Visual design: Preparations for rollout (#6120)

Task/Issue URL:
https://app.asana.com/1/137249556945/project/1157893581871903/task/1210327410584404?focus=true

### Description
PR to allow for visual design rollout

### Steps to test this PR
Testing scenarios in
https://app.asana.com/1/137249556945/project/1157893581871903/task/1210341258091868?focus=true

---------

Co-authored-by: Łukasz Paczos <[email protected]>

Author: malmstein

app/src/internal/res/drawable/ic_fire_16.xml

@@ -1046,7 +1046,7 @@ class BrowserTabFragment :
         browserNavigationBarIntegration = BrowserNavigationBarViewIntegration(
             lifecycleScope = lifecycleScope,
             browserTabFragmentBinding = binding,
-            visualDesignExperimentDataStore = visualDesignExperimentDataStore,
+            isExperimentEnabled = visualDesignExperimentDataStore.isExperimentEnabled.value,
             omnibar = omnibar,
             browserNavigationBarObserver = observer,
         )

app/src/internal/res/drawable/ic_fire_24.xml

@@ -23,7 +23,6 @@ import com.duckduckgo.app.browser.navigation.bar.view.BrowserNavigationBarView
 import com.duckduckgo.app.browser.navigation.bar.view.BrowserNavigationBarView.ViewMode.Browser
 import com.duckduckgo.app.browser.navigation.bar.view.BrowserNavigationBarView.ViewMode.NewTab
 import com.duckduckgo.app.browser.omnibar.Omnibar
-import com.duckduckgo.common.ui.experiments.visual.store.VisualDesignExperimentDataStore
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.utils.keyboardVisibilityFlow
@@ -43,7 +42,7 @@ import kotlinx.coroutines.launch
 class BrowserNavigationBarViewIntegration(
     private val lifecycleScope: CoroutineScope,
     private val browserTabFragmentBinding: FragmentBrowserTabBinding,
-    private val visualDesignExperimentDataStore: VisualDesignExperimentDataStore,
+    isExperimentEnabled: Boolean,
     private val omnibar: Omnibar,
     browserNavigationBarObserver: BrowserNavigationBarObserver,
 ) {
@@ -53,19 +52,14 @@ class BrowserNavigationBarViewIntegration(
         browserTabFragmentBinding.rootView.removeView(browserTabFragmentBinding.navigationBar)
     } ?: browserTabFragmentBinding.navigationBar
 
-    private var stateObserverJob: Job? = null
     private var keyboardVisibilityObserverJob: Job? = null
     private var navigationBarVisibilityChangeJob: Job? = null
 
     init {
-        stateObserverJob = lifecycleScope.launch {
-            visualDesignExperimentDataStore.isExperimentEnabled.collect { isExperimentEnabled ->
-                if (isExperimentEnabled) {
-                    onEnabled()
-                } else {
-                    onDisabled()
-                }
-            }
+        if (isExperimentEnabled) {
+            onEnabled()
+        } else {
+            onDisabled()
         }
         navigationBarView.browserNavigationBarObserver = browserNavigationBarObserver
     }
@@ -87,11 +81,11 @@ class BrowserNavigationBarViewIntegration(
     }
 
     fun onDestroyView() {
-        stateObserverJob?.cancel()
         onDisabled()
     }
 
     private fun onEnabled() {
+        navigationBarView.show()
         // we're hiding the navigation bar when keyboard is shown,
         // to prevent it from being "pushed up" within the coordinator layout
         keyboardVisibilityObserverJob = lifecycleScope.launch {
@@ -110,6 +104,7 @@ class BrowserNavigationBarViewIntegration(
     }
 
     private fun onDisabled() {
+        navigationBarView.gone()
         keyboardVisibilityObserverJob?.cancel()
     }
 }

app/src/internal/res/drawable/ic_fire_color_24.xml

@@ -35,7 +35,6 @@ import com.duckduckgo.app.pixels.AppPixelName
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelParameter.FIRE_BUTTON_STATE
 import com.duckduckgo.app.tabs.model.TabRepository
-import com.duckduckgo.common.ui.experiments.visual.store.VisualDesignExperimentDataStore
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.ViewScope
 import javax.inject.Inject
@@ -53,7 +52,6 @@ import kotlinx.coroutines.flow.update
 @SuppressLint("NoLifecycleObserver")
 @ContributesViewModel(ViewScope::class)
 class BrowserNavigationBarViewModel @Inject constructor(
-    private val visualDesignExperimentDataStore: VisualDesignExperimentDataStore,
     private val tabRepository: TabRepository,
     private val pixel: Pixel,
     private val dispatcherProvider: DispatcherProvider,
@@ -67,10 +65,9 @@ class BrowserNavigationBarViewModel @Inject constructor(
         _viewState.asStateFlow(),
         isCustomTab,
         tabRepository.flowTabs,
-        visualDesignExperimentDataStore.isExperimentEnabled,
-    ) { state, isCustomTab, tabs, isExperimentEnabled ->
+    ) { state, isCustomTab, tabs ->
         state.copy(
-            isVisible = isExperimentEnabled && !isCustomTab,
+            isVisible = !isCustomTab,
             tabsCount = tabs.size,
             hasUnreadTabs = tabs.firstOrNull { !it.viewed } != null,
         )

app/src/internal/res/drawable/ic_fire_red_24.xml

@@ -22,6 +22,7 @@ import com.duckduckgo.app.browser.senseofprotection.SenseOfProtectionToggles.Coh
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.browser.api.UserBrowserProperties
+import com.duckduckgo.common.ui.experiments.visual.store.VisualDesignExperimentDataStore
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.feature.toggles.api.MetricsPixel
@@ -31,6 +32,7 @@ import dagger.SingleInstanceIn
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber
 
 private const val EXISTING_USER_DAY_COUNT_THRESHOLD = 28
 
@@ -57,28 +59,37 @@ class SenseOfProtectionExperimentImpl @Inject constructor(
     private val userBrowserProperties: UserBrowserProperties,
     private val senseOfProtectionToggles: SenseOfProtectionToggles,
     private val senseOfProtectionPixelsPlugin: SenseOfProtectionPixelsPlugin,
+    private val visualDesignExperimentDataStore: VisualDesignExperimentDataStore,
     private val pixel: Pixel,
 ) : SenseOfProtectionExperiment {
 
     init {
         // enrol users in the existing user experiment if they are not already enrolled in the new user experiment
         appCoroutineScope.launch(dispatcherProvider.io()) {
             if (userBrowserProperties.daysSinceInstalled() > EXISTING_USER_DAY_COUNT_THRESHOLD) {
-                if (!isEnrolledInNewUserExperiment()) {
+                if (canBeEnrolledInExistingUserExperiment()) {
                     enrollInExistingUserExperiment(cohortName = MODIFIED_CONTROL)
                 }
             }
         }
     }
 
+    private fun canBeEnrolledInExistingUserExperiment(): Boolean {
+        return !isEnrolledInNewUserExperiment() && !seesNewVisualDesign()
+    }
+
     override fun enrolUserInNewExperimentIfEligible(): Boolean {
-        return if (userBrowserProperties.daysSinceInstalled() <= EXISTING_USER_DAY_COUNT_THRESHOLD) {
+        return if (canBeEnrolledInNewUserExperiment()) {
             enrollInNewUserExperiment(cohortName = MODIFIED_CONTROL)
         } else {
             false
         }
     }
 
+    private fun canBeEnrolledInNewUserExperiment(): Boolean {
+        return (userBrowserProperties.daysSinceInstalled() <= EXISTING_USER_DAY_COUNT_THRESHOLD) && !seesNewVisualDesign()
+    }
+
     override fun isUserEnrolledInModifiedControlCohortAndExperimentEnabled(): Boolean =
         getNewUserExperimentCohortName() == MODIFIED_CONTROL.cohortName && isNewUserExperimentEnabled(MODIFIED_CONTROL) ||
             getExistingUserExperimentCohortName() == MODIFIED_CONTROL.cohortName && isExistingUserExperimentEnabled(MODIFIED_CONTROL)
@@ -192,4 +203,10 @@ class SenseOfProtectionExperimentImpl @Inject constructor(
     private fun MetricsPixel.fire() = getPixelDefinitions().forEach {
         pixel.fire(it.pixelName, it.params)
     }
+
+    private fun seesNewVisualDesign(): Boolean {
+        val seesNewVisualDesing = visualDesignExperimentDataStore.isExperimentEnabled.value
+        Timber.d("VisualDesign: seesNewVisualDesign $seesNewVisualDesing")
+        return seesNewVisualDesing
+    }
 }