2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-11 13:11:01 +00:00

For #23839 - Replace @color/contrast_text_normal_theme with @color/fx_mobile_[text|icon]_color_oncolor

This commit is contained in:
Gabriel Luong 2022-01-23 17:05:30 -05:00 committed by mergify[bot]
parent 8ae31f625c
commit 0b26bac220
5 changed files with 6 additions and 8 deletions

View File

@ -52,7 +52,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/multiselect_title" app:layout_constraintTop_toTopOf="@+id/multiselect_title"
app:srcCompat="@drawable/ic_close" app:srcCompat="@drawable/ic_close"
app:tint="@color/contrast_text_normal_theme" /> app:tint="@color/fx_mobile_icon_color_oncolor" />
<TextView <TextView
android:id="@+id/multiselect_title" android:id="@+id/multiselect_title"
@ -60,7 +60,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:textColor="@color/contrast_text_normal_theme" android:textColor="@color/fx_mobile_text_color_oncolor_primary"
android:textSize="20sp" android:textSize="20sp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:fontFamily="@font/metropolis_semibold" app:fontFamily="@font/metropolis_semibold"

View File

@ -20,7 +20,7 @@
app:layout_constraintEnd_toStartOf="@id/share_multi_select" app:layout_constraintEnd_toStartOf="@id/share_multi_select"
app:layout_constraintTop_toTopOf="@id/topBar" app:layout_constraintTop_toTopOf="@id/topBar"
app:srcCompat="@drawable/ic_tab_collection" app:srcCompat="@drawable/ic_tab_collection"
app:tint="@color/contrast_text_normal_theme" /> app:tint="@color/fx_mobile_icon_color_oncolor" />
<ImageButton <ImageButton
android:id="@+id/share_multi_select" android:id="@+id/share_multi_select"
@ -33,7 +33,7 @@
app:layout_constraintEnd_toStartOf="@id/menu_multi_select" app:layout_constraintEnd_toStartOf="@id/menu_multi_select"
app:layout_constraintTop_toTopOf="@id/topBar" app:layout_constraintTop_toTopOf="@id/topBar"
app:srcCompat="@drawable/ic_share" app:srcCompat="@drawable/ic_share"
app:tint="@color/contrast_text_normal_theme" /> app:tint="@color/fx_mobile_icon_color_oncolor" />
<ImageButton <ImageButton
android:id="@+id/menu_multi_select" android:id="@+id/menu_multi_select"
@ -46,5 +46,5 @@
app:layout_constraintEnd_toEndOf="@id/topBar" app:layout_constraintEnd_toEndOf="@id/topBar"
app:layout_constraintTop_toTopOf="@id/topBar" app:layout_constraintTop_toTopOf="@id/topBar"
app:srcCompat="@drawable/ic_menu" app:srcCompat="@drawable/ic_menu"
app:tint="@color/contrast_text_normal_theme" /> app:tint="@color/fx_mobile_icon_color_oncolor" />
</merge> </merge>

View File

@ -123,7 +123,6 @@
<color name="fx_mobile_border_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color> <color name="fx_mobile_border_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color>
<!-- Normal theme colors for dark mode --> <!-- Normal theme colors for dark mode -->
<color name="contrast_text_normal_theme">@color/fx_mobile_text_color_primary</color>
<color name="caption_text_normal_theme">@color/photonLightGrey70</color> <color name="caption_text_normal_theme">@color/photonLightGrey70</color>
<color name="inset_normal_theme">@color/photonDarkGrey50</color> <color name="inset_normal_theme">@color/photonDarkGrey50</color>
<color name="accent_normal_theme">@color/photonViolet50</color> <color name="accent_normal_theme">@color/photonViolet50</color>

View File

@ -197,7 +197,6 @@
<color name="tab_tray_item_media_background_private_theme">@color/photonViolet50</color> <color name="tab_tray_item_media_background_private_theme">@color/photonViolet50</color>
<!-- Normal theme colors for light mode --> <!-- Normal theme colors for light mode -->
<color name="contrast_text_normal_theme">@color/photonLightGrey05</color>
<color name="caption_text_normal_theme">@color/photonLightGrey90</color> <color name="caption_text_normal_theme">@color/photonLightGrey90</color>
<color name="inset_normal_theme">@color/photonLightGrey30</color> <color name="inset_normal_theme">@color/photonLightGrey30</color>
<color name="accent_normal_theme">@color/photonInk20</color> <color name="accent_normal_theme">@color/photonInk20</color>

View File

@ -49,7 +49,7 @@
<!-- Updated color attributes --> <!-- Updated color attributes -->
<item name="primaryText">@color/fx_mobile_text_color_primary</item> <item name="primaryText">@color/fx_mobile_text_color_primary</item>
<item name="secondaryText">@color/fx_mobile_text_color_secondary</item> <item name="secondaryText">@color/fx_mobile_text_color_secondary</item>
<item name="contrastText">@color/contrast_text_normal_theme</item> <item name="contrastText">@color/fx_mobile_text_color_oncolor_primary</item>
<item name="accent">@color/accent_normal_theme</item> <item name="accent">@color/accent_normal_theme</item>
<item name="accentBright">@color/photonViolet70</item> <item name="accentBright">@color/photonViolet70</item>
<item name="accentHighContrast">@color/accent_high_contrast_normal_theme</item> <item name="accentHighContrast">@color/accent_high_contrast_normal_theme</item>