diff --git a/app/src/main/java/org/mozilla/fenix/ThemeManager.kt b/app/src/main/java/org/mozilla/fenix/ThemeManager.kt index 445b1c59f..cf82154b2 100644 --- a/app/src/main/java/org/mozilla/fenix/ThemeManager.kt +++ b/app/src/main/java/org/mozilla/fenix/ThemeManager.kt @@ -120,13 +120,13 @@ class DefaultThemeManager : ThemeManager { window.navigationBarColor = ContextCompat .getColor( context, DefaultThemeManager - .resolveAttribute(R.attr.navigationBarColorHome, context) + .resolveAttribute(R.attr.above, context) ) } else { window.navigationBarColor = ContextCompat .getColor( context, DefaultThemeManager - .resolveAttribute(R.attr.navigationBarColorBrowser, context) + .resolveAttribute(R.attr.foundation, context) ) } } diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index b30138ac6..7779f3dcb 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -126,7 +126,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope { setBackgroundColor( ContextCompat.getColor( view.context, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarBackground, context) + DefaultThemeManager.resolveAttribute(R.attr.foundation, context) ) ) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt index a1f94ff2c..592f1458c 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt @@ -59,15 +59,15 @@ class ToolbarComponent( private fun applyTheme() { getView().suggestionBackgroundColor = ContextCompat.getColor( container.context, - DefaultThemeManager.resolveAttribute(R.attr.suggestionBackground, container.context) + R.color.suggestion_highlight_color ) getView().textColor = ContextCompat.getColor( container.context, - DefaultThemeManager.resolveAttribute(R.attr.awesomeBarTitleTextColor, container.context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, container.context) ) getView().hintColor = ContextCompat.getColor( container.context, - DefaultThemeManager.resolveAttribute(R.attr.awesomeBarDescriptionTextColor, container.context) + DefaultThemeManager.resolveAttribute(R.attr.secondaryText, container.context) ) } } diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt index eee267e87..d813a6ae8 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt @@ -44,14 +44,14 @@ class ToolbarMenu( primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_back, primaryContentDescription = context.getString(R.string.browser_menu_back), primaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.browserToolbarMenuIcons, + R.attr.primaryText, context ), isInPrimaryState = { context.components.core.sessionManager.selectedSession?.canGoBack ?: true }, secondaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.disabledIconColor, + R.attr.secondaryText, context ), disableInSecondaryState = true @@ -63,14 +63,14 @@ class ToolbarMenu( primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_forward, primaryContentDescription = context.getString(R.string.browser_menu_forward), primaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.browserToolbarMenuIcons, + R.attr.primaryText, context ), isInPrimaryState = { context.components.core.sessionManager.selectedSession?.canGoForward ?: true }, secondaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.disabledIconColor, + R.attr.secondaryText, context ), disableInSecondaryState = true @@ -82,7 +82,7 @@ class ToolbarMenu( primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_refresh, primaryContentDescription = context.getString(R.string.browser_menu_refresh), primaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.browserToolbarMenuIcons, + R.attr.primaryText, context ), isInPrimaryState = { @@ -92,7 +92,7 @@ class ToolbarMenu( secondaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_stop, secondaryContentDescription = context.getString(R.string.browser_menu_stop), secondaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.browserToolbarMenuIcons, + R.attr.primaryText, context ), disableInSecondaryState = false @@ -112,7 +112,7 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_help), R.drawable.ic_help, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(Item.Help) }, @@ -120,7 +120,7 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_settings), R.drawable.ic_settings, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(Item.Settings) }, @@ -128,7 +128,7 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_library), R.drawable.ic_library, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(Item.Library) }, @@ -143,7 +143,7 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_find_in_page), R.drawable.mozac_ic_search, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(Item.FindInPage) }, @@ -151,7 +151,7 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_private_tab), R.drawable.ic_private_browsing, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(Item.NewPrivateTab) }, @@ -159,7 +159,7 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_new_tab), R.drawable.ic_new, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(Item.NewTab) }, @@ -167,7 +167,7 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_share), R.drawable.mozac_ic_share, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(Item.Share) }, @@ -175,7 +175,7 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_report_issue), R.drawable.ic_report_issues, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(Item.ReportIssue) }, diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt index 6d3d6a933..ecc276e6f 100644 --- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt @@ -40,14 +40,14 @@ class CustomTabsIntegration( primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_back, primaryContentDescription = context.getString(R.string.browser_menu_back), primaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.browserToolbarMenuIcons, + R.attr.primaryText, context ), isInPrimaryState = { context.components.core.sessionManager.selectedSession?.canGoBack ?: true }, secondaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.disabledIconColor, + R.attr.secondaryText, context ), disableInSecondaryState = true @@ -59,14 +59,14 @@ class CustomTabsIntegration( primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_forward, primaryContentDescription = context.getString(R.string.browser_menu_forward), primaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.browserToolbarMenuIcons, + R.attr.primaryText, context ), isInPrimaryState = { context.components.core.sessionManager.selectedSession?.canGoForward ?: true }, secondaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.disabledIconColor, + R.attr.secondaryText, context ), disableInSecondaryState = true @@ -78,7 +78,7 @@ class CustomTabsIntegration( primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_refresh, primaryContentDescription = context.getString(R.string.browser_menu_refresh), primaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.browserToolbarMenuIcons, + R.attr.primaryText, context ), isInPrimaryState = { @@ -88,7 +88,7 @@ class CustomTabsIntegration( secondaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_stop, secondaryContentDescription = context.getString(R.string.browser_menu_stop), secondaryImageTintResource = DefaultThemeManager.resolveAttribute( - R.attr.browserToolbarMenuIcons, + R.attr.primaryText, context ), disableInSecondaryState = false @@ -111,7 +111,7 @@ class CustomTabsIntegration( context.getString(R.string.browser_menu_powered_by, appName).toUpperCase() }(), ToolbarMenu.CAPTION_TEXT_SIZE, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ), BrowserMenuDivider(), SimpleBrowserMenuItem( @@ -120,7 +120,7 @@ class CustomTabsIntegration( context.getString(R.string.browser_menu_open_in_fenix, appName) }(), textColorResource = DefaultThemeManager.resolveAttribute( - R.attr.browserToolbarMenuIcons, + R.attr.primaryText, context ) ) { @@ -129,7 +129,7 @@ class CustomTabsIntegration( BrowserMenuImageText( context.getString(R.string.browser_menu_find_in_page), R.drawable.mozac_ic_search, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(ToolbarMenu.Item.FindInPage) }, @@ -140,7 +140,7 @@ class CustomTabsIntegration( BrowserMenuImageText( context.getString(R.string.browser_menu_share), R.drawable.mozac_ic_share, - DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(ToolbarMenu.Item.Share) }, diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index b351b69a3..15dd7ad03 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -144,7 +144,6 @@ class HomeFragment : Fragment(), CoroutineScope { val isPrivate = (activity as HomeActivity).browsingModeManager.isPrivate - view.toolbar_wrapper.isPrivateModeEnabled = isPrivate privateBrowsingButton.contentDescription = contentDescriptionForPrivateBrowsingButton(isPrivate) privateBrowsingButton.setOnClickListener { diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt index af9d34cfb..1a24ad985 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -28,7 +28,7 @@ class HomeMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_settings), R.drawable.ic_settings, - DefaultThemeManager.resolveAttribute(R.attr.iconColor, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(HomeMenu.Item.Settings) }, @@ -36,7 +36,7 @@ class HomeMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_library), R.drawable.ic_library, - DefaultThemeManager.resolveAttribute(R.attr.iconColor, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(HomeMenu.Item.Library) }, @@ -45,7 +45,7 @@ class HomeMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_help), R.drawable.ic_help, - DefaultThemeManager.resolveAttribute(R.attr.iconColor, context) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(HomeMenu.Item.Help) }) diff --git a/app/src/main/java/org/mozilla/fenix/home/SearchView.kt b/app/src/main/java/org/mozilla/fenix/home/SearchView.kt index 15b1a9304..41fdb3274 100644 --- a/app/src/main/java/org/mozilla/fenix/home/SearchView.kt +++ b/app/src/main/java/org/mozilla/fenix/home/SearchView.kt @@ -11,65 +11,34 @@ import android.widget.FrameLayout import org.mozilla.fenix.R class SearchView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) { - - var isPrivateModeEnabled = false - private val lightDrawable = resources.getDrawable(R.drawable.home_search_background_normal, context.theme) - private val privateLightDrawable = - resources.getDrawable(R.drawable.home_search_background_private, context.theme) private val darkDrawable = resources.getDrawable(R.drawable.home_search_background_dark, context.theme) - private val privateDarkDrawable = - resources.getDrawable(R.drawable.home_search_background_private_dark, context.theme) private val darkNoBorderDrawable = resources.getDrawable(R.drawable.home_search_background_dark_no_border, context.theme) - private val privateDarkNoBorderDrawable = - resources.getDrawable(R.drawable.home_search_background_private_dark_no_border, context.theme) private val lightToDark = TransitionDrawable(arrayOf(lightDrawable, darkDrawable)) private val darkToNoBorder = TransitionDrawable(arrayOf(darkDrawable, darkNoBorderDrawable)) - private val privateLightToDark = TransitionDrawable(arrayOf(privateLightDrawable, privateDarkDrawable)) - private val privateDarkToNoBorder = TransitionDrawable(arrayOf(privateDarkDrawable, privateDarkNoBorderDrawable)) fun transitionToLight() { - if (isPrivateModeEnabled) { - background = privateLightToDark - privateLightToDark.reverseTransition(transitionDurationMs) - } else { - background = lightToDark - lightToDark.reverseTransition(transitionDurationMs) - } + background = lightToDark + lightToDark.reverseTransition(transitionDurationMs) } fun transitionToDark() { - if (isPrivateModeEnabled) { - background = privateLightToDark - privateLightToDark.startTransition(transitionDurationMs) - } else { - background = lightToDark - lightToDark.startTransition(transitionDurationMs) - } + background = lightToDark + lightToDark.startTransition(transitionDurationMs) } fun transitionToDarkFromNoBorder() { - if (isPrivateModeEnabled) { - background = privateDarkToNoBorder - privateDarkToNoBorder.reverseTransition(transitionDurationMs) - } else { - background = darkToNoBorder - darkToNoBorder.reverseTransition(transitionDurationMs) - } + background = darkToNoBorder + darkToNoBorder.reverseTransition(transitionDurationMs) } fun transitionToDarkNoBorder() { - if (isPrivateModeEnabled) { - background = privateDarkToNoBorder - privateDarkToNoBorder.startTransition(transitionDurationMs) - } else { - background = darkToNoBorder - darkToNoBorder.startTransition(transitionDurationMs) - } + background = darkToNoBorder + darkToNoBorder.startTransition(transitionDurationMs) } companion object { diff --git a/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt b/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt index 1e2612120..947f162b5 100644 --- a/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt @@ -49,7 +49,7 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer drawable?.setColorFilter( ContextCompat.getColor( context!!, - DefaultThemeManager.resolveAttribute(R.attr.iconColor, context!!) + DefaultThemeManager.resolveAttribute(R.attr.accent, context!!) ), PorterDuff.Mode.SRC_IN ) setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) @@ -69,7 +69,7 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer drawable?.setColorFilter( ContextCompat.getColor( context!!, - DefaultThemeManager.resolveAttribute(R.attr.deleteColor, context!!) + R.color.delete_color ), PorterDuff.Mode.SRC_IN ) setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) @@ -80,7 +80,7 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer drawable?.setColorFilter( ContextCompat.getColor( context!!, - DefaultThemeManager.resolveAttribute(R.attr.iconColor, context!!) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context!!) ), PorterDuff.Mode.SRC_IN ) setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt index 09ba541c6..50492c518 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt @@ -12,7 +12,6 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView import io.reactivex.Observer -import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.R import org.mozilla.fenix.home.sessioncontrol.viewholders.SessionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TabViewHolder @@ -130,7 +129,7 @@ class SwipeToDeleteCallback( val textPaint = Paint() textPaint.color = ContextCompat.getColor( context, - DefaultThemeManager.resolveAttribute(R.attr.deleteColor, context) + R.color.delete_color ) textPaint.textSize = TEXT_SIZE val textX = iconLeft - TEXT_MARGIN_X diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 87933d74c..66a0de72e 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -109,14 +109,14 @@ class BookmarkFragment : Fragment(), CoroutineScope, BackHandler, AccountObserve null ) ) getString(R.string.library_bookmarks) else currentRoot!!.title - toolbar.setBackgroundColor(R.attr.toolbarColor.getColorFromAttr(context!!)) - toolbar.setTitleTextColor(R.attr.toolbarTextColor.getColorFromAttr(context!!)) + toolbar.setBackgroundColor(R.attr.foundation.getColorFromAttr(context!!)) + toolbar.setTitleTextColor(R.attr.primaryText.getColorFromAttr(context!!)) } is BookmarkState.Mode.Selecting -> { inflater.inflate(R.menu.bookmarks_select_multi, menu) activity?.title = getString(R.string.bookmarks_multi_select_title, mode.selectedItems.size) val colorFilter = - PorterDuffColorFilter(ContextCompat.getColor(context!!, R.color.off_white), PorterDuff.Mode.SRC_IN) + PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN) themeToolbar(toolbar, colorFilter) } } @@ -127,7 +127,7 @@ class BookmarkFragment : Fragment(), CoroutineScope, BackHandler, AccountObserve colorFilter: PorterDuffColorFilter ) { toolbar.setBackgroundColor(ContextCompat.getColor(context!!, R.color.bookmark_multi_select_actionbar)) - toolbar.setTitleTextColor(ContextCompat.getColor(context!!, R.color.off_white)) + toolbar.setTitleTextColor(R.attr.primaryText.getColorFromAttr(context!!)) toolbar.overflowIcon?.colorFilter = colorFilter (0 until toolbar.childCount).forEach { when (val item = toolbar.getChildAt(it)) { diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt index e584ae18d..3d294a785 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt @@ -9,7 +9,6 @@ import mozilla.components.browser.menu.BrowserMenuBuilder import mozilla.components.browser.menu.item.SimpleBrowserMenuItem import mozilla.components.concept.storage.BookmarkNode import mozilla.components.concept.storage.BookmarkNodeType -import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.R class BookmarkItemMenu( @@ -64,10 +63,7 @@ class BookmarkItemMenu( } else null, SimpleBrowserMenuItem( context.getString(R.string.bookmark_menu_delete_button), - textColorResource = DefaultThemeManager.resolveAttribute( - R.attr.deleteColor, - context - ) + textColorResource = R.color.delete_color ) { onItemTapped.invoke(BookmarkItemMenu.Item.Delete) } diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt index 8b26d6519..5eda176ad 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt @@ -85,7 +85,7 @@ class AddBookmarkFolderFragment : Fragment(), CoroutineScope { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.bookmarks_add_folder, menu) menu.findItem(R.id.confirm_add_folder_button).icon.colorFilter = - PorterDuffColorFilter(R.attr.iconColor.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN) + PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt index d9cdcbb64..eb926a5a4 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt @@ -144,7 +144,7 @@ class EditBookmarkFragment : Fragment(), CoroutineScope { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.bookmarks_edit, menu) menu.findItem(R.id.delete_bookmark_button).icon.colorFilter = - PorterDuffColorFilter(R.attr.iconColor.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN) + PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt index 96077e1e0..167cc3c18 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt @@ -124,7 +124,7 @@ class SelectBookmarkFolderFragment : Fragment(), CoroutineScope, AccountObserver if (!visitedAddBookmark) { inflater.inflate(R.menu.bookmarks_select_folder, menu) menu.findItem(R.id.add_folder_button).icon.colorFilter = - PorterDuffColorFilter(R.attr.iconColor.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN) + PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt index c3076b206..1c102f299 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt @@ -7,7 +7,6 @@ package org.mozilla.fenix.library.history import android.content.Context import mozilla.components.browser.menu.BrowserMenuBuilder import mozilla.components.browser.menu.item.SimpleBrowserMenuItem -import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.R class HistoryItemMenu( @@ -24,7 +23,7 @@ class HistoryItemMenu( listOf( SimpleBrowserMenuItem( context.getString(R.string.history_delete_item), - textColorResource = DefaultThemeManager.resolveAttribute(R.attr.deleteColor, context) + textColorResource = R.color.delete_color ) { onItemTapped.invoke(Item.Delete) } diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt index d92d5baad..f9c013f13 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt @@ -93,7 +93,7 @@ class AwesomeBarUIView( draw?.setColorFilter( ContextCompat.getColor( this, - DefaultThemeManager.resolveAttribute(R.attr.searchShortcutsTextColor, this) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, this) ), PorterDuff.Mode.SRC_IN ) clipboardSuggestionProvider = ClipboardSuggestionProvider( @@ -122,7 +122,7 @@ class AwesomeBarUIView( draw?.setColorFilter( ContextCompat.getColor( this, - DefaultThemeManager.resolveAttribute(R.attr.searchShortcutsTextColor, this) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, this) ), PorterDuff.Mode.SRC_IN ) defaultSearchSuggestionProvider = @@ -175,7 +175,7 @@ class AwesomeBarUIView( draw?.setColorFilter( ContextCompat.getColor( this, - DefaultThemeManager.resolveAttribute(R.attr.searchShortcutsTextColor, this) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, this) ), PorterDuff.Mode.SRC_IN ) diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutEngineManager.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutEngineManager.kt index 30c4e2f23..802fada43 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutEngineManager.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutEngineManager.kt @@ -70,7 +70,7 @@ class ShortcutEngineManager( awesomeBarUIView.search_shortcuts_button.compoundDrawables[0]?.setTint( ContextCompat.getColor( this, - DefaultThemeManager.resolveAttribute(R.attr.pillWrapperBackground, this) + DefaultThemeManager.resolveAttribute(R.attr.foundation, this) ) ) @@ -85,7 +85,7 @@ class ShortcutEngineManager( awesomeBarUIView.search_shortcuts_button.compoundDrawables[0]?.setTint( ContextCompat.getColor( this, - DefaultThemeManager.resolveAttribute(R.attr.searchShortcutsTextColor, this) + DefaultThemeManager.resolveAttribute(R.attr.primaryText, this) ) ) diff --git a/app/src/main/res/color/toggle_text_color.xml b/app/src/main/res/color/toggle_text_color.xml index 80d6ef0e1..26386a9fc 100644 --- a/app/src/main/res/color/toggle_text_color.xml +++ b/app/src/main/res/color/toggle_text_color.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + - + diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml index 79c99d183..41c37d094 100644 --- a/app/src/main/res/drawable/button_background.xml +++ b/app/src/main/res/drawable/button_background.xml @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/fenix_snackbar_background.xml b/app/src/main/res/drawable/fenix_snackbar_background.xml index 2d7232d11..f2f3be41a 100644 --- a/app/src/main/res/drawable/fenix_snackbar_background.xml +++ b/app/src/main/res/drawable/fenix_snackbar_background.xml @@ -4,6 +4,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + diff --git a/app/src/main/res/drawable/home_background_gradient.xml b/app/src/main/res/drawable/home_background_gradient.xml index 41c81cc04..dad61a89c 100644 --- a/app/src/main/res/drawable/home_background_gradient.xml +++ b/app/src/main/res/drawable/home_background_gradient.xml @@ -7,8 +7,8 @@ diff --git a/app/src/main/res/drawable/home_header_shadow.xml b/app/src/main/res/drawable/home_header_shadow.xml index e3bf7a297..5a04a5fc4 100644 --- a/app/src/main/res/drawable/home_header_shadow.xml +++ b/app/src/main/res/drawable/home_header_shadow.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/drawable/home_search_background_dark.xml b/app/src/main/res/drawable/home_search_background_dark.xml index a8f228004..04e69e667 100644 --- a/app/src/main/res/drawable/home_search_background_dark.xml +++ b/app/src/main/res/drawable/home_search_background_dark.xml @@ -3,10 +3,10 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + + android:color="?aboveDarkened"/> - + - + + android:color="?above"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/home_search_background_private.xml b/app/src/main/res/drawable/home_search_background_private.xml deleted file mode 100644 index 40724c932..000000000 --- a/app/src/main/res/drawable/home_search_background_private.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/home_search_background_private_dark.xml b/app/src/main/res/drawable/home_search_background_private_dark.xml deleted file mode 100644 index ad45433e8..000000000 --- a/app/src/main/res/drawable/home_search_background_private_dark.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/home_search_background_private_dark_no_border.xml b/app/src/main/res/drawable/home_search_background_private_dark_no_border.xml deleted file mode 100644 index c71a3985b..000000000 --- a/app/src/main/res/drawable/home_search_background_private_dark_no_border.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_accessibility.xml b/app/src/main/res/drawable/ic_accessibility.xml index b139ab8f9..b8598ae0d 100644 --- a/app/src/main/res/drawable/ic_accessibility.xml +++ b/app/src/main/res/drawable/ic_accessibility.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?primaryText" /> diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml index 8d08925b2..670a3fec2 100644 --- a/app/src/main/res/drawable/ic_archive.xml +++ b/app/src/main/res/drawable/ic_archive.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_bookmark_filled.xml b/app/src/main/res/drawable/ic_bookmark_filled.xml index e387472a1..090a843c0 100644 --- a/app/src/main/res/drawable/ic_bookmark_filled.xml +++ b/app/src/main/res/drawable/ic_bookmark_filled.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_bookmark_outline.xml b/app/src/main/res/drawable/ic_bookmark_outline.xml index 26fe438cd..da59f26a6 100644 --- a/app/src/main/res/drawable/ic_bookmark_outline.xml +++ b/app/src/main/res/drawable/ic_bookmark_outline.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index e4400e1d4..7a62f37de 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -8,6 +8,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml index b199f8841..e565b9d57 100644 --- a/app/src/main/res/drawable/ic_close.xml +++ b/app/src/main/res/drawable/ic_close.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_customize.xml b/app/src/main/res/drawable/ic_customize.xml index 78d3ae49b..dc4b5deb5 100644 --- a/app/src/main/res/drawable/ic_customize.xml +++ b/app/src/main/res/drawable/ic_customize.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_data_collection.xml b/app/src/main/res/drawable/ic_data_collection.xml index e8797eab7..ee5ba829c 100644 --- a/app/src/main/res/drawable/ic_data_collection.xml +++ b/app/src/main/res/drawable/ic_data_collection.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index 3b9fd43b2..b0d083183 100644 --- a/app/src/main/res/drawable/ic_delete.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -7,8 +7,9 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml index 3c0e8f981..4a8c5fa4d 100644 --- a/app/src/main/res/drawable/ic_download.xml +++ b/app/src/main/res/drawable/ic_download.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_drawer_pull_tab.xml b/app/src/main/res/drawable/ic_drawer_pull_tab.xml index 04a234c92..b3a54e018 100644 --- a/app/src/main/res/drawable/ic_drawer_pull_tab.xml +++ b/app/src/main/res/drawable/ic_drawer_pull_tab.xml @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_energy.xml b/app/src/main/res/drawable/ic_energy.xml index 3069ecfc8..50d893a12 100644 --- a/app/src/main/res/drawable/ic_energy.xml +++ b/app/src/main/res/drawable/ic_energy.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?primaryText"/> diff --git a/app/src/main/res/drawable/ic_formfill.xml b/app/src/main/res/drawable/ic_formfill.xml index 1d685a7f8..7d4871475 100644 --- a/app/src/main/res/drawable/ic_formfill.xml +++ b/app/src/main/res/drawable/ic_formfill.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index f64a0c6c3..3f402070f 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml index ab1130b9f..0a0d3a01f 100644 --- a/app/src/main/res/drawable/ic_history.xml +++ b/app/src/main/res/drawable/ic_history.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index a2088c915..3db8a10e9 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?primaryText"/> diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml index 815d71e07..bf35d243f 100644 --- a/app/src/main/res/drawable/ic_info.xml +++ b/app/src/main/res/drawable/ic_info.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_internet.xml b/app/src/main/res/drawable/ic_internet.xml index 1a3158d13..c757ddff1 100644 --- a/app/src/main/res/drawable/ic_internet.xml +++ b/app/src/main/res/drawable/ic_internet.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml index f39c04644..7696b268a 100644 --- a/app/src/main/res/drawable/ic_language.xml +++ b/app/src/main/res/drawable/ic_language.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 7d06d03da..b902b355e 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -8,7 +8,7 @@ - + diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml index e1710dc6c..a83b781a2 100644 --- a/app/src/main/res/drawable/ic_library.xml +++ b/app/src/main/res/drawable/ic_library.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml index c8d85d3bc..728c219a6 100644 --- a/app/src/main/res/drawable/ic_link.xml +++ b/app/src/main/res/drawable/ic_link.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml index 1660006f6..a6cc455c9 100644 --- a/app/src/main/res/drawable/ic_location.xml +++ b/app/src/main/res/drawable/ic_location.xml @@ -8,6 +8,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml index 16baaecfd..f3825f326 100644 --- a/app/src/main/res/drawable/ic_login.xml +++ b/app/src/main/res/drawable/ic_login.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_microphone.xml b/app/src/main/res/drawable/ic_microphone.xml index 916f8a7fd..0b5550d90 100644 --- a/app/src/main/res/drawable/ic_microphone.xml +++ b/app/src/main/res/drawable/ic_microphone.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?primaryText"/> diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml index cf83dd755..5fc8b4b51 100644 --- a/app/src/main/res/drawable/ic_notification.xml +++ b/app/src/main/res/drawable/ic_notification.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_permission.xml b/app/src/main/res/drawable/ic_permission.xml index aa958b938..89052137d 100644 --- a/app/src/main/res/drawable/ic_permission.xml +++ b/app/src/main/res/drawable/ic_permission.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?primaryText" /> diff --git a/app/src/main/res/drawable/ic_private_browsing.xml b/app/src/main/res/drawable/ic_private_browsing.xml index 223ade8f7..d2e14d3fb 100644 --- a/app/src/main/res/drawable/ic_private_browsing.xml +++ b/app/src/main/res/drawable/ic_private_browsing.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?primaryText" /> diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml index 4e64c4a74..72d994788 100644 --- a/app/src/main/res/drawable/ic_qr.xml +++ b/app/src/main/res/drawable/ic_qr.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_report_issues.xml b/app/src/main/res/drawable/ic_report_issues.xml index 3fa4c681f..e9f19b531 100644 --- a/app/src/main/res/drawable/ic_report_issues.xml +++ b/app/src/main/res/drawable/ic_report_issues.xml @@ -7,6 +7,6 @@ android:viewportWidth="16" android:viewportHeight="16"> diff --git a/app/src/main/res/drawable/ic_screenshots.xml b/app/src/main/res/drawable/ic_screenshots.xml index 518c05fe9..dc677820b 100644 --- a/app/src/main/res/drawable/ic_screenshots.xml +++ b/app/src/main/res/drawable/ic_screenshots.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index a0c6fb9a0..d4c5354b9 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index 57f111417..127da1087 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml index e7b40940e..7bb6d01ea 100644 --- a/app/src/main/res/drawable/ic_share.xml +++ b/app/src/main/res/drawable/ic_share.xml @@ -10,7 +10,7 @@ diff --git a/app/src/main/res/drawable/ic_shortcuts.xml b/app/src/main/res/drawable/ic_shortcuts.xml index 2c213532a..39fd41ba4 100644 --- a/app/src/main/res/drawable/ic_shortcuts.xml +++ b/app/src/main/res/drawable/ic_shortcuts.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_tabs.xml b/app/src/main/res/drawable/ic_tabs.xml index 676d003d7..3f10e80b6 100644 --- a/app/src/main/res/drawable/ic_tabs.xml +++ b/app/src/main/res/drawable/ic_tabs.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_tracking_protection.xml b/app/src/main/res/drawable/ic_tracking_protection.xml index 7600a698b..4d1f7a14b 100644 --- a/app/src/main/res/drawable/ic_tracking_protection.xml +++ b/app/src/main/res/drawable/ic_tracking_protection.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/mozac_ui_tabcounter_box.xml b/app/src/main/res/drawable/mozac_ui_tabcounter_box.xml index 5ee8437a7..efb343f09 100644 --- a/app/src/main/res/drawable/mozac_ui_tabcounter_box.xml +++ b/app/src/main/res/drawable/mozac_ui_tabcounter_box.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/private_browsing_button_background.xml b/app/src/main/res/drawable/private_browsing_button_background.xml index 4c9e9e997..86e02f14a 100644 --- a/app/src/main/res/drawable/private_browsing_button_background.xml +++ b/app/src/main/res/drawable/private_browsing_button_background.xml @@ -6,13 +6,13 @@ android:color="?android:attr/colorControlHighlight"> - + - + diff --git a/app/src/main/res/drawable/progress_gradient.xml b/app/src/main/res/drawable/progress_gradient.xml index 5ad75fd03..131da98fd 100644 --- a/app/src/main/res/drawable/progress_gradient.xml +++ b/app/src/main/res/drawable/progress_gradient.xml @@ -5,7 +5,7 @@ - + diff --git a/app/src/main/res/drawable/search_pill_background.xml b/app/src/main/res/drawable/search_pill_background.xml index eb8f2660a..9814ce26f 100644 --- a/app/src/main/res/drawable/search_pill_background.xml +++ b/app/src/main/res/drawable/search_pill_background.xml @@ -3,10 +3,10 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + + android:color="?accent"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/search_pill_background_unselected.xml b/app/src/main/res/drawable/search_pill_background_unselected.xml index 97c715896..671b932d8 100644 --- a/app/src/main/res/drawable/search_pill_background_unselected.xml +++ b/app/src/main/res/drawable/search_pill_background_unselected.xml @@ -3,10 +3,10 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + + android:color="?neutral"/> diff --git a/app/src/main/res/drawable/session_border.xml b/app/src/main/res/drawable/session_border.xml index b6c595fd1..d79cf962d 100644 --- a/app/src/main/res/drawable/session_border.xml +++ b/app/src/main/res/drawable/session_border.xml @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/session_list_empty_bg.xml b/app/src/main/res/drawable/session_list_empty_bg.xml index aeceb2044..a81773c4e 100644 --- a/app/src/main/res/drawable/session_list_empty_bg.xml +++ b/app/src/main/res/drawable/session_list_empty_bg.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + - + diff --git a/app/src/main/res/drawable/url_background.xml b/app/src/main/res/drawable/url_background.xml index 7f247626c..3058f12e5 100644 --- a/app/src/main/res/drawable/url_background.xml +++ b/app/src/main/res/drawable/url_background.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + + android:textColor="@color/foundation_light_theme"/> diff --git a/app/src/main/res/layout/bookmark_row.xml b/app/src/main/res/layout/bookmark_row.xml index 9236fbd43..5e2ac3e24 100644 --- a/app/src/main/res/layout/bookmark_row.xml +++ b/app/src/main/res/layout/bookmark_row.xml @@ -28,7 +28,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" - android:foregroundTint="?attr/iconColor" + android:foregroundTint="?primaryText" tools:src="@drawable/ic_folder_icon" /> @@ -71,7 +71,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/bookmark_overflow" - android:background="?attr/bookmarksEditTextColor" + android:background="?neutral" android:visibility="gone"/> diff --git a/app/src/main/res/layout/component_awesomebar.xml b/app/src/main/res/layout/component_awesomebar.xml index 500e56c0c..fe31f4d76 100644 --- a/app/src/main/res/layout/component_awesomebar.xml +++ b/app/src/main/res/layout/component_awesomebar.xml @@ -13,5 +13,5 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper" - mozac:awesomeBarDescriptionTextColor="?attr/awesomeBarDescriptionTextColor" - mozac:awesomeBarTitleTextColor="?attr/awesomeBarTitleTextColor" /> + mozac:awesomeBarDescriptionTextColor="?secondaryText" + mozac:awesomeBarTitleTextColor="?primaryText" /> diff --git a/app/src/main/res/layout/component_bookmark.xml b/app/src/main/res/layout/component_bookmark.xml index 7ba867592..218624e7b 100644 --- a/app/src/main/res/layout/component_bookmark.xml +++ b/app/src/main/res/layout/component_bookmark.xml @@ -23,6 +23,6 @@ android:layout_gravity="center" android:text="@string/bookmarks_empty_message" android:visibility="gone" - android:textColor="?attr/bookmarksLabelColor"/> + android:textColor="?primaryText"/> diff --git a/app/src/main/res/layout/component_search.xml b/app/src/main/res/layout/component_search.xml index fcbf8f7f0..d9db4f6f6 100644 --- a/app/src/main/res/layout/component_search.xml +++ b/app/src/main/res/layout/component_search.xml @@ -10,8 +10,8 @@ android:clickable="true" android:focusable="true" android:focusableInTouchMode="true" - app:browserToolbarClearColor="?attr/browserToolbarIcons" - app:browserToolbarInsecureColor="?attr/browserToolbarIcons" - app:browserToolbarMenuColor="?attr/browserToolbarIcons" + app:browserToolbarClearColor="?primaryText" + app:browserToolbarInsecureColor="?primaryText" + app:browserToolbarMenuColor="?primaryText" app:browserToolbarProgressBarGravity="top" - app:browserToolbarSecureColor="?attr/browserToolbarIcons" /> + app:browserToolbarSecureColor="?primaryText" /> diff --git a/app/src/main/res/layout/delete_history_button.xml b/app/src/main/res/layout/delete_history_button.xml index 9ea0ec8aa..c8d0fb385 100644 --- a/app/src/main/res/layout/delete_history_button.xml +++ b/app/src/main/res/layout/delete_history_button.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/history_delete_all" - android:textColor="?attr/deleteColor" + android:textColor="@color/delete_color" android:drawablePadding="8dp" android:textSize="16sp" android:gravity="center" diff --git a/app/src/main/res/layout/delete_tabs_button.xml b/app/src/main/res/layout/delete_tabs_button.xml index 21c2d250b..b3fa2a86b 100644 --- a/app/src/main/res/layout/delete_tabs_button.xml +++ b/app/src/main/res/layout/delete_tabs_button.xml @@ -10,7 +10,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:background="@drawable/button_background" - android:backgroundTint="@color/delete_session_button_background" + android:backgroundTint="?neutral" android:clickable="true" android:focusable="true" android:foreground="?android:attr/selectableItemBackground" @@ -28,6 +28,6 @@ android:textStyle="bold" android:gravity="center" android:text="@string/session_delete" - android:textColor="@color/color_primary_dark" + android:textColor="@color/primary_text_light_theme" android:textSize="16sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 2ddb4d38c..35cd92c46 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -12,7 +12,7 @@ @@ -36,7 +36,7 @@ android:layout_marginTop="8dp" android:text="@string/bookmark_folder_label" android:textAllCaps="true" - android:textColor="?attr/bookmarksLabelColor" + android:textColor="?primaryText" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml index 937410dce..8466b7732 100644 --- a/app/src/main/res/layout/fragment_browser.xml +++ b/app/src/main/res/layout/fragment_browser.xml @@ -21,7 +21,7 @@ android:id="@+id/nestedScrollQuickAction" android:layout_width="match_parent" android:layout_height="80dp" - android:background="?attr/quickActionBackgroundColor" + android:background="?foundation" android:clipToPadding="true" app:behavior_hideable="true" app:behavior_peekHeight="15dp" @@ -32,9 +32,9 @@ android:layout_width="match_parent" android:layout_height="56dp" android:layout_gravity="bottom" - android:background="?attr/browserToolbarBackground" - mozac:findInPageResultCountTextColor="?attr/browserToolbarIcons" - mozac:findInPageButtonsTint="?attr/browserToolbarIcons" + android:background="?foundation" + mozac:findInPageResultCountTextColor="?primaryText" + mozac:findInPageButtonsTint="?primaryText" android:visibility="gone" app:layout_behavior="org.mozilla.fenix.components.FindInPageBarBehavior" /> diff --git a/app/src/main/res/layout/fragment_crash_reporter.xml b/app/src/main/res/layout/fragment_crash_reporter.xml index 4dba39904..fe8d3604f 100644 --- a/app/src/main/res/layout/fragment_crash_reporter.xml +++ b/app/src/main/res/layout/fragment_crash_reporter.xml @@ -7,7 +7,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/searchBackground_normal_theme"> + android:background="?above"> @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textSize="15sp" - android:textColor="?attr/bookmarksEditTextColor" + android:textColor="?secondaryText" tools:text="Internet for people, not profit -- Mozilla" android:inputType="textAutoComplete"/> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/bookmark_url_label" - android:textColor="?attr/bookmarksLabelColor" + android:textColor="?primaryText" android:textSize="12sp" android:textAllCaps="true"/> @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textSize="15sp" - android:textColor="?attr/bookmarksEditTextColor" + android:textColor="?secondaryText" tools:text="https://www.mozilla.org/en-US/" android:inputType="textUri"/> @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/bookmark_folder_label" - android:textColor="?attr/bookmarksLabelColor" + android:textColor="?primaryText" android:textSize="12sp" android:textAllCaps="true"/> @@ -65,10 +65,10 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:textSize="16sp" - android:textColor="?attr/bookmarksEditTextColor" + android:textColor="?secondaryText" android:drawableStart="@drawable/ic_folder_icon" android:drawablePadding="10dp" - android:drawableTint="?attr/iconColor" + android:drawableTint="?primaryText" tools:text="Mobile Bookmarks" tools:targetApi="m" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index bf502474e..93208824f 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -12,7 +12,7 @@ android:id="@+id/homeLayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/homeBackgroundGradient" + android:background="@drawable/home_background_gradient" app:layoutDescription="@xml/home_scene" tools:context=".home.HomeFragment"> @@ -31,8 +31,9 @@ android:id="@+id/privateBrowsingButton" android:layout_width="@dimen/glyph_button_height" android:layout_height="@dimen/glyph_button_height" - android:background="?attr/privateBrowsingButtonBackground" + android:background="?privateBrowsingButtonBackground" android:src="@drawable/ic_private_browsing" + android:tint="?primaryText" android:contentDescription="@string/content_description_private_browsing_button" app:layout_constraintEnd_toStartOf="@id/menuButton" app:layout_constraintTop_toTopOf="@id/menuButton" /> @@ -43,7 +44,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="42dp" - android:src="?attr/fenixLogo" + android:src="?fenixLogo" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/menuButton" /> @@ -55,7 +56,7 @@ android:layout_marginTop="64dp" android:layout_marginStart="16dp" android:elevation="@dimen/toolbar_elevation" - android:background="?attr/toolbarWrapperBackground" + android:background="@drawable/home_search_background_normal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/wordmark"> @@ -73,7 +74,7 @@ android:focusable="true" android:gravity="center_vertical" android:text="@string/search_hint" - android:textColor="?attr/toolbarTextColor" + android:textColor="?primaryText" android:textSize="14sp" /> @@ -81,7 +82,7 @@ android:id="@+id/homeDivider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/homeDividerColor" + android:background="?neutral" app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml b/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml index 752ca7de0..7c9fd5671 100644 --- a/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml +++ b/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:contentDescription="@string/quick_settings_sheet" - android:background="?attr/toolbarColor"> + android:background="?foundation"> diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index a3b00a6eb..28a80c67b 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -9,7 +9,7 @@ android:layout_height="match_parent" tools:context=".search.SearchFragment" android:id="@+id/search_layout" - android:background="?attr/searchBackground"> + android:background="?above"> + android:textColor="?primaryText"/> diff --git a/app/src/main/res/layout/history_list_item.xml b/app/src/main/res/layout/history_list_item.xml index c2ad2d508..e9f4c722f 100644 --- a/app/src/main/res/layout/history_list_item.xml +++ b/app/src/main/res/layout/history_list_item.xml @@ -28,7 +28,7 @@ android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/content_description_history_menu" android:src="@drawable/ic_menu" - android:tint="?attr/menuButtonTint" + android:tint="?primaryText" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -50,7 +50,7 @@ android:ellipsize="end" android:singleLine="true" android:textAlignment="viewStart" - android:textColor="?attr/historyURLColor" + android:textColor="?secondaryText" android:textSize="12sp" android:layout_marginTop="4dp" app:layout_constraintEnd_toStartOf="@id/history_item_overflow" @@ -66,7 +66,7 @@ android:ellipsize="end" android:singleLine="true" android:textAlignment="viewStart" - android:textColor="?attr/historyTitleColor" + android:textColor="?primaryText" android:textSize="18sp" app:layout_constraintEnd_toStartOf="@id/history_item_overflow" app:layout_constraintStart_toEndOf="@id/history_favicon" diff --git a/app/src/main/res/layout/layout_quick_action_sheet.xml b/app/src/main/res/layout/layout_quick_action_sheet.xml index cfcd0da03..2748d40a5 100644 --- a/app/src/main/res/layout/layout_quick_action_sheet.xml +++ b/app/src/main/res/layout/layout_quick_action_sheet.xml @@ -7,7 +7,7 @@ android:id="@+id/quick_action_sheet" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/quickActionBackgroundColor" + android:background="?foundation" android:orientation="vertical">