From dfbd57b1724aa987711a5c6c1098073afec15433 Mon Sep 17 00:00:00 2001
From: Edward Wang <edwardwang0000@gmail.com>
Date: Tue, 6 Aug 2024 11:53:58 -0500
Subject: [PATCH 1/2] fixed buttons, but not aligned

---
 app/(tabs)/my-pantry/index.tsx | 28 +++++++++-------
 components/whats-new-modal.tsx | 60 ++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 12 deletions(-)
 create mode 100644 components/whats-new-modal.tsx

diff --git a/app/(tabs)/my-pantry/index.tsx b/app/(tabs)/my-pantry/index.tsx
index f0f42f8..1e008d1 100644
--- a/app/(tabs)/my-pantry/index.tsx
+++ b/app/(tabs)/my-pantry/index.tsx
@@ -292,18 +292,22 @@ export default function MyPantry() {
             <View style={styles.sectionItem}>
               <Text style={{ fontSize: 16, width: "60%" }}>{item}</Text>
               <View style={{ flexDirection: "row", gap: 16 }}>
-                <TouchableOpacity
-                  style={{ display: showEdits ? "flex" : "none" }}
-                  onPress={() => editItem(sections.indexOf(section), index)}
-                >
-                  <SymbolView name="pencil" size={20} tintColor="black" />
-                </TouchableOpacity>
-                <TouchableOpacity
-                  style={{ display: showDeletes ? "flex" : "none" }}
-                  onPress={() => handleDeleteIngredient(section, index, item)}
-                >
-                  <SymbolView name="trash.fill" size={20} tintColor="black" />
-                </TouchableOpacity>
+                <View style={{ opacity: showEdits ? 1 : 0 }}>
+                  <Pressable
+                    disabled={!showEdits}
+                    onPress={() => editItem(sections.indexOf(section), index)}
+                  >
+                    <SymbolView name="pencil" size={20} tintColor="black" />
+                  </Pressable>
+                </View>
+                <View style={{ opacity: showDeletes ? 1 : 0 }}>
+                  <Pressable
+                    disabled={!showDeletes}
+                    onPress={() => handleDeleteIngredient(section, index, item)}
+                  >
+                    <SymbolView name="trash.fill" size={20} tintColor="black" />
+                  </Pressable>
+                </View>
                 <TouchableOpacity
                   style={{
                     display:
diff --git a/components/whats-new-modal.tsx b/components/whats-new-modal.tsx
new file mode 100644
index 0000000..3ece731
--- /dev/null
+++ b/components/whats-new-modal.tsx
@@ -0,0 +1,60 @@
+import { Modal, Text, View, Button, StyleSheet } from "react-native";
+
+import { Theme, useTheme } from "../utils/ThemeProvider";
+
+type WhatsNewModalProps = {
+  version: string;
+  changes: string;
+  onClose: () => void;
+};
+
+export const WhatsNewModal = (props: WhatsNewModalProps) => {
+  const styles = getOnboardingStyles(useTheme());
+  return (
+    <Modal animationType="slide" transparent>
+      <View style={styles.centered}>
+        <View style={styles.modal}>
+          <Text style={styles.modalTitle}>What's New in v{props.version}:</Text>
+          <Text style={styles.modalBody}>{props.changes}</Text>
+          <Button title="Got it!" onPress={props.onClose} />
+        </View>
+      </View>
+    </Modal>
+  );
+};
+
+const getOnboardingStyles = (_theme: Theme) =>
+  StyleSheet.create({
+    centered: {
+      alignItems: "center",
+      flex: 1,
+      justifyContent: "center",
+    },
+    modal: {
+      alignItems: "center",
+      alignSelf: "center",
+      backgroundColor: "white",
+      borderRadius: 20,
+      marginHorizontal: 20,
+      paddingHorizontal: 35,
+      paddingTop: 35,
+      paddingBottom: 25,
+      shadowOffset: {
+        width: 0,
+        height: 2,
+      },
+      shadowOpacity: 0.25,
+      shadowRadius: 4,
+    },
+    modalTitle: {
+      fontSize: 24,
+      fontWeight: "bold",
+      marginBottom: 10,
+      textAlign: "center",
+    },
+    modalBody: {
+      fontSize: 18,
+      marginBottom: 10,
+      textAlign: "center",
+    },
+  });

From d2a3a35951361ebc4df28a259ea4268c5785e12c Mon Sep 17 00:00:00 2001
From: Edward Wang <103095576+eddwang@users.noreply.github.com>
Date: Tue, 6 Aug 2024 20:16:34 -0500
Subject: [PATCH 2/2] new line for linting

---
 components/whats-new-modal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/whats-new-modal.tsx b/components/whats-new-modal.tsx
index b2c7cf3..99ae1b0 100644
--- a/components/whats-new-modal.tsx
+++ b/components/whats-new-modal.tsx
@@ -59,4 +59,4 @@ const getOnboardingStyles = (_theme: Theme) =>
       marginBottom: 10,
       textAlign: "center",
     },
-  });
\ No newline at end of file
+  });