Merge pull request #514 from IvanIFChen/tma988-remove-positioned-tags-for-video-moments

[TMA-988] Remove Positioned Tags for Video Moments

2 files changed, 19 insertions, 12 deletions

diff --git a/src/screens/moments/TagFriendsScreen.tsx b/src/screens/moments/TagFriendsScreen.tsx
index fc3bccf2..d11f8049 100644
--- a/src/screens/moments/TagFriendsScreen.tsx
+++ b/src/screens/moments/TagFriendsScreen.tsx
@@ -188,13 +188,17 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
             />
           </View>
         </TouchableOpacity>
-        <TouchableWithoutFeedback style={styles.captionContainer}>
-          {tags.length === 0 ? (
-            <Text style={styles.header}>Tap on photo to tag friends!</Text>
-          ) : (
-            <Text style={styles.header}>Press and drag to move</Text>
-          )}
-        </TouchableWithoutFeedback>
+        {!media.isVideo ? (
+          <TouchableWithoutFeedback style={styles.headerContainer}>
+            {tags.length === 0 ? (
+              <Text style={styles.header}>Tap on photo to tag friends!</Text>
+            ) : (
+              <Text style={styles.header}>Press and drag to move</Text>
+            )}
+          </TouchableWithoutFeedback>
+        ) : (
+          <View style={styles.headerPlaceholder} />
+        )}
         <TouchableOpacity
           style={styles.buttonContainer}
           // Altering the opacity style of TouchableOpacity doesn't work,
@@ -213,7 +217,7 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
           </Text>
         </TouchableOpacity>
       </View>
-      {tags.length !== 0 && (
+      {tags.length !== 0 && !media.isVideo && (
         <MomentTags
           tags={tags}
           setTags={setTags}
@@ -260,12 +264,15 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'flex-end',
   },
-  captionContainer: {
+  headerContainer: {
     width: SCREEN_WIDTH,
     flexDirection: 'row',
     justifyContent: 'center',
     zIndex: 9999,
   },
+  headerPlaceholder: {
+    width: SCREEN_WIDTH * 0.5,
+  },
   shareButtonTitle: {
     fontWeight: 'bold',
     fontSize: 18,
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index eba3e4bf..7f77bdca 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -152,9 +152,9 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
 
   const formattedTags = () => {
     return tags.map((tag) => ({
-      x: tag.x,
-      y: tag.y,
-      z: tag.z,
+      x: isMediaAVideo ? 0 : tag.x,
+      y: isMediaAVideo ? 0 : tag.y,
+      z: isMediaAVideo ? 0 : tag.z,
       user_id: tag.user.id,
     }));
   };