Просмотр исходного кода

Fixed background color for headers and navigation

Vadik Sirekanyan 7 лет назад
Родитель
Сommit
38d93daeea

+ 1 - 1
app/src/main/res/layout/activity_main.xml

@@ -62,7 +62,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="@color/white"
+        android:background="?android:attr/windowBackground"
         app:menu="@menu/navigation" />
 
 </LinearLayout>

+ 1 - 1
app/src/main/res/layout/header.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:background="@color/white">
+    android:background="?android:attr/windowBackground">
 
     <View
         android:id="@+id/header_divider"

+ 2 - 0
app/src/main/res/values/colors.xml

@@ -33,6 +33,7 @@
     <color name="light.color_primary_dark">@color/common_deep_purple_700</color>
     <color name="light.color_primary">@color/common_deep_purple_500</color>
     <color name="light.background_color">@color/common_white</color>
+    <color name="light.color_accent">@color/common_deep_orange_accent_400</color>
     <color name="light.text_color_primary">@color/black_87</color>
     <color name="light.text_color_secondary">@color/black_60</color>
     <color name="light.text_color_tertiary">@color/black_38</color>
@@ -42,6 +43,7 @@
     <color name="dark.color_primary_dark">@color/common_black</color>
     <color name="dark.color_primary">@color/common_grey_900</color>
     <color name="dark.background_color">@color/common_grey_850</color>
+    <color name="dark.color_accent">@color/common_deep_orange_accent_400</color>
     <color name="dark.text_color_primary">@color/white_87</color>
     <color name="dark.text_color_secondary">@color/white_60</color>
     <color name="dark.text_color_tertiary">@color/white_38</color>

+ 2 - 2
app/src/main/res/values/styles.xml

@@ -3,7 +3,7 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/light.color_primary</item>
         <item name="colorPrimaryDark">@color/light.color_primary_dark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccent">@color/light.color_accent</item>
         <item name="android:windowBackground">@color/light.background_color</item>
         <item name="android:listDivider">@drawable/recycler_view_divider</item>
         <item name="image_placeholder_color">@color/image_placeholder_color_light</item>
@@ -15,7 +15,7 @@
     <style name="DarkAppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/dark.color_primary</item>
         <item name="colorPrimaryDark">@color/dark.color_primary_dark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccent">@color/dark.color_accent</item>
         <item name="android:windowBackground">@color/dark.background_color</item>
         <item name="android:listDivider">@drawable/recycler_view_divider</item>
         <item name="image_placeholder_color">@color/image_placeholder_color_dark</item>