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

[TMA-969] New Caption Screen

2 files changed, 15 insertions, 14 deletions

diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index dd3612ca..2282ecad 100644
--- a/src/screens/moments/CameraScreen.tsx
+++ b/src/screens/moments/CameraScreen.tsx
@@ -30,7 +30,7 @@ interface CameraScreenProps {
   navigation: CameraScreenNavigationProps;
 }
 const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
-  const {title, screenType} = route.params;
+  const {screenType, selectedCategory} = route.params;
   const cameraRef = createRef<RNCamera>();
   const tabBarHeight = useBottomTabBarHeight();
   const [cameraType, setCameraType] = useState<keyof CameraType>('front');
@@ -45,11 +45,6 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
       navigation.dangerouslyGetParent()?.setOptions({
         tabBarVisible: false,
       });
-      return () => {
-        navigation.dangerouslyGetParent()?.setOptions({
-          tabBarVisible: true,
-        });
-      };
     }, [navigation]),
   );
 
@@ -72,18 +67,17 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
   const navigateToCropper = (uri: string) => {
     navigation.navigate('ZoomInCropper', {
       screenType,
-      title,
       media: {
         uri,
         isVideo: false,
       },
+      selectedCategory,
     });
   };
 
   const navigateToCaptionScreen = (isVideo: boolean, uri: string) => {
     navigation.navigate('CaptionScreen', {
       screenType,
-      title,
       media: {
         uri,
         isVideo,
@@ -101,6 +95,9 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
       setShowSaveButton(false);
       setMediaFromGallery('');
     } else {
+      navigation.dangerouslyGetParent()?.setOptions({
+        tabBarVisible: true,
+      });
       navigation.goBack();
     }
   };
diff --git a/src/screens/moments/TagFriendsScreen.tsx b/src/screens/moments/TagFriendsScreen.tsx
index 6c982936..fc3bccf2 100644
--- a/src/screens/moments/TagFriendsScreen.tsx
+++ b/src/screens/moments/TagFriendsScreen.tsx
@@ -16,11 +16,11 @@ import {MomentTags} from '../../components';
 import {TagFriendsFooter} from '../../components/moments';
 import {MomentTagType} from '../../types';
 import {
-  SCREEN_WIDTH,
-  SCREEN_HEIGHT,
   HeaderHeight,
   isIPhoneX,
   normalize,
+  SCREEN_HEIGHT,
+  SCREEN_WIDTH,
 } from '../../utils';
 
 type TagFriendsScreenRouteProps = RouteProp<
@@ -120,10 +120,10 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
   return (
     <View style={styles.contentContainer}>
       <View
-        style={{
-          position: 'absolute',
-          paddingTop: SCREEN_HEIGHT / 2 - imageHeight / 2,
-        }}>
+        style={[
+          styles.innerContainer,
+          {paddingTop: SCREEN_HEIGHT / 2 - imageHeight / 2},
+        ]}>
         <TouchableWithoutFeedback
           onPress={() =>
             navigation.navigate('TagSelectionScreen', {
@@ -206,6 +206,7 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
             style={[
               styles.shareButtonTitle,
               // makes the Done buttomn invisible if there are no tags
+              // eslint-disable-next-line react-native/no-inline-styles
               {opacity: tags.length !== 0 ? 1 : 0},
             ]}>
             Done
@@ -295,6 +296,9 @@ const styles = StyleSheet.create({
     bottom: 0,
     height: SCREEN_HEIGHT * 0.15,
   },
+  innerContainer: {
+    position: 'absolute',
+  },
 });
 
 export default TagFriendsScreen;