From 3487bbd4cff99f907affc44c0008c88695ebc4b4 Mon Sep 17 00:00:00 2001
From: Rajarshee Chatterjee <rajarshee.adm@gmail.com>
Date: Sat, 18 Jun 2022 13:37:52 +0530
Subject: [PATCH] Minor fixes

---
 .../ColorPickerModal/ColorPickerModal.tsx     |  2 +-
 src/screens/reader/components/TextReader.tsx  |  4 +++-
 .../reader/components/WebViewReader.tsx       | 23 +++++++++++--------
 .../settings/SettingsAppearanceScreen.js      |  4 ++--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/components/ColorPickerModal/ColorPickerModal.tsx b/src/components/ColorPickerModal/ColorPickerModal.tsx
index 3d77f2c8..e924af9e 100644
--- a/src/components/ColorPickerModal/ColorPickerModal.tsx
+++ b/src/components/ColorPickerModal/ColorPickerModal.tsx
@@ -117,7 +117,7 @@ const ColorPickerModal: React.FC<ColorPickerModalProps> = ({
                   }}
                   onPress={() => {
                     onSubmit(item);
-                    hideModal();
+                    closeModal();
                   }}
                 />
               </View>
diff --git a/src/screens/reader/components/TextReader.tsx b/src/screens/reader/components/TextReader.tsx
index abded751..6e25c8ca 100644
--- a/src/screens/reader/components/TextReader.tsx
+++ b/src/screens/reader/components/TextReader.tsx
@@ -84,6 +84,7 @@ const TextReader: React.FC<TextReaderProps> = ({
               title={`Next: ${nextChapter.chapterName}`}
               onPress={navigateToNextChapter}
               theme={theme}
+              textColor={theme.colorButtonText}
               style={styles.nextButton}
             />
           ) : (
@@ -133,6 +134,7 @@ const styles = StyleSheet.create({
     textAlign: 'center',
   },
   nextButton: {
-    marginVertical: 16,
+    marginTop: 16,
+    marginBottom: 32,
   },
 });
diff --git a/src/screens/reader/components/WebViewReader.tsx b/src/screens/reader/components/WebViewReader.tsx
index 6311f3bc..54199c71 100644
--- a/src/screens/reader/components/WebViewReader.tsx
+++ b/src/screens/reader/components/WebViewReader.tsx
@@ -190,14 +190,16 @@ const WebViewReader: FunctionComponent<WebViewReaderProps> = ({
                       .nextButton,
                       .infoText {
                         width: 100%;
-                        min-height: 40;
                         border-radius: 50px;
-                        padding-vertical: 8;
-                        padding-horizontal: 24;
                         border-width: 1;
                         color: ${theme.colorButtonText};
                         background-color: ${theme.colorAccent};
-                        font-size: 0.8em;
+                        font-family: ${reader.fontFamily};
+                        font-size: 16px;
+                        border-width: 0;
+                      }
+                      .nextButton {
+                        min-height: 40px
                       }
                       .infoText {
                         background-color: transparent;
@@ -205,10 +207,12 @@ const WebViewReader: FunctionComponent<WebViewReaderProps> = ({
                         border: none;
                         margin: 0px;
                         color: inherit;
+                        padding-top: 16px;
+                        padding-bottom: 16px;
                       }
                       .pos,.posl,.posr {
                         background-color: #ff000055;
-                        color: blue;
+                        color: white;
                         position: fixed;
                         z-index: 99;
                         height: 100vh;
@@ -217,16 +221,17 @@ const WebViewReader: FunctionComponent<WebViewReaderProps> = ({
                         justify-content: center;
                         align-items:center;
                         width: 100px;
+                        font-weight: bold;
+                        -webkit-text-stroke-width: 1px;
+                        -webkit-text-stroke-color: black;
                       }
                       .posl {
                         background-color: #00ff0055;
-                        color: red;
                         font-size: 2em;
                         text-align: center;
                       }
                       .posr {
                         background-color: #0000ff55;
-                        color: red;
                         font-size: 2em;
                         text-align: center;
                       }
@@ -270,8 +275,8 @@ const WebViewReader: FunctionComponent<WebViewReaderProps> = ({
                         ${
                           wvShowSwipeMargins
                             ? `<div class='pos'> </div>
-                        <div class='posr'>=></div>
-                        <div class='posl'><=</div>`
+                        <div class='posr'>Swipe Left</div>
+                        <div class='posl'>Swipe Right</div>`
                             : ''
                         }
                         <script>
diff --git a/src/screens/settings/SettingsAppearanceScreen.js b/src/screens/settings/SettingsAppearanceScreen.js
index 3940c153..975970df 100644
--- a/src/screens/settings/SettingsAppearanceScreen.js
+++ b/src/screens/settings/SettingsAppearanceScreen.js
@@ -237,8 +237,8 @@ const AppearanceSettings = ({ navigation }) => {
 
       <ColorPickerModal
         title="Accent color"
-        modalVisible={accentColorModal}
-        hideModal={hideAccentColorModal}
+        visible={accentColorModal}
+        closeModal={hideAccentColorModal}
         color={theme.colorAccent}
         onSubmit={onSubmit}
         theme={theme}