From ef0b546d4ccd071a2741e51cdd294ebb24a057d6 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 15 Mar 2020 16:46:38 -0400 Subject: [PATCH] Replace more icons --- .../kanade/tachiyomi/data/download/DownloadNotifier.kt | 8 ++++---- .../tachiyomi/data/library/LibraryUpdateService.kt | 6 +++--- .../eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt | 6 +++--- .../eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt | 6 +++--- app/src/main/res/drawable/ic_add_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_add_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_book_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_book_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_brightness_4_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_brightness_4_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_brightness_5_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_brightness_5_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_close_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_close_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_delete_white_24dp.xml | 9 --------- .../main/res/drawable/ic_file_download_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_image_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_pause_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_photo_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_play_arrow_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_refresh_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_settings_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_share_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_share_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_skip_next_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_skip_next_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_skip_previous_24dp.xml | 9 +++++++++ .../main/res/drawable/ic_skip_previous_white_24dp.xml | 9 --------- app/src/main/res/layout/categories_controller.xml | 2 +- app/src/main/res/layout/reader_activity.xml | 6 ++++-- app/src/main/res/layout/reader_color_filter.xml | 2 +- app/src/main/res/layout/reader_page_sheet.xml | 4 ++-- app/src/main/res/layout/webview_activity.xml | 2 +- app/src/main/res/menu/chapter_selection.xml | 2 +- app/src/main/res/menu/reader.xml | 6 ++++-- app/src/main/res/menu/updates_chapter_selection.xml | 2 +- app/src/main/res/values/themes.xml | 2 ++ 37 files changed, 102 insertions(+), 168 deletions(-) create mode 100644 app/src/main/res/drawable/ic_add_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_add_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_book_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_book_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_brightness_4_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_brightness_4_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_brightness_5_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_brightness_5_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_close_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_close_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_delete_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_file_download_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_image_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_pause_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_photo_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_play_arrow_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_refresh_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_settings_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_share_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_share_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_skip_next_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_skip_next_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_skip_previous_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_skip_previous_white_24dp.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt index 7000f79e3..1530b6a0f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt @@ -87,7 +87,7 @@ internal class DownloadNotifier(private val context: Context) { setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) isDownloading = true // Pause action - addAction(R.drawable.ic_pause_white_24dp, + addAction(R.drawable.ic_pause_24dp, context.getString(R.string.action_pause), NotificationReceiver.pauseDownloadsPendingBroadcast(context)) } @@ -119,18 +119,18 @@ internal class DownloadNotifier(private val context: Context) { with(notificationBuilder) { setContentTitle(context.getString(R.string.chapter_paused)) setContentText(context.getString(R.string.download_notifier_download_paused)) - setSmallIcon(R.drawable.ic_pause_white_24dp) + setSmallIcon(R.drawable.ic_pause_24dp) setAutoCancel(false) setProgress(0, 0, false) clearActions() // Open download manager when clicked setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) // Resume action - addAction(R.drawable.ic_play_arrow_white_24dp, + addAction(R.drawable.ic_play_arrow_24dp, context.getString(R.string.action_resume), NotificationReceiver.resumeDownloadsPendingBroadcast(context)) // Clear action - addAction(R.drawable.ic_close_white_24dp, + addAction(R.drawable.ic_close_24dp, context.getString(R.string.action_cancel_all), NotificationReceiver.clearDownloadsPendingBroadcast(context)) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index f371e703d..71e062b7c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -96,11 +96,11 @@ class LibraryUpdateService( private val progressNotificationBuilder by lazy { notificationBuilder(Notifications.CHANNEL_LIBRARY) { setContentTitle(getString(R.string.app_name)) - setSmallIcon(R.drawable.ic_refresh_white_24dp) + setSmallIcon(R.drawable.ic_refresh_24dp) setLargeIcon(notificationBitmap) setOngoing(true) setOnlyAlertOnce(true) - addAction(R.drawable.ic_close_white_24dp, getString(android.R.string.cancel), cancelIntent) + addAction(R.drawable.ic_close_24dp, getString(android.R.string.cancel), cancelIntent) } } @@ -535,7 +535,7 @@ class LibraryUpdateService( NotificationReceiver.markAsReadPendingBroadcast(this@LibraryUpdateService, manga, chapters, Notifications.ID_NEW_CHAPTERS)) // View chapters action - addAction(R.drawable.ic_book_white_24dp, getString(R.string.action_view_chapters), + addAction(R.drawable.ic_book_24dp, getString(R.string.action_view_chapters), NotificationReceiver.openChapterPendingActivity(this@LibraryUpdateService, manga, Notifications.ID_NEW_CHAPTERS)) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt index 5af444614..8f878df9b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt @@ -73,7 +73,7 @@ internal class UpdaterNotifier(private val context: Context) { context.getString(R.string.action_install), NotificationHandler.installApkPendingActivity(context, uri)) // Cancel action - addAction(R.drawable.ic_close_white_24dp, + addAction(R.drawable.ic_close_24dp, context.getString(R.string.action_cancel), NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER)) } @@ -92,11 +92,11 @@ internal class UpdaterNotifier(private val context: Context) { setOnlyAlertOnce(false) setProgress(0, 0, false) // Retry action - addAction(R.drawable.ic_refresh_white_24dp, + addAction(R.drawable.ic_refresh_24dp, context.getString(R.string.action_retry), UpdaterService.downloadApkPendingService(context, url)) // Cancel action - addAction(R.drawable.ic_close_white_24dp, + addAction(R.drawable.ic_close_24dp, context.getString(R.string.action_cancel), NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER)) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt index 714211d48..5045c6bb5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt @@ -54,7 +54,7 @@ class SaveImageNotifier(private val context: Context) { private fun showCompleteNotification(file: File, image: Bitmap) { with(notificationBuilder) { setContentTitle(context.getString(R.string.picture_saved)) - setSmallIcon(R.drawable.ic_image_black_24dp) + setSmallIcon(R.drawable.ic_photo_24dp) setStyle(NotificationCompat.BigPictureStyle().bigPicture(image)) setLargeIcon(image) setAutoCancel(true) @@ -66,11 +66,11 @@ class SaveImageNotifier(private val context: Context) { setContentIntent(NotificationHandler.openImagePendingActivity(context, file)) // Share action - addAction(R.drawable.ic_share_white_24dp, + addAction(R.drawable.ic_share_24dp, context.getString(R.string.action_share), NotificationReceiver.shareImagePendingBroadcast(context, file.absolutePath, notificationId)) // Delete action - addAction(R.drawable.ic_delete_white_24dp, + addAction(R.drawable.ic_delete_24dp, context.getString(R.string.action_delete), NotificationReceiver.deleteImagePendingBroadcast(context, file.absolutePath, notificationId)) diff --git a/app/src/main/res/drawable/ic_add_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml new file mode 100644 index 000000000..757f45033 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml deleted file mode 100644 index b9b8eca8b..000000000 --- a/app/src/main/res/drawable/ic_add_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_book_24dp.xml b/app/src/main/res/drawable/ic_book_24dp.xml new file mode 100644 index 000000000..1f05b6210 --- /dev/null +++ b/app/src/main/res/drawable/ic_book_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_book_white_24dp.xml b/app/src/main/res/drawable/ic_book_white_24dp.xml deleted file mode 100644 index 4b7103673..000000000 --- a/app/src/main/res/drawable/ic_book_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_brightness_4_24dp.xml b/app/src/main/res/drawable/ic_brightness_4_24dp.xml new file mode 100644 index 000000000..2f5a094ab --- /dev/null +++ b/app/src/main/res/drawable/ic_brightness_4_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_brightness_4_white_24dp.xml b/app/src/main/res/drawable/ic_brightness_4_white_24dp.xml deleted file mode 100644 index 09f16c1d3..000000000 --- a/app/src/main/res/drawable/ic_brightness_4_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_brightness_5_24dp.xml b/app/src/main/res/drawable/ic_brightness_5_24dp.xml new file mode 100644 index 000000000..5eb722920 --- /dev/null +++ b/app/src/main/res/drawable/ic_brightness_5_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_brightness_5_black_24dp.xml b/app/src/main/res/drawable/ic_brightness_5_black_24dp.xml deleted file mode 100644 index 54301c0aa..000000000 --- a/app/src/main/res/drawable/ic_brightness_5_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml new file mode 100644 index 000000000..f3a79ee73 --- /dev/null +++ b/app/src/main/res/drawable/ic_close_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml deleted file mode 100644 index d11cc5c9c..000000000 --- a/app/src/main/res/drawable/ic_close_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml deleted file mode 100644 index f9213d2b5..000000000 --- a/app/src/main/res/drawable/ic_delete_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_file_download_white_24dp.xml b/app/src/main/res/drawable/ic_file_download_white_24dp.xml deleted file mode 100644 index e43b8645a..000000000 --- a/app/src/main/res/drawable/ic_file_download_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_image_black_24dp.xml b/app/src/main/res/drawable/ic_image_black_24dp.xml deleted file mode 100644 index b2018595e..000000000 --- a/app/src/main/res/drawable/ic_image_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable/ic_pause_white_24dp.xml deleted file mode 100644 index 8356ff57f..000000000 --- a/app/src/main/res/drawable/ic_pause_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_photo_24dp.xml b/app/src/main/res/drawable/ic_photo_24dp.xml new file mode 100644 index 000000000..d9ba24da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_photo_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml deleted file mode 100644 index 81a8f74f6..000000000 --- a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_refresh_white_24dp.xml b/app/src/main/res/drawable/ic_refresh_white_24dp.xml deleted file mode 100644 index a8175c316..000000000 --- a/app/src/main/res/drawable/ic_refresh_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings_white_24dp.xml deleted file mode 100644 index ce997a727..000000000 --- a/app/src/main/res/drawable/ic_settings_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_share_black_24dp.xml b/app/src/main/res/drawable/ic_share_black_24dp.xml deleted file mode 100644 index a28fb9e28..000000000 --- a/app/src/main/res/drawable/ic_share_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml deleted file mode 100644 index c5027c659..000000000 --- a/app/src/main/res/drawable/ic_share_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_skip_next_24dp.xml b/app/src/main/res/drawable/ic_skip_next_24dp.xml new file mode 100644 index 000000000..dad5e7bb6 --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_next_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml deleted file mode 100644 index 5d1017b1c..000000000 --- a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_skip_previous_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_24dp.xml new file mode 100644 index 000000000..986729543 --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_previous_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml deleted file mode 100644 index 752878575..000000000 --- a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/categories_controller.xml b/app/src/main/res/layout/categories_controller.xml index 31c887944..2aae55ff9 100644 --- a/app/src/main/res/layout/categories_controller.xml +++ b/app/src/main/res/layout/categories_controller.xml @@ -18,7 +18,7 @@ android:id="@+id/fab" style="@style/Theme.Widget.FAB" app:layout_anchor="@id/recycler" - app:srcCompat="@drawable/ic_add_white_24dp" /> + app:srcCompat="@drawable/ic_add_24dp" /> + app:srcCompat="@drawable/ic_skip_previous_24dp" + app:tint="?attr/colorOnPrimary" /> + app:srcCompat="@drawable/ic_skip_next_24dp" + app:tint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/reader_color_filter.xml b/app/src/main/res/layout/reader_color_filter.xml index a2b7dd53f..9254d3c81 100644 --- a/app/src/main/res/layout/reader_color_filter.xml +++ b/app/src/main/res/layout/reader_color_filter.xml @@ -213,7 +213,7 @@ app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/brightness_seekbar" - app:srcCompat="@drawable/ic_brightness_5_black_24dp" /> + app:srcCompat="@drawable/ic_brightness_5_24dp" /> + app:srcCompat="@drawable/ic_photo_24dp" /> + app:srcCompat="@drawable/ic_share_24dp" /> + app:navigationIcon="@drawable/ic_close_24dp" /> diff --git a/app/src/main/res/menu/chapter_selection.xml b/app/src/main/res/menu/chapter_selection.xml index aaaf53ec9..1ae33a089 100644 --- a/app/src/main/res/menu/chapter_selection.xml +++ b/app/src/main/res/menu/chapter_selection.xml @@ -4,7 +4,7 @@ diff --git a/app/src/main/res/menu/reader.xml b/app/src/main/res/menu/reader.xml index fb2788e97..72901792c 100644 --- a/app/src/main/res/menu/reader.xml +++ b/app/src/main/res/menu/reader.xml @@ -4,14 +4,16 @@ diff --git a/app/src/main/res/menu/updates_chapter_selection.xml b/app/src/main/res/menu/updates_chapter_selection.xml index f14e13098..472bfb551 100644 --- a/app/src/main/res/menu/updates_chapter_selection.xml +++ b/app/src/main/res/menu/updates_chapter_selection.xml @@ -4,7 +4,7 @@ diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 4bdabc66d..7f2bf2562 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -175,6 +175,7 @@