Merge pull request #20 from sebastien46/main

VectorDrawable improvements

app/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <application
         android:name=".SapioApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher_foreground"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true">

app/src/main/res/drawable-v33/ic_launcher_monochrome.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="107.98dp"
+    android:height="107.98dp"
+    android:viewportWidth="107.98"
+    android:viewportHeight="107.98">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M46.78,55.1c-1.95,0 -3.78,0.76 -5.16,2.14l-0.31,0.31a0.92,0.92 0,0 0,0 1.31c0.36,0.36 0.94,0.36 1.3,-0l0.31,-0.31c1.03,-1.03 2.4,-1.6 3.85,-1.6h15.74c3.02,0 5.86,-1.18 7.99,-3.31l2.86,-2.86c0.36,-0.36 0.36,-0.94 0,-1.3a0.92,0.92 0,0 0,-1.3 -0l-2.86,2.86c-1.79,1.79 -4.16,2.77 -6.69,2.77zM74.44,54.78c-0.36,0.36 -0.36,0.94 0,1.3 0.36,0.36 0.94,0.36 1.3,0l1.66,-1.66c2.09,-2.09 2.45,-5.41 0.86,-7.89l-0.72,-1.13c-0.27,-0.43 -0.85,-0.55 -1.27,-0.28a0.92,0.92 0,0 0,-0.28 1.27l0.72,1.13c1.13,1.76 0.87,4.11 -0.61,5.59z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M77.58,36.38c-0.75,-0.75 -1.77,-1.1 -2.8,-0.97 -0.07,-1.03 -0.6,-1.96 -1.46,-2.54a0.58,0.58 0,0 0,-0.02 -0.02c-4.49,-3 -9.74,-4.58 -15.16,-4.58h-1.74c-0.95,0 -1.81,0.4 -2.42,1.04 -0.61,-0.64 -1.47,-1.04 -2.42,-1.04h-5.4a24.8,24.8 0,0 0,-2.02 0.08,0.92 0.92,0 0,0 -0.84,1c0.04,0.51 0.49,0.89 1,0.84a22.98,22.98 0,0 1,1.87 -0.08h5.4c0.82,0 1.49,0.67 1.49,1.49v8.13c0,0.51 0.41,0.92 0.92,0.92a0.92,0.92 0,0 0,0.92 -0.92v-8.13c0,-0.82 0.67,-1.49 1.49,-1.49H58.14c5.05,0 9.93,1.47 14.12,4.26l0.02,0.01c0.79,0.52 0.89,1.63 0.23,2.3l-3.58,3.58a0.92,0.92 0,0 0,1.3 1.31l3.91,-3.91c0.28,-0.28 0.65,-0.44 1.06,-0.44 0.4,0 0.79,0.16 1.07,0.45 4.85,4.9 7.39,11.33 7.37,17.98 -0,0.61 -0.34,1.12 -0.92,1.35 -0.58,0.24 -1.19,0.12 -1.64,-0.32l-0.19,-0.19c-0.36,-0.36 -0.94,-0.36 -1.3,0 -0.36,0.36 -0.36,0.94 0,1.3l1,1c1.15,1.15 1.15,3.02 -0,4.17 -1.15,1.15 -2.52,2 -4.01,2.51a0.91,0.91 0,0 0,-0.14 0.05c-1.03,0.33 -2.11,0.51 -3.22,0.51h-1.38a0.92,0.92 0,0 0,-0.25 -0.44l-1.2,-1.2c-2.44,-2.44 -5.69,-3.79 -9.14,-3.79h-11.48a0.92,0.92 0,0 0,-0.92 0.92c0,0.51 0.41,0.92 0.92,0.92h11.48c2.96,0 5.74,1.15 7.83,3.24l0.34,0.34H44.15c-2,0 -3.88,-0.78 -5.29,-2.19 -1.62,-1.62 -2.39,-3.83 -2.16,-6.07v-0c0.39,-3.82 3.58,-6.71 7.45,-6.71h18.86a0.92,0.92 0,0 0,0.92 -0.92,0.92 0.92,0 0,0 -0.92,-0.92h-2.31v-8.76a0.92,0.92 0,0 0,-0.92 -0.92,0.92 0.92,0 0,0 -0.92,0.92v8.76h-9.25v-8.76a0.92,0.92 0,0 0,-0.92 -0.92,0.92 0.92,0 0,0 -0.92,0.92v8.76h-3.61c-1.49,0 -2.9,0.34 -4.15,0.96L35.52,45.69a0.92,0.92 0,0 0,-1.3 1.31l4.18,4.18a9.28,9.28 0,0 0,-3.41 5.58h-1.82c-2.94,0 -5.58,-1.39 -7.26,-3.8 -1.67,-2.42 -2.04,-5.38 -1,-8.13 1.33,-3.46 3.46,-6.56 6.16,-8.96 0.59,-0.53 1.49,-0.5 2.05,0.06l3.61,3.61a0.92,0.92 0,0 0,1.3 -1.31l-3.01,-3.01c-0.34,-0.34 -0.49,-0.8 -0.42,-1.28 0.07,-0.47 0.34,-0.86 0.75,-1.08a22.74,22.74 0,0 1,4.79 -1.93,0.92 0.92,0 0,0 -0.49,-1.78 24.59,24.59 0,0 0,-5.18 2.08c-0.9,0.49 -1.56,1.37 -1.71,2.48 -1.01,-0.22 -2.1,0.04 -2.93,0.77 -2.92,2.6 -5.22,5.95 -6.66,9.69a10.67,10.67 0,0 0,1.21 9.83,10.67 10.67,0 0,0 8.77,4.6h1.65c0.01,2.48 0.99,4.8 2.74,6.55 1.76,1.76 4.1,2.73 6.59,2.73h7.93l1.97,3.6c0.25,0.45 0.81,0.61 1.25,0.37 0.45,-0.24 0.61,-0.81 0.37,-1.25l-1.48,-2.71h4.1c0.25,2.15 1.34,4.04 2.94,5.33l0.76,2.77c0.26,0.96 -0.46,1.9 -1.45,1.9a1.5,1.5 0,0 1,-1.32 -0.78L57.75,74.4a0.92,0.92 0,0 0,-1.25 -0.37,0.92 0.92,0 0,0 -0.37,1.25l1.47,2.69a3.35,3.35 0,0 0,2.94 1.74c1.05,0 2.02,-0.48 2.66,-1.32 0.64,-0.84 0.85,-1.9 0.57,-2.91l-0.27,-0.99a8,8 0,0 0,2.78 0.49h1.26c2.14,0 4.21,-0.64 5.98,-1.84 0.42,-0.29 0.53,-0.86 0.24,-1.28 -0.29,-0.42 -0.86,-0.53 -1.28,-0.24 -1.46,0.99 -3.17,1.52 -4.94,1.52h-1.26c-3.1,0 -5.68,-2.29 -6.12,-5.27h13.08a12.4,12.4 0,0 0,2.34 -0.22,7.35 7.35,0 0,1 -0.51,1.15 0.92,0.92 0,0 0,0.37 1.25c0.45,0.24 1.01,0.08 1.25,-0.37 0.46,-0.83 0.77,-1.71 0.95,-2.63 1.58,-0.61 3.04,-1.55 4.27,-2.79 1.45,-1.45 1.77,-3.61 0.97,-5.38a3.51,3.51 0,0 0,0.56 -0.18c1.26,-0.52 2.05,-1.69 2.06,-3.05 0.02,-7.03 -2.63,-13.96 -7.91,-19.29z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m33.82,38.42 l-0.02,-0.02c-0.97,-1.02 -2.64,-1.03 -3.61,0.05 -0.37,0.41 -0.73,0.84 -1.06,1.29 -0.74,0.97 -0.65,2.36 0.21,3.22l0.02,0.02c1.05,1.05 2.78,0.93 3.68,-0.25a16.59,16.59 0,0 1,0.82 -0.99c0.86,-0.96 0.84,-2.39 -0.04,-3.32zM32.49,40.51a18.56,18.56 0,0 0,-0.91 1.1c-0.22,0.29 -0.65,0.32 -0.91,0.06l-0.02,-0.02a0.61,0.61 0,0 1,-0.05 -0.79c0.31,-0.4 0.64,-0.8 0.97,-1.18 0.23,-0.26 0.64,-0.28 0.89,-0.01l0.02,0.02c0.22,0.23 0.22,0.58 0.01,0.82zM29.87,45.23a2.44,2.44 0,0 0,-2.42 -0.62,2.46 2.46,0 0,0 -1.71,1.84c-0.45,2.1 -0.07,4 1.18,5.8 0.99,1.43 2.38,2.45 4.01,2.95 0.75,0.23 1.53,0.09 2.16,-0.38 1.07,-0.79 0.99,-1.98 0.99,-1.99 0,-1.07 -0.71,-2.04 -1.72,-2.34 -0.57,-0.17 -1.04,-0.52 -1.4,-1.04 -0.43,-0.62 -0.57,-1.28 -0.43,-2 0.16,-0.81 -0.09,-1.65 -0.67,-2.23zM31.84,52.26c0.24,0.07 0.4,0.3 0.4,0.57 -0,0.01 0.03,0.31 -0.25,0.51 -0.09,0.07 -0.28,0.17 -0.53,0.09 -1.23,-0.37 -2.28,-1.14 -3.03,-2.23 -0.95,-1.38 -1.23,-2.76 -0.89,-4.36 0.1,-0.47 0.68,-0.65 1.02,-0.31 0.14,0.14 0.2,0.35 0.16,0.56 -0.24,1.2 0.01,2.38 0.72,3.4 0.6,0.86 1.42,1.47 2.39,1.76z"/>
+</vector>

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

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M62.3,73.24c-1.8,-1.34 -0.23,-6.25 -0.23,-8.66l-9.47,2.77 5.96,10.9a2.5,2.5 0,0 0,2.19 1.3c1.65,0 2.84,-1.57 2.41,-3.16z"
+      android:fillColor="#eab1b7"/>
+  <path
+      android:pathData="M59.33,67.35c0,4.05 3.28,7.33 7.33,7.33h1.29c4.81,0 9,-3.47 9.56,-7.93 -1.16,0.39 -3.2,-3.79 -4.49,-3.79Z"
+      android:fillColor="#e28086"/>
+  <path
+      android:pathData="M43.88,67.35h29.94c3.23,0 6.15,-1.31 8.27,-3.43 1.55,-1.56 1.56,-4.08 0,-5.63l-1.03,-1.03 0.2,0.2c1.56,1.56 4.24,0.47 4.25,-1.73l0,-0.05c0,-7.47 -3.01,-14.23 -7.87,-19.15 -0.97,-0.98 -2.56,-1 -3.54,-0.02l-0.34,0.34c1.11,-1.11 0.93,-2.96 -0.38,-3.83h0c-4.32,-2.88 -9.51,-4.56 -15.09,-4.56H56.49c-1.38,0 -2.49,1.12 -2.49,2.49 0,-1.38 -1.12,-2.49 -2.49,-2.49h-5.56c-4.14,0 -8.11,1.05 -11.6,2.94 -1.46,0.79 -1.73,2.77 -0.56,3.94l-0.62,-0.62c-0.93,-0.93 -2.43,-0.98 -3.42,-0.1 -2.89,2.57 -5.16,5.84 -6.6,9.6 -2.48,6.57 2.38,13.58 9.39,13.58h2.37a0.31,0.31 0,0 1,0.3 0.33,8.76 8.76,0 0,0 -0.02,0.57c-0,4.79 3.89,8.67 8.68,8.66z"
+      android:fillColor="#eab1b7"/>
+  <path
+      android:pathData="M77.63,36.52c-0.85,-0.86 -2.16,-0.98 -3.13,-0.35 3.71,4.65 5.93,10.55 5.93,16.96v0.03c-0.02,6.44 -5.24,11.65 -11.68,11.65H38.81a8.73,8.73 0,0 1,-1.14 -0.07c1.58,1.61 3.78,2.61 6.21,2.61h29.94c3.23,0 6.15,-1.31 8.27,-3.43 1.55,-1.56 1.56,-4.08 0,-5.63l-0.84,-0.84c1.56,1.56 4.24,0.47 4.25,-1.73v-0.05c0,-7.47 -3.01,-14.23 -7.87,-19.15z"
+      android:fillColor="#e4989d"/>
+  <path
+      android:pathData="M30.2,38.63c-0.37,0.41 -0.72,0.83 -1.05,1.27 -0.48,0.63 -0.42,1.51 0.14,2.07l0.02,0.02c0.67,0.67 1.78,0.6 2.36,-0.16 0.28,-0.37 0.58,-0.73 0.89,-1.07 0.55,-0.61 0.54,-1.54 -0.02,-2.14l-0.02,-0.02c-0.63,-0.67 -1.7,-0.65 -2.32,0.04zM29.5,49.86c-0.57,-0.83 -0.79,-1.77 -0.59,-2.78 0.1,-0.52 -0.05,-1.06 -0.43,-1.44 -0.88,-0.88 -2.39,-0.43 -2.65,0.79 -0.38,1.75 -0.16,3.46 1.06,5.23 0.9,1.31 2.17,2.22 3.63,2.67 1.01,0.31 2.02,-0.45 2.02,-1.51v-0.02c0,-0.68 -0.44,-1.3 -1.09,-1.5 -0.78,-0.23 -1.46,-0.73 -1.95,-1.44Z"
+      android:fillColor="#f6d3d5"/>
+  <path
+      android:pathData="M62.33,49.07h-2.38v-9.02a0.95,0.95 0,0 0,-0.95 -0.95,0.95 0.95,0 0,0 -0.95,0.95v9.02H48.53v-9.02a0.95,0.95 0,0 0,-0.95 -0.95,0.95 0.95,0 0,0 -0.95,0.95v9.02h-3.72c-1.53,0 -2.98,0.36 -4.26,1l-4.63,-4.63a0.95,0.95 0,1 0,-1.34 1.34l4.32,4.32c-2.03,1.59 -3.41,3.98 -3.66,6.68h1.58a0.31,0.31 0,0 1,0.3 0.27c0.32,-3.96 3.64,-7.09 7.69,-7.09h19.43a0.95,0.95 0,0 0,0.95 -0.95c-0,-0.53 -0.43,-0.95 -0.95,-0.95z"
+      android:fillColor="#e4989d"/>
+  <path
+      android:pathData="M62.79,57.05c3.11,0 6.03,-1.21 8.23,-3.41l2.94,-2.94a0.95,0.95 0,0 0,-1.34 -1.34l-2.94,2.94c-1.84,1.84 -4.29,2.85 -6.89,2.85L46.57,55.15c-2.01,0 -3.89,0.78 -5.31,2.2l-0.32,0.32a0.95,0.95 0,0 0,0 1.34,0.95 0.95,0 0,0 0.67,0.28 0.95,0.95 0,0 0,0.67 -0.28l0.32,-0.32c1.06,-1.06 2.47,-1.64 3.97,-1.64zM70.91,64.71c-2.51,-2.51 -5.86,-3.9 -9.41,-3.9L49.67,60.81a0.95,0.95 0,0 0,-0.95 0.95c0,0.52 0.43,0.95 0.95,0.95h11.82c3.05,0 5.91,1.19 8.07,3.34l1.3,1.3h2.69zM75.06,54.81c-0.37,0.37 -0.37,0.97 0,1.34a0.95,0.95 0,0 0,0.67 0.28,0.95 0.95,0 0,0 0.67,-0.28l1.71,-1.71c2.15,-2.15 2.52,-5.57 0.88,-8.13l-0.74,-1.16a0.95,0.95 0,0 0,-1.31 -0.29,0.95 0.95,0 0,0 -0.29,1.31l0.74,1.16c1.16,1.82 0.9,4.24 -0.63,5.76zM33.17,34.71c-0.82,-0.82 -2.09,-0.95 -3.06,-0.37l4.7,4.7a0.95,0.95 0,0 0,0.67 0.28,0.95 0.95,0 0,0 0.67,-0.28 0.95,0.95 0,0 0,0 -1.34zM53.05,40.26a0.95,0.95 0,0 0,0.95 -0.95v-8.38c0,-1.17 -0.81,-2.16 -1.9,-2.42v10.8c0,0.52 0.43,0.95 0.95,0.95zM74.12,33.79a2.48,2.48 0,0 0,-0.75 -0.78l0,-0a27.14,27.14 0,0 0,-5.53 -2.84,27.33 27.33,0 0,1 3.57,2.71c1.03,0.93 1.09,2.53 0.11,3.51l-3.47,3.47a0.95,0.95 0,0 0,1.34 1.34l4.36,-4.36c0.84,-0.84 0.94,-2.11 0.37,-3.06z"
+      android:fillColor="#e4989d"/>
+</vector>

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

@@ -23,7 +23,7 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent"
-          app:srcCompat="@mipmap/ic_launcher_foreground" />
+          app:srcCompat="@drawable/ic_launcher_foreground" />
 
         <TextView
           android:id="@+id/version"

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

@@ -20,7 +20,7 @@
           android:layout_width="250dp"
           android:layout_height="250dp"
           android:layout_gravity="center"
-          app:srcCompat="@mipmap/ic_launcher_foreground" />
+          app:srcCompat="@drawable/ic_launcher_foreground" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,6 @@
 <?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="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,6 @@
 <?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="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

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

@@ -9,4 +9,6 @@
     <color name="white">#FFFFFFFF</color>
     <color name="grey">#212121</color>
     <color name="grey_light">#E0E0E0</color>
+    <color name="ic_launcher_background">@color/grey</color>
+    <color name="background">@color/white</color>
 </resources>