Merge pull request #491 from IvanIFChen/tma969-new-caption-screen

[TMA-969] New Caption Screen

2 files changed, 10 insertions, 19 deletions

diff --git a/src/components/moments/CaptionScreenHeader.tsx b/src/components/moments/CaptionScreenHeader.tsx
index 0638c128..cda85e57 100644
--- a/src/components/moments/CaptionScreenHeader.tsx
+++ b/src/components/moments/CaptionScreenHeader.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {Text, View, StyleSheet, ViewProps} from 'react-native';
+import {normalize} from '../../utils';
 interface CaptionScreenHeaderProps extends ViewProps {
   title: string;
 }
@@ -26,8 +27,8 @@ const styles = StyleSheet.create({
     width: '90%',
   },
   header: {
-    fontSize: 20,
-    fontWeight: 'bold',
+    fontSize: normalize(18),
+    fontWeight: '700',
     color: 'white',
     textAlign: 'center',
   },
diff --git a/src/components/moments/Moment.tsx b/src/components/moments/Moment.tsx
index 73503c5e..087b343f 100644
--- a/src/components/moments/Moment.tsx
+++ b/src/components/moments/Moment.tsx
@@ -7,7 +7,6 @@ import LinearGradient from 'react-native-linear-gradient';
 import DeleteIcon from '../../assets/icons/delete-logo.svg';
 import DownIcon from '../../assets/icons/down_icon.svg';
 import BigPlusIcon from '../../assets/icons/plus-icon-white.svg';
-import PlusIcon from '../../assets/icons/plus-icon.svg';
 import UpIcon from '../../assets/icons/up_icon.svg';
 import {TAGG_LIGHT_BLUE} from '../../constants';
 import {MomentType, ScreenType} from '../../types';
@@ -40,14 +39,6 @@ const Moment: React.FC<MomentProps> = ({
   externalStyles,
 }) => {
   const navigation = useNavigation();
-
-  const navigateToCameraScreen = () => {
-    navigation.navigate('CameraScreen', {
-      title,
-      screenType,
-    });
-  };
-
   return (
     <View style={[styles.container, externalStyles?.container]}>
       <View style={[styles.header, externalStyles?.header]}>
@@ -81,13 +72,6 @@ const Moment: React.FC<MomentProps> = ({
           )}
           {!userXId && (
             <View style={styles.row}>
-              <PlusIcon
-                width={23}
-                height={23}
-                onPress={navigateToCameraScreen}
-                color={TAGG_LIGHT_BLUE}
-                style={styles.horizontalMargin}
-              />
               {shouldAllowDeletion && (
                 <DeleteIcon
                   onPress={() => handleMomentCategoryDelete(title)}
@@ -114,7 +98,13 @@ const Moment: React.FC<MomentProps> = ({
             />
           ))}
         {(images === undefined || images.length === 0) && !userXId && (
-          <TouchableOpacity onPress={navigateToCameraScreen}>
+          <TouchableOpacity
+            onPress={() =>
+              navigation.navigate('CameraScreen', {
+                screenType: ScreenType.Profile,
+                selectedCategory: title,
+              })
+            }>
             <LinearGradient
               colors={['rgba(105, 141, 211, 1)', 'rgba(105, 141, 211, 0.3)']}>
               <View style={styles.defaultImage}>