diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-07-23 18:57:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 18:57:04 -0400 |
| commit | 841693de4d72fc50079aa1b24fc13f27d02decc4 (patch) | |
| tree | 3e1465a0e195c3b9676513606089a3dd141b0176 /src/screens | |
| parent | e39fcbd9e35f6a5e36afe248e24bea0dd3859202 (diff) | |
| parent | c3febe151a34456cecbe84ffaac6eeea56254005 (diff) | |
Merge pull request #519 from IvanIFChen/tma994-bugfix-camera-screen-preview
[TMA-994] [BUGFIX] Camera Screen Preview Fix
Diffstat (limited to 'src/screens')
| -rw-r--r-- | src/screens/moments/CameraScreen.tsx | 15 | ||||
| -rw-r--r-- | src/screens/upload/EditMedia.tsx | 6 |
2 files changed, 3 insertions, 18 deletions
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); |
