Added adaptive icon

Faltenreich · May 11, 2018 · 4a35f50 · 4a35f50
1 parent 656f8a3
commit 4a35f50
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 5 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Diaguard/src/beta/res/values/colors.xml b/Diaguard/src/beta/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+
+    <color name="primary">@color/blue</color>
+
+</resources>
diff --git a/Diaguard/src/main/AndroidManifest.xml b/Diaguard/src/main/AndroidManifest.xml
@@ -15,10 +15,9 @@
     <application
         android:name=".DiaguardApplication"
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
-        <receiver android:name=".util.AlarmBroadcastReceiver" />
 
         <activity
             android:name=".ui.activity.MainActivity"
@@ -96,6 +95,8 @@
                 android:resource="@xml/provider_paths"/>
         </provider>
 
+        <receiver android:name=".util.AlarmBroadcastReceiver" />
+
         <service
             android:name=".networking.openfoodfacts.OpenFoodFactsService"
             android:exported="false" />

diff --git a/Diaguard/src/main/res/drawable-hdpi/ic_launcher.png b/Diaguard/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/drawable-mdpi/ic_launcher.png b/Diaguard/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/drawable-xhdpi/ic_launcher.png b/Diaguard/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/drawable-xxhdpi/ic_launcher.png b/Diaguard/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/drawable-xxxhdpi/ic_launcher.png b/Diaguard/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/menu/navigation.xml b/Diaguard/src/main/res/menu/navigation.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <group
         android:id="@+id/fragments"

diff --git a/Diaguard/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Diaguard/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <background android:drawable="@color/primary"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+
+</adaptive-icon>
diff --git a/Diaguard/src/main/res/mipmap-hdpi/ic_launcher.png b/Diaguard/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/Diaguard/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/Diaguard/src/main/res/mipmap-mdpi/ic_launcher.png b/Diaguard/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/Diaguard/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/Diaguard/src/main/res/mipmap-xhdpi/ic_launcher.png b/Diaguard/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/Diaguard/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/Diaguard/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Diaguard/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/Diaguard/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/Diaguard/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Diaguard/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Diaguard/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/Diaguard/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/Diaguard/src/main/res/values/colors.xml b/Diaguard/src/main/res/values/colors.xml
@@ -2,6 +2,7 @@
 
 <resources>
 
+    <color name="primary">@color/green</color>
     <color name="translucent_scrim_end">#58000000</color>
     <color name="translucent_scrim_center">#3F000000</color>