review fixes

hyperskill · Oct 11, 2023 · 22a4c97 · 22a4c97
1 parent 450a25a
commit 22a4c97
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 47 deletions.
diff --git a/...yperskillApp/Sources/Modules/FirstProblemOnboarding/FirstProblemOnboardingViewModel.swift b/...yperskillApp/Sources/Modules/FirstProblemOnboarding/FirstProblemOnboardingViewModel.swift
@@ -1,4 +1,3 @@
-import CombineSchedulers
 import Foundation
 import shared
 
@@ -18,9 +17,8 @@ final class FirstProblemOnboardingViewModel: FeatureViewModel<
         FirstProblemOnboardingFeatureViewStateKs(oldState) != FirstProblemOnboardingFeatureViewStateKs(newState)
     }
 
-    override init(feature: Presentation_reduxFeature, mainScheduler: AnySchedulerOf<RunLoop> = .main) {
+    init(feature: Presentation_reduxFeature) {
         super.init(feature: feature)
-
         onNewMessage(FirstProblemOnboardingFeatureMessageInitialize())
     }
 

diff --git a/...lApp/Sources/Modules/FirstProblemOnboarding/Views/FirstProblemOnboardingContentView.swift b/...lApp/Sources/Modules/FirstProblemOnboarding/Views/FirstProblemOnboardingContentView.swift
@@ -4,7 +4,7 @@ extension FirstProblemOnboardingContentView {
     struct Appearance {
         let interitemSpacing = LayoutInsets.smallInset
 
-        let illustrationHeight: CGFloat = 380
+        let illustrationMaxHeight: CGFloat = 380
 
         let maxWidth: CGFloat = DeviceInfo.current.isPad ? 400 : .infinity
     }
@@ -79,50 +79,50 @@ struct FirstProblemOnboardingContentView: View {
     private var illustration: some View {
         Image(
             isNewUserMode
-            ? ImageResource.firstProblemOnboardingNewUserIllustration
-            : ImageResource.firstProblemOnboardingExistingUserIllustration
+              ? ImageResource.firstProblemOnboardingNewUserIllustration
+              : ImageResource.firstProblemOnboardingExistingUserIllustration
         )
         .renderingMode(.original)
         .resizable()
         .aspectRatio(contentMode: .fit)
         .frame(maxWidth: .infinity)
-        .frame(maxHeight: appearance.illustrationHeight)
+        .frame(maxHeight: appearance.illustrationMaxHeight)
     }
 
     @MainActor
     private var actionButton: some View {
-        VStack(alignment: .center, spacing: appearance.interitemSpacing) {
-            Button(
-                buttonText,
-                action: {
-                    actionButtonsFeedbackGenerator.triggerFeedback()
-                    onCallToActionButtonTap()
-                }
-            )
-            .buttonStyle(RoundedRectangleButtonStyle(style: .newViolet))
-            .shineEffect()
-        }
+        Button(
+            buttonText,
+            action: {
+                actionButtonsFeedbackGenerator.triggerFeedback()
+                onCallToActionButtonTap()
+            }
+        )
+        .buttonStyle(RoundedRectangleButtonStyle(style: .newViolet))
+        .shineEffect()
     }
 }
 
-struct FirstProblemOnboardingContentView_Previews: PreviewProvider {
-    static var previews: some View {
-        FirstProblemOnboardingContentView(
-            title: "Let's keep going!",
-            subtitle: "It seems you've already made progress. Continue learning on '{project(or track).title}'!",
-            buttonText: "Keep learning",
-            isNewUserMode: false,
-            onCallToActionButtonTap: {}
-        )
-        .previewDevice(PreviewDevice(rawValue: "iPhone 14 Pro"))
-
-        FirstProblemOnboardingContentView(
-            title: "Great choice!",
-            subtitle: "Embark on your journey in '{project(or track).title}' right now!",
-            buttonText: "Start learning",
-            isNewUserMode: true,
-            onCallToActionButtonTap: {}
-        )
-        .previewDevice(PreviewDevice(rawValue: "iPad (10th generation)"))
-    }
+// MARK: - FirstProblemOnboardingContentView (Previews) -
+
+#Preview("Mobile device") {
+    FirstProblemOnboardingContentView(
+        title: "Let's keep going!",
+        subtitle: "It seems you've already made progress. Continue learning on '{project(or track).title}'!",
+        buttonText: "Keep learning",
+        isNewUserMode: false,
+        onCallToActionButtonTap: {}
+    )
+    .previewDevice(PreviewDevice(rawValue: "iPhone 14 Pro"))
+}
+
+#Preview("Tablet device") {
+    FirstProblemOnboardingContentView(
+        title: "Great choice!",
+        subtitle: "Embark on your journey in '{project(or track).title}' right now!",
+        buttonText: "Start learning",
+        isNewUserMode: true,
+        onCallToActionButtonTap: {}
+    )
+    .previewDevice(PreviewDevice(rawValue: "iPad (10th generation)"))
 }
diff --git a/...perskillApp/Sources/Modules/FirstProblemOnboarding/Views/FirstProblemOnboardingView.swift b/...perskillApp/Sources/Modules/FirstProblemOnboarding/Views/FirstProblemOnboardingView.swift
@@ -85,16 +85,16 @@ private extension FirstProblemOnboardingView {
     }
 }
 
-// MARK: - FirstProblemOnboardingView_Previews: PreviewProvider -
+// MARK: - FirstProblemOnboardingView (Previews) -
 
-struct FirstProblemOnboardingView_Previews: PreviewProvider {
-    static var previews: some View {
-        UIKitViewControllerPreview {
-            FirstProblemOnboardingAssembly(isNewUserMode: true, output: nil).makeModule()
-        }
+#Preview("New user") {
+    UIKitViewControllerPreview {
+        FirstProblemOnboardingAssembly(isNewUserMode: true, output: nil).makeModule()
+    }
+}
 
-        UIKitViewControllerPreview {
-            FirstProblemOnboardingAssembly(isNewUserMode: false, output: nil).makeModule()
-        }
+#Preview("Existed user") {
+    UIKitViewControllerPreview {
+        FirstProblemOnboardingAssembly(isNewUserMode: false, output: nil).makeModule()
     }
 }
diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Onboarding/OnboardingView.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Onboarding/OnboardingView.swift
@@ -78,6 +78,7 @@ struct OnboardingView: View {
 
                 Button(Strings.Onboarding.signIn, action: viewModel.doSignPresentation)
                     .buttonStyle(RoundedRectangleButtonStyle(style: .violet))
+                    .shineEffect()
 
                 Button(Strings.Onboarding.signUp, action: viewModel.doClickedSignUpAction)
                     .buttonStyle(OutlineButtonStyle(style: .violet))