ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #22978 - Replace @color/foundation_normal_theme with @color/fx_mobile_layer_color_1

This commit is contained in:
Gabriel Luong 2021-12-24 00:08:50 -05:00 committed by mergify[bot]
parent 7c12e9c970
commit ddc806e8bc
12 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/components/Core.kt
View File

@ -117,7 +117,7 @@ class Core(
enterpriseRootsEnabled = context.settings().allowThirdPartyRootCerts,
clearColor = ContextCompat.getColor(
context,
R.color.foundation_normal_theme
R.color.fx_mobile_layer_color_1
)
)

6
app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionBannerBinding.kt
View File

@ -19,12 +19,12 @@ import org.mozilla.fenix.R
import org.mozilla.fenix.databinding.ComponentTabstray2Binding
import org.mozilla.fenix.databinding.TabstrayMultiselectItemsBinding
import org.mozilla.fenix.tabstray.NavigationInteractor
import org.mozilla.fenix.tabstray.TabsTrayAction.ExitSelectMode
import org.mozilla.fenix.tabstray.TabsTrayInteractor
import org.mozilla.fenix.tabstray.TabsTrayState
import org.mozilla.fenix.tabstray.TabsTrayStore
import org.mozilla.fenix.tabstray.TabsTrayAction.ExitSelectMode
import org.mozilla.fenix.tabstray.TabsTrayState.Mode
import org.mozilla.fenix.tabstray.TabsTrayState.Mode.Select
import org.mozilla.fenix.tabstray.TabsTrayStore
import org.mozilla.fenix.tabstray.ext.showWithTheme
/**
@ -123,7 +123,7 @@ class SelectionBannerBinding(
val colorResource = if (isSelectMode) {
R.color.accent_normal_theme
} else {
R.color.foundation_normal_theme
R.color.fx_mobile_layer_color_1
}
val color = ContextCompat.getColor(backgroundView.context, colorResource)

2
app/src/main/java/org/mozilla/fenix/tabstray/ext/BrowserMenu.kt
View File

@ -18,7 +18,7 @@ fun BrowserMenu.showWithTheme(view: View) {
(popupMenu.contentView as? CardView)?.setCardBackgroundColor(
ContextCompat.getColor(
view.context,
R.color.foundation_normal_theme
R.color.fx_mobile_layer_color_1
)
)
}

2
app/src/main/res/drawable/home_bottom_bar_background.xml
View File

@ -6,7 +6,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/foundation_normal_theme" />
<solid android:color="@color/fx_mobile_layer_color_1" />
</shape>
</item>
<item android:bottom="-2dp" android:left="-2dp" android:right="-2dp">

2
app/src/main/res/drawable/home_bottom_bar_background_top.xml
View File

@ -6,7 +6,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/foundation_normal_theme" />
<solid android:color="@color/fx_mobile_layer_color_1" />
</shape>
</item>
<item android:top="-2dp" android:left="-2dp" android:right="-2dp">

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

@ -73,7 +73,7 @@
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
app:backgroundTint="@color/foundation_light_theme"
app:backgroundTint="@color/photonLightGrey20"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -9,7 +9,7 @@
style="@style/BottomSheetModal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:backgroundTint="@color/foundation_normal_theme"
android:backgroundTint="@color/fx_mobile_layer_color_1"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
tools:ignore="MozMultipleConstraintLayouts">
@ -28,7 +28,7 @@
android:id="@+id/info_banner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/foundation_normal_theme"
android:background="@color/fx_mobile_layer_color_1"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@+id/topBar" />
@ -36,7 +36,7 @@
android:id="@+id/topBar"
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@color/foundation_normal_theme"
android:background="@color/fx_mobile_layer_color_1"
android:importantForAccessibility="no"
app:layout_constraintTop_toBottomOf="@+id/handle" />
@ -78,7 +78,7 @@
android:id="@+id/tab_layout"
android:layout_width="0dp"
android:layout_height="80dp"
android:background="@color/foundation_normal_theme"
android:background="@color/fx_mobile_layer_color_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintWidth_percent="0.5"

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

@ -14,6 +14,6 @@
<item name="android:windowLightStatusBar">false</item>
<!-- Style the navigation bar -->
<item name="android:navigationBarColor">@color/foundation_normal_theme</item>
<item name="android:navigationBarColor">@color/fx_mobile_layer_color_1</item>
</style>
</resources>

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

@ -7,7 +7,7 @@
<!-- Layers -->
<!-- Default Screen, Search, Frontlayer background -->
<color name="fx_mobile_layer_color_1" tools:ignore="UnusedResources">@color/photonDarkGrey80</color>
<color name="fx_mobile_layer_color_1">@color/photonDarkGrey80</color>
<!-- Card background, Menu background -->
<color name="fx_mobile_layer_color_2" tools:ignore="UnusedResources">@color/photonDarkGrey50</color>
<!-- App Bar Top, App Bar Bottom, Frontlayer header -->
@ -100,7 +100,6 @@
<color name="secondary_text_normal_theme">#A7A2B7</color>
<color name="contrast_text_normal_theme">@color/primary_text_normal_theme</color>
<color name="caption_text_normal_theme">@color/photonLightGrey70</color>
<color name="foundation_normal_theme">@color/photonDarkGrey80</color>
<color name="above_normal_theme">@color/photonDarkGrey50</color>
<color name="inset_normal_theme">@color/photonDarkGrey50</color>
<color name="accent_normal_theme">@color/photonViolet50</color>
@ -116,9 +115,9 @@
<color name="toggle_off_track_normal_theme">@color/toggle_off_track_dark_theme</color>
<color name="snackbar_normal_theme">@color/accent_bright_dark_theme</color>
<color name="accent_on_dark_background_normal_theme">@color/accent_high_contrast_dark_theme</color>
<color name="toolbar_start_gradient_normal_theme">@color/foundation_normal_theme</color>
<color name="toolbar_center_gradient_normal_theme">@color/foundation_normal_theme</color>
<color name="toolbar_end_gradient_normal_theme">@color/foundation_normal_theme</color>
<color name="toolbar_start_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
<color name="toolbar_center_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
<color name="toolbar_end_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
<color name="toolbar_divider_color_normal_theme">@color/photonDarkGrey10</color>
<color name="fill_link_from_clipboard_normal_theme">@color/accent_on_dark_background_normal_theme</color>
<color name="sync_disconnected_icon_fill_normal_theme">#FFF36E</color>
@ -163,7 +162,7 @@
<!--Top site colors -->
<color name="top_site_pager_dot">@color/photonDarkGrey40</color>
<color name="top_site_pager_dot_selected">@color/photonDarkGrey05</color>
<color name="top_site_pin_icon_color">@color/foundation_light_theme</color>
<color name="top_site_pin_icon_color">@color/photonLightGrey20</color>
<color name="top_sites_border_color">@color/photonDarkGrey90</color>
<!-- Collection icons-->

4
app/src/main/res/values-v27/styles.xml
View File

@ -48,6 +48,6 @@
<style name="TabTrayDialogStyle" parent="TabTrayDialogStyleBase">
<item name="android:navigationBarDividerColor">@android:color/transparent</item>
<item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
<item name="android:navigationBarColor">@color/foundation_normal_theme</item>
<item name="android:navigationBarColor">@color/fx_mobile_layer_color_1</item>
</style>
</resources>
</resources>

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

@ -7,7 +7,7 @@
<!-- Layers -->
<!-- Default Screen, Search, Frontlayer background -->
<color name="fx_mobile_layer_color_1" tools:ignore="UnusedResources">@color/photonLightGrey20</color>
<color name="fx_mobile_layer_color_1">@color/photonLightGrey20</color>
<!-- Card background, Menu background -->
<color name="fx_mobile_layer_color_2" tools:ignore="UnusedResources">@color/photonWhite</color>
<!-- App Bar Top, App Bar Bottom, Frontlayer header -->
@ -134,7 +134,6 @@
<!-- Light theme color palette -->
<color name="primary_text_light_theme">@color/photonInk80</color>
<color name="foundation_light_theme">@color/photonLightGrey20</color>
<color name="accent_light_theme">@color/photonInk20</color>
<color name="accent_bright_light_theme">@color/photonViolet70</color>
<color name="about_link_normal_theme">@color/photonViolet70</color>
@ -205,7 +204,6 @@
<color name="secondary_text_normal_theme">@color/photonGrey50</color>
<color name="contrast_text_normal_theme">@color/photonLightGrey05</color>
<color name="caption_text_normal_theme">@color/photonLightGrey90</color>
<color name="foundation_normal_theme">@color/foundation_light_theme</color>
<color name="above_normal_theme">@color/photonWhite</color>
<color name="inset_normal_theme">@color/photonLightGrey30</color>
<color name="accent_normal_theme">@color/accent_light_theme</color>
@ -218,9 +216,9 @@
<color name="disabled_normal_theme">#6620123A</color>
<color name="snackbar_normal_theme">@color/accent_light_theme</color>
<color name="accent_on_dark_background_normal_theme">@color/accent_bright_light_theme</color>
<color name="toolbar_start_gradient_normal_theme">@color/foundation_light_theme</color>
<color name="toolbar_center_gradient_normal_theme">@color/foundation_light_theme</color>
<color name="toolbar_end_gradient_normal_theme">@color/foundation_light_theme</color>
<color name="toolbar_start_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
<color name="toolbar_center_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
<color name="toolbar_end_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
<color name="toolbar_divider_color_normal_theme">@color/photonLightGrey50</color>
<color name="fill_link_from_clipboard_normal_theme">@color/accent_light_theme</color>
<color name="sync_disconnected_icon_fill_normal_theme">@color/photonYellow70</color>

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

@ -12,7 +12,7 @@
<item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
<item name="android:progressBarStyleHorizontal">@style/progressBarStyleHorizontal</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowBackground">@color/foundation_normal_theme</item>
<item name="android:windowBackground">@color/fx_mobile_layer_color_1</item>
<item name="android:colorEdgeEffect">@color/accent_normal_theme</item>
<item name="android:colorAccent">@color/primary_text_normal_theme</item>
<item name="android:textColorPrimary">@color/state_list_text_color</item>
@ -48,7 +48,7 @@
<item name="accentBright">@color/accent_bright_normal_theme</item>
<item name="aboutLink">@color/about_link_normal_theme</item>
<item name="accentHighContrast">@color/accent_high_contrast_normal_theme</item>
<item name="foundation">@color/foundation_normal_theme</item>
<item name="foundation">@color/fx_mobile_layer_color_1</item>
<item name="above">@color/above_normal_theme</item>
<item name="inset">@color/inset_normal_theme</item>
<item name="tabRing">@color/tab_ring_normal_theme</item>
@ -98,7 +98,7 @@
<!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
<item name="homeBackground">@color/foundation_normal_theme</item>
<item name="homeBackground">@color/fx_mobile_layer_color_1</item>
<item name="bottomBarBackground">@drawable/home_bottom_bar_background</item>
<item name="bottomBarBackgroundTop">@drawable/home_bottom_bar_background_top</item>
<item name="privateBrowsingButtonBackground">@android:color/transparent</item>
@ -595,7 +595,7 @@
<!-- Tab Tray does not present a private theme, so it needs to be separate from other bottom sheet styles -->
<style name="TabTrayDialogStyleBase" parent="BottomSheetBase">
<item name="bottomSheetStyle">@style/BottomSheetModal</item>
<item name="android:colorBackground">@color/foundation_normal_theme</item>
<item name="android:colorBackground">@color/fx_mobile_layer_color_1</item>
</style>
<style name="TabTrayDialogStyle" parent="TabTrayDialogStyleBase" />