Minor UI improvements.
This commit is contained in:
@@ -3,7 +3,7 @@ import * as ImagePicker from "expo-image-picker";
|
|||||||
import { useCallback, useEffect, useState } from "react";
|
import { useCallback, useEffect, useState } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { StyleSheet, Text, View } from "react-native";
|
import { StyleSheet, Text, View } from "react-native";
|
||||||
import { Button, SegmentedButtons } from "react-native-paper";
|
import { Button } from "react-native-paper";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
import { toggleDeleteAfterUpload } from "../../redux/app/app.actions";
|
import { toggleDeleteAfterUpload } from "../../redux/app/app.actions";
|
||||||
@@ -53,7 +53,9 @@ export function ImageBrowserScreen({
|
|||||||
cameraRollStatus.status !== "granted" ||
|
cameraRollStatus.status !== "granted" ||
|
||||||
cameraStatus.status !== "granted"
|
cameraStatus.status !== "granted"
|
||||||
) {
|
) {
|
||||||
alert("Sorry, we need these permissions to make this work!");
|
alert(
|
||||||
|
"Photo and Camera permissions have not been granted. Please open the settings app and allow these permissions to upload photos."
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ export default function DataLabelComponent({
|
|||||||
const { key, ...rest } = restProps;
|
const { key, ...rest } = restProps;
|
||||||
return (
|
return (
|
||||||
<View key={key} {...rest} style={{ margin: 4, ...restProps.style }}>
|
<View key={key} {...rest} style={{ margin: 4, ...restProps.style }}>
|
||||||
<Text>{label}</Text>
|
<Text style={{ fontWeight: "bold" }}>{label}</Text>
|
||||||
<Text>{theContent}</Text>
|
<Text>{theContent}</Text>
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -102,7 +102,8 @@ export default function JobTombstone() {
|
|||||||
<DataLabelComponent
|
<DataLabelComponent
|
||||||
label={t("objects.jobs.fields.employee_body")}
|
label={t("objects.jobs.fields.employee_body")}
|
||||||
content={`${
|
content={`${
|
||||||
(job.employee_body_rel && job.employee_body_rel.first_name) || ""
|
(job.employee_body_rel && job.employee_body_rel.first_name) ||
|
||||||
|
t("general.labels.na")
|
||||||
} ${
|
} ${
|
||||||
(job.employee_body_rel && job.employee_body_rel.last_name) || ""
|
(job.employee_body_rel && job.employee_body_rel.last_name) || ""
|
||||||
}`}
|
}`}
|
||||||
@@ -110,7 +111,8 @@ export default function JobTombstone() {
|
|||||||
<DataLabelComponent
|
<DataLabelComponent
|
||||||
label={t("objects.jobs.fields.employee_prep")}
|
label={t("objects.jobs.fields.employee_prep")}
|
||||||
content={`${
|
content={`${
|
||||||
(job.employee_prep_rel && job.employee_prep_rel.first_name) || ""
|
(job.employee_prep_rel && job.employee_prep_rel.first_name) ||
|
||||||
|
t("general.labels.na")
|
||||||
} ${
|
} ${
|
||||||
(job.employee_prep_rel && job.employee_prep_rel.last_name) || ""
|
(job.employee_prep_rel && job.employee_prep_rel.last_name) || ""
|
||||||
}`}
|
}`}
|
||||||
@@ -120,7 +122,7 @@ export default function JobTombstone() {
|
|||||||
content={`${
|
content={`${
|
||||||
(job.employee_refinish_rel &&
|
(job.employee_refinish_rel &&
|
||||||
job.employee_refinish_rel.first_name) ||
|
job.employee_refinish_rel.first_name) ||
|
||||||
""
|
t("general.labels.na")
|
||||||
} ${
|
} ${
|
||||||
(job.employee_refinish_rel &&
|
(job.employee_refinish_rel &&
|
||||||
job.employee_refinish_rel.last_name) ||
|
job.employee_refinish_rel.last_name) ||
|
||||||
@@ -130,7 +132,8 @@ export default function JobTombstone() {
|
|||||||
<DataLabelComponent
|
<DataLabelComponent
|
||||||
label={t("objects.jobs.fields.employee_csr")}
|
label={t("objects.jobs.fields.employee_csr")}
|
||||||
content={`${
|
content={`${
|
||||||
(job.employee_csr_rel && job.employee_csr_rel.first_name) || ""
|
(job.employee_csr_rel && job.employee_csr_rel.first_name) ||
|
||||||
|
t("general.labels.na")
|
||||||
} ${
|
} ${
|
||||||
(job.employee_csr_rel && job.employee_csr_rel.last_name) || ""
|
(job.employee_csr_rel && job.employee_csr_rel.last_name) || ""
|
||||||
}`}
|
}`}
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ export function* openImagePickerAction({ payload: jobid }) {
|
|||||||
cameraRollStatus.status !== "granted" ||
|
cameraRollStatus.status !== "granted" ||
|
||||||
cameraStatus.status !== "granted"
|
cameraStatus.status !== "granted"
|
||||||
) {
|
) {
|
||||||
alert("Sorry, we need these permissions to make this work!");
|
alert("Photo and Camera permissions have not been granted. Please open the settings app and allow these permissions to upload photos.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ const lightTheme = {
|
|||||||
colors: {
|
colors: {
|
||||||
primary: "#1890ff",
|
primary: "#1890ff",
|
||||||
onPrimary: "#ffffff",
|
onPrimary: "#ffffff",
|
||||||
primaryContainer: "#e1e1e1ff",
|
primaryContainer: "#eaeaeaff",
|
||||||
onPrimaryContainer: "#001c3a",
|
onPrimaryContainer: "#001c3a",
|
||||||
secondary: "#545f71",
|
secondary: "#545f71",
|
||||||
onSecondary: "#ffffff",
|
onSecondary: "#ffffff",
|
||||||
|
|||||||
Reference in New Issue
Block a user