From 3691c729b46da9c725202b85a8b185563e6a9fd1 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Mon, 26 Sep 2022 19:13:48 +1300
Subject: [PATCH] Revert "Add setting for date format"

This reverts commit 023041b84604b922d58ee3e193b3f3944ab65a7e.
---
 SettingsPage.tsx | 20 --------------------
 db.ts            |  3 ---
 set.service.ts   | 13 ++-----------
 settings.ts      |  1 -
 4 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/SettingsPage.tsx b/SettingsPage.tsx
index ddd5d1f..5a8437b 100644
--- a/SettingsPage.tsx
+++ b/SettingsPage.tsx
@@ -27,7 +27,6 @@ export default function SettingsPage() {
   const [showUnit, setShowUnit] = useState(!!settings.showUnit);
   const [workouts, setWorkouts] = useState(!!settings.workouts);
   const [steps, setSteps] = useState(!!settings.steps);
-  const [date, setDate] = useState('%Y-%m-%d %H:%M');
   const {color, setColor} = useContext(CustomTheme);
   const {toast} = useContext(SnackbarContext);
 
@@ -49,7 +48,6 @@ export default function SettingsPage() {
       color,
       workouts: +workouts,
       steps: +steps,
-      date,
     });
     getSettings();
   }, [
@@ -63,7 +61,6 @@ export default function SettingsPage() {
     color,
     workouts,
     steps,
-    date,
   ]);
 
   const changeAlarmEnabled = useCallback(
@@ -192,23 +189,6 @@ export default function SettingsPage() {
             ))}
           </Picker>
         )}
-        {'date format'.includes(search.toLowerCase()) && (
-          <Picker
-            style={{color}}
-            dropdownIconColor={color}
-            selectedValue={date}
-            onValueChange={value => setDate(value)}>
-            <Picker.Item
-              value="%Y-%m-%d %H:%M"
-              label="Format date as 1990-12-24 15:05"
-            />
-            <Picker.Item
-              value="%Y-%m-%d"
-              label="Format date as 1990-12-24 (YYYY-MM-dd)"
-            />
-            <Picker.Item value="%m-%d" label="Format date as 12-24 (MM-dd)" />
-          </Picker>
-        )}
         {'alarm sound'.includes(search.toLowerCase()) && (
           <Button style={{alignSelf: 'flex-start'}} onPress={changeSound}>
             Alarm sound
diff --git a/db.ts b/db.ts
index 33a8440..024ffc6 100644
--- a/db.ts
+++ b/db.ts
@@ -103,9 +103,6 @@ const migrations = [
   `
     ALTER TABLE settings ADD COLUMN nextAlarm TEXT NULL
   `,
-  `
-    ALTER TABLE settings ADD COLUMN date TEXT NULL
-  `,
 ];
 
 export let db: SQLiteDatabase;
diff --git a/set.service.ts b/set.service.ts
index bd20dd4..d6d6d8c 100644
--- a/set.service.ts
+++ b/set.service.ts
@@ -1,6 +1,5 @@
 import {db} from './db';
 import Set from './set';
-import {settings} from './settings.service';
 
 export const updateSet = async (value: Set) => {
   const update = `
@@ -66,21 +65,13 @@ export const getSets = async ({
   limit,
   offset,
 }: PageParams): Promise<Set[]> => {
-  const format = settings.date || '%Y-%m-%d %H:%M';
   const select = `
-    SELECT id, name, reps, weight, sets, minutes, seconds, 
-      STRFTIME(?, created) as created, unit, image, steps 
-    FROM sets 
+    SELECT * from sets 
     WHERE name LIKE ? AND NOT hidden
     ORDER BY created DESC 
     LIMIT ? OFFSET ?
   `;
-  const [result] = await db.executeSql(select, [
-    format,
-    `%${search}%`,
-    limit,
-    offset,
-  ]);
+  const [result] = await db.executeSql(select, [`%${search}%`, limit, offset]);
   return result.rows.raw();
 };
 
diff --git a/settings.ts b/settings.ts
index a5d7b2b..a1690ce 100644
--- a/settings.ts
+++ b/settings.ts
@@ -10,5 +10,4 @@ export default interface Settings {
   workouts: number;
   steps: number;
   nextAlarm?: string;
-  date?: string;
 }