diff options
| author | Michael <michael.foiani@gmail.com> | 2021-07-14 16:35:57 -0400 |
|---|---|---|
| committer | Michael <michael.foiani@gmail.com> | 2021-07-14 16:35:57 -0400 |
| commit | 346d53a55a9d880dad706859350712bac2fedc5b (patch) | |
| tree | 91d96bbb753da6f39f0e36ce1a1a84c25d578ff2 /src/screens | |
| parent | 18eca660a7220e4bb67b7ddc267cfde7e8905c0d (diff) | |
| parent | 4b6ada10d14e569c897fa289f57886e1daa2478d (diff) | |
Merged with newer master containing the cropper.
Diffstat (limited to 'src/screens')
| -rw-r--r-- | src/screens/moments/CameraScreen.tsx | 4 | ||||
| -rw-r--r-- | src/screens/profile/CaptionScreen.tsx | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx index 10e42e6d..ef52a56f 100644 --- a/src/screens/moments/CameraScreen.tsx +++ b/src/screens/moments/CameraScreen.tsx @@ -184,12 +184,16 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => { ) { showGIFFailureAlert(() => navigateToCropper(media.path)); } else { +<<<<<<< HEAD // is this a video? if (media.duration !== null) { navigateToCaptionScreen(true, media.sourceURL); } else { navigateToCropper(media.sourceURL); } +======= + navigateToCropper(media.path); +>>>>>>> master } }} /> diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx index 954f8b24..d3aadf76 100644 --- a/src/screens/profile/CaptionScreen.tsx +++ b/src/screens/profile/CaptionScreen.tsx @@ -49,7 +49,6 @@ import {RootState} from '../../store/rootReducer'; import {MomentTagType} from '../../types'; import {isIPhoneX, normalize, SCREEN_WIDTH, StatusBarHeight} from '../../utils'; import {mentionPartTypes} from '../../utils/comments'; -//import {TrimmerPlayer} from '../../components/moments/trimmer'; /** * Upload Screen to allow users to upload posts to Tagg */ |