From fd8fb367bd8223a67e46911d69367f6421eb7ae1 Mon Sep 17 00:00:00 2001
From: Rajarshee Chatterjee <rajarshee.adm@gmail.com>
Date: Sun, 31 Oct 2021 15:17:16 +0530
Subject: [PATCH] Allow setting default sort order for chapters (Closes #100)

---
 src/redux/settings/settings.reducer.js        |  1 +
 src/screens/novel/NovelScreen.js              |  9 ++-
 .../novel/components/JumpToChapterModal.js    |  2 +-
 src/screens/setting/SettingsGeneralScreen.js  | 23 +++++++
 .../components/DefaultChapterSortModal.js     | 61 +++++++++++++++++++
 5 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 src/screens/setting/components/DefaultChapterSortModal.js

diff --git a/src/redux/settings/settings.reducer.js b/src/redux/settings/settings.reducer.js
index f6af4b18..e538fa91 100644
--- a/src/redux/settings/settings.reducer.js
+++ b/src/redux/settings/settings.reducer.js
@@ -99,6 +99,7 @@ const initialState = {
    */
 
   hideBackdrop: false,
+  defaultChapterSort: null,
 
   /**
    * Reader settings
diff --git a/src/screens/novel/NovelScreen.js b/src/screens/novel/NovelScreen.js
index c174f2fa..89efa7cb 100644
--- a/src/screens/novel/NovelScreen.js
+++ b/src/screens/novel/NovelScreen.js
@@ -77,15 +77,18 @@ const Novel = ({route, navigation}) => {
   const deleteDownloadsSnackbar = useModal();
 
   const {
-    sort = 'ORDER BY chapterId ASC',
+    useFabForContinueReading = false,
+    defaultChapterSort = 'ORDER BY chapterId ASC',
+  } = useSettings();
+
+  const {
+    sort = defaultChapterSort,
     filter = '',
     showChapterTitles = false,
   } = usePreferences(novel.novelId);
 
   let {lastReadChapter, position} = useContinueReading(chapters, novel.novelId);
 
-  const {useFabForContinueReading = lastReadChapter && false} = useSettings();
-
   useEffect(() => {
     dispatch(
       getNovelAction(followed, sourceId, novelUrl, novelId, sort, filter),
diff --git a/src/screens/novel/components/JumpToChapterModal.js b/src/screens/novel/components/JumpToChapterModal.js
index 9bb7bfd8..f54ed675 100644
--- a/src/screens/novel/components/JumpToChapterModal.js
+++ b/src/screens/novel/components/JumpToChapterModal.js
@@ -89,7 +89,7 @@ const JumpToChapterModal = ({
         <TextInput
           value={text}
           placeholder={
-            mode ? 'Chapter Name' : `Chapter Number (<= ${chapters.length})`
+            mode ? 'Chapter Name' : `Chapter Number (≤ ${chapters.length})`
           }
           onChangeText={onChangeText}
           onSubmitEditing={onSubmit}
diff --git a/src/screens/setting/SettingsGeneralScreen.js b/src/screens/setting/SettingsGeneralScreen.js
index f703ec35..e83f14ee 100644
--- a/src/screens/setting/SettingsGeneralScreen.js
+++ b/src/screens/setting/SettingsGeneralScreen.js
@@ -14,6 +14,7 @@ import {useSettings, useTheme} from '../../hooks/reduxHooks';
 import {setAppSettings} from '../../redux/settings/settings.actions';
 import {SHOW_LAST_UPDATE_TIME} from '../../redux/updates/updates.types';
 import {useModal} from '../../hooks/useModal';
+import DefaultChapterSortModal from './components/DefaultChapterSortModal';
 
 const GenralSettings = ({navigation}) => {
   const theme = useTheme();
@@ -27,6 +28,7 @@ const GenralSettings = ({navigation}) => {
     updateLibraryOnLaunch = false,
     downloadNewChapters = false,
     onlyUpdateOngoingNovels = false,
+    defaultChapterSort = 'ORDER BY chapterId ASC',
   } = useSettings();
 
   const {showLastUpdateTime = true} = useSelector(
@@ -54,6 +56,8 @@ const GenralSettings = ({navigation}) => {
    */
   const gridSizeModalRef = useModal();
 
+  const defaultChapterSortModal = useModal();
+
   return (
     <ScreenContainer theme={theme}>
       <Appbar title="General" onBackAction={navigation.goBack} />
@@ -85,6 +89,18 @@ const GenralSettings = ({navigation}) => {
             theme={theme}
           />
           <List.Divider theme={theme} />
+          <List.SubHeader theme={theme}>Novel</List.SubHeader>
+          <List.Item
+            title="Default chapter sort"
+            description={`By source ${
+              defaultChapterSort === 'ORDER BY chapterId ASC'
+                ? '(Ascending)'
+                : '(Descending)'
+            }`}
+            onPress={defaultChapterSortModal.showModal}
+            theme={theme}
+          />
+          <List.Divider theme={theme} />
           <List.SubHeader theme={theme}>Global update</List.SubHeader>
           <SwitchSetting
             label="Only update ongoing novels"
@@ -131,6 +147,13 @@ const GenralSettings = ({navigation}) => {
         dispatch={dispatch}
         theme={theme}
       />
+      <DefaultChapterSortModal
+        defaultChapterSort={defaultChapterSort}
+        displayModalVisible={defaultChapterSortModal.visible}
+        hideDisplayModal={defaultChapterSortModal.hideModal}
+        dispatch={dispatch}
+        theme={theme}
+      />
       <GridSizeModal
         dispatch={dispatch}
         novelsPerRow={novelsPerRow}
diff --git a/src/screens/setting/components/DefaultChapterSortModal.js b/src/screens/setting/components/DefaultChapterSortModal.js
new file mode 100644
index 00000000..ae071344
--- /dev/null
+++ b/src/screens/setting/components/DefaultChapterSortModal.js
@@ -0,0 +1,61 @@
+import React from 'react';
+import {StyleSheet} from 'react-native';
+
+import {Portal, Modal} from 'react-native-paper';
+import {SortItem} from '../../../components/Checkbox/Checkbox';
+
+import {setAppSettings} from '../../../redux/settings/settings.actions';
+
+const DefaultChapterSortModal = ({
+  theme,
+  dispatch,
+  defaultChapterSort,
+  hideDisplayModal,
+  displayModalVisible,
+}) => {
+  return (
+    <Portal>
+      <Modal
+        visible={displayModalVisible}
+        onDismiss={hideDisplayModal}
+        contentContainerStyle={[
+          styles.containerStyle,
+          {backgroundColor: theme.colorPrimaryDark},
+        ]}
+      >
+        <SortItem
+          label="By source"
+          theme={theme}
+          status={
+            defaultChapterSort === 'ORDER BY chapterId ASC' ? 'asc' : 'desc'
+          }
+          onPress={() =>
+            defaultChapterSort === 'ORDER BY chapterId ASC'
+              ? dispatch(
+                  setAppSettings(
+                    'defaultChapterSort',
+                    'ORDER BY chapterId DESC',
+                  ),
+                )
+              : dispatch(
+                  setAppSettings(
+                    'defaultChapterSort',
+                    'ORDER BY chapterId ASC',
+                  ),
+                )
+          }
+        />
+      </Modal>
+    </Portal>
+  );
+};
+
+export default DefaultChapterSortModal;
+
+const styles = StyleSheet.create({
+  containerStyle: {
+    paddingVertical: 20,
+    margin: 20,
+    borderRadius: 6,
+  },
+});