diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-06-30 15:57:55 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-06-30 15:57:55 -0400 |
| commit | 9eb246e92aad427ac4d12840960f0be531f43d19 (patch) | |
| tree | 70e24d0a72a3a006adf2e456ff19ce090dc7ebd5 /src/screens | |
| parent | 919a7c14633f0a381613cebf73e8f29d84d3ebe2 (diff) | |
Squashed commit of the following:
commit 7046c2673c54ecf2f418a85fbcfc2c4872858697
Merge: 5480267b c6900bc6
Author: Ivan Chen <ivan@tagg.id>
Date: Wed Jun 30 15:16:02 2021 -0400
Merge pull request #479 from brian-tagg/tma959-gif-handle
[TMA-959] GIF handle
commit c6900bc62b2ea9a1eb07088ac02556c0dd1d5ebc
Author: Brian Kim <brian@tagg.id>
Date: Thu Jul 1 04:00:53 2021 +0900
Redo extraneous file
commit 4eda8db632ca996ff9712872b2076a8675a63523
Author: Brian Kim <brian@tagg.id>
Date: Thu Jul 1 03:52:50 2021 +0900
Updates from product
commit 1c1975265fb6013c34c8e766a7f11b0c5b8d1e11
Author: Brian Kim <brian@tagg.id>
Date: Thu Jul 1 01:23:19 2021 +0900
Respond to comments
commit 50344b4236e235fdd42997c1fe85f2c1bd014e47
Author: Brian Kim <brian@tagg.id>
Date: Tue Jun 29 23:04:22 2021 +0900
Fixed up some merge issues
commit 014af4ac61bae6e38a4965ceb274b147ac3395c6
Author: Brian Kim <brian@tagg.id>
Date: Tue Jun 29 23:01:24 2021 +0900
Construct and merge with master
Diffstat (limited to 'src/screens')
| -rw-r--r-- | src/screens/moments/CameraScreen.tsx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx index 7b71f9e5..4ca79c4f 100644 --- a/src/screens/moments/CameraScreen.tsx +++ b/src/screens/moments/CameraScreen.tsx @@ -16,7 +16,11 @@ import { } from '../../components'; import {MainStackParams} from '../../routes'; import {HeaderHeight, normalize, SCREEN_WIDTH} from '../../utils'; -import {navigateToImagePicker, takePicture} from '../../utils/camera'; +import { + navigateToImagePicker, + showGIFFailureAlert, + takePicture, +} from '../../utils/camera'; type CameraScreenRouteProps = RouteProp<MainStackParams, 'CameraScreen'>; export type CameraScreenNavigationProps = StackNavigationProp< @@ -146,7 +150,15 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => { mostRecentPhotoUri={mostRecentPhoto} callback={() => navigateToImagePicker((pic) => { - navigateToCropper(pic.path); + const filename = pic.filename; + if ( + filename && + (filename.endsWith('gif') || filename.endsWith('GIF')) + ) { + showGIFFailureAlert(() => navigateToCropper(pic.path)); + } else { + navigateToCropper(pic.path); + } }) } /> |