@axelor/aos-mobile-core 7.1.1 → 7.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/metafile-api.d.ts +10 -0
- package/lib/api/metafile-api.js +12 -6
- package/lib/api/metafile-api.js.map +1 -1
- package/lib/api/mobile-config-api.js +9 -15
- package/lib/api/mobile-config-api.js.map +1 -1
- package/lib/api/model-api.d.ts +4 -0
- package/lib/api/model-api.js +28 -0
- package/lib/api/model-api.js.map +1 -0
- package/lib/apiProviders/utils.js +15 -3
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/app/RootNavigator.js +1 -1
- package/lib/auth/components/index.d.ts +1 -0
- package/lib/auth/components/index.js +19 -0
- package/lib/auth/components/index.js.map +1 -0
- package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.d.ts +2 -0
- package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.js +63 -0
- package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.js.map +1 -0
- package/lib/auth/components/molecules/index.d.ts +1 -0
- package/lib/auth/components/molecules/index.js +19 -0
- package/lib/auth/components/molecules/index.js.map +1 -0
- package/lib/auth/features/companySlice.d.ts +1 -1
- package/lib/auth/features/configSlice.d.ts +1 -1
- package/lib/auth/features/languageSlice.d.ts +1 -1
- package/lib/auth/features/userSlice.d.ts +1 -1
- package/lib/auth/features/userSlice.js +0 -4
- package/lib/auth/features/userSlice.js.map +1 -1
- package/lib/auth/screens/SettingsScreen.js +7 -31
- package/lib/auth/screens/SettingsScreen.js.map +1 -1
- package/lib/auth/screens/UserScreen.js +4 -4
- package/lib/auth/screens/UserScreen.js.map +1 -1
- package/lib/components/external/Camera/Camera.js +15 -5
- package/lib/components/external/Camera/Camera.js.map +1 -1
- package/lib/components/external/Camera/CaptureButton.d.ts +2 -1
- package/lib/components/external/Camera/CaptureButton.js +3 -3
- package/lib/components/external/Camera/CaptureButton.js.map +1 -1
- package/lib/components/external/Stopwatch/Stopwatch.d.ts +5 -1
- package/lib/components/external/Stopwatch/Stopwatch.js +35 -11
- package/lib/components/external/Stopwatch/Stopwatch.js.map +1 -1
- package/lib/components/external/Timer/Timer.d.ts +3 -2
- package/lib/components/external/Timer/Timer.js +5 -4
- package/lib/components/external/Timer/Timer.js.map +1 -1
- package/lib/components/molecules/CameraButton/CameraButton.d.ts +12 -0
- package/lib/components/molecules/CameraButton/CameraButton.js +87 -0
- package/lib/components/molecules/CameraButton/CameraButton.js.map +1 -0
- package/lib/components/molecules/UploadFileInput/UploadFileInput.d.ts +3 -1
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js +68 -14
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map +1 -1
- package/lib/components/molecules/index.d.ts +1 -0
- package/lib/components/molecules/index.js +1 -0
- package/lib/components/molecules/index.js.map +1 -1
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.d.ts +2 -1
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js +5 -4
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js.map +1 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.d.ts +4 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js +2 -2
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js.map +1 -1
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js +1 -1
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js.map +1 -1
- package/lib/components/templates/SocialNetworkLinks/SocialNetworkLinks.d.ts +13 -0
- package/lib/components/templates/SocialNetworkLinks/SocialNetworkLinks.js +58 -0
- package/lib/components/templates/SocialNetworkLinks/SocialNetworkLinks.js.map +1 -0
- package/lib/components/templates/index.d.ts +1 -0
- package/lib/components/templates/index.js +1 -0
- package/lib/components/templates/index.js.map +1 -1
- package/lib/config/routes.d.ts +20 -20
- package/lib/features/attachedFilesSlice.d.ts +1 -1
- package/lib/features/authSlice.d.ts +1 -1
- package/lib/features/cameraScannerSlice.d.ts +2 -2
- package/lib/features/cameraScannerSlice.js +4 -1
- package/lib/features/cameraScannerSlice.js.map +1 -1
- package/lib/features/cameraSlice.d.ts +13 -4
- package/lib/features/cameraSlice.js +4 -1
- package/lib/features/cameraSlice.js.map +1 -1
- package/lib/features/mailMessageSlice.d.ts +1 -1
- package/lib/features/menuConfigSlice.d.ts +1 -1
- package/lib/features/metaModuleSlice.d.ts +1 -1
- package/lib/features/metafileSlice.d.ts +1 -1
- package/lib/features/mobileConfigSlice.d.ts +1 -1
- package/lib/features/onlineSlice.d.ts +1 -1
- package/lib/features/scannerSlice.d.ts +2 -2
- package/lib/features/scannerSlice.js +4 -1
- package/lib/features/scannerSlice.js.map +1 -1
- package/lib/header/hooks.d.ts +15 -1
- package/lib/header/hooks.js +28 -2
- package/lib/header/hooks.js.map +1 -1
- package/lib/header/types.d.ts +1 -0
- package/lib/i18n/component/Translator.d.ts +1 -1
- package/lib/i18n/hooks/use-translator.js +3 -1
- package/lib/i18n/hooks/use-translator.js.map +1 -1
- package/lib/i18n/translations/en.json +1 -0
- package/lib/i18n/translations/fr.json +1 -0
- package/lib/index.d.ts +2 -2
- package/lib/index.js +2 -2
- package/lib/index.js.map +1 -1
- package/lib/navigator/Navigator.d.ts +1 -1
- package/lib/navigator/Navigator.js +2 -18
- package/lib/navigator/Navigator.js.map +1 -1
- package/lib/navigator/drawer/Header.js +1 -1
- package/lib/navigator/drawer/Header.js.map +1 -1
- package/lib/redux/store.d.ts +1 -1
- package/lib/screens/BarcodeDisplayScreen.d.ts +4 -0
- package/lib/screens/BarcodeDisplayScreen.js +54 -0
- package/lib/screens/BarcodeDisplayScreen.js.map +1 -0
- package/lib/screens/SessionManagementScreen.js +1 -1
- package/lib/screens/SessionManagementScreen.js.map +1 -1
- package/lib/screens/index.d.ts +38 -0
- package/lib/screens/index.js +47 -0
- package/lib/screens/index.js.map +1 -0
- package/lib/sessions/components/alerts/PopupCreateSession.d.ts +3 -3
- package/lib/sessions/components/alerts/PopupCreateSession.js +24 -15
- package/lib/sessions/components/alerts/PopupCreateSession.js.map +1 -1
- package/lib/sessions/components/alerts/PopupEditSession.js +1 -0
- package/lib/sessions/components/alerts/PopupEditSession.js.map +1 -1
- package/lib/sessions/components/display/SessionListCard.js +3 -6
- package/lib/sessions/components/display/SessionListCard.js.map +1 -1
- package/lib/sessions/components/inputs/SessionInputs.d.ts +2 -1
- package/lib/sessions/components/inputs/SessionInputs.js +9 -6
- package/lib/sessions/components/inputs/SessionInputs.js.map +1 -1
- package/lib/tools/LinkingProvider.d.ts +2 -2
- package/lib/tools/LinkingProvider.js +4 -4
- package/lib/tools/LinkingProvider.js.map +1 -1
- package/lib/utils/filter.d.ts +4 -0
- package/lib/utils/filter.js +13 -0
- package/lib/utils/filter.js.map +1 -1
- package/lib/utils/formatters.d.ts +1 -0
- package/lib/utils/formatters.js +16 -0
- package/lib/utils/formatters.js.map +1 -1
- package/lib/utils/index.d.ts +2 -2
- package/lib/utils/index.js +2 -2
- package/lib/utils/index.js.map +1 -1
- package/package.json +7 -8
|
@@ -25,13 +25,14 @@ import { Icon, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
|
25
25
|
import { disableCamera, takePhoto, useCameraSelector, } from '../../../features/cameraSlice';
|
|
26
26
|
import CaptureButton from './CaptureButton';
|
|
27
27
|
const CONTENT_SPACING = 40;
|
|
28
|
+
const PHOTO_TYPE = 'jpeg';
|
|
28
29
|
const SAFE_BOTTOM = Platform.select({
|
|
29
30
|
ios: StaticSafeAreaInsets.safeAreaInsetsBottom,
|
|
30
31
|
}) ?? 0;
|
|
31
32
|
const SAFE_AREA_PADDING = {
|
|
32
33
|
paddingLeft: StaticSafeAreaInsets.safeAreaInsetsLeft + CONTENT_SPACING,
|
|
33
|
-
paddingTop: StaticSafeAreaInsets.safeAreaInsetsTop + CONTENT_SPACING,
|
|
34
|
-
paddingRight: StaticSafeAreaInsets.safeAreaInsetsRight + CONTENT_SPACING,
|
|
34
|
+
paddingTop: StaticSafeAreaInsets.safeAreaInsetsTop + CONTENT_SPACING * 1.5,
|
|
35
|
+
paddingRight: StaticSafeAreaInsets.safeAreaInsetsRight + CONTENT_SPACING / 2,
|
|
35
36
|
paddingBottom: SAFE_BOTTOM + CONTENT_SPACING,
|
|
36
37
|
};
|
|
37
38
|
const BUTTON_SIZE = 40;
|
|
@@ -84,7 +85,16 @@ const Camera = () => {
|
|
|
84
85
|
}, []);
|
|
85
86
|
const onMediaCapture = useCallback(async (photo) => {
|
|
86
87
|
const photoData = await RNFS.readFile(photo.path, 'base64');
|
|
87
|
-
|
|
88
|
+
const { size } = await RNFS.stat(photo.path);
|
|
89
|
+
dispatch(takePhoto({
|
|
90
|
+
name: `camera.${PHOTO_TYPE}`,
|
|
91
|
+
pictureExtention: PHOTO_TYPE,
|
|
92
|
+
dateTime: new Date().toISOString(),
|
|
93
|
+
type: `image/${PHOTO_TYPE}`,
|
|
94
|
+
size: size,
|
|
95
|
+
base64: photoData,
|
|
96
|
+
fullBase64: `data:image/${PHOTO_TYPE};base64,${photoData}`,
|
|
97
|
+
}));
|
|
88
98
|
dispatch(disableCamera());
|
|
89
99
|
}, [dispatch]);
|
|
90
100
|
useEffect(() => {
|
|
@@ -110,7 +120,7 @@ const Camera = () => {
|
|
|
110
120
|
<Icon style={styles.button} name={'times'} color={Colors.backgroundColor} size={24} touchable={true} onPress={() => dispatch(disableCamera())}/>
|
|
111
121
|
</View>
|
|
112
122
|
<View style={styles.captureButton}>
|
|
113
|
-
<CaptureButton camera={camera} onMediaCaptured={onMediaCapture} flash={flash} enabled={isEnabled}/>
|
|
123
|
+
<CaptureButton camera={camera} onMediaCaptured={onMediaCapture} flash={flash} enabled={isEnabled} type={PHOTO_TYPE}/>
|
|
114
124
|
</View>
|
|
115
125
|
</View>);
|
|
116
126
|
};
|
|
@@ -125,7 +135,7 @@ const styles = StyleSheet.create({
|
|
|
125
135
|
zIndex: 850,
|
|
126
136
|
},
|
|
127
137
|
camera: {
|
|
128
|
-
height: Dimensions.get('
|
|
138
|
+
height: Dimensions.get('screen').height,
|
|
129
139
|
width: Dimensions.get('window').width,
|
|
130
140
|
position: 'absolute',
|
|
131
141
|
top: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/Camera.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AACpE,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,MAAM,IAAI,aAAa,EACvB,iBAAiB,EACjB,WAAW,EACX,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,oBAAoB,MAAM,sCAAsC,CAAC;AACxE,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EACL,aAAa,EACb,SAAS,EACT,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,MAAM,eAAe,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/Camera.js"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import type { Camera, PhotoFile } from 'react-native-vision-camera';
|
|
3
|
-
declare const CaptureButton: ({ camera, onMediaCaptured, flash, enabled, style, }: {
|
|
3
|
+
declare const CaptureButton: ({ camera, onMediaCaptured, flash, enabled, style, type, }: {
|
|
4
4
|
camera: React.RefObject<Camera>;
|
|
5
5
|
onMediaCaptured: (media: PhotoFile) => void;
|
|
6
6
|
flash: 'off' | 'on';
|
|
7
7
|
enabled: boolean;
|
|
8
8
|
style?: any;
|
|
9
|
+
type: string;
|
|
9
10
|
}) => JSX.Element;
|
|
10
11
|
export default CaptureButton;
|
|
@@ -20,14 +20,14 @@ import { TouchableOpacity, StyleSheet, View } from 'react-native';
|
|
|
20
20
|
import Reanimated, { Easing, useAnimatedStyle, withSpring, withTiming, useSharedValue, withRepeat, } from 'react-native-reanimated';
|
|
21
21
|
const CAPTURE_BUTTON_SIZE = 78;
|
|
22
22
|
const BORDER_WIDTH = CAPTURE_BUTTON_SIZE * 0.1;
|
|
23
|
-
const CaptureButton = ({ camera, onMediaCaptured, flash, enabled, style, }) => {
|
|
23
|
+
const CaptureButton = ({ camera, onMediaCaptured, flash, enabled, style, type, }) => {
|
|
24
24
|
const takePhotoOptions = useMemo(() => ({
|
|
25
|
-
photoCodec:
|
|
25
|
+
photoCodec: type,
|
|
26
26
|
qualityPrioritization: 'speed',
|
|
27
27
|
flash: flash,
|
|
28
28
|
quality: 90,
|
|
29
29
|
skipMetadata: false,
|
|
30
|
-
}), [flash]);
|
|
30
|
+
}), [flash, type]);
|
|
31
31
|
const isPressingButton = useSharedValue(false);
|
|
32
32
|
const takePhoto = useCallback(async () => {
|
|
33
33
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CaptureButton.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/CaptureButton.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAChE,OAAO,UAAU,EAAE,EACjB,MAAM,EACN,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,cAAc,EACd,UAAU,GACX,MAAM,yBAAyB,CAAC;AAQjC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,YAAY,GAAG,mBAAmB,GAAG,GAAG,CAAC;AAE/C,MAAM,aAAa,GAAG,CAAC,EACrB,MAAM,EACN,eAAe,EACf,KAAK,EACL,OAAO,EACP,KAAK,
|
|
1
|
+
{"version":3,"file":"CaptureButton.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/CaptureButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
interface StopwatchProps {
|
|
2
2
|
startTime: number;
|
|
3
3
|
status: number;
|
|
4
|
+
getTimerState?: () => {
|
|
5
|
+
status: number;
|
|
6
|
+
time: number;
|
|
7
|
+
};
|
|
4
8
|
timerFormat: string;
|
|
5
9
|
disable?: boolean;
|
|
6
10
|
disablePlay?: boolean;
|
|
@@ -15,5 +19,5 @@ interface StopwatchProps {
|
|
|
15
19
|
onCancel?: () => void;
|
|
16
20
|
useObjectStatus?: boolean;
|
|
17
21
|
}
|
|
18
|
-
declare const Stopwatch: ({ startTime, status, timerFormat, disable, disablePlay, disablePause, disableStop, disableCancel, hideCancel, style, onPlay, onPause, onStop, onCancel, useObjectStatus, }: StopwatchProps) => JSX.Element;
|
|
22
|
+
declare const Stopwatch: ({ startTime, status, getTimerState, timerFormat, disable, disablePlay, disablePause, disableStop, disableCancel, hideCancel, style, onPlay, onPause, onStop, onCancel, useObjectStatus, }: StopwatchProps) => JSX.Element;
|
|
19
23
|
export default Stopwatch;
|
|
@@ -15,17 +15,36 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, { useEffect, useMemo, useState } from 'react';
|
|
19
|
-
import { StyleSheet, View } from 'react-native';
|
|
18
|
+
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
|
19
|
+
import { AppState, StyleSheet, View } from 'react-native';
|
|
20
20
|
import { Card, Icon, Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import useTranslator from '../../../i18n/hooks/use-translator';
|
|
22
22
|
import { StopwatchType } from '../../../types';
|
|
23
23
|
import { Timer } from '../../external';
|
|
24
|
-
const
|
|
24
|
+
const APP_STATE = {
|
|
25
|
+
inactiveRegex: /inactive|background/,
|
|
26
|
+
activeMode: 'active',
|
|
27
|
+
};
|
|
28
|
+
const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, getTimerState = () => ({ status: null, time: null }), timerFormat, disable = false, disablePlay = false, disablePause = false, disableStop = false, disableCancel = false, hideCancel = false, style, onPlay = () => { }, onPause = () => { }, onStop = () => { }, onCancel = () => { }, useObjectStatus = false, }) => {
|
|
29
|
+
const appState = useRef(AppState.currentState);
|
|
25
30
|
const Colors = useThemeColor();
|
|
26
31
|
const I18n = useTranslator();
|
|
27
32
|
const [state, setState] = useState(status);
|
|
28
33
|
const [time, setTime] = useState(startTime);
|
|
34
|
+
useEffect(() => {
|
|
35
|
+
const subscription = AppState.addEventListener('change', nextAppState => {
|
|
36
|
+
if (appState.current.match(APP_STATE.inactiveRegex) &&
|
|
37
|
+
nextAppState === APP_STATE.activeMode) {
|
|
38
|
+
const { status: _status, time: _time } = getTimerState();
|
|
39
|
+
_status != null && setState(_status);
|
|
40
|
+
_time != null && setTime(_time);
|
|
41
|
+
}
|
|
42
|
+
appState.current = nextAppState;
|
|
43
|
+
});
|
|
44
|
+
return () => {
|
|
45
|
+
subscription.remove();
|
|
46
|
+
};
|
|
47
|
+
}, [appState, getTimerState]);
|
|
29
48
|
useEffect(() => {
|
|
30
49
|
setTime(startTime);
|
|
31
50
|
}, [startTime]);
|
|
@@ -58,6 +77,11 @@ const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFo
|
|
|
58
77
|
setTime(0);
|
|
59
78
|
onCancel();
|
|
60
79
|
};
|
|
80
|
+
const TimerButton = ({ name, disabled, onPress, }) => {
|
|
81
|
+
return (<Icon name={name} size={25} color={disabled
|
|
82
|
+
? Colors.secondaryColor.background_light
|
|
83
|
+
: Colors.secondaryColor_dark.background} touchable={!disabled} onPress={onPress} style={styles.btn}/>);
|
|
84
|
+
};
|
|
61
85
|
return (<Card style={[styles.container, borderStyle, style]}>
|
|
62
86
|
<View style={styles.row}>
|
|
63
87
|
<Text style={styles.status}>
|
|
@@ -67,20 +91,20 @@ const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFo
|
|
|
67
91
|
</View>
|
|
68
92
|
<View style={styles.row}>
|
|
69
93
|
<View style={styles.btnContainer}>
|
|
70
|
-
{stopwatchStatus !== StopwatchType.status.InProgress && (<
|
|
94
|
+
{stopwatchStatus !== StopwatchType.status.InProgress && (<TimerButton name="play" disabled={disable ||
|
|
71
95
|
disablePlay ||
|
|
72
96
|
stopwatchStatus === StopwatchType.status.InProgress ||
|
|
73
|
-
stopwatchStatus === StopwatchType.status.Finished}
|
|
74
|
-
{stopwatchStatus === StopwatchType.status.InProgress && (<
|
|
75
|
-
<
|
|
97
|
+
stopwatchStatus === StopwatchType.status.Finished} onPress={handlePlayBtn}/>)}
|
|
98
|
+
{stopwatchStatus === StopwatchType.status.InProgress && (<TimerButton name="pause" disabled={disable || disablePause} onPress={handlePauseBtn}/>)}
|
|
99
|
+
<TimerButton name="power-off" disabled={disable ||
|
|
76
100
|
disableStop ||
|
|
77
101
|
stopwatchStatus === StopwatchType.status.Ready ||
|
|
78
|
-
stopwatchStatus === StopwatchType.status.Finished}
|
|
79
|
-
{!hideCancel && (<
|
|
102
|
+
stopwatchStatus === StopwatchType.status.Finished} onPress={handleStopBtn}/>
|
|
103
|
+
{!hideCancel && (<TimerButton name="undo" disabled={disable ||
|
|
80
104
|
disableCancel ||
|
|
81
|
-
stopwatchStatus === StopwatchType.status.Ready}
|
|
105
|
+
stopwatchStatus === StopwatchType.status.Ready} onPress={handleCancelBtn}/>)}
|
|
82
106
|
</View>
|
|
83
|
-
<Timer time={time}
|
|
107
|
+
<Timer time={time} addCount={timeToAdd => setTime(_current => _current + timeToAdd)} style={styles.timer} isPaused={stopwatchStatus !== StopwatchType.status.InProgress} timerFormat={timerFormat}/>
|
|
84
108
|
</View>
|
|
85
109
|
</Card>);
|
|
86
110
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Stopwatch.js","sourceRoot":"","sources":["../../../../src/components/external/Stopwatch/Stopwatch.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Stopwatch.js","sourceRoot":"","sources":["../../../../src/components/external/Stopwatch/Stopwatch.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
1
2
|
interface TimerProps {
|
|
2
3
|
time: number;
|
|
3
4
|
timerFormat: string;
|
|
4
5
|
style?: any;
|
|
5
6
|
isPaused?: boolean;
|
|
6
|
-
|
|
7
|
+
addCount: (value: any) => void;
|
|
7
8
|
}
|
|
8
|
-
declare function Timer({ style, timerFormat, time, isPaused,
|
|
9
|
+
declare function Timer({ style, timerFormat, time, isPaused, addCount, }: TimerProps): JSX.Element;
|
|
9
10
|
export default Timer;
|
|
@@ -19,7 +19,8 @@ import React, { useEffect, useCallback, useMemo } from 'react';
|
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
20
|
import { Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { formatDuration } from '../../../utils/formatters';
|
|
22
|
-
|
|
22
|
+
const ONE_SECOND = 1000;
|
|
23
|
+
function Timer({ style, timerFormat, time = 0, isPaused = true, addCount, }) {
|
|
23
24
|
const interval = React.useRef(null);
|
|
24
25
|
const Colors = useThemeColor();
|
|
25
26
|
const styles = useMemo(() => {
|
|
@@ -30,13 +31,13 @@ function Timer({ style, timerFormat, time = 0, isPaused = true, onCount, }) {
|
|
|
30
31
|
console.warn('Timer: something went wrong');
|
|
31
32
|
return;
|
|
32
33
|
}
|
|
33
|
-
|
|
34
|
-
}, [
|
|
34
|
+
addCount(ONE_SECOND);
|
|
35
|
+
}, [addCount, time]);
|
|
35
36
|
useEffect(() => {
|
|
36
37
|
if (isPaused) {
|
|
37
38
|
return;
|
|
38
39
|
}
|
|
39
|
-
interval.current = setInterval(counterHandle,
|
|
40
|
+
interval.current = setInterval(counterHandle, ONE_SECOND);
|
|
40
41
|
return () => clearInterval(interval.current);
|
|
41
42
|
}, [counterHandle, isPaused, time]);
|
|
42
43
|
return (<View style={[styles.timer, style]}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Timer.js","sourceRoot":"","sources":["../../../../src/components/external/Timer/Timer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"Timer.js","sourceRoot":"","sources":["../../../../src/components/external/Timer/Timer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;AAEzD,MAAM,UAAU,GAAG,IAAI,CAAC;AAUxB,SAAS,KAAK,CAAC,EACb,KAAK,EACL,WAAW,EACX,IAAI,GAAG,CAAC,EACR,QAAQ,GAAG,IAAI,EACf,QAAQ,GACG;IACX,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;QAC1B,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;QACrC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAC5C,OAAO;SACR;QACD,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAErB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,EAAE;YACZ,OAAO;SACR;QAED,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC1D,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC,EAAE,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAEpC,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CACjC;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,EAAE,IAAI,CACrE;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC;AAED,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CACzB,UAAU,CAAC,MAAM,CAAC;IAChB,KAAK,EAAE;QACL,UAAU,EAAE,CAAC;QACb,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;KACrB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM;QAClB,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,UAAU;KAC7C;CACF,CAAC,CAAC;AAEL,eAAe,KAAK,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
declare const CameraButton: ({ size, cameraKey, onUpload, returnBase64, getFileName, }: {
|
|
2
|
+
size?: number;
|
|
3
|
+
cameraKey: string;
|
|
4
|
+
onUpload: (_file: any) => void;
|
|
5
|
+
returnBase64?: boolean;
|
|
6
|
+
getFileName?: (data: {
|
|
7
|
+
user: any;
|
|
8
|
+
extension: string;
|
|
9
|
+
dateTime: string;
|
|
10
|
+
}) => string;
|
|
11
|
+
}) => JSX.Element;
|
|
12
|
+
export default CameraButton;
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Axelor Business Solutions
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2023 Axelor (<http://axelor.com>).
|
|
5
|
+
*
|
|
6
|
+
* This program is free software: you can redistribute it and/or modify
|
|
7
|
+
* it under the terms of the GNU Affero General Public License, version 3,
|
|
8
|
+
* as published by the Free Software Foundation.
|
|
9
|
+
*
|
|
10
|
+
* This program is distributed in the hope that it will be useful,
|
|
11
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
+
* GNU Affero General Public License for more details.
|
|
14
|
+
*
|
|
15
|
+
* You should have received a copy of the GNU Affero General Public License
|
|
16
|
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
+
*/
|
|
18
|
+
import React, { useCallback, useEffect, useMemo } from 'react';
|
|
19
|
+
import { Dimensions, StyleSheet } from 'react-native';
|
|
20
|
+
import { useDispatch, useSelector } from 'react-redux';
|
|
21
|
+
import { CircleButton, useConfig, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
|
+
import { clearPhoto, enableCamera, useCameraValueByKey, } from '../../../features/cameraSlice';
|
|
23
|
+
import { uploadBase64 } from '../../../api/metafile-api';
|
|
24
|
+
const CameraButton = ({ size = 70, cameraKey, onUpload, returnBase64 = false, getFileName, }) => {
|
|
25
|
+
const Colors = useThemeColor();
|
|
26
|
+
const dispatch = useDispatch();
|
|
27
|
+
const { setActivityIndicator } = useConfig();
|
|
28
|
+
const cameraPicture = useCameraValueByKey(cameraKey);
|
|
29
|
+
const { baseUrl, token, jsessionId } = useSelector((state) => state.auth);
|
|
30
|
+
const { user } = useSelector((state) => state.user);
|
|
31
|
+
const styles = useMemo(() => getStyles(Colors, size), [Colors, size]);
|
|
32
|
+
const handleCameraPress = useCallback(() => {
|
|
33
|
+
dispatch(enableCamera(cameraKey));
|
|
34
|
+
}, [cameraKey, dispatch]);
|
|
35
|
+
const handleNext = useCallback(_file => {
|
|
36
|
+
setActivityIndicator(false);
|
|
37
|
+
onUpload(_file);
|
|
38
|
+
}, [onUpload, setActivityIndicator]);
|
|
39
|
+
const handleCameraUpload = useCallback(async (photo) => {
|
|
40
|
+
try {
|
|
41
|
+
const _file = {
|
|
42
|
+
name: getFileName
|
|
43
|
+
? getFileName({
|
|
44
|
+
user,
|
|
45
|
+
dateTime: photo.dateTime,
|
|
46
|
+
extension: photo.pictureExtention,
|
|
47
|
+
})
|
|
48
|
+
: `Camera_${user.name}_${photo.dateTime}.${photo.pictureExtention}`,
|
|
49
|
+
type: photo.type,
|
|
50
|
+
size: photo.size,
|
|
51
|
+
base64: photo.base64,
|
|
52
|
+
};
|
|
53
|
+
if (returnBase64) {
|
|
54
|
+
handleNext(_file);
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const response = await uploadBase64(_file, {
|
|
58
|
+
baseUrl,
|
|
59
|
+
token,
|
|
60
|
+
jsessionId,
|
|
61
|
+
});
|
|
62
|
+
handleNext(response);
|
|
63
|
+
}
|
|
64
|
+
catch (error) {
|
|
65
|
+
console.log('Could not upload the file:', error);
|
|
66
|
+
}
|
|
67
|
+
}, [baseUrl, getFileName, handleNext, jsessionId, returnBase64, token, user]);
|
|
68
|
+
useEffect(() => {
|
|
69
|
+
if (cameraPicture) {
|
|
70
|
+
setActivityIndicator(true);
|
|
71
|
+
handleCameraUpload(cameraPicture);
|
|
72
|
+
dispatch(clearPhoto());
|
|
73
|
+
}
|
|
74
|
+
}, [cameraPicture, dispatch, handleCameraUpload, setActivityIndicator]);
|
|
75
|
+
return (<CircleButton style={styles.floatingButton} iconName="camera" onPress={handleCameraPress} size={size}/>);
|
|
76
|
+
};
|
|
77
|
+
const getStyles = (Colors, buttonSize) => StyleSheet.create({
|
|
78
|
+
floatingButton: {
|
|
79
|
+
backgroundColor: Colors.secondaryColor_dark.foreground,
|
|
80
|
+
position: 'absolute',
|
|
81
|
+
bottom: 25,
|
|
82
|
+
elevation: 2,
|
|
83
|
+
left: Dimensions.get('window').width / 2 - buttonSize / 2,
|
|
84
|
+
},
|
|
85
|
+
});
|
|
86
|
+
export default CameraButton;
|
|
87
|
+
//# sourceMappingURL=CameraButton.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CameraButton.js","sourceRoot":"","sources":["../../../../src/components/molecules/CameraButton/CameraButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ interface UploadFileInputProps {
|
|
|
10
10
|
canDeleteFile?: boolean;
|
|
11
11
|
displayPreview?: boolean;
|
|
12
12
|
maxSize?: number;
|
|
13
|
+
canTakePicture?: boolean;
|
|
14
|
+
getFileName?: (extension: string, dateTime: string) => string;
|
|
13
15
|
}
|
|
14
|
-
declare const UploadFileInput: ({ style, title, defaultValue, onUpload, returnBase64String, required, readonly, documentTypesAllowed, canDeleteFile, displayPreview, maxSize, }: UploadFileInputProps) => JSX.Element;
|
|
16
|
+
declare const UploadFileInput: ({ style, title, defaultValue, onUpload, returnBase64String, required, readonly, documentTypesAllowed, canDeleteFile, displayPreview, maxSize, canTakePicture, getFileName, }: UploadFileInputProps) => JSX.Element;
|
|
15
17
|
export default UploadFileInput;
|
|
@@ -15,20 +15,22 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, { useEffect, useMemo, useState } from 'react';
|
|
18
|
+
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
|
-
import { useSelector } from 'react-redux';
|
|
20
|
+
import { useDispatch, useSelector } from 'react-redux';
|
|
21
21
|
import DocumentPicker from 'react-native-document-picker';
|
|
22
|
-
import {
|
|
23
|
-
import { deleteMetaFile, uploadFile } from '../../../api/metafile-api';
|
|
22
|
+
import { Text, getCommonStyles, useThemeColor, Image, Icon, } from '@axelor/aos-mobile-ui';
|
|
23
|
+
import { deleteMetaFile, uploadBase64, uploadFile, } from '../../../api/metafile-api';
|
|
24
24
|
import { useTranslator } from '../../../i18n';
|
|
25
25
|
import { openFileInExternalApp } from '../../../tools';
|
|
26
26
|
import { useMetafileUri } from '../../../utils';
|
|
27
|
+
import { useCameraValueByKey, enableCamera, clearPhoto, } from '../../../features/cameraSlice';
|
|
27
28
|
const DEFAULT_MAX_FILE_SIZE = 5000000;
|
|
29
|
+
const BUTTON_SIZE = 28;
|
|
28
30
|
const isMetaFile = file => {
|
|
29
|
-
return (
|
|
31
|
+
return (file != null &&
|
|
32
|
+
typeof file === 'object' &&
|
|
30
33
|
file?.id != null &&
|
|
31
|
-
file?.version != null &&
|
|
32
34
|
file?.fileName != null);
|
|
33
35
|
};
|
|
34
36
|
const formatFileSize = (size) => {
|
|
@@ -40,10 +42,13 @@ const formatFileSize = (size) => {
|
|
|
40
42
|
}
|
|
41
43
|
}
|
|
42
44
|
};
|
|
43
|
-
const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, returnBase64String = false, required = false, readonly = false, documentTypesAllowed = 'allFiles', canDeleteFile = true, displayPreview = false, maxSize = DEFAULT_MAX_FILE_SIZE, }) => {
|
|
45
|
+
const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, returnBase64String = false, required = false, readonly = false, documentTypesAllowed = 'allFiles', canDeleteFile = true, displayPreview = false, maxSize = DEFAULT_MAX_FILE_SIZE, canTakePicture = true, getFileName = (extension, dateTime) => `picture_${dateTime}.${extension}`, }) => {
|
|
44
46
|
const I18n = useTranslator();
|
|
45
47
|
const Colors = useThemeColor();
|
|
46
48
|
const formatMetafileURI = useMetafileUri();
|
|
49
|
+
const dispatch = useDispatch();
|
|
50
|
+
const cameraKey = useMemo(() => `${title}camera_upload`, [title]);
|
|
51
|
+
const cameraPicture = useCameraValueByKey(cameraKey);
|
|
47
52
|
const { baseUrl, token, jsessionId } = useSelector((state) => state.auth);
|
|
48
53
|
const [selectedFile, setSelectedFile] = useState(defaultValue);
|
|
49
54
|
const [sizeError, setSizeError] = useState(false);
|
|
@@ -54,8 +59,17 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
54
59
|
}
|
|
55
60
|
return maxSize;
|
|
56
61
|
}, [maxSize]);
|
|
62
|
+
const _enablePicture = useMemo(() => {
|
|
63
|
+
if (!canTakePicture) {
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
return documentTypesAllowed !== 'pdf';
|
|
67
|
+
}, [canTakePicture, documentTypesAllowed]);
|
|
57
68
|
const commonStyles = useMemo(() => getCommonStyles(Colors), [Colors]);
|
|
58
69
|
const styles = useMemo(() => getStyles(Colors, _required), [Colors, _required]);
|
|
70
|
+
const handleCamera = () => {
|
|
71
|
+
dispatch(enableCamera(cameraKey));
|
|
72
|
+
};
|
|
59
73
|
const handleDocumentPick = async () => {
|
|
60
74
|
try {
|
|
61
75
|
const file = await DocumentPicker.pickSingle({
|
|
@@ -90,17 +104,44 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
90
104
|
console.log('Could not upload the file:', error);
|
|
91
105
|
}
|
|
92
106
|
};
|
|
107
|
+
const handleCameraUpload = useCallback(async (photo) => {
|
|
108
|
+
try {
|
|
109
|
+
const _file = {
|
|
110
|
+
name: getFileName
|
|
111
|
+
? getFileName(photo.pictureExtention, photo.dateTime)
|
|
112
|
+
: `picture_${photo.dateTime}.${photo.pictureExtention}`,
|
|
113
|
+
type: photo.type,
|
|
114
|
+
size: photo.size,
|
|
115
|
+
base64: returnBase64String ? photo.fullBase64 : photo.base64,
|
|
116
|
+
};
|
|
117
|
+
if (returnBase64String) {
|
|
118
|
+
setSelectedFile(_file);
|
|
119
|
+
onUpload(_file.base64);
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
const response = await uploadBase64(_file, {
|
|
123
|
+
baseUrl,
|
|
124
|
+
token,
|
|
125
|
+
jsessionId,
|
|
126
|
+
});
|
|
127
|
+
setSelectedFile({ ..._file, ...response });
|
|
128
|
+
onUpload(response);
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
console.log('Could not upload the file:', error);
|
|
132
|
+
}
|
|
133
|
+
}, [baseUrl, getFileName, jsessionId, onUpload, returnBase64String, token]);
|
|
93
134
|
const handleFileDelete = async () => {
|
|
94
135
|
if (isMetaFile(selectedFile)) {
|
|
95
136
|
try {
|
|
96
137
|
await deleteMetaFile(selectedFile?.id);
|
|
97
|
-
onUpload();
|
|
98
138
|
}
|
|
99
139
|
catch (error) {
|
|
100
140
|
console.log('Could not delete the file:', error);
|
|
101
141
|
}
|
|
102
142
|
}
|
|
103
143
|
setSelectedFile(null);
|
|
144
|
+
onUpload(null);
|
|
104
145
|
};
|
|
105
146
|
const handleFileView = async () => {
|
|
106
147
|
await openFileInExternalApp({
|
|
@@ -109,9 +150,21 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
109
150
|
isMetaFile: true,
|
|
110
151
|
}, { baseUrl: baseUrl, token: token, jsessionId: jsessionId }, I18n);
|
|
111
152
|
};
|
|
153
|
+
useEffect(() => {
|
|
154
|
+
if (cameraPicture) {
|
|
155
|
+
handleCameraUpload(cameraPicture);
|
|
156
|
+
dispatch(clearPhoto());
|
|
157
|
+
}
|
|
158
|
+
}, [cameraPicture, dispatch, handleCameraUpload]);
|
|
112
159
|
useEffect(() => {
|
|
113
160
|
setSelectedFile(defaultValue);
|
|
114
161
|
}, [defaultValue]);
|
|
162
|
+
const canDisplayPreview = useMemo(() => {
|
|
163
|
+
if (isMetaFile(selectedFile) && selectedFile.fileName.includes('pdf')) {
|
|
164
|
+
return false;
|
|
165
|
+
}
|
|
166
|
+
return displayPreview && selectedFile != null;
|
|
167
|
+
}, [displayPreview, selectedFile]);
|
|
115
168
|
return (<View style={[styles.container, style]}>
|
|
116
169
|
<Text style={styles.title}>{title}</Text>
|
|
117
170
|
<View style={[
|
|
@@ -120,16 +173,17 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
120
173
|
commonStyles.filterAlign,
|
|
121
174
|
styles.content,
|
|
122
175
|
]}>
|
|
123
|
-
{
|
|
124
|
-
? formatMetafileURI(selectedFile)
|
|
176
|
+
{canDisplayPreview ? (<Image imageSize={styles.imageSize} resizeMode="contain" source={isMetaFile(selectedFile)
|
|
177
|
+
? formatMetafileURI(selectedFile?.id)
|
|
125
178
|
: { uri: selectedFile?.base64 }} defaultIconSize={60}/>) : null}
|
|
126
179
|
<Text style={styles.fileName} numberOfLines={1}>
|
|
127
180
|
{selectedFile ? selectedFile.name : I18n.t('Base_ChooseFile')}
|
|
128
181
|
</Text>
|
|
129
182
|
<View style={styles.buttons}>
|
|
130
|
-
{canDeleteFile && selectedFile != null && !readonly && (<
|
|
131
|
-
{isMetaFile(selectedFile) && (<
|
|
132
|
-
{selectedFile == null && !readonly && (<
|
|
183
|
+
{canDeleteFile && selectedFile != null && !readonly && (<Icon name="times" size={BUTTON_SIZE} touchable={true} onPress={handleFileDelete} style={styles.action}/>)}
|
|
184
|
+
{isMetaFile(selectedFile) && (<Icon name="expand-alt" size={BUTTON_SIZE} touchable={true} onPress={handleFileView} style={styles.action}/>)}
|
|
185
|
+
{selectedFile == null && !readonly && _enablePicture && (<Icon name="camera" size={BUTTON_SIZE} touchable={true} onPress={handleCamera} style={styles.action}/>)}
|
|
186
|
+
{selectedFile == null && !readonly && (<Icon name="upload" FontAwesome5={false} size={BUTTON_SIZE} touchable={true} onPress={handleDocumentPick} style={styles.action}/>)}
|
|
133
187
|
</View>
|
|
134
188
|
</View>
|
|
135
189
|
{sizeError && (<Text textColor={Colors.errorColor.background} style={styles.error}>
|
|
@@ -166,7 +220,7 @@ const getStyles = (Colors, _required) => StyleSheet.create({
|
|
|
166
220
|
alignItems: 'center',
|
|
167
221
|
},
|
|
168
222
|
action: {
|
|
169
|
-
marginHorizontal:
|
|
223
|
+
marginHorizontal: 4,
|
|
170
224
|
},
|
|
171
225
|
imageSize: {
|
|
172
226
|
height: 60,
|