diff --git a/SettingsPage.tsx b/SettingsPage.tsx index a4f2b23..b473559 100644 --- a/SettingsPage.tsx +++ b/SettingsPage.tsx @@ -19,29 +19,21 @@ interface Input { } export default function SettingsPage() { - const [vibrate, setVibrate] = useState(true); - const [alarm, setAlarm] = useState(false); - const [predict, setPredict] = useState(false); - const [sound, setSound] = useState(''); - const [notify, setNotify] = useState(false); - const [images, setImages] = useState(false); const [battery, setBattery] = useState(false); const [ignoring, setIgnoring] = useState(false); const [search, setSearch] = useState(''); - const [showUnit, setShowUnit] = useState(true); + const [vibrate, setVibrate] = useState(!!settings.vibrate); + const [alarm, setAlarm] = useState(!!settings.alarm); + const [predict, setPredict] = useState(!!settings.predict); + const [sound, setSound] = useState(settings.sound); + const [notify, setNotify] = useState(!!settings.notify); + const [images, setImages] = useState(!!settings.images); + const [showUnit, setShowUnit] = useState(!!settings.showUnit); const {color, setColor} = useContext(CustomTheme); const {toast} = useContext(SnackbarContext); useFocusEffect( useCallback(() => { - console.log('SettingsPage.refresh:', {settings}); - setAlarm(!!settings.alarm); - setPredict(!!settings.predict); - setVibrate(!!settings.vibrate); - setSound(settings.sound ?? ''); - setNotify(!!settings.notify); - setImages(!!settings.images); - setShowUnit(!!settings.showUnit); NativeModules.AlarmModule.ignoringBattery(setIgnoring); }, []), ); diff --git a/settings.service.ts b/settings.service.ts index 70a8c0e..3e6333f 100644 --- a/settings.service.ts +++ b/settings.service.ts @@ -10,6 +10,7 @@ export const getSettings = async () => { }; export const updateSettings = async (value: Settings) => { + console.log(`${updateSettings.name}`, {value}); const keys = Object.keys(value) as (keyof Settings)[]; const sets = keys.map(key => `${key}=?`).join(','); const update = `UPDATE settings SET ${sets}`;