From 14edb66e28adcc9e4c60268538f467d829ed0ca9 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Fri, 30 Dec 2022 13:35:11 +1300 Subject: [PATCH] Add common date formats Add yyyy-MM-d and yyyy.MM.d formats Closes #139 --- SettingsPage.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SettingsPage.tsx b/SettingsPage.tsx index 133bc6d..7ff92c4 100644 --- a/SettingsPage.tsx +++ b/SettingsPage.tsx @@ -20,12 +20,13 @@ import Switch from './Switch' import {toast} from './toast' import {useTheme} from './use-theme' -const defaultFormats = ['P', 'Pp', 'ccc p', 'p'] +const twelveHours = ['P', 'Pp', 'ccc p', 'p', 'yyyy-MM-d', 'yyyy.MM.d'] +const twentyFours = ['P', 'P, k:m', 'ccc k:m', 'k:m', 'yyyy-MM-d', 'yyyy.MM.d'] export default function SettingsPage() { const [ignoring, setIgnoring] = useState(false) const [term, setTerm] = useState('') - const [formatOptions, setFormatOptions] = useState(defaultFormats) + const [formatOptions, setFormatOptions] = useState(twelveHours) const [importing, setImporting] = useState(false) const [settings, setSettings] = useState(new Settings()) const {reset} = useNavigation>() @@ -39,8 +40,8 @@ export default function SettingsPage() { NativeModules.SettingsModule.ignoringBattery(setIgnoring) NativeModules.SettingsModule.is24().then((is24: boolean) => { console.log(`${SettingsPage.name}.focus:`, {is24}) - if (is24) setFormatOptions(['P', 'P, k:m', 'ccc k:m', 'k:m']) - else setFormatOptions(defaultFormats) + if (is24) setFormatOptions(twentyFours) + else setFormatOptions(twelveHours) }) }, [])