Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-24 03:41:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to manga details when app is locked + scrolling toolbar fixes

Browse Source
This commit is contained in:
Jay 2020-03-28 19:11:32 -04:00
parent 9e67c00465
commit b48cff63e4
2 changed files with 70 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
View File

@ -252,10 +252,15 @@ class MangaDetailsController : BaseController,
if ((!atTop && !toolbarIsColored && (appBarY < (-headerHeight + 1) || (dy < 0 && appBarY == 0f))) || (atTop && toolbarIsColored)) {
colorToolbar(!atTop)
}
if (atTop) {
getHeader()?.backdrop?.translationY = 0f
activity!!.appbar.y = 0f
}
}
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
super.onScrollStateChanged(recyclerView, newState)
val atTop = !recycler.canScrollVertically(-1)
if (newState == RecyclerView.SCROLL_STATE_IDLE) {
if (router?.backstack?.lastOrNull()
?.controller() == this@MangaDetailsController && statusBarHeight > -1 && activity != null &&
@ -266,7 +271,6 @@ class MangaDetailsController : BaseController,
android.R.integer.config_shortAnimTime
) ?: 0
val closerToTop = abs(activity!!.appbar.y) - halfWay > 0
val atTop = !recycler.canScrollVertically(-1)
activity!!.appbar.animate().y(
if (closerToTop && !atTop) (-activity!!.appbar.height.toFloat())
else 0f
@ -275,6 +279,11 @@ class MangaDetailsController : BaseController,
colorToolbar(true)
}
}
if (atTop && toolbarIsColored) colorToolbar(false)
if (atTop) {
getHeader()?.backdrop?.translationY = 0f
activity!!.appbar.y = 0f
}
}
})
setPaletteColor()
@ -599,6 +608,7 @@ class MangaDetailsController : BaseController,
editItem.title = view?.context?.getString(if (manga?.source == LocalSource.ID)
R.string.action_edit else R.string.action_edit_cover)
menu.findItem(R.id.action_download).isVisible = !presenter.isLockedFromSearch
menu.findItem(R.id.action_add_to_home_screen).isVisible = !presenter.isLockedFromSearch
menu.findItem(R.id.action_mark_all_as_read).isVisible =
presenter.getNextUnreadChapter() != null && !presenter.isLockedFromSearch
menu.findItem(R.id.action_mark_all_as_unread).isVisible =
@ -935,11 +945,16 @@ class MangaDetailsController : BaseController,
ChaptersSortBottomSheet(this).show()
}
override fun favoriteManga(longPress: Boolean) {
private fun isLocked(): Boolean {
if (presenter.isLockedFromSearch) {
SecureActivityDelegate.promptLockIfNeeded(activity)
return
return true
}
return false
}
override fun favoriteManga(longPress: Boolean) {
if (isLocked()) return
val manga = presenter.manga
if (longPress) {
if (!manga.favorite) {
@ -1071,6 +1086,7 @@ class MangaDetailsController : BaseController,
}
override fun showTrackingSheet() {
if (isLocked()) return
trackingBottomSheet =
TrackingBottomSheet(this)
trackingBottomSheet?.show()

90
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt
View File

@ -89,19 +89,28 @@ class MangaHeaderHolder(
val presenter = adapter.delegate.mangaPresenter()
manga_full_title.text = manga.title
if (manga.genre.isNullOrBlank().not())
manga_genres_tags.setTags(manga.genre?.split(", ")?.map(String::trim))
else
manga_genres_tags.setTags(emptyList())
if (manga.genre.isNullOrBlank().not()) manga_genres_tags.setTags(
manga.genre?.split(", ")?.map(String::trim)
)
else manga_genres_tags.setTags(emptyList())
if (manga.author == manga.artist ||
manga.artist.isNullOrBlank())
manga_author.text = manga.author?.trim()
if (manga.author == manga.artist || manga.artist.isNullOrBlank()) manga_author.text =
manga.author?.trim()
else {
manga_author.text = "${manga.author?.trim()}, ${manga.artist}"
}
manga_summary.text = manga.description?.trim() ?: itemView.context.getString(R.string
.no_description)
manga_summary.text = manga.description?.trim() ?: itemView.context.getString(
R.string.no_description
)
if (item.isLocked) sub_item_group.referencedIds =
intArrayOf(R.id.manga_summary, R.id.manga_summary_label, R.id.button_layout)
else sub_item_group.referencedIds = intArrayOf(
R.id.start_reading_button,
R.id.manga_summary,
R.id.manga_summary_label,
R.id.button_layout
)
manga_summary.post {
if (sub_item_group.visibility != View.GONE) {
@ -112,8 +121,8 @@ class MangaHeaderHolder(
if (adapter.hasFilter()) collapse()
else expand()
}
manga_summary_label.text = itemView.context.getString(R.string.about_this,
itemView.context.getString(
manga_summary_label.text = itemView.context.getString(
R.string.about_this, itemView.context.getString(
when {
manga.mangaType() == Manga.TYPE_MANHWA -> R.string.manhwa
manga.mangaType() == Manga.TYPE_MANHUA -> R.string.manhua
@ -121,7 +130,8 @@ class MangaHeaderHolder(
manga.mangaType() == Manga.TYPE_WEBTOON -> R.string.webtoon
else -> R.string.manga
}
).toLowerCase(Locale.getDefault()))
).toLowerCase(Locale.getDefault())
)
with(favorite_button) {
icon = ContextCompat.getDrawable(
itemView.context, when {
@ -139,18 +149,24 @@ class MangaHeaderHolder(
)
checked(!item.isLocked && manga.favorite)
}
true_backdrop.setBackgroundColor(adapter.delegate.coverColor()
?: itemView.context.getResourceColor(android.R.attr.colorBackground))
true_backdrop.setBackgroundColor(
adapter.delegate.coverColor()
?: itemView.context.getResourceColor(android.R.attr.colorBackground)
)
val tracked = presenter.isTracked() && !item.isLocked
with(track_button) {
visibleIf(presenter.hasTrackers())
text = itemView.context.getString(if (tracked) R.string.action_filter_tracked
else R.string.tracking)
text = itemView.context.getString(
if (tracked) R.string.action_filter_tracked
else R.string.tracking
)
icon = ContextCompat.getDrawable(itemView.context, if (tracked) R.drawable
.ic_check_white_24dp else R.drawable.ic_sync_black_24dp)
icon = ContextCompat.getDrawable(
itemView.context,
if (tracked) R.drawable.ic_check_white_24dp else R.drawable.ic_sync_black_24dp
)
checked(tracked)
}
@ -158,21 +174,20 @@ class MangaHeaderHolder(
val nextChapter = presenter.getNextUnreadChapter()
visibleIf(presenter.chapters.isNotEmpty() && !item.isLocked)
isEnabled = (nextChapter != null)
if (nextChapter != null) {
text = if (nextChapter != null) {
val number = adapter.decimalFormat.format(nextChapter.chapter_number.toDouble())
text = if (nextChapter.chapter_number > 0) resources.getString(
if (nextChapter.chapter_number > 0) resources.getString(
if (nextChapter.last_page_read > 0) R.string.continue_reading_chapter
else R.string.start_reading_chapter, number
)
else {
val name = nextChapter.name
resources.getString(
if (nextChapter.last_page_read > 0) R.string.continue_reading
else R.string.start_reading
)
}
} else {
text = resources.getString(R.string.all_chapters_read)
resources.getString(R.string.all_chapters_read)
}
}
@ -183,12 +198,14 @@ class MangaHeaderHolder(
height = adapter.delegate.topCoverHeight()
}
manga_status.text = (itemView.context.getString(when (manga.status) {
SManga.ONGOING -> R.string.ongoing
SManga.COMPLETED -> R.string.completed
SManga.LICENSED -> R.string.licensed
else -> R.string.unknown_status
}))
manga_status.text = (itemView.context.getString(
when (manga.status) {
SManga.ONGOING -> R.string.ongoing
SManga.COMPLETED -> R.string.completed
SManga.LICENSED -> R.string.licensed
else -> R.string.unknown_status
}
))
manga_source.text = presenter.source.toString()
filters_text.text = presenter.currentFilters()
@ -199,16 +216,12 @@ class MangaHeaderHolder(
}
if (!manga.initialized) return
GlideApp.with(view.context).load(manga)
.diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
GlideApp.with(view.context).load(manga).diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
.signature(ObjectKey(MangaImpl.getLastCoverFetch(manga.id!!).toString()))
.into(manga_cover)
GlideApp.with(view.context).load(manga)
.diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
.signature(ObjectKey(MangaImpl.getLastCoverFetch(manga.id!!).toString()))
.centerCrop()
.transition(DrawableTransitionOptions.withCrossFade())
.into(backdrop)
GlideApp.with(view.context).load(manga).diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
.signature(ObjectKey(MangaImpl.getLastCoverFetch(manga.id!!).toString())).centerCrop()
.transition(DrawableTransitionOptions.withCrossFade()).into(backdrop)
}
private fun MaterialButton.checked(checked: Boolean) {
@ -243,7 +256,7 @@ class MangaHeaderHolder(
}
fun updateTracking() {
val presenter = adapter.delegate.mangaPresenter() ?: return
val presenter = adapter.delegate.mangaPresenter()
val tracked = presenter.isTracked()
with(track_button) {
text = itemView.context.getString(if (tracked) R.string.action_filter_tracked
@ -267,8 +280,7 @@ class MangaHeaderHolder(
fun expand() {
sub_item_group.visible()
if (more_button.visibility == View.VISIBLE || more_button.visibility == View.INVISIBLE)
more_button_group.visible()
if (more_button.visibility == View.VISIBLE || more_button.visibility == View.INVISIBLE) more_button_group.visible()
else {
less_button.visible()
manga_genres_tags.visible()