From b849be6f5ef13860666f15b70e3e79c176d67003 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 1 Jan 2024 11:31:45 -0600
Subject: [PATCH] Add:Epub reader setting to force single page #1018

---
 components/modals/FullscreenModal.vue |  2 +-
 components/readers/Reader.vue         | 36 ++++++++++++++++++++++-----
 strings/cs.json                       |  3 +++
 strings/da.json                       |  3 +++
 strings/de.json                       |  3 +++
 strings/en-us.json                    |  3 +++
 strings/es.json                       |  3 +++
 strings/fr.json                       |  3 +++
 strings/gu.json                       |  3 +++
 strings/hi.json                       |  3 +++
 strings/hr.json                       |  3 +++
 strings/it.json                       |  3 +++
 strings/lt.json                       |  3 +++
 strings/nl.json                       |  3 +++
 strings/no.json                       |  3 +++
 strings/pl.json                       |  3 +++
 strings/ru.json                       |  3 +++
 strings/sv.json                       |  3 +++
 strings/zh-cn.json                    |  3 +++
 19 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/components/modals/FullscreenModal.vue b/components/modals/FullscreenModal.vue
index 9f99ca4f..63c21eb8 100644
--- a/components/modals/FullscreenModal.vue
+++ b/components/modals/FullscreenModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="wrapper" class="modal modal-bg w-screen fixed bottom-0 left-0 flex items-center justify-center z-50" :class="halfScreen ? 'h-[50vh]' : 'h-screen'" @click.stop @touchstart.stop @touchend.stop>
+  <div ref="wrapper" class="modal modal-bg w-screen fixed bottom-0 left-0 flex items-center justify-center z-50" :class="halfScreen ? 'h-[50vh] min-h-[400px]' : 'h-screen'" @click.stop @touchstart.stop @touchend.stop>
     <div ref="content" class="relative text-fg h-full w-full bg-bg">
       <slot />
     </div>
diff --git a/components/readers/Reader.vue b/components/readers/Reader.vue
index e41d1fe8..ddd2d7bf 100644
--- a/components/readers/Reader.vue
+++ b/components/readers/Reader.vue
@@ -56,7 +56,7 @@
     <!-- ereader settings modal -->
     <modals-fullscreen-modal v-model="showSettingsModal" :theme="ereaderTheme" half-screen>
       <div style="box-shadow: 0px -8px 8px #11111155">
-        <div class="flex items-end justify-between h-20 px-4 pb-2 mb-8">
+        <div class="flex items-end justify-between h-20 px-4 pb-2 mb-6">
           <h1 class="text-lg">{{ $strings.HeaderEreaderSettings }}</h1>
           <button class="flex" @click="showSettingsModal = false">
             <span class="material-icons">close</span>
@@ -64,24 +64,30 @@
         </div>
         <div class="w-full overflow-y-auto overflow-x-hidden h-full max-h-[calc(100vh-85px)]">
           <div class="w-full h-full px-4">
-            <div class="flex items-center mb-8">
+            <div class="flex items-center mb-6">
               <div class="w-32">
                 <p class="text-base">{{ $strings.LabelTheme }}:</p>
               </div>
               <ui-toggle-btns v-model="ereaderSettings.theme" :items="themeItems" @input="settingsUpdated" />
             </div>
-            <div class="flex items-center mb-8">
+            <div class="flex items-center mb-6">
               <div class="w-32">
                 <p class="text-base">{{ $strings.LabelFontScale }}:</p>
               </div>
               <ui-range-input v-model="ereaderSettings.fontScale" :min="5" :max="300" :step="5" input-width="180px" @input="settingsUpdated" />
             </div>
-            <div class="flex items-center mb-8">
+            <div class="flex items-center mb-6">
               <div class="w-32">
                 <p class="text-base">{{ $strings.LabelLineSpacing }}:</p>
               </div>
               <ui-range-input v-model="ereaderSettings.lineSpacing" :min="100" :max="300" :step="5" input-width="180px" @input="settingsUpdated" />
             </div>
+            <div class="flex items-center">
+              <div class="w-32">
+                <p class="text-base">{{ $strings.LabelLayout }}:</p>
+              </div>
+              <ui-toggle-btns v-model="ereaderSettings.spread" :items="spreadItems" @input="settingsUpdated" />
+            </div>
           </div>
         </div>
       </div>
@@ -109,7 +115,8 @@ export default {
       ereaderSettings: {
         theme: 'dark',
         fontScale: 100,
-        lineSpacing: 115
+        lineSpacing: 115,
+        spread: 'auto'
       }
     }
   },
@@ -154,6 +161,18 @@ export default {
       if (this.isEpub) return this.ereaderSettings.theme
       return document.documentElement.dataset.theme || 'dark'
     },
+    spreadItems() {
+      return [
+        {
+          text: this.$strings.LabelLayoutSinglePage,
+          value: 'none'
+        },
+        {
+          text: this.$strings.LabelLayoutAuto,
+          value: 'auto'
+        }
+      ]
+    },
     themeItems() {
       return [
         {
@@ -350,7 +369,12 @@ export default {
       try {
         const settings = localStorage.getItem('ereaderSettings')
         if (settings) {
-          this.ereaderSettings = JSON.parse(settings)
+          const ereaderSettings = JSON.parse(settings)
+          if (!ereaderSettings.spread) {
+            // Added in 0.9.71
+            ereaderSettings.spread = 'auto'
+          }
+          this.ereaderSettings = ereaderSettings
           this.settingsUpdated()
         }
       } catch (error) {
diff --git a/strings/cs.json b/strings/cs.json
index 8d138ae5..1c170eda 100644
--- a/strings/cs.json
+++ b/strings/cs.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Jazyk",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Řádkování",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/da.json b/strings/da.json
index 408743cb..2c5f6d05 100644
--- a/strings/da.json
+++ b/strings/da.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Sprog",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Linjeafstand",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/de.json b/strings/de.json
index 60bcda59..dfe9f26c 100644
--- a/strings/de.json
+++ b/strings/de.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Rückspulzeit",
   "LabelJumpForwardsTime": "Vorwärtsspulzeit",
   "LabelLanguage": "Sprache",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Leicht",
   "LabelLineSpacing": "Zeilenabstand",
   "LabelListenAgain": "Erneut anhören",
diff --git a/strings/en-us.json b/strings/en-us.json
index b96c5929..5eaf71c1 100644
--- a/strings/en-us.json
+++ b/strings/en-us.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Language",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Line spacing",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/es.json b/strings/es.json
index ec095812..90f815a9 100644
--- a/strings/es.json
+++ b/strings/es.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Lenguaje",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Interlineado",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/fr.json b/strings/fr.json
index 31143b0d..63e81f0e 100644
--- a/strings/fr.json
+++ b/strings/fr.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Langue",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Interligne",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/gu.json b/strings/gu.json
index 3e4011fc..212c9772 100644
--- a/strings/gu.json
+++ b/strings/gu.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Language",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Line spacing",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/hi.json b/strings/hi.json
index 45bb0c2b..19b97a39 100644
--- a/strings/hi.json
+++ b/strings/hi.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Language",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Line spacing",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/hr.json b/strings/hr.json
index 29354142..3bf0f4bc 100644
--- a/strings/hr.json
+++ b/strings/hr.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Jezik",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Line spacing",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/it.json b/strings/it.json
index 71f87d34..8d96bf79 100644
--- a/strings/it.json
+++ b/strings/it.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Lingua",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Interlinea",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/lt.json b/strings/lt.json
index e64b879f..7161615c 100644
--- a/strings/lt.json
+++ b/strings/lt.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Kalba",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Tarpas tarp eilučių",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/nl.json b/strings/nl.json
index 599a3640..f96a488f 100644
--- a/strings/nl.json
+++ b/strings/nl.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Taal",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Regelruimte",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/no.json b/strings/no.json
index 23c12365..b828ead7 100644
--- a/strings/no.json
+++ b/strings/no.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Språk",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Linjemellomrom",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/pl.json b/strings/pl.json
index 51126279..8b457d4e 100644
--- a/strings/pl.json
+++ b/strings/pl.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Język",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Line spacing",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/ru.json b/strings/ru.json
index bf4ae655..4ef3d641 100644
--- a/strings/ru.json
+++ b/strings/ru.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Перемотка назад",
   "LabelJumpForwardsTime": "Перемотка вперед",
   "LabelLanguage": "Язык",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Подсветка",
   "LabelLineSpacing": "Межстрочный интервал",
   "LabelListenAgain": "Слушать снова",
diff --git a/strings/sv.json b/strings/sv.json
index 4eb6b25f..f2bc678a 100644
--- a/strings/sv.json
+++ b/strings/sv.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
   "LabelLanguage": "Språk",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "Light",
   "LabelLineSpacing": "Radavstånd",
   "LabelListenAgain": "Listen Again",
diff --git a/strings/zh-cn.json b/strings/zh-cn.json
index 4af15313..1f8fc068 100644
--- a/strings/zh-cn.json
+++ b/strings/zh-cn.json
@@ -150,6 +150,9 @@
   "LabelJumpBackwardsTime": "快退时间",
   "LabelJumpForwardsTime": "快进时间",
   "LabelLanguage": "语言",
+  "LabelLayout": "Layout",
+  "LabelLayoutAuto": "Auto",
+  "LabelLayoutSinglePage": "Single page",
   "LabelLight": "轻",
   "LabelLineSpacing": "行间距",
   "LabelListenAgain": "再次收听",