From 4230afecaa2475d6e3aa6786501651debf9e9b77 Mon Sep 17 00:00:00 2001 From: Jay Date: Thu, 21 May 2020 03:03:55 -0400 Subject: [PATCH] Refactoring vectors to remove _white/_black from the names --- .../data/backup/BackupRestoreService.kt | 2 +- .../data/library/LibraryUpdateNotifier.kt | 2 +- .../tachiyomi/ui/category/CategoryHolder.kt | 8 ++++---- .../tachiyomi/ui/download/DownloadBottomSheet.kt | 2 +- .../tachiyomi/ui/download/DownloadButton.kt | 4 ++-- .../tachiyomi/ui/download/DownloadHolder.kt | 2 +- .../tachiyomi/ui/library/LibraryController.kt | 2 +- .../kanade/tachiyomi/ui/library/LibraryGroup.kt | 4 ++-- .../tachiyomi/ui/library/LibraryHeaderHolder.kt | 16 ++++++++-------- .../eu/kanade/tachiyomi/ui/main/MainActivity.kt | 2 +- .../tachiyomi/ui/manga/MangaHeaderHolder.kt | 6 +++--- .../manga/process/MigrationListController.kt | 2 +- .../manga/process/MigrationProcessHolder.kt | 2 +- .../recent_updates/RecentChaptersController.kt | 2 +- .../ui/recently_read/RecentlyReadController.kt | 4 ++-- .../ui/setting/SettingsMainController.kt | 12 ++++++------ .../ui/source/browse/BrowseSourceController.kt | 4 ++-- .../tachiyomi/ui/source/filter/GroupItem.kt | 2 +- .../tachiyomi/ui/source/filter/SortGroup.kt | 2 +- .../tachiyomi/ui/source/filter/SortItem.kt | 4 ++-- .../kanade/tachiyomi/widget/CoverViewTarget.kt | 2 +- .../widget/preference/LoginPreference.kt | 12 ++++++++---- ...black_24dp.xml => ic_account_circle_24dp.xml} | 0 .../{ic_add_white_24dp.xml => ic_add_24dp.xml} | 0 .../main/res/drawable/ic_add_to_library_24dp.xml | 7 ------- .../main/res/drawable/ic_alert_octagram_24dp.xml | 8 -------- ...ack_white_24dp.xml => ic_arrow_back_24dp.xml} | 0 ...own_white_24dp.xml => ic_arrow_down_24dp.xml} | 0 ...own_white_32dp.xml => ic_arrow_down_32dp.xml} | 0 ..._white_24dp.xml => ic_arrow_forward_24dp.xml} | 0 ...ow_up_white_24dp.xml => ic_arrow_up_24dp.xml} | 0 ...ow_up_white_32dp.xml => ic_arrow_up_32dp.xml} | 0 ..._backup_black_24dp.xml => ic_backup_24dp.xml} | 0 .../main/res/drawable/ic_book_black_128dp.xml | 9 --------- ...black_24dp.xml => ic_brightness_day_24dp.xml} | 0 ...ite_24dp.xml => ic_brightness_night_24dp.xml} | 0 ...ge_grey_24dp.xml => ic_broken_image_24dp.xml} | 0 ...ort_white_24dp.xml => ic_bug_report_24dp.xml} | 0 ...ic_check_white_24dp.xml => ic_check_24dp.xml} | 0 ...e_white_24dp.xml => ic_check_circle_24dp.xml} | 0 .../ic_chevron_left_double_black_24dp.xml | 12 ------------ ..._white_24dp.xml => ic_chevron_right_24dp.xml} | 0 .../ic_chevron_right_double_black_24dp.xml | 12 ------------ .../{ic_code_black_24dp.xml => ic_code_24dp.xml} | 0 ...y_white_24dp.xml => ic_content_copy_24dp.xml} | 0 .../{ic_done_white_24dp.xml => ic_done_24dp.xml} | 0 ...e_all_white_24dp.xml => ic_done_all_24dp.xml} | 0 app/src/main/res/drawable/ic_done_green_24dp.xml | 9 --------- ...le_black_24dp.xml => ic_drag_handle_24dp.xml} | 0 .../{ic_edit_white_24dp.xml => ic_edit_24dp.xml} | 0 app/src/main/res/drawable/ic_error_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_error_grey.xml | 5 ----- .../main/res/drawable/ic_expand_less_24dp.xml | 12 ++++++++---- ..._black_24dp.xml => ic_file_download_24dp.xml} | 3 ++- .../drawable/ic_file_download_black_128dp.xml | 9 --------- .../res/drawable/ic_file_download_black_24dp.xml | 9 --------- .../res/drawable/ic_file_download_white_24dp.xml | 10 ---------- ...st_white_24dp.xml => ic_filter_list_24dp.xml} | 0 .../main/res/drawable/ic_glasses_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_history_24dp.xml | 10 ++++++++++ .../main/res/drawable/ic_history_black_24dp.xml | 6 ------ .../main/res/drawable/ic_history_white_128dp.xml | 6 ------ ...vron_left_black_24dp.xml => ic_info_24dp.xml} | 2 +- app/src/main/res/drawable/ic_info_black_24dp.xml | 5 ----- .../ic_keyboard_arrow_right_black_24dp.xml | 10 ---------- ...ic_label_white_24dp.xml => ic_label_24dp.xml} | 0 ..._white_24dp.xml => ic_label_outline_24dp.xml} | 0 .../{ic_lock_white_24dp.xml => ic_lock_24dp.xml} | 0 ...vert_black_24dp.xml => ic_more_vert_24dp.xml} | 0 ...hite_24dp.xml => ic_open_in_webview_24dp.xml} | 0 ...dp.xml => ic_radio_button_unchecked_24dp.xml} | 0 ..._search_white_24dp.xml => ic_search_24dp.xml} | 0 ...tings_white_24dp.xml => ic_settings_24dp.xml} | 0 .../res/drawable/ic_skip_next_white_24dp.xml | 5 ----- .../res/drawable/ic_skip_previous_white_24dp.xml | 9 --------- .../{ic_sort_white_24dp.xml => ic_sort_24dp.xml} | 0 ..._white_24dp.xml => ic_start_reading_24dp.xml} | 0 ...lls_white_24dp.xml => ic_swap_calls_24dp.xml} | 0 .../{ic_sync_black_24dp.xml => ic_sync_24dp.xml} | 0 app/src/main/res/drawable/ic_tachi.xml | 4 ++-- .../{ic_tune_white_24dp.xml => ic_tune_24dp.xml} | 0 ..._update_black_24dp.xml => ic_update_24dp.xml} | 0 .../main/res/drawable/ic_update_black_128dp.xml | 9 --------- ...list_white_24dp.xml => ic_view_list_24dp.xml} | 0 ...le_white_24dp.xml => ic_view_module_24dp.xml} | 0 .../main/res/layout/browse_source_controller.xml | 2 +- app/src/main/res/layout/categories_item.xml | 6 +++--- app/src/main/res/layout/chapter_header_item.xml | 2 +- app/src/main/res/layout/common_view_empty.xml | 2 +- app/src/main/res/layout/download_button.xml | 2 +- app/src/main/res/layout/download_item.xml | 4 ++-- app/src/main/res/layout/filter_bottom_sheet.xml | 4 ++-- .../res/layout/library_category_header_item.xml | 4 ++-- app/src/main/res/layout/manga_grid_item.xml | 2 +- app/src/main/res/layout/manga_header_item.xml | 6 +++--- app/src/main/res/layout/menu_sheet_item.xml | 2 +- .../main/res/layout/migration_bottom_sheet.xml | 2 +- .../main/res/layout/migration_process_item.xml | 4 ++-- .../main/res/layout/migration_source_item.xml | 2 +- .../main/res/layout/pre_migration_controller.xml | 2 +- app/src/main/res/layout/reader_color_filter.xml | 2 +- app/src/main/res/layout/reader_page_sheet.xml | 2 +- app/src/main/res/layout/recents_footer_item.xml | 2 +- app/src/main/res/layout/recents_header_item.xml | 4 ++-- .../main/res/layout/rounded_category_hopper.xml | 2 +- app/src/main/res/menu/browse_source.xml | 4 ++-- app/src/main/res/menu/catalogue_main.xml | 6 +++--- app/src/main/res/menu/catalogue_new_list.xml | 2 +- app/src/main/res/menu/extension_main.xml | 4 ++-- app/src/main/res/menu/library.xml | 6 +++--- app/src/main/res/menu/library_selection.xml | 4 ++-- app/src/main/res/menu/manga_details.xml | 10 +++++----- app/src/main/res/menu/migration_list.xml | 4 ++-- app/src/main/res/menu/reader.xml | 4 ++-- app/src/main/res/menu/recently_read.xml | 2 +- app/src/main/res/menu/recents.xml | 6 +++--- app/src/main/res/menu/settings_main.xml | 2 +- app/src/main/res/menu/settings_sources.xml | 4 ++-- app/src/main/res/menu/webview.xml | 4 ++-- 119 files changed, 143 insertions(+), 264 deletions(-) rename app/src/main/res/drawable/{ic_account_circle_black_24dp.xml => ic_account_circle_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_add_white_24dp.xml => ic_add_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_add_to_library_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_alert_octagram_24dp.xml rename app/src/main/res/drawable/{ic_arrow_back_white_24dp.xml => ic_arrow_back_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_down_white_24dp.xml => ic_arrow_down_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_down_white_32dp.xml => ic_arrow_down_32dp.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_forward_white_24dp.xml => ic_arrow_forward_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_up_white_24dp.xml => ic_arrow_up_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_up_white_32dp.xml => ic_arrow_up_32dp.xml} (100%) rename app/src/main/res/drawable/{ic_backup_black_24dp.xml => ic_backup_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_book_black_128dp.xml rename app/src/main/res/drawable/{ic_brightness_5_black_24dp.xml => ic_brightness_day_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_brightness_4_white_24dp.xml => ic_brightness_night_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_broken_image_grey_24dp.xml => ic_broken_image_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_bug_report_white_24dp.xml => ic_bug_report_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_check_white_24dp.xml => ic_check_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_check_circle_white_24dp.xml => ic_check_circle_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_chevron_left_double_black_24dp.xml rename app/src/main/res/drawable/{ic_chevron_right_white_24dp.xml => ic_chevron_right_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_chevron_right_double_black_24dp.xml rename app/src/main/res/drawable/{ic_code_black_24dp.xml => ic_code_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_content_copy_white_24dp.xml => ic_content_copy_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_done_white_24dp.xml => ic_done_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_done_all_white_24dp.xml => ic_done_all_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_done_green_24dp.xml rename app/src/main/res/drawable/{ic_drag_handle_black_24dp.xml => ic_drag_handle_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_edit_white_24dp.xml => ic_edit_24dp.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_error_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_error_grey.xml rename app/src/main/res/drawable/{ic_chevron_right_black_24dp.xml => ic_file_download_24dp.xml} (68%) delete mode 100644 app/src/main/res/drawable/ic_file_download_black_128dp.xml delete mode 100644 app/src/main/res/drawable/ic_file_download_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_file_download_white_24dp.xml rename app/src/main/res/drawable/{ic_filter_list_white_24dp.xml => ic_filter_list_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_glasses_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_history_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_history_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_history_white_128dp.xml rename app/src/main/res/drawable/{ic_chevron_left_black_24dp.xml => ic_info_24dp.xml} (64%) delete mode 100644 app/src/main/res/drawable/ic_info_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_keyboard_arrow_right_black_24dp.xml rename app/src/main/res/drawable/{ic_label_white_24dp.xml => ic_label_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_label_outline_white_24dp.xml => ic_label_outline_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_lock_white_24dp.xml => ic_lock_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_more_vert_black_24dp.xml => ic_more_vert_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_open_in_webview_white_24dp.xml => ic_open_in_webview_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_radio_button_unchecked_white_24dp.xml => ic_radio_button_unchecked_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_search_white_24dp.xml => ic_search_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_settings_white_24dp.xml => ic_settings_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_skip_next_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_skip_previous_white_24dp.xml rename app/src/main/res/drawable/{ic_sort_white_24dp.xml => ic_sort_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_start_reading_white_24dp.xml => ic_start_reading_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_swap_calls_white_24dp.xml => ic_swap_calls_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_sync_black_24dp.xml => ic_sync_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_tune_white_24dp.xml => ic_tune_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_update_black_24dp.xml => ic_update_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_update_black_128dp.xml rename app/src/main/res/drawable/{ic_view_list_white_24dp.xml => ic_view_list_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_view_module_white_24dp.xml => ic_view_module_24dp.xml} (100%) 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 e8cc3d9da7..c13109841c 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 @@ -453,7 +453,7 @@ class BackupRestoreService : Service() { val resultNotification = NotificationCompat.Builder(this, Notifications.CHANNEL_BACKUP_RESTORE) .setContentTitle(getString(R.string.restore_error)) .setContentText(errorMessage) - .setSmallIcon(R.drawable.ic_error_grey) + .setSmallIcon(R.drawable.ic_error_24dp) .setPriority(NotificationCompat.PRIORITY_HIGH) .setColor(ContextCompat.getColor(this, R.color.md_red_500)) notificationManager.notify(Notifications.ID_RESTORE_ERROR, resultNotification.build()) 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 46b200093b..81d447a155 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 @@ -159,7 +159,7 @@ class LibraryUpdateNotifier(private val context: Context) { ) ) addAction( - R.drawable.ic_glasses_black_24dp, context.getString(R.string.mark_as_read), + R.drawable.ic_eye_24dp, context.getString(R.string.mark_as_read), NotificationReceiver.markAsReadPendingBroadcast( context, manga, chapters, Notifications.ID_NEW_CHAPTERS 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 2ddfcc0097..8d0849a819 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 @@ -52,7 +52,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie if (createCategory) { title.setTextColor(ContextCompat.getColor(itemView.context, R.color.text_color_hint)) regularDrawable = ContextCompat.getDrawable(itemView.context, R.drawable - .ic_add_white_24dp) + .ic_add_24dp) image.gone() edit_button.setImageDrawable(null) edit_text.setText("") @@ -60,7 +60,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie } else { title.setTextColor(ContextCompat.getColor(itemView.context, R.color.textColorPrimary)) regularDrawable = ContextCompat.getDrawable(itemView.context, R.drawable - .ic_drag_handle_black_24dp) + .ic_drag_handle_24dp) image.visible() edit_text.setText(title.text) } @@ -74,7 +74,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie edit_text.inputType = InputType.TYPE_TEXT_FLAG_AUTO_CORRECT edit_text.requestFocus() edit_text.selectAll() - edit_button.setImageDrawable(ContextCompat.getDrawable(itemView.context, R.drawable.ic_check_white_24dp)) + edit_button.setImageDrawable(ContextCompat.getDrawable(itemView.context, R.drawable.ic_check_24dp)) edit_button.drawable.mutate().setTint(itemView.context.getResourceColor(R.attr.colorAccent)) showKeyboard() if (!createCategory) { @@ -90,7 +90,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie } else { if (!createCategory) { setDragHandleView(reorder) - edit_button.setImageDrawable(ContextCompat.getDrawable(itemView.context, R.drawable.ic_edit_white_24dp)) + edit_button.setImageDrawable(ContextCompat.getDrawable(itemView.context, R.drawable.ic_edit_24dp)) } else { edit_button.setImageDrawable(null) reorder.setOnTouchListener { _, _ -> true } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt index abef22d78e..45f9818a6b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt @@ -163,7 +163,7 @@ class DownloadBottomSheet @JvmOverloads constructor( setBottomSheet() if (presenter.downloadQueue.isEmpty()) { empty_view?.show( - R.drawable.ic_file_download_black_128dp, + R.drawable.ic_file_download_24dp, R.string.nothing_is_downloading) } else { empty_view?.hide() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt index a5878f7c9d..769832d311 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt @@ -30,9 +30,9 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut private val borderCircle = ContextCompat.getDrawable(context, R.drawable.border_circle)?.mutate() private val downloadDrawable = ContextCompat.getDrawable(context, - R.drawable.ic_arrow_down_white_24dp)?.mutate() + R.drawable.ic_arrow_down_24dp)?.mutate() private val checkDrawable = ContextCompat.getDrawable(context, - R.drawable.ic_check_white_24dp)?.mutate() + R.drawable.ic_check_24dp)?.mutate() private var isAnimating = false private var iconAnimation: ObjectAnimator? = null diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt index f7342ba9a9..729d632e46 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt @@ -54,7 +54,7 @@ class DownloadHolder(private val view: View, val adapter: DownloadAdapter) : migration_menu.visibleIf(adapterPosition != 0 || adapterPosition != adapter.itemCount - 1) migration_menu.setVectorCompat( - R.drawable.ic_more_vert_black_24dp, view.context + R.drawable.ic_more_vert_24dp, view.context .getResourceColor(android.R.attr.textColorPrimary)) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index 1b373ad9e5..b78b7d8611 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -710,7 +710,7 @@ class LibraryController( empty_view?.hide() } else { empty_view?.show( - R.drawable.ic_book_black_128dp, + R.drawable.ic_book_24dp, if (filter_bottom_sheet.hasActiveFilters()) R.string.no_matches_for_filters else R.string.library_is_empty_add_from_browse ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGroup.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGroup.kt index 426f97ac1d..c033e4a236 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGroup.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGroup.kt @@ -26,10 +26,10 @@ object LibraryGroup { return when (type) { BY_STATUS -> R.drawable.ic_progress_clock_24dp BY_TAG -> R.drawable.ic_style_24dp - BY_TRACK_STATUS -> R.drawable.ic_sync_black_24dp + BY_TRACK_STATUS -> R.drawable.ic_sync_24dp BY_SOURCE -> R.drawable.ic_browse_24dp UNGROUPED -> R.drawable.ic_ungroup_24dp - else -> R.drawable.ic_label_outline_white_24dp + else -> R.drawable.ic_label_outline_24dp } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt index c5f86c5102..96a46010fc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt @@ -98,9 +98,9 @@ class LibraryHeaderHolder(val view: View, private val adapter: LibraryCategoryAd val isAscending = category.isAscending() val sortingMode = category.sortingMode() val sortDrawable = when { - sortingMode == LibrarySort.DRAG_AND_DROP || sortingMode == null -> R.drawable.ic_sort_white_24dp - if (sortingMode == LibrarySort.DATE_ADDED || sortingMode == LibrarySort.LATEST_CHAPTER || sortingMode == LibrarySort.LAST_READ) !isAscending else isAscending -> R.drawable.ic_arrow_down_white_24dp - else -> R.drawable.ic_arrow_up_white_24dp + sortingMode == LibrarySort.DRAG_AND_DROP || sortingMode == null -> R.drawable.ic_sort_24dp + if (sortingMode == LibrarySort.DATE_ADDED || sortingMode == LibrarySort.LATEST_CHAPTER || sortingMode == LibrarySort.LAST_READ) !isAscending else isAscending -> R.drawable.ic_arrow_down_24dp + else -> R.drawable.ic_arrow_up_24dp } sortText.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, sortDrawable, 0) @@ -175,7 +175,7 @@ class LibraryHeaderHolder(val view: View, private val adapter: LibraryCategoryAd items.add( MaterialMenuSheet.MenuSheetItem( LibrarySort.DRAG_AND_DROP, - R.drawable.ic_label_outline_white_24dp, + R.drawable.ic_label_outline_24dp, R.string.category ) ) @@ -203,12 +203,12 @@ class LibraryHeaderHolder(val view: View, private val adapter: LibraryCategoryAd } private fun getSortRes(sortingMode: Int?, isAscending: Boolean): Int = when { - sortingMode == LibrarySort.DRAG_AND_DROP -> R.drawable.ic_check_white_24dp + sortingMode == LibrarySort.DRAG_AND_DROP -> R.drawable.ic_check_24dp if (sortingMode == LibrarySort.DATE_ADDED || sortingMode == LibrarySort.LATEST_CHAPTER || sortingMode == LibrarySort.LAST_READ) !isAscending else isAscending -> - R.drawable.ic_arrow_down_white_24dp - else -> R.drawable.ic_arrow_up_white_24dp + R.drawable.ic_arrow_down_24dp + else -> R.drawable.ic_arrow_up_24dp } private fun onCatSortClicked(category: Category, menuId: Int?) { @@ -246,7 +246,7 @@ class LibraryHeaderHolder(val view: View, private val adapter: LibraryCategoryAd val allSelected = adapter.libraryListener.allSelected(adapterPosition) val drawable = ContextCompat.getDrawable( contentView.context, - if (allSelected) R.drawable.ic_check_circle_white_24dp else R.drawable.ic_radio_button_unchecked_white_24dp + if (allSelected) R.drawable.ic_check_circle_24dp else R.drawable.ic_radio_button_unchecked_24dp ) val tintedDrawable = drawable?.mutate() tintedDrawable?.setTint( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 15e9ee60d4..dfc6587b71 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -145,7 +145,7 @@ open class MainActivity : BaseActivity(), DownloadServiceListener { drawerArrow = DrawerArrowDrawable(this) drawerArrow?.color = getResourceColor(R.attr.actionBarTintColor) searchDrawable = ContextCompat.getDrawable( - this, R.drawable.ic_search_white_24dp + this, R.drawable.ic_search_24dp ) dismissDrawable = ContextCompat.getDrawable( this, R.drawable.ic_close_24dp diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt index ce46919bce..1b0964359c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt @@ -169,7 +169,7 @@ class MangaHeaderHolder( with(favorite_button) { icon = ContextCompat.getDrawable( itemView.context, when { - item.isLocked -> R.drawable.ic_lock_white_24dp + item.isLocked -> R.drawable.ic_lock_24dp manga.favorite -> R.drawable.ic_heart_24dp else -> R.drawable.ic_heart_outline_24dp } @@ -199,7 +199,7 @@ class MangaHeaderHolder( icon = ContextCompat.getDrawable( itemView.context, - if (tracked) R.drawable.ic_check_white_24dp else R.drawable.ic_sync_black_24dp + if (tracked) R.drawable.ic_check_24dp else R.drawable.ic_sync_24dp ) checked(tracked) } @@ -291,7 +291,7 @@ class MangaHeaderHolder( icon = ContextCompat.getDrawable( itemView.context, if (tracked) R.drawable - .ic_check_white_24dp else R.drawable.ic_sync_black_24dp + .ic_check_24dp else R.drawable.ic_sync_24dp ) checked(tracked) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt index 382e83269b..8e8996846a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt @@ -453,7 +453,7 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle), if (adapter?.itemCount == 1) { menuMigrate.icon = VectorDrawableCompat.create( - resources!!, R.drawable.ic_done_white_24dp, null + resources!!, R.drawable.ic_done_24dp, null ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt index ee6efbe866..05df7853ef 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt @@ -52,7 +52,7 @@ class MigrationProcessHolder( val source = item.manga.mangaSource() migration_menu.setVectorCompat( - R.drawable.ic_more_vert_black_24dp, view.context.getResourceColor(android.R.attr.textColorPrimary) + R.drawable.ic_more_vert_24dp, view.context.getResourceColor(android.R.attr.textColorPrimary) ) skip_manga.setVectorCompat( R.drawable.ic_close_24dp, view.context.getResourceColor( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChaptersController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChaptersController.kt index c77abd7acb..d263058225 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChaptersController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChaptersController.kt @@ -161,7 +161,7 @@ class RecentChaptersController(bundle: Bundle? = null) : BaseController(bundle), if (size > 0) { empty_view?.hide() } else { - empty_view?.show(R.drawable.ic_update_black_128dp, R.string.no_recent_chapters) + empty_view?.show(R.drawable.ic_update_24dp, R.string.no_recent_chapters) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadController.kt index 281df99a68..0927b74593 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadController.kt @@ -16,9 +16,9 @@ import eu.kanade.tachiyomi.data.backup.BackupRestoreService import eu.kanade.tachiyomi.data.database.models.History import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.ui.base.controller.BaseController -import eu.kanade.tachiyomi.ui.source.browse.ProgressItem import eu.kanade.tachiyomi.ui.manga.MangaDetailsController import eu.kanade.tachiyomi.ui.reader.ReaderActivity +import eu.kanade.tachiyomi.ui.source.browse.ProgressItem import eu.kanade.tachiyomi.util.system.launchUI import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.view.RecyclerWindowInsetsListener @@ -128,7 +128,7 @@ class RecentlyReadController(bundle: Bundle? = null) : BaseController(bundle), if (size > 0) { empty_view?.hide() } else { - empty_view.show(R.drawable.ic_history_white_128dp, R.string + empty_view.show(R.drawable.ic_history_24dp, R.string .no_recently_read_manga) } } 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 9052e97a32..4b9cc60894 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 @@ -23,7 +23,7 @@ class SettingsMainController : SettingsController() { val tintColor = context.getResourceColor(R.attr.colorAccent) preference { - iconRes = R.drawable.ic_tune_white_24dp + iconRes = R.drawable.ic_tune_24dp iconTint = tintColor titleRes = R.string.general onClick { navigateTo(SettingsGeneralController()) } @@ -41,7 +41,7 @@ class SettingsMainController : SettingsController() { onClick { navigateTo(SettingsReaderController()) } } preference { - iconRes = R.drawable.ic_file_download_black_24dp + iconRes = R.drawable.ic_file_download_24dp iconTint = tintColor titleRes = R.string.downloads onClick { navigateTo(SettingsDownloadController()) } @@ -53,25 +53,25 @@ class SettingsMainController : SettingsController() { onClick { navigateTo(SettingsBrowseController()) } } preference { - iconRes = R.drawable.ic_sync_black_24dp + iconRes = R.drawable.ic_sync_24dp iconTint = tintColor titleRes = R.string.tracking onClick { navigateTo(SettingsTrackingController()) } } preference { - iconRes = R.drawable.ic_backup_black_24dp + iconRes = R.drawable.ic_backup_24dp iconTint = tintColor titleRes = R.string.backup onClick { navigateTo(SettingsBackupController()) } } preference { - iconRes = R.drawable.ic_code_black_24dp + iconRes = R.drawable.ic_code_24dp iconTint = tintColor titleRes = R.string.advanced onClick { navigateTo(SettingsAdvancedController()) } } preference { - iconRes = R.drawable.ic_info_black_24dp + iconRes = R.drawable.ic_info_24dp iconTint = tintColor titleRes = R.string.about onClick { navigateTo(AboutController()) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt index 6ec5fe72f9..8a7d0282a3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt @@ -251,9 +251,9 @@ open class BrowseSourceController(bundle: Bundle) : // Show next display mode menu.findItem(R.id.action_display_mode).apply { val icon = if (presenter.isListMode) - R.drawable.ic_view_module_white_24dp + R.drawable.ic_view_module_24dp else - R.drawable.ic_view_list_white_24dp + R.drawable.ic_view_list_24dp setIcon(icon) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/GroupItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/GroupItem.kt index cbf99e5e68..5d81dc3ad7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/GroupItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/GroupItem.kt @@ -37,7 +37,7 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_down_white_32dp, null) + Filter.Sort.Selection(i, false) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_down_32dp, null) ?.apply { setTint(view.context.getResourceColor(R.attr.colorAccent)) } - Filter.Sort.Selection(i, true) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_up_white_32dp, null) + Filter.Sort.Selection(i, true) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_up_32dp, null) ?.apply { setTint(view.context.getResourceColor(R.attr.colorAccent)) } else -> ContextCompat.getDrawable(view.context, R.drawable.empty_drawable_32dp) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/CoverViewTarget.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/CoverViewTarget.kt index 135fb67acf..49855e9db9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/CoverViewTarget.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/CoverViewTarget.kt @@ -20,7 +20,7 @@ class CoverViewTarget( progress?.gone() view.scaleType = ImageView.ScaleType.CENTER val vector = VectorDrawableCompat.create( - view.context.resources, R.drawable.ic_broken_image_grey_24dp, null + view.context.resources, R.drawable.ic_broken_image_24dp, null ) vector?.setTint(view.context.getResourceColor(android.R.attr.textColorSecondary)) view.setImageDrawable(vector) diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginPreference.kt index fc175c84fd..fb2affc2e8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginPreference.kt @@ -1,6 +1,8 @@ package eu.kanade.tachiyomi.widget.preference import android.content.Context +import android.content.res.ColorStateList +import android.graphics.Color import android.util.AttributeSet import androidx.preference.Preference import androidx.preference.PreferenceViewHolder @@ -17,10 +19,12 @@ class LoginPreference @JvmOverloads constructor(context: Context, attrs: Attribu override fun onBindViewHolder(holder: PreferenceViewHolder) { super.onBindViewHolder(holder) - holder.itemView.image_view.setImageResource(if (getPersistedString("").isNullOrEmpty()) - android.R.color.transparent - else - R.drawable.ic_done_green_24dp) + holder.itemView.image_view.setImageResource( + if (getPersistedString("").isNullOrEmpty()) android.R.color.transparent + else R.drawable.ic_done_24dp + ) + holder.itemView.image_view.imageTintList = + ColorStateList.valueOf(Color.parseColor("#FF4CAF50")) } public override fun notifyChanged() { diff --git a/app/src/main/res/drawable/ic_account_circle_black_24dp.xml b/app/src/main/res/drawable/ic_account_circle_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_account_circle_black_24dp.xml rename to app/src/main/res/drawable/ic_account_circle_24dp.xml diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_add_white_24dp.xml rename to app/src/main/res/drawable/ic_add_24dp.xml diff --git a/app/src/main/res/drawable/ic_add_to_library_24dp.xml b/app/src/main/res/drawable/ic_add_to_library_24dp.xml deleted file mode 100644 index bba4831293..0000000000 --- a/app/src/main/res/drawable/ic_add_to_library_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_alert_octagram_24dp.xml b/app/src/main/res/drawable/ic_alert_octagram_24dp.xml deleted file mode 100644 index 5f2b7e1afb..0000000000 --- a/app/src/main/res/drawable/ic_alert_octagram_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_back_white_24dp.xml rename to app/src/main/res/drawable/ic_arrow_back_24dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_down_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_down_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_down_white_24dp.xml rename to app/src/main/res/drawable/ic_arrow_down_24dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_down_white_32dp.xml b/app/src/main/res/drawable/ic_arrow_down_32dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_down_white_32dp.xml rename to app/src/main/res/drawable/ic_arrow_down_32dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_forward_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml rename to app/src/main/res/drawable/ic_arrow_forward_24dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_up_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_up_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_up_white_24dp.xml rename to app/src/main/res/drawable/ic_arrow_up_24dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_up_white_32dp.xml b/app/src/main/res/drawable/ic_arrow_up_32dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_up_white_32dp.xml rename to app/src/main/res/drawable/ic_arrow_up_32dp.xml diff --git a/app/src/main/res/drawable/ic_backup_black_24dp.xml b/app/src/main/res/drawable/ic_backup_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_backup_black_24dp.xml rename to app/src/main/res/drawable/ic_backup_24dp.xml diff --git a/app/src/main/res/drawable/ic_book_black_128dp.xml b/app/src/main/res/drawable/ic_book_black_128dp.xml deleted file mode 100644 index 5226a4ad51..0000000000 --- a/app/src/main/res/drawable/ic_book_black_128dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_brightness_5_black_24dp.xml b/app/src/main/res/drawable/ic_brightness_day_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_brightness_5_black_24dp.xml rename to app/src/main/res/drawable/ic_brightness_day_24dp.xml diff --git a/app/src/main/res/drawable/ic_brightness_4_white_24dp.xml b/app/src/main/res/drawable/ic_brightness_night_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_brightness_4_white_24dp.xml rename to app/src/main/res/drawable/ic_brightness_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_broken_image_grey_24dp.xml b/app/src/main/res/drawable/ic_broken_image_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_broken_image_grey_24dp.xml rename to app/src/main/res/drawable/ic_broken_image_24dp.xml diff --git a/app/src/main/res/drawable/ic_bug_report_white_24dp.xml b/app/src/main/res/drawable/ic_bug_report_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_bug_report_white_24dp.xml rename to app/src/main/res/drawable/ic_bug_report_24dp.xml diff --git a/app/src/main/res/drawable/ic_check_white_24dp.xml b/app/src/main/res/drawable/ic_check_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_check_white_24dp.xml rename to app/src/main/res/drawable/ic_check_24dp.xml diff --git a/app/src/main/res/drawable/ic_check_circle_white_24dp.xml b/app/src/main/res/drawable/ic_check_circle_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_check_circle_white_24dp.xml rename to app/src/main/res/drawable/ic_check_circle_24dp.xml diff --git a/app/src/main/res/drawable/ic_chevron_left_double_black_24dp.xml b/app/src/main/res/drawable/ic_chevron_left_double_black_24dp.xml deleted file mode 100644 index 1af4b96382..0000000000 --- a/app/src/main/res/drawable/ic_chevron_left_double_black_24dp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_chevron_right_white_24dp.xml b/app/src/main/res/drawable/ic_chevron_right_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_chevron_right_white_24dp.xml rename to app/src/main/res/drawable/ic_chevron_right_24dp.xml diff --git a/app/src/main/res/drawable/ic_chevron_right_double_black_24dp.xml b/app/src/main/res/drawable/ic_chevron_right_double_black_24dp.xml deleted file mode 100644 index 27d42fdbbd..0000000000 --- a/app/src/main/res/drawable/ic_chevron_right_double_black_24dp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_code_black_24dp.xml b/app/src/main/res/drawable/ic_code_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_code_black_24dp.xml rename to app/src/main/res/drawable/ic_code_24dp.xml diff --git a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml b/app/src/main/res/drawable/ic_content_copy_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_content_copy_white_24dp.xml rename to app/src/main/res/drawable/ic_content_copy_24dp.xml diff --git a/app/src/main/res/drawable/ic_done_white_24dp.xml b/app/src/main/res/drawable/ic_done_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_done_white_24dp.xml rename to app/src/main/res/drawable/ic_done_24dp.xml diff --git a/app/src/main/res/drawable/ic_done_all_white_24dp.xml b/app/src/main/res/drawable/ic_done_all_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_done_all_white_24dp.xml rename to app/src/main/res/drawable/ic_done_all_24dp.xml diff --git a/app/src/main/res/drawable/ic_done_green_24dp.xml b/app/src/main/res/drawable/ic_done_green_24dp.xml deleted file mode 100644 index 86e45f4a61..0000000000 --- a/app/src/main/res/drawable/ic_done_green_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml b/app/src/main/res/drawable/ic_drag_handle_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_drag_handle_black_24dp.xml rename to app/src/main/res/drawable/ic_drag_handle_24dp.xml diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_edit_white_24dp.xml rename to app/src/main/res/drawable/ic_edit_24dp.xml diff --git a/app/src/main/res/drawable/ic_error_24dp.xml b/app/src/main/res/drawable/ic_error_24dp.xml new file mode 100644 index 0000000000..b666c18189 --- /dev/null +++ b/app/src/main/res/drawable/ic_error_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_error_grey.xml b/app/src/main/res/drawable/ic_error_grey.xml deleted file mode 100644 index be7b45024a..0000000000 --- a/app/src/main/res/drawable/ic_error_grey.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_expand_less_24dp.xml b/app/src/main/res/drawable/ic_expand_less_24dp.xml index 5042d801af..7b6a65628c 100644 --- a/app/src/main/res/drawable/ic_expand_less_24dp.xml +++ b/app/src/main/res/drawable/ic_expand_less_24dp.xml @@ -1,5 +1,9 @@ - - + + diff --git a/app/src/main/res/drawable/ic_chevron_right_black_24dp.xml b/app/src/main/res/drawable/ic_file_download_24dp.xml similarity index 68% rename from app/src/main/res/drawable/ic_chevron_right_black_24dp.xml rename to app/src/main/res/drawable/ic_file_download_24dp.xml index 125885ad41..22e9181ce6 100644 --- a/app/src/main/res/drawable/ic_chevron_right_black_24dp.xml +++ b/app/src/main/res/drawable/ic_file_download_24dp.xml @@ -1,9 +1,10 @@ + android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" /> diff --git a/app/src/main/res/drawable/ic_file_download_black_128dp.xml b/app/src/main/res/drawable/ic_file_download_black_128dp.xml deleted file mode 100644 index 6edeb1b280..0000000000 --- a/app/src/main/res/drawable/ic_file_download_black_128dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_file_download_black_24dp.xml b/app/src/main/res/drawable/ic_file_download_black_24dp.xml deleted file mode 100644 index 492b41d346..0000000000 --- a/app/src/main/res/drawable/ic_file_download_black_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 7fc108d2f7..0000000000 --- a/app/src/main/res/drawable/ic_file_download_white_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_filter_list_white_24dp.xml b/app/src/main/res/drawable/ic_filter_list_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_filter_list_white_24dp.xml rename to app/src/main/res/drawable/ic_filter_list_24dp.xml diff --git a/app/src/main/res/drawable/ic_glasses_black_24dp.xml b/app/src/main/res/drawable/ic_glasses_black_24dp.xml deleted file mode 100644 index d2977ea352..0000000000 --- a/app/src/main/res/drawable/ic_glasses_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_history_24dp.xml b/app/src/main/res/drawable/ic_history_24dp.xml new file mode 100644 index 0000000000..5aef154982 --- /dev/null +++ b/app/src/main/res/drawable/ic_history_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_history_black_24dp.xml b/app/src/main/res/drawable/ic_history_black_24dp.xml deleted file mode 100644 index 3344c4fcc4..0000000000 --- a/app/src/main/res/drawable/ic_history_black_24dp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_history_white_128dp.xml b/app/src/main/res/drawable/ic_history_white_128dp.xml deleted file mode 100644 index 46514a1a00..0000000000 --- a/app/src/main/res/drawable/ic_history_white_128dp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_chevron_left_black_24dp.xml b/app/src/main/res/drawable/ic_info_24dp.xml similarity index 64% rename from app/src/main/res/drawable/ic_chevron_left_black_24dp.xml rename to app/src/main/res/drawable/ic_info_24dp.xml index b48c93db38..0cbb996010 100644 --- a/app/src/main/res/drawable/ic_chevron_left_black_24dp.xml +++ b/app/src/main/res/drawable/ic_info_24dp.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" /> diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml deleted file mode 100644 index f842adddb7..0000000000 --- a/app/src/main/res/drawable/ic_info_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right_black_24dp.xml deleted file mode 100644 index 58d1a85f9e..0000000000 --- a/app/src/main/res/drawable/ic_keyboard_arrow_right_black_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_label_white_24dp.xml b/app/src/main/res/drawable/ic_label_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_label_white_24dp.xml rename to app/src/main/res/drawable/ic_label_24dp.xml diff --git a/app/src/main/res/drawable/ic_label_outline_white_24dp.xml b/app/src/main/res/drawable/ic_label_outline_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_label_outline_white_24dp.xml rename to app/src/main/res/drawable/ic_label_outline_24dp.xml diff --git a/app/src/main/res/drawable/ic_lock_white_24dp.xml b/app/src/main/res/drawable/ic_lock_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_lock_white_24dp.xml rename to app/src/main/res/drawable/ic_lock_24dp.xml diff --git a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml b/app/src/main/res/drawable/ic_more_vert_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_more_vert_black_24dp.xml rename to app/src/main/res/drawable/ic_more_vert_24dp.xml diff --git a/app/src/main/res/drawable/ic_open_in_webview_white_24dp.xml b/app/src/main/res/drawable/ic_open_in_webview_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_open_in_webview_white_24dp.xml rename to app/src/main/res/drawable/ic_open_in_webview_24dp.xml diff --git a/app/src/main/res/drawable/ic_radio_button_unchecked_white_24dp.xml b/app/src/main/res/drawable/ic_radio_button_unchecked_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_radio_button_unchecked_white_24dp.xml rename to app/src/main/res/drawable/ic_radio_button_unchecked_24dp.xml diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_search_white_24dp.xml rename to app/src/main/res/drawable/ic_search_24dp.xml diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings_white_24dp.xml rename to app/src/main/res/drawable/ic_settings_24dp.xml 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 c2b8c6f584..0000000000 --- a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 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 752878575e..0000000000 --- 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/drawable/ic_sort_white_24dp.xml b/app/src/main/res/drawable/ic_sort_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_sort_white_24dp.xml rename to app/src/main/res/drawable/ic_sort_24dp.xml diff --git a/app/src/main/res/drawable/ic_start_reading_white_24dp.xml b/app/src/main/res/drawable/ic_start_reading_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_start_reading_white_24dp.xml rename to app/src/main/res/drawable/ic_start_reading_24dp.xml diff --git a/app/src/main/res/drawable/ic_swap_calls_white_24dp.xml b/app/src/main/res/drawable/ic_swap_calls_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_swap_calls_white_24dp.xml rename to app/src/main/res/drawable/ic_swap_calls_24dp.xml diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_sync_black_24dp.xml rename to app/src/main/res/drawable/ic_sync_24dp.xml diff --git a/app/src/main/res/drawable/ic_tachi.xml b/app/src/main/res/drawable/ic_tachi.xml index 4ae06cc2f7..00263fdc48 100644 --- a/app/src/main/res/drawable/ic_tachi.xml +++ b/app/src/main/res/drawable/ic_tachi.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/drawable/ic_tune_white_24dp.xml b/app/src/main/res/drawable/ic_tune_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_tune_white_24dp.xml rename to app/src/main/res/drawable/ic_tune_24dp.xml diff --git a/app/src/main/res/drawable/ic_update_black_24dp.xml b/app/src/main/res/drawable/ic_update_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_black_24dp.xml rename to app/src/main/res/drawable/ic_update_24dp.xml diff --git a/app/src/main/res/drawable/ic_update_black_128dp.xml b/app/src/main/res/drawable/ic_update_black_128dp.xml deleted file mode 100644 index 5b89fc3c3b..0000000000 --- a/app/src/main/res/drawable/ic_update_black_128dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_view_list_white_24dp.xml b/app/src/main/res/drawable/ic_view_list_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_view_list_white_24dp.xml rename to app/src/main/res/drawable/ic_view_list_24dp.xml diff --git a/app/src/main/res/drawable/ic_view_module_white_24dp.xml b/app/src/main/res/drawable/ic_view_module_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_view_module_white_24dp.xml rename to app/src/main/res/drawable/ic_view_module_24dp.xml diff --git a/app/src/main/res/layout/browse_source_controller.xml b/app/src/main/res/layout/browse_source_controller.xml index c70c8843b1..465ea5a0c0 100644 --- a/app/src/main/res/layout/browse_source_controller.xml +++ b/app/src/main/res/layout/browse_source_controller.xml @@ -28,7 +28,7 @@ android:id="@+id/fab" style="@style/Theme.Widget.FAB" android:text="@string/filter" - app:icon="@drawable/ic_filter_list_white_24dp"/> + app:icon="@drawable/ic_filter_list_24dp"/> + app:srcCompat="@drawable/ic_drag_handle_24dp" /> + tools:src="@drawable/ic_file_download_24dp"/> + android:src="@drawable/ic_arrow_down_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml index b88d1d07fa..93d1b1a740 100644 --- a/app/src/main/res/layout/download_item.xml +++ b/app/src/main/res/layout/download_item.xml @@ -59,7 +59,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_drag_handle_black_24dp" /> + app:srcCompat="@drawable/ic_drag_handle_24dp" /> + app:srcCompat="@drawable/ic_more_vert_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/filter_bottom_sheet.xml b/app/src/main/res/layout/filter_bottom_sheet.xml index 60416f3cda..8cf4d6e900 100644 --- a/app/src/main/res/layout/filter_bottom_sheet.xml +++ b/app/src/main/res/layout/filter_bottom_sheet.xml @@ -78,7 +78,7 @@ android:layout_marginEnd="10dp" android:text="@string/group_library_by" android:textColor="?android:attr/textColorPrimary" - app:icon="@drawable/ic_label_outline_white_24dp" + app:icon="@drawable/ic_label_outline_24dp" app:iconTint="?android:attr/textColorPrimary" /> diff --git a/app/src/main/res/layout/library_category_header_item.xml b/app/src/main/res/layout/library_category_header_item.xml index 5d9b5f9bc2..08bcca755d 100644 --- a/app/src/main/res/layout/library_category_header_item.xml +++ b/app/src/main/res/layout/library_category_header_item.xml @@ -25,7 +25,7 @@ android:contentDescription="@string/select_all" android:focusable="true" android:padding="5dp" - android:src="@drawable/ic_check_circle_white_24dp" + android:src="@drawable/ic_check_circle_24dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/category_title" app:layout_constraintStart_toStartOf="parent" @@ -97,7 +97,7 @@ android:layout_marginEnd="0dp" android:background="@drawable/square_ripple" android:clickable="true" - android:drawableEnd="@drawable/ic_sort_white_24dp" + android:drawableEnd="@drawable/ic_sort_24dp" android:drawablePadding="6dp" android:drawableTint="@color/gray_button" android:ellipsize="start" diff --git a/app/src/main/res/layout/manga_grid_item.xml b/app/src/main/res/layout/manga_grid_item.xml index 49f98a3b2a..c366ec943b 100644 --- a/app/src/main/res/layout/manga_grid_item.xml +++ b/app/src/main/res/layout/manga_grid_item.xml @@ -60,7 +60,7 @@ android:background="@drawable/round_play_background" android:contentDescription="@string/start_reading" android:padding="6dp" - android:src="@drawable/ic_start_reading_white_24dp" + android:src="@drawable/ic_start_reading_24dp" android:tint="@android:color/white" /> diff --git a/app/src/main/res/layout/manga_header_item.xml b/app/src/main/res/layout/manga_header_item.xml index 179fdaf2f6..c40c0577a1 100644 --- a/app/src/main/res/layout/manga_header_item.xml +++ b/app/src/main/res/layout/manga_header_item.xml @@ -181,7 +181,7 @@ style="@style/Theme.Widget.Button.RoundedOutline" android:layout_marginStart="6dp" android:text="@string/tracking" - app:icon="@drawable/ic_sync_black_24dp" /> + app:icon="@drawable/ic_sync_24dp" /> + android:src="@drawable/ic_arrow_up_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/migration_bottom_sheet.xml b/app/src/main/res/layout/migration_bottom_sheet.xml index b478e2fe25..98f55367eb 100644 --- a/app/src/main/res/layout/migration_bottom_sheet.xml +++ b/app/src/main/res/layout/migration_bottom_sheet.xml @@ -152,7 +152,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="10dp" - android:src="@drawable/ic_arrow_forward_white_24dp" + android:src="@drawable/ic_arrow_forward_24dp" app:layout_anchor="@id/constraint_layout" app:layout_anchorGravity="bottom|end" app:layout_constraintBottom_toBottomOf="@id/fab_guider" diff --git a/app/src/main/res/layout/migration_process_item.xml b/app/src/main/res/layout/migration_process_item.xml index 1d9dc1ae73..e35f6e7c92 100644 --- a/app/src/main/res/layout/migration_process_item.xml +++ b/app/src/main/res/layout/migration_process_item.xml @@ -30,7 +30,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/migration_manga_card_from" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_keyboard_arrow_right_black_24dp" /> + app:srcCompat="@drawable/ic_chevron_right_24dp" /> diff --git a/app/src/main/res/layout/migration_source_item.xml b/app/src/main/res/layout/migration_source_item.xml index eca6709be6..24537efc8a 100644 --- a/app/src/main/res/layout/migration_source_item.xml +++ b/app/src/main/res/layout/migration_source_item.xml @@ -37,7 +37,7 @@ android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height" android:scaleType="center" android:layout_gravity="end" - app:srcCompat="@drawable/ic_drag_handle_black_24dp" + app:srcCompat="@drawable/ic_drag_handle_24dp" android:tint="?android:attr/textColorPrimary"/> \ No newline at end of file diff --git a/app/src/main/res/layout/pre_migration_controller.xml b/app/src/main/res/layout/pre_migration_controller.xml index ec037a86ea..34762cdf4f 100644 --- a/app/src/main/res/layout/pre_migration_controller.xml +++ b/app/src/main/res/layout/pre_migration_controller.xml @@ -23,7 +23,7 @@ diff --git a/app/src/main/res/layout/reader_color_filter.xml b/app/src/main/res/layout/reader_color_filter.xml index fa9248a9a0..9aa2015202 100644 --- a/app/src/main/res/layout/reader_color_filter.xml +++ b/app/src/main/res/layout/reader_color_filter.xml @@ -215,7 +215,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_day_24dp" /> + app:srcCompat="@drawable/ic_file_download_24dp" /> @@ -17,7 +17,7 @@ diff --git a/app/src/main/res/menu/catalogue_main.xml b/app/src/main/res/menu/catalogue_main.xml index d7c7bcf055..0c7c03d41a 100644 --- a/app/src/main/res/menu/catalogue_main.xml +++ b/app/src/main/res/menu/catalogue_main.xml @@ -5,19 +5,19 @@ diff --git a/app/src/main/res/menu/catalogue_new_list.xml b/app/src/main/res/menu/catalogue_new_list.xml index 9a8cfaf019..55d692a6ac 100644 --- a/app/src/main/res/menu/catalogue_new_list.xml +++ b/app/src/main/res/menu/catalogue_new_list.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/extension_main.xml b/app/src/main/res/menu/extension_main.xml index ee4296071a..5f679a87a2 100644 --- a/app/src/main/res/menu/extension_main.xml +++ b/app/src/main/res/menu/extension_main.xml @@ -3,12 +3,12 @@ diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml index 32f4b42565..5be5eb907d 100644 --- a/app/src/main/res/menu/library.xml +++ b/app/src/main/res/menu/library.xml @@ -6,7 +6,7 @@ diff --git a/app/src/main/res/menu/library_selection.xml b/app/src/main/res/menu/library_selection.xml index 7312cc1adb..869e3623cf 100644 --- a/app/src/main/res/menu/library_selection.xml +++ b/app/src/main/res/menu/library_selection.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/manga_details.xml b/app/src/main/res/menu/manga_details.xml index 52512631e6..e526908064 100644 --- a/app/src/main/res/menu/manga_details.xml +++ b/app/src/main/res/menu/manga_details.xml @@ -4,14 +4,14 @@ @@ -35,7 +35,7 @@ @@ -68,13 +68,13 @@ diff --git a/app/src/main/res/menu/migration_list.xml b/app/src/main/res/menu/migration_list.xml index 1e36358198..47c8fd9dcd 100644 --- a/app/src/main/res/menu/migration_list.xml +++ b/app/src/main/res/menu/migration_list.xml @@ -4,12 +4,12 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/reader.xml b/app/src/main/res/menu/reader.xml index ed9ab515ce..b011162b48 100644 --- a/app/src/main/res/menu/reader.xml +++ b/app/src/main/res/menu/reader.xml @@ -4,13 +4,13 @@ diff --git a/app/src/main/res/menu/recently_read.xml b/app/src/main/res/menu/recently_read.xml index c7432f766a..7118b98735 100644 --- a/app/src/main/res/menu/recently_read.xml +++ b/app/src/main/res/menu/recently_read.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/menu/recents.xml b/app/src/main/res/menu/recents.xml index 1c9f121c92..e56db3d6b8 100644 --- a/app/src/main/res/menu/recents.xml +++ b/app/src/main/res/menu/recents.xml @@ -4,14 +4,14 @@ tools:context=".MainActivity"> @@ -33,7 +33,7 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/settings_main.xml b/app/src/main/res/menu/settings_main.xml index 7c304345f9..226537381d 100644 --- a/app/src/main/res/menu/settings_main.xml +++ b/app/src/main/res/menu/settings_main.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/webview.xml b/app/src/main/res/menu/webview.xml index c34f2f1ed2..adda8f30fb 100644 --- a/app/src/main/res/menu/webview.xml +++ b/app/src/main/res/menu/webview.xml @@ -3,13 +3,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto">