diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt index 6eef8ea8c..7febb562b 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt @@ -5,6 +5,8 @@ package org.mozilla.fenix.components.toolbar import android.content.Context +import android.view.LayoutInflater +import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleObserver @@ -16,6 +18,7 @@ import mozilla.components.browser.toolbar.BrowserToolbar import mozilla.components.concept.storage.HistoryStorage import mozilla.components.feature.toolbar.ToolbarAutocompleteFeature import mozilla.components.feature.toolbar.ToolbarFeature +import mozilla.components.support.ktx.android.content.res.pxToDp import org.mozilla.fenix.R import org.mozilla.fenix.ext.application import org.mozilla.fenix.ext.components @@ -30,6 +33,11 @@ class ToolbarIntegration( init { toolbar.setMenuBuilder(context.components.toolbar.menuBuilder) + toolbar.browserActionMargin = toolbar.resources.pxToDp(8) + toolbar.textColor = ContextCompat.getColor(context, R.color.searchText) + toolbar.urlBoxView = LayoutInflater.from(context).inflate(R.layout.layout_url_backround, null) + toolbar.urlBoxMargin = toolbar.resources.pxToDp(8) + val home = BrowserToolbar.Button( context.resources.getDrawable( R.drawable.ic_home, diff --git a/app/src/main/res/drawable/url_background.xml b/app/src/main/res/drawable/url_background.xml new file mode 100644 index 000000000..7f247626c --- /dev/null +++ b/app/src/main/res/drawable/url_background.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml index a88c68206..98d037eea 100644 --- a/app/src/main/res/layout/fragment_browser.xml +++ b/app/src/main/res/layout/fragment_browser.xml @@ -36,7 +36,7 @@ android:layout_width="match_parent" android:layout_height="56dp" android:layout_gravity="bottom" - android:background="@color/colorPrimary" + android:background="@color/offwhite" android:clickable="true" android:focusable="true" android:focusableInTouchMode="true" diff --git a/app/src/main/res/layout/layout_url_backround.xml b/app/src/main/res/layout/layout_url_backround.xml new file mode 100644 index 000000000..6ed4a35c4 --- /dev/null +++ b/app/src/main/res/layout/layout_url_backround.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5be2cb767..592ff2e1f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -13,7 +13,8 @@ #0A202340 #0C0C0D #f9f9fa - #0C0C0D + #E9E9ED + #20233E #1A665BFD #665BFD