|
@@ -16,7 +16,6 @@ import android.graphics.Paint
|
|
|
import android.graphics.PorterDuff
|
|
|
import android.os.Build
|
|
|
import android.os.Bundle
|
|
|
-import android.view.Gravity
|
|
|
import android.view.KeyEvent
|
|
|
import android.view.Menu
|
|
|
import android.view.MenuItem
|
|
@@ -25,7 +24,6 @@ import android.view.View.LAYER_TYPE_HARDWARE
|
|
|
import android.view.WindowManager
|
|
|
import android.view.animation.Animation
|
|
|
import android.view.animation.AnimationUtils
|
|
|
-import android.widget.FrameLayout
|
|
|
import android.widget.SeekBar
|
|
|
import android.widget.Toast
|
|
|
import androidx.core.graphics.ColorUtils
|
|
@@ -34,7 +32,6 @@ import androidx.core.view.WindowInsetsCompat
|
|
|
import androidx.core.view.WindowInsetsControllerCompat
|
|
|
import androidx.core.view.isInvisible
|
|
|
import androidx.core.view.isVisible
|
|
|
-import androidx.core.view.updateLayoutParams
|
|
|
import androidx.lifecycle.lifecycleScope
|
|
|
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
|
|
|
import com.google.android.material.shape.MaterialShapeDrawable
|
|
@@ -62,11 +59,9 @@ import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
|
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsSheet
|
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
|
|
|
import eu.kanade.tachiyomi.ui.reader.viewer.BaseViewer
|
|
|
-import eu.kanade.tachiyomi.ui.reader.viewer.ReaderProgressIndicator
|
|
|
import eu.kanade.tachiyomi.ui.reader.viewer.pager.R2LPagerViewer
|
|
|
import eu.kanade.tachiyomi.util.storage.getUriCompat
|
|
|
import eu.kanade.tachiyomi.util.system.GLUtil
|
|
|
-import eu.kanade.tachiyomi.util.system.createReaderThemeContext
|
|
|
import eu.kanade.tachiyomi.util.system.hasDisplayCutout
|
|
|
import eu.kanade.tachiyomi.util.system.isNightMode
|
|
|
import eu.kanade.tachiyomi.util.system.toast
|
|
@@ -142,8 +137,6 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
|
|
|
|
|
|
private val windowInsetsController by lazy { WindowInsetsControllerCompat(window, binding.root) }
|
|
|
|
|
|
- private var loadingIndicator: ReaderProgressIndicator? = null
|
|
|
-
|
|
|
var isScrollingThroughPages = false
|
|
|
private set
|
|
|
|
|
@@ -607,13 +600,8 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
|
|
|
binding.rightChapter.setTooltip(R.string.action_next_chapter)
|
|
|
}
|
|
|
|
|
|
- val loadingIndicatorContext = createReaderThemeContext(preferences.readerTheme().get())
|
|
|
- loadingIndicator = ReaderProgressIndicator(loadingIndicatorContext).apply {
|
|
|
- updateLayoutParams<FrameLayout.LayoutParams> {
|
|
|
- gravity = Gravity.CENTER
|
|
|
- }
|
|
|
- }
|
|
|
- binding.readerContainer.addView(loadingIndicator)
|
|
|
+ binding.pleaseWait.isVisible = true
|
|
|
+ binding.pleaseWait.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in_long))
|
|
|
}
|
|
|
|
|
|
private fun showReadingModeToast(mode: Int) {
|
|
@@ -632,7 +620,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
|
|
|
* hides or disables the reader prev/next buttons if there's a prev or next chapter
|
|
|
*/
|
|
|
fun setChapters(viewerChapters: ViewerChapters) {
|
|
|
- binding.readerContainer.removeView(loadingIndicator)
|
|
|
+ binding.pleaseWait.isVisible = false
|
|
|
viewer?.setChapters(viewerChapters)
|
|
|
binding.toolbar.subtitle = viewerChapters.currChapter.chapter.name
|
|
|
|