Fixed book progress color for dark theme

app/src/main/res/drawable/light_progress_bar_background.xml → app/src/main/res/drawable/progress_bar_background_dark.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/progress">
-        <clip android:drawable="@color/colorPrimaryLightest" />
+        <clip android:drawable="@color/dark_book_progress_color" />
     </item>
 </layer-list>

app/src/main/res/drawable/progress_bar_background_light.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/progress">
+        <clip android:drawable="@color/light_book_progress_color" />
+    </item>
+</layer-list>

app/src/main/res/layout/book.xml

@@ -14,7 +14,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="64dp"
-        android:progressDrawable="@drawable/light_progress_bar_background"
+        android:progressDrawable="?attr/book_progress_drawable"
         tools:progress="80" />
 
     <ImageView

app/src/main/res/layout/user.xml

@@ -36,7 +36,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         android:gravity="center_vertical"
-        android:textColor="?android:attr/textColorTertiary"
+        android:textColor="?android:attr/textColorSecondary"
         android:textSize="16sp"
         tools:text="40" />
 

app/src/main/res/layout/user_activity.xml

@@ -45,7 +45,7 @@
         android:layout_marginRight="16dp"
         android:layout_marginTop="56dp"
         android:src="@drawable/oval_placeholder_background"
-        android:theme="@style/DarkAppTheme"
+        android:theme="@style/ProfileAppTheme"
         app:appBarLayout="@+id/app_bar"
         app:appBarMaxHeight="@dimen/app_bar_height"
         app:appBarMinHeight="@dimen/toolbar_height"

app/src/main/res/values/attrs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="image_placeholder_color" format="reference|color" />
+    <attr name="book_progress_drawable" format="reference" />
     <declare-styleable name="ViewBehavior">
         <attr name="appBarLayout" format="reference" />
         <attr name="appBarMaxHeight" format="dimension" />

app/src/main/res/values/colors.xml

@@ -2,16 +2,21 @@
 <resources>
     <color name="common_deep_purple_700">#512DA8</color>
     <color name="common_deep_purple_500">#673AB7</color>
+    <color name="common_deep_purple_300">#9575CD</color>
+    <color name="common_deep_purple_200">#B39DDB</color>
+    <color name="common_deep_purple_100">#D1C4E9</color>
+    <color name="common_deep_purple_50">#EDE7F6</color>
     <color name="common_deep_orange_accent_400">#FF3D00</color>
+    <color name="common_blue_gray_900">#263238</color>
+    <color name="common_blue_gray_700">#455A64</color>
+    <color name="common_blue_gray_500">#607D8B</color>
+    <color name="common_blue_gray_300">#90A4AE</color>
+    <color name="common_teal_accent_700">#00BFA5</color>
     <color name="common_black">#000000</color>
     <color name="common_grey_900">#212121</color>
     <color name="common_grey_850">#303030</color>
     <color name="common_grey_800">#424242</color>
     <color name="common_white">#ffffff</color>
-    <color name="colorPrimaryLight">#9575CD</color>
-    <color name="colorPrimaryLightest">#B39DDB</color>
-    <color name="colorPrimary100">#D1C4E9</color>
-    <color name="colorPrimary50">#EDE7F6</color>
     <color name="colorAccent">#FF3D00</color>
     <color name="colorSuccessAccent">#00E676</color>
     <color name="white">#FFFFFF</color>
@@ -37,16 +42,21 @@
     <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>
-    <color name="image_placeholder_color_light">@color/colorPrimary50</color>
+    <color name="light_image_placeholder_color">@color/common_deep_purple_50</color>
+    <color name="light_book_progress_color">@color/common_deep_purple_200</color>
 
     <!-- dark theme -->
-    <color name="dark.color_primary_dark">@color/common_black</color>
-    <color name="dark.color_primary">@color/common_grey_900</color>
+    <color name="dark.color_primary_dark">@color/common_blue_gray_700</color>
+    <color name="dark.color_primary">@color/common_blue_gray_500</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.color_accent">@color/common_teal_accent_700</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>
-    <color name="image_placeholder_color_dark">@color/colorPrimaryLight</color>
+    <color name="dark_image_placeholder_color">@color/common_blue_gray_700</color>
+    <color name="dark_book_progress_color">@color/common_blue_gray_700</color>
+
+    <!-- profile theme -->
+    <color name="image_placeholder_color_dark">@color/common_deep_purple_300</color>
 
 </resources>

app/src/main/res/values/styles.xml

@@ -6,7 +6,8 @@
         <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>
+        <item name="image_placeholder_color">@color/light_image_placeholder_color</item>
+        <item name="book_progress_drawable">@drawable/progress_bar_background_light</item>
         <item name="android:textColorPrimary">@color/light.text_color_primary</item>
         <item name="android:textColorSecondary">@color/light.text_color_secondary</item>
         <item name="android:textColorTertiary">@color/light.text_color_tertiary</item>
@@ -18,7 +19,8 @@
         <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>
+        <item name="image_placeholder_color">@color/dark_image_placeholder_color</item>
+        <item name="book_progress_drawable">@drawable/progress_bar_background_dark</item>
         <item name="android:textColorPrimary">@color/dark.text_color_primary</item>
         <item name="android:textColorSecondary">@color/dark.text_color_secondary</item>
         <item name="android:textColorTertiary">@color/dark.text_color_tertiary</item>
@@ -28,6 +30,7 @@
         <item name="colorPrimary">@color/knigopis_splash_background</item>
         <item name="colorPrimaryDark">@color/knigopis_splash_background</item>
         <item name="android:windowBackground">@color/knigopis_splash_background</item>
+        <item name="image_placeholder_color">@color/image_placeholder_color_dark</item>
     </style>
 
     <style name="AppBarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />