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 6efd34f180..e1c46a93f5 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 @@ -73,7 +73,7 @@ internal class BackupNotifier(private val context: Context) { } addAction( - R.drawable.ic_share_grey_24dp, + R.drawable.ic_share_24dp, context.getString(R.string.share), NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, Notifications.ID_BACKUP_COMPLETE) ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt index ee8ad9634a..e8cc3d9da7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt @@ -364,7 +364,7 @@ class BackupRestoreService : Service() { .setOnlyAlertOnce(true) .setAutoCancel(false) .setColor(ContextCompat.getColor(this, R.color.colorAccent)) - .addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent) + .addAction(R.drawable.ic_close_24dp, getString(android.R.string.cancel), cancelIntent) } /** @@ -440,7 +440,7 @@ class BackupRestoreService : Service() { .setPriority(NotificationCompat.PRIORITY_HIGH) .setColor(ContextCompat.getColor(this, R.color.colorAccent)) if (errors.size > 0 && !path.isNullOrEmpty() && !file.isNullOrEmpty()) { - resultNotification.addAction(R.drawable.ic_clear_grey_24dp_img, getString(R.string + resultNotification.addAction(R.drawable.ic_close_24dp, getString(R.string .view_all_errors), getErrorLogIntent(path, file)) } notificationManager.notify(Notifications.ID_RESTORE_COMPLETE, resultNotification.build()) 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 decfb110be..13d5e8208d 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 @@ -78,7 +78,7 @@ internal class DownloadNotifier(private val context: Context) { setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) isDownloading = true // Pause action - addAction(R.drawable.ic_av_pause_grey_24dp_img, + addAction(R.drawable.ic_pause_24dp, context.getString(R.string.pause), NotificationReceiver.pauseDownloadsPendingBroadcast(context)) } @@ -124,7 +124,7 @@ internal class DownloadNotifier(private val context: Context) { setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) isDownloading = true // Pause action - addAction(R.drawable.ic_av_pause_grey_24dp_img, + addAction(R.drawable.ic_pause_24dp, context.getString(R.string.pause), NotificationReceiver.pauseDownloadsPendingBroadcast(context)) } @@ -149,7 +149,7 @@ internal class DownloadNotifier(private val context: Context) { with(notification) { setContentTitle(context.getString(R.string.paused)) setContentText(context.getString(R.string.download_paused)) - setSmallIcon(R.drawable.ic_av_pause_grey_24dp_img) + setSmallIcon(R.drawable.ic_pause_24dp) setAutoCancel(false) setProgress(0, 0, false) clearActions() @@ -157,13 +157,13 @@ internal class DownloadNotifier(private val context: Context) { setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) // Resume action addAction( - R.drawable.ic_av_play_arrow_grey_img, + R.drawable.ic_play_arrow_24dp, context.getString(R.string.resume), NotificationReceiver.resumeDownloadsPendingBroadcast(context) ) // Clear action addAction( - R.drawable.ic_clear_grey_24dp_img, + R.drawable.ic_close_24dp, context.getString(R.string.cancel_all), NotificationReceiver.clearDownloadsPendingBroadcast(context) ) 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 554631321f..46b200093b 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 @@ -166,7 +166,7 @@ class LibraryUpdateNotifier(private val context: Context) { ) ) addAction( - R.drawable.ic_book_white_24dp, context.getString(R.string.view_chapters), + R.drawable.ic_book_24dp, context.getString(R.string.view_chapters), NotificationReceiver.openChapterPendingActivity( context, 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 8f6551f7ea..64c4b97356 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 @@ -75,11 +75,11 @@ internal class UpdaterNotifier(private val context: Context) { setProgress(0, 0, false) // Install action setContentIntent(NotificationHandler.installApkPendingActivity(context, uri)) - addAction(R.drawable.ic_system_update_grey_24dp_img, + addAction(R.drawable.ic_system_update_24dp, context.getString(R.string.install), NotificationHandler.installApkPendingActivity(context, uri)) // Cancel action - addAction(R.drawable.ic_clear_grey_24dp_img, + addAction(R.drawable.ic_close_24dp, context.getString(R.string.cancel), NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER)) } @@ -99,11 +99,11 @@ internal class UpdaterNotifier(private val context: Context) { setProgress(0, 0, false) color = ContextCompat.getColor(context, R.color.colorAccent) // Retry action - addAction(R.drawable.ic_refresh_grey_24dp_img, + addAction(R.drawable.ic_refresh_24dp, context.getString(R.string.retry), UpdaterService.downloadApkPendingService(context, url)) // Cancel action - addAction(R.drawable.ic_clear_grey_24dp_img, + addAction(R.drawable.ic_close_24dp, context.getString(R.string.cancel), NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER)) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt index bd0647fe8d..b8f7f5a94a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt @@ -56,7 +56,7 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam val extNames = names.joinToString(", ") setContentText(extNames) setStyle(NotificationCompat.BigTextStyle().bigText(extNames)) - setSmallIcon(R.drawable.ic_extension_update) + setSmallIcon(R.drawable.ic_extension_update_24dp) color = ContextCompat.getColor(context, R.color.colorAccent) setContentIntent( NotificationReceiver.openExtensionsPendingActivity( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt index 6720af1cc5..2ddfcc0097 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt @@ -80,7 +80,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie if (!createCategory) { reorder.setImageDrawable( ContextCompat.getDrawable( - itemView.context, R.drawable.ic_delete_white_24dp + itemView.context, R.drawable.ic_delete_24dp ) ) reorder.setOnClickListener { 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 9d01b277a1..cdd92d32f2 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 @@ -56,7 +56,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_insert_photo_white_24dp) + setSmallIcon(R.drawable.ic_photo_24dp) setStyle(NotificationCompat.BigPictureStyle().bigPicture(image)) setLargeIcon(image) setAutoCancel(true) @@ -67,11 +67,11 @@ class SaveImageNotifier(private val context: Context) { setContentIntent(NotificationHandler.openImagePendingActivity(context, file)) // Share action - addAction(R.drawable.ic_share_grey_24dp, + addAction(R.drawable.ic_share_24dp, context.getString(R.string.share), NotificationReceiver.shareImagePendingBroadcast(context, file.absolutePath, notificationId)) // Delete action - addAction(R.drawable.ic_delete_grey_24dp, + addAction(R.drawable.ic_delete_24dp, context.getString(R.string.delete), NotificationReceiver.deleteImagePendingBroadcast(context, file.absolutePath, notificationId)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt index 51b29e63b4..9052e97a32 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt @@ -29,7 +29,7 @@ class SettingsMainController : SettingsController() { onClick { navigateTo(SettingsGeneralController()) } } preference { - iconRes = R.drawable.ic_book_black_24dp + iconRes = R.drawable.ic_book_24dp iconTint = tintColor titleRes = R.string.library onClick { navigateTo(SettingsLibraryController()) } diff --git a/app/src/main/res/drawable-hdpi/ic_av_pause_grey_24dp_img.png b/app/src/main/res/drawable-hdpi/ic_av_pause_grey_24dp_img.png deleted file mode 100644 index 074bf75621..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_av_pause_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_av_play_arrow_grey_img.png b/app/src/main/res/drawable-hdpi/ic_av_play_arrow_grey_img.png deleted file mode 100644 index 37a4ca1cd5..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_av_play_arrow_grey_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_book_white_24dp.png deleted file mode 100644 index 0fd780e778..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_book_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_clear_grey_24dp_img.png b/app/src/main/res/drawable-hdpi/ic_clear_grey_24dp_img.png deleted file mode 100644 index 8b288271d0..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_clear_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png b/app/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png deleted file mode 100644 index 13d2741f36..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_extension_update.png b/app/src/main/res/drawable-hdpi/ic_extension_update.png deleted file mode 100644 index add124edac..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_extension_update.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_insert_photo_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_insert_photo_white_24dp.png deleted file mode 100644 index 25a9576ddd..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_insert_photo_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png deleted file mode 100644 index 8ee6206643..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_share_grey_24dp.png b/app/src/main/res/drawable-hdpi/ic_share_grey_24dp.png deleted file mode 100644 index c0b2a80e96..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_share_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_system_update_grey_24dp_img.png b/app/src/main/res/drawable-hdpi/ic_system_update_grey_24dp_img.png deleted file mode 100644 index 51cf94d80c..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_system_update_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_av_pause_grey_24dp_img.png b/app/src/main/res/drawable-mdpi/ic_av_pause_grey_24dp_img.png deleted file mode 100644 index e13456677b..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_av_pause_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_av_play_arrow_grey_img.png b/app/src/main/res/drawable-mdpi/ic_av_play_arrow_grey_img.png deleted file mode 100644 index 1c2bd317cd..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_av_play_arrow_grey_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_book_white_24dp.png deleted file mode 100644 index 8b02f9ac2c..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_book_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_clear_grey_24dp_img.png b/app/src/main/res/drawable-mdpi/ic_clear_grey_24dp_img.png deleted file mode 100644 index cd8b425e98..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_clear_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png b/app/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png deleted file mode 100644 index a0df896860..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_extension_update.png b/app/src/main/res/drawable-mdpi/ic_extension_update.png deleted file mode 100644 index 9956eebfc0..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_extension_update.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_insert_photo_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_insert_photo_white_24dp.png deleted file mode 100644 index d474bd577d..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_insert_photo_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png deleted file mode 100644 index 895d64406f..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_share_grey_24dp.png b/app/src/main/res/drawable-mdpi/ic_share_grey_24dp.png deleted file mode 100644 index e2814bdc98..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_share_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_system_update_grey_24dp_img.png b/app/src/main/res/drawable-mdpi/ic_system_update_grey_24dp_img.png deleted file mode 100644 index 33cca7074e..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_system_update_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_av_pause_grey_24dp_img.png b/app/src/main/res/drawable-xhdpi/ic_av_pause_grey_24dp_img.png deleted file mode 100644 index c218aee56f..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_av_pause_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_av_play_arrow_grey_img.png b/app/src/main/res/drawable-xhdpi/ic_av_play_arrow_grey_img.png deleted file mode 100644 index d5d467c420..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_av_play_arrow_grey_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png deleted file mode 100644 index 5a5ee30413..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_clear_grey_24dp_img.png b/app/src/main/res/drawable-xhdpi/ic_clear_grey_24dp_img.png deleted file mode 100644 index dd1c49e093..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_clear_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png b/app/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png deleted file mode 100644 index 4ca7f7c9ad..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_extension_update.png b/app/src/main/res/drawable-xhdpi/ic_extension_update.png deleted file mode 100644 index 0ebd6ca1db..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_extension_update.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_insert_photo_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_insert_photo_white_24dp.png deleted file mode 100644 index 2642b9e09e..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_insert_photo_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png deleted file mode 100644 index 848f2fb5a3..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png b/app/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png deleted file mode 100644 index f691067f71..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_system_update_grey_24dp_img.png b/app/src/main/res/drawable-xhdpi/ic_system_update_grey_24dp_img.png deleted file mode 100644 index 37db7d1d40..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_system_update_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_av_pause_grey_24dp_img.png b/app/src/main/res/drawable-xxhdpi/ic_av_pause_grey_24dp_img.png deleted file mode 100644 index 803a258ffb..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_av_pause_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_av_play_arrow_grey_img.png b/app/src/main/res/drawable-xxhdpi/ic_av_play_arrow_grey_img.png deleted file mode 100644 index cf825e63e7..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_av_play_arrow_grey_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png deleted file mode 100644 index d181a32150..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_clear_grey_24dp_img.png b/app/src/main/res/drawable-xxhdpi/ic_clear_grey_24dp_img.png deleted file mode 100644 index bbf521cbce..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_clear_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png deleted file mode 100644 index 209e555eea..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_extension_update.png b/app/src/main/res/drawable-xxhdpi/ic_extension_update.png deleted file mode 100644 index 82901bd47d..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_extension_update.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_insert_photo_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_insert_photo_white_24dp.png deleted file mode 100644 index f9f1defa6d..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_insert_photo_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png deleted file mode 100644 index 945fd729df..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png deleted file mode 100644 index 9ed5b4d432..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_system_update_grey_24dp_img.png b/app/src/main/res/drawable-xxhdpi/ic_system_update_grey_24dp_img.png deleted file mode 100644 index d24aba7b29..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_system_update_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_av_pause_grey_24dp_img.png b/app/src/main/res/drawable-xxxhdpi/ic_av_pause_grey_24dp_img.png deleted file mode 100644 index fdf4261dc1..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_av_pause_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_av_play_arrow_grey_img.png b/app/src/main/res/drawable-xxxhdpi/ic_av_play_arrow_grey_img.png deleted file mode 100644 index 7e1eef6c2d..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_av_play_arrow_grey_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png deleted file mode 100644 index 938eff46c5..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_clear_grey_24dp_img.png b/app/src/main/res/drawable-xxxhdpi/ic_clear_grey_24dp_img.png deleted file mode 100644 index d0b5379447..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_clear_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png deleted file mode 100644 index a1b86d06e8..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_extension_update.png b/app/src/main/res/drawable-xxxhdpi/ic_extension_update.png deleted file mode 100644 index c1366de978..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_extension_update.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_insert_photo_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_insert_photo_white_24dp.png deleted file mode 100644 index 2ffdb55f26..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_insert_photo_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png deleted file mode 100644 index 7fc4e4799d..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png deleted file mode 100644 index 35b1664aa7..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_system_update_grey_24dp_img.png b/app/src/main/res/drawable-xxxhdpi/ic_system_update_grey_24dp_img.png deleted file mode 100644 index 8fa116da79..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_system_update_grey_24dp_img.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_book_black_24dp.xml b/app/src/main/res/drawable/ic_book_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_book_black_24dp.xml rename to app/src/main/res/drawable/ic_book_24dp.xml diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_delete_white_24dp.xml rename to app/src/main/res/drawable/ic_delete_24dp.xml diff --git a/app/src/main/res/drawable/ic_extension_update_24dp.xml b/app/src/main/res/drawable/ic_extension_update_24dp.xml new file mode 100644 index 0000000000..d080d08ce7 --- /dev/null +++ b/app/src/main/res/drawable/ic_extension_update_24dp.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_insert_photo_white_24dp.png b/app/src/main/res/drawable/ic_insert_photo_white_24dp.png deleted file mode 100644 index d474bd577d..0000000000 Binary files a/app/src/main/res/drawable/ic_insert_photo_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_pause_white_24dp.xml rename to app/src/main/res/drawable/ic_pause_24dp.xml diff --git a/app/src/main/res/drawable/ic_image_black_24dp.xml b/app/src/main/res/drawable/ic_photo_24dp.xml similarity index 59% rename from app/src/main/res/drawable/ic_image_black_24dp.xml rename to app/src/main/res/drawable/ic_photo_24dp.xml index b2018595e0..d0300632a8 100644 --- a/app/src/main/res/drawable/ic_image_black_24dp.xml +++ b/app/src/main/res/drawable/ic_photo_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" /> diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_play_arrow_white_24dp.xml rename to app/src/main/res/drawable/ic_play_arrow_24dp.xml diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_share_white_24dp.xml rename to app/src/main/res/drawable/ic_share_24dp.xml diff --git a/app/src/main/res/drawable/ic_system_update_24dp.xml b/app/src/main/res/drawable/ic_system_update_24dp.xml new file mode 100644 index 0000000000..29e7fa3fef --- /dev/null +++ b/app/src/main/res/drawable/ic_system_update_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/manga_header_item.xml b/app/src/main/res/layout/manga_header_item.xml index e03412faef..179fdaf2f6 100644 --- a/app/src/main/res/layout/manga_header_item.xml +++ b/app/src/main/res/layout/manga_header_item.xml @@ -206,7 +206,7 @@ android:layout_marginEnd="6dp" android:contentDescription="@string/share" android:padding="5dp" - android:src="@drawable/ic_share_white_24dp" + android:src="@drawable/ic_share_24dp" android:tooltipText="@string/share" /> diff --git a/app/src/main/res/layout/menu_sheet_item.xml b/app/src/main/res/layout/menu_sheet_item.xml index 2621c06ee7..1d7e2b7270 100644 --- a/app/src/main/res/layout/menu_sheet_item.xml +++ b/app/src/main/res/layout/menu_sheet_item.xml @@ -20,7 +20,7 @@ android:textColor="?android:textColorPrimary" android:textSize="13sp" android:tint="@color/md_white_1000_54" - tools:drawableStart="@drawable/ic_share_grey_24dp" + tools:drawableStart="@drawable/ic_share_24dp" tools:text="@string/share" /> + app:srcCompat="@drawable/ic_photo_24dp" /> + android:tint="@color/md_white_1000_54" + app:srcCompat="@drawable/ic_share_24dp" /> + android:icon="@drawable/ic_delete_24dp"/> + android:icon="@drawable/ic_delete_24dp"/> \ No newline at end of file diff --git a/app/src/main/res/menu/download_queue.xml b/app/src/main/res/menu/download_queue.xml index dfdcdddda4..5efca39ad3 100644 --- a/app/src/main/res/menu/download_queue.xml +++ b/app/src/main/res/menu/download_queue.xml @@ -4,13 +4,13 @@ diff --git a/app/src/main/res/menu/library_selection.xml b/app/src/main/res/menu/library_selection.xml index f6b8c3f3b2..7312cc1adb 100644 --- a/app/src/main/res/menu/library_selection.xml +++ b/app/src/main/res/menu/library_selection.xml @@ -10,7 +10,7 @@