From 6297bad81286f28b80771712d863c7f4e781e825 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Fri, 8 Jul 2022 15:45:24 +1200
Subject: [PATCH] Fix settings not saving

---
 SettingsPage.tsx | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/SettingsPage.tsx b/SettingsPage.tsx
index dd5707d..402d2da 100644
--- a/SettingsPage.tsx
+++ b/SettingsPage.tsx
@@ -5,6 +5,8 @@ import {Button, Snackbar, Switch, TextInput} from 'react-native-paper';
 import {DatabaseContext} from './App';
 import BatteryDialog from './BatteryDialog';
 
+const {getItem, setItem} = AsyncStorage;
+
 export default function SettingsPage() {
   const [minutes, setMinutes] = useState<string>('');
   const [seconds, setSeconds] = useState<string>('');
@@ -15,9 +17,9 @@ export default function SettingsPage() {
   const db = useContext(DatabaseContext);
 
   const refresh = async () => {
-    setMinutes((await AsyncStorage.getItem('minutes')) || '3');
-    setSeconds((await AsyncStorage.getItem('seconds')) || '');
-    setAlarmEnabled((await AsyncStorage.getItem('alarmEnabled')) === 'true');
+    setMinutes((await getItem('minutes')) || '3');
+    setSeconds((await getItem('seconds')) || '');
+    setAlarmEnabled((await getItem('alarmEnabled')) === 'true');
     NativeModules.AlarmModule.ignoringBatteryOptimizations(setIgnoring);
   };
 
@@ -25,12 +27,6 @@ export default function SettingsPage() {
     refresh();
   }, []);
 
-  useEffect(() => {
-    if (minutes) AsyncStorage.setItem('minutes', minutes);
-    if (seconds) AsyncStorage.setItem('seconds', seconds);
-    AsyncStorage.setItem('alarmEnabled', alarmEnabled ? 'true' : 'false');
-  }, [minutes, seconds, alarmEnabled]);
-
   const clear = async () => {
     setSnackbar('Deleting all data...');
     setTimeout(() => setSnackbar(''), 5000);
@@ -45,9 +41,10 @@ export default function SettingsPage() {
     NativeModules.ImportModule.sets();
   };
 
-  const changeAlarmEnabled = (enabled: boolean) => {
+  const changeAlarmEnabled = async (enabled: boolean) => {
     setAlarmEnabled(enabled);
     if (enabled && !ignoring) setShowBattery(true);
+    await setItem('alarmEnabled', enabled ? 'true' : 'false');
   };
 
   return (
@@ -57,7 +54,10 @@ export default function SettingsPage() {
         value={minutes}
         keyboardType="numeric"
         placeholder="3"
-        onChangeText={setMinutes}
+        onChangeText={async text => {
+          setMinutes(text);
+          await setItem('minutes', text);
+        }}
         style={styles.text}
       />
       <TextInput
@@ -65,7 +65,10 @@ export default function SettingsPage() {
         value={seconds}
         keyboardType="numeric"
         placeholder="30"
-        onChangeText={setSeconds}
+        onChangeText={async seconds => {
+          setSeconds(seconds);
+          await setItem('seconds', seconds);
+        }}
         style={styles.text}
       />
       <Text style={styles.text}>Rest timers</Text>