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

[fenix] For https://github.com/mozilla-mobile/fenix/issues/23450 - Rename design token Border Default to Border Primary

Browse Source
This commit is contained in:
Gabriel Luong 2022-01-28 12:07:15 -05:00 committed by mergify[bot]
parent 0ed58d7dba
commit 3f96c59777
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/home/recentvisits/view/RecentlyVisited.kt
View File

@ -349,7 +349,7 @@ private fun RecentlyVisitedDivider(
) {
Divider(
modifier = modifier,
color = FirefoxTheme.colors.borderDefault,
color = FirefoxTheme.colors.borderPrimary,
thickness = 0.5.dp
)
}

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

@ -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,

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

@ -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" />

4
app/src/main/res/layout/tab_tray_grid_item.xml
View File

@ -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">
<androidx.constraintlayout.widget.ConstraintLayout
@ -84,7 +84,7 @@ A FrameLayout here is an efficient way of having a views stack while allowing:
android:id="@+id/horizonatal_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/fx_mobile_border_color_default"
android:background="@color/fx_mobile_border_color_primary"
app:layout_constraintTop_toBottomOf="@+id/mozac_browser_tabstray_title" />
<androidx.cardview.widget.CardView

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

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

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

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

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

@ -90,7 +90,7 @@
<item name="mozac_primary_text_color">@color/primary_text_normal_theme</item>
<item name="mozac_caption_text_color">@color/caption_text_normal_theme</item>
<item name="mozac_widget_favicon_background_color">@color/fx_mobile_layer_color_2</item>
<item name="mozac_widget_favicon_border_color">@color/fx_mobile_border_color_default</item>
<item name="mozac_widget_favicon_border_color">@color/fx_mobile_border_color_primary</item>
<item name="tabTrayItemMediaBackground">@color/accent_normal_theme</item>
<item name="tabTrayThumbnailItemBackground">@color/tab_tray_item_thumbnail_background_normal_theme</item>