Fix app icon

6 years ago · d0afa2f61f
parent 9cb9d47857
commit d0afa2f61f
42 changed files with 5 additions and 11 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -12,7 +12,6 @@
        android:name=".AegisApplication"
        android:allowBackup="true"
        android:icon="@mipmap/${iconName}"
-        android:roundIcon="@mipmap/ic_launcher_round"
        android:label="Aegis"
        android:supportsRtl="true"
        android:theme="@style/AppTheme.NoActionBar"
--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
--- a/app/src/main/ic_launcher_debug-web.png
+++ b/app/src/main/ic_launcher_debug-web.png
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -1,5 +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"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug.xml
@ -1,5 +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="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_debug_foreground"/>
 </adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug_round.xml
@ -1,5 +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="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_debug_foreground"/>
 </adaptive-icon>
--- 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,5 +0,0 @@
-<?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="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_debug.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_debug.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_debug_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_debug_foreground.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_debug_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_debug_round.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_debug.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_debug.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_debug_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_debug_foreground.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_debug_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_debug_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_debug.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_debug.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_debug_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_debug_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_debug_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_debug_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug_foreground.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug_foreground.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png