@axelor/aos-mobile-core 7.1.1 → 7.2.0

package/lib/{sessions/components/buttons → auth/components}/index.js

@@ -15,7 +15,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-export { default as DisabledButton } from './DisabledButton';
-export { default as LoginButton } from './LoginButton';
-export { default as UpdateButton } from './UpdateButton';
+export * from './molecules';
 //# sourceMappingURL=index.js.map

package/lib/auth/components/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/components/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,aAAa,CAAC"}

package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.d.ts

@@ -0,0 +1,2 @@
+declare const TranslationsButton: ({}: {}) => JSX.Element;
+export default TranslationsButton;

package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.js

@@ -0,0 +1,63 @@
+/*
+ * Axelor Business Solutions
+ *
+ * Copyright (C) 2023 Axelor (<http://axelor.com>).
+ *
+ * This program is free software: you can redistribute it and/or  modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import React, { useCallback, useEffect, useMemo } from 'react';
+import { Dimensions, StyleSheet } from 'react-native';
+import { useDispatch, useSelector } from 'react-redux';
+import { useThemeColor, useConfig, RightIconButton, Icon, } from '@axelor/aos-mobile-ui';
+import { getTranslations, selectLanguage, useTranslator } from '../../../../i18n';
+import { showToastMessage } from '../../../../utils';
+import { clearMessage, uploadTranslations } from '../../../features/configSlice';
+const TranslationsButton = ({}) => {
+    const I18n = useTranslator();
+    const Colors = useThemeColor();
+    const dispatch = useDispatch();
+    const { setActivityIndicator } = useConfig();
+    const language = useSelector(selectLanguage);
+    const { message } = useSelector((state) => state.config);
+    const { user } = useSelector((state) => state.user);
+    const styles = useMemo(() => getStyles(Colors), [Colors]);
+    useEffect(() => {
+        if (message) {
+            showToastMessage({ type: 'success', position: 'bottom', text1: message });
+            setActivityIndicator(false);
+            dispatch(clearMessage());
+        }
+    }, [message, dispatch, setActivityIndicator]);
+    const handleSendTranslations = useCallback(() => {
+        setActivityIndicator(true);
+        const translations = getTranslations(language);
+        dispatch(uploadTranslations({ language, translations }));
+    }, [dispatch, language, setActivityIndicator]);
+    if (user?.group?.code !== 'admins') {
+        return null;
+    }
+    return (<RightIconButton icon={<Icon name="chevron-right" color={Colors.primaryColor.background}/>} style={styles.content} title={I18n.t('User_SendTranslations')} onPress={handleSendTranslations}/>);
+};
+const getStyles = (Colors) => StyleSheet.create({
+    content: {
+        width: Dimensions.get('window').width * 0.9,
+        height: 40,
+        borderColor: Colors.secondaryColor.background,
+        borderWidth: 1,
+        marginHorizontal: 18,
+        paddingLeft: 10,
+        paddingRight: 25,
+    },
+});
+export default TranslationsButton;
+//# sourceMappingURL=TranslationsButton.js.map

package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TranslationsButton.js","sourceRoot":"","sources":["../../../../../src/auth/components/molecules/TranslationsButton/TranslationsButton.tsx"],"names":[],"mappings":"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"}

package/lib/auth/components/molecules/index.d.ts

@@ -0,0 +1 @@
+export { default as TranslationsButton } from "./TranslationsButton/TranslationsButton";

package/lib/auth/components/molecules/index.js

@@ -0,0 +1,19 @@
+/*
+ * Axelor Business Solutions
+ *
+ * Copyright (C) 2023 Axelor (<http://axelor.com>).
+ *
+ * This program is free software: you can redistribute it and/or  modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+export { default as TranslationsButton } from './TranslationsButton/TranslationsButton';
+//# sourceMappingURL=index.js.map

package/lib/auth/components/molecules/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/auth/components/molecules/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,yCAAyC,CAAC"}

package/lib/auth/features/companySlice.d.ts

@@ -11,4 +11,4 @@ export const fetchCompanies: import("@reduxjs/toolkit").AsyncThunk<any, void, {
 export const companyReducer: import("redux").Reducer<{
     loading: boolean;
     companyList: any[];
-}, import("redux").AnyAction>;
+}>;

package/lib/auth/features/configSlice.d.ts

@@ -34,4 +34,4 @@ export const configReducer: import("redux").Reducer<import("immer/dist/internal"
     baseConfig: {};
     mobileSettings: {};
     message: any;
-}>, import("redux").AnyAction>;
+}>>;

package/lib/auth/features/languageSlice.d.ts

@@ -11,4 +11,4 @@ export const fetchLanguages: import("@reduxjs/toolkit").AsyncThunk<any, void, {
 export const languageReducer: import("redux").Reducer<{
     loading: boolean;
     languageList: any[];
-}, import("redux").AnyAction>;
+}>;

package/lib/auth/features/userSlice.d.ts

@@ -24,4 +24,4 @@ export const userReducer: import("redux").Reducer<import("immer/dist/internal").
     loadingUser: boolean;
     user: {};
     canModifyCompany: boolean;
-}>, import("redux").AnyAction>;
+}>>;

package/lib/auth/features/userSlice.js

@@ -72,11 +72,7 @@ const userSlice = createSlice({
                 state.canModifyCompany = true;
             }
         });
-        builder.addCase(updateActiveUser.pending, state => {
-            state.loadingUser = true;
-        });
         builder.addCase(updateActiveUser.fulfilled, (state, action) => {
-            state.loadingUser = false;
             state.user = action.payload;
             if (state.user.activeCompany == null) {
                 state.canModifyCompany = true;

package/lib/auth/features/userSlice.js.map

@@ -1 +1 @@
-{"version":3,"file":"userSlice.js","sourceRoot":"","sources":["../../../src/auth/features/userSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAExD,MAAM,CAAC,MAAM,eAAe,GAAG,gBAAgB,CAC7C,sBAAsB,EACtB,KAAK,WAAW,MAAM,EAAE,EAAC,QAAQ,EAAC;IAChC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,aAAa;QAC5B,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,kCAAkC;QAC1C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAC9C,uBAAuB,EACvB,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,QAAQ;QACvB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,mCAAmC;QAC3C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CACX,cAAc,CAAC;QACb,aAAa,EAAE,aAAa;QAC5B,IAAI,EAAE,IAAI,CAAC,EAAE;QACb,MAAM,EAAE,kCAAkC;QAC1C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,WAAW,EAAE,IAAI;IACjB,IAAI,EAAE,EAAE;IACR,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAEF,MAAM,SAAS,GAAG,WAAW,CAAC;IAC5B,IAAI,EAAE,MAAM;IACZ,YAAY;IACZ,QAAQ,EAAE;QACR,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACrC,KAAK,CAAC,IAAI,GAAG,EAAC,GAAG,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,EAAC,CAAC;QACzE,CAAC;QACD,0BAA0B,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5C,KAAK,CAAC,IAAI,GAAG;gBACX,GAAG,KAAK,CAAC,IAAI;gBACb,qBAAqB,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB;aACvD,CAAC;QACJ,CAAC;KACF;IACD,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC/C,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC3D,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;YAC1B,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC;YAC5B,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,EAAE;gBACpC,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAChD,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5D,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;YAC1B,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC;YAC5B,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,EAAE;gBACpC,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAC,mBAAmB,EAAE,0BAA0B,EAAC,GAC5D,SAAS,CAAC,OAAO,CAAC;AAEpB,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC"}
+{"version":3,"file":"userSlice.js","sourceRoot":"","sources":["../../../src/auth/features/userSlice.js"],"names":[],"mappings":"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"}

package/lib/auth/models/objectFields.js

@@ -24,9 +24,9 @@ export const auth_modelAPI = {
     auth_user: schemaContructor.object({
         fullName: schemaContructor.string(),
         name: schemaContructor.string(),
-        activeCompany: schemaContructor.subObject(),
-        'activeCompany.currency': schemaContructor.subObject(),
-        'activeCompany.currency.symbol': schemaContructor.string(),
+        activeCompany: schemaContructor.subObject().concat(schemaContructor.object({
+            currency: schemaContructor.subObject('symbol'),
+        })),
         activeTeam: schemaContructor.subObject(),
         workshopStockLocation: schemaContructor.subObject(),
         roles: schemaContructor.array(),

package/lib/auth/models/objectFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"objectFields.js","sourceRoot":"","sources":["../../../src/auth/models/objectFields.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAe,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;KAChC,CAAC;IACF,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;QACnC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,aAAa,EAAE,gBAAgB,CAAC,SAAS,EAAE;QAC3C,wBAAwB,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACtD,+BAA+B,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC1D,UAAU,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACxC,qBAAqB,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACnD,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE;QAC/B,KAAK,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACnC,QAAQ,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACtC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;QACnC,UAAU,EAAE,gBAAgB,CAAC,MAAM,EAAE;KACtC,CAAC;CACH,CAAC"}
+{"version":3,"file":"objectFields.js","sourceRoot":"","sources":["../../../src/auth/models/objectFields.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAe,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;KAChC,CAAC;IACF,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;QACnC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,aAAa,EAAE,gBAAgB,CAAC,SAAS,EAAE,CAAC,MAAM,CAChD,gBAAgB,CAAC,MAAM,CAAC;YACtB,QAAQ,EAAE,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC;SAC/C,CAAC,CACH;QACD,UAAU,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACxC,qBAAqB,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACnD,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE;QAC/B,KAAK,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACnC,QAAQ,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACtC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;QACnC,UAAU,EAAE,gBAAgB,CAAC,MAAM,EAAE;KACtC,CAAC;CACH,CAAC"}

package/lib/auth/screens/SettingsScreen.js

@@ -15,33 +15,21 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import React, { useCallback, useEffect } from 'react';
-import { StyleSheet, View, Dimensions } from 'react-native';
-import { Screen, SwitchCard, useConfig, useTheme, RightIconButton, Icon, useThemeColor, Text, } from '@axelor/aos-mobile-ui';
-import { clearMessage, uploadTranslations } from '../features/configSlice';
+import React, { useCallback } from 'react';
+import { StyleSheet, View } from 'react-native';
+import { Screen, SwitchCard, useConfig, useTheme, Text, } from '@axelor/aos-mobile-ui';
 import { useDispatch, useSelector } from 'react-redux';
-import { getTranslations, selectLanguage, useTranslator } from '../../i18n';
-import { showToastMessage } from '../../utils';
+import { useTranslator } from '../../i18n';
 import { disable, enable, useEffectOnline, useOnline, } from '../../features/onlineSlice';
 import { ApiProviderConfig } from '../../apiProviders/config';
+import { TranslationsButton } from '../components';
 const SettingsScreen = ({ children }) => {
-    const Colors = useThemeColor();
     const I18n = useTranslator();
     const Theme = useTheme();
     const online = useOnline();
     const dispatch = useDispatch();
-    const { showFilter, hideVirtualKeyboard, setActivityIndicator, toggleFilterConfig, toggleVirtualKeyboardConfig, setShowSubtitles, showSubtitles, } = useConfig();
-    const language = useSelector(selectLanguage);
-    const { message } = useSelector(state => state.config);
-    const { user } = useSelector(state => state.user);
+    const { showFilter, hideVirtualKeyboard, toggleFilterConfig, toggleVirtualKeyboardConfig, setShowSubtitles, showSubtitles, } = useConfig();
     const { baseUrl } = useSelector(state => state.auth);
-    useEffect(() => {
-        if (message) {
-            showToastMessage({ type: 'success', position: 'bottom', text1: message });
-            setActivityIndicator(false);
-            dispatch(clearMessage());
-        }
-    }, [message, dispatch, setActivityIndicator]);
     const handleToggleConnection = useCallback(state => {
         if (!state) {
             dispatch(enable());
@@ -62,11 +50,6 @@ const SettingsScreen = ({ children }) => {
     const handleToggleSubtitles = useCallback(state => {
         setShowSubtitles(state);
     }, [setShowSubtitles]);
-    const handleSendTranslations = useCallback(() => {
-        setActivityIndicator(true);
-        const translations = getTranslations(language);
-        dispatch(uploadTranslations({ language, translations }));
-    }, [dispatch, language, setActivityIndicator]);
     return (<Screen style={styles.screen}>
       <View style={styles.container}>
         <SwitchCard title={I18n.t('User_ShowFilter')} defaultValue={showFilter} onToggle={toggleFilterConfig}/>
@@ -75,7 +58,7 @@ const SettingsScreen = ({ children }) => {
         {ApiProviderConfig.allowConnectionBlock && (<SwitchCard title={I18n.t('User_BlockConnection')} defaultValue={!online.isEnabled} onToggle={handleToggleConnection}/>)}
         <SwitchCard title={I18n.t('User_Show_Drawer_Subtitles')} defaultValue={showSubtitles} onToggle={handleToggleSubtitles}/>
         {children}
-        {user?.group?.code !== 'admins' ? null : (<RightIconButton icon={<Icon name="chevron-right" color={Colors.primaryColor.background}/>} style={styles.RightIconButton} title={I18n.t('User_SendTranslations')} onPress={handleSendTranslations}/>)}
+        <TranslationsButton />
       </View>
       <View style={styles.footerContainer}>
         <Text>{`${I18n.t('Base_ConnectedOn')}:`}</Text>
@@ -93,13 +76,6 @@ const styles = StyleSheet.create({
         alignItems: 'center',
         flex: 1,
     },
-    RightIconButton: {
-        width: Dimensions.get('window').width * 0.9,
-        height: 40,
-        marginLeft: 18,
-        paddingRight: 50,
-        paddingLeft: 10,
-    },
     footerContainer: {
         justifyContent: 'center',
         alignItems: 'center',

package/lib/auth/screens/SettingsScreen.js.map

@@ -1 +1 @@
-{"version":3,"file":"SettingsScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/SettingsScreen.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"SettingsScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/SettingsScreen.js"],"names":[],"mappings":"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"}

package/lib/auth/screens/UserScreen.js

@@ -33,15 +33,15 @@ const UserScreen = ({ children }) => {
     const { userId, baseUrl } = useSelector(state => state.auth);
     const { languageList } = useSelector(state => state.language);
     const { baseConfig } = useSelector(state => state.config);
-    const { user, canModifyCompany } = useSelector(state => state.user);
+    const { loadingUser, user, canModifyCompany } = useSelector(state => state.user);
     const { setFilterConfig, setVirtualKeyboardConfig, setNbDecimalDigitForQty } = useConfig();
     useEffect(() => {
-        dispatch(fetchActiveUser(userId));
+        fetchUser();
         dispatch(fetchCompanies());
         dispatch(fetchLanguages());
         dispatch(fetchBaseConfig());
         dispatch(fetchMobileSettings());
-    }, [dispatch, userId]);
+    }, [dispatch, fetchUser, userId]);
     useEffect(() => {
         if (baseConfig?.nbDecimalDigitForQty != null) {
             setNbDecimalDigitForQty(baseConfig?.nbDecimalDigitForQty);
@@ -69,8 +69,11 @@ const UserScreen = ({ children }) => {
     const updateLanguage = useCallback(language => {
         dispatch(updateActiveUser({ id: user.id, language, version: user.version }));
     }, [dispatch, user]);
+    const fetchUser = useCallback(() => {
+        dispatch(fetchActiveUser(userId));
+    }, [dispatch, userId]);
     return (<Screen style={styles.container}>
-      <ScrollView>
+      <ScrollView refresh={{ loading: loadingUser, fetcher: fetchUser }}>
         <View style={styles.alignContainer}>
           <ImageBubble style={styles.imageIcon} imageSize={Dimensions.get('window').width * 0.3} defaultIconSize={60} source={{
             uri: `${baseUrl}ws/rest/com.axelor.auth.db.User/${user.id}/image/download?v=${user.version}&parentId=${user.id}&parentModel=com.axelor.auth.db.User&image=true`,
@@ -79,7 +82,7 @@ const UserScreen = ({ children }) => {
             <Icon style={styles.logOutIcon} name="power-off" color={Colors.primaryColor.background} size={Dimensions.get('window').width * 0.07} touchable={true} onPress={() => dispatch(logout())}/>,
         ]}/>
           <Text style={styles.textUser}>{user.name}</Text>
-          {baseConfig?.enableMultiCompany && (<Picker title={I18n.t('User_ActiveCompany')} listItems={companyList} labelField="name" valueField="id" onValueChange={updateActiveCompany} isValueItem={true} disabled={!canModifyCompany} disabledValue={user?.activeCompany?.name}/>)}
+          {baseConfig?.enableMultiCompany && (<Picker title={I18n.t('User_ActiveCompany')} listItems={companyList} defaultValue={user?.activeCompany} labelField="name" valueField="id" onValueChange={updateActiveCompany} isValueItem={true} readonly={!canModifyCompany}/>)}
           {children}
           {languageList?.length > 1 && (<Picker title={I18n.t('User_Language')} defaultValue={user.language} listItems={languageList} labelField="name" valueField="code" onValueChange={updateLanguage} emptyValue={false}/>)}
           {!Theme.isColorBlind && Theme.themes?.length !== 1 && (<Picker title={I18n.t('User_Theme')} defaultValue={Theme.activeTheme?.key} listItems={Theme.themes} labelField="name" valueField="key" onValueChange={handleChangeTheme} emptyValue={false}/>)}
@@ -88,12 +91,12 @@ const UserScreen = ({ children }) => {
     </Screen>);
 };
 const getStyles = Colors => StyleSheet.create({
-    container: {
-        justifyContent: 'center',
-    },
     alignContainer: {
         alignItems: 'center',
     },
+    container: {
+        justifyContent: 'center',
+    },
     imageIcon: {
         backgroundColor: Colors.backgroundColor,
     },

package/lib/auth/screens/UserScreen.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/UserScreen.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"UserScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/UserScreen.js"],"names":[],"mappings":"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"}

package/lib/components/external/Camera/Camera.js

@@ -25,13 +25,14 @@ import { Icon, useThemeColor } from '@axelor/aos-mobile-ui';
 import { disableCamera, takePhoto, useCameraSelector, } from '../../../features/cameraSlice';
 import CaptureButton from './CaptureButton';
 const CONTENT_SPACING = 40;
+const PHOTO_TYPE = 'jpeg';
 const SAFE_BOTTOM = Platform.select({
     ios: StaticSafeAreaInsets.safeAreaInsetsBottom,
 }) ?? 0;
 const SAFE_AREA_PADDING = {
     paddingLeft: StaticSafeAreaInsets.safeAreaInsetsLeft + CONTENT_SPACING,
-    paddingTop: StaticSafeAreaInsets.safeAreaInsetsTop + CONTENT_SPACING,
-    paddingRight: StaticSafeAreaInsets.safeAreaInsetsRight + CONTENT_SPACING,
+    paddingTop: StaticSafeAreaInsets.safeAreaInsetsTop + CONTENT_SPACING * 1.5,
+    paddingRight: StaticSafeAreaInsets.safeAreaInsetsRight + CONTENT_SPACING / 2,
     paddingBottom: SAFE_BOTTOM + CONTENT_SPACING,
 };
 const BUTTON_SIZE = 40;
@@ -84,7 +85,16 @@ const Camera = () => {
     }, []);
     const onMediaCapture = useCallback(async (photo) => {
         const photoData = await RNFS.readFile(photo.path, 'base64');
-        dispatch(takePhoto(photoData));
+        const { size } = await RNFS.stat(photo.path);
+        dispatch(takePhoto({
+            name: `camera.${PHOTO_TYPE}`,
+            pictureExtention: PHOTO_TYPE,
+            dateTime: new Date().toISOString(),
+            type: `image/${PHOTO_TYPE}`,
+            size: size,
+            base64: photoData,
+            fullBase64: `data:image/${PHOTO_TYPE};base64,${photoData}`,
+        }));
         dispatch(disableCamera());
     }, [dispatch]);
     useEffect(() => {
@@ -110,7 +120,7 @@ const Camera = () => {
         <Icon style={styles.button} name={'times'} color={Colors.backgroundColor} size={24} touchable={true} onPress={() => dispatch(disableCamera())}/>
       </View>
       <View style={styles.captureButton}>
-        <CaptureButton camera={camera} onMediaCaptured={onMediaCapture} flash={flash} enabled={isEnabled}/>
+        <CaptureButton camera={camera} onMediaCaptured={onMediaCapture} flash={flash} enabled={isEnabled} type={PHOTO_TYPE}/>
       </View>
     </View>);
 };
@@ -125,7 +135,7 @@ const styles = StyleSheet.create({
         zIndex: 850,
     },
     camera: {
-        height: Dimensions.get('window').height,
+        height: Dimensions.get('screen').height,
         width: Dimensions.get('window').width,
         position: 'absolute',
         top: 0,

package/lib/components/external/Camera/Camera.js.map

@@ -1 +1 @@
-{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/Camera.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/Camera.js"],"names":[],"mappings":"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"}

package/lib/components/external/Camera/CaptureButton.d.ts

@@ -1,10 +1,11 @@
 import React from 'react';
 import type { Camera, PhotoFile } from 'react-native-vision-camera';
-declare const CaptureButton: ({ camera, onMediaCaptured, flash, enabled, style, }: {
+declare const CaptureButton: ({ camera, onMediaCaptured, flash, enabled, style, type, }: {
     camera: React.RefObject<Camera>;
     onMediaCaptured: (media: PhotoFile) => void;
     flash: 'off' | 'on';
     enabled: boolean;
     style?: any;
+    type: string;
 }) => JSX.Element;
 export default CaptureButton;

package/lib/components/external/Camera/CaptureButton.js

@@ -20,14 +20,14 @@ import { TouchableOpacity, StyleSheet, View } from 'react-native';
 import Reanimated, { Easing, useAnimatedStyle, withSpring, withTiming, useSharedValue, withRepeat, } from 'react-native-reanimated';
 const CAPTURE_BUTTON_SIZE = 78;
 const BORDER_WIDTH = CAPTURE_BUTTON_SIZE * 0.1;
-const CaptureButton = ({ camera, onMediaCaptured, flash, enabled, style, }) => {
+const CaptureButton = ({ camera, onMediaCaptured, flash, enabled, style, type, }) => {
     const takePhotoOptions = useMemo(() => ({
-        photoCodec: 'jpeg',
+        photoCodec: type,
         qualityPrioritization: 'speed',
         flash: flash,
         quality: 90,
         skipMetadata: false,
-    }), [flash]);
+    }), [flash, type]);
     const isPressingButton = useSharedValue(false);
     const takePhoto = useCallback(async () => {
         try {

package/lib/components/external/Camera/CaptureButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"CaptureButton.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/CaptureButton.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CaptureButton.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/CaptureButton.tsx"],"names":[],"mappings":"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"}

package/lib/components/external/Stopwatch/Stopwatch.d.ts

@@ -1,6 +1,10 @@
 interface StopwatchProps {
     startTime: number;
     status: number;
+    getTimerState?: () => {
+        status: number;
+        time: number;
+    };
     timerFormat: string;
     disable?: boolean;
     disablePlay?: boolean;
@@ -15,5 +19,5 @@ interface StopwatchProps {
     onCancel?: () => void;
     useObjectStatus?: boolean;
 }
-declare const Stopwatch: ({ startTime, status, timerFormat, disable, disablePlay, disablePause, disableStop, disableCancel, hideCancel, style, onPlay, onPause, onStop, onCancel, useObjectStatus, }: StopwatchProps) => JSX.Element;
+declare const Stopwatch: ({ startTime, status, getTimerState, timerFormat, disable, disablePlay, disablePause, disableStop, disableCancel, hideCancel, style, onPlay, onPause, onStop, onCancel, useObjectStatus, }: StopwatchProps) => JSX.Element;
 export default Stopwatch;

package/lib/components/external/Stopwatch/Stopwatch.js

@@ -15,17 +15,36 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import React, { useEffect, useMemo, useState } from 'react';
-import { StyleSheet, View } from 'react-native';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { AppState, StyleSheet, View } from 'react-native';
 import { Card, Icon, Text, useThemeColor } from '@axelor/aos-mobile-ui';
 import useTranslator from '../../../i18n/hooks/use-translator';
 import { StopwatchType } from '../../../types';
 import { Timer } from '../../external';
-const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFormat, disable = false, disablePlay = false, disablePause = false, disableStop = false, disableCancel = false, hideCancel = false, style, onPlay = () => { }, onPause = () => { }, onStop = () => { }, onCancel = () => { }, useObjectStatus = false, }) => {
+const APP_STATE = {
+    inactiveRegex: /inactive|background/,
+    activeMode: 'active',
+};
+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, }) => {
+    const appState = useRef(AppState.currentState);
     const Colors = useThemeColor();
     const I18n = useTranslator();
     const [state, setState] = useState(status);
     const [time, setTime] = useState(startTime);
+    useEffect(() => {
+        const subscription = AppState.addEventListener('change', nextAppState => {
+            if (appState.current.match(APP_STATE.inactiveRegex) &&
+                nextAppState === APP_STATE.activeMode) {
+                const { status: _status, time: _time } = getTimerState();
+                _status != null && setState(_status);
+                _time != null && setTime(_time);
+            }
+            appState.current = nextAppState;
+        });
+        return () => {
+            subscription.remove();
+        };
+    }, [appState, getTimerState]);
     useEffect(() => {
         setTime(startTime);
     }, [startTime]);
@@ -58,6 +77,11 @@ const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFo
         setTime(0);
         onCancel();
     };
+    const TimerButton = ({ name, disabled, onPress, }) => {
+        return (<Icon name={name} size={25} color={disabled
+                ? Colors.secondaryColor.background_light
+                : Colors.secondaryColor_dark.background} touchable={!disabled} onPress={onPress} style={styles.btn}/>);
+    };
     return (<Card style={[styles.container, borderStyle, style]}>
       <View style={styles.row}>
         <Text style={styles.status}>
@@ -67,20 +91,20 @@ const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFo
       </View>
       <View style={styles.row}>
         <View style={styles.btnContainer}>
-          {stopwatchStatus !== StopwatchType.status.InProgress && (<Icon name="play" size={25} disabled={disable ||
+          {stopwatchStatus !== StopwatchType.status.InProgress && (<TimerButton name="play" disabled={disable ||
                 disablePlay ||
                 stopwatchStatus === StopwatchType.status.InProgress ||
-                stopwatchStatus === StopwatchType.status.Finished} touchable={true} onPress={handlePlayBtn} style={styles.btn}/>)}
-          {stopwatchStatus === StopwatchType.status.InProgress && (<Icon name="pause" size={25} disabled={disable || disablePause} touchable={true} onPress={handlePauseBtn} style={styles.btn}/>)}
-          <Icon name="power-off" size={25} disabled={disable ||
+                stopwatchStatus === StopwatchType.status.Finished} onPress={handlePlayBtn}/>)}
+          {stopwatchStatus === StopwatchType.status.InProgress && (<TimerButton name="pause" disabled={disable || disablePause} onPress={handlePauseBtn}/>)}
+          <TimerButton name="power-off" disabled={disable ||
             disableStop ||
             stopwatchStatus === StopwatchType.status.Ready ||
-            stopwatchStatus === StopwatchType.status.Finished} touchable={true} onPress={handleStopBtn} style={styles.btn}/>
-          {!hideCancel && (<Icon name="undo" size={25} disabled={disable ||
+            stopwatchStatus === StopwatchType.status.Finished} onPress={handleStopBtn}/>
+          {!hideCancel && (<TimerButton name="undo" disabled={disable ||
                 disableCancel ||
-                stopwatchStatus === StopwatchType.status.Ready} touchable={true} onPress={handleCancelBtn} style={styles.btn}/>)}
+                stopwatchStatus === StopwatchType.status.Ready} onPress={handleCancelBtn}/>)}
         </View>
-        <Timer time={time} onCount={setTime} style={styles.timer} isPaused={stopwatchStatus !== StopwatchType.status.InProgress} timerFormat={timerFormat}/>
+        <Timer time={time} addCount={timeToAdd => setTime(_current => _current + timeToAdd)} style={styles.timer} isPaused={stopwatchStatus !== StopwatchType.status.InProgress} timerFormat={timerFormat}/>
       </View>
     </Card>);
 };