diff --git a/app/src/debug/res/drawable/ic_launcher_foreground.xml b/app/src/debug/res/drawable/ic_launcher_foreground.xml index ff51d0085..b2db2f35c 100644 --- a/app/src/debug/res/drawable/ic_launcher_foreground.xml +++ b/app/src/debug/res/drawable/ic_launcher_foreground.xml @@ -1,27 +1,14 @@ + android:viewportWidth="256" + android:viewportHeight="256"> + - - - - - - + android:fillColor="#FFFFFFFF" + android:pathData="M234.14,187.75c-9.57,-2.7 -19.5,2.87 -22.2,12.44l-1.97,7c-0.8,2.84 -3.43,4.83 -6.38,4.83h-18.04c-3.66,0 -6.63,-2.97 -6.63,-6.63v-28.56h13.94c16.19,0 29.36,-13.17 29.36,-29.36L222.22,37.36c0,-16.19 -13.17,-29.36 -29.36,-29.36L65.45,8c-16.19,0 -29.36,13.17 -29.36,29.36v110.11c0,16.19 13.17,29.36 29.36,29.36h14.59c-0.7,1.98 -1.54,4.05 -2.57,6.14 -7.36,14.97 -20.78,24.91 -39.89,29.55 -9.66,2.35 -15.58,12.07 -13.24,21.73 2,8.23 9.36,13.75 17.47,13.75 1.41,0 2.83,-0.17 4.26,-0.51 38.36,-9.32 56.31,-32.64 64.6,-50.56 3.36,-7.26 5.42,-14.2 6.67,-20.1h25.58v28.56c0,23.5 19.12,42.61 42.61,42.61h18.04c9.23,0 18.36,-3.07 25.72,-8.64s12.79,-13.53 15.29,-22.41l1.97,-7c2.7,-9.56 -2.87,-19.5 -12.44,-22.2ZM72.08,82.24h114.14v19.79L72.08,102.03v-19.79ZM186.22,43.99v15.53L72.08,59.52v-15.53h114.14ZM72.08,124.76h114.14v16.08L72.08,140.84v-16.08Z"/> + diff --git a/app/src/debug/res/mipmap/ic_launcher.xml b/app/src/debug/res/mipmap/ic_launcher.xml index 1ad255903..40ad6488a 100644 --- a/app/src/debug/res/mipmap/ic_launcher.xml +++ b/app/src/debug/res/mipmap/ic_launcher.xml @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/app/src/debug/res/mipmap/ic_launcher_round.xml b/app/src/debug/res/mipmap/ic_launcher_round.xml deleted file mode 100644 index 1ad255903..000000000 --- a/app/src/debug/res/mipmap/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f3e716f88..48a783ecd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,7 +50,7 @@ android:networkSecurityConfig="@xml/network_security_config" android:preserveLegacyExternalStorage="true" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/Theme.Tachiyomi"> diff --git a/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt b/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt index bd7aa1ee4..881d96b64 100644 --- a/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt +++ b/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt @@ -21,7 +21,7 @@ fun LogoHeader() { horizontalAlignment = Alignment.CenterHorizontally, ) { Icon( - painter = painterResource(R.drawable.ic_tachi), + painter = painterResource(R.drawable.ic_mihon), contentDescription = null, tint = MaterialTheme.colorScheme.onSurface, modifier = Modifier diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt index 817f8a222..4ef212999 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt @@ -28,7 +28,7 @@ class BackupNotifier(private val context: Context) { Notifications.CHANNEL_BACKUP_RESTORE_PROGRESS, ) { setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher)) - setSmallIcon(R.drawable.ic_tachi) + setSmallIcon(R.drawable.ic_mihon) setAutoCancel(false) setOngoing(true) setOnlyAlertOnce(true) @@ -38,7 +38,7 @@ class BackupNotifier(private val context: Context) { Notifications.CHANNEL_BACKUP_RESTORE_COMPLETE, ) { setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher)) - setSmallIcon(R.drawable.ic_tachi) + setSmallIcon(R.drawable.ic_mihon) setAutoCancel(false) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt index e49c5ba37..c21dd7d32 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt @@ -153,7 +153,7 @@ class LibraryUpdateNotifier( ) { setContentTitle(context.stringResource(MR.strings.notification_update_error, failed)) setContentText(context.stringResource(MR.strings.action_show_errors)) - setSmallIcon(R.drawable.ic_tachi) + setSmallIcon(R.drawable.ic_mihon) setContentIntent(NotificationReceiver.openErrorLogPendingActivity(context, uri)) } @@ -193,7 +193,7 @@ class LibraryUpdateNotifier( } } - setSmallIcon(R.drawable.ic_tachi) + setSmallIcon(R.drawable.ic_mihon) setLargeIcon(notificationBitmap) setGroup(Notifications.GROUP_NEW_CHAPTERS) @@ -229,7 +229,7 @@ class LibraryUpdateNotifier( setContentText(description) setStyle(NotificationCompat.BigTextStyle().bigText(description)) - setSmallIcon(R.drawable.ic_tachi) + setSmallIcon(R.drawable.ic_mihon) if (icon != null) { setLargeIcon(icon) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt index f5a900cdc..6c20bea64 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt @@ -149,7 +149,7 @@ internal class AppUpdateNotifier(private val context: Context) { with(notificationBuilder) { setContentTitle(context.stringResource(MR.strings.update_check_notification_update_available)) setContentText(context.stringResource(MR.strings.update_check_fdroid_migration_info)) - setSmallIcon(R.drawable.ic_tachi) + setSmallIcon(R.drawable.ic_mihon) setContentIntent( NotificationHandler.openUrl( context, diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallService.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallService.kt index 826db44cd..3ffe9f783 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallService.kt @@ -25,7 +25,7 @@ class ExtensionInstallService : Service() { override fun onCreate() { val notification = notificationBuilder(Notifications.CHANNEL_EXTENSIONS_UPDATE) { - setSmallIcon(R.drawable.ic_tachi) + setSmallIcon(R.drawable.ic_mihon) setAutoCancel(false) setOngoing(true) setShowWhen(false) diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index c83d7d907..80b3d1951 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,27 +1,14 @@ + android:viewportWidth="256" + android:viewportHeight="256"> + - - - - - - + android:fillColor="#FF000000" + android:pathData="M234.14,187.75c-9.57,-2.7 -19.5,2.87 -22.2,12.44l-1.97,7c-0.8,2.84 -3.43,4.83 -6.38,4.83h-18.04c-3.66,0 -6.63,-2.97 -6.63,-6.63v-28.56h13.94c16.19,0 29.36,-13.17 29.36,-29.36L222.22,37.36c0,-16.19 -13.17,-29.36 -29.36,-29.36L65.45,8c-16.19,0 -29.36,13.17 -29.36,29.36v110.11c0,16.19 13.17,29.36 29.36,29.36h14.59c-0.7,1.98 -1.54,4.05 -2.57,6.14 -7.36,14.97 -20.78,24.91 -39.89,29.55 -9.66,2.35 -15.58,12.07 -13.24,21.73 2,8.23 9.36,13.75 17.47,13.75 1.41,0 2.83,-0.17 4.26,-0.51 38.36,-9.32 56.31,-32.64 64.6,-50.56 3.36,-7.26 5.42,-14.2 6.67,-20.1h25.58v28.56c0,23.5 19.12,42.61 42.61,42.61h18.04c9.23,0 18.36,-3.07 25.72,-8.64s12.79,-13.53 15.29,-22.41l1.97,-7c2.7,-9.56 -2.87,-19.5 -12.44,-22.2ZM72.08,82.24h114.14v19.79L72.08,102.03v-19.79ZM186.22,43.99v15.53L72.08,59.52v-15.53h114.14ZM72.08,124.76h114.14v16.08L72.08,140.84v-16.08Z"/> + diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml new file mode 100644 index 000000000..b2db2f35c --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_mihon.xml b/app/src/main/res/drawable/ic_mihon.xml new file mode 100644 index 000000000..92e656fb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_mihon.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_tachi_splash.xml b/app/src/main/res/drawable/ic_mihon_splash.xml similarity index 83% rename from app/src/main/res/drawable/ic_tachi_splash.xml rename to app/src/main/res/drawable/ic_mihon_splash.xml index 3fdf1b6f5..fa126b0ae 100644 --- a/app/src/main/res/drawable/ic_tachi_splash.xml +++ b/app/src/main/res/drawable/ic_mihon_splash.xml @@ -3,6 +3,6 @@ diff --git a/app/src/main/res/drawable/ic_tachi.xml b/app/src/main/res/drawable/ic_tachi.xml deleted file mode 100644 index 0c988fbf1..000000000 --- a/app/src/main/res/drawable/ic_tachi.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_tachi_monochrome_launcher.xml b/app/src/main/res/drawable/ic_tachi_monochrome_launcher.xml deleted file mode 100644 index 276da9df2..000000000 --- a/app/src/main/res/drawable/ic_tachi_monochrome_launcher.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/mipmap/ic_launcher.xml b/app/src/main/res/mipmap/ic_launcher.xml index 1ad255903..1413a3145 100644 --- a/app/src/main/res/mipmap/ic_launcher.xml +++ b/app/src/main/res/mipmap/ic_launcher.xml @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/mipmap/ic_launcher_round.xml b/app/src/main/res/mipmap/ic_launcher_round.xml deleted file mode 100644 index 1ad255903..000000000 --- a/app/src/main/res/mipmap/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml new file mode 100644 index 000000000..761c85472 --- /dev/null +++ b/app/src/main/res/values/color.xml @@ -0,0 +1,5 @@ + + + #FFFFFF + #36454F + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index f6597c58b..2e6458eca 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -373,7 +373,7 @@