diff --git a/apps/mobile/app/components/list-items/note/index.js b/apps/mobile/app/components/list-items/note/index.js
index 63020a532..fe49f45b0 100644
--- a/apps/mobile/app/components/list-items/note/index.js
+++ b/apps/mobile/app/components/list-items/note/index.js
@@ -37,6 +37,7 @@ import { SIZE } from "../../../utils/size";
import { Properties } from "../../properties";
import { Button } from "../../ui/button";
import { IconButton } from "../../ui/icon-button";
+import { ReminderTime } from "../../ui/reminder-time";
import { TimeSince } from "../../ui/time-since";
import Heading from "../../ui/typography/heading";
import Paragraph from "../../ui/typography/paragraph";
@@ -92,9 +93,9 @@ const NoteItem = ({
const attachmentCount = db.attachments?.ofNote(item.id, "all")?.length || 0;
const notebooks = React.useMemo(() => getNotebook(item), [item]);
const reminders = db.relations.from(item, "reminder");
- const current = getUpcomingReminder(reminders);
+ const reminder = getUpcomingReminder(reminders);
const _update = useRelationStore((state) => state.updater);
-
+ const noteColor = COLORS_NOTE[item.color?.toLowerCase()];
return (
<>
{notebooks?.map((_item) => (
) : null}
@@ -162,39 +176,6 @@ const NoteItem = ({
) : null}
- {current &&
- current.date && !current.disabled &&
- (current.mode !== "once" || current.date > Date.now() || current.snoozeUntil > Date.now()) ? (
- {
- Properties.present(current);
- }}
- style={{
- backgroundColor: colors.nav,
- borderRadius: 5,
- flexDirection: "row",
- paddingHorizontal: 5,
- paddingVertical: 3,
- alignItems: "center",
- marginTop: 5,
- justifyContent: "flex-start",
- alignSelf: "flex-start"
- }}
- >
- <>
-
-
- {formatReminderTime(current)}
-
- >
-
- ) : null}
-
@@ -88,7 +89,6 @@ const ReminderItem = React.memo(
flexWrap: "wrap"
}}
>
-
{item.disabled ? (
) : null}
- {item.date && !item.disabled ? (
-
- <>
-
-
- {formatReminderTime(item)}
-
- >
-
- ) : null}
+
+
{item.type === "note" ? (
diff --git a/apps/mobile/app/components/properties/index.js b/apps/mobile/app/components/properties/index.js
index d41f04750..33e9274d4 100644
--- a/apps/mobile/app/components/properties/index.js
+++ b/apps/mobile/app/components/properties/index.js
@@ -42,6 +42,7 @@ import {
formatReminderTime,
getUpcomingReminder
} from "@notesnook/core/collections/reminders";
+import { ReminderTime } from "../ui/reminder-time";
export const Properties = ({
close = () => {},
item,
@@ -119,37 +120,16 @@ export const Properties = ({
) : null}
{item.type === "reminder" ? (
-
- {item.date ? (
- <>
-
-
- {formatReminderTime(item)}
-
- >
- ) : null}
-
+ fontSize={SIZE.xs + 1}
+ />
) : null}
{item.type === "note" ? : null}
diff --git a/apps/mobile/app/components/sheets/reminder-notify/index.tsx b/apps/mobile/app/components/sheets/reminder-notify/index.tsx
index 5584aef8d..b9a64f2ff 100644
--- a/apps/mobile/app/components/sheets/reminder-notify/index.tsx
+++ b/apps/mobile/app/components/sheets/reminder-notify/index.tsx
@@ -101,7 +101,7 @@ export default function ReminderNotify({
alignItems: "center"
}}
>
-
+
{dayjs(reminder?.date).format("ddd, YYYY-MM-DD hh:mm A")}
diff --git a/apps/mobile/app/components/sheets/reminder/index.tsx b/apps/mobile/app/components/sheets/reminder/index.tsx
index 046b9c3f1..fd86df45d 100644
--- a/apps/mobile/app/components/sheets/reminder/index.tsx
+++ b/apps/mobile/app/components/sheets/reminder/index.tsx
@@ -46,6 +46,7 @@ import { useRelationStore } from "../../../stores/use-relation-store";
import Paragraph from "../../ui/typography/paragraph";
import PremiumService from "../../../services/premium";
import DatePicker from "react-native-date-picker";
+import { ReminderTime } from "../../ui/reminder-time";
type ReminderSheetProps = {
actionSheetRef: RefObject;
@@ -528,31 +529,17 @@ export default function ReminderSheet({
)}
- {reminder && reminder.date ? (
-
- <>
-
-
- {formatReminderTime(reminder)}
-
- >
-
- ) : null}
+
+
.
+*/
+import React from "react";
+import {
+ formatReminderTime,
+ isReminderActive
+} from "@notesnook/core/collections/reminders";
+import { ViewStyle } from "react-native";
+
+import { Reminder } from "../../../services/notifications";
+import { Button, ButtonProps } from "../button";
+import { useThemeStore } from "../../../stores/use-theme-store";
+import { SIZE } from "../../../utils/size";
+
+export const ReminderTime = ({
+ checkIsActive = true,
+ style,
+ ...props
+}: {
+ short?: boolean;
+ onPress?: () => void;
+ reminder?: Reminder;
+ color?: string;
+ style?: ViewStyle;
+ checkIsActive?: boolean;
+} & ButtonProps) => {
+ const colors = useThemeStore((state) => state.colors);
+ const reminder = props.reminder;
+ const time = !reminder ? undefined : formatReminderTime(reminder);
+ const isTodayOrTomorrow =
+ (time?.includes("Today") || time?.includes("Tomorrow")) &&
+ !time?.includes("Last");
+ const isActive =
+ checkIsActive && reminder ? isReminderActive(reminder) : true;
+
+ return reminder && isActive ? (
+
+ ) : null;
+};
diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsx
index b4acecc87..c17e8f807 100644
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -837,7 +837,7 @@ export const settingsGroups: SettingSection[] = [
id: "reminders",
type: "screen",
name: "Reminders",
- icon: "clock-outline",
+ icon: "bell",
description: "Manage and configure reminders in app",
sections: [
{
diff --git a/apps/mobile/app/utils/constants.js b/apps/mobile/app/utils/constants.js
index ab76ea724..d76e81478 100644
--- a/apps/mobile/app/utils/constants.js
+++ b/apps/mobile/app/utils/constants.js
@@ -130,7 +130,7 @@ export const MenuItemsList = [
},
{
name: "Reminders",
- icon: "clock-outline",
+ icon: "bell",
close: true
},
{