From e1b7e80e2fab630d705ecfa2d07fb42a320f3841 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Mon, 26 Sep 2022 19:13:24 +1300
Subject: [PATCH] Revert "Add setting for showing date by default"

This reverts commit e8715162a0cd859ed237fbfc5169be8d12f95ba9.
---
 SetList.tsx      |  3 +--
 SettingsPage.tsx | 13 -------------
 TimerPage.tsx    | 16 ++++------------
 db.ts            |  3 ---
 settings.ts      |  1 -
 5 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/SetList.tsx b/SetList.tsx
index be59133..cc2e9e1 100644
--- a/SetList.tsx
+++ b/SetList.tsx
@@ -26,7 +26,7 @@ export default function SetList() {
   const [offset, setOffset] = useState(0);
   const [search, setSearch] = useState('');
   const [end, setEnd] = useState(false);
-  const [dates, setDates] = useState(!!settings.showDate);
+  const [dates, setDates] = useState(false);
   const [images, setImages] = useState(true);
   const navigation = useNavigation<NavigationProp<HomePageParams>>();
 
@@ -75,7 +75,6 @@ export default function SetList() {
         headerRight: () => <DrawerMenu name="Home" />,
       });
       setImages(!!settings.images);
-      setDates(!!settings.showDate);
     }, [refresh, navigation]),
   );
 
diff --git a/SettingsPage.tsx b/SettingsPage.tsx
index ee85f07..ddd5d1f 100644
--- a/SettingsPage.tsx
+++ b/SettingsPage.tsx
@@ -28,7 +28,6 @@ export default function SettingsPage() {
   const [workouts, setWorkouts] = useState(!!settings.workouts);
   const [steps, setSteps] = useState(!!settings.steps);
   const [date, setDate] = useState('%Y-%m-%d %H:%M');
-  const [showDate, setShowDate] = useState(false);
   const {color, setColor} = useContext(CustomTheme);
   const {toast} = useContext(SnackbarContext);
 
@@ -51,7 +50,6 @@ export default function SettingsPage() {
       workouts: +workouts,
       steps: +steps,
       date,
-      showDate: +showDate,
     });
     getSettings();
   }, [
@@ -66,7 +64,6 @@ export default function SettingsPage() {
     workouts,
     steps,
     date,
-    showDate,
   ]);
 
   const changeAlarmEnabled = useCallback(
@@ -152,15 +149,6 @@ export default function SettingsPage() {
     [toast],
   );
 
-  const changeShowDate = useCallback(
-    (enabled: boolean) => {
-      setShowDate(enabled);
-      if (enabled) toast('Show date for sets by default.', 4000);
-      else toast('Stopped showing date for sets by default.', 4000);
-    },
-    [toast],
-  );
-
   const switches: Input<boolean>[] = [
     {name: 'Rest timers', value: alarm, onChange: changeAlarmEnabled},
     {name: 'Vibrate', value: vibrate, onChange: changeVibrate},
@@ -170,7 +158,6 @@ export default function SettingsPage() {
     {name: 'Show unit', value: showUnit, onChange: changeUnit},
     {name: 'Show workouts', value: workouts, onChange: changeWorkouts},
     {name: 'Show steps', value: steps, onChange: changeSteps},
-    {name: 'Show date', value: showDate, onChange: changeShowDate},
   ];
 
   return (
diff --git a/TimerPage.tsx b/TimerPage.tsx
index 78a959f..2569055 100644
--- a/TimerPage.tsx
+++ b/TimerPage.tsx
@@ -39,18 +39,17 @@ export default function TimerPage() {
 
   const tick = (date: Date) => {
     const remaining = date.getTime() - new Date().getTime();
-    console.log(`${TimerPage.name}.tick`, {remaining});
-    if (remaining <= 0) return 0;
+    console.log(`${TimerPage.name}.useEffect`, {remaining});
+    if (remaining <= 0) return;
     setMs(remaining);
-    return remaining;
   };
 
   useEffect(() => {
     console.log(`${TimerPage.name}.useEffect:`, {next});
     const date = next || new Date();
-    if (tick(date) <= 0) return;
+    tick(date);
     const id = setInterval(() => {
-      if (tick(date) <= 0) clearInterval(id);
+      tick(date);
     }, 1000);
     setIntervalId(oldId => {
       clearInterval(oldId);
@@ -76,13 +75,6 @@ export default function TimerPage() {
     setNext(date);
     NativeModules.AlarmModule.add(ms, !!settings.vibrate, settings.sound);
     tick(date);
-    const id = setInterval(() => {
-      if (tick(date) <= 0) clearInterval(id);
-    }, 1000);
-    setIntervalId(oldId => {
-      clearInterval(oldId);
-      return id;
-    });
   };
 
   return (
diff --git a/db.ts b/db.ts
index 040310e..33a8440 100644
--- a/db.ts
+++ b/db.ts
@@ -106,9 +106,6 @@ const migrations = [
   `
     ALTER TABLE settings ADD COLUMN date TEXT NULL
   `,
-  `
-    ALTER TABLE settings ADD COLUMN showDate BOOLEAN DEFAULT 0
-  `,
 ];
 
 export let db: SQLiteDatabase;
diff --git a/settings.ts b/settings.ts
index 70441de..a5d7b2b 100644
--- a/settings.ts
+++ b/settings.ts
@@ -11,5 +11,4 @@ export default interface Settings {
   steps: number;
   nextAlarm?: string;
   date?: string;
-  showDate: number;
 }