Fix the split omnibar address bar end margin

Author: 0nko

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

@@ -1400,11 +1400,11 @@ open class BrowserActivity : DuckDuckGoActivity() {
         when (settingsDataStore.omnibarType) {
             OmnibarType.SINGLE_TOP, OmnibarType.SPLIT -> {
                 if (Build.VERSION.SDK_INT < 28) {
-                    binding.topMockupSingleToolbar.mockOmniBarContainerShadow.cardElevation = 2f.toPx(this)
+                    binding.topMockupToolbar.mockOmniBarContainerShadow.cardElevation = 2f.toPx(this)
                 }
 
-                binding.bottomMockupSingleToolbar.appBarLayoutMockup.gone()
-                omnibarToolbarMockupBinding = binding.topMockupSingleToolbar
+                binding.bottomMockupToolbar.appBarLayoutMockup.gone()
+                omnibarToolbarMockupBinding = binding.topMockupToolbar
 
                 if (!duckAiFeatureState.showOmnibarShortcutOnNtpAndOnFocus.value) {
                     omnibarToolbarMockupBinding.aiChatIconMockup.isVisible = false
@@ -1415,18 +1415,20 @@ open class BrowserActivity : DuckDuckGoActivity() {
                 }
 
                 if (settingsDataStore.omnibarType == OmnibarType.SPLIT) {
-                    binding.topMockupSingleToolbar.iconsContainer.gone()
+                    binding.topMockupToolbar.tabsMenu.gone()
+                    binding.topMockupToolbar.browserMenu.gone()
+                    binding.topMockupToolbar.fireIconMenu.gone()
                     binding.navigationBarMockup.root.show()
                 }
             }
 
             OmnibarType.SINGLE_BOTTOM -> {
                 if (Build.VERSION.SDK_INT < 28) {
-                    binding.bottomMockupSingleToolbar.mockOmniBarContainerShadow.cardElevation = 0.5f.toPx(this)
+                    binding.bottomMockupToolbar.mockOmniBarContainerShadow.cardElevation = 0.5f.toPx(this)
                 }
 
-                binding.topMockupSingleToolbar.appBarLayoutMockup.gone()
-                omnibarToolbarMockupBottomBinding = binding.bottomMockupSingleToolbar
+                binding.topMockupToolbar.appBarLayoutMockup.gone()
+                omnibarToolbarMockupBottomBinding = binding.bottomMockupToolbar
 
                 if (!duckAiFeatureState.showOmnibarShortcutOnNtpAndOnFocus.value) {
                     omnibarToolbarMockupBottomBinding.aiChatIconMockup.isVisible = false

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

@@ -588,7 +588,6 @@ class OmnibarLayout @JvmOverloads constructor(
         }
 
         omnibarCardShadow.isGone = viewState.viewMode is ViewMode.CustomTab && !isFindInPageVisible
-        iconsContainer.isVisible = viewState.showFireIcon || viewState.showTabsMenu || viewState.showBrowserMenu
 
         renderButtons(viewState)
 

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

@@ -23,7 +23,7 @@
     tools:context="com.duckduckgo.app.browser.BrowserActivity">
 
     <include
-        android:id="@+id/topMockupSingleToolbar"
+        android:id="@+id/topMockupToolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_alignParentTop="true"
@@ -54,7 +54,7 @@
         android:visibility="gone" />
 
     <include
-        android:id="@+id/bottomMockupSingleToolbar"
+        android:id="@+id/bottomMockupToolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_alignParentBottom="true"

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

@@ -23,7 +23,6 @@
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
     android:background="?daxColorToolbar"
-    android:paddingEnd="@dimen/keyline_1"
     android:clipChildren="false">
 
     <com.google.android.material.card.MaterialCardView
@@ -96,6 +95,7 @@
         android:layout_height="@dimen/toolbarIcon"
         android:layout_marginTop="@dimen/omnibarCardMarginTop"
         android:layout_marginBottom="@dimen/omnibarCardMarginBottom"
+        android:layout_marginEnd="@dimen/keyline_1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/mockOmniBarContainerShadow"
@@ -122,8 +122,8 @@
 
             <ImageView
                 android:id="@+id/browserMenuImageView"
-                android:layout_width="@dimen/bottomNavIcon"
-                android:layout_height="@dimen/bottomNavIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@string/browserPopupMenu"
                 android:scaleType="center"
@@ -161,6 +161,13 @@
                 android:src="@drawable/ic_fire_24" />
         </FrameLayout>
 
+        <Space
+            android:layout_width="@dimen/omnibarCardExtendedMarginEnd"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -36,7 +36,6 @@
             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
@@ -406,6 +405,7 @@
                 android:layout_height="@dimen/toolbarIcon"
                 android:layout_marginTop="@dimen/omnibarCardMarginTop"
                 android:layout_marginBottom="@dimen/omnibarCardMarginBottom"
+                android:layout_marginEnd="@dimen/keyline_1"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/toolbar"