image download and autoDownload, algo fix the formatAttachmentUrl to show the image from local
This commit is contained in:
parent
07e097000a
commit
cdad2884b9
|
@ -72,6 +72,7 @@ const Attachments: React.FC<IMessageAttachments> = React.memo(
|
||||||
style={style}
|
style={style}
|
||||||
isReply={isReply}
|
isReply={isReply}
|
||||||
author={author}
|
author={author}
|
||||||
|
messageId={id}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
import React, { useContext } from 'react';
|
import React, { useContext, useLayoutEffect, useRef, useState } from 'react';
|
||||||
import { StyleProp, TextStyle, View } from 'react-native';
|
import { StyleProp, TextStyle, View } from 'react-native';
|
||||||
import FastImage from 'react-native-fast-image';
|
import FastImage from 'react-native-fast-image';
|
||||||
import { dequal } from 'dequal';
|
import { dequal } from 'dequal';
|
||||||
import { createImageProgress } from 'react-native-image-progress';
|
import { createImageProgress } from 'react-native-image-progress';
|
||||||
import * as Progress from 'react-native-progress';
|
import * as Progress from 'react-native-progress';
|
||||||
|
import { BlurView } from '@react-native-community/blur';
|
||||||
|
|
||||||
import Touchable from './Touchable';
|
import Touchable from './Touchable';
|
||||||
import Markdown from '../markdown';
|
import Markdown from '../markdown';
|
||||||
|
@ -14,6 +15,9 @@ import { TGetCustomEmoji } from '../../definitions/IEmoji';
|
||||||
import { IAttachment, IUserMessage } from '../../definitions';
|
import { IAttachment, IUserMessage } from '../../definitions';
|
||||||
import { TSupportedThemes, useTheme } from '../../theme';
|
import { TSupportedThemes, useTheme } from '../../theme';
|
||||||
import { formatAttachmentUrl } from '../../lib/methods/helpers/formatAttachmentUrl';
|
import { formatAttachmentUrl } from '../../lib/methods/helpers/formatAttachmentUrl';
|
||||||
|
import { CustomIcon } from '../CustomIcon';
|
||||||
|
import RCActivityIndicator from '../ActivityIndicator';
|
||||||
|
import { MediaTypes, downloadMediaFile, searchMediaFileAsync } from '../../lib/methods/handleMediaDownload';
|
||||||
import { isAutoDownloadEnabled } from './helpers/mediaDownload/autoDownloadPreference';
|
import { isAutoDownloadEnabled } from './helpers/mediaDownload/autoDownloadPreference';
|
||||||
|
|
||||||
interface IMessageButton {
|
interface IMessageButton {
|
||||||
|
@ -31,6 +35,7 @@ interface IMessageImage {
|
||||||
isReply?: boolean;
|
isReply?: boolean;
|
||||||
getCustomEmoji?: TGetCustomEmoji;
|
getCustomEmoji?: TGetCustomEmoji;
|
||||||
author?: IUserMessage;
|
author?: IUserMessage;
|
||||||
|
messageId: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ImageProgress = createImageProgress(FastImage);
|
const ImageProgress = createImageProgress(FastImage);
|
||||||
|
@ -46,37 +51,100 @@ const Button = React.memo(({ children, onPress, disabled, theme }: IMessageButto
|
||||||
</Touchable>
|
</Touchable>
|
||||||
));
|
));
|
||||||
|
|
||||||
export const MessageImage = React.memo(({ imgUri, theme }: { imgUri: string; theme: TSupportedThemes }) => (
|
export const MessageImage = React.memo(
|
||||||
|
({ imgUri, toDownload, loading }: { imgUri: string; toDownload: boolean; loading: boolean }) => {
|
||||||
|
const { colors } = useTheme();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
<ImageProgress
|
<ImageProgress
|
||||||
style={[styles.image, { borderColor: themes[theme].borderColor }]}
|
style={[styles.image, { borderColor: colors.borderColor }]}
|
||||||
source={{ uri: encodeURI(imgUri) }}
|
source={{ uri: encodeURI(imgUri) }}
|
||||||
resizeMode={FastImage.resizeMode.cover}
|
resizeMode={FastImage.resizeMode.cover}
|
||||||
indicator={Progress.Pie}
|
indicator={Progress.Pie}
|
||||||
indicatorProps={{
|
indicatorProps={{
|
||||||
color: themes[theme].actionTintColor
|
color: colors.actionTintColor
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
));
|
{toDownload ? <BlurComponent loading={loading} /> : null}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
const BlurComponent = ({ loading = false }: { loading: boolean }) => {
|
||||||
|
const { theme, colors } = useTheme();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<BlurView
|
||||||
|
style={[styles.image, { position: 'absolute', borderWidth: 0, top: 0, left: 0, bottom: 0, right: 0 }]}
|
||||||
|
blurType={theme === 'light' ? 'light' : 'dark'}
|
||||||
|
blurAmount={10}
|
||||||
|
reducedTransparencyFallbackColor='white'
|
||||||
|
/>
|
||||||
|
<View style={[styles.image, { position: 'absolute', justifyContent: 'center', alignItems: 'center', borderWidth: 0 }]}>
|
||||||
|
{loading ? <RCActivityIndicator /> : <CustomIcon color={colors.buttonText} name='arrow-down-circle' size={54} />}
|
||||||
|
</View>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
const ImageContainer = React.memo(
|
const ImageContainer = React.memo(
|
||||||
({ file, imageUrl, showAttachment, getCustomEmoji, style, isReply, author }: IMessageImage) => {
|
({ file, imageUrl, showAttachment, getCustomEmoji, style, isReply, author, messageId }: IMessageImage) => {
|
||||||
|
const [toDownload, setToDownload] = useState(true);
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
const { theme } = useTheme();
|
const { theme } = useTheme();
|
||||||
const { baseUrl, user } = useContext(MessageContext);
|
const { baseUrl, user } = useContext(MessageContext);
|
||||||
const img = imageUrl || formatAttachmentUrl(file.image_url, user.id, user.token, baseUrl);
|
const img = imageUrl || formatAttachmentUrl(file.image_url, user.id, user.token, baseUrl);
|
||||||
|
const filePath = useRef('');
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
const handleAutoDownload = async () => {
|
||||||
|
if (img) {
|
||||||
|
const searchImageBestQuality = await searchMediaFileAsync({
|
||||||
|
type: MediaTypes.image,
|
||||||
|
mimeType: file.image_type,
|
||||||
|
messageId
|
||||||
|
});
|
||||||
|
filePath.current = searchImageBestQuality.filePath;
|
||||||
|
if (searchImageBestQuality.file?.exists) {
|
||||||
|
file.title_link = searchImageBestQuality.file.uri;
|
||||||
|
return setToDownload(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
const autoDownload = await isAutoDownloadEnabled('imagesPreferenceDownload', { user, author });
|
||||||
|
if (autoDownload) {
|
||||||
|
await handleDownload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
handleAutoDownload();
|
||||||
|
}, []);
|
||||||
|
|
||||||
if (!img) {
|
if (!img) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
isAutoDownloadEnabled('imagesPreferenceDownload', { user, author }).then(result => {
|
const handleDownload = async () => {
|
||||||
if (result && file.title_link) {
|
setLoading(true);
|
||||||
// Since https://github.com/RocketChat/Rocket.Chat.ReactNative/pull/3370 the title_link is considered the full image
|
const imgUrl = imageUrl || formatAttachmentUrl(file.title_link || file.image_url, user.id, user.token, baseUrl);
|
||||||
const imgBestQualityPreload = formatAttachmentUrl(file.title_link, user.id, user.token, baseUrl);
|
const imageUri = await downloadMediaFile({ url: imgUrl, filePath: filePath.current });
|
||||||
FastImage.preload([{ uri: imgBestQualityPreload }]);
|
file.title_link = imageUri;
|
||||||
}
|
setToDownload(false);
|
||||||
});
|
setLoading(false);
|
||||||
|
};
|
||||||
|
|
||||||
const onPress = () => {
|
const onPress = () => {
|
||||||
|
if (loading) {
|
||||||
|
// Cancelar o download
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (toDownload && !loading) {
|
||||||
|
return handleDownload();
|
||||||
|
}
|
||||||
|
|
||||||
if (!showAttachment) {
|
if (!showAttachment) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -95,7 +163,7 @@ const ImageContainer = React.memo(
|
||||||
getCustomEmoji={getCustomEmoji}
|
getCustomEmoji={getCustomEmoji}
|
||||||
theme={theme}
|
theme={theme}
|
||||||
/>
|
/>
|
||||||
<MessageImage imgUri={img} theme={theme} />
|
<MessageImage imgUri={img} toDownload={toDownload} loading={loading} />
|
||||||
</View>
|
</View>
|
||||||
</Button>
|
</Button>
|
||||||
);
|
);
|
||||||
|
@ -103,7 +171,9 @@ const ImageContainer = React.memo(
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Button disabled={isReply} theme={theme} onPress={onPress}>
|
<Button disabled={isReply} theme={theme} onPress={onPress}>
|
||||||
<MessageImage imgUri={img} theme={theme} />
|
<>
|
||||||
|
<MessageImage imgUri={img} toDownload={toDownload} loading={loading} />
|
||||||
|
</>
|
||||||
</Button>
|
</Button>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { StyleSheet } from 'react-native';
|
import { StyleSheet } from 'react-native';
|
||||||
|
|
||||||
import sharedStyles from '../../views/Styles';
|
import sharedStyles from '../../views/Styles';
|
||||||
import { isTablet } from '../../lib/methods/helpers';
|
import { isAndroid, isTablet } from '../../lib/methods/helpers';
|
||||||
|
|
||||||
export default StyleSheet.create({
|
export default StyleSheet.create({
|
||||||
root: {
|
root: {
|
||||||
|
@ -96,7 +96,9 @@ export default StyleSheet.create({
|
||||||
},
|
},
|
||||||
imageContainer: {
|
imageContainer: {
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
borderRadius: 4
|
borderRadius: 4,
|
||||||
|
// https://github.com/Kureev/react-native-blur/issues/520#issuecomment-1378339192 Fix BlurView
|
||||||
|
overflow: isAndroid ? 'hidden' : 'visible'
|
||||||
},
|
},
|
||||||
image: {
|
image: {
|
||||||
width: '100%',
|
width: '100%',
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
|
import * as FileSystem from 'expo-file-system';
|
||||||
|
|
||||||
export const formatAttachmentUrl = (attachmentUrl: string | undefined, userId: string, token: string, server: string): string => {
|
export const formatAttachmentUrl = (attachmentUrl: string | undefined, userId: string, token: string, server: string): string => {
|
||||||
|
if (attachmentUrl?.startsWith(`${FileSystem.documentDirectory}`)) {
|
||||||
|
return attachmentUrl;
|
||||||
|
}
|
||||||
if (attachmentUrl && attachmentUrl.startsWith('http')) {
|
if (attachmentUrl && attachmentUrl.startsWith('http')) {
|
||||||
if (attachmentUrl.includes('rc_token')) {
|
if (attachmentUrl.includes('rc_token')) {
|
||||||
return encodeURI(attachmentUrl);
|
return encodeURI(attachmentUrl);
|
||||||
|
|
Loading…
Reference in New Issue