From e3571b2fcb4a78ea11466ff4bfb0405ae4028aea Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Wed, 26 May 2021 19:08:28 -0400
Subject: Finish logic for draggables, Caption screen logic is done

---
 src/screens/moments/TagFriendsScreen.tsx   | 34 ++++++++++++------------------
 src/screens/moments/TagSelectionScreen.tsx |  8 ++++++-
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/screens/moments')

diff --git a/src/screens/moments/TagFriendsScreen.tsx b/src/screens/moments/TagFriendsScreen.tsx
index b9b35742..30a7015f 100644
--- a/src/screens/moments/TagFriendsScreen.tsx
+++ b/src/screens/moments/TagFriendsScreen.tsx
@@ -19,7 +19,7 @@ import {
 } from '../../components';
 import {TagFriendsFooter} from '../../components/moments';
 import {TAGG_LIGHT_BLUE_2} from '../../constants';
-import {ProfilePreviewType} from '../../types';
+import {MomentTagType} from '../../types';
 import {SCREEN_WIDTH, StatusBarHeight} from '../../utils';
 
 type TagFriendsScreenRouteProps = RouteProp<
@@ -30,19 +30,17 @@ interface TagFriendsScreenProps {
   route: TagFriendsScreenRouteProps;
 }
 const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
-  const {image, selectedUsers} = route.params;
+  const {image, selectedTags} = route.params;
   const navigation = useNavigation();
   const imageRef = useRef(null);
-  const [taggedUsers, setTaggedUsers] = useState<ProfilePreviewType[]>([]);
+  const [tags, setTags] = useState<MomentTagType[]>([]);
 
   /*
    * Update list of tagged users from route params
    */
   useEffect(() => {
-    if (selectedUsers !== undefined) {
-      setTaggedUsers(selectedUsers);
-    }
-  }, [selectedUsers]);
+    setTags(selectedTags ? selectedTags : []);
+  }, [selectedTags]);
 
   /*
    * Navigate back to Tag Users Screen, send selected users
@@ -50,7 +48,7 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
   const handleDone = () => {
     navigation.navigate('CaptionScreen', {
       ...route.params,
-      selectedUsers: taggedUsers,
+      selectedTags: tags,
     });
   };
 
@@ -79,7 +77,7 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
               title={'Tap on photo to Tag friends!'}
             />
             <TouchableWithoutFeedback
-              disabled={taggedUsers.length > 0}
+              disabled={tags.length > 0}
               onPress={() =>
                 navigation.navigate('TagSelectionScreen', {
                   selectedUsers: [],
@@ -92,27 +90,23 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
                 resizeMode={'cover'}
               />
             </TouchableWithoutFeedback>
-            {taggedUsers.length !== 0 && (
+            {tags.length !== 0 && (
               <MomentTags
+                tags={tags}
+                setTags={setTags}
                 editing={true}
-                tags={taggedUsers.map((user) => ({
-                  id: '',
-                  x: 50,
-                  y: 50,
-                  z: 1,
-                  user,
-                }))}
                 imageRef={imageRef}
                 deleteFromList={(user) =>
-                  setTaggedUsers(taggedUsers.filter((u) => u.id !== user.id))
+                  setTags(tags.filter((tag) => tag.user.id !== user.id))
                 }
               />
             )}
             <View style={styles.footerContainer}>
               <TagFriendsFooter
-                taggedUsers={taggedUsers}
-                setTaggedUsers={setTaggedUsers}
+                taggedUsers={tags.map((tag) => tag.user)}
+                setTaggedUsers={(users) => null}
               />
+              {/* <TagFriendsFooter tags={tags} setTags={setTags} /> */}
             </View>
           </View>
         </KeyboardAvoidingView>
diff --git a/src/screens/moments/TagSelectionScreen.tsx b/src/screens/moments/TagSelectionScreen.tsx
index a698a07b..6a4006e8 100644
--- a/src/screens/moments/TagSelectionScreen.tsx
+++ b/src/screens/moments/TagSelectionScreen.tsx
@@ -48,7 +48,13 @@ const TagSelectionScreen: React.FC<TagSelectionScreenProps> = ({route}) => {
           onPress={() => {
             navigation.navigate('TagFriendsScreen', {
               ...route.params,
-              selectedUsers: selectedUsers,
+              selectedTags: selectedUsers.map((user) => ({
+                id: '',
+                x: 50,
+                y: 50,
+                z: 1,
+                user,
+              })),
             });
           }}>
           <BackIcon
-- 
cgit v1.2.3-70-g09d2