Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-09 19:10:42 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/24082 - Use Layer2 for the tab tray thumbnail item background color

Browse Source
This commit is contained in:
Gabriel Luong 2022-03-03 17:24:03 -05:00 committed by mergify[bot]
parent aa65fc9031
commit e56d96553d
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
android:id="@+id/previewThumbnail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?tabTrayThumbnailItemBackground" />
android:background="?layer2" />
<LinearLayout
android:id="@+id/fakeToolbar"

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

@ -92,8 +92,7 @@ A FrameLayout here is an efficient way of having a views stack while allowing:
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="@dimen/tab_tray_grid_item_thumbnail_height"
android:backgroundTint="?tabTrayThumbnailItemBackground"
app:cardBackgroundColor="@color/photonWhite"
app:cardBackgroundColor="?layer2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/horizonatal_divider">

3
app/src/main/res/layout/tab_tray_item.xml
View File

@ -33,8 +33,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:backgroundTint="?tabTrayThumbnailItemBackground"
app:cardBackgroundColor="@color/photonWhite"
app:cardBackgroundColor="?layer2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

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

@ -142,7 +142,6 @@
<!-- Tab tray -->
<color name="tab_tray_item_background_normal_theme">@color/photonDarkGrey80</color>
<color name="tab_tray_item_thumbnail_background_normal_theme">@color/photonDarkGrey50</color>
<color name="tab_tray_item_thumbnail_icon_normal_theme">@color/photonDarkGrey05</color>
<!-- Reader View colors -->

3
app/src/main/res/values/attrs.xml
View File

@ -6,6 +6,8 @@
<!-- Design system color attributes -->
<!-- Layers -->
<!-- Card background, Menu background, Dialog, Banner -->
<attr name="layer2" format="reference" />
<!-- Search -->
<attr name="layer3" format="reference" />
<!-- Selected tab -->
@ -75,7 +77,6 @@
<attr name="awesomeBarIndicatorBookmarkColor" format="reference|color"/>
<!-- Tab tray -->
<attr name="tabTrayThumbnailItemBackground" format="reference" />
<attr name="tabTrayThumbnailIcon" format="reference" />
<declare-styleable name="TrackingProtectionCategory">

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

@ -281,7 +281,6 @@
<!-- Tab tray -->
<color name="tab_tray_item_background_normal_theme">@color/photonLightGrey10</color>
<color name="tab_tray_item_thumbnail_background_normal_theme">@color/photonLightGrey10</color>
<color name="tab_tray_item_thumbnail_icon_normal_theme">@color/photonLightGrey60</color>
<!-- Bookmark buttons -->

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

@ -34,6 +34,8 @@
<!-- Design system color attributes -->
<!-- Layers -->
<!-- Card background, Menu background, Dialog, Banner -->
<item name="layer2">@color/fx_mobile_layer_color_2</item>
<!-- Search -->
<item name="layer3">@color/fx_mobile_layer_color_3</item>
<!-- Selected tab -->
@ -108,7 +110,6 @@
<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_primary</item>
<item name="tabTrayThumbnailItemBackground">@color/tab_tray_item_thumbnail_background_normal_theme</item>
<item name="tabTrayThumbnailIcon">@color/tab_tray_item_thumbnail_icon_normal_theme</item>
<!-- Drawables -->
@ -226,6 +227,8 @@
<!-- Design system color attributes -->
<!-- Layers -->
<!-- Card background, Menu background, Dialog, Banner -->
<item name="layer2">@color/fx_mobile_private_layer_color_2</item>
<!-- Search -->
<item name="layer3">@color/fx_mobile_private_layer_color_3</item>
<!-- Selected tab -->
@ -299,7 +302,6 @@
<item name="mozac_widget_favicon_border_color">@color/photonInk50</item>
<!-- Tab Tray -->
<item name="tabTrayThumbnailItemBackground">@color/tab_tray_item_thumbnail_background_normal_theme</item>
<item name="tabTrayThumbnailIcon">@color/tab_tray_item_thumbnail_icon_normal_theme</item>
<!-- Drawables -->