GitHub/GradientLoadingBar
1
0
Fork 0
mirror of https://github.com/fxm90/GradientLoadingBar.git synced 2026-06-16 12:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/adapt-uikit-animation-to-swiftui-variant

Browse Source 
# Conflicts:
#	GradientLoadingBar/Feature/GradientActivityIndicatorView/GradientActivityIndicatorViewModel.swift
This commit is contained in:
Felix Mau
2022-08-14 18:29:09 +02:00
parent 24b380bf50 68c39399c4
commit 596692c2d4
24 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Example/Example/Scenes/AdvancedExample/AdvancedExampleTableViewController.swift
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2022 Felix Mau. All rights reserved.
//
import UIKit
import SwiftUI
import GradientLoadingBar
import SwiftUI
import UIKit
final class AdvancedExampleTableViewController: UITableViewController {
Example/Example/Scenes/AdvancedExample/Cells/CustomSuperviewTableViewCell.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2022 Felix Mau. All rights reserved.
//
import UIKit
import GradientLoadingBar
import UIKit
final class CustomSuperviewTableViewCell: UITableViewCell {
Example/Example/Scenes/AdvancedExample/Cells/InterfaceBuilderSetupTableViewCell.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2022 Felix Mau. All rights reserved.
//
import UIKit
import GradientLoadingBar
import UIKit
final class InterfaceBuilderSetupTableViewCell: UITableViewCell {
Example/Example/Scenes/BasicExample/BasicExampleViewController.swift
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2022 Felix Mau. All rights reserved.
//
import UIKit
import SwiftUI
import GradientLoadingBar
import SwiftUI
import UIKit
final class BasicExampleViewController: UIViewController {
Example/Example/Scenes/NavigationBarExample/NavigationBarExampleViewController.swift
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2022 Felix Mau. All rights reserved.
//
import UIKit
import SwiftUI
import GradientLoadingBar
import SwiftUI
import UIKit
final class NavigationBarExampleViewController: UIViewController {
Example/Example/Scenes/SafeAreaExample/SafeAreaExampleViewController.swift
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2022 Felix Mau. All rights reserved.
//
import UIKit
import SwiftUI
import GradientLoadingBar
import SwiftUI
import UIKit
final class SafeAreaExampleViewController: UIViewController {
Example/Example/Scenes/SwiftUIExample/SwiftUIExampleView.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2022 Felix Mau. All rights reserved.
//
import SwiftUI
import GradientLoadingBar
import SwiftUI
struct SwiftUIExampleView: View {
Example/ExampleSnapshotTests/GradientActivityIndicatorView/GradientActivityIndicatorViewTestCase.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2019 Felix Mau. All rights reserved.
//
import XCTest
import SnapshotTesting
import XCTest
@testable import GradientLoadingBar
Example/ExampleSnapshotTests/GradientLoadingBarController/GradientLoadingBarControllerTestCase.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2020 Felix Mau. All rights reserved.
//
import XCTest
import SnapshotTesting
import XCTest
@testable import GradientLoadingBar
Example/ExampleSnapshotTests/GradientLoadingBarController/NotchGradientLoadingBarControllerTestCase.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2020 Felix Mau. All rights reserved.
//
import XCTest
import SnapshotTesting
import XCTest
@testable import GradientLoadingBar
Example/ExampleSnapshotTests/GradientLoadingBarView/GradientLoadingBarViewTestCase.swift
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2022 Felix Mau. All rights reserved.
//
import XCTest
import SwiftUI
import SnapshotTesting
import SwiftUI
import XCTest
@testable import GradientLoadingBar
Example/ExampleTests/ViewModel/GradientActivityIndicatorViewModelTestCase.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2019 Felix Mau. All rights reserved.
//
import XCTest
import LightweightObservable
import XCTest
@testable import GradientLoadingBar
Example/ExampleTests/ViewModel/GradientLoadingBarView+ViewModelTestCase.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2022 Felix Mau. All rights reserved.
//
import XCTest
import SwiftUI
import XCTest
@testable import GradientLoadingBar
Example/ExampleTests/ViewModel/GradientLoadingBarViewModelTestCase.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2017 Felix Mau. All rights reserved.
//
import XCTest
import LightweightObservable
import XCTest
@testable import GradientLoadingBar
Example/Podfile.lock
+5 -5
View File
@@ -4,8 +4,8 @@ PODS:
- LightweightObservable (2.2.1)
- SnapshotTesting (1.9.0)
- SwiftConfigurationFiles (0.0.1)
- SwiftFormat/CLI (0.49.13)
- SwiftLint (0.47.1)
- SwiftFormat/CLI (0.49.15)
- SwiftLint (0.48.0)
DEPENDENCIES:
- GradientLoadingBar (from `../`)
@@ -29,7 +29,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
SwiftConfigurationFiles:
:commit: bc225b564e963fa72d2bdae67b6de9ea98da3121
:commit: efe01ba39069e8957fb89217b8c7fed298254691
:git: https://github.com/fxm90/SwiftConfigurationFiles.git
SPEC CHECKSUMS:
@@ -37,8 +37,8 @@ SPEC CHECKSUMS:
LightweightObservable: 64d0f623a4eec857e2680476380a08f3117a1a92
SnapshotTesting: 6141c48b6aa76ead61431ca665c14ab9a066c53b
SwiftConfigurationFiles: 1cf2228a911ebed9f42f8dec077bb634f04ca6c8
SwiftFormat: 53864d9acbae3a954eb413736729500fe7051435
SwiftLint: f80f1be7fa96d30e0aa68e58d45d4ea1ccaac519
SwiftFormat: 4798a30dd0706958ebe9e88aa9b481a1f79edae5
SwiftLint: 284cea64b6187c5d6bd83e9a548a64104d546447
PODFILE CHECKSUM: 236416c4c4856713b28b6bf3da014054e9b319f2
Example/Pods/Manifest.lock
Generated
+5 -5
View File
@@ -4,8 +4,8 @@ PODS:
- LightweightObservable (2.2.1)
- SnapshotTesting (1.9.0)
- SwiftConfigurationFiles (0.0.1)
- SwiftFormat/CLI (0.49.13)
- SwiftLint (0.47.1)
- SwiftFormat/CLI (0.49.15)
- SwiftLint (0.48.0)
DEPENDENCIES:
- GradientLoadingBar (from `../`)
@@ -29,7 +29,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
SwiftConfigurationFiles:
:commit: bc225b564e963fa72d2bdae67b6de9ea98da3121
:commit: efe01ba39069e8957fb89217b8c7fed298254691
:git: https://github.com/fxm90/SwiftConfigurationFiles.git
SPEC CHECKSUMS:
@@ -37,8 +37,8 @@ SPEC CHECKSUMS:
LightweightObservable: 64d0f623a4eec857e2680476380a08f3117a1a92
SnapshotTesting: 6141c48b6aa76ead61431ca665c14ab9a066c53b
SwiftConfigurationFiles: 1cf2228a911ebed9f42f8dec077bb634f04ca6c8
SwiftFormat: 53864d9acbae3a954eb413736729500fe7051435
SwiftLint: f80f1be7fa96d30e0aa68e58d45d4ea1ccaac519
SwiftFormat: 4798a30dd0706958ebe9e88aa9b481a1f79edae5
SwiftLint: 284cea64b6187c5d6bd83e9a548a64104d546447
PODFILE CHECKSUM: 236416c4c4856713b28b6bf3da014054e9b319f2
Example/Pods/SwiftConfigurationFiles/.swiftformat
Generated
+2 -2
View File
@@ -23,11 +23,11 @@
#
--disable andOperator
--disable blankLinesAtStartOfScope
--disable sortedImports
--disable wrapMultilineStatementBraces
#
# Rule Configuration
#
--wraparguments "after-first"
--wrapcollections "before-first"
--wrapcollections "before-first"
--importgrouping testable-last
Example/Pods/SwiftConfigurationFiles/README.md
Generated
+8 -1
View File
@@ -1,2 +1,9 @@
# Swift Configuration Files 🛠
Repository containing configuration files for Swift development, e.g. for tools like [SwiftLint](https://github.com/realm/SwiftLint) or [SwiftFormat](https://github.com/nicklockwood/SwiftFormat).
Repository containing configuration files for Swift development, e.g. for tools like [SwiftLint](https://github.com/realm/SwiftLint) or [SwiftFormat](https://github.com/nicklockwood/SwiftFormat).
### Author
Felix Mau (me(@)felix.hamburg)
### License
Swift Configuration Files is available under the MIT license. See the LICENSE file for more info.
Example/Pods/SwiftFormat/CommandLineTool/swiftformat
Generated
BIN
View File
Binary file not shown.
Example/Pods/SwiftFormat/README.md
Generated
+2 -2
View File
@@ -236,7 +236,7 @@ Alternatively, you might want to consider running SwiftFormat in [lint](#linting
To set up SwiftFormat as an Xcode build phase, do the following:
#### 1) Create a BuildTools folder & Package.swift
#### 1) Create a BuildTools folder and Package.swift
1. Create a folder called `BuildTools` in the same folder as your xcodeproj file
2. In this folder, create a file called `Package.swift`, with the following contents:
@@ -255,7 +255,7 @@ let package = Package(
```
3. If you are running Xcode 11.4 or later, in the `BuildTools` folder create a file called `Empty.swift` with nothing in it. This is to satisfy a change in Swift Package Manager.
#### 2) Add a Build phases to your app target
#### 2) Add a Build phase to your app target
1. Click on your project in the file list, choose your target under `TARGETS`, click the `Build Phases` tab
2. Add a `New Run Script Phase` by clicking the little plus icon in the top left
Example/Pods/SwiftLint/swiftlint
Generated
BIN
View File
Binary file not shown.
GradientLoadingBar/Feature/GradientActivityIndicatorView/GradientActivityIndicatorView.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2016 Felix Mau. All rights reserved.
//
import UIKit
import LightweightObservable
import UIKit
@IBDesignable
open class GradientActivityIndicatorView: UIView {
GradientLoadingBar/Feature/GradientLoadingBar/GradientLoadingBarController.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2016 Felix Mau. All rights reserved.
//
import UIKit
import LightweightObservable
import UIKit
/// Type-alias for the controller to match pod name.
public typealias GradientLoadingBar = GradientLoadingBarController
GradientLoadingBar/Feature/GradientLoadingBar/GradientLoadingBarViewModel.swift
+1 -1
View File
@@ -6,8 +6,8 @@
// Copyright © 2017 Felix Mau. All rights reserved.
//
import UIKit
import LightweightObservable
import UIKit
/// This view model checks for the availability of the key-window,
/// and adds it as a superview to the gradient-view.