Added Android adaptive icons

mmatyas · Mar 23, 2021 · c027320 · c027320
1 parent 00909ca
commit c027320
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 9 deletions.
diff --git a/src/app/install.pri b/src/app/install.pri
@@ -68,14 +68,22 @@ android {
     QT += androidextras
     OTHER_FILES += \
         platform/android/AndroidManifest.xml \
-        platform/android/res/drawable/banner.png \
-        platform/android/res/drawable-ldpi/icon.png \
-        platform/android/res/drawable-mdpi/icon.png \
-        platform/android/res/drawable-hdpi/icon.png \
-        platform/android/res/drawable-xhdpi/icon.png \
-        platform/android/res/drawable-xxhdpi/icon.png \
-        platform/android/res/drawable-xxxhdpi/icon.png \
+        platform/android/res/mipmap/banner.png \
+        platform/android/res/mipmap-ldpi/icon.png \
+        platform/android/res/mipmap-mdpi/icon.png \
+        platform/android/res/mipmap-hdpi/icon.png \
+        platform/android/res/mipmap-xhdpi/icon.png \
+        platform/android/res/mipmap-xxhdpi/icon.png \
+        platform/android/res/mipmap-xxxhdpi/icon.png \
+        platform/android/res/mipmap-ldpi/icon_fg.png \
+        platform/android/res/mipmap-mdpi/icon_fg.png \
+        platform/android/res/mipmap-hdpi/icon_fg.png \
+        platform/android/res/mipmap-xhdpi/icon_fg.png \
+        platform/android/res/mipmap-xxhdpi/icon_fg.png \
+        platform/android/res/mipmap-xxxhdpi/icon_fg.png \
+        platform/android/res/mipmap-anydpi-v26/icon.xml \
         platform/android/src/org/pegasus_frontend/android/MainActivity.java \
+        platform/android/res/values/icon_bg.xml \
         platform/android/res/values/libs.xml \
 
     ANDROID_MIN_SDK_VERSION = 21

diff --git a/src/app/platform/android/AndroidManifest.xml b/src/app/platform/android/AndroidManifest.xml
@@ -9,8 +9,8 @@
         android:hardwareAccelerated="true"
         android:name="org.qtproject.qt5.android.bindings.QtApplication"
         android:label="Pegasus"
-        android:icon="@drawable/icon"
-        android:banner="@drawable/banner"
+        android:icon="@mipmap/icon"
+        android:banner="@mipmap/banner"
         android:extractNativeLibs="true"
         android:requestLegacyExternalStorage="true">
         <activity

diff --git a/src/app/platform/android/res/mipmap-anydpi-v26/icon.xml b/src/app/platform/android/res/mipmap-anydpi-v26/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/icon_bg"/>
+    <foreground android:drawable="@mipmap/icon_fg"/>
+</adaptive-icon>
diff --git a/...atform/android/res/drawable-hdpi/icon.png → ...platform/android/res/mipmap-hdpi/icon.png b/...atform/android/res/drawable-hdpi/icon.png → ...platform/android/res/mipmap-hdpi/icon.png
diff --git a/src/app/platform/android/res/mipmap-hdpi/icon_fg.png b/src/app/platform/android/res/mipmap-hdpi/icon_fg.png
diff --git a/...atform/android/res/drawable-ldpi/icon.png → ...platform/android/res/mipmap-ldpi/icon.png b/...atform/android/res/drawable-ldpi/icon.png → ...platform/android/res/mipmap-ldpi/icon.png
diff --git a/...atform/android/res/drawable-mdpi/icon.png → ...platform/android/res/mipmap-mdpi/icon.png b/...atform/android/res/drawable-mdpi/icon.png → ...platform/android/res/mipmap-mdpi/icon.png
diff --git a/src/app/platform/android/res/mipmap-mdpi/icon_fg.png b/src/app/platform/android/res/mipmap-mdpi/icon_fg.png
diff --git a/...tform/android/res/drawable-xhdpi/icon.png → ...latform/android/res/mipmap-xhdpi/icon.png b/...tform/android/res/drawable-xhdpi/icon.png → ...latform/android/res/mipmap-xhdpi/icon.png
diff --git a/src/app/platform/android/res/mipmap-xhdpi/icon_fg.png b/src/app/platform/android/res/mipmap-xhdpi/icon_fg.png
diff --git a/...form/android/res/drawable-xxhdpi/icon.png → ...atform/android/res/mipmap-xxhdpi/icon.png b/...form/android/res/drawable-xxhdpi/icon.png → ...atform/android/res/mipmap-xxhdpi/icon.png
diff --git a/src/app/platform/android/res/mipmap-xxhdpi/icon_fg.png b/src/app/platform/android/res/mipmap-xxhdpi/icon_fg.png
diff --git a/...orm/android/res/drawable-xxxhdpi/icon.png → ...tform/android/res/mipmap-xxxhdpi/icon.png b/...orm/android/res/drawable-xxxhdpi/icon.png → ...tform/android/res/mipmap-xxxhdpi/icon.png
diff --git a/src/app/platform/android/res/mipmap-xxxhdpi/icon_fg.png b/src/app/platform/android/res/mipmap-xxxhdpi/icon_fg.png
diff --git a/.../platform/android/res/drawable/banner.png → ...pp/platform/android/res/mipmap/banner.png b/.../platform/android/res/drawable/banner.png → ...pp/platform/android/res/mipmap/banner.png
diff --git a/src/app/platform/android/res/values/icon_bg.xml b/src/app/platform/android/res/values/icon_bg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="icon_bg">#333333</color>
+</resources>