Add option to reverse tapping (#3360)
* Add option to reverse tapping * Fix string for preference key * Invert tapping for Webtoon and Vertical * Use enum instead of boolean * Add option to reader sheet * Hide from reader sheet if tapping disabled and remove hard coded string * Hide option if tapping disabled (cherry picked from commit 04d83e9a6a0fe4618b4e60c15bb56b302f1241a9) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt # app/src/main/res/layout/reader_settings_sheet.xml
This commit is contained in:
parent
a9317dff88
commit
e3d2e5b89d
@ -53,6 +53,8 @@ object PreferenceKeys {
|
|||||||
|
|
||||||
const val readWithTapping = "reader_tap"
|
const val readWithTapping = "reader_tap"
|
||||||
|
|
||||||
|
const val readWithTappingInverted = "reader_tapping_inverted"
|
||||||
|
|
||||||
const val readWithLongTap = "reader_long_tap"
|
const val readWithLongTap = "reader_long_tap"
|
||||||
|
|
||||||
const val readWithVolumeKeys = "reader_volume_keys"
|
const val readWithVolumeKeys = "reader_volume_keys"
|
||||||
|
@ -30,4 +30,11 @@ object PreferenceValues {
|
|||||||
COMFORTABLE_GRID,
|
COMFORTABLE_GRID,
|
||||||
LIST,
|
LIST,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum class TappingInvertMode {
|
||||||
|
NONE,
|
||||||
|
HORIZONTAL,
|
||||||
|
VERTICAL,
|
||||||
|
BOTH
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -119,6 +119,8 @@ class PreferencesHelper(val context: Context) {
|
|||||||
|
|
||||||
fun readWithTapping() = flowPrefs.getBoolean(Keys.readWithTapping, true)
|
fun readWithTapping() = flowPrefs.getBoolean(Keys.readWithTapping, true)
|
||||||
|
|
||||||
|
fun readWithTappingInverted() = flowPrefs.getEnum(Keys.readWithTappingInverted, Values.TappingInvertMode.NONE)
|
||||||
|
|
||||||
fun readWithLongTap() = flowPrefs.getBoolean(Keys.readWithLongTap, true)
|
fun readWithLongTap() = flowPrefs.getBoolean(Keys.readWithLongTap, true)
|
||||||
|
|
||||||
fun readWithVolumeKeys() = flowPrefs.getBoolean(Keys.readWithVolumeKeys, false)
|
fun readWithVolumeKeys() = flowPrefs.getBoolean(Keys.readWithVolumeKeys, false)
|
||||||
|
@ -7,6 +7,7 @@ import android.view.View
|
|||||||
import android.view.ViewGroup.LayoutParams
|
import android.view.ViewGroup.LayoutParams
|
||||||
import androidx.viewpager.widget.ViewPager
|
import androidx.viewpager.widget.ViewPager
|
||||||
import eu.kanade.tachiyomi.R
|
import eu.kanade.tachiyomi.R
|
||||||
|
import eu.kanade.tachiyomi.data.preference.PreferenceValues.TappingInvertMode
|
||||||
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
|
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
|
||||||
import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
|
import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
|
||||||
import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
|
import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
|
||||||
@ -80,11 +81,30 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
pager.tapListener = { event ->
|
pager.tapListener = { event ->
|
||||||
val positionX = event.x
|
val invertMode = config.tappingInverted
|
||||||
when {
|
|
||||||
positionX < pager.width * 0.33f && config.tappingEnabled -> moveLeft()
|
if (this is VerticalPagerViewer) {
|
||||||
positionX > pager.width * 0.66f && config.tappingEnabled -> moveRight()
|
val positionY = event.y
|
||||||
else -> activity.toggleMenu()
|
val tappingInverted = invertMode == TappingInvertMode.VERTICAL || invertMode == TappingInvertMode.BOTH
|
||||||
|
val topSideTap = positionY < pager.height * 0.33f && config.tappingEnabled
|
||||||
|
val bottomSideTap = positionY > pager.height * 0.66f && config.tappingEnabled
|
||||||
|
|
||||||
|
when {
|
||||||
|
topSideTap && !tappingInverted || bottomSideTap && tappingInverted -> moveLeft()
|
||||||
|
bottomSideTap && !tappingInverted || topSideTap && tappingInverted -> moveRight()
|
||||||
|
else -> activity.toggleMenu()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
val positionX = event.x
|
||||||
|
val tappingInverted = invertMode == TappingInvertMode.HORIZONTAL || invertMode == TappingInvertMode.BOTH
|
||||||
|
val leftSideTap = positionX < pager.width * 0.33f && config.tappingEnabled
|
||||||
|
val rightSideTap = positionX > pager.width * 0.66f && config.tappingEnabled
|
||||||
|
|
||||||
|
when {
|
||||||
|
leftSideTap && !tappingInverted || rightSideTap && tappingInverted -> moveLeft()
|
||||||
|
rightSideTap && !tappingInverted || leftSideTap && tappingInverted -> moveRight()
|
||||||
|
else -> activity.toggleMenu()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pager.longTapListener = f@{
|
pager.longTapListener = f@{
|
||||||
|
@ -7,6 +7,7 @@ import android.view.ViewGroup
|
|||||||
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
|
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import androidx.recyclerview.widget.WebtoonLayoutManager
|
import androidx.recyclerview.widget.WebtoonLayoutManager
|
||||||
|
import eu.kanade.tachiyomi.data.preference.PreferenceValues.TappingInvertMode
|
||||||
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
|
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
|
||||||
import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
|
import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
|
||||||
import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
|
import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
|
||||||
|
@ -250,7 +250,7 @@ class SettingsGeneralController : SettingsController() {
|
|||||||
summary = "%s"
|
summary = "%s"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// --> EXH
|
// --> EXH
|
||||||
preferenceCategory {
|
preferenceCategory {
|
||||||
titleRes = R.string.eh_settings_category
|
titleRes = R.string.eh_settings_category
|
||||||
|
|
||||||
|
@ -4,6 +4,7 @@ import android.os.Build
|
|||||||
import androidx.preference.PreferenceScreen
|
import androidx.preference.PreferenceScreen
|
||||||
import eu.kanade.tachiyomi.R
|
import eu.kanade.tachiyomi.R
|
||||||
import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
|
import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
|
||||||
|
import eu.kanade.tachiyomi.data.preference.PreferenceValues.TappingInvertMode
|
||||||
import eu.kanade.tachiyomi.data.preference.asImmediateFlow
|
import eu.kanade.tachiyomi.data.preference.asImmediateFlow
|
||||||
import eu.kanade.tachiyomi.util.preference.defaultValue
|
import eu.kanade.tachiyomi.util.preference.defaultValue
|
||||||
import eu.kanade.tachiyomi.util.preference.entriesRes
|
import eu.kanade.tachiyomi.util.preference.entriesRes
|
||||||
@ -307,6 +308,26 @@ class SettingsReaderController : SettingsController() {
|
|||||||
titleRes = R.string.pref_read_with_tapping
|
titleRes = R.string.pref_read_with_tapping
|
||||||
defaultValue = true
|
defaultValue = true
|
||||||
}
|
}
|
||||||
|
listPreference {
|
||||||
|
key = Keys.readWithTappingInverted
|
||||||
|
titleRes = R.string.pref_read_with_tapping_inverted
|
||||||
|
entriesRes = arrayOf(
|
||||||
|
R.string.tapping_inverted_none,
|
||||||
|
R.string.tapping_inverted_horizontal,
|
||||||
|
R.string.tapping_inverted_vertical,
|
||||||
|
R.string.tapping_inverted_both
|
||||||
|
)
|
||||||
|
entryValues = arrayOf(
|
||||||
|
TappingInvertMode.NONE.name,
|
||||||
|
TappingInvertMode.HORIZONTAL.name,
|
||||||
|
TappingInvertMode.VERTICAL.name,
|
||||||
|
TappingInvertMode.BOTH.name
|
||||||
|
)
|
||||||
|
defaultValue = TappingInvertMode.NONE.name
|
||||||
|
summary = "%s"
|
||||||
|
|
||||||
|
preferences.readWithTapping().asImmediateFlow { isVisible = it }.launchIn(scope)
|
||||||
|
}
|
||||||
switchPreference {
|
switchPreference {
|
||||||
key = Keys.readWithLongTap
|
key = Keys.readWithLongTap
|
||||||
titleRes = R.string.pref_read_with_long_tap
|
titleRes = R.string.pref_read_with_long_tap
|
||||||
|
@ -79,4 +79,11 @@
|
|||||||
<item>@string/filter_mode_multiply</item>
|
<item>@string/filter_mode_multiply</item>
|
||||||
<item>@string/filter_mode_screen</item>
|
<item>@string/filter_mode_screen</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
<string-array name="invert_tapping_mode">
|
||||||
|
<item>@string/tapping_inverted_none</item>
|
||||||
|
<item>@string/tapping_inverted_horizontal</item>
|
||||||
|
<item>@string/tapping_inverted_vertical</item>
|
||||||
|
<item>@string/tapping_inverted_both</item>
|
||||||
|
</string-array>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -676,5 +676,10 @@
|
|||||||
<string name="channel_backup_restore">Backup and restore</string>
|
<string name="channel_backup_restore">Backup and restore</string>
|
||||||
<string name="channel_backup_restore_progress">Progress</string>
|
<string name="channel_backup_restore_progress">Progress</string>
|
||||||
<string name="channel_backup_restore_complete">Complete</string>
|
<string name="channel_backup_restore_complete">Complete</string>
|
||||||
|
<string name="pref_read_with_tapping_inverted">Invert tapping</string>
|
||||||
|
<string name="tapping_inverted_none">None</string>
|
||||||
|
<string name="tapping_inverted_horizontal">Horizontal</string>
|
||||||
|
<string name="tapping_inverted_vertical">Vertical</string>
|
||||||
|
<string name="tapping_inverted_both">Both</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user