mg-library 1.0.556 → 1.0.558

package/blocks.js

@@ -1,7 +1,7 @@
 import { useCallback, useState, useEffect } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import { View, ActivityIndicator, Pressable, Image, FlatList, Keyboard, Dimensions } from 'react-native';
-import { Text, Button, Popover, Card, Input } from '@ui-kitten/components';
+import { Button, Popover, Card, Input } from '@ui-kitten/components';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 import * as ImageManipulator from 'expo-image-manipulator';
 import { Camera, CameraType, CameraView } from 'expo-camera';
@@ -401,8 +401,8 @@ export function MGCamera(props) {
     );
     const cardHeader = (
         <View style={{ marginLeft: 15, marginTop: 10, marginBottom: 10 }}>
-            <Text category='h6'>{mgFunctionsLib.i18nString('photo', props.language)}</Text>
-            <Text>{mgFunctionsLib.i18nString('takePhoto', props.language)}</Text>
+            <MGText category='h6'>{mgFunctionsLib.i18nString('photo', props.language)}</MGText>
+            <MGText>{mgFunctionsLib.i18nString('takePhoto', props.language)}</MGText>
         </View>
     );
     const cardFooter = (
@@ -418,7 +418,7 @@ export function MGCamera(props) {
                                 facing === mgConstantsLib.CAMERA_FACING_BACK ? mgConstantsLib.CAMERA_FACING_FRONT : mgConstantsLib.CAMERA_FACING_BACK
                             )
                         }}>
-                        <Text>{mgFunctionsLib.i18nString('doInvertCamera', props.language)}</Text>
+                        <MGText>{mgFunctionsLib.i18nString('doInvertCamera', props.language)}</MGText>
                     </Button>
                 </View>
                 <View style={{ flex: 1, alignItems: 'center' }}>
@@ -427,7 +427,7 @@ export function MGCamera(props) {
                         status='primary'
                         accessoryLeft={TakeIcon}
                         onPress={__takePicture}>
-                        <Text>{mgFunctionsLib.i18nString('doTakePhoto', props.language)}</Text>
+                        <MGText>{mgFunctionsLib.i18nString('doTakePhoto', props.language)}</MGText>
                     </Button>
                 </View>
             </View>
@@ -489,8 +489,8 @@ export function MGCameraPreview(props) {
     );
     const cardHeader = (
         <View style={{ marginLeft: 15, marginTop: 10, marginBottom: 10 }}>
-            <Text category='h6'>{mgFunctionsLib.i18nString('photo', props.language)}</Text>
-            <Text>{mgFunctionsLib.i18nString('previewPhoto', props.language)}</Text>
+            <MGText category='h6'>{mgFunctionsLib.i18nString('photo', props.language)}</MGText>
+            <MGText>{mgFunctionsLib.i18nString('previewPhoto', props.language)}</MGText>
         </View>
     );
     const cardFooter = (
@@ -502,7 +502,7 @@ export function MGCameraPreview(props) {
                         status='primary'
                         accessoryLeft={SaveIcon}
                         onPress={__savePicture}>
-                        <Text>{mgFunctionsLib.i18nString('doSavePhoto', props.language)}</Text>
+                        <MGText>{mgFunctionsLib.i18nString('doSavePhoto', props.language)}</MGText>
                     </Button>
                 </View>
             </View>
@@ -560,10 +560,10 @@ export function MGPopover(props) {
         <>
             <View style={{ flexGrow: 1, flexDirection: 'row', justifyContent: 'space-around', marginTop: 20, marginBottom: 20 }}>
                 <Button style={{ flexGrow: 0.3 }} onPress={() => { setVisible(false); props.callback() }}>
-                    <Text>{mgFunctionsLib.i18nString('yes', props.language)}</Text>
+                    <MGText>{mgFunctionsLib.i18nString('yes', props.language)}</MGText>
                 </Button>
                 <Button style={{ flexGrow: 0.3 }} onPress={() => { setVisible(false) }}>
-                    <Text>{mgFunctionsLib.i18nString('no', props.language)}</Text>
+                    <MGText>{mgFunctionsLib.i18nString('no', props.language)}</MGText>
                 </Button>
             </View>
         </>
@@ -577,7 +577,7 @@ export function MGPopover(props) {
             <Card footer={cardFooter}>
                 <View style={{ flexDirection: 'column', justifyContent: 'center', alignItems: 'center' }}>
                     <MaterialCommunityIcons name='alert-outline' color={props.theme['color-primary-500']} size={70} style={{ marginBottom: 10 }} />
-                    <Text>{mgFunctionsLib.i18nString('confirm', props.language)} ?</Text>
+                    <MGText>{mgFunctionsLib.i18nString('confirm', props.language)} ?</MGText>
                 </View>
             </Card>
         </Popover>
@@ -622,7 +622,7 @@ export function MGFlatListHeader(props) {
                 props.beforeTitle
             }
             <View style={{ marginHorizontal: 10, marginBottom: 20, paddingHorizontal: 10, paddingVertical: 10, borderColor: props.theme['color-primary-500'], borderRadius: 10, borderStyle: 'solid', borderWidth: 1 }}>
-                <Text category='h6' style={{ marginLeft: 10 }}>{props.title}</Text>
+                <MGText category='h6' style={{ marginLeft: 10 }}>{props.title}</MGText>
                 {props.subTitle != undefined &&
                     props.subTitle
                 }
@@ -640,15 +640,15 @@ export function MGSessionHeader(props) {
             <View style={{ marginBottom: 10 }}>
                 <View style={{ display: 'flex', flexDirection: 'row', alignItems: 'stretch' }}>
                     <View style={{ flexGrow: 0.5, alignSelf: 'center' }}>
-                        <Text category='h5' style={{ color: props.theme['color-primary-500'], marginLeft: 5 }}>{props.module}</Text>
+                        <MGText category='h5' style={{ color: props.theme['color-primary-500'], marginLeft: 5 }}>{props.module}</MGText>
                     </View>
                     <View style={{ flexGrow: 0.35, flexDirection: 'column', justifyContent: 'center' }}>
-                        <Text style={{ alignSelf: 'flex-end', marginBottom: -5 }} category='h6'>{props.person.lastName}</Text>
-                        <Text style={{ alignSelf: 'flex-end' }}>{props.person.firstName}</Text>
+                        <MGText style={{ alignSelf: 'flex-end', marginBottom: -5 }} category='h6'>{props.person.lastName}</MGText>
+                        <MGText style={{ alignSelf: 'flex-end' }}>{props.person.firstName}</MGText>
                     </View>
                     <View style={{ flexGrow: 0.15, flexDirection: 'column' }}>
                         <MaterialCommunityIcons name='account' size={40} style={{ alignSelf: 'center', color: props.theme['color-primary-700'] }} />
-                        <Text category='c1' style={{ alignSelf: 'center', marginTop: -5 }}>{props.person.profile}</Text>
+                        <MGText category='c1' style={{ alignSelf: 'center', marginTop: -5 }}>{props.person.profile}</MGText>
                     </View>
                 </View>
                 <MGDivider />
@@ -678,7 +678,7 @@ export function MGCardHeader(props) {
         <>
             <View style={{ flexDirection: 'row', marginVertical: 10, marginLeft: 10 }}>
                 <View style={{ flexGrow: 0.95 }}>
-                    <Text category='h6'>{props.title}</Text>
+                    <MGText category='h6'>{props.title}</MGText>
                 </View>
             </View>
         </>

package/functions.js

@@ -1,8 +1,7 @@
 import Toast from 'react-native-root-toast';
 import { StyleSheet, View, Dimensions } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { Button } from '@ui-kitten/components';
-import { Box } from 'native-base';
+import { Box, Button } from 'native-base';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 import moment from 'moment';
 import 'moment/locale/es';
@@ -18,7 +17,7 @@ const logoutIcon = () => (
     <MaterialCommunityIcons name='logout' color='white' size={20} style={{ flex: 1 }} />
 );
 
-export function navigatorHeader(insets, theme, onPressLogout, company) {
+/* export function navigatorHeader(insets, theme, onPressLogout, company) {
     let companyDescription = company.description;
     if (companyDescription.length > 25)
         companyDescription = companyDescription.substring(0, 25) + '...';
@@ -34,6 +33,31 @@ export function navigatorHeader(insets, theme, onPressLogout, company) {
             </View>
         </Box>
     );
+} */
+
+export function navigatorHeader(insets, theme, onPressLogout, company) {
+    let companyDescription = company.description;
+    if (companyDescription.length > 25)
+        companyDescription = companyDescription.substring(0, 25) + '...';
+    return (
+        <Box style={[safeAreaViewForNavigatorHeaderStyleSheet(insets).safeAreaView, { backgroundColor: theme['color-primary-500'], flexDirection: 'column', justifyContent: 'flex-end' }]}>
+            <View style={{ flexDirection: 'row', flexGrow: 1 }}>
+                <View style={{ flexGrow: 0.9, marginLeft: 10, alignSelf: 'center' }}>
+                    <MGText category='h5' style={{ color: 'white' }}>{companyDescription}</MGText>
+                </View>
+                <View style={{ flexGrow: 0.1, flexDirection: 'column' }}>
+                    <Button 
+                        style={{ alignSelf: 'center' }}
+                        leftIcon={
+                            <Icon as={MaterialCommunityIcons} name="logout" size="sm" color="white" />
+                        }
+                        bg="transparent"
+                        onPress={onPressLogout}
+                    />
+                </View>
+            </View>
+        </Box>
+    );
 }
 
 // Camera
@@ -255,7 +279,7 @@ function showToast(config) {
     });
 }
 
-export function showToastWithError(error, subMessage) {    
+export function showToastWithError(error, subMessage) {
     let message = '';
     if (error.message != undefined)
         message = error.message;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mg-library",
-    "version": "1.0.556",
+    "version": "1.0.558",
     "description": "",
     "main": "index.js",
     "scripts": {