ishan/fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #23850 - Replace @color/neutral_text with @color/fx_mobile_[icon|text]_color_oncolor

Browse Source
This commit is contained in:
Gabriel Luong 2022-02-20 20:28:57 -05:00 committed by mergify[bot]
parent eb16933692
commit 7713305df1
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/layout/component_collection_creation.xml
View File

@ -23,10 +23,10 @@
android:paddingBottom="16dp"
android:text="@string/create_collection_select_tabs"
android:textAppearance="@style/HeaderTextStyle"
android:textColor="@color/neutral_text"
android:textColor="@color/fx_mobile_text_color_oncolor_primary"
android:textSize="20sp"
app:drawableStartCompat="@drawable/mozac_ic_back"
app:drawableTint="@color/neutral_text"
app:drawableTint="@color/fx_mobile_icon_color_oncolor"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
@ -47,7 +47,7 @@
android:paddingBottom="16dp"
android:text="@string/create_collection_select_all"
android:textAllCaps="false"
android:textColor="@color/neutral_text"
android:textColor="@color/fx_mobile_text_color_oncolor_primary"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@id/back_button"
app:layout_constraintEnd_toEndOf="parent"

6
app/src/main/res/layout/component_collection_creation_name_collection.xml
View File

@ -20,10 +20,10 @@
android:gravity="start|center_vertical"
android:text="@string/create_collection_name_collection"
android:textAppearance="@style/HeaderTextStyle"
android:textColor="@color/neutral_text"
android:textColor="@color/fx_mobile_text_color_oncolor_primary"
android:textSize="20sp"
app:drawableStartCompat="@drawable/mozac_ic_back"
app:drawableTint="@color/neutral_text"
app:drawableTint="@color/fx_mobile_icon_color_oncolor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ButtonStyleXmlDetector" />
@ -37,7 +37,7 @@
android:background="?android:attr/selectableItemBackgroundBorderless"
android:text="@string/create_collection_select_all"
android:textAllCaps="false"
android:textColor="@color/neutral_text"
android:textColor="@color/fx_mobile_text_color_oncolor_primary"
android:textSize="16sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"

6
app/src/main/res/layout/component_collection_creation_select_collection.xml
View File

@ -20,10 +20,10 @@
android:gravity="start|center_vertical"
android:text="@string/create_collection_select_collection"
android:textAppearance="@style/HeaderTextStyle"
android:textColor="@color/neutral_text"
android:textColor="@color/fx_mobile_text_color_oncolor_primary"
android:textSize="20sp"
app:drawableStartCompat="@drawable/mozac_ic_back"
app:drawableTint="@color/neutral_text"
app:drawableTint="@color/fx_mobile_icon_color_oncolor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ButtonStyleXmlDetector" />
@ -37,7 +37,7 @@
android:background="?android:attr/selectableItemBackgroundBorderless"
android:text="@string/create_collection_select_all"
android:textAllCaps="false"
android:textColor="@color/neutral_text"
android:textColor="@color/fx_mobile_text_color_oncolor_primary"
android:textSize="16sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"

6
app/src/main/res/values-night/colors.xml
View File

@ -66,9 +66,9 @@
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent_disabled" tools:ignore="UnusedResources">@color/photonViolet20A60</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_text_color_oncolor_primary">@color/photonLightGrey05</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
<color name="fx_mobile_text_color_oncolor_secondary">@color/photonLightGrey40</color>
<!-- Action Primary text -->
<color name="fx_mobile_text_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Secondary text -->
@ -90,7 +90,7 @@
<!-- Disabled icon -->
<color name="fx_mobile_icon_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
<!-- Icon inverted (on color) -->
<color name="fx_mobile_icon_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_icon_color_oncolor">@color/photonLightGrey05</color>
<!-- Information -->
<color name="fx_mobile_icon_color_information">@color/photonBlue30</color>
<!-- Icon button -->

7
app/src/main/res/values/colors.xml
View File

@ -66,9 +66,9 @@
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent_disabled" tools:ignore="UnusedResources">@color/photonViolet70A80</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_text_color_oncolor_primary">@color/photonLightGrey05</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
<color name="fx_mobile_text_color_oncolor_secondary">@color/photonLightGrey40</color>
<!-- Action Primary text -->
<color name="fx_mobile_text_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Secondary text -->
@ -90,7 +90,7 @@
<!-- Disabled icon -->
<color name="fx_mobile_icon_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey90A40</color>
<!-- Icon inverted (on color) -->
<color name="fx_mobile_icon_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_icon_color_oncolor">@color/photonLightGrey05</color>
<!-- Information -->
<color name="fx_mobile_icon_color_information">@color/photonBlue30</color>
<!-- Icon button -->
@ -244,7 +244,6 @@
<!-- Misc colors applied universally-->
<color name="suggestion_highlight_color">#5C592ACB</color>
<color name="white_color">@color/photonLightGrey05</color>
<color name="neutral_text">@color/white_color</color>
<color name="text_scale_example_text_color">#232749</color>
<color name="sync_error_background_color">#FFF36E</color>
<color name="sync_error_text_color">@color/photonYellow90</color>