Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-03 23:15:31 +00:00
Code Issues Releases Wiki Activity

For #23761 - Add Text Warning Button design token

Browse Source
This commit is contained in:
Gabriel Luong 2022-02-15 16:28:35 -05:00 committed by mergify[bot]
parent 2ec29b8101
commit e568f2e151
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,7 @@ private val darkColorPalette = FirefoxColors(
textSecondary = PhotonColors.LightGrey40,
textDisabled = PhotonColors.LightGrey05A40,
textWarning = PhotonColors.Red20,
textWarningButton = PhotonColors.Red70,
textAccent = PhotonColors.Violet20,
textAccentDisabled = PhotonColors.Violet20A60,
textOnColorPrimary = PhotonColors.LightGrey05,
@ -126,6 +127,7 @@ private val lightColorPalette = FirefoxColors(
textSecondary = PhotonColors.DarkGrey05,
textDisabled = PhotonColors.DarkGrey90A40,
textWarning = PhotonColors.Red70,
textWarningButton = PhotonColors.Red70,
textAccent = PhotonColors.Violet70,
textAccentDisabled = PhotonColors.Violet70A80,
textOnColorPrimary = PhotonColors.LightGrey05,
@ -190,6 +192,7 @@ class FirefoxColors(
textSecondary: Color,
textDisabled: Color,
textWarning: Color,
textWarningButton: Color,
textAccent: Color,
textAccentDisabled: Color,
textOnColorPrimary: Color,
@ -304,6 +307,9 @@ class FirefoxColors(
// Warning text
var textWarning by mutableStateOf(textWarning)
private set
// Warning text on Secondary button
var textWarningButton by mutableStateOf(textWarningButton)
private set
// Small heading, Text link
var textAccent by mutableStateOf(textAccent)
private set
@ -422,6 +428,7 @@ class FirefoxColors(
textSecondary = other.textSecondary
textDisabled = other.textDisabled
textWarning = other.textWarning
textWarningButton = other.textWarningButton
textAccent = other.textAccent
textAccentDisabled = other.textAccentDisabled
textOnColorPrimary = other.textOnColorPrimary
@ -481,6 +488,7 @@ class FirefoxColors(
textSecondary = textSecondary,
textDisabled = textDisabled,
textWarning = textWarning,
textWarningButton = textWarningButton,
textAccent = textAccent,
textAccentDisabled = textAccentDisabled,
textOnColorPrimary = textOnColorPrimary,

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

@ -59,6 +59,8 @@
<color name="fx_mobile_text_color_disabled">@color/photonLightGrey05A40</color>
<!-- Warning text -->
<color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed20</color>
<!-- Warning text on Secondary button -->
<color name="fx_mobile_text_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent">@color/photonViolet20</color>
<!-- Small heading, Text link -->

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

@ -59,6 +59,8 @@
<color name="fx_mobile_text_color_disabled">@color/photonDarkGrey90A40</color>
<!-- Warning text -->
<color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed70</color>
<!-- Warning text on Secondary button -->
<color name="fx_mobile_text_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent">@color/photonViolet70</color>
<!-- Small heading, Text link -->