From f79595511457d7c6ee1a6c46a6bb7050b456d61f Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Sun, 13 Mar 2022 00:13:19 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/24252 - Rename primaryText attribute to textPrimary --- .../AddonPermissionDetailsBindingDelegate.kt | 2 +- .../fenix/addons/AddonsManagementFragment.kt | 4 +- .../mozilla/fenix/browser/BaseBrowserFragment.kt | 2 +- .../org/mozilla/fenix/browser/BrowserFragment.kt | 4 +- .../fenix/components/toolbar/BrowserToolbarView.kt | 2 +- .../fenix/components/toolbar/DefaultToolbarMenu.kt | 4 +- .../fenix/components/toolbar/ToolbarIntegration.kt | 2 +- .../fenix/customtabs/CustomTabToolbarMenu.kt | 2 +- .../java/org/mozilla/fenix/home/HomeFragment.kt | 2 +- .../main/java/org/mozilla/fenix/home/HomeMenu.kt | 2 +- .../mozilla/fenix/library/LibraryPageFragment.kt | 2 +- .../org/mozilla/fenix/library/LibraryPageView.kt | 2 +- .../library/bookmarks/edit/EditBookmarkFragment.kt | 2 +- .../mozilla/fenix/library/history/HistoryView.kt | 2 +- .../history/awesomebar/AwesomeBarWrapper.kt | 2 +- .../fenix/library/history/toolbar/ToolbarView.kt | 4 +- .../fenix/onboarding/OnboardingRadioButton.kt | 2 +- .../mozilla/fenix/search/SearchDialogFragment.kt | 2 +- .../fenix/search/awesomebar/AwesomeBarView.kt | 4 +- .../fenix/search/awesomebar/AwesomeBarWrapper.kt | 2 +- .../awesomebar/ShortcutsSuggestionProvider.kt | 2 +- .../mozilla/fenix/search/toolbar/ToolbarView.kt | 4 +- .../settings/account/AccountSettingsFragment.kt | 2 +- .../creditcards/view/CreditCardEditorView.kt | 4 +- .../logins/SavedLoginsSortingStrategyMenu.kt | 2 +- .../org/mozilla/fenix/utils/ClearableEditText.kt | 2 +- .../res/color/primary_state_list_text_color.xml | 2 +- .../src/main/res/color/save_enabled_ic_color.xml | 2 +- .../res/color/saved_login_clear_edit_text_tint.xml | 2 +- .../src/main/res/color/state_list_text_color.xml | 2 +- .../app/src/main/res/color/toggle_text_color.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_account.xml | 2 +- .../src/main/res/drawable/ic_addons_extensions.xml | 2 +- .../src/main/res/drawable/ic_arrowhead_right.xml | 2 +- .../src/main/res/drawable/ic_autoplay_disabled.xml | 4 +- .../src/main/res/drawable/ic_autoplay_enabled.xml | 4 +- .../app/src/main/res/drawable/ic_back_button.xml | 2 +- .../src/main/res/drawable/ic_bookmark_filled.xml | 2 +- .../app/src/main/res/drawable/ic_bookmark_list.xml | 4 +- .../src/main/res/drawable/ic_bookmark_outline.xml | 2 +- .../src/main/res/drawable/ic_bookmarks_menu.xml | 4 +- .../src/main/res/drawable/ic_camera_disabled.xml | 2 +- .../src/main/res/drawable/ic_camera_enabled.xml | 2 +- .../app/src/main/res/drawable/ic_chevron_down.xml | 2 +- .../app/src/main/res/drawable/ic_chevron_up.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_close.xml | 2 +- .../src/main/res/drawable/ic_cookies_disabled.xml | 2 +- .../src/main/res/drawable/ic_cookies_enabled.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_copy.xml | 2 +- .../app/src/main/res/drawable/ic_customize.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_delete.xml | 4 +- .../fenix/app/src/main/res/drawable/ic_desktop.xml | 2 +- .../app/src/main/res/drawable/ic_download.xml | 4 +- .../fenix/app/src/main/res/drawable/ic_edit.xml | 2 +- .../app/src/main/res/drawable/ic_file_type_apk.xml | 2 +- .../main/res/drawable/ic_file_type_audio_note.xml | 2 +- .../src/main/res/drawable/ic_file_type_default.xml | 2 +- .../main/res/drawable/ic_file_type_document.xml | 10 ++--- .../src/main/res/drawable/ic_file_type_image.xml | 6 +-- .../src/main/res/drawable/ic_file_type_video.xml | 2 +- .../app/src/main/res/drawable/ic_file_type_zip.xml | 8 ++-- .../app/src/main/res/drawable/ic_folder_icon.xml | 2 +- .../app/src/main/res/drawable/ic_folder_new.xml | 4 +- .../fenix/app/src/main/res/drawable/ic_history.xml | 4 +- .../fenix/app/src/main/res/drawable/ic_info.xml | 4 +- .../app/src/main/res/drawable/ic_internet.xml | 2 +- .../app/src/main/res/drawable/ic_link_disabled.xml | 6 +-- .../app/src/main/res/drawable/ic_link_enabled.xml | 6 +-- .../src/main/res/drawable/ic_location_disabled.xml | 4 +- .../src/main/res/drawable/ic_location_enabled.xml | 4 +- .../fenix/app/src/main/res/drawable/ic_lock.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_login.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_menu.xml | 2 +- .../main/res/drawable/ic_microphone_disabled.xml | 2 +- .../main/res/drawable/ic_microphone_enabled.xml | 4 +- .../app/src/main/res/drawable/ic_multiple_tabs.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_new.xml | 2 +- .../res/drawable/ic_notifications_disabled.xml | 4 +- .../main/res/drawable/ic_notifications_enabled.xml | 4 +- .../app/src/main/res/drawable/ic_open_in_app.xml | 2 +- .../app/src/main/res/drawable/ic_open_in_new.xml | 2 +- .../app/src/main/res/drawable/ic_permission.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_qr.xml | 2 +- .../app/src/main/res/drawable/ic_readermode.xml | 4 +- .../fenix/app/src/main/res/drawable/ic_search.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_share.xml | 2 +- .../fenix/app/src/main/res/drawable/ic_sign_in.xml | 2 +- .../app/src/main/res/drawable/ic_signed_out.xml | 6 +-- .../src/main/res/drawable/ic_storage_disabled.xml | 4 +- .../src/main/res/drawable/ic_storage_enabled.xml | 4 +- .../src/main/res/drawable/ic_sync_disconnected.xml | 4 +- .../app/src/main/res/drawable/ic_synced_tabs.xml | 4 +- .../src/main/res/drawable/ic_tab_collection.xml | 4 +- .../app/src/main/res/drawable/ic_top_sites.xml | 2 +- .../drawable/ic_tracking_protection_disabled.xml | 4 +- .../drawable/ic_tracking_protection_enabled.xml | 2 +- .../app/src/main/res/drawable/ic_whats_new.xml | 2 +- .../src/main/res/drawable/mozac_ic_broken_lock.xml | 4 +- .../app/src/main/res/layout/account_preference.xml | 2 +- .../main/res/layout/account_share_list_item.xml | 2 +- .../res/layout/amo_collection_override_dialog.xml | 4 +- .../src/main/res/layout/app_share_list_item.xml | 2 +- .../res/layout/browser_toolbar_popup_window.xml | 6 +-- .../res/layout/collection_dialog_list_item.xml | 2 +- .../main/res/layout/collection_tab_list_row.xml | 2 +- .../layout/component_bottom_browser_toolbar.xml | 8 ++-- .../res/layout/component_browser_top_toolbar.xml | 8 ++-- .../res/layout/component_collection_creation.xml | 2 +- ...mponent_collection_creation_name_collection.xml | 2 +- ...onent_collection_creation_select_collection.xml | 2 +- .../layout/component_tracking_protection_panel.xml | 12 +++--- .../res/layout/connection_details_website_info.xml | 2 +- .../src/main/res/layout/credit_card_list_item.xml | 2 +- .../layout/custom_search_engine_radio_button.xml | 2 +- .../src/main/res/layout/download_dialog_layout.xml | 8 ++-- .../app/src/main/res/layout/exception_item.xml | 2 +- .../src/main/res/layout/exceptions_description.xml | 2 +- .../app/src/main/res/layout/fragment_add_login.xml | 48 +++++++++++----------- .../main/res/layout/fragment_add_on_details.xml | 2 +- .../res/layout/fragment_credit_card_editor.xml | 20 ++++----- .../src/main/res/layout/fragment_edit_bookmark.xml | 8 ++-- .../src/main/res/layout/fragment_edit_login.xml | 38 ++++++++--------- .../res/layout/fragment_history_search_dialog.xml | 8 ++-- .../app/src/main/res/layout/fragment_home.xml | 2 +- .../layout/fragment_installed_add_on_details.xml | 16 ++++---- .../src/main/res/layout/fragment_login_detail.xml | 12 +++--- .../res/layout/fragment_onboarding_home_dialog.xml | 6 +-- .../main/res/layout/fragment_pwa_onboarding.xml | 4 +- .../src/main/res/layout/fragment_search_dialog.xml | 8 ++-- .../app/src/main/res/layout/fragment_sign_out.xml | 2 +- .../fragment_site_permissions_exceptions.xml | 2 +- .../fragment_site_permissions_exceptions_item.xml | 2 +- .../src/main/res/layout/fragment_turn_on_sync.xml | 4 +- .../app/src/main/res/layout/history_list_item.xml | 2 +- .../main/res/layout/layout_percentage_seek_bar.xml | 2 +- .../app/src/main/res/layout/library_site_item.xml | 2 +- .../src/main/res/layout/locale_settings_item.xml | 4 +- .../fenix/app/src/main/res/layout/logins_item.xml | 2 +- .../src/main/res/layout/mp_migration_dialog.xml | 6 +-- .../main/res/layout/mp_migration_done_dialog.xml | 2 +- .../main/res/layout/onboarding_theme_picker.xml | 4 +- .../layout/onboarding_toolbar_position_picker.xml | 4 +- .../res/layout/preference_search_add_engine.xml | 2 +- .../res/layout/private_browsing_description.xml | 4 +- .../main/res/layout/quicksettings_permissions.xml | 16 ++++---- .../main/res/layout/recently_closed_nav_item.xml | 2 +- .../main/res/layout/search_engine_radio_button.xml | 2 +- .../app/src/main/res/layout/stub_find_in_page.xml | 4 +- .../fenix/app/src/main/res/layout/study_item.xml | 2 +- .../fenix/app/src/main/res/layout/tab_preview.xml | 2 +- .../src/main/res/layout/view_crash_reporter.xml | 4 +- .../main/res/menu/add_custom_searchengine_menu.xml | 2 +- .../app/src/main/res/menu/bookmarks_add_folder.xml | 2 +- .../fenix/app/src/main/res/menu/bookmarks_edit.xml | 4 +- .../fenix/app/src/main/res/menu/bookmarks_menu.xml | 4 +- .../src/main/res/menu/bookmarks_select_folder.xml | 2 +- .../app/src/main/res/menu/credit_card_editor.xml | 4 +- .../res/menu/edit_custom_searchengine_menu.xml | 2 +- .../fenix/app/src/main/res/menu/history_menu.xml | 4 +- .../fenix/app/src/main/res/menu/languages_list.xml | 2 +- .../fenix/app/src/main/res/menu/library_menu.xml | 2 +- .../fenix/app/src/main/res/menu/login_list.xml | 2 +- .../app/src/main/res/menu/login_options_menu.xml | 4 +- .../fenix/app/src/main/res/values/attrs.xml | 3 +- .../fenix/app/src/main/res/values/styles.xml | 36 ++++++++-------- 165 files changed, 340 insertions(+), 337 deletions(-) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionDetailsBindingDelegate.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionDetailsBindingDelegate.kt index d1b817fbae5a..e5dd5cad7dd5 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionDetailsBindingDelegate.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionDetailsBindingDelegate.kt @@ -41,7 +41,7 @@ class AddonPermissionDetailsBindingDelegate( adapter = AddonPermissionsAdapter( sortedPermissions, style = AddonPermissionsAdapter.Style( - ThemeManager.resolveAttribute(R.attr.primaryText, context) + ThemeManager.resolveAttribute(R.attr.textPrimary, context) ) ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt index 47cda1f05779..d4a732190291 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt @@ -184,8 +184,8 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management) private fun createAddonStyle(context: Context): AddonsManagerAdapter.Style { return AddonsManagerAdapter.Style( - sectionsTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context), - addonNameTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context), + sectionsTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context), + addonNameTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context), addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.secondaryText, context), sectionsTypeFace = ResourcesCompat.getFont(context, R.font.metropolis_semibold), addonAllowPrivateBrowsingLabelDrawableRes = R.drawable.ic_add_on_private_browsing_label diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index 7145614ddb53..67b964eb7acc 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -774,7 +774,7 @@ abstract class BaseBrowserFragment : if (binding.swipeRefresh.isEnabled) { val primaryTextColor = - ThemeManager.resolveAttribute(R.attr.primaryText, context) + ThemeManager.resolveAttribute(R.attr.textPrimary, context) binding.swipeRefresh.setColorSchemeColors(primaryTextColor) swipeRefreshFeature.set( feature = SwipeRefreshFeature( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index da88c5939235..332147dda5c0 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -77,14 +77,14 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { R.drawable.mozac_ic_home )!!, contentDescription = context.getString(R.string.browser_toolbar_home), - iconTintColorResource = ThemeManager.resolveAttribute(R.attr.primaryText, context), + iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context), listener = browserToolbarInteractor::onHomeButtonClicked ) browserToolbarView.view.addNavigationAction(homeAction) if (resources.getBoolean(R.bool.tablet)) { - val enableTint = ThemeManager.resolveAttribute(R.attr.primaryText, context) + val enableTint = ThemeManager.resolveAttribute(R.attr.textPrimary, context) val disableTint = ThemeManager.resolveAttribute(R.attr.disabled, context) val backAction = BrowserToolbar.TwoStateButton( primaryImage = AppCompatResources.getDrawable( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt index d20768721e7e..20881fb01dcb 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt @@ -101,7 +101,7 @@ class BrowserToolbarView( val primaryTextColor = ContextCompat.getColor( context, - ThemeManager.resolveAttribute(R.attr.primaryText, context) + ThemeManager.resolveAttribute(R.attr.textPrimary, context) ) val secondaryTextColor = ContextCompat.getColor( context, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index 88a31432cf38..58d2c18f80d5 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -306,7 +306,7 @@ open class DefaultToolbarMenu( ThemeManager.resolveAttribute(R.attr.syncDisconnected, context) else primaryTextColor(), textColorResource = if (hasAccountProblem) - ThemeManager.resolveAttribute(R.attr.primaryText, context) else + ThemeManager.resolveAttribute(R.attr.textPrimary, context) else primaryTextColor(), highlight = BrowserMenuHighlight.HighPriority( endImageResource = R.drawable.ic_sync_disconnected, @@ -399,7 +399,7 @@ open class DefaultToolbarMenu( @ColorRes @VisibleForTesting - internal fun primaryTextColor() = ThemeManager.resolveAttribute(R.attr.primaryText, context) + internal fun primaryTextColor() = ThemeManager.resolveAttribute(R.attr.textPrimary, context) @ColorRes @VisibleForTesting diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt index fb83010bd872..5960b573e97f 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt @@ -43,7 +43,7 @@ abstract class ToolbarIntegration( sessionId, ToolbarFeature.UrlRenderConfiguration( context.components.publicSuffixList, - ThemeManager.resolveAttribute(R.attr.primaryText, context), + ThemeManager.resolveAttribute(R.attr.textPrimary, context), renderStyle = renderStyle ) ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt index fdf978ec1697..0986c00554bb 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt @@ -177,7 +177,7 @@ class CustomTabToolbarMenu( ) @ColorRes - private fun primaryTextColor() = ThemeManager.resolveAttribute(R.attr.primaryText, context) + private fun primaryTextColor() = ThemeManager.resolveAttribute(R.attr.textPrimary, context) companion object { private const val CAPTION_TEXT_SIZE = 12f diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 862af37cd03d..36f1c7f676ea 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -518,7 +518,7 @@ class HomeFragment : Fragment() { binding.menuButton.setColorFilter( ContextCompat.getColor( requireContext(), - ThemeManager.resolveAttribute(R.attr.primaryText, requireContext()) + ThemeManager.resolveAttribute(R.attr.textPrimary, requireContext()) ) ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt index 7f019a08d28c..9213635e90d1 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -55,7 +55,7 @@ class HomeMenu( data class DesktopMode(val checked: Boolean) : Item() } - private val primaryTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context) + private val primaryTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context) private val syncDisconnectedColor = ThemeManager.resolveAttribute(R.attr.syncDisconnected, context) private val syncDisconnectedBackgroundColor = diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt index ea0c59dd5ace..f3123d676651 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt @@ -40,7 +40,7 @@ abstract class LibraryPageFragment : Fragment() { super.onDetach() context?.let { activity?.findViewById(R.id.navigationToolbar)?.setToolbarColors( - it.getColorFromAttr(R.attr.primaryText), + it.getColorFromAttr(R.attr.textPrimary), it.getColorFromAttr(R.attr.foundation) ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt index 70aa59418739..cf7596380a89 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt @@ -24,7 +24,7 @@ open class LibraryPageView( ) { updateToolbar( title = title, - foregroundColor = context.getColorFromAttr(R.attr.primaryText), + foregroundColor = context.getColorFromAttr(R.attr.textPrimary), backgroundColor = context.getColorFromAttr(R.attr.foundation) ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt index be34de1b6e52..8ec012e84c32 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt @@ -165,7 +165,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) { val actionBar = (activity as NavHostActivity).getSupportActionBarAndInflateIfNecessary() val toolbar = activity.findViewById(R.id.navigationToolbar) toolbar?.setToolbarColors( - foreground = activity.getColorFromAttr(R.attr.primaryText), + foreground = activity.getColorFromAttr(R.attr.textPrimary), background = activity.getColorFromAttr(R.attr.foundation) ) actionBar.show() diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt index 28e0bd76e028..808f8a4858fe 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt @@ -42,7 +42,7 @@ class HistoryView( } val primaryTextColor = - ThemeManager.resolveAttribute(R.attr.primaryText, context) + ThemeManager.resolveAttribute(R.attr.textPrimary, context) binding.swipeRefresh.setColorSchemeColors(primaryTextColor) binding.swipeRefresh.setOnRefreshListener { interactor.onRequestSync() diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt index d50b05ae15d3..1f7402dd8f6d 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt @@ -55,7 +55,7 @@ class AwesomeBarWrapper @JvmOverloads constructor( orientation = orientation, colors = AwesomeBarDefaults.colors( background = Color.Transparent, - title = ThemeManager.resolveAttributeColor(R.attr.primaryText), + title = ThemeManager.resolveAttributeColor(R.attr.textPrimary), description = ThemeManager.resolveAttributeColor(R.attr.secondaryText), autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.secondaryText) ), diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt index e530d4e5c2da..2aff8f730cba 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt @@ -58,13 +58,13 @@ class ToolbarView( edit.hint = context.getString(R.string.history_search_1) edit.colors = edit.colors.copy( - text = context.getColorFromAttr(R.attr.primaryText), + text = context.getColorFromAttr(R.attr.textPrimary), hint = context.getColorFromAttr(R.attr.secondaryText), suggestionBackground = ContextCompat.getColor( context, R.color.suggestion_highlight_color ), - clear = context.getColorFromAttr(R.attr.primaryText) + clear = context.getColorFromAttr(R.attr.textPrimary) ) edit.setUrlBackground( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt index 6fdb7d0af86f..304419b0abb3 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt @@ -71,7 +71,7 @@ class OnboardingRadioButton( val spannableTitle = SpannableString(resources.getString(title)) spannableTitle.setTextSize(context, TITLE_TEXT_SIZE) - spannableTitle.setTextColor(context, R.attr.primaryText) + spannableTitle.setTextColor(context, R.attr.textPrimary) builder.append(spannableTitle) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index d44fa714c33e..997b655fbfd4 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -711,7 +711,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { binding.searchEnginesShortcutButton.isVisible = areShortcutsAvailable binding.searchEnginesShortcutButton.isChecked = showShortcuts - val color = if (showShortcuts) R.attr.contrastText else R.attr.primaryText + val color = if (showShortcuts) R.attr.contrastText else R.attr.textPrimary binding.searchEnginesShortcutButton.compoundDrawables[0]?.setTint( requireContext().getColorFromAttr(color) ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt index 55816fee4ae7..cf1df415bc59 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt @@ -93,7 +93,7 @@ class AwesomeBarView( init { val components = activity.components - val primaryTextColor = activity.getColorFromAttr(R.attr.primaryText) + val primaryTextColor = activity.getColorFromAttr(R.attr.textPrimary) val engineForSpeculativeConnects = when (activity.browsingModeManager.mode) { BrowsingMode.Normal -> components.core.engine @@ -333,7 +333,7 @@ class AwesomeBarView( private fun getSuggestionProviderForEngine(engine: SearchEngine): List { return searchSuggestionProviderMap.getOrPut(engine) { val components = activity.components - val primaryTextColor = activity.getColorFromAttr(R.attr.primaryText) + val primaryTextColor = activity.getColorFromAttr(R.attr.textPrimary) val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply { colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt index e4891be0423c..8c1c71ac3ac3 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt @@ -55,7 +55,7 @@ class AwesomeBarWrapper @JvmOverloads constructor( orientation = orientation, colors = AwesomeBarDefaults.colors( background = Color.Transparent, - title = ThemeManager.resolveAttributeColor(R.attr.primaryText), + title = ThemeManager.resolveAttributeColor(R.attr.textPrimary), description = ThemeManager.resolveAttributeColor(R.attr.secondaryText), autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.secondaryText) ), diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt index 2225407e0a85..a5753d17dbf5 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt @@ -31,7 +31,7 @@ class ShortcutsSuggestionProvider( private val settingsIcon by lazy { AppCompatResources.getDrawable(context, R.drawable.mozac_ic_settings)?.apply { colorFilter = createBlendModeColorFilterCompat( - context.getColorFromAttr(R.attr.primaryText), + context.getColorFromAttr(R.attr.textPrimary), SRC_IN ) }?.toBitmap() diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt index 06007afe8bd1..56bbb36431cf 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt @@ -85,13 +85,13 @@ class ToolbarView( edit.hint = context.getString(R.string.search_hint) edit.colors = edit.colors.copy( - text = context.getColorFromAttr(R.attr.primaryText), + text = context.getColorFromAttr(R.attr.textPrimary), hint = context.getColorFromAttr(R.attr.secondaryText), suggestionBackground = ContextCompat.getColor( context, R.color.suggestion_highlight_color ), - clear = context.getColorFromAttr(R.attr.primaryText) + clear = context.getColorFromAttr(R.attr.textPrimary) ) edit.setUrlBackground( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt index f8fd162c31fa..8852ebcb6768 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt @@ -132,7 +132,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() { onPreferenceClickListener = getClickListenerForSyncNow() icon = icon.mutate().apply { - setTint(context.getColorFromAttr(R.attr.primaryText)) + setTint(context.getColorFromAttr(R.attr.textPrimary)) } // Current sync state diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt index 15b8d7090127..90391f1f7bcf 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt @@ -122,7 +122,7 @@ class CreditCardEditorView( if (binding.cardNumberInput.text.toString().validateCreditCardNumber()) { binding.cardNumberLayout.error = null - binding.cardNumberTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.primaryText)) + binding.cardNumberTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.textPrimary)) } else { isValid = false @@ -133,7 +133,7 @@ class CreditCardEditorView( if (binding.nameOnCardInput.text.toString().isNotBlank()) { binding.nameOnCardInput.error = null - binding.nameOnCardTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.primaryText)) + binding.nameOnCardTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.textPrimary)) } else { isValid = false diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsSortingStrategyMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsSortingStrategyMenu.kt index f34a7d00f077..839e892692da 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsSortingStrategyMenu.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsSortingStrategyMenu.kt @@ -36,7 +36,7 @@ class SavedLoginsSortingStrategyMenu( @VisibleForTesting internal fun menuItems(itemToHighlight: Item): List { val textStyle = TextStyle( - color = context.getColorFromAttr(R.attr.primaryText) + color = context.getColorFromAttr(R.attr.textPrimary) ) val highlight = HighPriorityHighlightEffect( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt index 7a4a7ebf1cee..76f0287f4b2e 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt @@ -54,7 +54,7 @@ class ClearableEditText @JvmOverloads constructor( val textLength = text?.length ?: 0 val drawable = if (shouldShowClearButton(textLength)) { AppCompatResources.getDrawable(context, R.drawable.mozac_ic_clear)?.apply { - colorFilter = createBlendModeColorFilterCompat(context.getColorFromAttr(R.attr.primaryText), SRC_IN) + colorFilter = createBlendModeColorFilterCompat(context.getColorFromAttr(R.attr.textPrimary), SRC_IN) } } else { null diff --git a/mobile/android/fenix/app/src/main/res/color/primary_state_list_text_color.xml b/mobile/android/fenix/app/src/main/res/color/primary_state_list_text_color.xml index 68658629a178..33de7f8aaa63 100644 --- a/mobile/android/fenix/app/src/main/res/color/primary_state_list_text_color.xml +++ b/mobile/android/fenix/app/src/main/res/color/primary_state_list_text_color.xml @@ -4,5 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + diff --git a/mobile/android/fenix/app/src/main/res/color/save_enabled_ic_color.xml b/mobile/android/fenix/app/src/main/res/color/save_enabled_ic_color.xml index 4c0a682f3ca9..18c3e9bca400 100644 --- a/mobile/android/fenix/app/src/main/res/color/save_enabled_ic_color.xml +++ b/mobile/android/fenix/app/src/main/res/color/save_enabled_ic_color.xml @@ -3,6 +3,6 @@ - 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/mobile/android/fenix/app/src/main/res/color/saved_login_clear_edit_text_tint.xml b/mobile/android/fenix/app/src/main/res/color/saved_login_clear_edit_text_tint.xml index 1a800496d661..9865ecd82407 100644 --- a/mobile/android/fenix/app/src/main/res/color/saved_login_clear_edit_text_tint.xml +++ b/mobile/android/fenix/app/src/main/res/color/saved_login_clear_edit_text_tint.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + android:color="?attr/textPrimary" /> diff --git a/mobile/android/fenix/app/src/main/res/color/state_list_text_color.xml b/mobile/android/fenix/app/src/main/res/color/state_list_text_color.xml index 68658629a178..33de7f8aaa63 100644 --- a/mobile/android/fenix/app/src/main/res/color/state_list_text_color.xml +++ b/mobile/android/fenix/app/src/main/res/color/state_list_text_color.xml @@ -4,5 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + diff --git a/mobile/android/fenix/app/src/main/res/color/toggle_text_color.xml b/mobile/android/fenix/app/src/main/res/color/toggle_text_color.xml index a4093484e1a7..12a77aee535f 100644 --- a/mobile/android/fenix/app/src/main/res/color/toggle_text_color.xml +++ b/mobile/android/fenix/app/src/main/res/color/toggle_text_color.xml @@ -5,5 +5,5 @@ - + diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_account.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_account.xml index efc5d36fabe8..b8784a442ff3 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_account.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_account.xml @@ -8,5 +8,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary"/> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_addons_extensions.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_addons_extensions.xml index efe803ba3277..b05cc304578d 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_addons_extensions.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_addons_extensions.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary" /> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_arrowhead_right.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_arrowhead_right.xml index 268da1cced97..ed2e5db38161 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_arrowhead_right.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_arrowhead_right.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_autoplay_disabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_autoplay_disabled.xml index c5f4e048bd19..a6ea523f54b6 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_autoplay_disabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_autoplay_disabled.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_autoplay_enabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_autoplay_enabled.xml index fa534a57c551..76fdb229b57e 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_autoplay_enabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_autoplay_enabled.xml @@ -6,9 +6,9 @@ android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_back_button.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_back_button.xml index 5194f6f7623f..d6a1ab965f5d 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_back_button.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_back_button.xml @@ -9,6 +9,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_filled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_filled.xml index 8989f5484caf..351e618a7d12 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_filled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_filled.xml @@ -8,7 +8,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_list.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_list.xml index 9937d1a68699..883b296992bb 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_list.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_list.xml @@ -11,8 +11,8 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary"/> + android:fillColor="?attr/textPrimary"/> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_outline.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_outline.xml index 67c872b2b987..00fbec57a5fc 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_outline.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_bookmark_outline.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_bookmarks_menu.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_bookmarks_menu.xml index fce6d6829f3e..16d908d48897 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_bookmarks_menu.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_bookmarks_menu.xml @@ -9,8 +9,8 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary"/> + android:fillColor="?attr/textPrimary"/> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_camera_disabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_camera_disabled.xml index f0707e72cca3..85dbbf2bcb06 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_camera_disabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_camera_disabled.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_camera_enabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_camera_enabled.xml index 3818f98e497b..ddcd6db6ef15 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_camera_enabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_camera_enabled.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_chevron_down.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_chevron_down.xml index 6177fe8a1030..9ac97d343d05 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_chevron_down.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_chevron_down.xml @@ -7,6 +7,6 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_chevron_up.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_chevron_up.xml index 60d8c82f8cc4..19f4194100d5 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_chevron_up.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_chevron_up.xml @@ -7,6 +7,6 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_close.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_close.xml index 7b82c9846600..d811dde28368 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_close.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_close.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_cookies_disabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_cookies_disabled.xml index 168157b4f760..e5ccc68b3f6a 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_cookies_disabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_cookies_disabled.xml @@ -10,6 +10,6 @@ android:viewportWidth="16" android:viewportHeight="16"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_cookies_enabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_cookies_enabled.xml index 7394384766e0..9a29d5508928 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_cookies_enabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_cookies_enabled.xml @@ -10,6 +10,6 @@ android:viewportWidth="16" android:viewportHeight="16"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_copy.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_copy.xml index e6bdd9f943d8..d0c2c19b2d17 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_copy.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_copy.xml @@ -8,7 +8,7 @@ android:viewportWidth="17" android:viewportHeight="20"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_customize.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_customize.xml index 6389021b863c..40faee312ced 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_customize.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_customize.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_delete.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_delete.xml index 016f2ad0b90d..41681f9d5f72 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_delete.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_delete.xml @@ -9,8 +9,8 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary"/> + android:fillColor="?attr/textPrimary"/> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_desktop.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_desktop.xml index de303bb1e74c..9bb70ca8ca7d 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_desktop.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_desktop.xml @@ -7,6 +7,6 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_download.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_download.xml index ecccd5dd1529..c0178e005697 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_download.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_download.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_edit.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_edit.xml index 3da6ea077666..9b36809ddf90 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_edit.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_edit.xml @@ -8,6 +8,6 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_apk.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_apk.xml index 1cc92c1ab4b6..65adf4af904a 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_apk.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_apk.xml @@ -7,6 +7,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_audio_note.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_audio_note.xml index 62ab60ff2e64..2aff77213892 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_audio_note.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_audio_note.xml @@ -7,7 +7,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_default.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_default.xml index 0c7fcd453c55..5c49b209d3c7 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_default.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_default.xml @@ -7,6 +7,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_document.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_document.xml index 671e6d4c0457..cc004f253cb5 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_document.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_document.xml @@ -7,18 +7,18 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_image.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_image.xml index aaa629212564..e210c018dbef 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_image.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_image.xml @@ -7,12 +7,12 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_video.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_video.xml index 520bb54aaf3b..64576d87cd18 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_video.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_video.xml @@ -7,6 +7,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_zip.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_zip.xml index b3fc0f8c7c89..1d4d72af6972 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_zip.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_file_type_zip.xml @@ -7,15 +7,15 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_folder_icon.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_folder_icon.xml index ea7cea353ce0..a844c30ee0ce 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_folder_icon.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_folder_icon.xml @@ -8,6 +8,6 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_folder_new.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_folder_new.xml index fc41e1d89495..1b332a99ab94 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_folder_new.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_folder_new.xml @@ -8,10 +8,10 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_history.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_history.xml index 757559a7ea6b..65b88cde9f5a 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_history.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_history.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_info.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_info.xml index 0897d1761e37..81dbe97ad9fd 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_info.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_info.xml @@ -9,8 +9,8 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary"/> + android:fillColor="?attr/textPrimary"/> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_internet.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_internet.xml index f6276035e568..211ea9c3de46 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_internet.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_internet.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_link_disabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_link_disabled.xml index 7168e7ccf857..31eb967415ca 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_link_disabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_link_disabled.xml @@ -9,12 +9,12 @@ android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_link_enabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_link_enabled.xml index ecbc5488c184..9e2f66a6e757 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_link_enabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_link_enabled.xml @@ -8,12 +8,12 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_location_disabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_location_disabled.xml index dee8edc59dfd..2b28566e1748 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_location_disabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_location_disabled.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_location_enabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_location_enabled.xml index 785b356ab7cd..c4b940ba5662 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_location_enabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_location_enabled.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_lock.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_lock.xml index 8b2fe6870cf5..610720af55bc 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_lock.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_lock.xml @@ -8,6 +8,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_login.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_login.xml index a61455db09d6..49c2fd3f80a9 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_login.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_login.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary" /> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_menu.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_menu.xml index 126d113c3ec0..acff28c81a2b 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_menu.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_menu.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_microphone_disabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_microphone_disabled.xml index c7c01c13701e..bff0fcc1ec50 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_microphone_disabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_microphone_disabled.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_microphone_enabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_microphone_enabled.xml index e639d9faaa8e..a237d2071899 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_microphone_enabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_microphone_enabled.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_multiple_tabs.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_multiple_tabs.xml index 4df88b72c020..11f3c37b5762 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_multiple_tabs.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_multiple_tabs.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary" /> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_new.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_new.xml index ea1ea7ba1605..dad894f93ad0 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_new.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_new.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_notifications_disabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_notifications_disabled.xml index 78abf7ae8a60..b939c6cdfffc 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_notifications_disabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_notifications_disabled.xml @@ -9,8 +9,8 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary"/> + android:fillColor="?attr/textPrimary"/> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_notifications_enabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_notifications_enabled.xml index 8fcc4d39d5e0..1b9581fc68d5 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_notifications_enabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_notifications_enabled.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_open_in_app.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_open_in_app.xml index b874dda34d42..a06244fbe70a 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_open_in_app.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_open_in_app.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary" /> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_open_in_new.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_open_in_new.xml index 46bb2822136e..cd1b759ff334 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_open_in_new.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_open_in_new.xml @@ -8,7 +8,7 @@ android:viewportWidth="18" android:viewportHeight="18"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_permission.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_permission.xml index 2087357a568d..50093fa65a4b 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_permission.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_permission.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary" /> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_qr.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_qr.xml index 2b237163daa0..44e8a3549747 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_qr.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_qr.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_readermode.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_readermode.xml index 396e54072704..c8ce86a9c207 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_readermode.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_readermode.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_search.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_search.xml index dd401903ffbd..19972e04bc3a 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_search.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_search.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_share.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_share.xml index c36e1839d482..067ca50c37af 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_share.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_share.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_sign_in.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_sign_in.xml index 28629bb9c9b1..27cd49ef344e 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_sign_in.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_sign_in.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary" /> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_signed_out.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_signed_out.xml index 2a52d161ec99..8616a490d625 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_signed_out.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_signed_out.xml @@ -9,12 +9,12 @@ android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_storage_disabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_storage_disabled.xml index 86f59d74c8c6..2eb40fd27e1c 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_storage_disabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_storage_disabled.xml @@ -9,8 +9,8 @@ android:autoMirrored="true"> + android:fillColor="?attr/textPrimary"/> + android:fillColor="?attr/textPrimary"/> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_storage_enabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_storage_enabled.xml index b5d2f7b4a21e..3c4b14dc0131 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_storage_enabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_storage_enabled.xml @@ -10,9 +10,9 @@ android:viewportHeight="24" android:autoMirrored="true"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_sync_disconnected.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_sync_disconnected.xml index b4d61e51c4e6..8176893c9201 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_sync_disconnected.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_sync_disconnected.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_synced_tabs.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_synced_tabs.xml index 5968047c9ab5..d1d5e1270506 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_synced_tabs.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_synced_tabs.xml @@ -9,8 +9,8 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary"/> + android:fillColor="?attr/textPrimary"/> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_tab_collection.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_tab_collection.xml index df421740c1bc..3ee1e5361792 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_tab_collection.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_tab_collection.xml @@ -8,9 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_top_sites.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_top_sites.xml index 59a02d306c49..b3016a52d9dd 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_top_sites.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_top_sites.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_tracking_protection_disabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_tracking_protection_disabled.xml index 779137e7fe6e..e202377f86e6 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_tracking_protection_disabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_tracking_protection_disabled.xml @@ -9,8 +9,8 @@ android:viewportHeight="24"> + android:fillColor="?attr/textPrimary"/> + android:fillColor="?attr/textPrimary"/> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_tracking_protection_enabled.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_tracking_protection_enabled.xml index 2c5cf04a7c33..a3abe7bd5796 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_tracking_protection_enabled.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_tracking_protection_enabled.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_whats_new.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_whats_new.xml index c96c8b5b9d7e..eb5a9402056d 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/ic_whats_new.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/ic_whats_new.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/mobile/android/fenix/app/src/main/res/drawable/mozac_ic_broken_lock.xml b/mobile/android/fenix/app/src/main/res/drawable/mozac_ic_broken_lock.xml index dc9ec5a9f419..eb6c5a4d954d 100644 --- a/mobile/android/fenix/app/src/main/res/drawable/mozac_ic_broken_lock.xml +++ b/mobile/android/fenix/app/src/main/res/drawable/mozac_ic_broken_lock.xml @@ -8,12 +8,12 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/mobile/android/fenix/app/src/main/res/layout/account_preference.xml b/mobile/android/fenix/app/src/main/res/layout/account_preference.xml index 23a2bfbac7d9..0dde8b8fe964 100644 --- a/mobile/android/fenix/app/src/main/res/layout/account_preference.xml +++ b/mobile/android/fenix/app/src/main/res/layout/account_preference.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:ellipsize="marquee" android:fadingEdge="horizontal" - android:textColor="?primaryText" + android:textColor="?attr/textPrimary" android:textSize="16sp" android:visibility="gone" /> diff --git a/mobile/android/fenix/app/src/main/res/layout/account_share_list_item.xml b/mobile/android/fenix/app/src/main/res/layout/account_share_list_item.xml index 26972f46d011..172d2c35d8ce 100644 --- a/mobile/android/fenix/app/src/main/res/layout/account_share_list_item.xml +++ b/mobile/android/fenix/app/src/main/res/layout/account_share_list_item.xml @@ -37,7 +37,7 @@ android:lines="2" android:textAlignment="gravity" android:textSize="10sp" - android:textColor="?primaryText" + android:textColor="?attr/textPrimary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/mobile/android/fenix/app/src/main/res/layout/amo_collection_override_dialog.xml b/mobile/android/fenix/app/src/main/res/layout/amo_collection_override_dialog.xml index 2d9b3d5b0b09..5018fc748e10 100644 --- a/mobile/android/fenix/app/src/main/res/layout/amo_collection_override_dialog.xml +++ b/mobile/android/fenix/app/src/main/res/layout/amo_collection_override_dialog.xml @@ -19,7 +19,7 @@ android:hint="@string/customize_addon_collection_user_hint" android:inputType="number" android:singleLine="true" - android:textColor="?primaryText" /> + android:textColor="?attr/textPrimary" /> + android:textColor="?attr/textPrimary" /> diff --git a/mobile/android/fenix/app/src/main/res/layout/app_share_list_item.xml b/mobile/android/fenix/app/src/main/res/layout/app_share_list_item.xml index a3a09c5acb80..42ce0b046ecf 100644 --- a/mobile/android/fenix/app/src/main/res/layout/app_share_list_item.xml +++ b/mobile/android/fenix/app/src/main/res/layout/app_share_list_item.xml @@ -33,7 +33,7 @@ android:gravity="center|top" android:lines="2" android:textAlignment="gravity" - android:textColor="?primaryText" + android:textColor="?attr/textPrimary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/mobile/android/fenix/app/src/main/res/layout/browser_toolbar_popup_window.xml b/mobile/android/fenix/app/src/main/res/layout/browser_toolbar_popup_window.xml index 28ed26d0f14b..501494176c92 100644 --- a/mobile/android/fenix/app/src/main/res/layout/browser_toolbar_popup_window.xml +++ b/mobile/android/fenix/app/src/main/res/layout/browser_toolbar_popup_window.xml @@ -24,7 +24,7 @@ android:paddingEnd="12dp" android:text="@string/browser_toolbar_long_press_popup_copy" android:textAllCaps="false" - android:textColor="?primaryText" /> + android:textColor="?attr/textPrimary" />