From 47dc5c29cbbc8776a781e7350dc43574dd7d4cc8 Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 7 Jul 2020 17:24:43 -0400 Subject: [PATCH] Update some icons (cherry picked from commit 7401673ac1868cd468139a9e6d064c32ff8d1e8c) # Conflicts: # app/src/main/res/drawable/ic_file_download_black_24dp.xml --- .../java/eu/kanade/tachiyomi/ui/more/MoreController.kt | 2 +- .../tachiyomi/ui/setting/SettingsMainController.kt | 6 +++--- app/src/main/res/drawable/ic_backup_24dp.xml | 6 +++--- .../main/res/drawable/ic_file_download_black_24dp.xml | 9 --------- 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100755 app/src/main/res/drawable/ic_file_download_black_24dp.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt index 730c70855..f09051f49 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt @@ -62,7 +62,7 @@ class MoreController : initDownloadQueueSummary(this) } - iconRes = R.drawable.ic_file_download_black_24dp + iconRes = R.drawable.ic_get_app_24dp iconTint = tintColor onClick { router.pushController(DownloadController().withFadeTransaction()) 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 9a043dfe5..90fc3f550 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 @@ -24,7 +24,7 @@ class SettingsMainController : SettingsController() { onClick { navigateTo(SettingsGeneralController()) } } preference { - iconRes = R.drawable.ic_collections_bookmark_24dp + iconRes = R.drawable.ic_collections_bookmark_outline_24dp iconTint = tintColor titleRes = R.string.pref_category_library onClick { navigateTo(SettingsLibraryController()) } @@ -36,7 +36,7 @@ class SettingsMainController : SettingsController() { onClick { navigateTo(SettingsReaderController()) } } preference { - iconRes = R.drawable.ic_file_download_black_24dp + iconRes = R.drawable.ic_get_app_24dp iconTint = tintColor titleRes = R.string.pref_category_downloads onClick { navigateTo(SettingsDownloadController()) } @@ -48,7 +48,7 @@ class SettingsMainController : SettingsController() { onClick { navigateTo(SettingsTrackingController()) } } preference { - iconRes = R.drawable.ic_explore_24dp + iconRes = R.drawable.ic_explore_outline_24dp iconTint = tintColor titleRes = R.string.browse onClick { navigateTo(SettingsBrowseController()) } diff --git a/app/src/main/res/drawable/ic_backup_24dp.xml b/app/src/main/res/drawable/ic_backup_24dp.xml index fad311c80..15c5afb8d 100644 --- a/app/src/main/res/drawable/ic_backup_24dp.xml +++ b/app/src/main/res/drawable/ic_backup_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + 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 100755 index 492b41d34..000000000 --- a/app/src/main/res/drawable/ic_file_download_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -