Android: Inherit from Material3 themes and round corners on box art

18 files changed, 12 insertions, 3 deletions

diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
index 284a00684c..35fd924eea 100644
--- a/Source/Android/app/src/main/AndroidManifest.xml
+++ b/Source/Android/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
     <application
         android:name=".DolphinApplication"
         android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true"
         android:preserveLegacyExternalStorage="true"
         android:allowBackup="true"
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java
index 5e33a852a2..48af4e4f4d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java
@@ -129,7 +129,7 @@ public class SyncChannelJobService extends JobService
                               builder.build().toContentValues());
 
       channelId = ContentUris.parseId(channelUrl);
-      Bitmap bitmap = TvUtil.convertToBitmap(context, R.drawable.ic_launcher);
+      Bitmap bitmap = TvUtil.convertToBitmap(context, R.drawable.ic_dolphin);
       ChannelLogoUtils.storeChannelLogo(context, channelId, bitmap);
 
       return channelId;
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_dolphin.png
index e50a86dac1..e50a86dac1 100644
--- a/Source/Android/app/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/Source/Android/app/src/main/res/drawable-hdpi/ic_dolphin.png
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_dolphin.png
index f20aa29c6a..f20aa29c6a 100644
--- a/Source/Android/app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/Source/Android/app/src/main/res/drawable-xhdpi/ic_dolphin.png
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_dolphin.png
index c1a05c347b..c1a05c347b 100644
--- a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_dolphin.png
diff --git a/Source/Android/app/src/main/res/layout/tv_title.xml b/Source/Android/app/src/main/res/layout/tv_title.xml
index 9980b6b6e3..29786d47f5 100644
--- a/Source/Android/app/src/main/res/layout/tv_title.xml
+++ b/Source/Android/app/src/main/res/layout/tv_title.xml
@@ -25,7 +25,7 @@
             android:id="@+id/badge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_launcher"/>
+            android:src="@drawable/ic_dolphin"/>
 
     </RelativeLayout>
 </androidx.leanback.widget.TitleView>
diff --git a/Source/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Source/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000000..036d09bc5f
--- /dev/null
+++ b/Source/Android/app/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/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..e50a86dac1
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..32d19dd1dc
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..032b6ff75e
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..5f636ef075
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..f20aa29c6a
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..e9cc77ff6a
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..c1a05c347b
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..60fe3e3d7b
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..9578251b57
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..f73215fb64
--- /dev/null
+++ b/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/values/ic_launcher_background.xml b/Source/Android/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000000..c5d5899fdf
--- /dev/null
+++ b/Source/Android/app/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">#FFFFFF</color>
+</resources>
\ No newline at end of file