ProfessionalUwU/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MangaSummaryView: Fix incomplete description on tablet ui (#6518)

Browse Source
This commit is contained in:
Ivan Iskandar 2022-01-30 22:47:53 +07:00 committed by GitHub
parent 7de707c60a
commit cf5e60f8eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
View File

@ -290,9 +290,9 @@ class MangaInfoHeaderAdapter(
binding.mangaCover.loadAnyAutoPause(manga) binding.mangaCover.loadAnyAutoPause(manga)
// Manga info section // Manga info section
binding.mangaSummarySection.isVisible = !manga.description.isNullOrBlank() || !manga.genre.isNullOrBlank()
binding.mangaSummarySection.description = manga.description
binding.mangaSummarySection.setTags(manga.getGenres(), controller::performGenreSearch) binding.mangaSummarySection.setTags(manga.getGenres(), controller::performGenreSearch)
binding.mangaSummarySection.description = manga.description
binding.mangaSummarySection.isVisible = !manga.description.isNullOrBlank() || !manga.genre.isNullOrBlank()
} }
/** /**

9
app/src/main/java/eu/kanade/tachiyomi/widget/MangaSummaryView.kt
View File

@ -59,7 +59,9 @@ class MangaSummaryView @JvmOverloads constructor(
doOnNextLayout { doOnNextLayout {
updateExpandState() updateExpandState()
} }
requestLayout() if (!isInLayout) {
requestLayout()
}
} }
} }
@ -141,7 +143,10 @@ class MangaSummaryView @JvmOverloads constructor(
} }
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
if (!recalculateHeights) { // Wait until parent view has determined the exact width
// because this affect the description line count
val measureWidthFreely = MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.EXACTLY
if (!recalculateHeights || measureWidthFreely) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec) super.onMeasure(widthMeasureSpec, heightMeasureSpec)
return return
} }