From edb91c46d4ea86a2c80d0c2f1e4832588247d3e4 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Wed, 9 Aug 2023 14:50:52 +0300
Subject: [PATCH] Option to disable pages animation #406

---
 app/src/main/AndroidManifest.xml                  |  3 ---
 .../koitharu/kotatsu/core/prefs/AppSettings.kt    |  6 +++---
 .../kotatsu/core/prefs/ReaderAnimation.kt         |  7 +++++++
 .../org/koitharu/kotatsu/core/prefs/ReaderMode.kt |  4 ++--
 .../koitharu/kotatsu/reader/ui/ReaderViewModel.kt |  2 +-
 .../kotatsu/reader/ui/pager/BaseReaderFragment.kt |  6 ++++++
 .../ui/pager/reversed/ReversedReaderFragment.kt   | 15 ++++++++++-----
 .../ui/pager/standard/NoAnimPageTransformer.kt    | 15 +++++++++++++++
 .../ui/pager/standard/PagerReaderFragment.kt      | 14 +++++++++-----
 .../ui/pager/webtoon/WebtoonReaderFragment.kt     |  3 +--
 .../kotatsu/settings/ReaderSettingsFragment.kt    |  5 +++++
 app/src/main/res/values/arrays.xml                |  6 ++++++
 app/src/main/res/xml/pref_reader.xml              |  6 ++++++
 13 files changed, 71 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderAnimation.kt
 create mode 100644 app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/NoAnimPageTransformer.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b8261310b..fb16c29d8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -166,9 +166,6 @@
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity"
 			android:label="@string/color_correction" />
-		<activity
-			android:name="org.koitharu.kotatsu.shelf.ui.config.ShelfSettingsActivity"
-			android:label="@string/settings" />
 		<activity
 			android:name="org.koitharu.kotatsu.scrobbling.common.ui.config.ScrobblerConfigActivity"
 			android:exported="true"
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index 7e9b197e6..ff00392d1 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -101,8 +101,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val notificationLight: Boolean
 		get() = prefs.getBoolean(KEY_NOTIFICATIONS_LIGHT, true)
 
-	val readerAnimation: Boolean
-		get() = prefs.getBoolean(KEY_READER_ANIMATION, false)
+	val readerAnimation: ReaderAnimation
+		get() = prefs.getEnumValue(KEY_READER_ANIMATION, ReaderAnimation.DEFAULT)
 
 	val readerBackground: ReaderBackground
 		get() = prefs.getEnumValue(KEY_READER_BACKGROUND, ReaderBackground.DEFAULT)
@@ -384,7 +384,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_NOTIFICATIONS_VIBRATE = "notifications_vibrate"
 		const val KEY_NOTIFICATIONS_LIGHT = "notifications_light"
 		const val KEY_NOTIFICATIONS_INFO = "tracker_notifications_info"
-		const val KEY_READER_ANIMATION = "reader_animation"
+		const val KEY_READER_ANIMATION = "reader_animation2"
 		const val KEY_READER_MODE = "reader_mode"
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
 		const val KEY_APP_PASSWORD = "app_password"
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderAnimation.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderAnimation.kt
new file mode 100644
index 000000000..e95559322
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderAnimation.kt
@@ -0,0 +1,7 @@
+package org.koitharu.kotatsu.core.prefs
+
+enum class ReaderAnimation {
+
+	// Do not rename this
+	NONE, DEFAULT, ADVANCED;
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderMode.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderMode.kt
index 9ec51d479..9d7907c14 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderMode.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderMode.kt
@@ -8,6 +8,6 @@ enum class ReaderMode(val id: Int) {
 
 	companion object {
 
-		fun valueOf(id: Int) = values().firstOrNull { it.id == id }
+		fun valueOf(id: Int) = entries.firstOrNull { it.id == id }
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
index 0bae31cc5..fc6f6c6ab 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
@@ -101,7 +101,7 @@ class ReaderViewModel @Inject constructor(
 	val manga: DoubleManga?
 		get() = mangaData.value
 
-	val readerAnimation = settings.observeAsStateFlow(
+	val pageAnimation = settings.observeAsStateFlow(
 		scope = viewModelScope + Dispatchers.Default,
 		key = AppSettings.KEY_READER_ANIMATION,
 		valueProducer = { readerAnimation },
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt
index 293928fb5..d8b6688be 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt
@@ -4,8 +4,10 @@ import android.os.Bundle
 import androidx.core.graphics.Insets
 import androidx.fragment.app.activityViewModels
 import androidx.viewbinding.ViewBinding
+import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.util.ext.getParcelableCompat
+import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.ReaderViewModel
@@ -54,6 +56,10 @@ abstract class BaseReaderFragment<B : ViewBinding> : BaseFragment<B>() {
 		"Adapter was not created or already destroyed"
 	}
 
+	protected fun isAnimationEnabled(): Boolean {
+		return context?.isAnimationsEnabled == true && viewModel.pageAnimation.value != ReaderAnimation.NONE
+	}
+
 	override fun onWindowInsetsChanged(insets: Insets) = Unit
 
 	abstract fun switchPageBy(delta: Int)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt
index beed525cd..73a7f1107 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt
@@ -11,8 +11,8 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.yield
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
+import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.util.ext.doOnPageChanged
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.recyclerView
 import org.koitharu.kotatsu.core.util.ext.resetTransformations
@@ -22,6 +22,7 @@ import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
 import org.koitharu.kotatsu.reader.ui.pager.BaseReaderFragment
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
+import org.koitharu.kotatsu.reader.ui.pager.standard.NoAnimPageTransformer
 import org.koitharu.kotatsu.reader.ui.pager.standard.PagerReaderFragment
 import javax.inject.Inject
 import kotlin.math.absoluteValue
@@ -48,8 +49,12 @@ class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>
 			doOnPageChanged(::notifyPageChanged)
 		}
 
-		viewModel.readerAnimation.observe(viewLifecycleOwner) {
-			val transformer = if (it) ReversedPageAnimTransformer() else null
+		viewModel.pageAnimation.observe(viewLifecycleOwner) {
+			val transformer = when (it) {
+				ReaderAnimation.NONE -> NoAnimPageTransformer()
+				ReaderAnimation.DEFAULT -> null
+				ReaderAnimation.ADVANCED -> ReversedPageAnimTransformer()
+			}
 			binding.pager.setPageTransformer(transformer)
 			if (transformer == null) {
 				binding.pager.recyclerView?.children?.forEach { v ->
@@ -74,7 +79,7 @@ class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>
 
 	override fun switchPageBy(delta: Int) {
 		with(requireViewBinding().pager) {
-			setCurrentItem(currentItem - delta, context.isAnimationsEnabled)
+			setCurrentItem(currentItem - delta, isAnimationEnabled())
 		}
 	}
 
@@ -82,7 +87,7 @@ class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>
 		with(requireViewBinding().pager) {
 			setCurrentItem(
 				reversed(position),
-				smooth && context.isAnimationsEnabled && (currentItem - position).absoluteValue < PagerReaderFragment.SMOOTH_SCROLL_LIMIT,
+				smooth && isAnimationEnabled() && (currentItem - position).absoluteValue < PagerReaderFragment.SMOOTH_SCROLL_LIMIT,
 			)
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/NoAnimPageTransformer.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/NoAnimPageTransformer.kt
new file mode 100644
index 000000000..2ce4317a1
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/NoAnimPageTransformer.kt
@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.reader.ui.pager.standard
+
+import android.view.View
+import androidx.viewpager2.widget.ViewPager2
+
+class NoAnimPageTransformer : ViewPager2.PageTransformer {
+
+	override fun transformPage(page: View, position: Float) {
+		page.translationX = when {
+			position in -0.5f..0.5f -> -position * page.width.toFloat()
+			position > 0 -> page.width.toFloat()
+			else -> -page.width.toFloat()
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt
index a9c656113..5d5c7f6a5 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt
@@ -11,8 +11,8 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.yield
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
+import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.util.ext.doOnPageChanged
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.recyclerView
 import org.koitharu.kotatsu.core.util.ext.resetTransformations
@@ -47,8 +47,12 @@ class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>()
 			doOnPageChanged(::notifyPageChanged)
 		}
 
-		viewModel.readerAnimation.observe(viewLifecycleOwner) {
-			val transformer = if (it) PageAnimTransformer() else null
+		viewModel.pageAnimation.observe(viewLifecycleOwner) {
+			val transformer = when (it) {
+				ReaderAnimation.NONE -> NoAnimPageTransformer()
+				ReaderAnimation.DEFAULT -> null
+				ReaderAnimation.ADVANCED -> PageAnimTransformer()
+			}
 			binding.pager.setPageTransformer(transformer)
 			if (transformer == null) {
 				binding.pager.recyclerView?.children?.forEach { view ->
@@ -95,7 +99,7 @@ class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>()
 
 	override fun switchPageBy(delta: Int) {
 		with(requireViewBinding().pager) {
-			setCurrentItem(currentItem + delta, context.isAnimationsEnabled)
+			setCurrentItem(currentItem + delta, isAnimationEnabled())
 		}
 	}
 
@@ -103,7 +107,7 @@ class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>()
 		with(requireViewBinding().pager) {
 			setCurrentItem(
 				position,
-				smooth && context.isAnimationsEnabled && (currentItem - position).absoluteValue < SMOOTH_SCROLL_LIMIT,
+				smooth && isAnimationEnabled() && (currentItem - position).absoluteValue < SMOOTH_SCROLL_LIMIT,
 			)
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
index 78836411a..789f3cc02 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
@@ -13,7 +13,6 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.util.ext.findCenterViewPosition
 import org.koitharu.kotatsu.core.util.ext.firstVisibleItemPosition
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.databinding.FragmentReaderWebtoonBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
@@ -111,7 +110,7 @@ class WebtoonReaderFragment : BaseReaderFragment<FragmentReaderWebtoonBinding>()
 
 	override fun switchPageBy(delta: Int) {
 		with(requireViewBinding().recyclerView) {
-			if (context.isAnimationsEnabled) {
+			if (isAnimationEnabled()) {
 				smoothScrollBy(0, (height * 0.9).toInt() * delta, scrollInterpolator)
 			} else {
 				nestedScrollBy(0, (height * 0.9).toInt() * delta)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/ReaderSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/ReaderSettingsFragment.kt
index fe59043eb..a605cb80f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/ReaderSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/ReaderSettingsFragment.kt
@@ -10,6 +10,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.prefs.ReaderBackground
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
@@ -32,6 +33,10 @@ class ReaderSettingsFragment :
 			entryValues = ReaderBackground.entries.names()
 			setDefaultValueCompat(ReaderBackground.DEFAULT.name)
 		}
+		findPreference<ListPreference>(AppSettings.KEY_READER_ANIMATION)?.run {
+			entryValues = ReaderAnimation.entries.names()
+			setDefaultValueCompat(ReaderAnimation.DEFAULT.name)
+		}
 		findPreference<MultiSelectListPreference>(AppSettings.KEY_READER_SWITCHERS)?.run {
 			summaryProvider = MultiSummaryProvider(R.string.gestures_only)
 		}
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 0b8af4d99..9969d64b1 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -65,4 +65,10 @@
 		<item>@string/color_white</item>
 		<item>@string/color_black</item>
 	</string-array>
+	<string-array name="reader_animation">
+		<item>@string/disabled</item>
+		<item>@string/system_default</item>
+		<item>@string/advanced</item>
+	</string-array>
+	<string name="advanced">Advanced</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_reader.xml b/app/src/main/res/xml/pref_reader.xml
index 9cb6dc6c4..e8cddffa9 100644
--- a/app/src/main/res/xml/pref_reader.xml
+++ b/app/src/main/res/xml/pref_reader.xml
@@ -42,6 +42,12 @@
 		android:summary="@string/reader_control_ltr_summary"
 		android:title="@string/reader_control_ltr" />
 
+	<ListPreference
+		android:entries="@array/reader_animation"
+		android:key="reader_animation2"
+		android:title="@string/pages_animation"
+		app:useSimpleSummaryProvider="true" />
+
 	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:key="reader_animation"