Use the feature flag to decide what omnibar layout to use

Author: 0nko

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -1017,7 +1017,11 @@ class BrowserTabFragment :
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        omnibar = Omnibar(settingsDataStore.omnibarPosition, binding)
+        omnibar = Omnibar(
+            omnibarPosition = settingsDataStore.omnibarPosition,
+            binding = binding,
+            isUnifiedOmnibarEnabled = androidBrowserConfigFeature.useUnifiedOmnibarLayout().isEnabled(),
+        )
 
         webViewContainer = binding.webViewContainer
         configureObservers()

app/src/main/java/com/duckduckgo/app/browser/omnibar/Omnibar.kt

@@ -71,8 +71,20 @@ import logcat.logcat
 class Omnibar(
     val omnibarPosition: OmnibarPosition,
     private val binding: FragmentBrowserTabBinding,
+    isUnifiedOmnibarEnabled: Boolean,
 ) {
     init {
+        if (isUnifiedOmnibarEnabled) {
+            setupUnifiedOmnibar()
+        } else {
+            setupSingleOmnibar()
+        }
+    }
+
+    private fun setupSingleOmnibar() {
+        binding.rootView.removeView(binding.unifiedOmnibarLayoutTop)
+        binding.rootView.removeView(binding.unifiedOmnibarLayoutBottom)
+
         when (omnibarPosition) {
             OmnibarPosition.TOP -> {
                 // remove bottom variant
@@ -86,8 +98,25 @@ class Omnibar(
                 adjustCoordinatorLayoutBehaviorForBottomOmnibar()
             }
         }
-        binding.rootView.removeView(binding.unifiedOmnibarLayoutTop)
-        binding.rootView.removeView(binding.unifiedOmnibarLayoutBottom)
+    }
+
+    private fun setupUnifiedOmnibar() {
+        binding.rootView.removeView(binding.singleOmnibarLayoutTop)
+        binding.rootView.removeView(binding.singleOmnibarLayoutBottom)
+
+        when (omnibarPosition) {
+            OmnibarPosition.TOP -> {
+                // remove bottom variant
+                binding.rootView.removeView(binding.unifiedOmnibarLayoutBottom)
+            }
+
+            OmnibarPosition.BOTTOM -> {
+                // remove top variant
+                binding.rootView.removeView(binding.unifiedOmnibarLayoutTop)
+
+                adjustCoordinatorLayoutBehaviorForBottomOmnibar()
+            }
+        }
     }
 
     val omnibarView: OmnibarView by lazy {

app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarLayout.kt

@@ -293,7 +293,7 @@ open class OmnibarLayout @JvmOverloads constructor(
         }
     }
 
-    open var omnibarPosition: OmnibarPosition = OmnibarPosition.TOP
+    override val omnibarPosition: OmnibarPosition = OmnibarPosition.TOP
 
     private val smoothProgressAnimator by lazy { SmoothProgressAnimator(pageLoadingIndicator) }
 

app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarView.kt

@@ -27,10 +27,12 @@ import com.duckduckgo.app.browser.omnibar.model.ItemPressedListener
 import com.duckduckgo.app.browser.omnibar.model.LogoClickListener
 import com.duckduckgo.app.browser.omnibar.model.StateChange
 import com.duckduckgo.app.browser.omnibar.model.TextListener
+import com.duckduckgo.browser.ui.omnibar.OmnibarPosition
 import com.duckduckgo.common.ui.view.KeyboardAwareEditText
 import kotlinx.coroutines.flow.Flow
 
 interface OmnibarView {
+    val omnibarPosition: OmnibarPosition
     var isScrollingEnabled: Boolean
     val isEditing: Boolean
     val isEditingFlow: Flow<Boolean>

app/src/main/java/com/duckduckgo/app/browser/omnibar/SingleOmnibarLayout.kt

@@ -89,6 +89,8 @@ class SingleOmnibarLayout @JvmOverloads constructor(
 
     private var singleOmnibarItemPressedListener: OmnibarItemPressedListener? = null
 
+    override val omnibarPosition: OmnibarPosition
+
     init {
         val attr = context.theme.obtainStyledAttributes(attrs, R.styleable.SingleOmnibarLayout, defStyle, 0)
         omnibarPosition = OmnibarPosition.entries[attr.getInt(R.styleable.SingleOmnibarLayout_omnibarPosition, 0)]

app/src/main/java/com/duckduckgo/app/browser/omnibar/UnifiedOmnibarLayout.kt

@@ -237,7 +237,7 @@ class UnifiedOmnibarLayout @JvmOverloads constructor(
 
     private var focusAnimator: ValueAnimator? = null
 
-    val omnibarPosition: OmnibarPosition
+    override val omnibarPosition: OmnibarPosition
 
     init {
         inflate(context, R.layout.view_omnibar, this)

app/src/main/java/com/duckduckgo/app/browser/webview/BrowserContainerLayoutBehavior.kt

@@ -24,6 +24,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior
 import androidx.core.view.isGone
 import com.duckduckgo.app.browser.navigation.bar.view.BrowserNavigationBarView
 import com.duckduckgo.app.browser.omnibar.OmnibarLayout
+import com.duckduckgo.app.browser.omnibar.OmnibarView
 import com.duckduckgo.browser.ui.omnibar.OmnibarPosition
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.AppBarLayout.ScrollingViewBehavior
@@ -118,4 +119,4 @@ private fun offsetByBottomElementVisibleHeight(
 
 private fun View.isBrowserNavigationBar(): Boolean = this is BrowserNavigationBarView
 
-private fun View.isBottomOmnibar(): Boolean = this is OmnibarLayout && this.omnibarPosition == OmnibarPosition.BOTTOM
+private fun View.isBottomOmnibar(): Boolean = this is OmnibarView && this.omnibarPosition == OmnibarPosition.BOTTOM