From c02a72018d799ca41f69895f57f308323bc9501d Mon Sep 17 00:00:00 2001 From: Rajarshee Chatterjee Date: Sat, 30 Jul 2022 08:09:32 +0530 Subject: [PATCH] fix: Remove Text Selectable Option (Closes #332) --- src/redux/settings/settings.reducer.js | 1 - src/screens/reader/ReaderScreen.js | 2 -- .../ReaderBottomSheet/ReaderBottomSheet.tsx | 14 ++------------ src/screens/reader/components/TextReader.tsx | 3 --- src/screens/reader/components/WebViewReader.tsx | 1 - 5 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/redux/settings/settings.reducer.js b/src/redux/settings/settings.reducer.js index 81d69b57..8585422b 100644 --- a/src/redux/settings/settings.reducer.js +++ b/src/redux/settings/settings.reducer.js @@ -122,7 +122,6 @@ export const initialState = { autoScroll: false, autoScrollInterval: 10, autoScrollOffset: null, - textSelectable: false, verticalSeekbar: true, removeExtraParagraphSpacing: false, diff --git a/src/screens/reader/ReaderScreen.js b/src/screens/reader/ReaderScreen.js index 5cfc9a73..ad90e131 100644 --- a/src/screens/reader/ReaderScreen.js +++ b/src/screens/reader/ReaderScreen.js @@ -79,7 +79,6 @@ const Chapter = ({ route, navigation }) => { const { swipeGestures = false, incognitoMode = false, - textSelectable = false, useWebViewForChapter = false, wvUseNewSwipes = false, wvShowSwipeMargins = true, @@ -469,7 +468,6 @@ const Chapter = ({ route, navigation }) => { text={chapterText} reader={readerSettings} chapterName={chapter.chapterName || chapterName} - textSelectable={textSelectable} theme={theme} nextChapter={nextChapter} navigateToNextChapter={navigateToNextChapter} diff --git a/src/screens/reader/components/ReaderBottomSheet/ReaderBottomSheet.tsx b/src/screens/reader/components/ReaderBottomSheet/ReaderBottomSheet.tsx index 1c4349d1..905e135a 100644 --- a/src/screens/reader/components/ReaderBottomSheet/ReaderBottomSheet.tsx +++ b/src/screens/reader/components/ReaderBottomSheet/ReaderBottomSheet.tsx @@ -48,7 +48,6 @@ const GeneralTab: React.FC = () => { showScrollPercentage, wvUseVolumeButtons = false, swipeGestures = false, - textSelectable, removeExtraParagraphSpacing = false, } = useSettingsV1(); @@ -125,16 +124,7 @@ const GeneralTab: React.FC = () => { value={removeExtraParagraphSpacing} theme={theme} /> - {!useWebViewForChapter ? ( - - dispatch(setAppSettings('textSelectable', !textSelectable)) - } - value={textSelectable} - theme={theme} - /> - ) : ( + {useWebViewForChapter ? ( @@ -143,7 +133,7 @@ const GeneralTab: React.FC = () => { value={wvUseVolumeButtons} theme={theme} /> - )} + ) : null} ); }; diff --git a/src/screens/reader/components/TextReader.tsx b/src/screens/reader/components/TextReader.tsx index 6e25c8ca..20104442 100644 --- a/src/screens/reader/components/TextReader.tsx +++ b/src/screens/reader/components/TextReader.tsx @@ -30,7 +30,6 @@ interface TextReaderProps { }; chapterName: string; nextChapter: ChapterItem; - textSelectable: boolean; navigateToNextChapter: () => void; onPress(): void; } @@ -41,7 +40,6 @@ const TextReader: React.FC = ({ reader, chapterName, nextChapter, - textSelectable, navigateToNextChapter, onPress, }) => { @@ -61,7 +59,6 @@ const TextReader: React.FC = ({ fontSize: reader.textSize, textAlign: reader.textAlign as TextAlignments, }, - selectable: textSelectable, }} defaultViewProps={{ style: { diff --git a/src/screens/reader/components/WebViewReader.tsx b/src/screens/reader/components/WebViewReader.tsx index 9c2d642e..00910939 100644 --- a/src/screens/reader/components/WebViewReader.tsx +++ b/src/screens/reader/components/WebViewReader.tsx @@ -32,7 +32,6 @@ type WebViewReaderProps = { }; chapterName: string; nextChapter: ChapterItem; - textSelectable: boolean; navigateToNextChapter(): void; navigateToPrevChapter(): void; onPress(): void;