diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerDefaultNavigation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/RightAndLeftNavigation.kt similarity index 72% rename from app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerDefaultNavigation.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/RightAndLeftNavigation.kt index 4d25ce815..f0df1afa2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerDefaultNavigation.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/RightAndLeftNavigation.kt @@ -1,8 +1,7 @@ -package eu.kanade.tachiyomi.ui.reader.viewer.pager +package eu.kanade.tachiyomi.ui.reader.viewer.navigation import android.graphics.RectF import eu.kanade.tachiyomi.ui.reader.viewer.ViewerNavigation -import eu.kanade.tachiyomi.ui.reader.viewer.navigation.LNavigation /** * Visualization of default state without any inversion @@ -14,7 +13,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.navigation.LNavigation * | N | M | P | N: Move Left * +---+---+---+ */ -class PagerDefaultNavigation : ViewerNavigation() { +class RightAndLeftNavigation : ViewerNavigation() { override var regions: List = listOf( Region( @@ -27,5 +26,3 @@ class PagerDefaultNavigation : ViewerNavigation() { ), ) } - -class VerticalPagerDefaultNavigation : LNavigation() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt index 3243c2ec4..77b158865 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt @@ -6,6 +6,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.ViewerNavigation import eu.kanade.tachiyomi.ui.reader.viewer.navigation.EdgeNavigation import eu.kanade.tachiyomi.ui.reader.viewer.navigation.KindlishNavigation import eu.kanade.tachiyomi.ui.reader.viewer.navigation.LNavigation +import eu.kanade.tachiyomi.ui.reader.viewer.navigation.RightAndLeftNavigation import kotlinx.coroutines.CoroutineScope import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get @@ -69,8 +70,8 @@ class PagerConfig( override fun defaultNavigation(): ViewerNavigation { return when (viewer) { - is VerticalPagerViewer -> VerticalPagerDefaultNavigation() - else -> PagerDefaultNavigation() + is VerticalPagerViewer -> LNavigation() + else -> RightAndLeftNavigation() } } @@ -80,6 +81,7 @@ class PagerConfig( 1 -> LNavigation() 2 -> KindlishNavigation() 3 -> EdgeNavigation() + 4 -> RightAndLeftNavigation() else -> defaultNavigation() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt index 255fad0ae..44eeb6f56 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt @@ -6,6 +6,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.ViewerNavigation import eu.kanade.tachiyomi.ui.reader.viewer.navigation.EdgeNavigation import eu.kanade.tachiyomi.ui.reader.viewer.navigation.KindlishNavigation import eu.kanade.tachiyomi.ui.reader.viewer.navigation.LNavigation +import eu.kanade.tachiyomi.ui.reader.viewer.navigation.RightAndLeftNavigation import kotlinx.coroutines.CoroutineScope import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get @@ -44,7 +45,7 @@ class WebtoonConfig( } override fun defaultNavigation(): ViewerNavigation { - return WebtoonDefaultNavigation() + return LNavigation() } override fun updateNavigation(navigationMode: Int) { @@ -53,6 +54,7 @@ class WebtoonConfig( 1 -> LNavigation() 2 -> KindlishNavigation() 3 -> EdgeNavigation() + 4 -> RightAndLeftNavigation() else -> defaultNavigation() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonDefaultNavigation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonDefaultNavigation.kt deleted file mode 100644 index 04e05909d..000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonDefaultNavigation.kt +++ /dev/null @@ -1,5 +0,0 @@ -package eu.kanade.tachiyomi.ui.reader.viewer.webtoon - -import eu.kanade.tachiyomi.ui.reader.viewer.navigation.LNavigation - -class WebtoonDefaultNavigation : LNavigation() diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 687db1cc1..7dafac408 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -97,6 +97,7 @@ @string/l_nav @string/kindlish_nav @string/edge_nav + @string/right_and_left_nav @@ -104,5 +105,6 @@ @string/l_nav @string/kindlish_nav @string/edge_nav + @string/right_and_left_nav diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a21c7db10..347f6f2d9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -293,6 +293,7 @@ L shaped Kindle-ish Edge + Right and Left Left to right Right to left Vertical