Changed color scheme

icabetong · Jun 25, 2020 · 0969028 · 0969028
1 parent 88ac5fd
commit 0969028
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 13 deletions.
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/res/drawable/ic_clear.xml b/app/src/main/res/drawable/ic_clear.xml
@@ -3,7 +3,7 @@
     android:height="16dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="@android:color/white">
+    android:tint="@color/colorPrimary">
     <path
         android:fillColor="#FF000000"
         android:pathData="M18.3,5.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L12,10.59 7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,13.41l4.89,4.89c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z" />

diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.096746646"
+      android:scaleY="0.096746646"
+      android:translateX="29.7"
+      android:translateY="29.7">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m502.343,159.864 l-65.707,-65.707 -44.492,44.492 -44.492,-44.492 -138.124,138.123 -54.837,-54.837 -44.492,44.492 -44.492,-44.492 -65.707,65.707 165.036,165.036 44.492,-44.492 44.492,44.492zM154.691,219.87 L188.314,253.493 165.035,276.772 131.411,243.149zM42.426,243.15 L65.707,219.869 165.036,319.198 347.651,136.583 370.932,159.863 165.036,365.759zM436.636,136.583 L459.917,159.864 254.021,365.759 230.742,342.48z"/>
+  </group>
+</vector>
diff --git a/...main/res/drawable/shape_remove_button.xml → ...main/res/drawable/shape_button_remove.xml b/...main/res/drawable/shape_remove_button.xml → ...main/res/drawable/shape_button_remove.xml
@@ -5,7 +5,7 @@
     <item>
         <shape android:shape="oval">
             <size android:width="4dp" android:height="4dp"/>
-            <solid android:color="@color/colorEditorButton"/>
+            <solid android:color="@color/colorWidgetTint"/>
         </shape>
     </item>
 

diff --git a/app/src/main/res/layout/fragment_task.xml b/app/src/main/res/layout/fragment_task.xml
@@ -44,6 +44,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
             android:gravity="center"
             android:text="@string/empty_view_no_tasks_summary"/>
 
@@ -55,6 +56,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_padding"
-        android:src="@drawable/ic_add" />
+        android:src="@drawable/ic_add"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/layout_editor_event.xml b/app/src/main/res/layout/layout_editor_event.xml
@@ -121,7 +121,7 @@
                         android:layout_height="wrap_content"
                         android:contentDescription="@null"
                         android:background="@android:color/transparent"
-                        android:src="@drawable/shape_remove_button"
+                        android:src="@drawable/shape_button_remove"
                         android:visibility="gone"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/layout_editor_task.xml b/app/src/main/res/layout/layout_editor_task.xml
@@ -102,7 +102,7 @@
                         android:layout_height="wrap_content"
                         android:contentDescription="@null"
                         android:background="@android:color/transparent"
-                        android:src="@drawable/shape_remove_button"
+                        android:src="@drawable/shape_button_remove"
                         android:visibility="gone"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#0277bd</color>
-    <color name="colorPrimaryDark">#004c8c</color>
-    <color name="colorPrimaryLight">#58a5f0</color>
-    <color name="colorOnPrimary">#ffffff</color>
+    <color name="colorPrimary">#0091ea</color>
+    <color name="colorPrimaryDark">#0064b7</color>
+    <color name="colorPrimaryLight">#64c1ff</color>
+    <color name="colorOnPrimary">#000000</color>
+    <color name="colorWidgetTint">#82f7ff</color>
     <color name="colorSurface">#ffffff</color>
     <color name="colorOnSurface">#000000</color>
     <color name="colorError">#B00020</color>

diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
@@ -29,6 +29,8 @@
         <item name="toolbarNavigationButtonStyle">@style/Fokus.Widget.Toolbar.Navigation</item>
         <item name="actionOverflowButtonStyle">@style/Fokus.Widget.Toolbar.Overflow</item>
         <item name="switchStyle">@style/Fokus.Widget.Switch</item>
+        <item name="floatingActionButtonStyle">@style/Fokus.Widget.FAB</item>
+        <item name="extendedFloatingActionButtonStyle">@style/Fokus.Widget.FAB.Extended</item>
 
         <item name="textAppearanceBody1">@style/Fokus.TextAppearance.Body</item>
         <item name="textAppearanceBody2">@style/Fokus.TextAppearance.Body.Medium</item>
@@ -101,7 +103,15 @@
         <item name="track">@drawable/selector_switch_track</item>
         <item name="android:thumb">@drawable/selector_switch_thumb</item>
     </style>
-
+    <style name="Fokus.Widget.FAB" parent="Widget.MaterialComponents.FloatingActionButton">
+        <item name="backgroundTint">@color/colorWidgetTint</item>
+        <item name="tint">@color/colorPrimary</item>
+    </style>
+    <style name="Fokus.Widget.FAB.Extended" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
+        <item name="backgroundTint">@color/colorWidgetTint</item>
+        <item name="iconTint">@color/colorPrimary</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+    </style>
 
     <style name="Fokus.TextAppearance" parent="TextAppearance.AppCompat"/>
     <style name="Fokus.TextAppearance.Title" parent="Fokus.TextAppearance">
@@ -167,5 +177,5 @@
     </style>
 
     <!-- Used for Adaptive Launcher Icon Background -->
-    <color name="ic_launcher_background">#0277bd</color>
+    <color name="ic_launcher_background">@color/colorPrimary</color>
 </resources>