diff --git a/app.json b/app.json index 296036c..69db046 100644 --- a/app.json +++ b/app.json @@ -2,23 +2,23 @@ "expo": { "name": "imexmobile", "slug": "imexmobile", - "version": "1.0.9", + "version": "1.0.12", "orientation": "default", "icon": "./assets/logo192noa.png", "ios": { "supportsTablet": true, "bundleIdentifier": "com.imex.imexmobile", - "buildNumber": "1.0.9", + "buildNumber": "1.0.12", "googleServicesFile": "./GoogleService-Info.plist" }, "android": { "package": "com.imex.imexmobile", - "versionCode": 9, + "versionCode": 12, "googleServicesFile": "./google-services.json" }, "splash": { - "image": "./assets/logo1024.png", - "resizeMode": "contain", + "image": "./assets/Splash.png", + "backgroundColor": "#efefef" }, "notification": { diff --git a/assets/splash.png b/assets/splash.png index cc94f37..6ccf56a 100644 Binary files a/assets/splash.png and b/assets/splash.png differ diff --git a/babel-translations.babel b/babel-translations.babel index 30d4d18..42554b6 100644 --- a/babel-translations.babel +++ b/babel-translations.babel @@ -1012,6 +1012,27 @@ + + PAP + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + PAR false diff --git a/components/job-documents/job-documents.component.jsx b/components/job-documents/job-documents.component.jsx index c830b33..c4a2ac6 100644 --- a/components/job-documents/job-documents.component.jsx +++ b/components/job-documents/job-documents.component.jsx @@ -47,6 +47,8 @@ export default function JobDocumentsComponent({ job, loading, refetch }) { style={{ flex: 1, flexDirection: "column", + justifyContent: "center", + alignItems: "center", margin: 5, }} > diff --git a/components/job-lines/job-lines.component.jsx b/components/job-lines/job-lines.component.jsx index ee85312..66b6655 100644 --- a/components/job-lines/job-lines.component.jsx +++ b/components/job-lines/job-lines.component.jsx @@ -1,8 +1,6 @@ -import Dinero from "dinero.js"; import React from "react"; import { useTranslation } from "react-i18next"; import { FlatList, RefreshControl, StyleSheet, Text, View } from "react-native"; -import { ScrollView } from "react-native-gesture-handler"; import { Card, DataTable } from "react-native-paper"; export default function JobLines({ job, loading, refetch }) { @@ -18,66 +16,59 @@ export default function JobLines({ job, loading, refetch }) { }; return ( - - - - - - {t("jobdetail.labels.lines_desc")} - - - {t("jobdetail.labels.lines_lbr_ty")} - - - {t("jobdetail.labels.lines_lb_hrs")} - - - {t("jobdetail.labels.lines_part_type")} - - - {t("jobdetail.labels.lines_qty")} - - - {t("jobdetail.labels.lines_price")} - - - + + + + + {t("jobdetail.labels.lines_desc")} + + + {t("jobdetail.labels.lines_lbr_ty")} + + + {t("jobdetail.labels.lines_lb_hrs")} + + + {t("jobdetail.labels.lines_part_type")} + + + {t("jobdetail.labels.lines_qty")} + + + {t("jobdetail.labels.lines_price")} + + + - - } - keyExtractor={(item) => item.id} - renderItem={(object) => ( - - - {object.item.line_desc} - - - {object.item.mod_lbr_ty && - t(`jobdetail.lbr_types.${object.item.mod_lbr_ty}`)} - - - {object.item.mod_lb_hrs} - - - {object.item.part_type && - t(`jobdetail.part_types.${object.item.part_type}`)} - - - {object.item.part_qty} - - - {Dinero({ - amount: Math.round((object.item.act_price || 0) * 100), - }).toFormat()} - - - )} - /> - - + + } + keyExtractor={(item) => item.id} + renderItem={(object) => ( + + + {object.item.line_desc} + + + {object.item.mod_lbr_ty && + t(`jobdetail.lbr_types.${object.item.mod_lbr_ty}`)} + + + {object.item.mod_lb_hrs} + + + {object.item.part_type && + t(`jobdetail.part_types.${object.item.part_type}`)} + + + {object.item.part_qty} + + + )} + /> + ); } diff --git a/components/screen-job-detail/screen-job-detail.component.jsx b/components/screen-job-detail/screen-job-detail.component.jsx index 8a5b945..04fdc0c 100644 --- a/components/screen-job-detail/screen-job-detail.component.jsx +++ b/components/screen-job-detail/screen-job-detail.component.jsx @@ -27,8 +27,8 @@ export default function ScreenJobDetail({ route }) { const renderTabBar = (props) => ( ); @@ -72,6 +72,7 @@ export default function ScreenJobDetail({ route }) { return (