Merge pull request #2564 from xisberto/adaptive_icon

Adaptive icon

25 files changed, 17 insertions, 3 deletions

diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 3a5db2c36..3257c13a7 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher">
+        android:icon="@mipmap/ic_launcher">
 
         <service
             android:name=".service.download.DownloadService"
diff --git a/core/src/main/res/drawable-hdpi/ic_launcher.png b/core/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 8bd22b54a..000000000
--- a/core/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-ldpi/ic_launcher.png b/core/src/main/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 494468020..000000000
--- a/core/src/main/res/drawable-ldpi/ic_launcher.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_launcher.png b/core/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 219e8c5ab..000000000
--- a/core/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_launcher.png b/core/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 2dbfd8874..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_launcher.png b/core/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 41b261b4f..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
diff --git a/core/src/main/res/drawable/bg_splash.xml b/core/src/main/res/drawable/bg_splash.xml
index dd66e3083..32241ec22 100644
--- a/core/src/main/res/drawable/bg_splash.xml
+++ b/core/src/main/res/drawable/bg_splash.xml
@@ -2,12 +2,12 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:drawable="@color/overlay_dark"/>
+        android:drawable="@color/ic_launcher_background"/>
 
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/ic_launcher"/>
+            android:src="@mipmap/ic_launcher_foreground"/>
     </item>
 
 </layer-list>
\ No newline at end of file
diff --git a/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..036d09bc5
--- /dev/null
+++ b/core/src/main/res/mipmap-anydpi-v26/ic_launcher.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_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..036d09bc5
--- /dev/null
+++ b/core/src/main/res/mipmap-anydpi-v26/ic_launcher_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_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher.png b/core/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..12e9b3395
--- /dev/null
+++ b/core/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..d687f94bb
--- /dev/null
+++ b/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher_round.png b/core/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..12e9b3395
--- /dev/null
+++ b/core/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher.png b/core/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..1da13d374
--- /dev/null
+++ b/core/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..2e7a4b74d
--- /dev/null
+++ b/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher_round.png b/core/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..1da13d374
--- /dev/null
+++ b/core/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher.png b/core/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..32b022ada
--- /dev/null
+++ b/core/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..5f90a1d11
--- /dev/null
+++ b/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..32b022ada
--- /dev/null
+++ b/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..321600e15
--- /dev/null
+++ b/core/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..d72ffedbb
--- /dev/null
+++ b/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..321600e15
--- /dev/null
+++ b/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..ff2870dca
--- /dev/null
+++ b/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..0af16fadf
--- /dev/null
+++ b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..ff2870dca
--- /dev/null
+++ b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/core/src/main/res/values/ic_launcher_background.xml b/core/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 000000000..3df03b8f4
--- /dev/null
+++ b/core/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#008AB8</color>
+</resources>
\ No newline at end of file