Move pull gesture option to reader settings

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderConfigSheet.kt

@@ -10,6 +10,7 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.fragment.app.activityViewModels
+import androidx.transition.TransitionManager
 import com.google.android.material.button.MaterialButtonToggleGroup
 import com.google.android.material.slider.Slider
 import dagger.hilt.android.AndroidEntryPoint
@@ -90,13 +91,9 @@ class ReaderConfigSheet :
 		binding.buttonVertical.isChecked = mode == ReaderMode.VERTICAL
 		binding.switchDoubleReader.isChecked = settings.isReaderDoubleOnLandscape
 		binding.switchDoubleReader.isEnabled = mode == ReaderMode.STANDARD || mode == ReaderMode.REVERSED
-		binding.switchPullGesture.isChecked = settings.isWebtoonPullGestureEnabled
+		binding.sliderDoubleSensitivity.setValueRounded(settings.readerDoublePagesSensitivity * 100f)
-		binding.switchPullGesture.isEnabled = mode == ReaderMode.WEBTOON
+		binding.sliderDoubleSensitivity.setLabelFormatter(IntPercentLabelFormatter(binding.root.context))
-
+        binding.adjustSensitivitySlider(withAnimation = false)
-		binding.textSensitivity.isVisible = settings.isReaderDoubleOnLandscape
-		binding.seekbarSensitivity.isVisible = settings.isReaderDoubleOnLandscape
-		binding.seekbarSensitivity.setValueRounded(settings.readerDoublePagesSensitivity * 100f)
-		binding.seekbarSensitivity.setLabelFormatter(IntPercentLabelFormatter(binding.root.context))
 
 		binding.checkableGroup.addOnButtonCheckedListener(this)
 		binding.buttonSavePage.setOnClickListener(this)
@@ -107,8 +104,7 @@ class ReaderConfigSheet :
 		binding.buttonScrollTimer.setOnClickListener(this)
 		binding.buttonBookmark.setOnClickListener(this)
 		binding.switchDoubleReader.setOnCheckedChangeListener(this)
-		binding.switchPullGesture.setOnCheckedChangeListener(this)
+		binding.sliderDoubleSensitivity.addOnChangeListener(this)
-		binding.seekbarSensitivity.addOnChangeListener(this)
 
 		viewModel.isBookmarkAdded.observe(viewLifecycleOwner) {
 			binding.buttonBookmark.setText(if (it) R.string.bookmark_remove else R.string.bookmark_add)
@@ -183,14 +179,9 @@ class ReaderConfigSheet :
 
 			R.id.switch_double_reader -> {
 				settings.isReaderDoubleOnLandscape = isChecked
-				viewBinding?.textSensitivity?.isVisible = isChecked
+				viewBinding?.adjustSensitivitySlider(withAnimation = true)
-				viewBinding?.seekbarSensitivity?.isVisible = isChecked
 				findParentCallback(Callback::class.java)?.onDoubleModeChanged(isChecked)
 			}
-
-			R.id.switch_pull_gesture -> {
-				settings.isWebtoonPullGestureEnabled = isChecked
-			}
 		}
 	}
 
@@ -213,8 +204,10 @@ class ReaderConfigSheet :
 			R.id.button_vertical -> ReaderMode.VERTICAL
 			else -> return
 		}
-		viewBinding?.switchDoubleReader?.isEnabled = newMode == ReaderMode.STANDARD || newMode == ReaderMode.REVERSED
+		viewBinding?.run {
-		viewBinding?.switchPullGesture?.isEnabled = newMode == ReaderMode.WEBTOON
+            switchDoubleReader.isEnabled = newMode == ReaderMode.STANDARD || newMode == ReaderMode.REVERSED
+            adjustSensitivitySlider(withAnimation = true)
+        }
 		if (newMode == mode) {
 			return
 		}
@@ -248,6 +241,15 @@ class ReaderConfigSheet :
 		)
 	}
 
+    private fun SheetReaderConfigBinding.adjustSensitivitySlider(withAnimation: Boolean) {
+        val isSliderVisible = switchDoubleReader.isEnabled && switchDoubleReader.isChecked
+        if (isSliderVisible != sliderDoubleSensitivity.isVisible && withAnimation) {
+            TransitionManager.beginDelayedTransition(layoutMain)
+        }
+        sliderDoubleSensitivity.isVisible = isSliderVisible
+        textDoubleSensitivity.isVisible = isSliderVisible
+    }
+
 	interface Callback {
 
 		fun onReaderModeChanged(mode: ReaderMode)

app/src/main/res/layout/sheet_reader_config.xml

@@ -21,6 +21,7 @@
         android:scrollIndicators="top">
 
         <LinearLayout
+            android:id="@+id/layout_main"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -130,7 +131,7 @@
                 app:drawableStartCompat="@drawable/ic_split_horizontal" />
 
             <TextView
-				android:id="@+id/text_sensitivity"
+                android:id="@+id/text_double_sensitivity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/margin_normal"
@@ -139,7 +140,7 @@
                 android:textAppearance="@style/TextAppearance.Kotatsu.GridTitle" />
 
             <com.google.android.material.slider.Slider
-				android:id="@+id/seekbar_sensitivity"
+                android:id="@+id/slider_double_sensitivity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/margin_small"
@@ -149,20 +150,6 @@
                 app:labelBehavior="floating"
                 tools:value="50" />
 
-			<com.google.android.material.materialswitch.MaterialSwitch
-				android:id="@+id/switch_pull_gesture"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/margin_small"
-				android:drawablePadding="?android:listPreferredItemPaddingStart"
-				android:minHeight="?android:listPreferredItemHeightSmall"
-				android:paddingStart="?android:listPreferredItemPaddingStart"
-				android:paddingEnd="?android:listPreferredItemPaddingEnd"
-				android:text="@string/enable_pull_gesture_title"
-				android:textAppearance="?textAppearanceListItem"
-				android:textColor="?colorOnSurfaceVariant"
-				app:drawableStartCompat="@drawable/ic_gesture_vertical" />
-
             <org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
                 android:id="@+id/button_screen_rotate"
                 android:layout_width="match_parent"

app/src/main/res/xml/pref_reader.xml

@@ -87,6 +87,12 @@
 		android:title="@string/pages_animation"
 		app:useSimpleSummaryProvider="true" />
 
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="webtoon_pull_gesture"
+        android:summary="@string/enable_pull_gesture_summary"
+        android:title="@string/enable_pull_gesture_title" />
+
 	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:key="enhanced_colors"