diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index 10dea25c4f..5b3cde82df 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -487,7 +487,16 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session }, onNeedToRequestPermissions = { permissions -> requestPermissions(permissions, REQUEST_CODE_PROMPT_PERMISSIONS) - }), + }, + loginPickerView = loginSelectBar, + onManageLogins = { + browserAnimator.captureEngineViewAndDrawStatically { + val directions = + NavGraphDirections.actionGlobalSavedLoginsAuthFragment() + findNavController().navigate(directions) + } + } + ), owner = this, view = view ) diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml index 5ed490ea6f..09c23b747f 100644 --- a/app/src/main/res/layout/fragment_browser.xml +++ b/app/src/main/res/layout/fragment_browser.xml @@ -1,4 +1,5 @@ - - + android:layout_height="match_parent"> - + android:layout_height="0dp" + app:layout_constraintBottom_toTopOf="@+id/loginSelectBar" + app:layout_constraintTop_toTopOf="parent" + tools:context="browser.BrowserFragment"> - + + + + + + + - + - + - - - - - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/browserLayout" /> + #00B3F4 @color/search_suggestion_indicator_icon_color_dark_theme @color/search_suggestion_indicator_icon_bookmark_color_dark_theme + @color/accent_high_contrast_dark_theme @color/mozac_widget_favicon_background_dark_theme @color/mozac_widget_favicon_border_dark_theme diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 292f24ea5f..2edab8d151 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -93,4 +93,5 @@ + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5c9c19b046..8469a6d0b0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -250,7 +250,7 @@ @color/prompt_login_edit_text_cursor_color_light_theme @color/search_suggestion_indicator_icon_color_light_theme @color/search_suggestion_indicator_icon_bookmark_color_light_theme - + @color/accent_bright_light_theme @color/mozac_widget_favicon_background_light_theme @color/mozac_widget_favicon_border_light_theme diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 25302f51d3..cc7d78fb7b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,6 +27,7 @@ tools:ignore="UnusedResources">@color/destructive_normal_theme @color/destructive_normal_theme + @style/SelectLoginHeaderTextStyle @color/accent_high_contrast_normal_theme @@ -79,7 +80,7 @@ @color/synced_tabs_separator @color/search_suggestion_indicator_icon_color_normal_theme @color/search_suggestion_indicator_icon_bookmark_color_normal_theme - + @color/select_login_header_normal_theme @color/primary_text_normal_theme @color/caption_text_normal_theme @@ -126,6 +127,11 @@ @style/DialogButtonStyleLight + +