nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1885565 - Part 3: Add border secondary color token r=android-reviewers,007

Browse source 
Source: https://www.figma.com/file/pEyGeE4KV5ytYHeXMfLcEr/Mobile-Styles?type=design&node-id=6092-8714&mode=dev

Differential Revision: https://phabricator.services.mozilla.com/D206216
This commit is contained in:
Gabriel Luong 2024-04-01 22:45:02 +00:00
parent 55fe28751e
commit 80663eebde
5 changed files with 16 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
View file

@ -157,6 +157,7 @@ private val darkColorPalette = FirefoxColors(
iconGradientStart = PhotonColors.Violet20,
iconGradientEnd = PhotonColors.Blue20,
borderPrimary = PhotonColors.DarkGrey05,
borderSecondary = PhotonColors.DarkGrey10,
borderInverted = PhotonColors.LightGrey30,
borderFormDefault = PhotonColors.LightGrey05,
borderAccent = PhotonColors.Violet40,
@ -234,6 +235,7 @@ private val lightColorPalette = FirefoxColors(
iconGradientStart = PhotonColors.Violet50,
iconGradientEnd = PhotonColors.Blue60,
borderPrimary = PhotonColors.LightGrey30,
borderSecondary = PhotonColors.LightGrey20,
borderInverted = PhotonColors.DarkGrey05,
borderFormDefault = PhotonColors.DarkGrey90,
borderAccent = PhotonColors.Ink20,
@ -247,6 +249,7 @@ private val privateColorPalette = darkColorPalette.copy(
layer2 = PhotonColors.Ink50,
layer3 = PhotonColors.Ink90,
layerSearch = PhotonColors.Ink90,
borderSecondary = PhotonColors.Ink10,
borderToolbarDivider = PhotonColors.Violet80,
)
@ -324,6 +327,7 @@ class FirefoxColors(
iconGradientStart: Color,
iconGradientEnd: Color,
borderPrimary: Color,
borderSecondary: Color,
borderInverted: Color,
borderFormDefault: Color,
borderAccent: Color,
@ -600,6 +604,9 @@ class FirefoxColors(
var borderPrimary by mutableStateOf(borderPrimary)
private set
var borderSecondary by mutableStateOf(borderSecondary)
private set
// Onboarding
var borderInverted by mutableStateOf(borderInverted)
private set
@ -697,6 +704,7 @@ class FirefoxColors(
iconGradientStart = other.iconGradientStart
iconGradientEnd = other.iconGradientEnd
borderPrimary = other.borderPrimary
borderSecondary = other.borderSecondary
borderInverted = other.borderInverted
borderFormDefault = other.borderFormDefault
borderAccent = other.borderAccent
@ -778,6 +786,7 @@ class FirefoxColors(
iconGradientStart: Color = this.iconGradientStart,
iconGradientEnd: Color = this.iconGradientEnd,
borderPrimary: Color = this.borderPrimary,
borderSecondary: Color = this.borderSecondary,
borderInverted: Color = this.borderInverted,
borderFormDefault: Color = this.borderFormDefault,
borderAccent: Color = this.borderAccent,
@ -853,6 +862,7 @@ class FirefoxColors(
iconGradientStart = iconGradientStart,
iconGradientEnd = iconGradientEnd,
borderPrimary = borderPrimary,
borderSecondary = borderSecondary,
borderInverted = borderInverted,
borderFormDefault = borderFormDefault,
borderAccent = borderAccent,

1
mobile/android/fenix/app/src/main/res/values-night/colors.xml
View file

@ -135,6 +135,7 @@
<!-- Border -->
<!-- Default, Divider, Dotted -->
<color name="fx_mobile_border_color_primary">@color/photonDarkGrey05</color>
<color name="fx_mobile_border_color_secondary">@color/photonDarkGrey10</color>
<!-- Onboarding -->
<color name="fx_mobile_border_color_inverted" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
<!-- Form parts -->

1
mobile/android/fenix/app/src/main/res/values/attrs.xml
View file

@ -48,6 +48,7 @@
<!-- Border -->
<!-- Default, Divider, Dotted -->
<attr name="borderPrimary" format="reference" />
<attr name="borderSecondary" format="reference" />
<!-- Toolbar divider -->
<attr name="borderToolbarDivider" format="reference"/>

2
mobile/android/fenix/app/src/main/res/values/colors.xml
View file

@ -134,6 +134,7 @@
<!-- Border -->
<!-- Default, Divider, Dotted -->
<color name="fx_mobile_border_color_primary">@color/photonLightGrey30</color>
<color name="fx_mobile_border_color_secondary">@color/photonLightGrey20</color>
<!-- Toolbar divider -->
<color name="fx_mobile_border_color_toolbar_divider">@color/photonLightGrey10</color>
<!-- Onboarding -->
@ -268,6 +269,7 @@
<!-- Border -->
<!-- Default, Divider, Dotted -->
<color name="fx_mobile_private_border_color_primary">@color/photonDarkGrey05</color>
<color name="fx_mobile_private_border_color_secondary">@color/photonInk10</color>
<!-- Onboarding -->
<color name="fx_mobile_private_border_color_inverted" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
<!-- Form parts -->

2
mobile/android/fenix/app/src/main/res/values/styles.xml
View file

@ -86,6 +86,7 @@
<!-- Border -->
<!-- Default, Divider, Dotted -->
<item name="borderPrimary">@color/fx_mobile_border_color_primary</item>
<item name="borderSecondary">@color/fx_mobile_border_color_secondary</item>
<!-- Toolbar divider -->
<item name="borderToolbarDivider">@color/fx_mobile_border_color_toolbar_divider</item>
<!-- Active thumb color & Active track color (30% transparency) -->
@ -281,6 +282,7 @@
<!-- Border -->
<!-- Default, Divider, Dotted -->
<item name="borderPrimary">@color/fx_mobile_private_border_color_primary</item>
<item name="borderSecondary">@color/fx_mobile_private_border_color_secondary</item>
<!-- Toolbar divider -->
<item name="borderToolbarDivider">@color/fx_mobile_private_border_color_toolbar_divider</item>