From ab438295d77a3991f06d1ac102938f2cc14f24ca Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 18 Oct 2018 23:16:44 +0200
Subject: [PATCH] fix adaptive icon

apparently needs to be in mipmap-anydpi-v26, not in drawable-anydpi-v26
---
 packaging/android/AndroidManifest.xml               |   2 +-
 packaging/android/res/drawable-mdpi/splash.xml      |   2 +-
 .../icon.xml                                        |   0
 .../res/{drawable-hdpi => mipmap-hdpi}/icon.png     | Bin
 .../{drawable-hdpi => mipmap-hdpi}/round_icon.png   | Bin
 .../res/{drawable-ldpi => mipmap-ldpi}/icon.png     | Bin
 .../{drawable-ldpi => mipmap-ldpi}/round_icon.png   | Bin
 .../res/{drawable-mdpi => mipmap-mdpi}/icon.png     | Bin
 .../{drawable-mdpi => mipmap-mdpi}/round_icon.png   | Bin
 9 files changed, 2 insertions(+), 2 deletions(-)
 rename packaging/android/res/{drawable-anydpi-v26 => mipmap-anydpi-v26}/icon.xml (100%)
 rename packaging/android/res/{drawable-hdpi => mipmap-hdpi}/icon.png (100%)
 rename packaging/android/res/{drawable-hdpi => mipmap-hdpi}/round_icon.png (100%)
 rename packaging/android/res/{drawable-ldpi => mipmap-ldpi}/icon.png (100%)
 rename packaging/android/res/{drawable-ldpi => mipmap-ldpi}/round_icon.png (100%)
 rename packaging/android/res/{drawable-mdpi => mipmap-mdpi}/icon.png (100%)
 rename packaging/android/res/{drawable-mdpi => mipmap-mdpi}/round_icon.png (100%)

diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml
index 6b362ff9..d911e010 100644
--- a/packaging/android/AndroidManifest.xml
+++ b/packaging/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <manifest package="io.guh.nymeaapp" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
 
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="nymea:app" android:icon="@drawable/icon" android:roundIcon="@drawable/round_icon">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="nymea:app" android:icon="@mipmap/icon" android:roundIcon="@mipmap/round_icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="io.guh.nymeaapp.NymeaAppActivity" android:label="nymea:app" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
diff --git a/packaging/android/res/drawable-mdpi/splash.xml b/packaging/android/res/drawable-mdpi/splash.xml
index 611a8f4f..8f4fc965 100644
--- a/packaging/android/res/drawable-mdpi/splash.xml
+++ b/packaging/android/res/drawable-mdpi/splash.xml
@@ -6,7 +6,7 @@
         </shape>
     </item>
     <item>
-         <bitmap android:src="@drawable/icon"
+         <bitmap android:src="@mipmap/icon"
         android:gravity="center" />
     </item>
 </layer-list>
diff --git a/packaging/android/res/drawable-anydpi-v26/icon.xml b/packaging/android/res/mipmap-anydpi-v26/icon.xml
similarity index 100%
rename from packaging/android/res/drawable-anydpi-v26/icon.xml
rename to packaging/android/res/mipmap-anydpi-v26/icon.xml
diff --git a/packaging/android/res/drawable-hdpi/icon.png b/packaging/android/res/mipmap-hdpi/icon.png
similarity index 100%
rename from packaging/android/res/drawable-hdpi/icon.png
rename to packaging/android/res/mipmap-hdpi/icon.png
diff --git a/packaging/android/res/drawable-hdpi/round_icon.png b/packaging/android/res/mipmap-hdpi/round_icon.png
similarity index 100%
rename from packaging/android/res/drawable-hdpi/round_icon.png
rename to packaging/android/res/mipmap-hdpi/round_icon.png
diff --git a/packaging/android/res/drawable-ldpi/icon.png b/packaging/android/res/mipmap-ldpi/icon.png
similarity index 100%
rename from packaging/android/res/drawable-ldpi/icon.png
rename to packaging/android/res/mipmap-ldpi/icon.png
diff --git a/packaging/android/res/drawable-ldpi/round_icon.png b/packaging/android/res/mipmap-ldpi/round_icon.png
similarity index 100%
rename from packaging/android/res/drawable-ldpi/round_icon.png
rename to packaging/android/res/mipmap-ldpi/round_icon.png
diff --git a/packaging/android/res/drawable-mdpi/icon.png b/packaging/android/res/mipmap-mdpi/icon.png
similarity index 100%
rename from packaging/android/res/drawable-mdpi/icon.png
rename to packaging/android/res/mipmap-mdpi/icon.png
diff --git a/packaging/android/res/drawable-mdpi/round_icon.png b/packaging/android/res/mipmap-mdpi/round_icon.png
similarity index 100%
rename from packaging/android/res/drawable-mdpi/round_icon.png
rename to packaging/android/res/mipmap-mdpi/round_icon.png