Merge pull request #49 from adamstener/TCA-Version-Update
This commit is contained in:
commit
c641784a95
|
@ -1019,7 +1019,7 @@
|
|||
repositoryURL = "https://github.com/pointfreeco/swift-composable-architecture";
|
||||
requirement = {
|
||||
kind = exactVersion;
|
||||
version = 0.9.0;
|
||||
version = 0.28.1;
|
||||
};
|
||||
};
|
||||
/* End XCRemoteSwiftPackageReference section */
|
||||
|
|
|
@ -19,13 +19,40 @@
|
|||
"version": "0.7.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-collections",
|
||||
"repositoryURL": "https://github.com/apple/swift-collections",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "2d33a0ea89c961dcb2b3da2157963d9c0370347e",
|
||||
"version": "1.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-composable-architecture",
|
||||
"repositoryURL": "https://github.com/pointfreeco/swift-composable-architecture",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "b67569f69813140cd9c984db33ee959d9711a008",
|
||||
"version": "0.9.0"
|
||||
"revision": "599a2398adaaa7a4e3f5420cde7728c39e33677e",
|
||||
"version": "0.28.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-custom-dump",
|
||||
"repositoryURL": "https://github.com/pointfreeco/swift-custom-dump",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "21f8fdbb3226e5e28a1a2fffac3e0f3deec34bf0",
|
||||
"version": "0.2.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-identified-collections",
|
||||
"repositoryURL": "https://github.com/pointfreeco/swift-identified-collections",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "f76e7d3fe4265ee09216044ec3780d74f546ca82",
|
||||
"version": "0.3.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -16,7 +16,7 @@ struct OnboardingStep: Equatable, Identifiable {
|
|||
}
|
||||
|
||||
struct OnboardingState: Equatable {
|
||||
var steps: IdentifiedArrayOf<OnboardingStep>
|
||||
var steps: IdentifiedArrayOf<OnboardingStep> = Self.onboardingSteps
|
||||
var index = 0
|
||||
var offset: CGFloat = .zero
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ struct OnboardingView: View {
|
|||
}
|
||||
|
||||
extension OnboardingState {
|
||||
static let steps = IdentifiedArray(
|
||||
static let onboardingSteps = IdentifiedArray(
|
||||
uniqueElements: [
|
||||
OnboardingStep(
|
||||
id: UUID(),
|
||||
|
@ -85,7 +85,7 @@ struct Onboarding_Previews: PreviewProvider {
|
|||
Group {
|
||||
OnboardingView(
|
||||
store: Store(
|
||||
initialState: OnboardingState(steps: OnboardingState.steps),
|
||||
initialState: OnboardingState(),
|
||||
reducer: onboardingReducer,
|
||||
environment: ()
|
||||
)
|
||||
|
|
|
@ -45,9 +45,6 @@ internal enum Asset {
|
|||
internal static let navigationButtonDisabled = ColorAsset(name: "NavigationButtonDisabled")
|
||||
internal static let navigationButtonEnabled = ColorAsset(name: "NavigationButtonEnabled")
|
||||
}
|
||||
internal static let primaryButton = ColorAsset(name: "PrimaryButton")
|
||||
internal static let primaryButtonDisabled = ColorAsset(name: "PrimaryButtonDisabled")
|
||||
internal static let primaryButtonPressed = ColorAsset(name: "PrimaryButtonPressed")
|
||||
internal enum ProgressIndicator {
|
||||
internal static let gradientLeft = ColorAsset(name: "GradientLeft")
|
||||
internal static let gradientRight = ColorAsset(name: "GradientRight")
|
||||
|
|
|
@ -12,7 +12,7 @@ import ComposableArchitecture
|
|||
class OnboardingStoreTests: XCTestCase {
|
||||
func testIncrementingOnboarding() {
|
||||
let store = TestStore(
|
||||
initialState: OnboardingState(steps: OnboardingState.steps),
|
||||
initialState: OnboardingState(),
|
||||
reducer: onboardingReducer,
|
||||
environment: ()
|
||||
)
|
||||
|
@ -23,7 +23,7 @@ class OnboardingStoreTests: XCTestCase {
|
|||
|
||||
XCTAssertFalse($0.nextButtonDisabled)
|
||||
XCTAssertFalse($0.backButtonDisabled)
|
||||
XCTAssertEqual($0.currentStep, OnboardingState.steps[1])
|
||||
XCTAssertEqual($0.currentStep, $0.steps[1])
|
||||
XCTAssertEqual($0.progress, 66)
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ class OnboardingStoreTests: XCTestCase {
|
|||
|
||||
XCTAssertTrue($0.nextButtonDisabled)
|
||||
XCTAssertFalse($0.backButtonDisabled)
|
||||
XCTAssertEqual($0.currentStep, OnboardingState.steps[2])
|
||||
XCTAssertEqual($0.currentStep, $0.steps[2])
|
||||
XCTAssertEqual($0.progress, 100)
|
||||
}
|
||||
}
|
||||
|
@ -41,7 +41,6 @@ class OnboardingStoreTests: XCTestCase {
|
|||
func testDecrementingOnboarding() {
|
||||
let store = TestStore(
|
||||
initialState: OnboardingState(
|
||||
steps: OnboardingState.steps,
|
||||
index: 2,
|
||||
offset: .zero - 20.0 - 20.0
|
||||
),
|
||||
|
@ -55,7 +54,7 @@ class OnboardingStoreTests: XCTestCase {
|
|||
|
||||
XCTAssertFalse($0.nextButtonDisabled)
|
||||
XCTAssertFalse($0.backButtonDisabled)
|
||||
XCTAssertEqual($0.currentStep, OnboardingState.steps[1])
|
||||
XCTAssertEqual($0.currentStep, $0.steps[1])
|
||||
XCTAssertEqual($0.progress, 66)
|
||||
}
|
||||
|
||||
|
@ -65,7 +64,7 @@ class OnboardingStoreTests: XCTestCase {
|
|||
|
||||
XCTAssertFalse($0.nextButtonDisabled)
|
||||
XCTAssertTrue($0.backButtonDisabled)
|
||||
XCTAssertEqual($0.currentStep, OnboardingState.steps[0])
|
||||
XCTAssertEqual($0.currentStep, $0.steps[0])
|
||||
XCTAssertEqual($0.progress, 33)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue