From c8d3ccf7a33c8b19eaa8d7744feb1103674a1237 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 15 Oct 2021 06:15:12 -0500 Subject: [PATCH] TCA Updates --- secant.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 31 +++++++++++++++++-- .../Features/Onboarding/OnboardingStore.swift | 2 +- .../Onboarding/Views/Onboarding.swift | 4 +-- secant/Generated/XCAssets+Generated.swift | 3 -- .../OnboardingStoreTests.swift | 11 +++---- 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/secant.xcodeproj/project.pbxproj b/secant.xcodeproj/project.pbxproj index 7731182..b34b9be 100644 --- a/secant.xcodeproj/project.pbxproj +++ b/secant.xcodeproj/project.pbxproj @@ -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 */ diff --git a/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 383959a..fb9ffd9 100644 --- a/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -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" } }, { diff --git a/secant/Features/Onboarding/OnboardingStore.swift b/secant/Features/Onboarding/OnboardingStore.swift index 315ff0a..d0e3372 100644 --- a/secant/Features/Onboarding/OnboardingStore.swift +++ b/secant/Features/Onboarding/OnboardingStore.swift @@ -16,7 +16,7 @@ struct OnboardingStep: Equatable, Identifiable { } struct OnboardingState: Equatable { - var steps: IdentifiedArrayOf + var steps: IdentifiedArrayOf = Self.onboardingSteps var index = 0 var offset: CGFloat = .zero diff --git a/secant/Features/Onboarding/Views/Onboarding.swift b/secant/Features/Onboarding/Views/Onboarding.swift index 9e1b131..c48ec1e 100644 --- a/secant/Features/Onboarding/Views/Onboarding.swift +++ b/secant/Features/Onboarding/Views/Onboarding.swift @@ -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: () ) diff --git a/secant/Generated/XCAssets+Generated.swift b/secant/Generated/XCAssets+Generated.swift index 21713fe..2624987 100644 --- a/secant/Generated/XCAssets+Generated.swift +++ b/secant/Generated/XCAssets+Generated.swift @@ -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") diff --git a/secantTests/OnboardingTests/OnboardingStoreTests.swift b/secantTests/OnboardingTests/OnboardingStoreTests.swift index c2da2b4..b816299 100644 --- a/secantTests/OnboardingTests/OnboardingStoreTests.swift +++ b/secantTests/OnboardingTests/OnboardingStoreTests.swift @@ -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) } }