Merge pull request #2325 from CruGlobal/GT-2331-cyoa-tool-tip-rendering

GT-2331 cyoa tool tip rendering
CruGlobal · Nov 5, 2024 · 6999ad7 · 6999ad7
2 parents 19f7ec0 + badaa49
commit 6999ad7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/godtools/App/Flows/ChooseYourOwnAdventure/ChooseYourOwnAdventureFlow.swift b/godtools/App/Flows/ChooseYourOwnAdventure/ChooseYourOwnAdventureFlow.swift
@@ -28,15 +28,20 @@ class ChooseYourOwnAdventureFlow: ToolNavigationFlow, ToolSettingsNavigationFlow
     var tractFlow: TractFlow?
     var downloadToolTranslationFlow: DownloadToolTranslationsFlow?
 
-    init(flowDelegate: FlowDelegate, appDiContainer: AppDiContainer, sharedNavigationController: AppNavigationController, appLanguage: AppLanguageDomainModel, toolTranslations: ToolTranslationsDomainModel, initialPage: MobileContentPagesPage?, selectedLanguageIndex: Int?) {
+    init(flowDelegate: FlowDelegate, appDiContainer: AppDiContainer, sharedNavigationController: AppNavigationController, appLanguage: AppLanguageDomainModel, toolTranslations: ToolTranslationsDomainModel, initialPage: MobileContentPagesPage?, selectedLanguageIndex: Int?, trainingTipsEnabled: Bool) {
 
         self.flowDelegate = flowDelegate
         self.appDiContainer = appDiContainer
         self.navigationController = sharedNavigationController
         self.appLanguage = appLanguage
 
         sharedNavigationController.pushViewController(
-            getChooseYourOwnAdventureView(toolTranslations: toolTranslations, initialPage: initialPage, selectedLanguageIndex: selectedLanguageIndex),
+            getChooseYourOwnAdventureView(
+                toolTranslations: toolTranslations,
+                initialPage: initialPage,
+                selectedLanguageIndex: selectedLanguageIndex,
+                trainingTipsEnabled: trainingTipsEnabled
+            ),
             animated: true
         )
     }
@@ -71,7 +76,7 @@ class ChooseYourOwnAdventureFlow: ToolNavigationFlow, ToolSettingsNavigationFlow
 
 extension ChooseYourOwnAdventureFlow {
 
-    private func getChooseYourOwnAdventureView(toolTranslations: ToolTranslationsDomainModel, initialPage: MobileContentPagesPage?, selectedLanguageIndex: Int?) -> UIViewController {
+    private func getChooseYourOwnAdventureView(toolTranslations: ToolTranslationsDomainModel, initialPage: MobileContentPagesPage?, selectedLanguageIndex: Int?, trainingTipsEnabled: Bool) -> UIViewController {
 
         let navigation: MobileContentRendererNavigation = appDiContainer.getMobileContentRendererNavigation(
             parentFlow: self,
@@ -97,7 +102,7 @@ extension ChooseYourOwnAdventureFlow {
             mobileContentEventAnalytics: appDiContainer.getMobileContentRendererEventAnalyticsTracking(),
             getCurrentAppLanguageUseCase: appDiContainer.feature.appLanguage.domainLayer.getCurrentAppLanguageUseCase(),
             getTranslatedLanguageName: appDiContainer.dataLayer.getTranslatedLanguageName(),
-            trainingTipsEnabled: false,
+            trainingTipsEnabled: trainingTipsEnabled,
             incrementUserCounterUseCase: appDiContainer.domainLayer.getIncrementUserCounterUseCase(),
             selectedLanguageIndex: selectedLanguageIndex
         )

diff --git a/godtools/App/Flows/ToolNavigation/ToolNavigationFlow.swift b/godtools/App/Flows/ToolNavigation/ToolNavigationFlow.swift
@@ -147,7 +147,8 @@ extension ToolNavigationFlow {
                 appLanguage: appLanguage,
                 toolTranslations: toolTranslations,
                 initialPage: initialPage,
-                selectedLanguageIndex: selectedLanguageIndex
+                selectedLanguageIndex: selectedLanguageIndex,
+                trainingTipsEnabled: trainingTipsEnabled
             )
 
         case .metaTool:

diff --git a/godtools/App/Services/Renderer/Renderer/MobileContentRendererPageViewFactories.swift b/godtools/App/Services/Renderer/Renderer/MobileContentRendererPageViewFactories.swift
@@ -35,7 +35,12 @@ class MobileContentRendererPageViewFactories: MobileContentPageViewFactoryType {
                 mobileContentAnalytics: mobileContentAnalytics
             )
 
-            pageViewFactories = [chooseYourOwnAdventureViewFactory]
+            let trainingViewFactory: TrainingViewFactory = TrainingViewFactory(
+                mobileContentAnalytics: mobileContentAnalytics,
+                getTrainingTipCompletedUseCase: getTrainingTipCompletedUseCase
+            )
+
+            pageViewFactories = [chooseYourOwnAdventureViewFactory, trainingViewFactory]
 
         case .lesson: