Merge pull request #519 from IvanIFChen/tma994-bugfix-camera-screen-preview

[TMA-994] [BUGFIX] Camera Screen Preview Fix

3 files changed, 9 insertions, 19 deletions

diff --git a/src/components/moments/TrimmerPlayer.tsx b/src/components/moments/TrimmerPlayer.tsx
index a7239d8b..8d1cd156 100644
--- a/src/components/moments/TrimmerPlayer.tsx
+++ b/src/components/moments/TrimmerPlayer.tsx
@@ -73,7 +73,12 @@ const TrimmerPlayer: React.FC<TrimmerPlayerProps> = ({
         repeat={true}
         onLoad={(payload) => {
           setEnd(payload.duration);
-          handleLoad(payload.naturalSize, payload.duration);
+          const {width, height} = payload.naturalSize;
+          if (payload.naturalSize.orientation === 'portrait') {
+            handleLoad(height, width, payload.duration);
+          } else {
+            handleLoad(width, height, payload.duration);
+          }
         }}
         onProgress={(e) => {
           if (!paused) {
diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index 33ee2347..ecf19f3a 100644
--- a/src/screens/moments/CameraScreen.tsx
+++ b/src/screens/moments/CameraScreen.tsx
@@ -57,6 +57,7 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
   }, []);
 
   const navigateToEditMedia = (uri: string) => {
+    cameraRef.current?.resumePreview();
     navigation.navigate('EditMedia', {
       screenType,
       media: {
@@ -74,16 +75,6 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
     });
   };
 
-  const navigateToCaptionScreen = (isVideo: boolean, uri: string) => {
-    navigation.navigate('CaptionScreen', {
-      screenType,
-      media: {
-        uri,
-        isVideo,
-      },
-    });
-  };
-
   const handleClose = () => {
     navigation.dangerouslyGetParent()?.setOptions({
       tabBarVisible: true,
@@ -116,9 +107,7 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
           }
           activeOpacity={1}
           onLongPress={() => {
-            takeVideo(cameraRef, (vid) => {
-              navigateToCaptionScreen(true, vid.uri);
-            });
+            takeVideo(cameraRef, (vid) => navigateToEditMedia(vid.uri));
             setIsRecording(true);
           }}
           onPressOut={async () => {
diff --git a/src/screens/upload/EditMedia.tsx b/src/screens/upload/EditMedia.tsx
index 07d20a7b..338634b8 100644
--- a/src/screens/upload/EditMedia.tsx
+++ b/src/screens/upload/EditMedia.tsx
@@ -370,11 +370,7 @@ export const EditMedia: React.FC<EditMediaProps> = ({route, navigation}) => {
                   height: SCREEN_WIDTH / aspectRatio,
                 },
               ]}
-              handleLoad={(
-                response: {width: number; height: number},
-                duration: number,
-              ) => {
-                const {width, height} = response;
+              handleLoad={(width: number, height: number, duration: number) => {
                 setVideoDuration(duration);
                 setOrigDimensions([width, height]);
                 setAspectRatio(width / height);