From d7043bcaeb4941bda92f7833de20971e75ba3bbb Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 14 Mar 2020 14:00:07 -0400 Subject: [PATCH] Use outlined icons in bottom nav and more controller --- .../java/eu/kanade/tachiyomi/ui/more/MoreController.kt | 8 ++++---- .../main/res/drawable/ic_collections_bookmark_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_explore_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_explore_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_extension_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_extension_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_help_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_help_outline_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_history_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_history_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_info_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_info_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_more_horiz_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_more_horiz_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_new_releases_24dp.xml | 9 +++++++++ .../main/res/drawable/ic_new_releases_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_settings_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_settings_black_24dp.xml | 9 --------- app/src/main/res/menu/bottom_nav.xml | 10 +++++----- 19 files changed, 90 insertions(+), 81 deletions(-) create mode 100644 app/src/main/res/drawable/ic_collections_bookmark_24dp.xml create mode 100644 app/src/main/res/drawable/ic_explore_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_explore_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_extension_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_extension_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_help_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_help_outline_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 create mode 100644 app/src/main/res/drawable/ic_info_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_info_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_more_horiz_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_more_horiz_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_new_releases_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_new_releases_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_settings_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_settings_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 c8effdfc7..335fe6d37 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 @@ -27,7 +27,7 @@ class MoreController : SettingsController(), RootController { preference { titleRes = R.string.label_extensions - iconRes = R.drawable.ic_extension_black_24dp + iconRes = R.drawable.ic_extension_24dp iconTint = tintColor onClick { router.pushController(ExtensionController().withFadeTransaction()) @@ -53,14 +53,14 @@ class MoreController : SettingsController(), RootController { preferenceCategory { preference { titleRes = R.string.label_settings - iconRes = R.drawable.ic_settings_black_24dp + iconRes = R.drawable.ic_settings_24dp iconTint = tintColor onClick { router.pushController(SettingsMainController().withFadeTransaction()) } } preference { - iconRes = R.drawable.ic_info_black_24dp + iconRes = R.drawable.ic_info_24dp iconTint = tintColor titleRes = R.string.pref_category_about onClick { @@ -69,7 +69,7 @@ class MoreController : SettingsController(), RootController { } preference { titleRes = R.string.label_help - iconRes = R.drawable.ic_help_black_24dp + iconRes = R.drawable.ic_help_outline_24dp iconTint = tintColor onClick { activity?.openInBrowser(URL_HELP) diff --git a/app/src/main/res/drawable/ic_collections_bookmark_24dp.xml b/app/src/main/res/drawable/ic_collections_bookmark_24dp.xml new file mode 100644 index 000000000..916e94524 --- /dev/null +++ b/app/src/main/res/drawable/ic_collections_bookmark_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_explore_24dp.xml b/app/src/main/res/drawable/ic_explore_24dp.xml new file mode 100644 index 000000000..f42cbf95e --- /dev/null +++ b/app/src/main/res/drawable/ic_explore_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_explore_black_24dp.xml b/app/src/main/res/drawable/ic_explore_black_24dp.xml deleted file mode 100644 index 68aa81479..000000000 --- a/app/src/main/res/drawable/ic_explore_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_extension_24dp.xml b/app/src/main/res/drawable/ic_extension_24dp.xml new file mode 100644 index 000000000..4784816a3 --- /dev/null +++ b/app/src/main/res/drawable/ic_extension_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_extension_black_24dp.xml b/app/src/main/res/drawable/ic_extension_black_24dp.xml deleted file mode 100644 index d3dd09481..000000000 --- a/app/src/main/res/drawable/ic_extension_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_help_black_24dp.xml b/app/src/main/res/drawable/ic_help_black_24dp.xml deleted file mode 100644 index b1d7a2cf5..000000000 --- a/app/src/main/res/drawable/ic_help_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_help_outline_24dp.xml b/app/src/main/res/drawable/ic_help_outline_24dp.xml new file mode 100644 index 000000000..dfd39a1fd --- /dev/null +++ b/app/src/main/res/drawable/ic_help_outline_24dp.xml @@ -0,0 +1,9 @@ + + + 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 000000000..c1caa0b0d --- /dev/null +++ b/app/src/main/res/drawable/ic_history_24dp.xml @@ -0,0 +1,9 @@ + + + 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 d9f75ea6d..000000000 --- a/app/src/main/res/drawable/ic_history_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_info_24dp.xml b/app/src/main/res/drawable/ic_info_24dp.xml new file mode 100644 index 000000000..715b90c9b --- /dev/null +++ b/app/src/main/res/drawable/ic_info_24dp.xml @@ -0,0 +1,9 @@ + + + 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 0cbb99601..000000000 --- a/app/src/main/res/drawable/ic_info_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_more_horiz_24dp.xml b/app/src/main/res/drawable/ic_more_horiz_24dp.xml new file mode 100644 index 000000000..c437098f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_more_horiz_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_more_horiz_black_24dp.xml b/app/src/main/res/drawable/ic_more_horiz_black_24dp.xml deleted file mode 100644 index da83afdb1..000000000 --- a/app/src/main/res/drawable/ic_more_horiz_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_new_releases_24dp.xml b/app/src/main/res/drawable/ic_new_releases_24dp.xml new file mode 100644 index 000000000..bfc9e87d3 --- /dev/null +++ b/app/src/main/res/drawable/ic_new_releases_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_new_releases_black_24dp.xml b/app/src/main/res/drawable/ic_new_releases_black_24dp.xml deleted file mode 100644 index 2f5128db6..000000000 --- a/app/src/main/res/drawable/ic_new_releases_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml new file mode 100644 index 000000000..e1fb6a23e --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml deleted file mode 100644 index ace746c40..000000000 --- a/app/src/main/res/drawable/ic_settings_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/menu/bottom_nav.xml b/app/src/main/res/menu/bottom_nav.xml index 838b04efa..4d40d7a9a 100644 --- a/app/src/main/res/menu/bottom_nav.xml +++ b/app/src/main/res/menu/bottom_nav.xml @@ -2,22 +2,22 @@