Fix theming for bottom nav and app bar

infinum · Apr 20, 2024 · 0de374f · 0de374f
1 parent 0e8dbec
commit 0de374f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sentinel/src/main/res/layout/sentinel_fragment.xml b/sentinel/src/main/res/layout/sentinel_fragment.xml
@@ -23,7 +23,6 @@
             <com.google.android.material.appbar.AppBarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/sentinel_surface"
                 app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
                 app:liftOnScroll="false"
                 app:liftOnScrollTargetViewId="@id/nestedScrollView">
@@ -33,6 +32,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingEnd="8dp"
+                    android:background="@color/sentinel_surface"
                     app:menu="@menu/sentinel_menu"
                     app:navigationIcon="@drawable/sentinel_ic_settings"
                     app:subtitleCentered="true"

diff --git a/sentinel/src/main/res/values/themes.xml b/sentinel/src/main/res/values/themes.xml
@@ -20,7 +20,6 @@
         <item name="colorOnErrorContainer">@color/sentinel_onErrorContainer</item>
         <item name="android:colorBackground">@color/sentinel_background</item>
         <item name="colorOnBackground">@color/sentinel_onBackground</item>
-        <item name="colorSurface">@color/sentinel_surface</item>
         <item name="colorOnSurface">@color/sentinel_onSurface</item>
         <item name="colorSurfaceVariant">@color/sentinel_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/sentinel_onSurfaceVariant</item>
@@ -55,6 +54,7 @@
     </style>
 
     <style name="Sentinel.Widget.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
+        <item name="android:background">@color/sentinel_surface</item>
         <item name="itemTextAppearanceActive">
             @style/Sentinel.TextAppearance.Item.BottomNavigationView.Active
         </item>