Merge pull request #50 from omer358/dev

resolves #7
omer358 · Aug 21, 2024 · 8042ae9 · 8042ae9
2 parents 04786fb + 8fa1e0b
commit 8042ae9
Show file tree

Hide file tree

Showing 20 changed files with 185 additions and 37 deletions.
diff --git a/.github/workflows/pull_request_tests.yml b/.github/workflows/pull_request_tests.yml
@@ -0,0 +1,38 @@
+#name: Pull Request Tests
+#
+#on:
+#  pull_request:
+#    branches: [ "main" ]
+#
+#jobs:
+#  test:
+#
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#      - uses: actions/checkout@v4
+#      - name: set up JDK 17
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '17'
+#          distribution: 'zulu'
+#          cache: gradle
+#
+#      - name: Cache Gradle packages
+#        uses: actions/cache@v2
+#        with:
+#          path: |
+#            ~/.gradle/caches
+#            ~/.gradle/wrapper
+#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+#          restore-keys: |
+#            ${{ runner.os }}-gradle-
+#
+#      - name: Grant execute permission for gradlew
+#        run: chmod +x gradlew
+#
+#      - name: Run Unit Tests
+#        run: ./gradlew test
+#
+#      - name: Run Instrumentation Tests
+#        run: ./gradlew connectedAndroidTest
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -20,7 +20,7 @@ android {
         versionCode = 1
         versionName = "1.0"
 
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "com.example.rememberme.CustomTestRunner"
         vectorDrawables {
             useSupportLibrary = true
         }
@@ -105,6 +105,17 @@ dependencies {
     implementation(libs.hilt.android)
     implementation(libs.androidx.hilt.navigation.compose)
     kapt(libs.hilt.compiler)
+
+    // For Robolectric tests.
+    testImplementation(libs.hilt.android.testing)
+    // ...with Kotlin.
+    kspTest(libs.hilt.android.compiler)
+
+    // For instrumented tests.
+
+    androidTestImplementation(libs.hilt.android.testing)
+    // ...with Kotlin.
+    kspAndroidTest(libs.hilt.android.compiler)
     // Hilt Worker
     implementation(libs.androidx.hilt.work)
     // When using Kotlin.

diff --git a/app/src/androidTest/java/com/example/rememberme/CustomTestRunner.kt b/app/src/androidTest/java/com/example/rememberme/CustomTestRunner.kt
@@ -0,0 +1,14 @@
+package com.example.rememberme
+
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
+import dagger.hilt.android.testing.HiltTestApplication
+
+// A custom runner to set up the instrumented application class for tests.
+class CustomTestRunner : AndroidJUnitRunner() {
+
+    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
+        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
+    }
+}
diff --git a/app/src/androidTest/java/com/example/rememberme/presentation/navgraph/NavGraphTest.kt b/app/src/androidTest/java/com/example/rememberme/presentation/navgraph/NavGraphTest.kt
@@ -1,19 +1,23 @@
-package com.example.rememberme
+package com.example.rememberme.presentation.navgraph
 
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.example.rememberme.presentation.navgraph.NavGraph
-import com.example.rememberme.presentation.navgraph.Routes
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class NavGraphTest {
 
+    @get:Rule
+    var hiltRule = HiltAndroidRule(this)
+
     @get:Rule
     val composeTestRule = createComposeRule()
 

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_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,30 +1,106 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
+    android:viewportWidth="838"
+    android:viewportHeight="638">
+  <group
+      android:name="animation_group"
+      android:scaleX="0.45"
+      android:scaleY="0.34260142"
+      android:translateX="230.45"
+      android:translateY="209.71014">
+    <path
+        android:fillColor="#f2f2f2"
+        android:pathData="M508.14,192.26a5.09,5.09 0,0 0,3.69 -8.82c-0.13,-0.51 -0.22,-0.88 -0.35,-1.39q0.07,-0.17 0.14,-0.33c4.69,-11.17 20.57,-11.1 25.22,0.09 4.12,9.93 9.37,19.88 10.67,30.38a40.44,40.44 0,0 1,-0.71 13.91,162.13 162.13,0 0,0 14.75,-67.34 156.49,156.49 0,0 0,-0.97 -17.46q-0.8,-7.13 -2.23,-14.15a164.01,164.01 0,0 0,-32.52 -69.51,43.65 43.65,0 0,1 -18.15,-18.83 33.29,33.29 0,0 1,-3.03 -9.1c0.88,0.12 3.33,-13.34 2.67,-14.17 1.23,-1.87 3.44,-2.8 4.78,-4.62 6.69,-9.07 15.91,-7.49 20.72,4.84 10.28,5.19 10.38,13.79 4.07,22.06 -4.01,5.26 -4.56,12.39 -8.08,18.02 0.36,0.46 0.74,0.91 1.1,1.38a165.07,165.07 0,0 1,17.23 27.29c-1.37,-10.69 0.65,-23.57 4.1,-31.87 3.92,-9.46 11.27,-17.43 17.74,-25.6 7.77,-9.82 23.72,-5.54 25.09,6.92q0.02,0.18 0.04,0.36 -1.44,0.81 -2.82,1.73a6.9,6.9 0,0 0,2.78 12.57l0.14,0.02a68.7,68.7 0,0 1,-1.81 10.27c8.3,32.11 -9.62,43.81 -35.22,44.33 -0.56,0.29 -1.12,0.58 -1.68,0.85a168.49,168.49 0,0 1,9.07 42.68,159.8 159.8,0 0,1 -0.12,25.8l0.04,-0.3a42.23,42.23 0,0 1,14.42 -24.38c11.09,-9.11 26.77,-12.47 38.73,-19.79 5.76,-3.53 13.14,1.03 12.14,7.71q-0.02,0.16 -0.05,0.32a46.38,46.38 0,0 0,-5.2 2.51q-1.44,0.81 -2.82,1.73a6.9,6.9 0,0 0,2.78 12.57l0.14,0.02c0.1,0.01 0.19,0.03 0.29,0.04a68.76,68.76 0,0 1,-12.65 19.8c-5.19,28.03 -27.49,30.69 -51.34,22.53h-0.01a168.44,168.44 0,0 1,-11.31 33.03L509.15,228.35c-0.14,-0.45 -0.28,-0.91 -0.41,-1.36a45.93,45.93 0,0 0,11.18 -0.67c-3,-3.68 -6,-7.39 -9,-11.07a2.51,2.51 0,0 1,-0.19 -0.22c-1.52,-1.88 -3.06,-3.75 -4.58,-5.64l-0,-0a67.27,67.27 0,0 1,1.97 -17.14Z"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M637.91,88.81c-7.52,-27.4 53.1,-50.9 69.02,-28.83 2.21,-3.14 10.39,-5.04 14.15,-4.08s6.91,3.37 9.99,5.7c4.23,3.25 8.62,6.62 11.22,11.3 2.62,4.66 3.02,11.01 -0.5,15.05 -2.79,3.21 -11.03,5.29 -15.22,6.14 -2.93,0.6 -5.39,1.08 -7.51,1.42a14.35,14.35 0,0 1,-2.5 -9.49,11.65 11.65,0 0,0 -5.08,8.55c-0.06,0.71 23.65,87.96 23.65,87.96a51.72,51.72 0,0 1,-8.95 4.02,112.54 112.54,0 0,1 -13.95,-30.41 97.45,97.45 0,0 0,0.27 21.65,119.14 119.14,0 0,0 2.04,11.99c-28.18,6.08 -70.56,4.08 -89,-21.79q-0,-0.16 -0.01,-0.32a4.4,4.4 0,0 0,-8.5 -1.54c-0.45,1.14 -0.86,2.13 -1.23,2.91C610.43,149.85 617.38,127.61 637.91,88.81Z"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M589.96,548.21v0.9A3.81,3.81 0,0 1,589.96 548.21Z"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M617.56,393.13a15.32,15.32 0,0 1,2.18 -0.42Q618.47,392.92 617.56,393.13Z"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M616.92,393.3c0.19,-0.05 0.41,-0.11 0.64,-0.16C617.34,393.19 617.14,393.23 616.92,393.3Z"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M820.79,638L717.5,638a8.21,8.21 0,0 1,-2.21 -10.11c2.82,-6.47 -2.71,-12.38 -2.71,-12.38a17.57,17.57 0,0 1,-3.54 -16.19c2.74,-9.56 -7.99,-36.53 -7.99,-36.53s-5.78,34.83 -12.87,75.23L589.96,638a18.26,18.26 0,0 1,0 -18.49c5.72,-9.71 0,-11.57 0,-11.57s-5.72,-10.86 0,-18.75 0,-40.09 0,-40.09c0.22,1.42 1.85,-1.16 4.36,-6.59 3.82,-8.26 9.66,-23.11 15.57,-40.35 4.22,-12.3 8.47,-25.84 12.03,-39.08h0.01q1.4,-5.22 2.65,-10.34c1.63,-6.7 3.03,-13.2 4.09,-19.31 2.3,-13.16 3.06,-24.46 1.29,-31.81 -1.47,-6.12 -4.68,-9.49 -10.22,-8.91 2.97,-0.49 7.32,-0.96 12.68,-1.4 0.97,-0.08 1.97,-0.16 3,-0.24 39.97,-3.02 125.72,-4.75 125.72,-4.75L787.41,433.35l33.26,59.58S819.76,572.86 820.79,638Z"/>
+    <path
+        android:fillColor="#e6e6e6"
+        android:pathData="M710.55,183.02 L650.03,170.19l-12.02,24.19L597.56,217.8s26.08,106.64 25.93,121.64c-0.38,38.08 -61.31,123.44 -15.28,116.87s55.37,-34.07 70.14,-29.72c13.32,3.92 29.59,21.37 40.49,8.89s14.73,1.93 21.62,2.43c3.27,0.24 1.3,-15.76 9.54,0.5s51.9,-5.63 37.1,-20.43c-24.65,-24.65 -29.66,-206.36 -29.66,-206.36l-27.44,-8.44Z"/>
+    <path
+        android:fillColor="#a0616a"
+        android:pathData="M596.41,570.3a14.53,14.53 0,0 0,-1.5 -20.21,13.94 13.94,0 0,0 -1.87,-1.35l10.12,-49.66 -23.39,-14 -6.51,69.52a14.49,14.49 0,0 0,3.34 17.37,13.86 13.86,0 0,0 19.56,-1.39Q596.29,570.44 596.41,570.3Z"/>
+    <path
+        android:fillColor="#e6e6e6"
+        android:pathData="M669.04,308.55c-0.15,-1.6 -2.18,-2.32 -5,-3.32a30.95,30.95 0,0 1,-8 -3.79c-6.25,-4.51 -3.79,-9.23 -0.39,-15.76 0.66,-1.27 1.35,-2.59 2,-3.96 1.92,-4.06 -1.14,-20.83 -9.12,-49.84 -2.46,-8.93 -2.45,-15.24 -4.15,-19.42 -1.69,-4.18 -5.08,-6.25 -14.32,-6.68a42.25,42.25 0,0 0,-30.42 10.81c-0.22,0.2 -0.46,0.41 -0.68,0.62q-0.63,0.6 -1.24,1.22a42.22,42.22 0,0 0,-12.27 29.03l-0.04,1.86 -1.91,88.63 -5.36,77.78 -7.39,107.14 5.47,0.27L598.05,524.23l2.65,0.13 6.28,-26.35 7.56,-31.71 2.78,-11.65 8.62,-36.14 4.02,-16.89 2.46,-10.31L633.42,387.1l4.88,-20.47c0.11,-0.43 11.35,-44.76 24.3,-52.17C667.43,311.7 669.17,310.1 669.04,308.55Z"/>
+    <path
+        android:fillColor="#a0616a"
+        android:pathData="M814.35,569.77a14.53,14.53 0,0 1,-0.68 -20.25,13.93 13.93,0 0,1 1.71,-1.54L799.99,499.69l21.75,-16.43 13.93,68.42a14.49,14.49 0,0 1,-1.45 17.63,13.86 13.86,0 0,1 -19.59,0.72Q814.49,569.9 814.35,569.77Z"/>
+    <path
+        android:fillColor="#e6e6e6"
+        android:pathData="M825,465S808.03,405.31 813.2,398.85s-10.11,-7.72 -3.52,-19.76 -2.5,-14.05 -2.5,-14.05l-4.93,-27.67 -8.82,-67.96 -0.27,-2.02 -2.56,-19.77a42.34,42.34 0,0 0,-16.7 -28.62c-0.23,-0.18 -0.47,-0.35 -0.71,-0.52q-1.63,-1.17 -3.33,-2.17a42.26,42.26 0,0 0,-28.11 -5.34c-18.29,2.85 -12.59,9.67 -15.56,27.93 -4.82,29.7 -6.07,46.7 -3.72,50.54 0.79,1.29 1.62,2.53 2.42,3.72 4.08,6.13 7.03,10.55 1.3,15.72a31.25,31.25 0,0 1,-7.54 4.62c-2.69,1.3 -4.64,2.24 -4.62,3.84 0.03,1.55 1.93,2.96 7.03,5.18 6.18,2.7 12.81,12.92 18.25,23.36a257.88,257.88 0,0 1,11.52 25.9L797.54,503.14l7.62,21.42 2.63,-0.42 21.58,-3.42 5.41,-0.86Z"/>
+    <path
+        android:fillColor="#a0616a"
+        android:pathData="M685.02,119.91m-49.37,0a49.37,49.37 0,1 1,98.74 0a49.37,49.37 0,1 1,-98.74 0"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M610.97,92.66c-7.52,-27.4 53.1,-50.9 69.02,-28.83 2.21,-3.14 10.39,-5.04 14.15,-4.08s6.91,3.37 9.99,5.7c4.23,3.25 8.62,6.62 11.22,11.3 2.62,4.66 3.02,11.01 -0.5,15.05 -2.79,3.21 -11.03,5.29 -15.22,6.14 -2.93,0.6 -5.39,1.08 -7.51,1.42a14.35,14.35 0,0 1,-2.5 -9.49,11.65 11.65,0 0,0 -5.08,8.55c-0.06,0.71 23.65,87.96 23.65,87.96a51.72,51.72 0,0 1,-8.95 4.02,112.54 112.54,0 0,1 -13.95,-30.41 97.45,97.45 0,0 0,0.27 21.65,119.14 119.14,0 0,0 2.04,11.99c-28.18,6.08 -70.56,4.08 -89,-21.79q-0,-0.16 -0.01,-0.32a4.4,4.4 0,0 0,-8.5 -1.53c-0.45,1.14 -0.86,2.13 -1.23,2.91C583.48,153.69 590.43,131.46 610.97,92.66Z"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M629.44,66.85"/>
+    <path
+        android:fillColor="#f2f2f2"
+        android:pathData="M366.12,263.26a5.09,5.09 0,0 1,-3.69 -8.82c0.13,-0.51 0.22,-0.88 0.35,-1.39q-0.07,-0.17 -0.14,-0.33c-4.69,-11.17 -20.57,-11.1 -25.22,0.09 -4.12,9.93 -9.37,19.88 -10.67,30.38a40.44,40.44 0,0 0,0.71 13.91A162.13,162.13 0,0 1,312.72 229.76a156.49,156.49 0,0 1,0.97 -17.46q0.8,-7.13 2.23,-14.15a164.01,164.01 0,0 1,32.52 -69.51,43.65 43.65,0 0,0 18.15,-18.83 33.29,33.29 0,0 0,3.03 -9.1c-0.88,0.12 -3.33,-13.34 -2.67,-14.17 -1.23,-1.87 -3.44,-2.8 -4.78,-4.62 -6.69,-9.07 -15.91,-7.49 -20.72,4.84 -10.28,5.19 -10.38,13.79 -4.07,22.06 4.01,5.26 4.56,12.39 8.08,18.02 -0.36,0.46 -0.74,0.91 -1.1,1.38a165.07,165.07 0,0 0,-17.23 27.29c1.37,-10.69 -0.65,-23.57 -4.1,-31.87 -3.92,-9.46 -11.27,-17.43 -17.74,-25.6 -7.77,-9.82 -23.72,-5.54 -25.09,6.92q-0.02,0.18 -0.04,0.36 1.44,0.81 2.82,1.73a6.9,6.9 0,0 1,-2.78 12.57l-0.14,0.02a68.7,68.7 0,0 0,1.81 10.27c-8.3,32.11 9.62,43.81 35.22,44.33 0.56,0.29 1.12,0.58 1.68,0.85a168.49,168.49 0,0 0,-9.07 42.68,159.8 159.8,0 0,0 0.12,25.8l-0.04,-0.3A42.23,42.23 0,0 0,295.38 218.88c-11.09,-9.11 -26.77,-12.47 -38.73,-19.79 -5.76,-3.53 -13.14,1.03 -12.14,7.71q0.02,0.16 0.05,0.32a46.38,46.38 0,0 1,5.2 2.51q1.44,0.81 2.82,1.73a6.9,6.9 0,0 1,-2.78 12.57l-0.14,0.02c-0.1,0.01 -0.19,0.03 -0.29,0.04A68.76,68.76 0,0 0,262.01 243.79c5.19,28.03 27.49,30.69 51.34,22.53h0.01a168.44,168.44 0,0 0,11.31 33.03L365.11,299.35c0.14,-0.45 0.28,-0.91 0.41,-1.36a45.93,45.93 0,0 1,-11.18 -0.67c3,-3.68 6,-7.39 9,-11.07a2.51,2.51 0,0 0,0.19 -0.22c1.52,-1.88 3.06,-3.75 4.58,-5.64l0,-0a67.27,67.27 0,0 0,-1.97 -17.14Z"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M177.52,59.98c-0.92,2.14 -29.2,1.91 -30.5,3.81 -9.99,14.7 26.02,77.23 16.03,91.95l-1.39,1.66a65.76,65.76 0,0 0,9.36 -5.28c0.27,-6.02 0.53,-12.07 0.82,-18.09a49.72,49.72 0,0 1,7.17 12.6c2.33,-1.64 4.23,-4.68 14.2,-10.66A62.51,62.51 0,0 1,207.02 124.6Z"/>
+    <path
+        android:fillColor="#ffb6b6"
+        android:pathData="M198.06,180.43a23.43,23.43 0,0 0,-35.49 13.86L119.58,306.29 45.69,264.34a22.88,22.88 0,1 0,-14.27 22.75c15.56,16.61 83.02,84.7 110.95,58.09 23.47,-22.36 57.35,-109.03 65.51,-138.96A23.43,23.43 0,0 0,198.06 180.43Z"/>
+    <path
+        android:fillColor="#ffb6b6"
+        android:pathData="M117.34,349.88l13.57,61.31l99.19,8.97l9.12,-53.39l-121.87,-16.9z"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M268.86,507.11c-0.05,0.88 -0.1,1.75 -0.16,2.63 -0.95,12.7 -2.04,27.36 -3.22,43.41 -1.86,25.48 -3.93,54.49 -6.03,84.85L51.4,638l40.35,-121.28s16.29,-8.97 8,-24.04 8.03,-3.06 8.18,-24.58 14.78,-44.42 14.78,-44.42l2.4,-32.58 1.37,0.03 108.27,1.8 1.98,0.04 3.33,27.97A123.67,123.67 0,0 1,268.86 507.11Z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M179.25,150.72l49.37,-2.54 22.93,36.24s43.15,7.21 40.16,58.06 -52.5,95.46 -52.5,95.46l2.12,-7.26 -3.68,10.5 0.47,5.9 5.01,6.24 0.52,6.46 -4.44,10.22v0a5.84,5.84 0,0 1,-5.54 8.9l-71.34,-7.15c-1.62,-4.47 -2.93,-9.81 -9.44,-0.91l-6.72,-0.65 -27.94,-2.71 -1.64,-5.99a23.2,23.2 0,0 1,3.78 -20.01v0a30.61,30.61 0,0 1,1.77 -22.98l0.13,-0.27 2.97,-2.47s-32.46,-48.76 4.8,-85.49l14.95,-25.42 16.73,-20.41Z"/>
+    <path
+        android:fillColor="#ffb6b6"
+        android:pathData="M191.54,82.51m-46.82,0a46.82,46.82 0,1 1,93.64 0a46.82,46.82 0,1 1,-93.64 0"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M227.1,149.95a22.55,22.55 0,0 1,-7.55 -12.39,48.45 48.45,0 0,0 0.67,17.69c-2.54,1.91 -4.99,3.72 -7.32,5.36a49.72,49.72 0,0 0,-7.17 -12.6c-0.29,6.02 -0.55,12.07 -0.82,18.09a65.75,65.75 0,0 1,-9.36 5.28l1.39,-1.66c9.99,-14.72 -15.86,-41.8 -5.87,-56.5 2.8,-4.12 -9.86,-36.66 -19.5,-38.12 -8.58,-1.3 -8.22,1.18 -16.53,2.99a41.59,41.59 0,0 0,-3.98 -10.31,34.07 34.07,0 0,1 -0.32,10.87c-2.95,0.11 -5.28,-1.77 -8.43,-2.25 -20.07,-3.07 -18.03,-24.78 -12.45,-31.66 5.6,-6.86 24.21,-8.92 32.79,-11.15 0.78,-0.76 2.55,-0.29 3.34,-1.01 16.44,-15.05 38.43,-17.54 58.21,-10.87 21.1,7.11 34.26,20.87 41.01,42.09l1.94,16.98c1.74,5.46 -0.45,30.86 -1.94,36.39C259.42,138.67 247.1,127.94 227.1,149.95Z"/>
+    <path
+        android:fillColor="#ffb6b6"
+        android:pathData="M295.36,371.77l-1.84,-143.55a23.17,23.17 0,0 0,-23.17 -22.81h-0a23.17,23.17 0,0 0,-23.14 24.4l6.49,149.06 0.12,90.74a20.22,20.22 0,1 0,24.83 7.56Z"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M537,557.49s-2.85,51.27 -4.16,80.51L434.7,638c-2.02,-26.61 -2.7,-46.16 -2.7,-46.16l-5.37,46.16h-99.2l-6.15,-85.49 29.72,-73.67s161.06,-11.17 176,3C541.93,496 537,557.49 537,557.49Z"/>
+    <path
+        android:fillColor="#ffb6b6"
+        android:pathData="M450.22,72.6m-53.61,0a53.61,53.61 0,1 1,107.21 0a53.61,53.61 0,1 1,-107.21 0"/>
+    <path
+        android:fillColor="#2f2e41"
+        android:pathData="M512.7,55.18c-5.51,2.51 -9.07,20.69 -13.4,16.47s-4.04,-9.73 -9.87,-11.29c-4.71,-1.27 -9.78,0.18 -14.08,2.46 -0.77,0.4 -1.51,0.84 -2.24,1.28 -0.48,-0.32 -0.95,-0.62 -1.47,-0.9a17.03,17.03 0,0 0,-12.54 -1.41,16.71 16.71,0 0,1 8.26,6.09c-1.44,0.96 -2.9,1.93 -4.39,2.79 -12.45,7.18 -30.17,-8.44 -43.27,-14.31 8.21,15.4 4.17,21.78 -2.96,37.71l-0.25,0.91c0.4,-3.99 -11.95,-6.97 -11.23,-1.35 0.51,3.99 3.96,12.86 5.9,16.38 -13.78,-15.93 -23.19,-35.43 -21.21,-55.54 0.43,-4.22 0.3,-8.68 2.48,-12.35 2.18,-3.65 6.73,-6.21 10.75,-4.82a35.54,35.54 0,0 1,53.51 -32.52c5.14,3.02 9.44,7.29 14.16,10.97 4.72,3.68 10.15,6.89 16.13,7.2 3.79,0.18 7.92,-0.74 11.18,1.22 3.77,2.28 4.42,7.05 4.99,11.64a17.01,17.01 0,0 0,-9.17 3.82,16.65 16.65,0 0,1 10.02,2.15 1.04,1.04 0,0 1,0.16 0.09C506.16,49.46 505.96,51.15 512.7,55.18Z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M327.67,504.78c45.65,-53.44 30.23,-121.4 12.11,-190.01l3.45,-101.35a31,31 0,0 1,14.03 -24.9L403.86,158.07 422,131.84l50,5 27.73,29.32 30.69,23.43a50.84,50.84 0,0 1,18.79 51.39L519.84,373.81s12.28,68.86 4.79,76.46 -26.81,0 -11.49,8.54c18.38,10.24 35.09,8.35 25.79,17.66s2.47,22.23 2.47,22.23Z"/>
+    <path
+        android:fillColor="#ffb6b6"
+        android:pathData="M347.19,582.44l7.61,-54.22 -30.37,-8.67 -6.01,57.61a18.33,18.33 0,1 0,28.76 5.28Z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M405,167.84s-86.44,28.13 -88.5,48.72S315.12,249.75 306,332.12l0.48,221.88s57.95,12.41 52.01,-0.86 -3.87,-19.51 -3.87,-19.51 12.42,-4.9 9.31,-20.48 12.49,-92.77 12.49,-92.77L386.27,281.95Z"/>
+    <path
+        android:fillColor="#ffb6b6"
+        android:pathData="M511.58,579.57l-4.05,-54.6 30.87,-6.67 2.23,57.88a18.33,18.33 0,1 1,-29.05 3.39Z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M480.99,162.08s84.41,33.72 85.13,54.4 -0.79,33.2 2.92,116l-14.98,221.38s-58.64,8.59 -51.84,-4.26 5.14,-19.21 5.14,-19.21 -12.08,-5.7 -7.96,-21.04S493,415.95 493,415.95l-0.77,-138.79Z"/>
+  </group>
+</vector>
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,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <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,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#396846</color>
+</resources>