fix: Fix & rename swipe actions (#1094)

aniyomiorg · Aug 2, 2023 · 04aad93 · 04aad93
1 parent 1f59519
commit 04aad93
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
@@ -287,8 +287,8 @@ object SettingsLibraryScreen : SearchableSettings {
             title = stringResource(R.string.pref_chapter_swipe),
             preferenceItems = listOf(
                 Preference.PreferenceItem.ListPreference(
-                    pref = libraryPreferences.swipeChapterEndAction(),
-                    title = stringResource(R.string.pref_chapter_swipe_end),
+                    pref = libraryPreferences.swipeChapterStartAction(),
+                    title = stringResource(R.string.pref_chapter_swipe_start),
                     entries = mapOf(
                         LibraryPreferences.ChapterSwipeAction.Disabled to stringResource(R.string.action_disable),
                         LibraryPreferences.ChapterSwipeAction.ToggleBookmark to stringResource(R.string.action_bookmark),
@@ -297,8 +297,8 @@ object SettingsLibraryScreen : SearchableSettings {
                     ),
                 ),
                 Preference.PreferenceItem.ListPreference(
-                    pref = libraryPreferences.swipeChapterStartAction(),
-                    title = stringResource(R.string.pref_chapter_swipe_start),
+                    pref = libraryPreferences.swipeChapterEndAction(),
+                    title = stringResource(R.string.pref_chapter_swipe_end),
                     entries = mapOf(
                         LibraryPreferences.ChapterSwipeAction.Disabled to stringResource(R.string.action_disable),
                         LibraryPreferences.ChapterSwipeAction.ToggleBookmark to stringResource(R.string.action_bookmark),
@@ -318,8 +318,8 @@ object SettingsLibraryScreen : SearchableSettings {
             title = stringResource(R.string.pref_episode_swipe),
             preferenceItems = listOf(
                 Preference.PreferenceItem.ListPreference(
-                    pref = libraryPreferences.swipeEpisodeEndAction(),
-                    title = stringResource(R.string.pref_episode_swipe_end),
+                    pref = libraryPreferences.swipeEpisodeStartAction(),
+                    title = stringResource(R.string.pref_episode_swipe_start),
                     entries = mapOf(
                         LibraryPreferences.EpisodeSwipeAction.Disabled to stringResource(R.string.action_disable),
                         LibraryPreferences.EpisodeSwipeAction.ToggleBookmark to stringResource(R.string.action_bookmark_episode),
@@ -329,7 +329,7 @@ object SettingsLibraryScreen : SearchableSettings {
                 ),
                 Preference.PreferenceItem.ListPreference(
                     pref = libraryPreferences.swipeEpisodeEndAction(),
-                    title = stringResource(R.string.pref_episode_swipe_start),
+                    title = stringResource(R.string.pref_episode_swipe_end),
                     entries = mapOf(
                         LibraryPreferences.EpisodeSwipeAction.Disabled to stringResource(R.string.action_disable),
                         LibraryPreferences.EpisodeSwipeAction.ToggleBookmark to stringResource(R.string.action_bookmark_episode),

diff --git a/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
@@ -160,13 +160,13 @@ class LibraryPreferences(
 
     // region Swipe Actions
 
-    fun swipeEpisodeEndAction() = preferenceStore.getEnum("pref_episode_swipe_end_action", EpisodeSwipeAction.ToggleBookmark)
+    fun swipeEpisodeEndAction() = preferenceStore.getEnum("pref_episode_swipe_start_action", EpisodeSwipeAction.ToggleBookmark)
 
-    fun swipeEpisodeStartAction() = preferenceStore.getEnum("pref_episode_swipe_start_action", EpisodeSwipeAction.ToggleSeen)
+    fun swipeEpisodeStartAction() = preferenceStore.getEnum("pref_episode_swipe_end_action", EpisodeSwipeAction.ToggleSeen)
 
-    fun swipeChapterEndAction() = preferenceStore.getEnum("pref_chapter_swipe_end_action", ChapterSwipeAction.ToggleBookmark)
+    fun swipeChapterEndAction() = preferenceStore.getEnum("pref_chapter_swipe_start_action", ChapterSwipeAction.ToggleBookmark)
 
-    fun swipeChapterStartAction() = preferenceStore.getEnum("pref_chapter_swipe_start_action", ChapterSwipeAction.ToggleRead)
+    fun swipeChapterStartAction() = preferenceStore.getEnum("pref_chapter_swipe_end_action", ChapterSwipeAction.ToggleRead)
 
     // endregion
 

diff --git a/i18n/src/main/res/values/strings-aniyomi.xml b/i18n/src/main/res/values/strings-aniyomi.xml
@@ -294,8 +294,8 @@
     <string name="action_save_screenshot">Save screenshot</string>
 
     <string name="pref_episode_swipe">Episode swipe</string>
-    <string name="pref_episode_swipe_end">Swipe to end action</string>
-    <string name="pref_episode_swipe_start">Swipe to start action</string>
+    <string name="pref_episode_swipe_end">Swipe to right action</string>
+    <string name="pref_episode_swipe_start">Swipe to left action</string>
     <!-- TachiyomiSY -->
     <string name="data_saver_exclude">Exclude from data saver</string>
     <string name="data_saver_stop_exclude">Stop excluding from data saver</string>

diff --git a/i18n/src/main/res/values/strings.xml b/i18n/src/main/res/values/strings.xml
@@ -273,8 +273,8 @@
     <string name="exclude">Exclude: %s</string>
 
     <string name="pref_chapter_swipe">Chapter swipe</string>
-    <string name="pref_chapter_swipe_end">Swipe to end action</string>
-    <string name="pref_chapter_swipe_start">Swipe to start action</string>
+    <string name="pref_chapter_swipe_end">Swipe to right action</string>
+    <string name="pref_chapter_swipe_start">Swipe to left action</string>
 
       <!-- Extension section -->
     <string name="multi_lang">Multi</string>