IO-3092 Add imgproxy uploads and update expo version.
This commit is contained in:
@@ -1,23 +1,23 @@
|
||||
import { Ionicons } from '@expo/vector-icons';
|
||||
import { AssetsSelector } from 'expo-images-picker';
|
||||
import { MediaType } from 'expo-media-library';
|
||||
import React, { useCallback, useMemo, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { StyleSheet, Text, View } from 'react-native';
|
||||
import { connect } from 'react-redux';
|
||||
import { createStructuredSelector } from 'reselect';
|
||||
import { logImEXEvent } from '../../firebase/firebase.analytics';
|
||||
import { toggleDeleteAfterUpload } from '../../redux/app/app.actions';
|
||||
import { Ionicons } from "@expo/vector-icons";
|
||||
import { AssetsSelector } from "expo-images-picker";
|
||||
import { MediaType } from "expo-media-library";
|
||||
import React, { useCallback, useMemo, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { StyleSheet, Text, View } from "react-native";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { logImEXEvent } from "../../firebase/firebase.analytics";
|
||||
import { toggleDeleteAfterUpload } from "../../redux/app/app.actions";
|
||||
import {
|
||||
selectCurrentCameraJobId,
|
||||
selectDeleteAfterUpload,
|
||||
} from '../../redux/app/app.selectors';
|
||||
import { selectBodyshop } from '../../redux/user/user.selectors';
|
||||
import CameraSelectJob from '../camera-select-job/camera-select-job.component';
|
||||
import JobSpaceAvailable from '../job-space-available/job-space-available.component';
|
||||
import LocalUploadProgress from '../local-upload-progress/local-upload-progress.component';
|
||||
import UploadDeleteSwitch from '../upload-delete-switch/upload-delete-switch.component';
|
||||
import UploadProgress from '../upload-progress/upload-progress.component';
|
||||
} from "../../redux/app/app.selectors";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import CameraSelectJob from "../camera-select-job/camera-select-job.component";
|
||||
import JobSpaceAvailable from "../job-space-available/job-space-available.component";
|
||||
import UploadProgressLocal from "../upload-progress-local/upload-progress-local.component";
|
||||
import UploadDeleteSwitch from "../upload-delete-switch/upload-delete-switch.component";
|
||||
import UploadProgress from "../upload-progress/upload-progress.component";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
selectedCameraJobId: selectCurrentCameraJobId,
|
||||
@@ -43,18 +43,18 @@ export function ImageBrowserScreen({
|
||||
}, []);
|
||||
|
||||
const onDone = (data) => {
|
||||
logImEXEvent('imexmobile_upload_documents', { count: data.length });
|
||||
logImEXEvent("imexmobile_upload_documents", { count: data.length });
|
||||
if (data.length !== 0) setUploads(data);
|
||||
};
|
||||
|
||||
const widgetErrors = useMemo(
|
||||
() => ({
|
||||
errorTextColor: 'black',
|
||||
errorTextColor: "black",
|
||||
errorMessages: {
|
||||
hasErrorWithPermissions: 'Please Allow media gallery permissions.',
|
||||
hasErrorWithLoading: 'There was an error while loading images.',
|
||||
hasErrorWithResizing: 'There was an error while loading images.',
|
||||
hasNoAssets: 'No images found.',
|
||||
hasErrorWithPermissions: "Please Allow media gallery permissions.",
|
||||
hasErrorWithLoading: "There was an error while loading images.",
|
||||
hasErrorWithResizing: "There was an error while loading images.",
|
||||
hasNoAssets: "No images found.",
|
||||
},
|
||||
}),
|
||||
[]
|
||||
@@ -78,28 +78,28 @@ export function ImageBrowserScreen({
|
||||
width: 50,
|
||||
compress: 0.7,
|
||||
base64: false,
|
||||
saveTo: 'jpeg',
|
||||
saveTo: "jpeg",
|
||||
}),
|
||||
[]
|
||||
);
|
||||
|
||||
const _textStyle = {
|
||||
color: 'white',
|
||||
color: "white",
|
||||
};
|
||||
|
||||
const _buttonStyle = {
|
||||
backgroundColor: 'orange',
|
||||
backgroundColor: "orange",
|
||||
borderRadius: 5,
|
||||
};
|
||||
|
||||
const widgetNavigator = useMemo(
|
||||
() => ({
|
||||
Texts: {
|
||||
finish: t('mediabrowser.actions.upload'),
|
||||
back: t('mediabrowser.actions.refresh'),
|
||||
selected: 'selected',
|
||||
finish: t("mediabrowser.actions.upload"),
|
||||
back: t("mediabrowser.actions.refresh"),
|
||||
selected: "selected",
|
||||
},
|
||||
midTextColor: 'black',
|
||||
midTextColor: "black",
|
||||
minSelection: 1,
|
||||
buttonTextStyle: styles.textStyle,
|
||||
buttonStyle: styles.buttonStyle,
|
||||
@@ -114,20 +114,20 @@ export function ImageBrowserScreen({
|
||||
const widgetStyles = useMemo(
|
||||
() => ({
|
||||
margin: 2,
|
||||
bgColor: 'white',
|
||||
spinnerColor: 'blue',
|
||||
bgColor: "white",
|
||||
spinnerColor: "blue",
|
||||
widgetWidth: 99,
|
||||
videoIcon: {
|
||||
Component: Ionicons,
|
||||
iconName: 'videocam',
|
||||
color: 'white',
|
||||
iconName: "videocam",
|
||||
color: "white",
|
||||
size: 20,
|
||||
},
|
||||
selectedIcon: {
|
||||
Component: Ionicons,
|
||||
iconName: 'checkmark-circle-outline',
|
||||
color: 'white',
|
||||
bg: 'rgba(35,35,35, 0.75)',
|
||||
iconName: "checkmark-circle-outline",
|
||||
color: "white",
|
||||
bg: "rgba(35,35,35, 0.75)",
|
||||
size: 32,
|
||||
},
|
||||
}),
|
||||
@@ -139,7 +139,7 @@ export function ImageBrowserScreen({
|
||||
<CameraSelectJob />
|
||||
{bodyshop.uselocalmediaserver ? (
|
||||
<Text style={{ margin: 10 }}>
|
||||
{t('mediabrowser.labels.localserver', {
|
||||
{t("mediabrowser.labels.localserver", {
|
||||
url: bodyshop.localmediaserverhttp,
|
||||
})}
|
||||
</Text>
|
||||
@@ -161,11 +161,11 @@ export function ImageBrowserScreen({
|
||||
<View
|
||||
style={{
|
||||
flex: 1,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
}}
|
||||
>
|
||||
<Text>{t('mediabrowser.labels.selectjobassetselector')}</Text>
|
||||
<Text>{t("mediabrowser.labels.selectjobassetselector")}</Text>
|
||||
</View>
|
||||
)}
|
||||
{selectedCameraJobId && (
|
||||
@@ -179,7 +179,7 @@ export function ImageBrowserScreen({
|
||||
/>
|
||||
)}
|
||||
{bodyshop.uselocalmediaserver ? (
|
||||
<LocalUploadProgress
|
||||
<UploadProgressLocal
|
||||
uploads={uploads}
|
||||
setUploads={setUploads}
|
||||
forceRerender={forceRerender}
|
||||
@@ -200,7 +200,7 @@ const styles = StyleSheet.create({
|
||||
flex: 1,
|
||||
},
|
||||
container: {
|
||||
display: 'flex',
|
||||
display: "flex",
|
||||
// position: "relative",
|
||||
},
|
||||
buttonStyle: {
|
||||
@@ -208,7 +208,7 @@ const styles = StyleSheet.create({
|
||||
},
|
||||
// eslint-disable-next-line react-native/no-color-literals
|
||||
textStyle: {
|
||||
color: 'dodgerblue',
|
||||
color: "dodgerblue",
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user