From fa0c0a4cb37fe8e856625b5a0d85ddc306980c15 Mon Sep 17 00:00:00 2001
From: Thomas Irvine <tom.irvine@slu.edu>
Date: Mon, 4 Mar 2024 13:38:38 -0600
Subject: [PATCH 1/6] small change forcing fresh time grab on note save

---
 lib/screens/AddNoteScreen.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/screens/AddNoteScreen.tsx b/lib/screens/AddNoteScreen.tsx
index d42aded..cd309a4 100644
--- a/lib/screens/AddNoteScreen.tsx
+++ b/lib/screens/AddNoteScreen.tsx
@@ -207,6 +207,8 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
           longitude = userLocation.coords.longitude.toString();
         }
         
+        setTime(new Date()); //force a fresh time date grab on note save
+
         const newNote = {
           title: titleText,
           text: bodyText,

From aa7c978abcb3d73c0597074051474ca8f92f702e Mon Sep 17 00:00:00 2001
From: Thomas Irvine <tom.irvine@slu.edu>
Date: Sun, 17 Mar 2024 17:44:55 -0500
Subject: [PATCH 2/6] component side changes to location

---
 lib/components/location.tsx | 56 ++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/lib/components/location.tsx b/lib/components/location.tsx
index d96c01b..41239cc 100644
--- a/lib/components/location.tsx
+++ b/lib/components/location.tsx
@@ -27,12 +27,12 @@ async function getLocation() {
     let { status } = await Location.requestForegroundPermissionsAsync();
     if (status !== "granted") {
       console.log("Permission to access location was denied");
-      return null; // Return null to indicate that location access is denied
+      return null;
     }
     return await Location.getCurrentPositionAsync({});
   } catch (error) {
     console.error("Error getting location:", error);
-    return null; // Return null to indicate an error occurred while getting location
+    return null;
   }
 }
 
@@ -73,6 +73,7 @@ export default function LocationWindow({
     location?.longitude?.toString() || ""
   );
   const [distanceFromEvent, setDistanceFromEvent] = useState<string>("");
+  const [isLocationShown, setIsLocationShown] = useState(false);
 
   useEffect(() => {
     const updateDistance = async () => {
@@ -103,26 +104,38 @@ export default function LocationWindow({
     setLongitude(location?.longitude?.toString() || "");
   }, [location]);
 
-  const setShownLocation = async () => {
-    try {
-      let userLocation = await getLocation();
-  
-      if (userLocation?.coords?.latitude !== undefined && userLocation?.coords?.longitude !== undefined) {
-        setLocation({
-          latitude: userLocation.coords.latitude,
-          longitude: userLocation.coords.longitude,
-        });
-  
-        setLatitude(userLocation.coords.latitude.toString());
-        setLongitude(userLocation.coords.longitude.toString());
-      } else {
-        console.log("Location data is not available.");
+  const toggleLocationVisibility = async () => {
+    if (isLocationShown) {
+      // Hide Location
+      setLocation({
+        latitude: 0,
+        longitude: 0,
+      });
+      setLatitude("0");
+      setLongitude("0");
+    } else {
+      // Show Location
+      try {
+        let userLocation = await getLocation();
+    
+        if (userLocation?.coords?.latitude !== undefined && userLocation?.coords?.longitude !== undefined) {
+          setLocation({
+            latitude: userLocation.coords.latitude,
+            longitude: userLocation.coords.longitude,
+          });
+    
+          setLatitude(userLocation.coords.latitude.toString());
+          setLongitude(userLocation.coords.longitude.toString());
+        } else {
+          console.log("Location data is not available.");
+        }
+      } catch (error) {
+        console.error("Error setting location:", error);
       }
-    } catch (error) {
-      console.error("Error setting location:", error);
     }
+    setIsLocationShown((prev) => !prev);
   };
-  
+
   const getDistance = async () => {
     const lat1 = location?.latitude || 0;
     const lon1 = location?.longitude || 0;
@@ -151,7 +164,10 @@ export default function LocationWindow({
         value={latitude}
         onChangeText={handleLatitudeChange}
       />
-      <Button title="Use Current Location" onPress={setShownLocation} />
+      <Button
+        title={isLocationShown ? "Hide Location" : "Show Location"}
+        onPress={toggleLocationVisibility}
+      />
     </View>
   );
 }

From 096d8d1b79bb51cdb9d2299b21e16756807ae0f7 Mon Sep 17 00:00:00 2001
From: Thomas Irvine <tom.irvine@slu.edu>
Date: Sun, 17 Mar 2024 17:53:54 -0500
Subject: [PATCH 3/6] inverting the time comp to initally show hide, and
 changes to the addnotescreen to not set location on save

---
 lib/components/location.tsx   | 11 +---------
 lib/screens/AddNoteScreen.tsx | 39 +++++++++++++++++++----------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/lib/components/location.tsx b/lib/components/location.tsx
index 41239cc..6473b89 100644
--- a/lib/components/location.tsx
+++ b/lib/components/location.tsx
@@ -73,7 +73,7 @@ export default function LocationWindow({
     location?.longitude?.toString() || ""
   );
   const [distanceFromEvent, setDistanceFromEvent] = useState<string>("");
-  const [isLocationShown, setIsLocationShown] = useState(false);
+  const [isLocationShown, setIsLocationShown] = useState(true);
 
   useEffect(() => {
     const updateDistance = async () => {
@@ -136,15 +136,6 @@ export default function LocationWindow({
     setIsLocationShown((prev) => !prev);
   };
 
-  const getDistance = async () => {
-    const lat1 = location?.latitude || 0;
-    const lon1 = location?.longitude || 0;
-    const currentLocation = await getLocation();
-    const lat2 = currentLocation?.coords.latitude || 0;
-    const lon2 = currentLocation?.coords.longitude || 0;
-    return getDistanceFrom(lat1, lon1, lat2, lon2);
-  };
-
   return (
     <View style={styles.container}>
       <View style={styles.distanceContainer}>
diff --git a/lib/screens/AddNoteScreen.tsx b/lib/screens/AddNoteScreen.tsx
index cd309a4..5a9a9de 100644
--- a/lib/screens/AddNoteScreen.tsx
+++ b/lib/screens/AddNoteScreen.tsx
@@ -84,6 +84,24 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
     };
   }, []);
 
+  useEffect(() => {
+    if (!location?.latitude && !location?.longitude) {
+      grabLocation();
+    }
+  }, []);
+
+  const grabLocation = async () => {
+    try {
+      const userLocation = await Location.getCurrentPositionAsync({});
+      setLocation({
+        latitude: userLocation.coords.latitude,
+        longitude: userLocation.coords.longitude,
+      });
+    } catch (error) {
+      console.error("Error grabbing location:", error);
+    }
+  };
+
   const handleCursorPosition = (position) => {
     if (scrollViewRef.current && keyboardOpen) {
       const editorBottomY = position.absoluteY + position.height;
@@ -130,13 +148,6 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
     }
   };
 
-  // const onEditorContentSizeChange = (e) => {
-  //   if (scrollViewRef.current) {
-  //     scrollViewRef.current.scrollToEnd({ animated: true });
-  //   }
-  // };
-  
-
   const handleShareButtonPress = () => {
     setIsPublished(!isPublished);  // Toggle the share status
     ToastMessage.show({
@@ -195,17 +206,9 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
     }
     else {
       try {
-        const userLocation = await Location.getCurrentPositionAsync({});
         const userID = await user.getId();
-        let latitude, longitude;
-        
-        if (Platform.OS === 'ios') {
-          latitude = location?.latitude.toString();
-          longitude = location?.longitude.toString();
-        } else if (Platform.OS === 'android') {
-          latitude = userLocation.coords.latitude.toString();
-          longitude = userLocation.coords.longitude.toString();
-        }
+        const latitude = location?.latitude.toString();
+        const longitude = location?.longitude.toString();
         
         setTime(new Date()); //force a fresh time date grab on note save
 
@@ -457,4 +460,4 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
 
 };
 
-export default AddNoteScreen;
\ No newline at end of file
+export default AddNoteScreen;

From 0f9a23fc24599e29242637f17b64399ccf7a0e17 Mon Sep 17 00:00:00 2001
From: Thomas Irvine <tom.irvine@slu.edu>
Date: Sun, 17 Mar 2024 18:14:22 -0500
Subject: [PATCH 4/6] QoL changes and code reorganizing

---
 lib/screens/AddNoteScreen.tsx | 72 ++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/lib/screens/AddNoteScreen.tsx b/lib/screens/AddNoteScreen.tsx
index 5a9a9de..43631b3 100644
--- a/lib/screens/AddNoteScreen.tsx
+++ b/lib/screens/AddNoteScreen.tsx
@@ -85,9 +85,7 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
   }, []);
 
   useEffect(() => {
-    if (!location?.latitude && !location?.longitude) {
-      grabLocation();
-    }
+    checkLocationPermission();
   }, []);
 
   const grabLocation = async () => {
@@ -160,25 +158,34 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
   const checkLocationPermission = async () => {
     try {
       let { status } = await Location.getForegroundPermissionsAsync();
-
+  
       if (status !== 'granted') {
         // Location permission not granted, request it
         const requestResult = await Location.requestForegroundPermissionsAsync();
-
+  
         if (requestResult.status === 'denied') {
-          // Location permission denied after requesting, request again
-          const requestAgainResult = await Location.requestForegroundPermissionsAsync();
-          status = requestAgainResult.status;
-        }
-
-        if (status !== 'granted') {
-          // Location permission still not granted
-          Alert.alert("Location permission denied", "Please grant location permission to save the note or remove the title to not save.");
+          // Location permission denied after requesting, show alert and return false
+          Alert.alert(
+            "Location permission denied",
+            "Please grant location permission to save the note or remove the title to not save.",
+            [
+              {
+                text: "Delete Note",
+                onPress: () => navigation.goBack(), // Delete the note and go back
+                style: "destructive",
+              },
+              { text: "OK", onPress: () => console.log("OK Pressed") },
+            ],
+            { cancelable: false }
+          );
           return false;
         }
+  
+        // Location permission not yet granted
+        return false;
       }
-
-      // Location permission already granted or granted after request
+  
+      // Location permission already granted
       return true;
     } catch (error) {
       console.error("Error checking location permission:", error);
@@ -189,29 +196,22 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
   const saveNote = async () => {
     const locationPermissionGranted = await checkLocationPermission();
     if (titleText === "") {
-      if (!promptedMissingTitle) {
-        setPromptedMissingTitle(true);
-        Alert.alert(
-          "Title is empty",
-          "Please enter a title to save the note, or press back again to confirm not saving the note.",
-        );
-        return;
-      } else {
-        navigation.goBack();
-        return;
-      }
+      navigation.goBack();
+      return;
     }
     if (!locationPermissionGranted) {
       return; // Stop saving the note if location permission is not granted
-    }
-    else {
+    } else {
       try {
         const userID = await user.getId();
-        const latitude = location?.latitude.toString();
-        const longitude = location?.longitude.toString();
-        
-        setTime(new Date()); //force a fresh time date grab on note save
-
+  
+        // Grab user's current location
+        const userLocation = await Location.getCurrentPositionAsync({});
+        const latitude = userLocation.coords.latitude.toString();
+        const longitude = userLocation.coords.longitude.toString();
+  
+        setTime(new Date()); // force a fresh time date grab on note save
+  
         const newNote = {
           title: titleText,
           text: bodyText,
@@ -225,10 +225,10 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
           time: time,
         };
         const response = await ApiService.writeNewNote(newNote);
-
+  
         const obj = await response.json();
         const id = obj["@id"];
-
+  
         route.params.refreshPage();
         navigation.goBack();
       } catch (error) {
@@ -236,6 +236,8 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
       }
     }
   };
+  
+  
 
   return (
       <SafeAreaView style={{ flex: 1 }}>

From 8fc4aa5d7b456e0a9e1574995f6d968b6bac96b1 Mon Sep 17 00:00:00 2001
From: Thomas Irvine <tom.irvine@slu.edu>
Date: Sun, 17 Mar 2024 18:24:54 -0500
Subject: [PATCH 5/6] final QoL

---
 lib/screens/AddNoteScreen.tsx | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/screens/AddNoteScreen.tsx b/lib/screens/AddNoteScreen.tsx
index 43631b3..452d54f 100644
--- a/lib/screens/AddNoteScreen.tsx
+++ b/lib/screens/AddNoteScreen.tsx
@@ -167,7 +167,7 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
           // Location permission denied after requesting, show alert and return false
           Alert.alert(
             "Location permission denied",
-            "Please grant location permission to save the note or remove the title to not save.",
+            "Please grant location permission to save the note.",
             [
               {
                 text: "Delete Note",
@@ -194,11 +194,20 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
   };
 
   const saveNote = async () => {
-    const locationPermissionGranted = await checkLocationPermission();
-    if (titleText === "") {
-      navigation.goBack();
+    if (titleText.trim() === "") {
+      Alert.alert(
+        "Empty Title",
+        "Please enter a title to save the note or delete the note.",
+        [
+          { text: "Delete Note", onPress: () => navigation.goBack() },
+          { text: "OK", onPress: () => console.log("OK Pressed") }
+        ],
+        { cancelable: false }
+      );
       return;
     }
+  
+    const locationPermissionGranted = await checkLocationPermission();
     if (!locationPermissionGranted) {
       return; // Stop saving the note if location permission is not granted
     } else {
@@ -236,6 +245,7 @@ const AddNoteScreen: React.FC<AddNoteScreenProps> = ({ navigation, route }) => {
       }
     }
   };
+
   
   
 

From a4f4eb826185c6682e9563d8b1f9368dec76a5ee Mon Sep 17 00:00:00 2001
From: Thomas Irvine <tom.irvine@slu.edu>
Date: Sun, 17 Mar 2024 18:43:13 -0500
Subject: [PATCH 6/6] style change to audio

---
 lib/components/audio.tsx | 57 +++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/lib/components/audio.tsx b/lib/components/audio.tsx
index 9a2f4c7..501b27b 100644
--- a/lib/components/audio.tsx
+++ b/lib/components/audio.tsx
@@ -9,8 +9,7 @@ import {
 import { Ionicons } from "@expo/vector-icons";
 import { AudioType } from "../models/media_class";
 import Slider from "@react-native-community/slider";
-// Checkout Audio for expo av!
-import { Audio} from "expo-av";
+import { Audio } from "expo-av";
 import uuid from "react-native-uuid";
 import { uploadAudio } from "../utils/S3_proxy";
 
@@ -38,7 +37,9 @@ function AudioContainer({
   const [currentIndex, setCurrentIndex] = useState(-1);
   const [sliderValues, setSliderValues] = useState<number[]>([]);
   const [pausedPosition, setPausedPosition] = useState<number | null>(null);
-  const [pausedAudioIndex, setPausedAudioIndex] = useState<number | null>(null);
+  const [pausedAudioIndex, setPausedAudioIndex] = useState<number | null>(
+    null
+  );
   const [isLoaded, setIsLoaded] = useState(false);
 
   useEffect(() => {
@@ -76,7 +77,6 @@ function AudioContainer({
     }
   };
 
-
   async function startRecording() {
     setIsRecording(true);
     try {
@@ -87,22 +87,24 @@ function AudioContainer({
           playsInSilentModeIOS: true,
           allowsRecordingIOS: true,
         });
-        
-        const { recording } = await Audio.Recording.createAsync(Audio.RecordingOptionsPresets.HIGH_QUALITY);
 
-          setRecording(recording);
-        } else {
-          alert("Please grant permission to app to access microphone");
-        }
-      } catch (err) {
-        console.error("Failed to start recording", err);
+        const { recording } = await Audio.Recording.createAsync(
+          Audio.RecordingOptionsPresets.HIGH_QUALITY
+        );
+
+        setRecording(recording);
+      } else {
+        alert("Please grant permission to the app to access the microphone");
       }
       console.log("Start recording");
+    } catch (err) {
+      console.error("Failed to start recording", err);
     }
+  }
 
-   async function stopRecording() {
+  async function stopRecording() {
     setIsRecording(false);
-    
+
     await Audio.setAudioModeAsync({
       allowsRecordingIOS: false,
       playsInSilentModeIOS: true,
@@ -144,7 +146,7 @@ function AudioContainer({
       console.error("Failed to stop recording", err);
     }
   }
-  
+
   async function playAudio(index: number) {
     console.log("entered audio player");
     const current = newAudio[index];
@@ -160,9 +162,8 @@ function AudioContainer({
       const newPlayer = new Audio.Sound();
 
       console.log("play uri===", current.getUri());
-      await newPlayer.loadAsync({ uri:current.getUri() });
+      await newPlayer.loadAsync({ uri: current.getUri() });
       newPlayer.setOnPlaybackStatusUpdate((status) => {
-
         setIsLoaded(status.isLoaded);
 
         if (status.didJustFinish) {
@@ -262,23 +263,25 @@ function AudioContainer({
           width: "100%",
         }}
       >
-        <Ionicons name={"mic-outline"} size={60} color="#111111" />
+        {isRecording ? (
+          <Ionicons name={"mic-outline"} size={60} color="red" />
+        ) : (
+          <Ionicons name={"mic-outline"} size={60} color="#111111" />
+        )}
         <Text style={{ fontSize: 24, fontWeight: "600" }}>Recordings</Text>
         {isRecording ? (
-
-          <TouchableOpacity 
-            onPress={ () => stopRecording() }
+          <TouchableOpacity
+            onPress={() => stopRecording()}
             testID="stopRecordingButton"
           >
-          <Ionicons name={"stop-circle-outline"} size={45} color="#111111" />
+            <Ionicons name={"stop-circle-outline"} size={45} color="#111111" />
           </TouchableOpacity>
         ) : (
-          <TouchableOpacity 
-            onPress={ () => startRecording() }
+          <TouchableOpacity
+            onPress={() => startRecording()}
             testID="startRecordingButton"
           >
             <Ionicons name={"radio-button-on-outline"} size={45} color="red" />
-
           </TouchableOpacity>
         )}
       </View>
@@ -334,7 +337,7 @@ function AudioContainer({
                   <Ionicons name={"pause-outline"} size={25} color="#111111" />
                 </TouchableOpacity>
               ) : (
-                <TouchableOpacity onPress={() => playAudio(index)}testID="playButton">
+                <TouchableOpacity onPress={() => playAudio(index)} testID="playButton">
                   <Ionicons name={"play-outline"} size={25} color="#111111" />
                 </TouchableOpacity>
               )}
@@ -387,4 +390,4 @@ const styles = StyleSheet.create({
     width: 200,
     textAlign: "center",
   },
-});
\ No newline at end of file
+});