diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 711e5ac..12fe67b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ android:allowBackup="false" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..4c05ec6 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt b/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt index 4b3cc0a..f6aff62 100644 --- a/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt +++ b/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt @@ -67,7 +67,7 @@ class MediaControlsManager(val context: Service, private val mediaSession: Media .setMediaSession(mediaSession.sessionToken) .setShowActionsInCompactView(0, 1, 2) ) - .setSmallIcon(R.drawable.ottericon) + .setSmallIcon(R.drawable.ottershape) .run { if (cover != null) { try { setLargeIcon(cover.get()) } catch (_: Exception) {} diff --git a/app/src/main/play/listings/en-US/graphics/icon/1.png b/app/src/main/play/listings/en-US/graphics/icon/1.png index 34be3a2..3e6b6fe 100644 Binary files a/app/src/main/play/listings/en-US/graphics/icon/1.png and b/app/src/main/play/listings/en-US/graphics/icon/1.png differ diff --git a/app/src/main/res/drawable-hdpi/ottericon.png b/app/src/main/res/drawable-hdpi/ottericon.png deleted file mode 100644 index 09f5018..0000000 Binary files a/app/src/main/res/drawable-hdpi/ottericon.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ottershape.png b/app/src/main/res/drawable-hdpi/ottershape.png new file mode 100644 index 0000000..33e2275 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ottershape.png differ diff --git a/app/src/main/res/drawable-mdpi/ottericon.png b/app/src/main/res/drawable-mdpi/ottericon.png deleted file mode 100644 index 6c172a9..0000000 Binary files a/app/src/main/res/drawable-mdpi/ottericon.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ottershape.png b/app/src/main/res/drawable-mdpi/ottershape.png new file mode 100644 index 0000000..cc939cb Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ottershape.png differ diff --git a/app/src/main/res/drawable-xhdpi/ottericon.png b/app/src/main/res/drawable-xhdpi/ottericon.png deleted file mode 100644 index 70efa59..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ottericon.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ottershape.png b/app/src/main/res/drawable-xhdpi/ottershape.png new file mode 100644 index 0000000..6f711d0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ottershape.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ottericon.png b/app/src/main/res/drawable-xxhdpi/ottericon.png deleted file mode 100644 index 743d312..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ottericon.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ottershape.png b/app/src/main/res/drawable-xxhdpi/ottershape.png new file mode 100644 index 0000000..0eb1125 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ottershape.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ottericon.png b/app/src/main/res/drawable-xxxhdpi/ottericon.png deleted file mode 100644 index ff16169..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ottericon.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ottershape.png b/app/src/main/res/drawable-xxxhdpi/ottershape.png new file mode 100644 index 0000000..d7b9527 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ottershape.png differ diff --git a/app/src/main/res/drawable/ottershape.png b/app/src/main/res/drawable/ottershape.png deleted file mode 100644 index 8e7aed9..0000000 Binary files a/app/src/main/res/drawable/ottershape.png and /dev/null differ diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index 8b7fc49..a3be16e 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -55,7 +55,7 @@ android:theme="@style/AppTheme.AppBar" app:backgroundTint="@color/colorPrimary" app:layout_insetEdge="bottom" - app:navigationIcon="@drawable/ottericon" + app:navigationIcon="@drawable/ottershape" tools:menu="@menu/toolbar" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7f2c409..73d4146 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -38,7 +38,7 @@ android:theme="@style/AppTheme.AppBar" app:backgroundTint="@color/colorPrimary" app:layout_insetEdge="bottom" - app:navigationIcon="@drawable/ottericon" + app:navigationIcon="@drawable/ottershape" tools:menu="@menu/toolbar" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index d4f4073..fba571a 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -58,7 +58,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:layout_marginEnd="16dp" - android:drawableTop="@drawable/ottericon" + android:drawableTop="@drawable/ottershape" android:drawablePadding="16dp" android:drawableTint="#525252" android:text="@string/search_welcome" @@ -72,7 +72,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:layout_marginEnd="16dp" - android:drawableTop="@drawable/ottericon" + android:drawableTop="@drawable/ottershape" android:drawablePadding="16dp" android:drawableTint="#525252" android:text="@string/search_no_results" diff --git a/app/src/main/res/layout/partial_queue.xml b/app/src/main/res/layout/partial_queue.xml index 81d4ccc..afb6925 100644 --- a/app/src/main/res/layout/partial_queue.xml +++ b/app/src/main/res/layout/partial_queue.xml @@ -17,7 +17,7 @@ android:layout_gravity="center" android:layout_marginTop="64dp" android:layout_marginBottom="64dp" - android:drawableTop="@drawable/ottericon" + android:drawableTop="@drawable/ottershape" android:drawablePadding="16dp" android:drawableTint="#525252" android:text="@string/playback_queue_empty" diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 4ae7d12..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 4ae7d12..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index c593e32..07348f5 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png deleted file mode 100644 index 3f1ed3e..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 40419d1..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index c593e32..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 2e3b8cd..b748420 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png deleted file mode 100644 index f1f3cf6..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index fa7f764..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 2e3b8cd..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index af87689..7ecc02e 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png deleted file mode 100644 index f3489d9..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 4b2cac3..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index af87689..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index a556161..192c739 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png deleted file mode 100644 index 5c72bcc..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 466f617..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index a556161..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 499cc7e..258b711 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png deleted file mode 100644 index c20ab9a..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index df294f6..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 499cc7e..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..4e823a0 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #3DDC84 + \ No newline at end of file