Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-20 03:39:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when using a reader mode from main tachi

Browse Source 
The else case will default to R2L reader when the index is out of range
This commit is contained in:
Jays2Kings 2021-07-09 22:10:33 -04:00
parent c438236bf7
commit 784bd22989
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -832,11 +832,11 @@ class ReaderActivity :
val noDefault = manga.viewer == -1 val noDefault = manga.viewer == -1
val mangaViewer = presenter.getMangaViewer() val mangaViewer = presenter.getMangaViewer()
val newViewer = when (mangaViewer) { val newViewer = when (mangaViewer) {
RIGHT_TO_LEFT -> R2LPagerViewer(this) LEFT_TO_RIGHT -> L2RPagerViewer(this)
VERTICAL -> VerticalPagerViewer(this) VERTICAL -> VerticalPagerViewer(this)
WEBTOON -> WebtoonViewer(this) WEBTOON -> WebtoonViewer(this)
VERTICAL_PLUS -> WebtoonViewer(this, hasMargins = true) VERTICAL_PLUS -> WebtoonViewer(this, hasMargins = true)
else -> L2RPagerViewer(this) else -> R2LPagerViewer(this)
} }
if (noDefault && presenter.manga?.viewer!! > 0) { if (noDefault && presenter.manga?.viewer!! > 0) {

16
app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt
View File

@ -102,14 +102,18 @@ class MaterialSpinnerView @JvmOverloads constructor(context: Context, attrs: Att
} }
fun setSelection(selection: Int) { fun setSelection(selection: Int) {
popup?.menu?.get(selectedPosition)?.let { if (selectedPosition >= 0 && selectedPosition < popup?.menu?.size() ?: 0) {
it.icon = ContextCompat.getDrawable(context, R.drawable.ic_blank_24dp) popup?.menu?.get(selectedPosition)?.let {
it.title = entries[selectedPosition] it.icon = ContextCompat.getDrawable(context, R.drawable.ic_blank_24dp)
it.title = entries[selectedPosition]
}
} }
selectedPosition = selection selectedPosition = selection
popup?.menu?.get(selectedPosition)?.let { if (selectedPosition >= 0 && selectedPosition < popup?.menu?.size() ?: 0) {
it.icon = tintedCheck() popup?.menu?.get(selectedPosition)?.let {
it.title = it.title?.tintText(blendedAccent) it.icon = tintedCheck()
it.title = it.title?.tintText(blendedAccent)
}
} }
binding.detailView.text = entries.getOrNull(selection).orEmpty() binding.detailView.text = entries.getOrNull(selection).orEmpty()
} }