From 7fa0280e91ab70f17f28da5d5a788991120329cb Mon Sep 17 00:00:00 2001 From: Jay Date: Mon, 13 Apr 2020 23:18:00 -0400 Subject: [PATCH] appending ic_ to the icon drawables --- .../eu/kanade/tachiyomi/ui/library/LibraryController.kt | 2 +- .../eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt | 2 +- .../eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt | 4 ++-- .../tachiyomi/ui/recent_updates/RecentChapterHolder.kt | 4 ++-- app/src/main/res/drawable/browse_selector_24dp.xml | 5 ----- .../res/drawable/{browse_24dp.xml => ic_browse_24dp.xml} | 0 .../{browse_outline_24dp.xml => ic_browse_outline_24dp.xml} | 0 app/src/main/res/drawable/ic_browse_selector_24dp.xml | 5 +++++ app/src/main/res/drawable/{eye.xml => ic_eye_24dp.xml} | 0 .../main/res/drawable/{eye_off.xml => ic_eye_off_24dp.xml} | 0 .../res/drawable/{library_24dp.xml => ic_library_24dp.xml} | 0 ...library_outline_24dp.xml => ic_library_outline_24dp.xml} | 0 app/src/main/res/drawable/ic_library_selector_24dp.xml | 5 +++++ .../{recent_read_24dp.xml => ic_recent_read_24dp.xml} | 0 ...ead_outline_24dp.xml => ic_recent_read_outline_24dp.xml} | 0 app/src/main/res/drawable/ic_recent_read_selector_24dp.xml | 5 +++++ app/src/main/res/drawable/{star.xml => ic_star_24dp.xml} | 0 app/src/main/res/drawable/library_selector_24dp.xml | 5 ----- app/src/main/res/drawable/recent_read_selector_24dp.xml | 5 ----- app/src/main/res/layout/recent_chapters_item.xml | 2 +- app/src/main/res/layout/recent_manga_item.xml | 2 +- app/src/main/res/menu/bottom_navigation.xml | 6 +++--- 22 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 app/src/main/res/drawable/browse_selector_24dp.xml rename app/src/main/res/drawable/{browse_24dp.xml => ic_browse_24dp.xml} (100%) rename app/src/main/res/drawable/{browse_outline_24dp.xml => ic_browse_outline_24dp.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_browse_selector_24dp.xml rename app/src/main/res/drawable/{eye.xml => ic_eye_24dp.xml} (100%) rename app/src/main/res/drawable/{eye_off.xml => ic_eye_off_24dp.xml} (100%) rename app/src/main/res/drawable/{library_24dp.xml => ic_library_24dp.xml} (100%) rename app/src/main/res/drawable/{library_outline_24dp.xml => ic_library_outline_24dp.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_library_selector_24dp.xml rename app/src/main/res/drawable/{recent_read_24dp.xml => ic_recent_read_24dp.xml} (100%) rename app/src/main/res/drawable/{recent_read_outline_24dp.xml => ic_recent_read_outline_24dp.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_recent_read_selector_24dp.xml rename app/src/main/res/drawable/{star.xml => ic_star_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/library_selector_24dp.xml delete mode 100644 app/src/main/res/drawable/recent_read_selector_24dp.xml 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 e253b24327..26d2df1b9e 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 @@ -242,7 +242,7 @@ class LibraryController( !adapter.isHeader(adapter.getItem(position)) && position != adapter.itemCount - 1) null else if (letter != null) FastScrollItemIndicator.Text(letter) - else FastScrollItemIndicator.Icon(R.drawable.star) + else FastScrollItemIndicator.Icon(R.drawable.ic_star_24dp) }) fast_scroller.useDefaultScroller = false fast_scroller.itemIndicatorSelectedCallbacks += object : diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt index 44ce398111..60f5b8a936 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt @@ -363,7 +363,7 @@ class MangaDetailsController : BaseController, when { presenter.scrollType == 0 -> null letter != null -> FastScrollItemIndicator.Text(letter) - else -> FastScrollItemIndicator.Icon(R.drawable.star) + else -> FastScrollItemIndicator.Icon(R.drawable.ic_star_24dp) } }) fast_scroller.useDefaultScroller = false diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt index afd58bbfa7..e983ac855e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt @@ -80,8 +80,8 @@ class ChapterHolder( if (front_view.translationX == 0f) { read.setImageDrawable( ContextCompat.getDrawable( - read.context, if (item.read) R.drawable.eye_off - else R.drawable.eye + read.context, if (item.read) R.drawable.ic_eye_off_24dp + else R.drawable.ic_eye_24dp ) ) bookmark.setImageDrawable( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChapterHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChapterHolder.kt index d7dae74691..e572f72f90 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChapterHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChapterHolder.kt @@ -61,8 +61,8 @@ class RecentChapterHolder(private val view: View, private val adapter: RecentCha if (front_view.translationX == 0f) { read.setImageDrawable( ContextCompat.getDrawable( - read.context, if (item.read) R.drawable.eye_off - else R.drawable.eye + read.context, if (item.read) R.drawable.ic_eye_off_24dp + else R.drawable.ic_eye_24dp ) ) } diff --git a/app/src/main/res/drawable/browse_selector_24dp.xml b/app/src/main/res/drawable/browse_selector_24dp.xml deleted file mode 100644 index c3b8628648..0000000000 --- a/app/src/main/res/drawable/browse_selector_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/browse_24dp.xml b/app/src/main/res/drawable/ic_browse_24dp.xml similarity index 100% rename from app/src/main/res/drawable/browse_24dp.xml rename to app/src/main/res/drawable/ic_browse_24dp.xml diff --git a/app/src/main/res/drawable/browse_outline_24dp.xml b/app/src/main/res/drawable/ic_browse_outline_24dp.xml similarity index 100% rename from app/src/main/res/drawable/browse_outline_24dp.xml rename to app/src/main/res/drawable/ic_browse_outline_24dp.xml diff --git a/app/src/main/res/drawable/ic_browse_selector_24dp.xml b/app/src/main/res/drawable/ic_browse_selector_24dp.xml new file mode 100644 index 0000000000..ae581550df --- /dev/null +++ b/app/src/main/res/drawable/ic_browse_selector_24dp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/eye.xml b/app/src/main/res/drawable/ic_eye_24dp.xml similarity index 100% rename from app/src/main/res/drawable/eye.xml rename to app/src/main/res/drawable/ic_eye_24dp.xml diff --git a/app/src/main/res/drawable/eye_off.xml b/app/src/main/res/drawable/ic_eye_off_24dp.xml similarity index 100% rename from app/src/main/res/drawable/eye_off.xml rename to app/src/main/res/drawable/ic_eye_off_24dp.xml diff --git a/app/src/main/res/drawable/library_24dp.xml b/app/src/main/res/drawable/ic_library_24dp.xml similarity index 100% rename from app/src/main/res/drawable/library_24dp.xml rename to app/src/main/res/drawable/ic_library_24dp.xml diff --git a/app/src/main/res/drawable/library_outline_24dp.xml b/app/src/main/res/drawable/ic_library_outline_24dp.xml similarity index 100% rename from app/src/main/res/drawable/library_outline_24dp.xml rename to app/src/main/res/drawable/ic_library_outline_24dp.xml diff --git a/app/src/main/res/drawable/ic_library_selector_24dp.xml b/app/src/main/res/drawable/ic_library_selector_24dp.xml new file mode 100644 index 0000000000..25ca378800 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_selector_24dp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/recent_read_24dp.xml b/app/src/main/res/drawable/ic_recent_read_24dp.xml similarity index 100% rename from app/src/main/res/drawable/recent_read_24dp.xml rename to app/src/main/res/drawable/ic_recent_read_24dp.xml diff --git a/app/src/main/res/drawable/recent_read_outline_24dp.xml b/app/src/main/res/drawable/ic_recent_read_outline_24dp.xml similarity index 100% rename from app/src/main/res/drawable/recent_read_outline_24dp.xml rename to app/src/main/res/drawable/ic_recent_read_outline_24dp.xml diff --git a/app/src/main/res/drawable/ic_recent_read_selector_24dp.xml b/app/src/main/res/drawable/ic_recent_read_selector_24dp.xml new file mode 100644 index 0000000000..81ea68a928 --- /dev/null +++ b/app/src/main/res/drawable/ic_recent_read_selector_24dp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/star.xml b/app/src/main/res/drawable/ic_star_24dp.xml similarity index 100% rename from app/src/main/res/drawable/star.xml rename to app/src/main/res/drawable/ic_star_24dp.xml diff --git a/app/src/main/res/drawable/library_selector_24dp.xml b/app/src/main/res/drawable/library_selector_24dp.xml deleted file mode 100644 index 77ab41c7e2..0000000000 --- a/app/src/main/res/drawable/library_selector_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/recent_read_selector_24dp.xml b/app/src/main/res/drawable/recent_read_selector_24dp.xml deleted file mode 100644 index 65de23f524..0000000000 --- a/app/src/main/res/drawable/recent_read_selector_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/recent_chapters_item.xml b/app/src/main/res/layout/recent_chapters_item.xml index c89398b78f..bfdff0ee8d 100644 --- a/app/src/main/res/layout/recent_chapters_item.xml +++ b/app/src/main/res/layout/recent_chapters_item.xml @@ -23,7 +23,7 @@ android:tint="@color/md_white_1000" android:layout_gravity="end|center" android:layout_marginEnd="21dp" - android:src="@drawable/eye" /> + android:src="@drawable/ic_eye_24dp" /> + android:src="@drawable/ic_eye_24dp" />