Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

For #22975 - Replace aboutLink attribute with Text Accent color token

Browse Source
upstream-sync
Gabriel Luong 2 years ago committed by mergify[bot]
parent 5d8587e5d1
commit 27336c2368
7 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/res/layout/fragment_add_on_details.xml
Unescape Escape View File

@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?primaryText"
android:textColorLink="?aboutLink"
android:textColorLink="?textAccent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/lorem/random" />
@ -134,7 +134,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/mozac_feature_addons_home_page"
android:textColor="?aboutLink"
android:textColor="?textAccent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/last_updated_divider" />

2
app/src/main/res/layout/fragment_add_on_permissions.xml
Unescape Escape View File

@ -28,6 +28,6 @@
android:paddingEnd="16dp"
android:text="@string/mozac_feature_addons_learn_more"
style="@style/AboutHeaderContentText"
android:textColor="?aboutLink"/>
android:textColor="?textAccent"/>
</RelativeLayout>
</ScrollView>

2
app/src/main/res/layout/settings_studies.xml
Unescape Escape View File

@ -31,7 +31,7 @@
android:importantForAccessibility="no"
android:text="@string/preference_experiments_summary_2"
android:textColor="?attr/secondaryText"
android:textColorLink="?aboutLink"
android:textColorLink="?textAccent"
app:layout_constraintEnd_toEndOf="@id/studiesTitle"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="@id/studiesTitle"

1
app/src/main/res/values-night/colors.xml
Unescape Escape View File

@ -105,7 +105,6 @@
<color name="accent_normal_theme">@color/photonViolet50</color>
<color name="accent_bright_normal_theme">@color/accent_bright_dark_theme</color>
<color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_dark_theme</color>
<color name="about_link_normal_theme">@color/photonViolet40</color>
<color name="tab_ring_normal_theme">@color/accent_normal_theme</color>
<color name="neutral_normal_theme">@color/photonGrey20</color>
<color name="neutral_faded_normal_theme">#1FFBFBFE</color>

5
app/src/main/res/values/attrs.xml
Unescape Escape View File

@ -3,13 +3,16 @@
- 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/. -->
<resources>
<!-- Design system color attributes -->
<!-- Small heading, Text link -->
<attr name="textAccent" format="reference" />
<!-- Color palette attributes -->
<attr name="primaryText" format="reference" />
<attr name="secondaryText" format="reference" />
<attr name="contrastText" format="reference" />
<attr name="accent" format="reference" />
<attr name="accentBright" format="reference" />
<attr name="aboutLink" format="reference" />
<attr name="accentHighContrast" format="reference" />
<attr name="accentUsedOnDarkBackground" format="reference" />
<attr name="tabRing" format="reference" />

4
app/src/main/res/values/colors.xml
Unescape Escape View File

@ -118,7 +118,7 @@
<color name="fx_mobile_private_text_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
<color name="fx_mobile_private_text_color_tertiary" tools:ignore="UnusedResources">@color/photonViolet40</color>
<color name="fx_mobile_private_text_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
<color name="fx_mobile_private_text_color_action" tools:ignore="UnusedResources">@color/photonViolet40</color>
<color name="fx_mobile_private_text_color_accent">@color/photonViolet40</color>
<color name="fx_mobile_private_text_color_warning_light" tools:ignore="UnusedResources">@color/photonRed80</color>
<color name="fx_mobile_private_text_color_warning_dark" tools:ignore="UnusedResources">@color/photonRed40</color>
@ -136,7 +136,6 @@
<color name="primary_text_light_theme">@color/photonInk80</color>
<color name="accent_light_theme">@color/photonInk20</color>
<color name="accent_bright_light_theme">@color/photonViolet70</color>
<color name="about_link_normal_theme">@color/photonViolet70</color>
<color name="dark_grey_90_gradient_start">@color/photonDarkGrey90</color>
<color name="dark_grey_90_gradient_end">#0015141A</color>
<color name="preference_section_header_normal_theme">@color/accent_bright_light_theme</color>
@ -163,7 +162,6 @@
<color name="above_private_theme">@color/photonInk50</color>
<color name="accent_private_theme">@color/photonViolet50</color>
<color name="accent_bright_private_theme">@color/photonViolet70</color>
<color name="about_link_private_theme">@color/photonViolet40</color>
<color name="accent_high_contrast_private_theme">#AA71FF</color>
<color name="tab_ring_private_theme">#F565FF</color>
<color name="neutral_private_theme">@color/photonGrey20</color>

12
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -31,6 +31,10 @@
<item name="mozacLoginSelectHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectLoginHeaderTextStyle</item>
<item name="mozacSelectCreditCardHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectCreditCardHeaderTextStyle</item>
<!-- Design system color attributes -->
<!-- Small heading, Text link -->
<item name="textAccent">@color/fx_mobile_text_color_accent</item>
<!-- Active thumb color & Active track color (30% transparency) -->
<item name="colorControlActivated">@color/accent_high_contrast_normal_theme</item>
<!-- Inactive thumb color -->
@ -46,7 +50,6 @@
<item name="contrastText">@color/contrast_text_normal_theme</item>
<item name="accent">@color/accent_normal_theme</item>
<item name="accentBright">@color/accent_bright_normal_theme</item>
<item name="aboutLink">@color/about_link_normal_theme</item>
<item name="accentHighContrast">@color/accent_high_contrast_normal_theme</item>
<item name="foundation">@color/fx_mobile_layer_color_1</item>
<item name="above">@color/above_normal_theme</item>
@ -213,6 +216,10 @@
<item name="mozacLoginSelectHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectLoginHeaderTextStyle</item>
<item name="mozacSelectCreditCardHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectCreditCardHeaderTextStyle</item>
<!-- Design system color attributes -->
<!-- Small heading, Text link -->
<item name="textAccent">@color/fx_mobile_private_text_color_accent</item>
<!-- Inactive thumb color -->
<item name="colorSwitchThumbNormal">@color/toggle_off_knob_dark_theme</item>
<!-- Inactive track color(30% transparency) -->
@ -226,7 +233,6 @@
<item name="contrastText">@color/contrast_text_private_theme</item>
<item name="accent">@color/accent_private_theme</item>
<item name="accentBright">@color/accent_bright_private_theme</item>
<item name="aboutLink">@color/about_link_private_theme</item>
<item name="accentHighContrast">@color/accent_high_contrast_private_theme</item>
<item name="foundation">@color/foundation_private_theme</item>
<item name="above">@color/above_private_theme</item>
@ -539,7 +545,7 @@
<style name="ShareDialogStyle" parent="DialogStyleBase"/>
<style name="AboutItemText" parent="TextAppearance.MaterialComponents.Body2">
<item name="android:textColor">?aboutLink</item>
<item name="android:textColor">?textAccent</item>
<item name="android:textSize">@dimen/about_items_text_size</item>
<item name="android:paddingStart">@dimen/about_list_item_text_padding</item>
<item name="android:paddingEnd">@dimen/about_list_item_text_padding</item>

Write Preview
Loading…
Cancel
Save