Merge pull request #2326 from CruGlobal/develop

Merge develop into master

Gemfile.lock

@@ -5,8 +5,9 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.1.2)
+    activesupport (7.2.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -24,8 +25,8 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.992.0)
-    aws-sdk-core (3.210.0)
+    aws-partitions (1.999.0)
+    aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -37,16 +38,17 @@ GEM
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.0)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
+    benchmark (0.3.0)
     bigdecimal (3.1.8)
     claide (1.1.0)
-    cocoapods (1.16.1)
+    cocoapods (1.16.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.16.1)
+      cocoapods-core (= 1.16.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -60,8 +62,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.26.0, < 2.0)
-    cocoapods-core (1.16.1)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -292,7 +294,7 @@ GEM
     xcode-install (2.8.1)
       claide (>= 0.9.1)
       fastlane (>= 2.1.0, < 3.0.0)
-    xcodeproj (1.26.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

godtools/App/AppDelegate.swift

@@ -44,7 +44,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             appConfig: appConfig,
             infoPlist: infoPlist,
             realmDatabase: realmDatabase,
-            appMessagingEnabled: launchEnvironmentReader.getAppMessagingIsEnabled() ?? true
+            firebaseEnabled: firebaseEnabled
         )
     }()
 
@@ -56,6 +56,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }()
 
     private var toolShortcutLinks: ToolShortcutLinksView?
+    private var firebaseEnabled: Bool {
+        return launchEnvironmentReader.getFirebaseEnabled() ?? true
+    }
 
     var window: UIWindow?
 
@@ -74,8 +77,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         if appBuild.configuration == .analyticsLogging {
             appDiContainer.getFirebaseDebugArguments().enable()
         }
-
-        appDiContainer.getFirebaseConfiguration().configure()
+
+        if firebaseEnabled {
+            appDiContainer.getFirebaseConfiguration().configure()
+        }
 
         if appBuild.configuration == .release {
             GodToolsParserLogger.shared.start()

godtools/App/DependencyContainer/AppDataLayerDependencies.swift

@@ -19,15 +19,15 @@ class AppDataLayerDependencies {
     private let sharedIgnoreCacheSession: IgnoreCacheSession = IgnoreCacheSession()
     private let sharedUserDefaultsCache: SharedUserDefaultsCache = SharedUserDefaultsCache()
     private let sharedAnalytics: AnalyticsContainer
-    private let appMessagingEnabled: Bool
+    private let firebaseEnabled: Bool
 
-    init(appBuild: AppBuild, appConfig: AppConfig, infoPlist: InfoPlist, realmDatabase: RealmDatabase, appMessagingEnabled: Bool) {
+    init(appBuild: AppBuild, appConfig: AppConfig, infoPlist: InfoPlist, realmDatabase: RealmDatabase, firebaseEnabled: Bool) {
 
         sharedAppBuild = appBuild
         sharedAppConfig = appConfig
         sharedInfoPlist = infoPlist
         sharedRealmDatabase = realmDatabase
-        self.appMessagingEnabled = appMessagingEnabled
+        self.firebaseEnabled = firebaseEnabled
 
         sharedAnalytics = AnalyticsContainer(
             appsFlyerAnalytics: AppsFlyerAnalytics(appsFlyer: AppsFlyer.shared, loggingEnabled: appBuild.configuration == .analyticsLogging),
@@ -57,7 +57,7 @@ class AppDataLayerDependencies {
 
     func getAppMessaging() -> AppMessagingInterface {
 
-        guard appMessagingEnabled else {
+        guard firebaseEnabled else {
             return DisabledInAppMessaging()
         }
 

godtools/App/DependencyContainer/AppDiContainer.swift

@@ -19,7 +19,7 @@ class AppDiContainer {
     let domainLayer: AppDomainLayerDependencies
     let feature: AppFeatureDiContainer
 
-    init(appBuild: AppBuild, appConfig: AppConfig, infoPlist: InfoPlist, realmDatabase: RealmDatabase, appMessagingEnabled: Bool) {
+    init(appBuild: AppBuild, appConfig: AppConfig, infoPlist: InfoPlist, realmDatabase: RealmDatabase, firebaseEnabled: Bool) {
 
         self.appBuild = appBuild
         self.realmDatabase = realmDatabase
@@ -29,7 +29,7 @@ class AppDiContainer {
             appConfig: appConfig,
             infoPlist: infoPlist,
             realmDatabase: realmDatabase,
-            appMessagingEnabled: appMessagingEnabled
+            firebaseEnabled: firebaseEnabled
         )
 
         domainLayer = AppDomainLayerDependencies(dataLayer: dataLayer)

godtools/App/Features/Dashboard/Presentation/Dashboard/DashboardView.swift

@@ -100,14 +100,18 @@ import Combine
 
 struct DashboardView_Previews: PreviewProvider {
 
+    private static let diContainer: AppDiContainer = SwiftUIPreviewDiContainer().getAppDiContainer()
+    private static let flowDelegate: FlowDelegate = MockFlowDelegate()
+    private static let dashboardDependencies: DashboardPresentationLayerDependencies = DashboardPresentationLayerDependencies(appDiContainer: Self.diContainer, flowDelegate: Self.flowDelegate)
+
     static func getDashboardViewModel() -> DashboardViewModel {
 
-        let appDiContainer: AppDiContainer = SwiftUIPreviewDiContainer().getAppDiContainer()
+        let appDiContainer: AppDiContainer = Self.diContainer
 
         let viewModel = DashboardViewModel(
             startingTab: .favorites,
-            flowDelegate: MockFlowDelegate(),
-            dashboardPresentationLayerDependencies: DashboardPresentationLayerDependencies(appDiContainer: appDiContainer, flowDelegate: MockFlowDelegate()),
+            flowDelegate: Self.flowDelegate,
+            dashboardPresentationLayerDependencies: Self.dashboardDependencies,
             getCurrentAppLanguageUseCase: appDiContainer.feature.appLanguage.domainLayer.getCurrentAppLanguageUseCase(),
             viewDashboardUseCase: appDiContainer.feature.dashboard.domainLayer.getViewDashboardUseCase(), 
             dashboardTabObserver: CurrentValueSubject(.favorites)
@@ -118,6 +122,6 @@ struct DashboardView_Previews: PreviewProvider {
 
     static var previews: some View {
 
-        DashboardView(viewModel: DashboardView_Previews.getDashboardViewModel())
+        DashboardView(viewModel: Self.getDashboardViewModel())
     }
 }

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
         )

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:

godtools/App/Preview/DependencyContainer/SwiftUIPreviewDiContainer.swift

@@ -26,7 +26,7 @@ class SwiftUIPreviewDiContainer {
             appConfig: AppConfig(appBuild: appBuild),
             infoPlist: InfoPlist(),
             realmDatabase: SwiftUIPreviewDiContainer.previewDatabase,
-            appMessagingEnabled: false
+            firebaseEnabled: false
         )
     }
 }

godtools/App/Services/Analytics/AppsFlyer/AppsFlyerAnalytics.swift

@@ -48,9 +48,7 @@ class AppsFlyerAnalytics: NSObject {
     func trackAppLaunch() {
 
         serialQueue.async { [weak self] in
-
-            self?.assertFailureIfNotConfigured()
-
+
             self?.appsFlyer.appsFlyerLib.start()
 
             self?.log(method: "trackAppLaunch()", label: nil, labelValue: nil, data: nil)
@@ -60,20 +58,12 @@ class AppsFlyerAnalytics: NSObject {
     func trackAction(actionName: String, data: [String: Any]?) {
 
         serialQueue.async { [weak self] in
-
-            self?.assertFailureIfNotConfigured()
-
+
             self?.appsFlyer.appsFlyerLib.logEvent(actionName, withValues: data)
             self?.log(method: "trackEvent()", label: "eventName", labelValue: actionName, data: data)
         }
     }
 
-    private func assertFailureIfNotConfigured() {
-        if !isConfigured {
-            assertionFailure("AppsFlyer has not been configured.  Call configure() on application didFinishLaunching.")
-        }
-    }
-
     private func log(method: String, label: String?, labelValue: String?, data: [String: Any]?) {
 
         if loggingEnabled {

godtools/App/Services/Analytics/Firebase/FirebaseAnalytics.swift

@@ -45,7 +45,6 @@ class FirebaseAnalytics {
     }
 
     func setLoggedInStateUserProperties(isLoggedIn: Bool, loggedInUserProperties: FirebaseAnalyticsLoggedInUserProperties?) {
-        assertFailureIfNotConfigured()
 
         let userId: String? = loggedInUserProperties?.grMasterPersonId ?? loggedInUserProperties?.ssoguid
 
@@ -104,16 +103,8 @@ class FirebaseAnalytics {
         )
     }
 
-    private func assertFailureIfNotConfigured() {
-        if !isConfigured {
-            assertionFailure("FirebaseAnalytics has not been configured.  Call configure() on application didFinishLaunching.")
-        }
-    }
-
     private func internalTrackEvent(screenName: String?, siteSection: String?, siteSubSection: String?, appLanguage: String?, contentLanguage: String?, secondaryContentLanguage: String?, previousScreenName: String, eventName: String, data: [String: Any]?) {
-
-        assertFailureIfNotConfigured()
-
+
         DispatchQueue.global().async { [weak self] in
 
             guard let firebaseAnalytics = self else {
@@ -176,7 +167,6 @@ class FirebaseAnalytics {
     }
 
     private func createBaseProperties(screenName: String?, siteSection: String?, siteSubSection: String?, appLanguage: String?, contentLanguage: String?, secondaryContentLanguage: String?, previousScreenName: String?) -> [String: String] {
-        assertFailureIfNotConfigured()
 
         var properties: [String: String] = [:]
 

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:
 

godtools/App/Share/Application/LaunchEnvironment/LaunchEnvironmentKey.swift

@@ -14,6 +14,6 @@ enum LaunchEnvironmentKey: String {
         return rawValue
     }
 
-    case appMessagingIsEnabled
+    case firebaseEnabled
     case urlDeeplink
 }

godtools/App/Share/Application/LaunchEnvironment/LaunchEnvironmentReader.swift

@@ -21,9 +21,9 @@ class LaunchEnvironmentReader {
         return LaunchEnvironmentReader(launchEnvironment: ProcessInfo.processInfo.environment)
     }
 
-    func getAppMessagingIsEnabled() -> Bool? {
+    func getFirebaseEnabled() -> Bool? {
 
-        guard let stringBool = launchEnvironment[LaunchEnvironmentKey.appMessagingIsEnabled.value] else {
+        guard let stringBool = launchEnvironment[LaunchEnvironmentKey.firebaseEnabled.value] else {
             return nil
         }
 

godtools/App/Share/Application/LaunchEnvironment/LaunchEnvironmentWriter.swift

@@ -14,8 +14,8 @@ class LaunchEnvironmentWriter {
 
     }
 
-    func setAppMessagingIsEnabled(launchEnvironment: inout [String: String], enabled: Bool) {
-        launchEnvironment[LaunchEnvironmentKey.appMessagingIsEnabled.value] = String(enabled)
+    func setFirebaseEnabled(launchEnvironment: inout [String: String], enabled: Bool) {
+        launchEnvironment[LaunchEnvironmentKey.firebaseEnabled.value] = String(enabled)
     }
 
     func setUrlDeepLink(launchEnvironment: inout [String: String], url: String) {

godtools/App/Share/Data/AppsFlyer/AppsFlyer.swift

@@ -22,16 +22,9 @@ class AppsFlyer {
     }
 
     var appsFlyerLib: AppsFlyerLib {
-        assertFailureIfNotConfigured()
         return sharedAppsFlyerLib
     }
 
-    private func assertFailureIfNotConfigured() {
-        if !isConfigured {
-            assertionFailure("AppsFlyer has not been configured.  Be sure to call configure on application didFinishLaunching.")
-        }
-    }
-
     func configure(configuration: AppsFlyerConfiguration, deepLinkDelegate: DeepLinkDelegate) {
 
         guard !isConfigured else {

godtoolsTests/App/DependencyContainer/TestsDiContainer.swift

@@ -22,7 +22,7 @@ class TestsDiContainer: AppDiContainer {
             appConfig: appConfig,
             infoPlist: InfoPlist(),
             realmDatabase: realmDatabase,
-            appMessagingEnabled: false
+            firebaseEnabled: false
         )
     }
 }

godtoolsTests/App/Features/LessonEvaluation/Data-DomainInterface/GetSpiritualConversationReadinessScaleTests.swift

@@ -105,6 +105,9 @@ class GetSpiritualConversationReadinessScaleTests: QuickSpec {
                 }
             }
 
+            // NOTE: Disabling this test since failing in iOS 18.  For some reason NumberFormatter and String format based on Locale isn't working with iOS 18 and iOS 18.1. See GT-2473. ~Levi
+
+            /*
             context("When viewing the ready to share faith scale and my app language is arabic.") {
 
                 let getSpiritualConversationReadinessScale = GetSpiritualConversationReadinessScale(
@@ -146,7 +149,7 @@ class GetSpiritualConversationReadinessScaleTests: QuickSpec {
                     expect(readinessScaleRef?.maxScale.valueTranslatedInAppLanguage).to(equal("١٠"))
                     expect(readinessScaleRef?.scale.valueTranslatedInAppLanguage).to(equal("٥"))
                 }
-            }
+            }*/
 
             context("When providing a scale value that is lower than the minimum 1.") {