Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup manga info header and make it viewbinding focused

Browse Source
This commit is contained in:
Jobobby04 2020-06-19 15:45:15 -04:00
parent bb6d3780c0
commit 606fb22d62
2 changed files with 92 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHeaderItem.kt
View File

@ -35,7 +35,7 @@ class MangaAllInOneHeaderItem(val manga: Manga, val source: Source, var smartSea
position: Int, position: Int,
payloads: MutableList<Any?>? payloads: MutableList<Any?>?
) { ) {
holder.bind(this, manga, source) holder.bind(manga, source)
} }
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {

202
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
View File

@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.data.glide.GlideApp
import eu.kanade.tachiyomi.data.glide.toMangaThumbnail import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.databinding.MangaAllInOneHeaderBinding
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
@ -27,31 +28,6 @@ import exh.util.setChipsExtended
import java.text.DateFormat import java.text.DateFormat
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.Date import java.util.Date
import kotlinx.android.synthetic.main.manga_all_in_one_header.backdrop
import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_categories
import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_favorite
import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_migrate
import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_share
import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_smart_search
import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_tracking
import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_webview
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_author
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_chapters
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_cover
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_full_title
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_genres_tags_compact
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_genres_tags_compact_chips
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_genres_tags_full_chips
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_genres_tags_wrapper
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_info_toggle
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_last_update
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_source
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_source_label
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_status
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_summary
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_summary_label
import kotlinx.android.synthetic.main.manga_all_in_one_header.merge_btn
import kotlinx.android.synthetic.main.manga_all_in_one_header.recommend_btn
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
@ -78,18 +54,22 @@ class MangaAllInOneHolder(
private val sourceManager: SourceManager by injectLazy() private val sourceManager: SourceManager by injectLazy()
var binding: MangaAllInOneHeaderBinding
init { init {
val presenter = adapter.delegate.mangaPresenter() val presenter = adapter.delegate.mangaPresenter()
// Setting this via XML doesn't work binding = MangaAllInOneHeaderBinding.bind(itemView)
manga_cover.clipToOutline = true
btn_favorite.clicks() // Setting this via XML doesn't work
binding.mangaCover.clipToOutline = true
binding.btnFavorite.clicks()
.onEach { adapter.delegate.onFavoriteClick() } .onEach { adapter.delegate.onFavoriteClick() }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
if ((Injekt.get<TrackManager>().hasLoggedServices())) { if ((Injekt.get<TrackManager>().hasLoggedServices())) {
btn_tracking.visible() binding.btnTracking.visible()
} }
adapter.delegate.controllerScope.launch(Dispatchers.IO) { adapter.delegate.controllerScope.launch(Dispatchers.IO) {
@ -101,81 +81,81 @@ class MangaAllInOneHolder(
) )
} }
btn_tracking.clicks() binding.btnTracking.clicks()
.onEach { adapter.delegate.openTracking() } .onEach { adapter.delegate.openTracking() }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
if (presenter.manga.favorite && presenter.getCategories().isNotEmpty()) { if (presenter.manga.favorite && presenter.getCategories().isNotEmpty()) {
btn_categories.visible() binding.btnCategories.visible()
} }
btn_categories.clicks() binding.btnCategories.clicks()
.onEach { adapter.delegate.onCategoriesClick() } .onEach { adapter.delegate.onCategoriesClick() }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
if (presenter.source is HttpSource) { if (presenter.source is HttpSource) {
btn_webview.visible() binding.btnWebview.visible()
btn_share.visible() binding.btnShare.visible()
btn_webview.clicks() binding.btnWebview.clicks()
.onEach { adapter.delegate.openInWebView() } .onEach { adapter.delegate.openInWebView() }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
btn_share.clicks() binding.btnShare.clicks()
.onEach { adapter.delegate.shareManga() } .onEach { adapter.delegate.shareManga() }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
} }
if (presenter.manga.favorite) { if (presenter.manga.favorite) {
btn_migrate.visible() binding.btnMigrate.visible()
btn_smart_search.visible() binding.btnSmartSearch.visible()
} }
btn_migrate.clicks() binding.btnMigrate.clicks()
.onEach { .onEach {
adapter.delegate.migrateManga() adapter.delegate.migrateManga()
} }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
btn_smart_search.clicks() binding.btnSmartSearch.clicks()
.onEach { adapter.delegate.openSmartSearch() } .onEach { adapter.delegate.openSmartSearch() }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
manga_full_title.longClicks() binding.mangaFullTitle.longClicks()
.onEach { .onEach {
adapter.delegate.copyToClipboard(view.context.getString(R.string.title), manga_full_title.text.toString()) adapter.delegate.copyToClipboard(view.context.getString(R.string.title), binding.mangaFullTitle.text.toString())
} }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
manga_full_title.clicks() binding.mangaFullTitle.clicks()
.onEach { .onEach {
adapter.delegate.performGlobalSearch(manga_full_title.text.toString()) adapter.delegate.performGlobalSearch(binding.mangaFullTitle.text.toString())
} }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
manga_author.longClicks() binding.mangaAuthor.longClicks()
.onEach { .onEach {
// EXH Special case E-Hentai/ExHentai to ignore author field (unused) // EXH Special case E-Hentai/ExHentai to ignore author field (unused)
if (!adapter.delegate.isEHentaiBasedSource()) { if (!adapter.delegate.isEHentaiBasedSource()) {
adapter.delegate.copyToClipboard("author", manga_author.text.toString()) adapter.delegate.copyToClipboard("author", binding.mangaAuthor.text.toString())
} }
} }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
manga_author.clicks() binding.mangaAuthor.clicks()
.onEach { .onEach {
// EXH Special case E-Hentai/ExHentai to ignore author field (unused) // EXH Special case E-Hentai/ExHentai to ignore author field (unused)
if (!adapter.delegate.isEHentaiBasedSource()) { if (!adapter.delegate.isEHentaiBasedSource()) {
adapter.delegate.performGlobalSearch(manga_author.text.toString()) adapter.delegate.performGlobalSearch(binding.mangaAuthor.text.toString())
} }
} }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
manga_summary.longClicks() binding.mangaSummary.longClicks()
.onEach { .onEach {
adapter.delegate.copyToClipboard(view.context.getString(R.string.description), manga_summary.text.toString()) adapter.delegate.copyToClipboard(view.context.getString(R.string.description), binding.mangaSummary.text.toString())
} }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
manga_cover.longClicks() binding.mangaCover.longClicks()
.onEach { .onEach {
adapter.delegate.copyToClipboard(view.context.getString(R.string.title), presenter.manga.title) adapter.delegate.copyToClipboard(view.context.getString(R.string.title), presenter.manga.title)
} }
@ -183,14 +163,14 @@ class MangaAllInOneHolder(
// EXH --> // EXH -->
if (smartSearchConfig == null) { if (smartSearchConfig == null) {
recommend_btn.visible() binding.recommendBtn.visible()
recommend_btn.clicks() binding.recommendBtn.clicks()
.onEach { adapter.delegate.openRecommends() } .onEach { adapter.delegate.openRecommends() }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
} }
smartSearchConfig?.let { smartSearchConfig -> smartSearchConfig?.let {
if (smartSearchConfig.origMangaId != null) { merge_btn.visible() } if (it.origMangaId != null) { binding.mergeBtn.visible() }
merge_btn.clicks() binding.mergeBtn.clicks()
.onEach { .onEach {
adapter.delegate.mergeWithAnother() adapter.delegate.mergeWithAnother()
} }
@ -200,10 +180,8 @@ class MangaAllInOneHolder(
// EXH <-- // EXH <--
} }
fun bind(item: MangaAllInOneHeaderItem, manga: Manga, source: Source?) { fun bind(manga: Manga, source: Source?) {
val presenter = adapter.delegate.mangaPresenter() binding.mangaFullTitle.text = if (manga.title.isBlank()) {
manga_full_title.text = if (manga.title.isBlank()) {
itemView.context.getString(R.string.unknown) itemView.context.getString(R.string.unknown)
} else { } else {
manga.title manga.title
@ -211,7 +189,7 @@ class MangaAllInOneHolder(
// Update author/artist TextView. // Update author/artist TextView.
val authors = listOf(manga.author, manga.artist).filter { !it.isNullOrBlank() }.distinct() val authors = listOf(manga.author, manga.artist).filter { !it.isNullOrBlank() }.distinct()
manga_author.text = if (authors.isEmpty()) { binding.mangaAuthor.text = if (authors.isEmpty()) {
itemView.context.getString(R.string.unknown) itemView.context.getString(R.string.unknown)
} else { } else {
authors.joinToString(", ") authors.joinToString(", ")
@ -219,19 +197,23 @@ class MangaAllInOneHolder(
// If manga source is known update source TextView. // If manga source is known update source TextView.
val mangaSource = source?.toString() val mangaSource = source?.toString()
with(manga_source) { with(binding.mangaSource) {
// EXH --> // EXH -->
if (mangaSource == null) { when {
text = itemView.context.getString(R.string.unknown) mangaSource == null -> {
} else if (source.id == MERGED_SOURCE_ID) { text = itemView.context.getString(R.string.unknown)
text = eu.kanade.tachiyomi.source.online.all.MergedSource.MangaConfig.readFromUrl(gson, manga.url).children.map { }
sourceManager.getOrStub(it.source).toString() source.id == MERGED_SOURCE_ID -> {
}.distinct().joinToString() text = eu.kanade.tachiyomi.source.online.all.MergedSource.MangaConfig.readFromUrl(gson, manga.url).children.map {
} else { sourceManager.getOrStub(it.source).toString()
text = mangaSource }.distinct().joinToString()
setOnClickListener { }
val sourceManager = Injekt.get<SourceManager>() else -> {
adapter.delegate.performSearch(sourceManager.getOrStub(source.id).name) text = mangaSource
setOnClickListener {
val sourceManager = Injekt.get<SourceManager>()
adapter.delegate.performSearch(sourceManager.getOrStub(source.id).name)
}
} }
} }
// EXH <-- // EXH <--
@ -239,14 +221,14 @@ class MangaAllInOneHolder(
// EXH --> // EXH -->
if (source?.id == MERGED_SOURCE_ID) { if (source?.id == MERGED_SOURCE_ID) {
manga_source_label.setText(R.string.label_sources) binding.mangaSourceLabel.setText(R.string.label_sources)
} else { } else {
manga_source_label.setText(R.string.manga_info_source_label) binding.mangaSourceLabel.setText(R.string.manga_info_source_label)
} }
// EXH <-- // EXH <--
// Update status TextView. // Update status TextView.
manga_status.setText( binding.mangaStatus.setText(
when (manga.status) { when (manga.status) {
SManga.ONGOING -> R.string.ongoing SManga.ONGOING -> R.string.ongoing
SManga.COMPLETED -> R.string.completed SManga.COMPLETED -> R.string.completed
@ -268,22 +250,20 @@ class MangaAllInOneHolder(
.load(mangaThumbnail) .load(mangaThumbnail)
.diskCacheStrategy(DiskCacheStrategy.RESOURCE) .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.centerCrop() .centerCrop()
.into(manga_cover) .into(binding.mangaCover)
backdrop?.let { GlideApp.with(itemView.context)
GlideApp.with(itemView.context) .load(mangaThumbnail)
.load(mangaThumbnail) .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.diskCacheStrategy(DiskCacheStrategy.RESOURCE) .centerCrop()
.centerCrop() .into(binding.backdrop)
.into(it)
}
// Manga info section // Manga info section
if (manga.description.isNullOrBlank() && manga.genre.isNullOrBlank()) { if (manga.description.isNullOrBlank() && manga.genre.isNullOrBlank()) {
hideMangaInfo() hideMangaInfo()
} else { } else {
// Update description TextView. // Update description TextView.
manga_summary.text = if (manga.description.isNullOrBlank()) { binding.mangaSummary.text = if (manga.description.isNullOrBlank()) {
itemView.context.getString(R.string.unknown) itemView.context.getString(R.string.unknown)
} else { } else {
manga.description manga.description
@ -291,17 +271,17 @@ class MangaAllInOneHolder(
// Update genres list // Update genres list
if (!manga.genre.isNullOrBlank()) { if (!manga.genre.isNullOrBlank()) {
manga_genres_tags_compact_chips.setChipsExtended(manga.getGenres(), this::performSearch, this::performGlobalSearch, manga.source) binding.mangaGenresTagsCompactChips.setChipsExtended(manga.getGenres(), this::performSearch, this::performGlobalSearch, manga.source)
manga_genres_tags_full_chips.setChipsExtended(manga.getGenres(), this::performSearch, this::performGlobalSearch, manga.source) binding.mangaGenresTagsFullChips.setChipsExtended(manga.getGenres(), this::performSearch, this::performGlobalSearch, manga.source)
} else { } else {
manga_genres_tags_wrapper.gone() binding.mangaGenresTagsWrapper.gone()
} }
// Handle showing more or less info // Handle showing more or less info
manga_summary.clicks() binding.mangaSummary.clicks()
.onEach { toggleMangaInfo(itemView.context) } .onEach { toggleMangaInfo(itemView.context) }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
manga_info_toggle.clicks() binding.mangaInfoToggle.clicks()
.onEach { toggleMangaInfo(itemView.context) } .onEach { toggleMangaInfo(itemView.context) }
.launchIn(adapter.delegate.controllerScope) .launchIn(adapter.delegate.controllerScope)
@ -314,23 +294,23 @@ class MangaAllInOneHolder(
} }
private fun hideMangaInfo() { private fun hideMangaInfo() {
manga_summary_label.gone() binding.mangaSummaryLabel.gone()
manga_summary.gone() binding.mangaSummary.gone()
manga_genres_tags_wrapper.gone() binding.mangaGenresTagsWrapper.gone()
manga_info_toggle.gone() binding.mangaInfoToggle.gone()
} }
fun toggleMangaInfo(context: Context) { private fun toggleMangaInfo(context: Context) {
val isExpanded = manga_info_toggle.text == context.getString(R.string.manga_info_collapse) val isExpanded = binding.mangaInfoToggle.text == context.getString(R.string.manga_info_collapse)
manga_info_toggle.text = binding.mangaInfoToggle.text =
if (isExpanded) { if (isExpanded) {
context.getString(R.string.manga_info_expand) context.getString(R.string.manga_info_expand)
} else { } else {
context.getString(R.string.manga_info_collapse) context.getString(R.string.manga_info_collapse)
} }
with(manga_summary) { with(binding.mangaSummary) {
maxLines = maxLines =
if (isExpanded) { if (isExpanded) {
3 3
@ -346,8 +326,8 @@ class MangaAllInOneHolder(
} }
} }
manga_genres_tags_compact.visibleIf { isExpanded } binding.mangaGenresTagsCompact.visibleIf { isExpanded }
manga_genres_tags_full_chips.visibleIf { !isExpanded } binding.mangaGenresTagsFullChips.visibleIf { !isExpanded }
} }
/** /**
@ -357,17 +337,17 @@ class MangaAllInOneHolder(
*/ */
fun setChapterCount(count: Float) { fun setChapterCount(count: Float) {
if (count > 0f) { if (count > 0f) {
manga_chapters.text = DecimalFormat("#.#").format(count) binding.mangaChapters.text = DecimalFormat("#.#").format(count)
} else { } else {
manga_chapters.text = itemView.context.getString(R.string.unknown) binding.mangaChapters.text = itemView.context.getString(R.string.unknown)
} }
} }
fun setLastUpdateDate(date: Date) { fun setLastUpdateDate(date: Date) {
if (date.time != 0L) { if (date.time != 0L) {
manga_last_update.text = dateFormat.format(date) binding.mangaLastUpdate.text = dateFormat.format(date)
} else { } else {
manga_last_update.text = itemView.context.getString(R.string.unknown) binding.mangaLastUpdate.text = itemView.context.getString(R.string.unknown)
} }
} }
@ -386,13 +366,13 @@ class MangaAllInOneHolder(
} }
} }
btn_categories.visibleIf { isNowFavorite && presenter.getCategories().isNotEmpty() } binding.btnCategories.visibleIf { isNowFavorite && presenter.getCategories().isNotEmpty() }
if (isNowFavorite) { if (isNowFavorite) {
btn_smart_search.visible() binding.btnSmartSearch.visible()
btn_migrate.visible() binding.btnMigrate.visible()
} else { } else {
btn_smart_search.gone() binding.btnSmartSearch.gone()
btn_migrate.gone() binding.btnMigrate.gone()
} }
} }
@ -404,7 +384,7 @@ class MangaAllInOneHolder(
fun setFavoriteButtonState(isFavorite: Boolean) { fun setFavoriteButtonState(isFavorite: Boolean) {
// Set the Favorite drawable to the correct one. // Set the Favorite drawable to the correct one.
// Border drawable if false, filled drawable if true. // Border drawable if false, filled drawable if true.
btn_favorite.apply { binding.btnFavorite.apply {
icon = ContextCompat.getDrawable(context, if (isFavorite) R.drawable.ic_favorite_24dp else R.drawable.ic_favorite_border_24dp) icon = ContextCompat.getDrawable(context, if (isFavorite) R.drawable.ic_favorite_24dp else R.drawable.ic_favorite_border_24dp)
text = context.getString(if (isFavorite) R.string.in_library else R.string.add_to_library) text = context.getString(if (isFavorite) R.string.in_library else R.string.add_to_library)
isChecked = isFavorite isChecked = isFavorite
@ -421,7 +401,7 @@ class MangaAllInOneHolder(
fun setTrackingIcon(tracked: Boolean) { fun setTrackingIcon(tracked: Boolean) {
if (tracked) { if (tracked) {
btn_tracking.setIconResource(R.drawable.ic_cloud_white_24dp) binding.btnTracking.setIconResource(R.drawable.ic_cloud_white_24dp)
} }
} }
} }