From 188cac58bd3cb855166395ccdc997895e3fec019 Mon Sep 17 00:00:00 2001
From: Sarah Jennings <marie.sarah.jennings@gmail.com>
Date: Mon, 27 Apr 2026 12:33:34 -0700
Subject: [PATCH 1/3] Fixing UI. Work in progress

---
 AlarmApp/App.tsx   | 98 ++++++++++++++++++++++++++++++++++------------
 AlarmApp/styles.js | 33 ++++++++++++++++
 2 files changed, 107 insertions(+), 24 deletions(-)

diff --git a/AlarmApp/App.tsx b/AlarmApp/App.tsx
index 62bb9b6..8ef8b4d 100644
--- a/AlarmApp/App.tsx
+++ b/AlarmApp/App.tsx
@@ -9,6 +9,7 @@ import {
   Switch,
   Alert,
   Platform,
+  Modal,
 } from 'react-native';
 import DateTimePicker from '@react-native-community/datetimepicker';
 
@@ -61,6 +62,7 @@ export default function App() {
   const [showEndPicker, setShowEndPicker] = useState<boolean>(false);
   const [showIntervalPicker, setShowIntervalPicker] = useState<boolean>(false);
   const [editingAlarmId, setEditingAlarmId] = useState<string | null>(null);
+  const [showAlarmModal, setShowAlarmModal] = useState(false);
 
   //guard against overlapping alarms
   const lastFiredRef = React.useRef<Record<string, string>>({});
@@ -192,6 +194,8 @@ export default function App() {
     setStartTime(start);
     setEndTime(end);
     setIntervalMinutes(alarm.interval);
+
+    setShowAlarmModal(true);
   };
 
   const saveEditAlarmSet = () => {
@@ -294,6 +298,64 @@ const confirmDeleteAlarmSet = (id: string) => {
         ListEmptyComponent={<Text style={styles.emptyText}>No alarms yet</Text>}
       />
 
+      <Modal
+        visible = {showAlarmModal}
+        animationType = "slide"
+        transparent = {true}
+      >
+        <View style = {styles.modalOverlay}>
+          <View style = {styles.modalBox}>
+            <Text style={styles.title}>
+              {editingAlarmId ? "Edit Alarm" : "Create Alarm"}
+            </Text>
+
+            {/* start */}
+            <Text style = {styles.summaryLabel}>Start Time</Text>
+            <TouchableOpacity onPress = {() => setShowStartPicker(true)}>
+              <Text style = {styles.timeText}>
+                {startTime.toLocaleTimeString([], {
+                  hour: '2-digit',
+                  minute: '2-digit'
+                })}
+              </Text>
+            </TouchableOpacity>
+
+            {/* end */}
+            <Text style = {styles.summaryLabel}>End Time</Text>
+            <TouchableOpacity onPress = {() => setShowEndPicker(true)}>
+              <Text style = {styles.timeText}>
+                {endTime.toLocaleTimeString([], {
+                  hour: '2-digit',
+                  minute: '2-digit'
+                })}
+              </Text>
+            </TouchableOpacity>
+
+            {/* interval picker */}
+            <Text style = {styles.summaryLabel}>Interval</Text>
+            <TouchableOpacity onPress={() => setShowIntervalPicker(true)}>
+              <Text style = {styles.timeText}>
+                Every {intervalMinutes} minutes
+              </Text>
+            </TouchableOpacity>
+
+            <Button
+              title = {editingAlarmId ? "Save Edit" : "Create"}
+              onPress={() => {
+                editingAlarmId ? saveEditAlarmSet() : CreateIntervalAlarms();
+                setShowAlarmModal(false);
+              }}
+            />
+
+            <Button
+              title = "Cancel"
+              color = "red"
+              onPress={() => setShowAlarmModal(false)}
+            />
+          </View>
+        </View>
+      </Modal>
+
       {/*Start time picker*/}
       <View style={styles.summary}>
         <Text style={styles.summaryLabel}>Start Time</Text>
@@ -303,30 +365,6 @@ const confirmDeleteAlarmSet = (id: string) => {
           </Text>
         </TouchableOpacity>
 
-        {/* end time picker */}
-        <Text style={styles.summaryLabel}>End Time</Text>
-        <TouchableOpacity onPress={() => setShowEndPicker(true)}>
-          <Text style={styles.timeText}>
-            {endTime.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
-          </Text>
-        </TouchableOpacity>
-
-        {/* interval picker */}
-        <Text style={styles.summaryLabel}>Interval</Text>
-        <TouchableOpacity
-          onPress={() => setShowIntervalPicker(true)}
-          activeOpacity={0.7}
-        >
-          <Text style={styles.timeText}>Every {intervalMinutes} minutes</Text>
-        </TouchableOpacity>
-      </View>
-
-      <Button
-        title={editingAlarmId ? "Save Edit" : "Create Alarm Set"}
-        onPress={editingAlarmId ? saveEditAlarmSet : CreateIntervalAlarms}
-        color="#4CAF50"
-      />
-
       {/* Time Pickers */}
       {showStartPicker && (
         <DateTimePicker
@@ -374,6 +412,18 @@ const confirmDeleteAlarmSet = (id: string) => {
           </TouchableOpacity>
         </View>
       )}
+
+      {/* + button */}
+      <TouchableOpacity 
+        style={styles.fab}
+        onPress={() => {
+          setEditingAlarmId(null);
+          setShowAlarmModal(true);
+        }}
+      > 
+        <Text style={styles.fabText}>+</Text>
+      </TouchableOpacity>
+      </View>
     </View>
   );
 }
\ No newline at end of file
diff --git a/AlarmApp/styles.js b/AlarmApp/styles.js
index 7b9e12d..c8c1ed4 100644
--- a/AlarmApp/styles.js
+++ b/AlarmApp/styles.js
@@ -119,6 +119,39 @@ const styles = StyleSheet.create({
     fontSize: 18,
     fontWeight: '500',
   },
+
+  fab: {
+    position: 'absolute',
+    bottom: 30,
+    right: 30,
+    backgroundColor: 'green',
+    width: 60,
+    height: 60,
+    borderRadius: 30,
+    justifyContent: 'center',
+    alignItems: 'center',
+    elevation: 5,
+  },
+
+  fabText: {
+    color: 'white',
+    fontSize: 32,
+    fontWeight: 'bold',
+  },
+
+  modalOverlay: {
+    flex: 1,
+    backgroundColor: 'black',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+
+  modalBox: {
+    width: '85%',
+    backgroundColor: 'white',
+    borderRadius: 15,
+    padding: 20,
+  },
 });
 
 

From 84a4f5a6f30209ccedc6629446f23450bc09cf06 Mon Sep 17 00:00:00 2001
From: Sarah Jennings <marie.sarah.jennings@gmail.com>
Date: Wed, 29 Apr 2026 02:32:52 -0700
Subject: [PATCH 2/3] Turning interval picker into a dropdown within modal.
 also possibly soemthing sinister

---
 AlarmApp/App.tsx                | 22 +++++++++++++++++++++-
 AlarmApp/styles.js              | 18 ++++++++++++++++++
 node_modules/.package-lock.json |  6 ++++++
 package-lock.json               |  6 ++++++
 package.json                    |  1 +
 5 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 node_modules/.package-lock.json
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/AlarmApp/App.tsx b/AlarmApp/App.tsx
index 8ef8b4d..2832fe6 100644
--- a/AlarmApp/App.tsx
+++ b/AlarmApp/App.tsx
@@ -63,6 +63,7 @@ export default function App() {
   const [showIntervalPicker, setShowIntervalPicker] = useState<boolean>(false);
   const [editingAlarmId, setEditingAlarmId] = useState<string | null>(null);
   const [showAlarmModal, setShowAlarmModal] = useState(false);
+  const [intervalDropdownOpen, setIntervalDropdownOpen] = useState(false);
 
   //guard against overlapping alarms
   const lastFiredRef = React.useRef<Record<string, string>>({});
@@ -333,12 +334,31 @@ const confirmDeleteAlarmSet = (id: string) => {
 
             {/* interval picker */}
             <Text style = {styles.summaryLabel}>Interval</Text>
-            <TouchableOpacity onPress={() => setShowIntervalPicker(true)}>
+            <TouchableOpacity
+              onPress = {() => setIntervalDropdownOpen(!intervalDropdownOpen)}
+              style = {styles.dropdownButton}
+            >
               <Text style = {styles.timeText}>
                 Every {intervalMinutes} minutes
               </Text>
             </TouchableOpacity>
 
+            {intervalDropdownOpen && (
+              <View style = {styles.dropdownBox}>
+                {intervalOptions.map((min) => (
+                  <TouchableOpacity
+                    key = {min}
+                    onPress = {() => {
+                      setIntervalMinutes(min);
+                      setIntervalDropdownOpen(false);
+                    }}
+                    style = {styles.dropdownItem}
+                  >
+                    <Text>{min} minutes</Text>
+                  </TouchableOpacity>
+                ))}
+              </View>
+            )}
             <Button
               title = {editingAlarmId ? "Save Edit" : "Create"}
               onPress={() => {
diff --git a/AlarmApp/styles.js b/AlarmApp/styles.js
index c8c1ed4..5da4a4a 100644
--- a/AlarmApp/styles.js
+++ b/AlarmApp/styles.js
@@ -152,6 +152,24 @@ const styles = StyleSheet.create({
     borderRadius: 15,
     padding: 20,
   },
+
+  dropdownBox: {
+    backgroundColor: 'white',
+    borderWidth: 1,
+    borderColor: 'black',
+    borderRadius: 8,
+    marginTop: 5,
+  },
+
+  dropdownItem: {
+    padding: 10,
+    borderBottomWidth: 1,
+    borderBottomColor: 'white'
+  },
+
+  dropdownButton: {
+    paddingVertical: 10,
+  },
 });
 
 
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
new file mode 100644
index 0000000..d3d9763
--- /dev/null
+++ b/node_modules/.package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "alarmflow",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..d3d9763
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "alarmflow",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/package.json
@@ -0,0 +1 @@
+{}

From 4d54d514c9c6266842b0d1aa87b62d0d2314f249 Mon Sep 17 00:00:00 2001
From: SynthNibbler <tmotley@csuchico.edu>
Date: Wed, 29 Apr 2026 21:24:00 -0700
Subject: [PATCH 3/3] Bright color palette with blue and off white

---
 AlarmApp/App.tsx   |  2 ++
 AlarmApp/styles.js | 35 +++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/AlarmApp/App.tsx b/AlarmApp/App.tsx
index 2832fe6..43ea862 100644
--- a/AlarmApp/App.tsx
+++ b/AlarmApp/App.tsx
@@ -279,6 +279,8 @@ const confirmDeleteAlarmSet = (id: string) => {
             <Switch
               value={item.active}
               onValueChange={() => toggleAlarmSet(item.id)}
+              trackColor={{ false: 'grey', true: '#d6ecff' }}
+              thumbColor={item.active ? '#2196f3' : '#d6ecff'}
             />
             {/* summarized alarm text */}
             <Text style={styles.alarmText}>
diff --git a/AlarmApp/styles.js b/AlarmApp/styles.js
index 5da4a4a..5bcf2a6 100644
--- a/AlarmApp/styles.js
+++ b/AlarmApp/styles.js
@@ -7,7 +7,7 @@ const styles = StyleSheet.create({
   container: { 
     flex: 1, 
     padding: 20, 
-    backgroundColor: '#fff' 
+    backgroundColor: '#FAF8F2' //soft paper white
   },
 
   title: { 
@@ -17,16 +17,17 @@ const styles = StyleSheet.create({
     textAlign: 'center' 
   },
 
+  //alarm batch/set
   alarmItem: {
     flexDirection: 'row',
     alignItems: 'center',
     padding: 14,
     borderBottomWidth: 1,
     borderColor: '#ddd',
-    backgroundColor: '#fff',
+    backgroundColor: 'white',
   },
 
-  alarmText: { 
+  alarmText: {
     marginLeft: 12, 
     fontSize: 16, 
     flex: 1,
@@ -52,17 +53,17 @@ const styles = StyleSheet.create({
   emptyText: { 
     textAlign: 'center', 
     marginTop: 40, 
-    color: '#888', 
+    color: '#888',
     fontSize: 16 
   },
 
   summary: {
     marginVertical: 24,
     padding: 16,
-    backgroundColor: '#f8f9fa',
+    backgroundColor: '#faf8f2', //soft paper white
     borderRadius: 12,
     borderWidth: 1,
-    borderColor: '#e0e0e0',
+    borderColor: '#2196f3',
   },
 
   summaryLabel: { 
@@ -79,13 +80,13 @@ const styles = StyleSheet.create({
     paddingVertical: 10,
     paddingHorizontal: 14,
     marginVertical: 4,
-    backgroundColor: '#fff',
+    backgroundColor: 'white', //pale blue
     borderRadius: 10,
     borderWidth: 1,
     borderColor: '#e0e0e0',
 
     // slight shadow to make touchable noticable
-    shadowColor: '#000',
+    shadowColor: 'black',
     shadowOffset: { width: 0, height: 2 },
     shadowOpacity: 0.12,
     shadowRadius: 3,
@@ -93,17 +94,19 @@ const styles = StyleSheet.create({
   },
 
   clickable: { 
-    color: '#2196F3', 
-    marginVertical: 4, 
+    color: '#2196f3',  //Recycling-bin blue
+    marginVertical: 4,
     fontWeight: '500' 
   },
 
+/* old interval picker, not used
   intervalPicker: {
     marginTop: 20,
     padding: 20,
-    backgroundColor: '#f0f0f0',
+    backgroundColor: 'red',
     borderRadius: 12,
   },
+*/
 
   intervalOption: {
     paddingVertical: 14,
@@ -122,9 +125,9 @@ const styles = StyleSheet.create({
 
   fab: {
     position: 'absolute',
-    bottom: 30,
-    right: 30,
-    backgroundColor: 'green',
+    bottom: 80,
+    right: -2,
+    backgroundColor: '#2196f3', //Recycling bin blue
     width: 60,
     height: 60,
     borderRadius: 30,
@@ -141,14 +144,14 @@ const styles = StyleSheet.create({
 
   modalOverlay: {
     flex: 1,
-    backgroundColor: 'black',
+    backgroundColor: '#d6ecff', //pale blue
     justifyContent: 'center',
     alignItems: 'center',
   },
 
   modalBox: {
     width: '85%',
-    backgroundColor: 'white',
+    backgroundColor: '#faf8f2', //soft paper white
     borderRadius: 15,
     padding: 20,
   },