From 7ecd7835751480ef13553864cd58fd644f2849c8 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Tue, 20 Jul 2021 12:51:06 -0400
Subject: Update navigation to edit media instead of caption screen

---
 src/screens/moments/CameraScreen.tsx | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index 33ee2347..6e3e5184 100644
--- a/src/screens/moments/CameraScreen.tsx
+++ b/src/screens/moments/CameraScreen.tsx
@@ -74,16 +74,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 +106,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 () => {
-- 
cgit v1.2.3-70-g09d2


From bc5974a4fa262e2b33f25298671b7fdd90e55937 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Tue, 20 Jul 2021 13:01:08 -0400
Subject: Fix camera resume issue

---
 src/screens/moments/CameraScreen.tsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index 6e3e5184..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: {
-- 
cgit v1.2.3-70-g09d2


From 811426f6a4d2e3495d45c0ed1b209f2ea539e26f Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 23 Jul 2021 18:31:10 -0400
Subject: Fix orientation issue

---
 src/components/moments/TrimmerPlayer.tsx | 7 ++++++-
 src/screens/upload/EditMedia.tsx         | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/moments/TrimmerPlayer.tsx b/src/components/moments/TrimmerPlayer.tsx
index 87b3a786..247c270f 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);
+          const {width, height} = payload.naturalSize;
+          if (payload.naturalSize.orientation === 'portrait') {
+            handleLoad(height, width);
+          } else {
+            handleLoad(width, height);
+          }
         }}
         onProgress={(e) => {
           if (!paused) {
diff --git a/src/screens/upload/EditMedia.tsx b/src/screens/upload/EditMedia.tsx
index f8e7692d..10f5f2fb 100644
--- a/src/screens/upload/EditMedia.tsx
+++ b/src/screens/upload/EditMedia.tsx
@@ -338,8 +338,7 @@ export const EditMedia: React.FC<EditMediaProps> = ({route, navigation}) => {
                   height: SCREEN_WIDTH / aspectRatio,
                 },
               ]}
-              handleLoad={(response: {width: number; height: number}) => {
-                const {width, height} = response;
+              handleLoad={(width: number, height: number) => {
                 setOrigDimensions([width, height]);
                 setAspectRatio(width / height);
               }}
-- 
cgit v1.2.3-70-g09d2