ProblemOfDaySolvedModalViewController show share streak

hyperskill · Nov 8, 2023 · cf20b45 · cf20b45
1 parent adab561
commit cf20b45
Show file tree

Hide file tree

Showing 7 changed files with 218 additions and 80 deletions.
diff --git a/...HyperskillApp/src/main/java/org/hyperskill/app/android/step/view/delegate/StepDelegate.kt b/...HyperskillApp/src/main/java/org/hyperskill/app/android/step/view/delegate/StepDelegate.kt
@@ -84,6 +84,10 @@ class StepDelegate<TFragment>(
                     is StepCompletionFeature.Action.ViewAction.ShowShareStreakModal -> {
                         // TODO: ALTAPPS-1028 Show share streak modal
                     }
+                    is StepCompletionFeature.Action.ViewAction.ShowShareStreakSystemModal -> {
+                        // TODO: ALTAPPS-1028 Show system share streak modal (after "Share your streak" button clicked)
+                        // on the problem of day solved modal
+                    }
                 }
             }
         }

diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Models/Constants/Strings.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Models/Constants/Strings.swift
@@ -121,6 +121,9 @@ enum Strings {
         enum ProblemOfDaySolvedModal {
             static let title = sharedStrings.step_quiz_problem_of_day_solved_modal_title.localized()
             static let text = sharedStrings.step_quiz_problem_of_day_solved_modal_text.localized()
+
+            static let shareStreakButton =
+              sharedStrings.step_quiz_problem_of_day_solved_modal_share_streak_button_text.localized()
         }
 
         enum TopicCompletedModal {

diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Step/StepViewModel.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Step/StepViewModel.swift
@@ -85,16 +85,6 @@ final class StepViewModel: FeatureViewModel<StepFeatureState, StepFeatureMessage
         }
     }
 
-    // MARK: Problem of day solved
-
-    func doGoBackProblemOfDaySolvedAction() {
-        onNewMessage(
-            StepFeatureMessageStepCompletionMessage(
-                message: StepCompletionFeatureMessageProblemOfDaySolvedModalGoBackClicked()
-            )
-        )
-    }
-
     // MARK: Daily notifications request
 
     func handleSendDailyStudyRemindersPermissionRequestResult(isGranted: Bool) {
@@ -122,22 +112,6 @@ final class StepViewModel: FeatureViewModel<StepFeatureState, StepFeatureMessage
     func logViewedEvent() {
         onNewMessage(StepFeatureMessageViewedEventMessage())
     }
-
-    func logDailyStepCompletedModalShownEvent() {
-        onNewMessage(
-            StepFeatureMessageStepCompletionMessage(
-                message: StepCompletionFeatureMessageDailyStepCompletedModalShownEventMessage()
-            )
-        )
-    }
-
-    func logDailyStepCompletedModalHiddenEvent() {
-        onNewMessage(
-            StepFeatureMessageStepCompletionMessage(
-                message: StepCompletionFeatureMessageDailyStepCompletedModalHiddenEventMessage()
-            )
-        )
-    }
 }
 
 // MARK: - StepViewModel: StepQuizOutputProtocol -
@@ -195,3 +169,44 @@ extension StepViewModel: TopicCompletedModalViewControllerDelegate {
         )
     }
 }
+
+// MARK: - StepViewModel: ProblemOfDaySolvedModalViewControllerDelegate -
+
+extension StepViewModel: ProblemOfDaySolvedModalViewControllerDelegate {
+    func problemOfDaySolvedModalViewControllerDidAppear(_ viewController: ProblemOfDaySolvedModalViewController) {
+        onNewMessage(
+            StepFeatureMessageStepCompletionMessage(
+                message: StepCompletionFeatureMessageDailyStepCompletedModalShownEventMessage()
+            )
+        )
+    }
+
+    func problemOfDaySolvedModalViewControllerDidDisappear(_ viewController: ProblemOfDaySolvedModalViewController) {
+        onNewMessage(
+            StepFeatureMessageStepCompletionMessage(
+                message: StepCompletionFeatureMessageDailyStepCompletedModalHiddenEventMessage()
+            )
+        )
+    }
+
+    func problemOfDaySolvedModalViewControllerDidTapGoBackButton(
+        _ viewController: ProblemOfDaySolvedModalViewController
+    ) {
+        onNewMessage(
+            StepFeatureMessageStepCompletionMessage(
+                message: StepCompletionFeatureMessageProblemOfDaySolvedModalGoBackClicked()
+            )
+        )
+    }
+
+    func problemOfDaySolvedModalViewControllerDidTapShareStreakButton(
+        _ viewController: ProblemOfDaySolvedModalViewController,
+        streak: Int
+    ) {
+        onNewMessage(
+            StepFeatureMessageStepCompletionMessage(
+                message: StepCompletionFeatureMessageProblemOfDaySolvedModalShareStreakClicked(streak: Int32(streak))
+            )
+        )
+    }
+}
diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Step/Views/StepView.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Step/Views/StepView.swift
@@ -115,9 +115,15 @@ struct StepView: View {
         case .requestDailyStudyRemindersPermission:
             presentSendDailyStudyRemindersPermissionAlert()
         case .showProblemOfDaySolvedModal(let showProblemOfDaySolvedModalViewAction):
-            presentDailyStepCompletedModal(earnedGemsText: showProblemOfDaySolvedModalViewAction.earnedGemsText)
+            presentDailyStepCompletedModal(
+                earnedGemsText: showProblemOfDaySolvedModalViewAction.earnedGemsText,
+                streakText: showProblemOfDaySolvedModalViewAction.streakText,
+                streak: showProblemOfDaySolvedModalViewAction.streak?.intValue
+            )
         case .showShareStreakModal:
             #warning("TODO: ALTAPPS-1027 Show share streak modal")
+        case .showShareStreakSystemModal:
+            #warning("TODO: ALTAPPS-1027 Show system share streak modal")
         }
     }
 
@@ -145,20 +151,18 @@ extension StepView {
         panModalPresenter.presentPanModal(modal)
     }
 
-    private func presentDailyStepCompletedModal(earnedGemsText: String) {
-        viewModel.logDailyStepCompletedModalShownEvent()
-
-        let panModal = ProblemOfDaySolvedModalViewController(
+    private func presentDailyStepCompletedModal(
+        earnedGemsText: String,
+        streakText: String?,
+        streak: Int?
+    ) {
+        let modal = ProblemOfDaySolvedModalViewController(
             earnedGemsText: earnedGemsText,
-            onGoBackButtonTap: { [weak viewModel] in
-                viewModel?.doGoBackProblemOfDaySolvedAction()
-            }
+            streakText: streakText,
+            streak: streak,
+            delegate: viewModel
         )
-        panModal.onDisappear = { [weak viewModel] in
-            viewModel?.logDailyStepCompletedModalHiddenEvent()
-        }
-
-        panModalPresenter.presentPanModal(panModal)
+        panModalPresenter.presentPanModal(modal)
     }
 }