Merge branch 'p7'

ACM-VIT · Oct 16, 2022 · c5211a0 · c5211a0
2 parents 61e93c3 + 7a434cc
commit c5211a0
Show file tree

Hide file tree

Showing 32 changed files with 18 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+/.idea/kotlinc.xml
+/.idea/vcs.xml
 *.iml
 .gradle
 /local.properties

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,9 +8,9 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_launcher_icon"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_launcher_icon_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AlarmIT"
         tools:targetApi="31">

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_icon.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_icon.xml
@@ -0,0 +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_icon_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_icon_foreground"/>
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_icon_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_icon_round.xml
@@ -0,0 +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_icon_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_icon_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
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_icon.png b/app/src/main/res/mipmap-hdpi/ic_launcher_icon.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_icon_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_icon_foreground.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_icon_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_icon_round.png
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_icon.png b/app/src/main/res/mipmap-mdpi/ic_launcher_icon.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_icon_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_icon_foreground.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_icon_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_icon_round.png
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_icon.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_icon.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_icon_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_icon_foreground.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_icon_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_icon_round.png
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_icon.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_icon.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_icon_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_icon_foreground.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_icon_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_icon_round.png
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_icon.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_icon.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_icon_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_icon_foreground.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_icon_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_icon_round.png
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_icon_background.xml b/app/src/main/res/values/ic_launcher_icon_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_icon_background">#6AB5D7</color>
+</resources>