A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: show note references in reminder page
Ammar Ahmedf15b4cf6341a
diff --git a/apps/mobile/app/components/list-items/note/index.tsx b/apps/mobile/app/components/list-items/note/index.tsxindex 91bd179cd..afbaae87e 100644--- a/apps/mobile/app/components/list-items/note/index.tsx+++ b/apps/mobile/app/components/list-items/note/index.tsx@@ -252,14 +252,16 @@ const NoteItem = ({{reminder ? (<ReminderTimereminder={reminder}- disabledcolor={color?.colorCode}textStyle={{- fontSize: AppFontSize.xxxs+ fontSize: AppFontSize.xxs}}- iconSize={AppFontSize.xxxs}+ short+ iconSize={AppFontSize.xxs}style={{- height: "auto"+ justifyContent: "flex-start",+ paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL / 2,+ alignSelf: "flex-start"}}/>) : null}diff --git a/apps/mobile/app/components/ui/reminder-time/index.tsx b/apps/mobile/app/components/ui/reminder-time/index.tsxindex cc127be88..e1da6a88d 100644--- a/apps/mobile/app/components/ui/reminder-time/index.tsx+++ b/apps/mobile/app/components/ui/reminder-time/index.tsx@@ -41,7 +41,9 @@ export const ReminderTime = ({} & ButtonProps) => {const { colors } = useThemeColors();const reminder = props.reminder;- const time = !reminder ? undefined : getFormattedReminderTime(reminder);+ const time = !reminder+ ? undefined+ : getFormattedReminderTime(reminder, props.short || false);const isTodayOrTomorrow =(time?.includes("Today") || time?.includes("Tomorrow")) &&!time?.includes("Last");diff --git a/apps/mobile/app/screens/add-reminder/index.tsx b/apps/mobile/app/screens/add-reminder/index.tsxindex 79289f996..59194dc1e 100644--- a/apps/mobile/app/screens/add-reminder/index.tsx+++ b/apps/mobile/app/screens/add-reminder/index.tsx@@ -39,7 +39,7 @@ import Input from "../../components/ui/input";import { ReminderTime } from "../../components/ui/reminder-time";import Paragraph from "../../components/ui/typography/paragraph";import { DDS } from "../../services/device-detection";-import { ToastManager } from "../../services/event-manager";+import { eSendEvent, ToastManager } from "../../services/event-manager";import Navigation, { NavigationProps } from "../../services/navigation";import Notifications from "../../services/notifications";import SettingsService from "../../services/settings";@@ -47,9 +47,18 @@ import { useRelationStore } from "../../stores/use-relation-store";import { useSettingStore } from "../../stores/use-setting-store";import { AppFontSize, defaultBorderRadius } from "../../utils/size";import { DefaultAppStyles } from "../../utils/styles";-import { getFormattedDate, useIsFeatureAvailable } from "@notesnook/common";+import {+ getFormattedDate,+ useIsFeatureAvailable,+ usePromise+} from "@notesnook/common";import PaywallSheet from "../../components/sheets/paywall";import { useNavigationFocus } from "../../hooks/use-navigation-focus";+import { Pressable } from "../../components/ui/pressable";+import { TimeSince } from "../../components/ui/time-since";+import Heading from "../../components/ui/typography/heading";+import { eOnLoadNote } from "../../utils/events";+import { fluidTabsRef } from "../../utils/global-refs";const ReminderModes =Platform.OS === "ios"@@ -123,6 +132,15 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {const titleRef = useRef<TextInput>(null);const descriptionRef = useRef<TextInput>(null);const timer = useRef<NodeJS.Timeout>(undefined);+ const referencedNotes = usePromise(+ () =>+ reminder?.id+ ? db.relations+ .to({ id: reminder.id, type: "reminder" }, "note")+ .resolve()+ : null,+ [reminder?.id]+ );const showDatePicker = () => {setDatePickerVisibility(true);@@ -245,6 +263,9 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {marginBottom: DDS.isTab ? 25 : undefined,paddingHorizontal: DefaultAppStyles.GAP}}+ contentContainerStyle={{+ gap: DefaultAppStyles.GAP_VERTICAL+ }}keyboardDismissMode="interactive"keyboardShouldPersistTaps="handled">@@ -279,15 +300,11 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {paddingVertical: DefaultAppStyles.GAP_VERTICAL}}height={80}- wrapperStyle={{- marginBottom: DefaultAppStyles.GAP_VERTICAL- }}/><ScrollViewstyle={{- flexDirection: "row",- marginBottom: DefaultAppStyles.GAP_VERTICAL+ flexDirection: "row"}}horizontal>@@ -343,8 +360,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {style={{backgroundColor: colors.secondary.background,padding: DefaultAppStyles.GAP,- borderRadius: defaultBorderRadius,- marginBottom: DefaultAppStyles.GAP_VERTICAL+ borderRadius: defaultBorderRadius}}><View@@ -462,7 +478,6 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {width: "100%",flexDirection: "column",justifyContent: "center",- marginBottom: DefaultAppStyles.GAP_VERTICAL,alignItems: "center"}}>@@ -521,10 +536,8 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {style={{borderRadius: defaultBorderRadius,flexDirection: "row",- paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,alignItems: "center",- justifyContent: "flex-start",- marginBottom: DefaultAppStyles.GAP_VERTICAL+ justifyContent: "flex-start"}}><>@@ -560,22 +573,10 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {</View>)}- <ReminderTime- reminder={reminder}- style={{- width: "100%",- justifyContent: "flex-start",- borderWidth: 0,- paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,- alignSelf: "flex-start"- }}- />-{reminderMode === ReminderModes.Permanent ? null : (<ScrollViewstyle={{flexDirection: "row",- marginTop: DefaultAppStyles.GAP_VERTICAL,height: 50}}horizontal@@ -620,6 +621,60 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {))}</ScrollView>)}++ <ReminderTime+ reminder={reminder}+ style={{+ width: "100%",+ justifyContent: "flex-start",+ paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,+ alignSelf: "flex-start"+ }}+ />++ {referencedNotes &&+ referencedNotes.status === "fulfilled" &&+ referencedNotes.value !== null &&+ referencedNotes.value?.length > 0 ? (+ <View+ style={{+ gap: DefaultAppStyles.GAP_VERTICAL+ }}+ >+ <Heading size={AppFontSize.md}>{strings.referencedIn()}</Heading>+ {referencedNotes.value.map((item) => (+ <Pressable+ style={{+ justifyContent: "space-between",+ flexDirection: "row",+ paddingHorizontal: DefaultAppStyles.GAP,+ paddingVertical: DefaultAppStyles.GAP_VERTICAL+ }}+ onPress={() => {+ Navigation.navigate("FluidPanelsView");+ fluidTabsRef.current?.goToPage("editor");+ eSendEvent(eOnLoadNote, {+ item: item+ });+ }}+ type="secondary"+ >+ <Paragraph>{item.title}</Paragraph>+ <TimeSince+ style={{+ fontSize: AppFontSize.xxs,+ color: colors.secondary.paragraph,+ marginRight: 6+ }}+ time={item.dateEdited}+ updateFrequency={+ Date.now() - item.dateEdited < 60000 ? 2000 : 60000+ }+ />+ </Pressable>+ ))}+ </View>+ ) : null}</ScrollView></KeyboardViewIOS></SafeAreaView>diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.jsonindex 1e2c4edd6..9409d3e6a 100644--- a/apps/mobile/package-lock.json+++ b/apps/mobile/package-lock.json@@ -1,12 +1,12 @@{"name": "@notesnook/mobile",- "version": "3.3.13-beta.0",+ "version": "3.3.13-beta.1","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "@notesnook/mobile",- "version": "3.3.13-beta.0",+ "version": "3.3.13-beta.1","hasInstallScript": true,"license": "GPL-3.0-or-later","dependencies": {