diff --git a/native/avatars/avatar-hooks.js b/native/avatars/avatar-hooks.js index dd456a8e3..c907f280e 100644 --- a/native/avatars/avatar-hooks.js +++ b/native/avatars/avatar-hooks.js @@ -1,178 +1,220 @@ // @flow import { useActionSheet } from '@expo/react-native-action-sheet'; import * as ImagePicker from 'expo-image-picker'; import * as React from 'react'; +import { Platform } from 'react-native'; import { useSafeAreaInsets } from 'react-native-safe-area-context'; import { uploadMultimedia } from 'lib/actions/upload-actions.js'; import { extensionFromFilename, filenameFromPathOrURI, } from 'lib/media/file-utils.js'; import type { MediaLibrarySelection, MediaMissionFailure, UploadMultimediaResult, } from 'lib/types/media-types.js'; import { useServerCall } from 'lib/utils/action-utils.js'; +import SWMansionIcon from '../components/swmansion-icon.react.js'; import { getCompatibleMediaURI } from '../media/identifier-utils.js'; import type { MediaResult } from '../media/media-utils.js'; import { processMedia } from '../media/media-utils.js'; import { useSelector } from '../redux/redux-utils.js'; +import { useStyles } from '../themes/colors.js'; import { useStaffCanSee } from '../utils/staff-utils.js'; function useUploadProcessedMedia(): MediaResult => Promise { const callUploadMultimedia = useServerCall(uploadMultimedia); const uploadProcessedMultimedia: MediaResult => Promise = React.useCallback( processedMedia => { const { uploadURI, filename, mime, dimensions } = processedMedia; return callUploadMultimedia( { uri: uploadURI, name: filename, type: mime, }, dimensions, ); }, [callUploadMultimedia], ); return uploadProcessedMultimedia; } function useProcessSelectedMedia(): MediaLibrarySelection => Promise< MediaMissionFailure | MediaResult, > { const hasWiFi = useSelector(state => state.connectivity.hasWiFi); const staffCanSee = useStaffCanSee(); const processSelectedMedia = React.useCallback( async (selection: MediaLibrarySelection) => { const { resultPromise } = processMedia(selection, { hasWiFi, finalFileHeaderCheck: staffCanSee, }); return await resultPromise; }, [hasWiFi, staffCanSee], ); return processSelectedMedia; } function useSelectAndUploadFromGallery(): () => Promise { const processSelectedMedia = useProcessSelectedMedia(); const uploadProcessedMedia = useUploadProcessedMedia(); const selectAndUploadFromGallery = React.useCallback(async () => { try { const { assets, canceled } = await ImagePicker.launchImageLibraryAsync({ mediaTypes: ImagePicker.MediaTypeOptions.Images, allowsEditing: true, allowsMultipleSelection: false, quality: 1, }); if (canceled || assets.length === 0) { return; } const asset = assets.pop(); const { width, height, assetId: mediaNativeID } = asset; const assetFilename = asset.fileName || filenameFromPathOrURI(asset.uri) || ''; const uri = getCompatibleMediaURI( asset.uri, extensionFromFilename(assetFilename), ); const currentTime = Date.now(); const selection: MediaLibrarySelection = { step: 'photo_library', dimensions: { height, width }, uri, filename: assetFilename, mediaNativeID, selectTime: currentTime, sendTime: currentTime, retries: 0, }; const processedMedia = await processSelectedMedia(selection); if (!processedMedia.success) { return; } await uploadProcessedMedia(processedMedia); } catch (e) { console.log(e); return; } }, [processSelectedMedia, uploadProcessedMedia]); return selectAndUploadFromGallery; } type ShowAvatarActionSheetOptions = { - +id: string, - +text: string, + +id: 'emoji' | 'image' | 'cancel', +onPress?: () => mixed, - +icon?: React.Node, - +isCancel?: boolean, }; function useShowAvatarActionSheet( options: $ReadOnlyArray, ): () => void { + options = Platform.OS === 'ios' ? [...options, { id: 'cancel' }] : options; + const insets = useSafeAreaInsets(); const { showActionSheetWithOptions } = useActionSheet(); + const styles = useStyles(unboundStyles); const showAvatarActionSheet = React.useCallback(() => { - const texts = options.map( - (option: ShowAvatarActionSheetOptions) => option.text, - ); + const texts = options.map((option: ShowAvatarActionSheetOptions) => { + if (option.id === 'emoji') { + return 'Use Emoji'; + } else if (option.id === 'image') { + return 'Select image'; + } else { + return 'Cancel'; + } + }); - const cancelButtonIndex = options.findIndex(option => option.isCancel); + const cancelButtonIndex = options.findIndex( + option => option.id === 'cancel', + ); const containerStyle = { paddingBotton: insets.bottom, }; - const icons = options.map(option => option.icon); + const icons = options.map(option => { + if (option.id === 'emoji') { + return ( + + ); + } else if (option.id === 'image') { + return ( + + ); + } else { + return undefined; + } + }); const onPressAction = (selectedIndex: ?number) => { if ( selectedIndex === null || selectedIndex === undefined || selectedIndex < 0 ) { return; } const option = options[selectedIndex]; if (option.onPress) { option.onPress(); } }; showActionSheetWithOptions( { options: texts, cancelButtonIndex, containerStyle, icons, }, onPressAction, ); - }, [insets.bottom, options, showActionSheetWithOptions]); + }, [ + insets.bottom, + options, + showActionSheetWithOptions, + styles.bottomSheetIcon, + ]); return showAvatarActionSheet; } +const unboundStyles = { + bottomSheetIcon: { + color: '#000000', + }, +}; + export { useUploadProcessedMedia, useProcessSelectedMedia, useSelectAndUploadFromGallery, useShowAvatarActionSheet, }; diff --git a/native/avatars/edit-thread-avatar.react.js b/native/avatars/edit-thread-avatar.react.js index 9228adf71..78c43ed0e 100644 --- a/native/avatars/edit-thread-avatar.react.js +++ b/native/avatars/edit-thread-avatar.react.js @@ -1,89 +1,40 @@ // @flow import * as React from 'react'; -import { TouchableOpacity, Platform } from 'react-native'; +import { TouchableOpacity } from 'react-native'; import { useSelectAndUploadFromGallery, useShowAvatarActionSheet, } from './avatar-hooks.js'; import EditAvatarBadge from './edit-avatar-badge.react.js'; -import SWMansionIcon from '../components/swmansion-icon.react.js'; -import { useStyles } from '../themes/colors.js'; type Props = { +children: React.Node, +onPressEmojiAvatarFlow: () => mixed, +disabled?: boolean, }; function EditThreadAvatar(props: Props): React.Node { const { onPressEmojiAvatarFlow, children, disabled } = props; - const styles = useStyles(unboundStyles); - const selectAndUploadFromGallery = useSelectAndUploadFromGallery(); - const editAvatarOptions = React.useMemo(() => { - const options = [ - { - id: 'emoji', - text: 'Use Emoji', - onPress: onPressEmojiAvatarFlow, - icon: ( - - ), - }, - { - id: 'image', - text: 'Select image', - onPress: selectAndUploadFromGallery, - icon: ( - - ), - }, - ]; - - if (Platform.OS === 'ios') { - options.push({ - id: 'cancel', - text: 'Cancel', - isCancel: true, - }); - } - return options; - }, [ - onPressEmojiAvatarFlow, - selectAndUploadFromGallery, - styles.bottomSheetIcon, - ]); - - const showAvatarActionSheet = useShowAvatarActionSheet(editAvatarOptions); + const actionSheetConfig = React.useMemo( + () => [ + { id: 'emoji', onPress: onPressEmojiAvatarFlow }, + { id: 'image', onPress: selectAndUploadFromGallery }, + ], + [onPressEmojiAvatarFlow, selectAndUploadFromGallery], + ); - let editBadge; - if (!disabled) { - editBadge = ; - } + const showAvatarActionSheet = useShowAvatarActionSheet(actionSheetConfig); return ( {children} - {editBadge} + {!disabled ? : null} ); } -const unboundStyles = { - bottomSheetIcon: { - color: '#000000', - }, -}; - export default EditThreadAvatar; diff --git a/native/avatars/edit-user-avatar.react.js b/native/avatars/edit-user-avatar.react.js index e83058991..05c9337bc 100644 --- a/native/avatars/edit-user-avatar.react.js +++ b/native/avatars/edit-user-avatar.react.js @@ -1,89 +1,40 @@ // @flow import * as React from 'react'; -import { TouchableOpacity, Platform } from 'react-native'; +import { TouchableOpacity } from 'react-native'; import { useSelectAndUploadFromGallery, useShowAvatarActionSheet, } from './avatar-hooks.js'; import EditAvatarBadge from './edit-avatar-badge.react.js'; -import SWMansionIcon from '../components/swmansion-icon.react.js'; -import { useStyles } from '../themes/colors.js'; type Props = { +children: React.Node, +onPressEmojiAvatarFlow: () => mixed, +disabled?: boolean, }; function EditUserAvatar(props: Props): React.Node { const { onPressEmojiAvatarFlow, children, disabled } = props; - const styles = useStyles(unboundStyles); - const selectAndUploadFromGallery = useSelectAndUploadFromGallery(); - const editAvatarOptions = React.useMemo(() => { - const options = [ - { - id: 'emoji', - text: 'Use Emoji', - onPress: onPressEmojiAvatarFlow, - icon: ( - - ), - }, - { - id: 'image', - text: 'Select image', - onPress: selectAndUploadFromGallery, - icon: ( - - ), - }, - ]; - - if (Platform.OS === 'ios') { - options.push({ - id: 'cancel', - text: 'Cancel', - isCancel: true, - }); - } - return options; - }, [ - onPressEmojiAvatarFlow, - selectAndUploadFromGallery, - styles.bottomSheetIcon, - ]); - - const showAvatarActionSheet = useShowAvatarActionSheet(editAvatarOptions); + const actionSheetConfig = React.useMemo( + () => [ + { id: 'emoji', onPress: onPressEmojiAvatarFlow }, + { id: 'image', onPress: selectAndUploadFromGallery }, + ], + [onPressEmojiAvatarFlow, selectAndUploadFromGallery], + ); - let editBadge; - if (!disabled) { - editBadge = ; - } + const showAvatarActionSheet = useShowAvatarActionSheet(actionSheetConfig); return ( {children} - {editBadge} + {!disabled ? : null} ); } -const unboundStyles = { - bottomSheetIcon: { - color: '#000000', - }, -}; - export default EditUserAvatar;