Use popup menus for reader shortcuts instead of toggling through

.github/workflows/issue_closer.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Autoclose issues
-        uses: arkon/issue-closer-action@v3.0
+        uses: arkon/issue-closer-action@v3.1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           rules: |

app/src/main/java/eu/kanade/tachiyomi/App.kt

@@ -52,6 +52,9 @@ open class App : Application(), LifecycleObserver {
         LocaleHelper.updateConfiguration(this, resources.configuration)
 
         ProcessLifecycleOwner.get().lifecycle.addObserver(this)
+
+        // Reset Incognito Mode on relaunch
+        preferences.incognitoMode().set(false)
     }
 
     override fun attachBaseContext(base: Context) {

app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt

@@ -81,15 +81,14 @@ class DownloadHolder(private val view: View, val adapter: DownloadAdapter) :
 
     private fun showPopupMenu(view: View) {
         view.popupMenu(
-            R.menu.download_single,
-            {
+            menuRes = R.menu.download_single,
+            initMenu = {
                 findItem(R.id.move_to_top).isVisible = bindingAdapterPosition != 0
                 findItem(R.id.move_to_bottom).isVisible =
                     bindingAdapterPosition != adapter.itemCount - 1
             },
-            {
+            onMenuItemClick = {
                 adapter.downloadItemListener.onMenuItemClick(bindingAdapterPosition, this)
-                true
             }
         )
     }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt

@@ -727,8 +727,7 @@ class MangaController :
 
     fun onChapterDownloadUpdate(download: Download) {
         chaptersAdapter?.currentItems?.find { it.id == download.chapter.id }?.let {
-            chaptersAdapter?.updateItem(it)
-            chaptersAdapter?.notifyDataSetChanged()
+            chaptersAdapter?.updateItem(it, it.status)
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterDownloadView.kt

@@ -6,65 +6,75 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.core.view.isVisible
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.databinding.ChapterDownloadViewBinding
+import eu.kanade.tachiyomi.util.view.setVectorCompat
 
 class ChapterDownloadView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
     FrameLayout(context, attrs) {
 
-    private val binding: ChapterDownloadViewBinding
+    private val binding: ChapterDownloadViewBinding =
+        ChapterDownloadViewBinding.inflate(LayoutInflater.from(context), this, false)
 
     private var state = Download.State.NOT_DOWNLOADED
     private var progress = 0
 
     private var downloadIconAnimator: ObjectAnimator? = null
-    private var isAnimating = false
 
     init {
-        binding = ChapterDownloadViewBinding.inflate(LayoutInflater.from(context), this, false)
         addView(binding.root)
     }
 
     fun setState(state: Download.State, progress: Int = 0) {
         val isDirty = this.state.value != state.value || this.progress != progress
-
-        this.state = state
-        this.progress = progress
-
         if (isDirty) {
-            updateLayout()
+            updateLayout(state, progress)
         }
     }
 
-    private fun updateLayout() {
-        binding.downloadIconBorder.isVisible = state == Download.State.NOT_DOWNLOADED
-
-        binding.downloadIcon.isVisible = state == Download.State.NOT_DOWNLOADED || state == Download.State.DOWNLOADING
-        if (state == Download.State.DOWNLOADING) {
-            if (!isAnimating) {
+    private fun updateLayout(state: Download.State, progress: Int) {
+        binding.downloadIcon.isVisible = state == Download.State.NOT_DOWNLOADED ||
+            state == Download.State.DOWNLOADING || state == Download.State.QUEUE
+        if (state == Download.State.DOWNLOADING || state == Download.State.QUEUE) {
+            if (downloadIconAnimator == null) {
                 downloadIconAnimator =
                     ObjectAnimator.ofFloat(binding.downloadIcon, "alpha", 1f, 0f).apply {
                         duration = 1000
                         repeatCount = ObjectAnimator.INFINITE
                         repeatMode = ObjectAnimator.REVERSE
                     }
                 downloadIconAnimator?.start()
-                isAnimating = true
             }
-        } else {
+            downloadIconAnimator?.currentPlayTime = System.currentTimeMillis() % 2000
+        } else if (downloadIconAnimator != null) {
             downloadIconAnimator?.cancel()
+            downloadIconAnimator = null
             binding.downloadIcon.alpha = 1f
-            isAnimating = false
         }
 
-        binding.downloadQueued.isVisible = state == Download.State.QUEUE
-
         binding.downloadProgress.isVisible = state == Download.State.DOWNLOADING ||
-            (state == Download.State.QUEUE && progress > 0)
-        binding.downloadProgress.progress = progress
+            state == Download.State.NOT_DOWNLOADED || state == Download.State.QUEUE
+        if (state == Download.State.DOWNLOADING) {
+            binding.downloadProgress.setProgressCompat(progress, true)
+        } else {
+            binding.downloadProgress.setProgressCompat(100, true)
+        }
 
-        binding.downloadedIcon.isVisible = state == Download.State.DOWNLOADED
+        binding.downloadStatusIcon.apply {
+            if (state == Download.State.DOWNLOADED || state == Download.State.ERROR) {
+                isVisible = true
+                if (state == Download.State.DOWNLOADED) {
+                    setVectorCompat(R.drawable.ic_check_circle_24dp, android.R.attr.textColorPrimary)
+                } else {
+                    setVectorCompat(R.drawable.ic_error_outline_24dp, R.attr.colorError)
+                }
+            } else {
+                isVisible = false
+            }
+        }
 
-        binding.errorIcon.isVisible = state == Download.State.ERROR
+        this.state = state
+        this.progress = progress
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt

@@ -51,16 +51,12 @@ class ChaptersSettingsSheet(
 
     private fun showPopupMenu(view: View) {
         view.popupMenu(
-            R.menu.default_chapter_filter,
-            {
-            },
-            {
-                when (this.itemId) {
+            menuRes = R.menu.default_chapter_filter,
+            onMenuItemClick = {
+                when (itemId) {
                     R.id.set_as_default -> {
                         SetChapterSettingsDialog(presenter.manga).showDialog(router)
-                        true
                     }
-                    else -> true
                 }
             }
         )

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterHolder.kt

@@ -29,7 +29,6 @@ open class BaseChapterHolder(
                     },
                     onMenuItemClick = {
                         adapter.clickListener.deleteChapter(position)
-                        true
                     }
                 )
             }

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

@@ -58,6 +58,7 @@ import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.util.view.defaultBar
 import eu.kanade.tachiyomi.util.view.hideBar
 import eu.kanade.tachiyomi.util.view.isDefaultBar
+import eu.kanade.tachiyomi.util.view.popupMenu
 import eu.kanade.tachiyomi.util.view.setTooltip
 import eu.kanade.tachiyomi.util.view.showBar
 import eu.kanade.tachiyomi.widget.SimpleAnimationListener
@@ -356,13 +357,18 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
             setTooltip(R.string.viewer)
 
             setOnClickListener {
-                val newReadingMode =
-                    ReadingModeType.getNextReadingMode(presenter.getMangaViewer(resolveDefault = false))
-                presenter.setMangaViewer(newReadingMode.prefValue)
+                popupMenu(
+                    items = ReadingModeType.values().map { it.prefValue to it.stringRes },
+                    selectedItemId = presenter.getMangaViewer(resolveDefault = false),
+                ) {
+                    val newReadingMode = ReadingModeType.fromPreference(itemId)
 
-                menuToggleToast?.cancel()
-                if (!preferences.showReadingMode()) {
-                    menuToggleToast = toast(newReadingMode.stringRes)
+                    presenter.setMangaViewer(newReadingMode.prefValue)
+
+                    menuToggleToast?.cancel()
+                    if (!preferences.showReadingMode()) {
+                        menuToggleToast = toast(newReadingMode.stringRes)
+                    }
                 }
             }
         }
@@ -372,13 +378,18 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
             setTooltip(R.string.pref_rotation_type)
 
             setOnClickListener {
-                val newOrientation = OrientationType.getNextOrientation(preferences.rotation().get())
+                popupMenu(
+                    items = OrientationType.values().map { it.prefValue to it.stringRes },
+                    selectedItemId = preferences.rotation().get(),
+                ) {
+                    val newOrientation = OrientationType.fromPreference(itemId)
 
-                preferences.rotation().set(newOrientation.prefValue)
-                setOrientation(newOrientation.flag)
+                    preferences.rotation().set(newOrientation.prefValue)
+                    setOrientation(newOrientation.flag)
 
-                menuToggleToast?.cancel()
-                menuToggleToast = toast(newOrientation.stringRes)
+                    menuToggleToast?.cancel()
+                    menuToggleToast = toast(newOrientation.stringRes)
+                }
             }
         }
         preferences.rotation().asImmediateFlow { updateRotationShortcut(it) }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt

@@ -4,7 +4,6 @@ import android.content.pm.ActivityInfo
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.lang.next
 
 enum class OrientationType(val prefValue: Int, val flag: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
     FREE(1, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, R.string.rotation_free, R.drawable.ic_screen_rotation_24dp),
@@ -17,10 +16,5 @@ enum class OrientationType(val prefValue: Int, val flag: Int, @StringRes val str
     companion object {
         fun fromPreference(preference: Int): OrientationType =
             values().find { it.prefValue == preference } ?: FREE
-
-        fun getNextOrientation(preference: Int): OrientationType {
-            val current = fromPreference(preference)
-            return current.next()
-        }
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt

@@ -22,7 +22,7 @@ class ReaderSettingsSheet(
     init {
         val sheetBehavior = BottomSheetBehavior.from(binding.root.parent as ViewGroup)
         sheetBehavior.isFitToContents = false
-        sheetBehavior.halfExpandedRatio = 0.5f
+        sheetBehavior.halfExpandedRatio = 0.25f
 
         val filterTabIndex = getTabViews().indexOf(colorFilterSettings)
         binding.tabs.addOnTabSelectedListener(object : SimpleTabSelectedListener() {
@@ -36,11 +36,6 @@ class ReaderSettingsSheet(
                 if (activity.menuVisible != !isFilterTab) {
                     activity.setMenuVisibility(!isFilterTab)
                 }
-
-                // Partially collapse the sheet for better preview
-                if (isFilterTab) {
-                    sheetBehavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
-                }
             }
         })
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReadingModeType.kt

@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.reader.setting
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.lang.next
 
 enum class ReadingModeType(val prefValue: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
     DEFAULT(0, R.string.default_viewer, R.drawable.ic_reader_default_24dp),
@@ -17,11 +16,6 @@ enum class ReadingModeType(val prefValue: Int, @StringRes val stringRes: Int, @D
     companion object {
         fun fromPreference(preference: Int): ReadingModeType = values().find { it.prefValue == preference } ?: DEFAULT
 
-        fun getNextReadingMode(preference: Int): ReadingModeType {
-            val current = fromPreference(preference)
-            return current.next()
-        }
-
         fun isPagerType(preference: Int): Boolean {
             val mode = fromPreference(preference)
             return mode == LEFT_TO_RIGHT || mode == RIGHT_TO_LEFT || mode == VERTICAL

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt

@@ -235,16 +235,13 @@ class PagerPageHolder(
         readImageHeaderSubscription = Observable
             .fromCallable {
                 val stream = streamFn().buffered(16)
-                openStream = stream
+                openStream = process(stream)
 
                 ImageUtil.findImageType(stream) == ImageUtil.ImageType.GIF
             }
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .doOnNext { isAnimated ->
-                if (viewer.config.dualPageSplit) {
-                    openStream = processDualPageSplit(openStream!!)
-                }
                 if (!isAnimated) {
                     initSubsamplingImageView().setImage(ImageSource.inputStream(openStream!!))
                 } else {
@@ -257,21 +254,31 @@ class PagerPageHolder(
             .subscribe({}, {})
     }
 
-    private fun processDualPageSplit(openStream: InputStream): InputStream {
-        var inputStream = openStream
-        val (isDoublePage, stream) = when (page) {
-            is InsertPage -> Pair(true, inputStream)
-            else -> ImageUtil.isDoublePage(inputStream)
+    private fun process(imageStream: InputStream): InputStream {
+        if (!viewer.config.dualPageSplit) {
+            return imageStream
+        }
+
+        if (page is InsertPage) {
+            return splitInHalf(imageStream)
+        }
+
+        val isDoublePage = ImageUtil.isDoublePage(imageStream)
+        if (!isDoublePage) {
+            return imageStream
         }
-        inputStream = stream
 
-        if (!isDoublePage) return inputStream
+        onPageSplit()
 
+        return splitInHalf(imageStream)
+    }
+
+    private fun splitInHalf(imageStream: InputStream): InputStream {
         var side = when {
             viewer is L2RPagerViewer && page is InsertPage -> ImageUtil.Side.RIGHT
-            (viewer is R2LPagerViewer || viewer is VerticalPagerViewer) && page is InsertPage -> ImageUtil.Side.LEFT
+            viewer !is L2RPagerViewer && page is InsertPage -> ImageUtil.Side.LEFT
             viewer is L2RPagerViewer && page !is InsertPage -> ImageUtil.Side.LEFT
-            (viewer is R2LPagerViewer || viewer is VerticalPagerViewer) && page !is InsertPage -> ImageUtil.Side.RIGHT
+            viewer !is L2RPagerViewer && page !is InsertPage -> ImageUtil.Side.RIGHT
             else -> error("We should choose a side!")
         }
 
@@ -282,11 +289,7 @@ class PagerPageHolder(
             }
         }
 
-        if (page !is InsertPage) {
-            onPageSplit()
-        }
-
-        return ImageUtil.splitInHalf(inputStream, side)
+        return ImageUtil.splitInHalf(imageStream, side)
     }
 
     private fun onPageSplit() {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt

@@ -385,7 +385,10 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
     }
 
     fun onPageSplit(currentPage: ReaderPage, newPage: InsertPage) {
-        adapter.onPageSplit(currentPage, newPage, this::class.java)
+        activity.runOnUiThread {
+            // Need to insert on UI thread else images will go blank
+            adapter.onPageSplit(currentPage, newPage, this::class.java)
+        }
     }
 
     private fun cleanupPageSplit() {