From 3f96c597773385b46f43bc382002b2726f12deb3 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Fri, 28 Jan 2022 12:07:15 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/23450 - Rename design token Border Default to Border Primary --- .../fenix/home/recentvisits/view/RecentlyVisited.kt | 2 +- .../java/org/mozilla/fenix/theme/FirefoxTheme.kt | 12 ++++++------ app/src/main/res/layout/component_tabstray2.xml | 2 +- app/src/main/res/layout/tab_tray_grid_item.xml | 4 ++-- app/src/main/res/values-night/colors.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/recentvisits/view/RecentlyVisited.kt b/app/src/main/java/org/mozilla/fenix/home/recentvisits/view/RecentlyVisited.kt index 0d47a4df24..a694cfd41c 100644 --- a/app/src/main/java/org/mozilla/fenix/home/recentvisits/view/RecentlyVisited.kt +++ b/app/src/main/java/org/mozilla/fenix/home/recentvisits/view/RecentlyVisited.kt @@ -349,7 +349,7 @@ private fun RecentlyVisitedDivider( ) { Divider( modifier = modifier, - color = FirefoxTheme.colors.borderDefault, + color = FirefoxTheme.colors.borderPrimary, thickness = 0.5.dp ) } diff --git a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt index b8cf7aaa0e..d2c8a044db 100644 --- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt +++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt @@ -89,7 +89,7 @@ private val darkColorPalette = FirefoxColors( iconAccentYellow = PhotonColors.Yellow20, iconGradientStart = PhotonColors.Violet20, iconGradientEnd = PhotonColors.Blue20, - borderDefault = PhotonColors.DarkGrey05, + borderPrimary = PhotonColors.DarkGrey05, borderInverted = PhotonColors.LightGrey30, borderFormDefault = PhotonColors.LightGrey05, borderAccent = PhotonColors.Violet40, @@ -146,7 +146,7 @@ private val lightColorPalette = FirefoxColors( iconAccentYellow = PhotonColors.Yellow60, iconGradientStart = PhotonColors.Violet50, iconGradientEnd = PhotonColors.Blue60, - borderDefault = PhotonColors.LightGrey30, + borderPrimary = PhotonColors.LightGrey30, borderInverted = PhotonColors.DarkGrey05, borderFormDefault = PhotonColors.DarkGrey90, borderAccent = PhotonColors.Ink20, @@ -208,7 +208,7 @@ class FirefoxColors( iconAccentYellow: Color, iconGradientStart: Color, iconGradientEnd: Color, - borderDefault: Color, + borderPrimary: Color, borderInverted: Color, borderFormDefault: Color, borderAccent: Color, @@ -365,7 +365,7 @@ class FirefoxColors( // Border // Default, Divider, Dotted - var borderDefault by mutableStateOf(borderDefault) + var borderPrimary by mutableStateOf(borderPrimary) private set // Onboarding var borderInverted by mutableStateOf(borderInverted) @@ -432,7 +432,7 @@ class FirefoxColors( iconAccentYellow = other.iconAccentYellow iconGradientStart = other.iconGradientStart iconGradientEnd = other.iconGradientEnd - borderDefault = other.borderDefault + borderPrimary = other.borderPrimary borderInverted = other.borderInverted borderFormDefault = other.borderFormDefault borderAccent = other.borderAccent @@ -489,7 +489,7 @@ class FirefoxColors( iconAccentYellow = iconAccentYellow, iconGradientStart = iconGradientStart, iconGradientEnd = iconGradientEnd, - borderDefault = borderDefault, + borderPrimary = borderPrimary, borderInverted = borderInverted, borderFormDefault = borderFormDefault, borderAccent = borderAccent, diff --git a/app/src/main/res/layout/component_tabstray2.xml b/app/src/main/res/layout/component_tabstray2.xml index 4fd514fa5e..6e6b6a9af6 100644 --- a/app/src/main/res/layout/component_tabstray2.xml +++ b/app/src/main/res/layout/component_tabstray2.xml @@ -127,7 +127,7 @@ android:id="@+id/divider" android:layout_width="0dp" android:layout_height="1dp" - android:background="@color/fx_mobile_border_color_default" + android:background="@color/fx_mobile_border_color_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/info_banner" /> diff --git a/app/src/main/res/layout/tab_tray_grid_item.xml b/app/src/main/res/layout/tab_tray_grid_item.xml index 963e3302d8..95fe99abe5 100644 --- a/app/src/main/res/layout/tab_tray_grid_item.xml +++ b/app/src/main/res/layout/tab_tray_grid_item.xml @@ -28,7 +28,7 @@ A FrameLayout here is an efficient way of having a views stack while allowing: app:cardBackgroundColor="@color/fx_mobile_layer_color_2" app:cardCornerRadius="@dimen/tab_tray_grid_item_border_radius" app:cardElevation="0dp" - app:strokeColor="@color/fx_mobile_border_color_default" + app:strokeColor="@color/fx_mobile_border_color_primary" app:strokeWidth="1dp"> - @color/photonDarkGrey05 + @color/photonDarkGrey05 @color/photonLightGrey30 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 169ea55594..3ea505e332 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -102,7 +102,7 @@ - @color/photonLightGrey30 + @color/photonLightGrey30 @color/photonDarkGrey05 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 13b265a36d..7f50ba3325 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -90,7 +90,7 @@ @color/primary_text_normal_theme @color/caption_text_normal_theme @color/fx_mobile_layer_color_2 - @color/fx_mobile_border_color_default + @color/fx_mobile_border_color_primary @color/accent_normal_theme @color/tab_tray_item_thumbnail_background_normal_theme