ALTAPPS-1012: iOS refactor rename OnboardingFeature

iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj

@@ -545,7 +545,7 @@
 		E97EDB002A8F595E00CABF8E /* BadgeEarnedModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97EDAFF2A8F595E00CABF8E /* BadgeEarnedModalViewController.swift */; };
 		E9802D07281BB5CC00CF3AC1 /* StepQuizChoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9802D06281BB5CC00CF3AC1 /* StepQuizChoiceView.swift */; };
 		E9859B91292E414300857679 /* RepeatButtonInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9859B90292E414300857679 /* RepeatButtonInfo.swift */; };
-		E9886D3228ABCE5C003724F9 /* OnboardingOutputProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9886D3128ABCE5C003724F9 /* OnboardingOutputProtocol.swift */; };
+		E9886D3228ABCE5C003724F9 /* WelcomeOutputProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9886D3128ABCE5C003724F9 /* WelcomeOutputProtocol.swift */; };
 		E98BE36D2A374394000B430F /* StreakRecoveryModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98BE36C2A374394000B430F /* StreakRecoveryModalView.swift */; };
 		E993E9A928426FF2005988EC /* StepQuizSortingViewData.swift in Sources */ = {isa = PBXBuildFile; fileRef = E993E9A828426FF2005988EC /* StepQuizSortingViewData.swift */; };
 		E9950E9328893F1700C4D962 /* ProfileDailyStudyRemindersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9950E9228893F1700C4D962 /* ProfileDailyStudyRemindersView.swift */; };
@@ -576,8 +576,8 @@
 		E9A1DA722AD00D41006A9D4B /* FirstProblemOnboardingContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9A1DA712AD00D41006A9D4B /* FirstProblemOnboardingContentView.swift */; };
 		E9A22BA0295081BD001700B7 /* StreakFreezeModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9A22B9F295081BD001700B7 /* StreakFreezeModalViewController.swift */; };
 		E9A3435029113FA400E0C0A4 /* StepQuizHintReactionButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9A3434F29113FA400E0C0A4 /* StepQuizHintReactionButtonView.swift */; };
-		E9A6250D28ABAE30009423EE /* OnboardingAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9A6250C28ABAE30009423EE /* OnboardingAssembly.swift */; };
-		E9A6250F28ABAE83009423EE /* OnboardingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9A6250E28ABAE83009423EE /* OnboardingViewModel.swift */; };
+		E9A6250D28ABAE30009423EE /* WelcomeAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9A6250C28ABAE30009423EE /* WelcomeAssembly.swift */; };
+		E9A6250F28ABAE83009423EE /* WelcomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9A6250E28ABAE83009423EE /* WelcomeViewModel.swift */; };
 		E9AB310F29DECC7500645376 /* StudyPlanSectionHeaderStatisticsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9AB310E29DECC7500645376 /* StudyPlanSectionHeaderStatisticsView.swift */; };
 		E9AB311429DED7FE00645376 /* StudyPlanSectionItemIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9AB311329DED7FE00645376 /* StudyPlanSectionItemIconView.swift */; };
 		E9ACD3412937342F0005E05B /* ProblemOfDaySolvedModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9ACD3402937342F0005E05B /* ProblemOfDaySolvedModalViewController.swift */; };
@@ -620,7 +620,7 @@
 		E9F655CA2875914200291143 /* StreakCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F655C92875914200291143 /* StreakCardView.swift */; };
 		E9F655D12875B32700291143 /* ProblemOfDayCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F655D02875B32700291143 /* ProblemOfDayCardView.swift */; };
 		E9F7A5E028AFC2000063913F /* NotificationDescriptionPlainObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F7A5DF28AFC2000063913F /* NotificationDescriptionPlainObject.swift */; };
-		E9F923F628A2633D00C065A7 /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F923F528A2633D00C065A7 /* OnboardingView.swift */; };
+		E9F923F628A2633D00C065A7 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F923F528A2633D00C065A7 /* WelcomeView.swift */; };
 		E9FAF38F299F61AE001FC596 /* View+MeasureSize.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9FAF38E299F61AE001FC596 /* View+MeasureSize.swift */; };
 		E9FB89A32893CCAF0011EFFB /* LocalNotificationProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9FB89A22893CCAF0011EFFB /* LocalNotificationProtocol.swift */; };
 		E9FB89A72893CD2C0011EFFB /* LocalNotificationsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9FB89A62893CD2C0011EFFB /* LocalNotificationsService.swift */; };
@@ -1223,7 +1223,7 @@
 		E97EDAFF2A8F595E00CABF8E /* BadgeEarnedModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeEarnedModalViewController.swift; sourceTree = "<group>"; };
 		E9802D06281BB5CC00CF3AC1 /* StepQuizChoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepQuizChoiceView.swift; sourceTree = "<group>"; };
 		E9859B90292E414300857679 /* RepeatButtonInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepeatButtonInfo.swift; sourceTree = "<group>"; };
-		E9886D3128ABCE5C003724F9 /* OnboardingOutputProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingOutputProtocol.swift; sourceTree = "<group>"; };
+		E9886D3128ABCE5C003724F9 /* WelcomeOutputProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeOutputProtocol.swift; sourceTree = "<group>"; };
 		E98BE36C2A374394000B430F /* StreakRecoveryModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreakRecoveryModalView.swift; sourceTree = "<group>"; };
 		E993E9A828426FF2005988EC /* StepQuizSortingViewData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepQuizSortingViewData.swift; sourceTree = "<group>"; };
 		E9950E9228893F1700C4D962 /* ProfileDailyStudyRemindersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileDailyStudyRemindersView.swift; sourceTree = "<group>"; };
@@ -1254,8 +1254,8 @@
 		E9A1DA712AD00D41006A9D4B /* FirstProblemOnboardingContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstProblemOnboardingContentView.swift; sourceTree = "<group>"; };
 		E9A22B9F295081BD001700B7 /* StreakFreezeModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreakFreezeModalViewController.swift; sourceTree = "<group>"; };
 		E9A3434F29113FA400E0C0A4 /* StepQuizHintReactionButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepQuizHintReactionButtonView.swift; sourceTree = "<group>"; };
-		E9A6250C28ABAE30009423EE /* OnboardingAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingAssembly.swift; sourceTree = "<group>"; };
-		E9A6250E28ABAE83009423EE /* OnboardingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewModel.swift; sourceTree = "<group>"; };
+		E9A6250C28ABAE30009423EE /* WelcomeAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeAssembly.swift; sourceTree = "<group>"; };
+		E9A6250E28ABAE83009423EE /* WelcomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewModel.swift; sourceTree = "<group>"; };
 		E9AB310E29DECC7500645376 /* StudyPlanSectionHeaderStatisticsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyPlanSectionHeaderStatisticsView.swift; sourceTree = "<group>"; };
 		E9AB311329DED7FE00645376 /* StudyPlanSectionItemIconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyPlanSectionItemIconView.swift; sourceTree = "<group>"; };
 		E9ACD3402937342F0005E05B /* ProblemOfDaySolvedModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProblemOfDaySolvedModalViewController.swift; sourceTree = "<group>"; };
@@ -1298,7 +1298,7 @@
 		E9F655C92875914200291143 /* StreakCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreakCardView.swift; sourceTree = "<group>"; };
 		E9F655D02875B32700291143 /* ProblemOfDayCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProblemOfDayCardView.swift; sourceTree = "<group>"; };
 		E9F7A5DF28AFC2000063913F /* NotificationDescriptionPlainObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationDescriptionPlainObject.swift; sourceTree = "<group>"; };
-		E9F923F528A2633D00C065A7 /* OnboardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView.swift; sourceTree = "<group>"; };
+		E9F923F528A2633D00C065A7 /* WelcomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = "<group>"; };
 		E9FAF38E299F61AE001FC596 /* View+MeasureSize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+MeasureSize.swift"; sourceTree = "<group>"; };
 		E9FB89A22893CCAF0011EFFB /* LocalNotificationProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNotificationProtocol.swift; sourceTree = "<group>"; };
 		E9FB89A62893CD2C0011EFFB /* LocalNotificationsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNotificationsService.swift; sourceTree = "<group>"; };
@@ -1637,7 +1637,6 @@
 				2CB0ADE92B04AC9E0089D557 /* HomeSubmodules */,
 				E6992F3BBF430924F32DC178 /* Leaderboard */,
 				B58361EACE24BF4B761F10BA /* NotificationsOnboarding */,
-				E9F923F428A2632800C065A7 /* Onboarding */,
 				E9B55A5329C89FFF0066900E /* ProblemsLimit */,
 				2C9EB95B2861BAAE007DDE44 /* Profile */,
 				2C963BC82812D3410036DD53 /* ProfileSettings */,
@@ -1652,6 +1651,7 @@
 				E9F0A2A729D416AC00C4A61E /* StudyPlan */,
 				E9A022AB291D0E1C004317DB /* TopicsRepetitions */,
 				2C2600862A2001E600BD3D39 /* TrackSelection */,
+				E9F923F428A2632800C065A7 /* Welcome */,
 			);
 			path = Modules;
 			sourceTree = "<group>";
@@ -3969,15 +3969,15 @@
 			path = ProblemOfDay;
 			sourceTree = "<group>";
 		};
-		E9F923F428A2632800C065A7 /* Onboarding */ = {
+		E9F923F428A2632800C065A7 /* Welcome */ = {
 			isa = PBXGroup;
 			children = (
-				E9A6250C28ABAE30009423EE /* OnboardingAssembly.swift */,
-				E9886D3128ABCE5C003724F9 /* OnboardingOutputProtocol.swift */,
-				E9F923F528A2633D00C065A7 /* OnboardingView.swift */,
-				E9A6250E28ABAE83009423EE /* OnboardingViewModel.swift */,
+				E9A6250C28ABAE30009423EE /* WelcomeAssembly.swift */,
+				E9886D3128ABCE5C003724F9 /* WelcomeOutputProtocol.swift */,
+				E9F923F528A2633D00C065A7 /* WelcomeView.swift */,
+				E9A6250E28ABAE83009423EE /* WelcomeViewModel.swift */,
 			);
-			path = Onboarding;
+			path = Welcome;
 			sourceTree = "<group>";
 		};
 		E9FB89A12893CC790011EFFB /* Notifications */ = {
@@ -4297,7 +4297,7 @@
 				2CAFD39127FC5D5D00F88B0B /* Color+DesignSystem.swift in Sources */,
 				2C0F3CFA2A80A42D00947C35 /* BadgeDetailsModalViewController.swift in Sources */,
 				2C5CA2372A20185300DBF2F9 /* ProjectSelectionDetailsFeatureViewStateKsExtensions.swift in Sources */,
-				E9886D3228ABCE5C003724F9 /* OnboardingOutputProtocol.swift in Sources */,
+				E9886D3228ABCE5C003724F9 /* WelcomeOutputProtocol.swift in Sources */,
 				2C5CBBE12948EBEA00113007 /* StepQuizSQLViewDataMapper.swift in Sources */,
 				2CF4341228126C79002893CD /* View+EndEditing.swift in Sources */,
 				E9F2CC5329223C0200691540 /* StyledHostingController.swift in Sources */,
@@ -4430,7 +4430,7 @@
 				2C005DCC27EF5B0300DC6503 /* GoogleServiceInfo.swift in Sources */,
 				2CBD191D291D3BF400F5FB0B /* UIKitRoundedRectangleButton.swift in Sources */,
 				2C078CE92AE29D0600D97E24 /* StepQuizFillBlanksViewDataMapperCache.swift in Sources */,
-				E9A6250F28ABAE83009423EE /* OnboardingViewModel.swift in Sources */,
+				E9A6250F28ABAE83009423EE /* WelcomeViewModel.swift in Sources */,
 				2C0F3CFC2A80A47600947C35 /* BadgeDetailsModalView.swift in Sources */,
 				E97BEA1E2977D26F00348EEC /* TopicCompletedModalViewController.swift in Sources */,
 				2CEEE03128916A3100282849 /* ProblemOfDayAssembly.swift in Sources */,
@@ -4439,7 +4439,7 @@
 				2C55133B28B8DFE8009F7627 /* Debouncer.swift in Sources */,
 				2C7CB6882ADFF57D006F78DA /* FillBlanksQuizViewWrapper.swift in Sources */,
 				2C56611A2AEA418D00D607FB /* FillBlanksSelectCollectionViewCell.swift in Sources */,
-				E9A6250D28ABAE30009423EE /* OnboardingAssembly.swift in Sources */,
+				E9A6250D28ABAE30009423EE /* WelcomeAssembly.swift in Sources */,
 				2C336D172865C9CD00C91342 /* UIView+TraitCollection.swift in Sources */,
 				2CD48D872858639500CFCC4A /* StepQuizViewModel.swift in Sources */,
 				E9B55A5929C8A0760066900E /* ProblemsLimitView.swift in Sources */,
@@ -4469,7 +4469,7 @@
 				E9950E9528894F4700C4D962 /* ProfileDailyStudyRemindersHourIntervalPickerView.swift in Sources */,
 				E9A022AE291D0E3F004317DB /* TopicsRepetitionsCardView.swift in Sources */,
 				2C5CBBE32948F4B600113007 /* StepQuizSQLViewModel.swift in Sources */,
-				E9F923F628A2633D00C065A7 /* OnboardingView.swift in Sources */,
+				E9F923F628A2633D00C065A7 /* WelcomeView.swift in Sources */,
 				E9BDB4052A7BE1E30069EF98 /* BadgeImageView.swift in Sources */,
 				2C106D9928C1CE6E004FA584 /* SendEmailFeedbackController.swift in Sources */,
 				2C688C052A4E97750061AFFD /* ProgressScreenProjectProgressView.swift in Sources */,

iosHyperskillApp/iosHyperskillApp/Sources/Models/Constants/Strings.swift

@@ -461,9 +461,9 @@ enum Strings {
         }
     }
 
-    // MARK: - Onboarding -
+    // MARK: - Welcome -
 
-    enum Onboarding {
+    enum Welcome {
         static let title = sharedStrings.onboarding_title.localized()
         static let text = sharedStrings.onboarding_text.localized()
         static let primaryButton = sharedStrings.onboarding_primary_button_text.localized()

iosHyperskillApp/iosHyperskillApp/Sources/Modules/App/AppViewModel.swift

@@ -107,14 +107,14 @@ extension AppViewModel: AuthOutputProtocol {
     }
 }
 
-// MARK: - AppViewModel: OnboardingOutputProtocol -
+// MARK: - AppViewModel: WelcomeOutputProtocol -
 
-extension AppViewModel: OnboardingOutputProtocol {
-    func handleOnboardingSignInRequested() {
+extension AppViewModel: WelcomeOutputProtocol {
+    func handleWelcomeSignInRequested() {
         onViewAction?(AppFeatureActionViewActionNavigateToAuthScreen(isInSignUpMode: false))
     }
 
-    func handleOnboardingSignUpRequested(isInSignUpMode: Bool) {
+    func handleWelcomeSignUpRequested(isInSignUpMode: Bool) {
         if isInSignUpMode {
             onViewAction?(AppFeatureActionViewActionNavigateToAuthScreen(isInSignUpMode: isInSignUpMode))
         } else {

iosHyperskillApp/iosHyperskillApp/Sources/Modules/App/ViewControllers/AppViewController.swift

@@ -106,7 +106,7 @@ extension AppViewController: AppViewControllerProtocol {
         let viewControllerToPresent: UIViewController = {
             switch viewAction {
             case .onboardingScreen:
-                return UIHostingController(rootView: OnboardingAssembly(output: viewModel).makeModule())
+                return UIHostingController(rootView: WelcomeAssembly(output: viewModel).makeModule())
             case .studyPlan:
                 return AppTabBarController(
                     initialTab: .studyPlan,

iosHyperskillApp/iosHyperskillApp/Sources/Modules/AuthCredentials/Views/AuthPreviews.swift

@@ -18,7 +18,7 @@ struct AuthPreviews_Previews: PreviewProvider {
                 .makeModule()
                 .previewDevice(previewDevice)
 
-            OnboardingAssembly()
+            WelcomeAssembly()
                 .makeModule()
                 .previewDevice(previewDevice)
         }

iosHyperskillApp/iosHyperskillApp/Sources/Modules/Welcome/WelcomeAssembly.swift

@@ -0,0 +1,19 @@
+import Foundation
+import shared
+
+final class WelcomeAssembly: Assembly {
+    private weak var moduleOutput: WelcomeOutputProtocol?
+
+    init(output: WelcomeOutputProtocol? = nil) {
+        self.moduleOutput = output
+    }
+
+    func makeModule() -> WelcomeView {
+        let welcomeComponent = AppGraphBridge.sharedAppGraph.buildWelcomeComponent()
+
+        let viewModel = WelcomeViewModel(feature: welcomeComponent.welcomeFeature)
+        viewModel.moduleOutput = self.moduleOutput
+
+        return WelcomeView(viewModel: viewModel)
+    }
+}

iosHyperskillApp/iosHyperskillApp/Sources/Modules/Welcome/WelcomeOutputProtocol.swift

@@ -0,0 +1,6 @@
+import Foundation
+
+protocol WelcomeOutputProtocol: AnyObject {
+    func handleWelcomeSignInRequested()
+    func handleWelcomeSignUpRequested(isInSignUpMode: Bool)
+}

iosHyperskillApp/iosHyperskillApp/Sources/Modules/Onboarding/OnboardingView.swift → iosHyperskillApp/iosHyperskillApp/Sources/Modules/Welcome/WelcomeView.swift

@@ -1,18 +1,18 @@
 import shared
 import SwiftUI
 
-extension OnboardingView {
+extension WelcomeView {
     struct Appearance {
         let contentMaxWidth: CGFloat = 400
 
         let illustrationImageMaxHeight: CGFloat = 220
     }
 }
 
-struct OnboardingView: View {
+struct WelcomeView: View {
     private(set) var appearance = Appearance()
 
-    @StateObject var viewModel: OnboardingViewModel
+    @StateObject var viewModel: WelcomeViewModel
 
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
 
@@ -47,7 +47,7 @@ struct OnboardingView: View {
             PlaceholderView(
                 configuration: .networkError(
                     backgroundColor: .clear,
-                    action: viewModel.doRetryLoadOnboarding
+                    action: viewModel.doRetryContentLoading
                 )
             )
         case .content:
@@ -56,12 +56,12 @@ struct OnboardingView: View {
                     Spacer()
                 }
 
-                Text(Strings.Onboarding.title)
+                Text(Strings.Welcome.title)
                     .font(.largeTitle).bold()
                     .foregroundColor(.newPrimaryText)
                     .multilineTextAlignment(.center)
 
-                Text(Strings.Onboarding.text)
+                Text(Strings.Welcome.text)
                     .font(.title3)
                     .foregroundColor(.newPrimaryText)
                     .multilineTextAlignment(.center)
@@ -77,7 +77,7 @@ struct OnboardingView: View {
                 Spacer()
 
                 Button(
-                    Strings.Onboarding.primaryButton,
+                    Strings.Welcome.primaryButton,
                     action: {
                         actionButtonsFeedbackGenerator.triggerFeedback()
                         viewModel.doPrimaryButtonAction()
@@ -87,7 +87,7 @@ struct OnboardingView: View {
                 .shineEffect()
 
                 Button(
-                    Strings.Onboarding.secondaryButton,
+                    Strings.Welcome.secondaryButton,
                     action: {
                         actionButtonsFeedbackGenerator.triggerFeedback()
                         viewModel.doSecondaryButtonAction()
@@ -119,16 +119,16 @@ struct OnboardingView: View {
 
 struct OnboardingView_Previews: PreviewProvider {
     static var previews: some View {
-        OnboardingAssembly()
+        WelcomeAssembly()
             .makeModule()
             .previewDevice(PreviewDevice(rawValue: "iPhone 13 Pro"))
 
-        OnboardingAssembly()
+        WelcomeAssembly()
             .makeModule()
             .previewDevice(PreviewDevice(rawValue: "iPhone SE (3rd generation)"))
             .preferredColorScheme(.dark)
 
-        OnboardingAssembly()
+        WelcomeAssembly()
             .makeModule()
             .previewDevice(PreviewDevice(rawValue: "iPad (9th generation)"))
     }