Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: sort reminders

Ammar Ahmed6e135cdd36ef
diff --git a/apps/mobile/app/components/list-items/headers/section-header.js b/apps/mobile/app/components/list-items/headers/section-header.js
index c026e3651..dc84ecc20 100644
--- a/apps/mobile/app/components/list-items/headers/section-header.js
+++ b/apps/mobile/app/components/list-items/headers/section-header.js
@@ -101,7 +101,7 @@ export const SectionHeader = React.memo(
alignItems: "center"
}}
>
- {index === 0 && (
+ {index === 0 ? (
<>
<Button
onPress={() => {
@@ -109,7 +109,6 @@ export const SectionHeader = React.memo(
component: <Sort screen={screen} type={type} />
});
}}
- hidden={screen === "Reminders"}
tooltipText="Change sorting of items in list"
fwdRef={sortRef}
title={groupBy}
@@ -160,7 +159,7 @@ export const SectionHeader = React.memo(
size={SIZE.lg - 2}
/>
</>
- )}
+ ) : null}
</View>
</View>
);
diff --git a/apps/mobile/app/components/sheets/sort/index.js b/apps/mobile/app/components/sheets/sort/index.js
index b85ff3673..64dbbc2b4 100644
--- a/apps/mobile/app/components/sheets/sort/index.js
+++ b/apps/mobile/app/components/sheets/sort/index.js
@@ -88,10 +88,14 @@ const Sort = ({ type, screen }) => {
? groupOptions.groupBy === "abc" ||
groupOptions.sortBy === "title"
? "A - Z"
+ : groupOptions.sortBy === "dueDate"
+ ? "Earliest first"
: "Old - New"
: groupOptions.groupBy === "abc" ||
groupOptions.sortBy === "title"
? "Z - A"
+ : groupOptions.sortBy === "dueDate"
+ ? "Latest first"
: "New - Old"
}
icon={
@@ -142,6 +146,7 @@ const Sort = ({ type, screen }) => {
/>
) : (
Object.keys(SORT).map((item) =>
+ (item === "dueDate" && screen !== "Reminders") ||
(item === "title" && groupOptions.groupBy !== "none") ||
((screen !== "Tags" || screen !== "Reminders") &&
item === "dateModified") ||
diff --git a/apps/mobile/app/stores/use-reminder-store.ts b/apps/mobile/app/stores/use-reminder-store.ts
index 45d77fd2c..f5fb8b176 100644
--- a/apps/mobile/app/stores/use-reminder-store.ts
+++ b/apps/mobile/app/stores/use-reminder-store.ts
@@ -32,7 +32,10 @@ export const useReminderStore = create<ReminderStore>((set) => ({
reminders: [],
setReminders: () => {
set({
- reminders: groupReminders((db.reminders?.all as Reminder[]) || [])
+ reminders: groupReminders(
+ (db.reminders?.all as Reminder[]) || [],
+ db.settings?.getGroupOptions("reminders")
+ )
});
},
cleareReminders: () => set({ reminders: [] })
diff --git a/apps/mobile/app/utils/constants.js b/apps/mobile/app/utils/constants.js
index 03a80b55e..40024e058 100644
--- a/apps/mobile/app/utils/constants.js
+++ b/apps/mobile/app/utils/constants.js
@@ -41,7 +41,8 @@ export const SORT = {
dateModified: "Date modified",
dateEdited: "Date edited",
dateCreated: "Date created",
- title: "Title"
+ title: "Title",
+ dueDate: "Due date"
};
export const itemSkus = [