[fenix] For https://github.com/mozilla-mobile/fenix/issues/24055 - Replace ?contrastText with Action Primary Text for Primary buttons

pull/600/head
Gabriel Luong 3 years ago committed by mergify[bot]
parent 5395d028be
commit 43a41e0790

@ -69,7 +69,7 @@
android:letterSpacing="0"
android:text="@string/add_to_homescreen_title"
android:textAllCaps="false"
android:textColor="?contrastText"
android:textColor="?textActionPrimary"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/cancel_button"

@ -68,7 +68,7 @@
<!-- Text Inverted/On 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>
<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>
<!-- Action Tertiary text -->

@ -17,6 +17,8 @@
<!-- Text -->
<!-- Small heading, Text link -->
<attr name="textAccent" format="reference" />
<!-- Action Primary text -->
<attr name="textActionPrimary" format="reference" />
<!-- Icon -->
<!-- Active tab -->

@ -68,7 +68,7 @@
<!-- Text Inverted/On 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>
<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>
<!-- Action Tertiary text -->
@ -191,7 +191,7 @@
<!-- Text Inverted/On Color -->
<color name="fx_mobile_private_text_color_oncolor_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
<!-- Action Primary text -->
<color name="fx_mobile_private_text_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_private_text_color_action_primary">@color/photonLightGrey05</color>
<!-- Action Secondary text -->
<color name="fx_mobile_private_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<!-- Action Tertiary text -->

@ -45,6 +45,8 @@
<!-- Text -->
<!-- Small heading, Text link -->
<item name="textAccent">@color/fx_mobile_text_color_accent</item>
<!-- Action Primary text -->
<item name="textActionPrimary">@color/fx_mobile_text_color_action_primary</item>
<!-- Icon -->
<!-- Active tab -->
@ -236,6 +238,8 @@
<!-- Text -->
<!-- Small heading, Text link -->
<item name="textAccent">@color/fx_mobile_private_text_color_accent</item>
<!-- Action Primary text -->
<item name="textActionPrimary">@color/fx_mobile_private_text_color_action_primary</item>
<!-- Icon -->
<!-- Active tab -->
@ -357,7 +361,7 @@
<style name="PositiveButton" parent="NeutralButton">
<item name="backgroundTint">?actionPrimary</item>
<item name="iconTint">?contrastText</item>
<item name="android:textColor">?contrastText</item>
<item name="android:textColor">?textActionPrimary</item>
</style>
<style name="search_pill" parent="Widget.AppCompat.Button.Borderless">

Loading…
Cancel
Save