From cb6de21804012f7aef21987329c083c6a8fca517 Mon Sep 17 00:00:00 2001 From: Jay Date: Sun, 12 Apr 2020 20:19:07 -0400 Subject: [PATCH] Using bookmark icon for chapter bookmarking, heart for favoriting manga --- .../java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 2 +- .../eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt | 4 ++-- .../kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt | 4 ++-- .../eu/kanade/tachiyomi/ui/recents/RecentsController.kt | 3 ++- .../eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt | 2 +- .../{ic_bookmark_white_24dp.xml => ic_bookmark_24dp.xml} | 1 + app/src/main/res/drawable/ic_bookmark_off_24dp.xml | 8 ++++++++ app/src/main/res/drawable/ic_heart_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_heart_outline_24dp.xml | 8 ++++++++ app/src/main/res/layout/chapters_item.xml | 2 +- 10 files changed, 35 insertions(+), 8 deletions(-) rename app/src/main/res/drawable/{ic_bookmark_white_24dp.xml => ic_bookmark_24dp.xml} (92%) create mode 100644 app/src/main/res/drawable/ic_bookmark_off_24dp.xml create mode 100644 app/src/main/res/drawable/ic_heart_24dp.xml create mode 100644 app/src/main/res/drawable/ic_heart_outline_24dp.xml 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 bec3b0c768..886a443676 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 @@ -93,7 +93,7 @@ open class MainActivity : BaseActivity(), DownloadServiceListener { this.snackBar = snackBar canDismissSnackBar = false launchUI { - delay(2000) + delay(1000) if (this@MainActivity.snackBar == snackBar) { canDismissSnackBar = true } 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 07d9592d8c..77d797b50a 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 @@ -142,8 +142,8 @@ class MangaHeaderHolder( icon = ContextCompat.getDrawable( itemView.context, when { item.isLocked -> R.drawable.ic_lock_white_24dp - manga.favorite -> R.drawable.ic_bookmark_white_24dp - else -> R.drawable.ic_add_to_library_24dp + manga.favorite -> R.drawable.ic_heart_24dp + else -> R.drawable.ic_heart_outline_24dp } ) text = itemView.resources.getString( 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 c74f8aed03..afd58bbfa7 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 @@ -86,8 +86,8 @@ class ChapterHolder( ) bookmark.setImageDrawable( ContextCompat.getDrawable( - read.context, if (item.bookmark) R.drawable.star_off - else R.drawable.star + read.context, if (item.bookmark) R.drawable.ic_bookmark_off_24dp + else R.drawable.ic_bookmark_24dp ) ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt index fc5a4f0215..66b6b5d185 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt @@ -364,7 +364,8 @@ class RecentsController(bundle: Bundle? = null) : BaseController(bundle), } override fun showSheet() { - dl_bottom_sheet.sheetBehavior?.state = BottomSheetBehavior.STATE_EXPANDED + if (dl_bottom_sheet.sheetBehavior?.isHideable == false || presenter.downloadManager.hasQueue()) + dl_bottom_sheet.sheetBehavior?.state = BottomSheetBehavior.STATE_EXPANDED } override fun toggleSheet() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt index a530633779..2757d1c9f6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt @@ -30,7 +30,7 @@ import kotlin.math.abs class RecentsPresenter( val controller: RecentsController, val preferences: PreferencesHelper = Injekt.get(), - private val downloadManager: DownloadManager = Injekt.get(), + val downloadManager: DownloadManager = Injekt.get(), private val db: DatabaseHelper = Injekt.get() ) : DownloadQueue.DownloadListener, LibraryServiceListener { diff --git a/app/src/main/res/drawable/ic_bookmark_white_24dp.xml b/app/src/main/res/drawable/ic_bookmark_24dp.xml similarity index 92% rename from app/src/main/res/drawable/ic_bookmark_white_24dp.xml rename to app/src/main/res/drawable/ic_bookmark_24dp.xml index a291197bed..38953e0efa 100644 --- a/app/src/main/res/drawable/ic_bookmark_white_24dp.xml +++ b/app/src/main/res/drawable/ic_bookmark_24dp.xml @@ -2,6 +2,7 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" + android:tint="#FFFFFF" android:viewportHeight="24.0"> + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_heart_24dp.xml b/app/src/main/res/drawable/ic_heart_24dp.xml new file mode 100644 index 0000000000..7f3d547d6e --- /dev/null +++ b/app/src/main/res/drawable/ic_heart_24dp.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_heart_outline_24dp.xml b/app/src/main/res/drawable/ic_heart_outline_24dp.xml new file mode 100644 index 0000000000..c83885db7c --- /dev/null +++ b/app/src/main/res/drawable/ic_heart_outline_24dp.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/chapters_item.xml b/app/src/main/res/layout/chapters_item.xml index 05bc229ff7..5569b507e5 100644 --- a/app/src/main/res/layout/chapters_item.xml +++ b/app/src/main/res/layout/chapters_item.xml @@ -47,7 +47,7 @@ android:layout_gravity="start|center" android:layout_marginStart="21dp" android:tint="@color/md_white_1000" - android:src="@drawable/ic_bookmark_white_24dp" /> + android:src="@drawable/ic_bookmark_24dp" />