Merge pull request #41 from gabrielbmoro/feature/36-status-bar-color-…

…is-wrong Status bar color is wrong
gabrielbmoro · Jul 23, 2023 · c62de0f · c62de0f
2 parents da200ee + 5872f4f
commit c62de0f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/src/app/src/main/res/drawable/ic_heart_border.xml b/src/app/src/main/res/drawable/ic_heart_border.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/heart_color"
+      android:fillColor="#D32F2F"
       android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
 </vector>
diff --git a/src/app/src/main/res/drawable/ic_heart_filled.xml b/src/app/src/main/res/drawable/ic_heart_filled.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/heart_color"
+      android:fillColor="#D32F2F"
       android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
 </vector>
diff --git a/src/app/src/main/res/drawable/ic_star.xml b/src/app/src/main/res/drawable/ic_star.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/star_color"
+      android:fillColor="#FFA000"
       android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>
diff --git a/src/app/src/main/res/drawable/ic_star_border.xml b/src/app/src/main/res/drawable/ic_star_border.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/star_color"
+      android:fillColor="#FFA000"
       android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
 </vector>
diff --git a/src/app/src/main/res/drawable/ic_star_half.xml b/src/app/src/main/res/drawable/ic_star_half.xml
@@ -6,7 +6,7 @@
   <group>
     <clip-path android:pathData="M0,0h24v24H0V0z M 0,0"/>
     <path
-        android:fillColor="@color/star_color"
+        android:fillColor="#FFA000"
         android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4V6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
   </group>
 </vector>
diff --git a/src/app/src/main/res/values-night/colors.xml b/src/app/src/main/res/values-night/colors.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#562DB3</color>
-    <color name="colorPrimaryDark">#140042</color>
-    <color name="colorAccent">#AE86DF</color>
-    <color name="colorSecondary">#000000</color>
+    <color name="colorPrimary">#624000</color>
+    <color name="colorPrimaryDark">#452B00</color>
+    <color name="colorAccent">#DDC3A2</color>
 </resources>
diff --git a/src/app/src/main/res/values/colors.xml b/src/app/src/main/res/values/colors.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#BB86FC</color>
-    <color name="star_color">#FFA000</color>
-    <color name="heart_color">#D32F2F</color>
-    <color name="colorSecondary">#FFFFFF</color>
+    <color name="colorPrimary">#825500</color>
+    <color name="colorPrimaryDark">#825500</color>
+    <color name="colorAccent">#FFDDAE</color>
 </resources>