diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0c9cddf04..1b24cb602 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,13 +41,12 @@ android:name=".JellyfinApplication" android:allowBackup="true" android:appCategory="video" - android:banner="@drawable/app_banner" + android:banner="@mipmap/app_banner" android:dataExtractionRules="@xml/backup_rules" android:fullBackupContent="@xml/backup_content" - android:icon="@drawable/app_icon" + android:icon="@mipmap/app_icon" android:label="@string/app_name" android:largeHeap="true" - android:roundIcon="@drawable/app_icon_round" android:supportsRtl="true" android:theme="@style/Theme.Jellyfin" android:usesCleartextTraffic="true"> diff --git a/app/src/main/java/org/jellyfin/androidtv/integration/LeanbackChannelWorker.kt b/app/src/main/java/org/jellyfin/androidtv/integration/LeanbackChannelWorker.kt index c7f695bdd..e3e32b58f 100644 --- a/app/src/main/java/org/jellyfin/androidtv/integration/LeanbackChannelWorker.kt +++ b/app/src/main/java/org/jellyfin/androidtv/integration/LeanbackChannelWorker.kt @@ -198,7 +198,7 @@ class LeanbackChannelWorker( } // Update logo - ResourcesCompat.getDrawable(context.resources, R.drawable.app_icon, context.theme)?.let { + ResourcesCompat.getDrawable(context.resources, R.mipmap.app_icon, context.theme)?.let { ChannelLogoUtils.storeChannelLogo( context, ContentUris.parseId(uri), diff --git a/app/src/main/res/drawable-v24/app_banner_background.xml b/app/src/main/res/drawable-v24/app_banner_background.xml deleted file mode 100644 index 8061f0b69..000000000 --- a/app/src/main/res/drawable-v24/app_banner_background.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-v24/app_banner_foreground.xml b/app/src/main/res/drawable-v24/app_banner_foreground.xml deleted file mode 100644 index ff2d68e38..000000000 --- a/app/src/main/res/drawable-v24/app_banner_foreground.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-v24/app_icon_background.xml b/app/src/main/res/drawable-v24/app_icon_background.xml deleted file mode 100644 index 148b70571..000000000 --- a/app/src/main/res/drawable-v24/app_icon_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-v24/app_icon_background_round.xml b/app/src/main/res/drawable-v24/app_icon_background_round.xml deleted file mode 100644 index 35b0c914e..000000000 --- a/app/src/main/res/drawable-v24/app_icon_background_round.xml +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/app/src/main/res/drawable-v24/app_icon_foreground.xml b/app/src/main/res/drawable-v24/app_icon_foreground.xml deleted file mode 100644 index 0a84a5ab6..000000000 --- a/app/src/main/res/drawable-v24/app_icon_foreground.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable-v26/app_icon_foreground_padded.xml b/app/src/main/res/drawable-v26/app_icon_foreground_padded.xml deleted file mode 100644 index 1a1e85429..000000000 --- a/app/src/main/res/drawable-v26/app_icon_foreground_padded.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/app_banner.xml b/app/src/main/res/drawable/app_banner.xml index 9b2860621..551900e2b 100644 --- a/app/src/main/res/drawable/app_banner.xml +++ b/app/src/main/res/drawable/app_banner.xml @@ -1,4 +1,3 @@ - diff --git a/app/src/main/res/drawable/app_banner_background.xml b/app/src/main/res/drawable/app_banner_background.xml index 0eae91dbd..7feebca2e 100644 --- a/app/src/main/res/drawable/app_banner_background.xml +++ b/app/src/main/res/drawable/app_banner_background.xml @@ -1,6 +1,4 @@ - - + + android:fillType="evenOdd" + android:pathData="M35.48,119C30.81,109.61 61.48,54 71,54C80.53,54 111.15,109.71 106.53,119C101.9,128.28 40.16,128.39 35.48,119ZM47.74,110.85C50.8,117 91.25,116.93 94.28,110.85C97.31,104.76 77.25,68.26 71.01,68.26C64.77,68.26 44.67,104.69 47.74,110.85Z"> + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/app_icon.xml b/app/src/main/res/drawable/app_icon.xml deleted file mode 100644 index 95d98040b..000000000 --- a/app/src/main/res/drawable/app_icon.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/app_icon_background.xml b/app/src/main/res/drawable/app_icon_background.xml index 23ca8f00e..113787c5d 100644 --- a/app/src/main/res/drawable/app_icon_background.xml +++ b/app/src/main/res/drawable/app_icon_background.xml @@ -1,9 +1,9 @@ + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> + android:pathData="M0,0h108v108h-108z" /> diff --git a/app/src/main/res/drawable/app_icon_background_round.xml b/app/src/main/res/drawable/app_icon_background_round.xml deleted file mode 100644 index 3ba4212ab..000000000 --- a/app/src/main/res/drawable/app_icon_background_round.xml +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/app/src/main/res/drawable/app_icon_foreground.xml b/app/src/main/res/drawable/app_icon_foreground.xml index b2c13aa70..e7eb07997 100644 --- a/app/src/main/res/drawable/app_icon_foreground.xml +++ b/app/src/main/res/drawable/app_icon_foreground.xml @@ -1,22 +1,41 @@ - + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> + + + + + + + + + diff --git a/app/src/main/res/drawable/app_icon_foreground_monochrome.xml b/app/src/main/res/drawable/app_icon_foreground_monochrome.xml new file mode 100644 index 000000000..bc9b5b1ea --- /dev/null +++ b/app/src/main/res/drawable/app_icon_foreground_monochrome.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/app_icon_round.xml b/app/src/main/res/drawable/app_icon_round.xml deleted file mode 100644 index 4542c7535..000000000 --- a/app/src/main/res/drawable/app_icon_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable-v26/app_icon.xml b/app/src/main/res/mipmap-anydpi-v26/app_icon.xml similarity index 72% rename from app/src/main/res/drawable-v26/app_icon.xml rename to app/src/main/res/mipmap-anydpi-v26/app_icon.xml index 3dc1d4afe..af02ea54f 100644 --- a/app/src/main/res/drawable-v26/app_icon.xml +++ b/app/src/main/res/mipmap-anydpi-v26/app_icon.xml @@ -1,5 +1,6 @@ - - + + + diff --git a/app/src/main/res/mipmap-hdpi/app_banner.png b/app/src/main/res/mipmap-hdpi/app_banner.png new file mode 100644 index 000000000..682f53770 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/app_banner.png differ diff --git a/app/src/main/res/mipmap-hdpi/app_icon.png b/app/src/main/res/mipmap-hdpi/app_icon.png new file mode 100644 index 000000000..1d18838ca Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/app_icon.png differ diff --git a/app/src/main/res/mipmap-mdpi/app_banner.png b/app/src/main/res/mipmap-mdpi/app_banner.png new file mode 100644 index 000000000..92105fbc3 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/app_banner.png differ diff --git a/app/src/main/res/mipmap-mdpi/app_icon.png b/app/src/main/res/mipmap-mdpi/app_icon.png new file mode 100644 index 000000000..9998dc341 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/app_icon.png differ diff --git a/app/src/main/res/mipmap-xhdpi/app_banner.png b/app/src/main/res/mipmap-xhdpi/app_banner.png new file mode 100644 index 000000000..56d807629 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/app_banner.png differ diff --git a/app/src/main/res/mipmap-xhdpi/app_icon.png b/app/src/main/res/mipmap-xhdpi/app_icon.png new file mode 100644 index 000000000..6bcf5f472 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/app_icon.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/app_banner.png b/app/src/main/res/mipmap-xxhdpi/app_banner.png new file mode 100644 index 000000000..118261216 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/app_banner.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/app_icon.png b/app/src/main/res/mipmap-xxhdpi/app_icon.png new file mode 100644 index 000000000..4686b1713 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/app_icon.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/app_banner.png b/app/src/main/res/mipmap-xxxhdpi/app_banner.png new file mode 100644 index 000000000..f36530aae Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/app_banner.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/app_icon.png b/app/src/main/res/mipmap-xxxhdpi/app_icon.png new file mode 100644 index 000000000..52eb4789d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/app_icon.png differ diff --git a/app/src/main/res/xml/authenticator.xml b/app/src/main/res/xml/authenticator.xml index 1718b0781..be0da5429 100644 --- a/app/src/main/res/xml/authenticator.xml +++ b/app/src/main/res/xml/authenticator.xml @@ -1,6 +1,6 @@ + android:smallIcon="@mipmap/app_icon" /> diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml index a92395fd9..741f1d28f 100644 --- a/app/src/main/res/xml/searchable.xml +++ b/app/src/main/res/xml/searchable.xml @@ -1,7 +1,7 @@