From 331dc3a8ec0dfaefc9682f79a74150a10b6bb356 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Sun, 13 Mar 2022 00:18:35 -0500 Subject: [PATCH] For #24252 - Rename secondaryText attribute to textSecondary --- .../fenix/addons/AddonsManagementFragment.kt | 2 +- .../fenix/components/toolbar/BrowserToolbarView.kt | 2 +- .../history/awesomebar/AwesomeBarWrapper.kt | 4 ++-- .../fenix/library/history/toolbar/ToolbarView.kt | 2 +- .../fenix/onboarding/OnboardingRadioButton.kt | 2 +- .../fenix/search/awesomebar/AwesomeBarWrapper.kt | 4 ++-- .../mozilla/fenix/search/toolbar/ToolbarView.kt | 2 +- .../SitePermissionsManagePhoneFeatureFragment.kt | 2 +- .../res/color/secondary_state_list_text_color.xml | 2 +- app/src/main/res/color/tab_checkbox_tint.xml | 2 +- app/src/main/res/drawable/ic_all_tabs.xml | 2 +- app/src/main/res/layout/account_preference.xml | 2 +- .../main/res/layout/collection_tab_list_row.xml | 2 +- app/src/main/res/layout/collections_list_item.xml | 2 +- app/src/main/res/layout/component_bookmark.xml | 2 +- app/src/main/res/layout/component_downloads.xml | 2 +- app/src/main/res/layout/component_exceptions.xml | 4 ++-- app/src/main/res/layout/component_history.xml | 2 +- .../layout/component_history_metadata_group.xml | 2 +- .../main/res/layout/component_recently_closed.xml | 2 +- app/src/main/res/layout/component_saved_logins.xml | 4 ++-- .../layout/component_tracking_protection_panel.xml | 4 ++-- app/src/main/res/layout/credit_card_list_item.xml | 2 +- app/src/main/res/layout/custom_search_engine.xml | 8 ++++---- .../res/layout/fragment_add_ons_management.xml | 2 +- app/src/main/res/layout/fragment_edit_bookmark.xml | 6 +++--- app/src/main/res/layout/library_site_item.xml | 2 +- app/src/main/res/layout/locale_settings_item.xml | 2 +- app/src/main/res/layout/logins_item.xml | 2 +- app/src/main/res/layout/name_collection_dialog.xml | 2 +- app/src/main/res/layout/no_collections_message.xml | 2 +- .../main/res/layout/normal_browser_tray_list.xml | 2 +- .../main/res/layout/private_browser_tray_list.xml | 2 +- .../main/res/layout/recently_closed_nav_item.xml | 2 +- app/src/main/res/layout/settings_studies.xml | 2 +- .../main/res/layout/share_to_account_devices.xml | 2 +- app/src/main/res/layout/study_item.xml | 2 +- .../main/res/layout/switch_with_description.xml | 2 +- .../main/res/layout/top_sites_rename_dialog.xml | 2 +- .../res/layout/tracking_protection_category.xml | 2 +- app/src/main/res/values/attrs.xml | 3 ++- app/src/main/res/values/styles.xml | 14 ++++++++------ 42 files changed, 60 insertions(+), 57 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt index d4a732190..f4838cb1d 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt @@ -186,7 +186,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management) return AddonsManagerAdapter.Style( sectionsTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context), addonNameTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context), - addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.secondaryText, context), + addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.textSecondary, context), sectionsTypeFace = ResourcesCompat.getFont(context, R.font.metropolis_semibold), addonAllowPrivateBrowsingLabelDrawableRes = R.drawable.ic_add_on_private_browsing_label ) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt index 20881fb01..43ff7bc1b 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt @@ -105,7 +105,7 @@ class BrowserToolbarView( ) val secondaryTextColor = ContextCompat.getColor( context, - ThemeManager.resolveAttribute(R.attr.secondaryText, context) + ThemeManager.resolveAttribute(R.attr.textSecondary, context) ) val separatorColor = ContextCompat.getColor( context, diff --git a/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt b/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt index 1f7402dd8..559777285 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt @@ -56,8 +56,8 @@ class AwesomeBarWrapper @JvmOverloads constructor( colors = AwesomeBarDefaults.colors( background = Color.Transparent, title = ThemeManager.resolveAttributeColor(R.attr.textPrimary), - description = ThemeManager.resolveAttributeColor(R.attr.secondaryText), - autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.secondaryText) + description = ThemeManager.resolveAttributeColor(R.attr.textSecondary), + autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.textSecondary) ), onSuggestionClicked = { suggestion -> suggestion.onSuggestionClicked?.invoke() diff --git a/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt b/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt index 2aff8f730..89db74929 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt @@ -59,7 +59,7 @@ class ToolbarView( edit.colors = edit.colors.copy( text = context.getColorFromAttr(R.attr.textPrimary), - hint = context.getColorFromAttr(R.attr.secondaryText), + hint = context.getColorFromAttr(R.attr.textSecondary), suggestionBackground = ContextCompat.getColor( context, R.color.suggestion_highlight_color diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt index 304419b0a..95836ffbc 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt @@ -78,7 +78,7 @@ class OnboardingRadioButton( if (description != 0) { val spannableDescription = SpannableString(resources.getString(description)) spannableDescription.setTextSize(context, DESCRIPTION_TEXT_SIZE) - spannableDescription.setTextColor(context, R.attr.secondaryText) + spannableDescription.setTextColor(context, R.attr.textSecondary) builder.append("\n") builder.append(spannableDescription) } diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt index 8c1c71ac3..1167890f8 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt @@ -56,8 +56,8 @@ class AwesomeBarWrapper @JvmOverloads constructor( colors = AwesomeBarDefaults.colors( background = Color.Transparent, title = ThemeManager.resolveAttributeColor(R.attr.textPrimary), - description = ThemeManager.resolveAttributeColor(R.attr.secondaryText), - autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.secondaryText) + description = ThemeManager.resolveAttributeColor(R.attr.textSecondary), + autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.textSecondary) ), onSuggestionClicked = { suggestion -> suggestion.onSuggestionClicked?.invoke() diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt index 56bbb3643..0149a5949 100644 --- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt @@ -86,7 +86,7 @@ class ToolbarView( edit.colors = edit.colors.copy( text = context.getColorFromAttr(R.attr.textPrimary), - hint = context.getColorFromAttr(R.attr.secondaryText), + hint = context.getColorFromAttr(R.attr.textSecondary), suggestionBackground = ContextCompat.getColor( context, R.color.suggestion_highlight_color diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt index f052bbebc..acbff187b 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt @@ -246,7 +246,7 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() { val recommendedSpannable = SpannableString(subText) val subTextColor = ContextCompat.getColor( requireContext(), - ThemeManager.resolveAttribute(R.attr.secondaryText, requireContext()) + ThemeManager.resolveAttribute(R.attr.textSecondary, requireContext()) ) recommendedSpannable.setSpan( diff --git a/app/src/main/res/color/secondary_state_list_text_color.xml b/app/src/main/res/color/secondary_state_list_text_color.xml index fd11c6aef..34d43034c 100644 --- a/app/src/main/res/color/secondary_state_list_text_color.xml +++ b/app/src/main/res/color/secondary_state_list_text_color.xml @@ -4,5 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + diff --git a/app/src/main/res/color/tab_checkbox_tint.xml b/app/src/main/res/color/tab_checkbox_tint.xml index fe33814e7..f494c305d 100644 --- a/app/src/main/res/color/tab_checkbox_tint.xml +++ b/app/src/main/res/color/tab_checkbox_tint.xml @@ -2,6 +2,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/app/src/main/res/drawable/ic_all_tabs.xml b/app/src/main/res/drawable/ic_all_tabs.xml index 0818555ec..53e366324 100644 --- a/app/src/main/res/drawable/ic_all_tabs.xml +++ b/app/src/main/res/drawable/ic_all_tabs.xml @@ -9,6 +9,6 @@ android:viewportHeight="18"> diff --git a/app/src/main/res/layout/account_preference.xml b/app/src/main/res/layout/account_preference.xml index 0dde8b8fe..6dcce6d59 100644 --- a/app/src/main/res/layout/account_preference.xml +++ b/app/src/main/res/layout/account_preference.xml @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_below="@id/displayName" android:layout_alignStart="@id/displayName" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:maxLines="4" android:text="@string/preferences_account_default_name" /> diff --git a/app/src/main/res/layout/collection_tab_list_row.xml b/app/src/main/res/layout/collection_tab_list_row.xml index 6e6dc2d65..35aeff9da 100644 --- a/app/src/main/res/layout/collection_tab_list_row.xml +++ b/app/src/main/res/layout/collection_tab_list_row.xml @@ -43,7 +43,7 @@ android:layout_marginStart="8dp" android:ellipsize="end" android:singleLine="true" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="12sp" android:textStyle="bold" app:layout_constraintStart_toEndOf="@id/favicon_image" diff --git a/app/src/main/res/layout/collections_list_item.xml b/app/src/main/res/layout/collections_list_item.xml index a42e135ad..e78970ecc 100644 --- a/app/src/main/res/layout/collections_list_item.xml +++ b/app/src/main/res/layout/collections_list_item.xml @@ -56,7 +56,7 @@ android:ellipsize="end" android:maxLines="2" android:minLines="2" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/collection_item" app:layout_constraintStart_toStartOf="@+id/collection_item" diff --git a/app/src/main/res/layout/component_bookmark.xml b/app/src/main/res/layout/component_bookmark.xml index 684c15735..2914bbf38 100644 --- a/app/src/main/res/layout/component_bookmark.xml +++ b/app/src/main/res/layout/component_bookmark.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:text="@string/bookmarks_empty_message" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/component_downloads.xml b/app/src/main/res/layout/component_downloads.xml index ef2a15f7e..663137850 100644 --- a/app/src/main/res/layout/component_downloads.xml +++ b/app/src/main/res/layout/component_downloads.xml @@ -26,7 +26,7 @@ android:layout_height="0dp" android:gravity="center" android:text="@string/download_empty_message_1" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/component_exceptions.xml b/app/src/main/res/layout/component_exceptions.xml index 5c2b1fd5a..d8ef30e2a 100644 --- a/app/src/main/res/layout/component_exceptions.xml +++ b/app/src/main/res/layout/component_exceptions.xml @@ -22,7 +22,7 @@ android:padding="4dp" android:text="@string/exceptions_empty_message_description" android:textAlignment="viewStart" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="visible" app:layout_constraintTop_toTopOf="parent" /> @@ -34,7 +34,7 @@ android:padding="4dp" android:text="@string/exceptions_empty_message_learn_more_link" android:textAlignment="viewStart" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="visible" app:layout_constraintTop_toBottomOf="@id/exceptions_empty_message" /> diff --git a/app/src/main/res/layout/component_history.xml b/app/src/main/res/layout/component_history.xml index 180f69a8b..698515e58 100644 --- a/app/src/main/res/layout/component_history.xml +++ b/app/src/main/res/layout/component_history.xml @@ -33,7 +33,7 @@ android:layout_height="0dp" android:gravity="center" android:text="@string/history_empty_message" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/component_history_metadata_group.xml b/app/src/main/res/layout/component_history_metadata_group.xml index 25b0f348e..2bd63c648 100644 --- a/app/src/main/res/layout/component_history_metadata_group.xml +++ b/app/src/main/res/layout/component_history_metadata_group.xml @@ -14,7 +14,7 @@ android:layout_height="0dp" android:gravity="center" android:text="@string/history_empty_message" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/component_recently_closed.xml b/app/src/main/res/layout/component_recently_closed.xml index feaf9e690..2a9218d57 100644 --- a/app/src/main/res/layout/component_recently_closed.xml +++ b/app/src/main/res/layout/component_recently_closed.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:text="@string/recently_closed_empty_message" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/component_saved_logins.xml b/app/src/main/res/layout/component_saved_logins.xml index 7b58c88ba..8c37306de 100644 --- a/app/src/main/res/layout/component_saved_logins.xml +++ b/app/src/main/res/layout/component_saved_logins.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:text="@string/preferences_passwords_saved_logins_description_empty_text" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:text="@string/preferences_passwords_saved_logins_description_empty_learn_more_link" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" app:layout_constraintTop_toBottomOf="@id/saved_passwords_empty_message" /> diff --git a/app/src/main/res/layout/component_tracking_protection_panel.xml b/app/src/main/res/layout/component_tracking_protection_panel.xml index ab3763267..e5d258f9d 100644 --- a/app/src/main/res/layout/component_tracking_protection_panel.xml +++ b/app/src/main/res/layout/component_tracking_protection_panel.xml @@ -236,7 +236,7 @@ android:layout_height="wrap_content" android:layout_marginStart="52dp" android:layout_marginEnd="19dp" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/category_title" @@ -250,7 +250,7 @@ android:layout_marginEnd="19dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/credit_card_list_item.xml b/app/src/main/res/layout/credit_card_list_item.xml index 3e7b9f348..6fbdea234 100644 --- a/app/src/main/res/layout/credit_card_list_item.xml +++ b/app/src/main/res/layout/credit_card_list_item.xml @@ -46,7 +46,7 @@ android:layout_marginEnd="@dimen/credit_cards_saved_cards_item_margin_end" android:ellipsize="middle" android:singleLine="true" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/credit_card_logo" diff --git a/app/src/main/res/layout/custom_search_engine.xml b/app/src/main/res/layout/custom_search_engine.xml index 4ea1fd8cd..0922b3ff6 100644 --- a/app/src/main/res/layout/custom_search_engine.xml +++ b/app/src/main/res/layout/custom_search_engine.xml @@ -20,8 +20,8 @@ android:id="@+id/custom_search_engine_name_field" android:layout_width="match_parent" android:layout_height="wrap_content" - app:hintTextColor="?secondaryText" - android:textColorHint="?secondaryText" + app:hintTextColor="?attr/textSecondary" + android:textColorHint="?attr/textSecondary" app:hintTextAppearance="@style/EngineTextField" android:paddingBottom="8dp" app:errorEnabled="true"> @@ -38,8 +38,8 @@ android:id="@+id/custom_search_engine_search_string_field" android:layout_width="match_parent" android:layout_height="wrap_content" - app:hintTextColor="?secondaryText" - android:textColorHint="?secondaryText" + app:hintTextColor="?attr/textSecondary" + android:textColorHint="?attr/textSecondary" app:hintTextAppearance="@style/EngineTextField" android:paddingBottom="8dp" app:errorEnabled="true"> diff --git a/app/src/main/res/layout/fragment_add_ons_management.xml b/app/src/main/res/layout/fragment_add_ons_management.xml index 29f6c69b1..2dcd1e0a3 100644 --- a/app/src/main/res/layout/fragment_add_ons_management.xml +++ b/app/src/main/res/layout/fragment_add_ons_management.xml @@ -37,7 +37,7 @@ android:layout_gravity="center" android:gravity="center" android:text="@string/no_add_ons" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone"/> diff --git a/app/src/main/res/layout/fragment_edit_bookmark.xml b/app/src/main/res/layout/fragment_edit_bookmark.xml index a88acba1c..d9b7e6fd0 100644 --- a/app/src/main/res/layout/fragment_edit_bookmark.xml +++ b/app/src/main/res/layout/fragment_edit_bookmark.xml @@ -43,7 +43,7 @@ android:fadingEdgeLength="8dp" android:inputType="textAutoComplete" android:requiresFadingEdge="horizontal" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="15sp" tools:text="Internet for people, not profit -- Mozilla" /> @@ -74,7 +74,7 @@ android:fadingEdgeLength="8dp" android:inputType="textUri" android:requiresFadingEdge="horizontal" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="15sp" tools:text="https://www.mozilla.org/en-US/" /> @@ -100,7 +100,7 @@ android:layout_marginTop="8dp" android:drawablePadding="10dp" android:gravity="center_vertical" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" app:drawableStartCompat="@drawable/ic_folder_icon" app:drawableTint="?attr/textPrimary" diff --git a/app/src/main/res/layout/library_site_item.xml b/app/src/main/res/layout/library_site_item.xml index 16dfb53f4..5be3f6ba2 100644 --- a/app/src/main/res/layout/library_site_item.xml +++ b/app/src/main/res/layout/library_site_item.xml @@ -62,7 +62,7 @@ android:ellipsize="end" android:singleLine="true" android:textAlignment="viewStart" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="12sp" tools:text="https://example.com/" app:layout_constraintEnd_toStartOf="@id/overflow_menu" diff --git a/app/src/main/res/layout/locale_settings_item.xml b/app/src/main/res/layout/locale_settings_item.xml index bf5f077d5..ad8d02044 100644 --- a/app/src/main/res/layout/locale_settings_item.xml +++ b/app/src/main/res/layout/locale_settings_item.xml @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/locale_item_text_margin_start" android:layout_marginEnd="@dimen/locale_item_text_margin_end" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textAlignment="viewStart" android:textSize="@dimen/locale_item_subtitle_size" android:visibility="visible" diff --git a/app/src/main/res/layout/logins_item.xml b/app/src/main/res/layout/logins_item.xml index e272e1027..14dfa192b 100644 --- a/app/src/main/res/layout/logins_item.xml +++ b/app/src/main/res/layout/logins_item.xml @@ -46,7 +46,7 @@ android:layout_marginEnd="@dimen/saved_logins_item_margin_end" android:ellipsize="middle" android:singleLine="true" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/favicon_image" diff --git a/app/src/main/res/layout/name_collection_dialog.xml b/app/src/main/res/layout/name_collection_dialog.xml index 8abbf9834..042777aaf 100644 --- a/app/src/main/res/layout/name_collection_dialog.xml +++ b/app/src/main/res/layout/name_collection_dialog.xml @@ -17,7 +17,7 @@ android:text="@string/tab_tray_add_new_collection_name" android:textAllCaps="true" android:textAppearance="@style/Body16TextStyle" - android:textColor="?secondaryText" /> + android:textColor="?attr/textSecondary" /> diff --git a/app/src/main/res/layout/private_browser_tray_list.xml b/app/src/main/res/layout/private_browser_tray_list.xml index 1dee7ecb8..bd6380dcf 100644 --- a/app/src/main/res/layout/private_browser_tray_list.xml +++ b/app/src/main/res/layout/private_browser_tray_list.xml @@ -20,7 +20,7 @@ android:gravity="center_horizontal" android:paddingTop="80dp" android:text="@string/no_open_tabs_description" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="visible" /> diff --git a/app/src/main/res/layout/recently_closed_nav_item.xml b/app/src/main/res/layout/recently_closed_nav_item.xml index b2ab9253b..653c63551 100644 --- a/app/src/main/res/layout/recently_closed_nav_item.xml +++ b/app/src/main/res/layout/recently_closed_nav_item.xml @@ -55,7 +55,7 @@ android:ellipsize="end" android:singleLine="true" android:textAlignment="viewStart" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/settings_studies.xml b/app/src/main/res/layout/settings_studies.xml index b839ea3f8..63877c4d7 100644 --- a/app/src/main/res/layout/settings_studies.xml +++ b/app/src/main/res/layout/settings_studies.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:importantForAccessibility="no" android:text="@string/preference_experiments_summary_2" - android:textColor="?attr/secondaryText" + android:textColor="?attr/textSecondary" android:textColorLink="?textAccent" app:layout_constraintEnd_toEndOf="@id/studiesTitle" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/share_to_account_devices.xml b/app/src/main/res/layout/share_to_account_devices.xml index 61cde4059..6009a4a74 100644 --- a/app/src/main/res/layout/share_to_account_devices.xml +++ b/app/src/main/res/layout/share_to_account_devices.xml @@ -18,7 +18,7 @@ android:singleLine="true" android:text="@string/share_device_subheader" android:textAllCaps="true" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="12sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/study_item.xml b/app/src/main/res/layout/study_item.xml index 72e368f94..3de01402a 100644 --- a/app/src/main/res/layout/study_item.xml +++ b/app/src/main/res/layout/study_item.xml @@ -29,7 +29,7 @@ android:id="@+id/study_description" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="?secondaryText" + android:textColor="?attr/textSecondary" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@id/remove_button" app:layout_constraintStart_toStartOf="@id/studyTitle" diff --git a/app/src/main/res/layout/switch_with_description.xml b/app/src/main/res/layout/switch_with_description.xml index e7c7570c3..0a786d756 100644 --- a/app/src/main/res/layout/switch_with_description.xml +++ b/app/src/main/res/layout/switch_with_description.xml @@ -35,7 +35,7 @@ android:clickable="false" android:focusable="false" android:importantForAccessibility="no" - android:textColor="?attr/secondaryText" + android:textColor="?attr/textSecondary" android:layout_marginBottom="4dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/trackingProtectionCategoryTitle" diff --git a/app/src/main/res/layout/top_sites_rename_dialog.xml b/app/src/main/res/layout/top_sites_rename_dialog.xml index 4288b7b94..a4a81af8f 100644 --- a/app/src/main/res/layout/top_sites_rename_dialog.xml +++ b/app/src/main/res/layout/top_sites_rename_dialog.xml @@ -17,7 +17,7 @@ android:text="@string/top_sites_rename_dialog_title" android:textAllCaps="true" android:textAppearance="@style/Body16TextStyle" - android:textColor="?secondaryText" /> + android:textColor="?attr/textSecondary" /> + + @@ -39,7 +41,6 @@ - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6a3e3c5a4..dace6238f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -49,6 +49,8 @@ @color/fx_mobile_text_color_primary + + @color/fx_mobile_text_color_secondary @color/fx_mobile_text_color_accent @@ -76,7 +78,6 @@ @color/fx_mobile_text_color_primary - @color/fx_mobile_text_color_secondary @color/fx_mobile_text_color_oncolor_primary @color/accent_normal_theme @color/photonViolet70 @@ -242,6 +243,8 @@ @color/fx_mobile_private_text_color_primary + + @color/fx_mobile_private_text_color_secondary @color/fx_mobile_private_text_color_accent @@ -267,7 +270,6 @@ @color/fx_mobile_private_text_color_primary - @color/fx_mobile_private_text_color_secondary @color/fx_mobile_private_text_color_primary @color/accent_private_theme @color/photonViolet70 @@ -340,7 +342,7 @@ false @color/fx_mobile_action_color_secondary @color/fx_mobile_text_color_action_secondary - ?secondaryText + ?attr/textSecondary 0 @font/metropolis_semibold @@ -447,7 +449,7 @@ @@ -475,7 +477,7 @@