Hide the icon container for split omnibar

Author: 0nko

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

@@ -589,13 +589,23 @@ class OmnibarLayout @JvmOverloads constructor(
 
         omnibarCardShadow.isGone = viewState.viewMode is ViewMode.CustomTab && !isFindInPageVisible
 
+        renderOmnibarButtonContainer(viewState.showButtons)
+
         renderButtons(viewState)
 
         omniBarButtonTransitionSet.doOnEnd {
             omnibarTextInput.requestLayout()
         }
     }
 
+    private fun renderOmnibarButtonContainer(showButtons: Boolean) {
+        if (showButtons) {
+            iconsContainer.show()
+        } else {
+            iconsContainer.gone()
+        }
+    }
+
     private fun renderPosition(isTopPosition: Boolean) {
         if (isTopPosition) {
             if (Build.VERSION.SDK_INT < 28) {

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

@@ -55,6 +55,7 @@ import com.duckduckgo.app.statistics.pixels.Pixel.PixelType.Unique
 import com.duckduckgo.app.tabs.model.TabRepository
 import com.duckduckgo.app.trackerdetection.model.Entity
 import com.duckduckgo.browser.api.UserBrowserProperties
+import com.duckduckgo.browser.ui.omnibar.OmnibarType
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.FragmentScope
 import com.duckduckgo.duckchat.api.DuckAiFeatureState
@@ -106,6 +107,7 @@ class OmnibarLayoutViewModel @Inject constructor(
     private val _viewState = MutableStateFlow(
         ViewState(
             showChatMenu = duckAiFeatureState.showOmnibarShortcutInAllStates.value,
+            showButtons = settingsDataStore.omnibarType != OmnibarType.SPLIT,
         ),
     )
 
@@ -175,6 +177,7 @@ class OmnibarLayoutViewModel @Inject constructor(
         val showShadows: Boolean = false,
         val showTextInputClickCatcher: Boolean = false,
         val showFindInPage: Boolean = false,
+        val showButtons: Boolean = true,
     ) {
         fun shouldUpdateOmnibarText(isFullUrlEnabled: Boolean): Boolean {
             return this.viewMode is Browser || this.viewMode is MaliciousSiteWarning || (!isFullUrlEnabled && omnibarText.isNotEmpty())

app/src/main/res/layout/view_omnibar.xml

@@ -36,6 +36,7 @@
             android:id="@+id/toolbarContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/keyline_1"
             android:background="?attr/daxColorToolbar">
 
             <androidx.appcompat.widget.Toolbar
@@ -404,7 +405,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/toolbarIcon"
                 android:layout_marginTop="@dimen/omnibarCardMarginTop"
-                android:layout_marginEnd="@dimen/keyline_1"
                 android:layout_marginBottom="@dimen/omnibarCardMarginBottom"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"