Merge branch 'feature/adaptive_icon' into develop

app/src/main/AndroidManifest.xml

@@ -23,7 +23,6 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Circles"
         tools:ignore="DataExtractionRules"

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

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <group android:scaleX="0.56"
+      android:scaleY="0.56"
+      android:translateX="225.28"
+      android:translateY="225.28">
+    <path
+        android:pathData="M232,512m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:fillColor="#87ceeb"
+        android:fillAlpha="0.5"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M232,512m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:strokeWidth="40"
+        android:fillColor="#00000000"
+        android:strokeColor="#87ceeb"/>
+    <path
+        android:pathData="M425.5,778.3m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:fillColor="#fa8072"
+        android:fillAlpha="0.5"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M425.5,778.3m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:strokeWidth="40"
+        android:fillColor="#00000000"
+        android:strokeColor="#fa8072"/>
+    <path
+        android:pathData="M738.5,676.6m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:fillColor="#98fb98"
+        android:fillAlpha="0.5"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M738.5,676.6m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:strokeWidth="40"
+        android:fillColor="#00000000"
+        android:strokeColor="#98fb98"/>
+    <path
+        android:pathData="M738.5,347.4m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:fillColor="#da70d6"
+        android:fillAlpha="0.5"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M738.5,347.4m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:strokeWidth="40"
+        android:fillColor="#00000000"
+        android:strokeColor="#da70d6"/>
+    <path
+        android:pathData="M425.5,245.7m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:fillColor="#ffff00"
+        android:fillAlpha="0.5"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M425.5,245.7m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+        android:strokeWidth="40"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffff00"/>
+    <path
+        android:pathData="M512,512m-264,0a264,264 0,1 1,528 0a264,264 0,1 1,-528 0"
+        android:strokeAlpha="0.9"
+        android:strokeWidth="60"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffffff"/>
+  </group>
+</vector>

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

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <group
+        android:scaleX="0.56"
+        android:scaleY="0.56"
+        android:translateX="225.28"
+        android:translateY="225.28">
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M232,512m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+            android:strokeWidth="40"
+            android:strokeColor="#87ceeb" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M425.5,778.3m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+            android:strokeWidth="40"
+            android:strokeColor="#fa8072" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M738.5,676.6m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+            android:strokeWidth="40"
+            android:strokeColor="#98fb98" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M738.5,347.4m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+            android:strokeWidth="40"
+            android:strokeColor="#da70d6" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M425.5,245.7m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+            android:strokeWidth="40"
+            android:strokeColor="#ffff00" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M512,512m-264,0a264,264 0,1 1,528 0a264,264 0,1 1,-528 0"
+            android:strokeWidth="60"
+            android:strokeColor="#ffffff" />
+    </group>
+</vector>

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

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
   <path
-      android:pathData="M256,388C328.9,388 388,328.9 388,256C388,183.1 328.9,124 256,124C183.1,124 124,183.1 124,256C124,328.9 183.1,388 256,388Z"
-      android:strokeWidth="30"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:pathData="M232,512m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+      android:strokeWidth="40"
+      android:strokeColor="#ffffff" />
+
   <path
-      android:pathData="M379,248C432.02,248 475,205.02 475,152C475,98.98 432.02,56 379,56C325.98,56 283,98.98 283,152C283,205.02 325.98,248 379,248Z"
-      android:strokeWidth="24"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:pathData="M425.5,778.3m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+      android:strokeWidth="40"
+      android:strokeColor="#ffffff" />
+
   <path
-      android:pathData="M379,414C432.02,414 475,371.02 475,318C475,264.98 432.02,222 379,222C325.98,222 283,264.98 283,318C283,371.02 325.98,414 379,414Z"
-      android:strokeWidth="24"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:pathData="M738.5,676.6m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+      android:strokeWidth="40"
+      android:strokeColor="#ffffff" />
   <path
-      android:pathData="M230,489C283.02,489 326,446.02 326,393C326,339.98 283.02,297 230,297C176.98,297 134,339.98 134,393C134,446.02 176.98,489 230,489Z"
-      android:strokeWidth="24"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:pathData="M738.5,347.4m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+      android:strokeWidth="40"
+      android:strokeColor="#ffffff" />
   <path
-      android:pathData="M114,368C167.02,368 210,325.02 210,272C210,218.98 167.02,176 114,176C60.98,176 18,218.98 18,272C18,325.02 60.98,368 114,368Z"
-      android:strokeWidth="24"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:pathData="M425.5,245.7m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"
+      android:strokeWidth="40"
+      android:strokeColor="#ffffff" />
   <path
-      android:pathData="M207,234C260.02,234 303,191.02 303,138C303,84.98 260.02,42 207,42C153.98,42 111,84.98 111,138C111,191.02 153.98,234 207,234Z"
-      android:strokeWidth="24"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
-  <path
-      android:pathData="M256,388C328.9,388 388,328.9 388,256C388,183.1 328.9,124 256,124C183.1,124 124,183.1 124,256C124,328.9 183.1,388 256,388Z"
-      android:strokeAlpha="0.5"
-      android:strokeWidth="30"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:fillAlpha="0.5"/>
+      android:pathData="M512,512m-264,0a264,264 0,1 1,528 0a264,264 0,1 1,-528 0"
+      android:strokeWidth="60"
+      android:strokeColor="#ffffff" />
 </vector>

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

 <?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"/>
+    <background android:drawable="@color/launcher_background_color" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
\ No newline at end of file

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

-<?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"/>
-</adaptive-icon>
\ No newline at end of file