removed unused screens

ragsav · Apr 22, 2023 · fa4f768 · fa4f768
1 parent 4a0517c
commit fa4f768
Show file tree

Hide file tree

Showing 42 changed files with 826 additions and 1,116 deletions.
diff --git a/App.js b/App.js
@@ -13,7 +13,7 @@ import {SafeAreaProvider} from 'react-native-safe-area-context';
 import {Provider as StoreProvider} from 'react-redux';
 import Router from './js/components/Router';
 import {configureStore} from './js/redux/store';
-
+import {MD3DarkTheme, MD3LightTheme} from 'react-native-paper';
 const store = configureStore();
 
 const App = () => {
@@ -24,7 +24,7 @@ const App = () => {
     <StoreProvider store={store}>
       <GestureHandlerRootView style={{flex: 1}}>
         <SafeAreaProvider>
-          <Router></Router>
+          <Router theme={MD3DarkTheme}></Router>
         </SafeAreaProvider>
       </GestureHandlerRootView>
     </StoreProvider>

diff --git a/assets/bootsplash_logo.svg b/assets/bootsplash_logo.svg
diff --git a/assets/logo_fore.png b/assets/logo_fore.png
diff --git a/constants.js b/constants.js
@@ -11,11 +11,11 @@ export const CONSTANTS = Object.freeze({
     TASKS: 'tasks',
   },
   ROUTES: {
-    HOME: 'HOME',
     LABEL: 'LABEL',
     INTRO: 'INTRO',
     PINNED_NOTES: 'PINNED_NOTES',
     BOOKMARKS: 'BOOKMARKS',
+    LABEL_DRAWER: 'LABEL_DRAWER',
     ADD_LABEL: 'ADD_LABEL',
     EDIT_LABEL: 'EDIT_LABEL',
 
@@ -35,14 +35,25 @@ export const CONSTANTS = Object.freeze({
     SEARCH: 'SEARCH',
     SETTINGS: 'SETTINGS',
     COMPLETED: 'COMPLETED',
-    ALL: 'ALL',
+    ALL_TASKS: 'ALL_TASKS',
   },
 
   NOTE_SORT: {
     TITLE: {text: 'Title', code: 'title'},
     CREATED_AT: {text: 'Created on', code: 'created_at'},
   },
 
+  NOTE_SORT_ORDER: {
+    ASC: {
+      text: 'Ascensing',
+      code: 'asc',
+    },
+    DESC: {
+      text: 'Descending',
+      code: 'desc',
+    },
+  },
+
   TASK_SORT: {
     TITLE: {text: 'Title', code: 'title'},
     START_DATE: {text: 'Start time', code: 'start_timestamp'},
@@ -105,5 +116,8 @@ export const CONSTANTS = Object.freeze({
     TASK_SORT_ORDER: 'TASK_SORT_ORDER',
     TASK_SORT_PROPERTY: 'TASK_SORT_PROPERTY',
     DEFAULT_HOME_SCREEN: 'DEFAULT_HOME_SCREEN',
+
+    NOTE_SORT_ORDER: 'NOTE_SORT_ORDER',
+    NOTE_SORT_PROPERTY: 'NOTE_SORT_PROPERTY',
   },
 });
diff --git a/js/components/CalenderItemBottomSheet.js b/js/components/CalenderItemBottomSheet.js
@@ -114,30 +114,16 @@ const enhanceSelectLabel = withObservables(
             .get('tasks')
             .query(
               Q.where('id', Q.oneOf(selectedDateInfo.taskIDs)),
-              Q.sortBy(
-                String(taskSortProperty).trim() === ''
-                  ? CONSTANTS.TASK_SORT.DUE_DATE.code
-                  : String(taskSortProperty).trim(),
-                String(taskSortOrder) === Q.asc ||
-                  String(taskSortOrder) === Q.desc
-                  ? taskSortOrder
-                  : Q.asc,
-              ),
+              Task.unarchived(),
+              Task.sortQuery(taskSortProperty, taskSortOrder),
             )
             .observe()
         : database.collections
             .get('tasks')
             .query(
               Q.where('id', Q.oneOf([])),
-              Q.sortBy(
-                String(taskSortProperty).trim() === ''
-                  ? CONSTANTS.TASK_SORT.DUE_DATE.code
-                  : String(taskSortProperty).trim(),
-                String(taskSortOrder) === Q.asc ||
-                  String(taskSortOrder) === Q.desc
-                  ? taskSortOrder
-                  : Q.asc,
-              ),
+              Task.unarchived(),
+              Task.sortQuery(taskSortProperty, taskSortOrder),
             )
             .observe(),
   }),