KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Move pull gesture option to reader settings

Browse Source
devel
Koitharu 6 months ago
parent b62467964e
commit dbada34a43
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7
3 changed files with 225 additions and 230 deletions
Show Stats Download Patch File Download Diff File

36
app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderConfigSheet.kt
Unescape Escape View File

@ -10,6 +10,7 @@ import androidx.core.view.isGone
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import androidx.transition.TransitionManager
import com.google.android.material.button.MaterialButtonToggleGroup import com.google.android.material.button.MaterialButtonToggleGroup
import com.google.android.material.slider.Slider import com.google.android.material.slider.Slider
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
@ -90,13 +91,9 @@ class ReaderConfigSheet :
binding.buttonVertical.isChecked = mode == ReaderMode.VERTICAL binding.buttonVertical.isChecked = mode == ReaderMode.VERTICAL
binding.switchDoubleReader.isChecked = settings.isReaderDoubleOnLandscape binding.switchDoubleReader.isChecked = settings.isReaderDoubleOnLandscape
binding.switchDoubleReader.isEnabled = mode == ReaderMode.STANDARD || mode == ReaderMode.REVERSED 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.checkableGroup.addOnButtonCheckedListener(this)
binding.buttonSavePage.setOnClickListener(this) binding.buttonSavePage.setOnClickListener(this)
@ -107,8 +104,7 @@ class ReaderConfigSheet :
binding.buttonScrollTimer.setOnClickListener(this) binding.buttonScrollTimer.setOnClickListener(this)
binding.buttonBookmark.setOnClickListener(this) binding.buttonBookmark.setOnClickListener(this)
binding.switchDoubleReader.setOnCheckedChangeListener(this) binding.switchDoubleReader.setOnCheckedChangeListener(this)
binding.switchPullGesture.setOnCheckedChangeListener(this) binding.sliderDoubleSensitivity.addOnChangeListener(this)
binding.seekbarSensitivity.addOnChangeListener(this)
viewModel.isBookmarkAdded.observe(viewLifecycleOwner) { viewModel.isBookmarkAdded.observe(viewLifecycleOwner) {
binding.buttonBookmark.setText(if (it) R.string.bookmark_remove else R.string.bookmark_add) 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 -> { R.id.switch_double_reader -> {
settings.isReaderDoubleOnLandscape = isChecked settings.isReaderDoubleOnLandscape = isChecked
viewBinding?.textSensitivity?.isVisible = isChecked viewBinding?.adjustSensitivitySlider(withAnimation = true)
viewBinding?.seekbarSensitivity?.isVisible = isChecked
findParentCallback(Callback::class.java)?.onDoubleModeChanged(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 R.id.button_vertical -> ReaderMode.VERTICAL
else -> return 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) { if (newMode == mode) {
return 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 { interface Callback {
fun onReaderModeChanged(mode: ReaderMode) fun onReaderModeChanged(mode: ReaderMode)

413
app/src/main/res/layout/sheet_reader_config.xml
Unescape Escape View File

@ -1,216 +1,203 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetHeaderBar <org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetHeaderBar
android:id="@+id/headerBar" android:id="@+id/headerBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:title="@string/options" /> app:title="@string/options" />
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:id="@+id/scrollView" android:id="@+id/scrollView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipToPadding="false" android:clipToPadding="false"
android:scrollIndicators="top"> android:scrollIndicators="top">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:id="@+id/layout_main"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:paddingBottom="@dimen/margin_normal"> android:orientation="vertical"
android:paddingBottom="@dimen/margin_normal">
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:id="@+id/button_save_page" <org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:layout_width="match_parent" android:id="@+id/button_save_page"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:text="@string/save_page" android:layout_height="wrap_content"
app:drawableStartCompat="@drawable/ic_save" /> android:text="@string/save_page"
app:drawableStartCompat="@drawable/ic_save" />
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:id="@+id/button_bookmark" <org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:layout_width="match_parent" android:id="@+id/button_bookmark"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:text="@string/bookmark_add" android:layout_height="wrap_content"
app:drawableStartCompat="@drawable/ic_bookmark" /> android:text="@string/bookmark_add"
app:drawableStartCompat="@drawable/ic_bookmark" />
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:id="@+id/button_image_server" <org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:layout_width="match_parent" android:id="@+id/button_image_server"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:drawableEnd="@drawable/ic_expand_more_22px" android:layout_height="wrap_content"
android:text="@string/image_server" android:drawableEnd="@drawable/ic_expand_more_22px"
android:visibility="gone" android:text="@string/image_server"
app:drawableStartCompat="@drawable/ic_images" android:visibility="gone"
tools:visibility="visible" /> app:drawableStartCompat="@drawable/ic_images"
tools:visibility="visible" />
<TextView
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginHorizontal="@dimen/margin_normal" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_normal" android:layout_marginHorizontal="@dimen/margin_normal"
android:text="@string/read_mode" android:layout_marginTop="@dimen/margin_normal"
android:textAppearance="?textAppearanceTitleSmall" /> android:text="@string/read_mode"
android:textAppearance="?textAppearanceTitleSmall" />
<com.google.android.material.button.MaterialButtonToggleGroup
android:id="@+id/checkableGroup" <com.google.android.material.button.MaterialButtonToggleGroup
android:layout_width="match_parent" android:id="@+id/checkableGroup"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginHorizontal="@dimen/margin_normal" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_small" android:layout_marginHorizontal="@dimen/margin_normal"
android:baselineAligned="false" android:layout_marginTop="@dimen/margin_small"
android:orientation="horizontal" android:baselineAligned="false"
app:selectionRequired="true" android:orientation="horizontal"
app:singleSelection="true"> app:selectionRequired="true"
app:singleSelection="true">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_standard" <com.google.android.material.button.MaterialButton
style="@style/Widget.Kotatsu.ToggleButton.Vertical" android:id="@+id/button_standard"
android:layout_width="0dp" style="@style/Widget.Kotatsu.ToggleButton.Vertical"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_weight="1" android:layout_height="wrap_content"
android:text="@string/standard" android:layout_weight="1"
app:icon="@drawable/ic_reader_ltr" /> android:text="@string/standard"
app:icon="@drawable/ic_reader_ltr" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_reversed" <com.google.android.material.button.MaterialButton
style="@style/Widget.Kotatsu.ToggleButton.Vertical" android:id="@+id/button_reversed"
android:layout_width="0dp" style="@style/Widget.Kotatsu.ToggleButton.Vertical"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_weight="1" android:layout_height="wrap_content"
android:text="@string/right_to_left" android:layout_weight="1"
app:icon="@drawable/ic_reader_rtl" /> android:text="@string/right_to_left"
app:icon="@drawable/ic_reader_rtl" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_vertical" <com.google.android.material.button.MaterialButton
style="@style/Widget.Kotatsu.ToggleButton.Vertical" android:id="@+id/button_vertical"
android:layout_width="0dp" style="@style/Widget.Kotatsu.ToggleButton.Vertical"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_weight="1" android:layout_height="wrap_content"
android:text="@string/vertical" android:layout_weight="1"
app:icon="@drawable/ic_reader_vertical" /> android:text="@string/vertical"
app:icon="@drawable/ic_reader_vertical" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_webtoon" <com.google.android.material.button.MaterialButton
style="@style/Widget.Kotatsu.ToggleButton.Vertical" android:id="@+id/button_webtoon"
android:layout_width="0dp" style="@style/Widget.Kotatsu.ToggleButton.Vertical"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_weight="1" android:layout_height="wrap_content"
android:text="@string/webtoon" android:layout_weight="1"
app:icon="@drawable/ic_script" /> android:text="@string/webtoon"
app:icon="@drawable/ic_script" />
</com.google.android.material.button.MaterialButtonToggleGroup>
</com.google.android.material.button.MaterialButtonToggleGroup>
<TextView
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginHorizontal="@dimen/margin_normal" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_small" android:layout_marginHorizontal="@dimen/margin_normal"
android:text="@string/reader_mode_hint" android:layout_marginTop="@dimen/margin_small"
android:textAppearance="?attr/textAppearanceBodySmall" /> android:text="@string/reader_mode_hint"
android:textAppearance="?attr/textAppearanceBodySmall" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switch_double_reader" <com.google.android.material.materialswitch.MaterialSwitch
android:layout_width="match_parent" android:id="@+id/switch_double_reader"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginTop="@dimen/margin_normal" android:layout_height="wrap_content"
android:drawablePadding="?android:listPreferredItemPaddingStart" android:layout_marginTop="@dimen/margin_normal"
android:minHeight="?android:listPreferredItemHeightSmall" android:drawablePadding="?android:listPreferredItemPaddingStart"
android:paddingStart="?android:listPreferredItemPaddingStart" android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingEnd="?android:listPreferredItemPaddingEnd" android:paddingStart="?android:listPreferredItemPaddingStart"
android:text="@string/use_two_pages_landscape" android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:textAppearance="?textAppearanceListItem" android:text="@string/use_two_pages_landscape"
android:textColor="?colorOnSurfaceVariant" android:textAppearance="?textAppearanceListItem"
app:drawableStartCompat="@drawable/ic_split_horizontal" /> android:textColor="?colorOnSurfaceVariant"
app:drawableStartCompat="@drawable/ic_split_horizontal" />
<TextView
android:id="@+id/text_sensitivity" <TextView
android:layout_width="match_parent" android:id="@+id/text_double_sensitivity"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginHorizontal="@dimen/margin_normal" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_small" android:layout_marginHorizontal="@dimen/margin_normal"
android:text="@string/two_page_scroll_sensitivity" android:layout_marginTop="@dimen/margin_small"
android:textAppearance="@style/TextAppearance.Kotatsu.GridTitle" /> android:text="@string/two_page_scroll_sensitivity"
android:textAppearance="@style/TextAppearance.Kotatsu.GridTitle" />
<com.google.android.material.slider.Slider
android:id="@+id/seekbar_sensitivity" <com.google.android.material.slider.Slider
android:layout_width="match_parent" android:id="@+id/slider_double_sensitivity"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginHorizontal="@dimen/margin_small" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_small" android:layout_marginHorizontal="@dimen/margin_small"
android:valueFrom="0" android:layout_marginTop="@dimen/margin_small"
android:valueTo="100" android:valueFrom="0"
app:labelBehavior="floating" android:valueTo="100"
tools:value="50" /> app:labelBehavior="floating"
tools:value="50" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switch_pull_gesture" <org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:layout_width="match_parent" android:id="@+id/button_screen_rotate"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginTop="@dimen/margin_small" android:layout_height="wrap_content"
android:drawablePadding="?android:listPreferredItemPaddingStart" android:text="@string/rotate_screen"
android:minHeight="?android:listPreferredItemHeightSmall" android:visibility="gone"
android:paddingStart="?android:listPreferredItemPaddingStart" app:drawableStartCompat="@drawable/ic_screen_rotation"
android:paddingEnd="?android:listPreferredItemPaddingEnd" tools:visibility="visible" />
android:text="@string/enable_pull_gesture_title"
android:textAppearance="?textAppearanceListItem" <com.google.android.material.materialswitch.MaterialSwitch
android:textColor="?colorOnSurfaceVariant" android:id="@+id/switch_screen_lock_rotation"
app:drawableStartCompat="@drawable/ic_gesture_vertical" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView android:drawablePadding="?android:listPreferredItemPaddingStart"
android:id="@+id/button_screen_rotate" android:ellipsize="end"
android:layout_width="match_parent" android:minHeight="?android:listPreferredItemHeightSmall"
android:layout_height="wrap_content" android:paddingStart="?android:listPreferredItemPaddingStart"
android:text="@string/rotate_screen" android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:visibility="gone" android:singleLine="true"
app:drawableStartCompat="@drawable/ic_screen_rotation" android:text="@string/lock_screen_rotation"
tools:visibility="visible" /> android:textAppearance="?textAppearanceListItem"
android:textColor="?colorOnSurfaceVariant"
<com.google.android.material.materialswitch.MaterialSwitch android:visibility="gone"
android:id="@+id/switch_screen_lock_rotation" app:drawableStartCompat="@drawable/ic_screen_rotation_lock"
android:layout_width="match_parent" tools:visibility="visible" />
android:layout_height="wrap_content"
android:drawablePadding="?android:listPreferredItemPaddingStart" <org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:ellipsize="end" android:id="@+id/button_scroll_timer"
android:minHeight="?android:listPreferredItemHeightSmall" android:layout_width="match_parent"
android:paddingStart="?android:listPreferredItemPaddingStart" android:layout_height="wrap_content"
android:paddingEnd="?android:listPreferredItemPaddingEnd" android:text="@string/automatic_scroll"
android:singleLine="true" app:drawableStartCompat="@drawable/ic_timer" />
android:text="@string/lock_screen_rotation"
android:textAppearance="?textAppearanceListItem" <org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:textColor="?colorOnSurfaceVariant" android:id="@+id/button_color_filter"
android:visibility="gone" android:layout_width="match_parent"
app:drawableStartCompat="@drawable/ic_screen_rotation_lock" android:layout_height="wrap_content"
tools:visibility="visible" /> android:text="@string/color_correction"
app:drawableStartCompat="@drawable/ic_appearance" />
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:id="@+id/button_scroll_timer" <org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:layout_width="match_parent" android:id="@+id/button_settings"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:text="@string/automatic_scroll" android:layout_height="wrap_content"
app:drawableStartCompat="@drawable/ic_timer" /> android:text="@string/settings"
app:drawableStartCompat="@drawable/ic_settings" />
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:id="@+id/button_color_filter" </LinearLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content" </androidx.core.widget.NestedScrollView>
android:text="@string/color_correction"
app:drawableStartCompat="@drawable/ic_appearance" />
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:id="@+id/button_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings"
app:drawableStartCompat="@drawable/ic_settings" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

6
app/src/main/res/xml/pref_reader.xml
Unescape Escape View File

@ -87,6 +87,12 @@
android:title="@string/pages_animation" android:title="@string/pages_animation"
app:useSimpleSummaryProvider="true" /> 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 <SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="enhanced_colors" android:key="enhanced_colors"

Write Preview
Loading…
Cancel
Save