Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-05 21:20:45 +00:00
Code Issues Releases Wiki Activity

For #23049 - Consolidate @color/fx_mobile_text_color_accent with @color/fx_mobile_text_color_action

Browse Source 
- Removes @color/fx_mobile_text_color_action
- Use the colors from @color/fx_mobile_text_color_action in @color/fx_mobile_text_color_accent
This commit is contained in:
Gabriel Luong 2022-01-03 23:26:29 -05:00 committed by mergify[bot]
parent 277e94881b
commit 986a57d40b
7 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
View File

@ -65,7 +65,6 @@ private val darkColorPalette = FirefoxColors(
textSecondary = PhotonColors.LightGrey40,
textDisabled = PhotonColors.LightGrey05A40,
textWarning = PhotonColors.Red40,
textLink = PhotonColors.Violet40,
textAccent = PhotonColors.Violet40,
textInverted = PhotonColors.White,
iconPrimary = PhotonColors.LightGrey05,
@ -114,8 +113,7 @@ private val lightColorPalette = FirefoxColors(
textSecondary = PhotonColors.DarkGrey05,
textDisabled = PhotonColors.DarkGrey90A40,
textWarning = PhotonColors.Red80,
textLink = PhotonColors.Violet70,
textAccent = PhotonColors.Violet90,
textAccent = PhotonColors.Violet70,
textInverted = PhotonColors.White,
iconPrimary = PhotonColors.DarkGrey90,
iconSecondary = PhotonColors.DarkGrey05,
@ -168,7 +166,6 @@ class FirefoxColors(
textSecondary: Color,
textDisabled: Color,
textWarning: Color,
textLink: Color,
textAccent: Color,
textInverted: Color,
iconPrimary: Color,
@ -268,10 +265,7 @@ class FirefoxColors(
// Warning text
var textWarning by mutableStateOf(textWarning)
private set
// Text link
var textLink by mutableStateOf(textLink)
private set
// Small heading
// Small heading, Text link
var textAccent by mutableStateOf(textAccent)
private set
// Text Inverted/On Color
@ -359,7 +353,6 @@ class FirefoxColors(
textSecondary = other.textSecondary
textDisabled = other.textDisabled
textWarning = other.textWarning
textLink = other.textLink
textAccent = other.textAccent
textInverted = other.textInverted
iconPrimary = other.iconPrimary
@ -408,7 +401,6 @@ class FirefoxColors(
textSecondary = textSecondary,
textDisabled = textDisabled,
textWarning = textWarning,
textLink = textLink,
textAccent = textAccent,
textInverted = textInverted,
iconPrimary = iconPrimary,

2
app/src/main/res/layout/recent_bookmarks_header.xml
View File

@ -38,7 +38,7 @@
android:maxLines="1"
android:nestedScrollingEnabled="false"
android:text="@string/recently_saved_show_all"
android:textColor="@color/fx_mobile_text_color_action"
android:textColor="@color/fx_mobile_text_color_accent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@id/header" />

2
app/src/main/res/layout/recent_tabs_header.xml
View File

@ -36,7 +36,7 @@
android:maxLines="1"
android:nestedScrollingEnabled="false"
android:text="@string/recent_tabs_show_all"
android:textColor="@color/fx_mobile_text_color_action"
android:textColor="@color/fx_mobile_text_color_accent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@id/header" />

2
app/src/main/res/layout/recent_visits_header.xml
View File

@ -37,7 +37,7 @@
android:maxLines="1"
android:nestedScrollingEnabled="false"
android:text="@string/recent_tabs_show_all"
android:textColor="@color/fx_mobile_text_color_action"
android:textColor="@color/fx_mobile_text_color_accent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@id/header" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -55,10 +55,8 @@
<color name="fx_mobile_text_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
<!-- Warning text -->
<color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color>
<!-- Text link -->
<color name="fx_mobile_text_color_action">@color/photonViolet40</color>
<!-- Small heading -->
<color name="fx_mobile_text_color_accent" tools:ignore="UnusedResources">@color/photonViolet40</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent">@color/photonViolet40</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color>

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

@ -55,10 +55,8 @@
<color name="fx_mobile_text_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey90A40</color>
<!-- Warning text -->
<color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed80</color>
<!-- Text link -->
<color name="fx_mobile_text_color_action">@color/photonViolet70</color>
<!-- Small heading -->
<color name="fx_mobile_text_color_accent" tools:ignore="UnusedResources">@color/photonViolet90</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent">@color/photonViolet70</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color>

2
app/src/main/res/values/styles.xml
View File

@ -22,7 +22,7 @@
<item name="android:windowEnableSplitTouch">false</item>
<item name="android:splitMotionEvents">false</item>
<item name="bottomSheetDialogTheme">@style/BottomSheet</item>
<item name="android:textColorLink">@color/fx_mobile_text_color_action</item>
<item name="android:textColorLink">@color/fx_mobile_text_color_accent</item>
<item name="mozacInputLayoutErrorTextColor"
tools:ignore="UnusedResources">@color/destructive_normal_theme</item>