For #24141 - Replace @color/button_text_color with @color/fx_mobile_[text|icon]_color_action_secondary

upstream-sync
Gabriel Luong 2 years ago committed by mergify[bot]
parent 76c2f1e210
commit bb94bc86e5

@ -50,7 +50,7 @@
android:maxLines="2"
android:lineHeight="24sp"
android:text="@string/migration_title"
android:textColor="@color/button_text_color"
android:textColor="@color/fx_mobile_text_color_action_secondary"
android:textSize="@dimen/migration_welcome_title_text_size"
android:textAppearance="@style/Header16TextStyle"
app:layout_constraintBottom_toTopOf="@+id/migration_description"

@ -72,7 +72,7 @@
<!-- Action Primary text -->
<color name="fx_mobile_text_color_action_primary">@color/photonLightGrey05</color>
<!-- Action Secondary text -->
<color name="fx_mobile_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<color name="fx_mobile_text_color_action_secondary">@color/photonDarkGrey90</color>
<!-- Action Tertiary text -->
<color name="fx_mobile_text_color_action_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Tertiary Active text -->
@ -106,7 +106,7 @@
<!-- Action Primary Icon -->
<color name="fx_mobile_icon_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Secondary Icon -->
<color name="fx_mobile_icon_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<color name="fx_mobile_icon_color_action_secondary">@color/photonDarkGrey90</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start">@color/photonViolet20</color>
<!-- Reader, ETP Shield -->

@ -72,7 +72,7 @@
<!-- Action Primary text -->
<color name="fx_mobile_text_color_action_primary">@color/photonLightGrey05</color>
<!-- Action Secondary text -->
<color name="fx_mobile_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<color name="fx_mobile_text_color_action_secondary">@color/photonDarkGrey90</color>
<!-- Action Tertiary text -->
<color name="fx_mobile_text_color_action_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<!-- Action Tertiary Active text -->
@ -106,7 +106,7 @@
<!-- Action Primary Icon -->
<color name="fx_mobile_icon_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Secondary Icon -->
<color name="fx_mobile_icon_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<color name="fx_mobile_icon_color_action_secondary">@color/photonDarkGrey90</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start">@color/photonViolet50</color>
<!-- Reader, ETP Shield -->
@ -314,9 +314,6 @@
<!-- Launcher Icon colors -->
<color name="ic_launcher_background">#FDFDFD</color>
<!-- Button Colors -->
<color name="button_text_color">@color/photonInk20</color>
<!-- Private Browsing Mode Persistent Notification -->
<color name="pbm_notification_color">@color/photonViolet70</color>

@ -327,7 +327,7 @@
<!-- UI button styling -->
<style name="NeutralButton" parent="Widget.MaterialComponents.Button.TextButton">
<item name="iconTint">@color/button_text_color</item>
<item name="iconTint">@color/fx_mobile_icon_color_action_secondary</item>
<item name="iconPadding">8dp</item>
<item name="iconGravity">textStart</item>
<item name="android:textAlignment">center</item>
@ -337,7 +337,7 @@
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">false</item>
<item name="backgroundTint">@color/fx_mobile_action_color_secondary</item>
<item name="android:textColor">@color/button_text_color</item>
<item name="android:textColor">@color/fx_mobile_text_color_action_secondary</item>
<item name="rippleColor">?secondaryText</item>
<item name="android:letterSpacing">0</item>
<item name="fontFamily">@font/metropolis_semibold</item>

Loading…
Cancel
Save