added toggles to user object and tracked state

shahdivyank · Oct 24, 2024 · b58a5bd · b58a5bd
1 parent 52ea8b5
commit b58a5bd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 13 deletions.
diff --git a/components/profile/settings/field.tsx b/components/profile/settings/field.tsx
@@ -1,18 +1,19 @@
 import { Href, Link } from "expo-router";
 import { View, Text } from "react-native";
+import Icon from "@/components/Icon";
 
 interface props {
   field: string;
-  value: string;
+  icon: string;
   link: Href<string>;
 }
 
-const Field = ({ field, value, link }: props) => {
+const Field = ({ field, icon, link }: props) => {
   return (
     <Link href={link} className="flex flex-row items-center justify-center">
       <View className="flex w-full flex-row justify-between py-4">
         <Text className="text-lg">{field}</Text>
-        <Text className="text-lg text-beatdrop-profile-secondary">{value}</Text>
+        <Icon name={icon} size={24} />
       </View>
     </Link>
   );

diff --git a/components/profile/settings/index.tsx b/components/profile/settings/index.tsx
@@ -8,11 +8,14 @@ import { Switch } from "react-native-gesture-handler";
 import { router } from "expo-router";
 
 const Settings = () => {
-  const { email, dummyPassword, setAllUndefined } = useUser();
-
-  const [postActivity, setPostActivity] = useState(false);
-  const [friendPosts, setFriendPosts] = useState(true);
-  const [taggedPosts, setTaggedPosts] = useState(true);
+  const {
+    email,
+    postActivity,
+    friendPosts,
+    taggedPosts,
+    setAttribute,
+    setAllUndefined,
+  } = useUser();
 
   const onSignOut = () => {
     setAllUndefined();
@@ -44,8 +47,8 @@ const Settings = () => {
         </View>
         <View className="border-[0.5px] border-beatdrop-border" />
         <Field
-          field="Password"
-          value={dummyPassword}
+          field="Change Password"
+          icon="Chevron_Right"
           link="/profile/password"
         />
         <View className="border-[0.5px] border-beatdrop-border" />
@@ -57,19 +60,28 @@ const Settings = () => {
 
         <View className="my-4 flex flex-row items-center justify-between">
           <Text className="text-lg"> Post Activity</Text>
-          <Switch value={postActivity} onValueChange={setPostActivity} />
+          <Switch
+            value={postActivity}
+            onValueChange={(value) => setAttribute("postActivity", value)}
+          />
         </View>
         <View className="border-[0.5px] border-beatdrop-border" />
 
         <View className="my-4 flex flex-row items-center justify-between">
           <Text className="text-lg"> Friend Posts</Text>
-          <Switch value={friendPosts} onValueChange={setFriendPosts} />
+          <Switch
+            value={friendPosts}
+            onValueChange={(value) => setAttribute("friendPosts", value)}
+          />
         </View>
         <View className="border-[0.5px] border-beatdrop-border" />
 
         <View className="my-4 flex flex-row items-center justify-between">
           <Text className="text-lg"> Tagged Posts</Text>
-          <Switch value={taggedPosts} onValueChange={setTaggedPosts} />
+          <Switch
+            value={taggedPosts}
+            onValueChange={(value) => setAttribute("taggedPosts", value)}
+          />
         </View>
         <View className="border-[0.5px] border-beatdrop-border" />
 

diff --git a/components/profile/settings/password.tsx b/components/profile/settings/password.tsx
@@ -21,6 +21,8 @@ const Password = () => {
   const onCurrentPasswordChange = (text: string) => {
     if (text === dummyPassword) {
       setHasEnteredCorrectPassword(true);
+    } else {
+      setHasEnteredCorrectPassword(false);
     }
   };
 

diff --git a/hooks/useUser.ts b/hooks/useUser.ts
@@ -12,6 +12,9 @@ interface User {
   following: number;
   email: string;
   dummyPassword: string;
+  postActivity: boolean;
+  friendPosts: boolean;
+  taggedPosts: boolean;
   setAttribute: (attribute: string, value: any) => void; // Updated to `any` to allow more flexible types
   resetAttributes: () => void;
   setAllUndefined: () => void;
@@ -34,6 +37,9 @@ const initialState: Omit<
   following: 21,
   email: "[email protected]",
   dummyPassword: "password",
+  postActivity: true,
+  friendPosts: true,
+  taggedPosts: true,
 };
 
 export const useUser = create<User>()((set) => ({
@@ -60,5 +66,8 @@ export const useUser = create<User>()((set) => ({
       following: undefined,
       email: undefined,
       dummyPassword: undefined,
+      postActivity: undefined,
+      friendPosts: undefined,
+      taggedPosts: undefined,
     })),
 }));