From 41a3a1fccf5be5643c4ee48a558c83e0db264f92 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@imexsystems.ca>
Date: Wed, 22 Oct 2025 15:35:42 -0700
Subject: [PATCH] Updated settings screen.

---
 components/global-search/global-search.jsx   |   3 +-
 components/settings/settings.jsx             | 171 +++++++++++++++----
 components/settings/upload-delete-switch.jsx |  35 +---
 translations/en-US/common.json               |   2 +-
 util/theme.js                                |   2 +-
 5 files changed, 149 insertions(+), 64 deletions(-)

diff --git a/components/global-search/global-search.jsx b/components/global-search/global-search.jsx
index 2615b95..79d319e 100644
--- a/components/global-search/global-search.jsx
+++ b/components/global-search/global-search.jsx
@@ -4,7 +4,7 @@ import debounce from "lodash/debounce";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FlatList, View } from "react-native";
-import { ActivityIndicator, Text } from "react-native-paper";
+import { ActivityIndicator, Icon, Text } from "react-native-paper";
 import env from "../../env";
 import ErrorDisplay from "../error/error-display";
 import JobListItem from "../jobs-list/job-list-item";
@@ -82,6 +82,7 @@ export default function GlobalSearch() {
   if (globalSearch === undefined || globalSearch.trim() === "") {
     return (
       <View style={{ flex: 1, justifyContent: "center", alignItems: "center" }}>
+        <Icon size={64} source="cloud-search" />
         <Text variant="bodyMedium" style={{ margin: 12, textAlign: "center" }}>
           {t("globalsearch.labels.entersearch")}
         </Text>
diff --git a/components/settings/settings.jsx b/components/settings/settings.jsx
index 6c97dd8..d2d365e 100644
--- a/components/settings/settings.jsx
+++ b/components/settings/settings.jsx
@@ -1,11 +1,14 @@
 import SignOutButton from "@/components-old/sign-out-button/sign-out-button.component";
-import { toggleDeleteAfterUpload } from "@/redux/app/app.actions";
 import { selectDeleteAfterUpload } from "@/redux/app/app.selectors";
-import { selectBodyshop } from "@/redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "@/redux/user/user.selectors";
 import { formatBytes } from "@/util/uploadUtils";
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import { StyleSheet, View } from "react-native";
-import { Button, Divider, Text } from "react-native-paper";
+import * as Application from "expo-application";
+import Constants from "expo-constants";
+import { useTranslation } from "react-i18next";
+import { Alert, ScrollView, StyleSheet, View } from "react-native";
+import { Button, Card, Divider, List, Text } from "react-native-paper";
+import { SafeAreaView } from "react-native-safe-area-context";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import UploadDeleteSwitch from "./upload-delete-switch";
@@ -13,44 +16,148 @@ import UploadDeleteSwitch from "./upload-delete-switch";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   deleteAfterUpload: selectDeleteAfterUpload,
+  currentUser: selectCurrentUser,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-  toggleDeleteAfterUpload: () => dispatch(toggleDeleteAfterUpload()),
-});
+const mapDispatchToProps = (dispatch) => ({});
 export default connect(mapStateToProps, mapDispatchToProps)(Tab);
 
-function Tab({ bodyshop, deleteAfterUpload, toggleDeleteAfterUpload }) {
+function Tab({ bodyshop, currentUser }) {
+  const { t } = useTranslation();
+  const handleClearStorage = () => {
+    Alert.alert(
+      "Clear Local Cache",
+      "This will remove persisted Redux state. Media already uploaded won't be affected. Continue?",
+      [
+        { text: "Cancel", style: "cancel" },
+        {
+          text: "Clear",
+          style: "destructive",
+          onPress: async () => {
+            try {
+              await AsyncStorage.removeItem("persist:root");
+              Alert.alert("Cleared", "Local cache cleared.");
+            } catch (_e) {
+              Alert.alert("Error", "Unable to clear local cache.");
+            }
+          },
+        },
+      ]
+    );
+  };
+
   return (
-    <View style={styles.container}>
-      <Text variant="titleLarge">Settings</Text>
-      <Text>
-        Media Storage:{" "}
-        {bodyshop?.uselocalmediaserver
-          ? bodyshop.localmediaserverhttp
-          : "Cloud"}
-      </Text>
-      {!bodyshop?.uselocalmediaserver && (
-        <Text>Job Size Limit: {formatBytes(bodyshop?.jobsizelimit)}</Text>
-      )}
-      <UploadDeleteSwitch />
-      <Button
-        onPress={() => {
-          AsyncStorage.removeItem("persist:root");
-        }}
-      >
-        Clear Storage
-      </Button>
-      <Divider />
-      <SignOutButton />
-    </View>
+    <SafeAreaView>
+      <ScrollView contentContainerStyle={styles.container}>
+        <Text variant="headlineMedium" style={styles.title}>
+          Settings
+        </Text>
+
+        <Card style={styles.section}>
+          <Card.Title title="Storage" />
+          <Card.Content>
+            <List.Section>
+              <View style={styles.inlineRow}>
+                <Text style={styles.switchLabel}>
+                  {" "}
+                  {t("mediabrowser.labels.deleteafterupload")}
+                </Text>
+                <UploadDeleteSwitch />
+              </View>
+              <List.Item
+                title="Media Storage"
+                description={
+                  bodyshop?.uselocalmediaserver
+                    ? bodyshop.localmediaserverhttp
+                    : "Cloud"
+                }
+                left={(props) => <List.Icon {...props} icon="database" />}
+              />
+              {!bodyshop?.uselocalmediaserver && (
+                <List.Item
+                  title="Job Size Limit"
+                  description={
+                    bodyshop?.jobsizelimit
+                      ? formatBytes(bodyshop.jobsizelimit)
+                      : "Not specified"
+                  }
+                  left={(props) => <List.Icon {...props} icon="harddisk" />}
+                />
+              )}
+            </List.Section>
+          </Card.Content>
+          <Card.Actions>
+            <Button
+              onPress={handleClearStorage}
+              mode="contained-tonal"
+              icon="delete-outline"
+            >
+              Clear Cache
+            </Button>
+          </Card.Actions>
+        </Card>
+
+        <Card style={styles.section}>
+          <Card.Content>
+            <Text style={styles.paragraph}>
+              Signed in to bodyshop:{" "}
+              {bodyshop?.shopname || bodyshop?.id || "Unknown"}
+            </Text>
+            <Text style={styles.paragraph}>
+              Signed in to as: {currentUser?.email || "Unknown"}
+            </Text>
+          </Card.Content>
+          <Card.Actions style={styles.actionsRow}>
+            <SignOutButton />
+          </Card.Actions>
+        </Card>
+
+        <Divider style={styles.divider} />
+        <Text style={styles.footerNote} variant="bodySmall">
+          {t("settings.labels.version", {
+            number: `${Constants.expoConfig.version}(${Application.nativeBuildVersion} - ${Constants.expoConfig.extra.expover})`,
+          })}
+        </Text>
+      </ScrollView>
+    </SafeAreaView>
   );
 }
 
 const styles = StyleSheet.create({
   container: {
-    flex: 1,
-    justifyContent: "center",
+    paddingVertical: 24,
+    paddingHorizontal: 20,
+  },
+  title: {
+    marginBottom: 12,
+    fontWeight: "600",
+  },
+  section: {
+    marginBottom: 20,
+  },
+  inlineRow: {
+    flexDirection: "row",
     alignItems: "center",
+    justifyContent: "space-between",
+    paddingVertical: 8,
+    paddingHorizontal: 4,
+  },
+  switchLabel: {
+    fontSize: 16,
+    fontWeight: "500",
+  },
+  paragraph: {
+    marginBottom: 8,
+  },
+  actionsRow: {
+    justifyContent: "flex-end",
+  },
+  divider: {
+    marginTop: 8,
+  },
+  footerNote: {
+    textAlign: "center",
+    // color: "#666",
+    marginTop: 16,
   },
 });
diff --git a/components/settings/upload-delete-switch.jsx b/components/settings/upload-delete-switch.jsx
index 7e9f263..1da515e 100644
--- a/components/settings/upload-delete-switch.jsx
+++ b/components/settings/upload-delete-switch.jsx
@@ -1,6 +1,4 @@
 import React from "react";
-import { useTranslation } from "react-i18next";
-import { StyleSheet, Text, View } from "react-native";
 import { Switch } from "react-native-paper";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -19,35 +17,14 @@ export function UploadDeleteSwitch({
   deleteAfterUpload,
   toggleDeleteAfterUpload,
 }) {
-
-  const { t } = useTranslation();
   return (
-    <View style={styles.container}>
-      <Text style={styles.text}>
-        {t("mediabrowser.labels.deleteafterupload")}
-      </Text>
-      <Switch
-        // trackColor={{ false: '#767577', true: '#81b0ff' }}
-        // thumbColor={deleteAfterUpload ? 'tomato' : '#f4f3f4'}
-        //ios_backgroundColor="#3e3e3e"
-        onValueChange={() => {
-          toggleDeleteAfterUpload();
-        }}
-        value={deleteAfterUpload}
-      />
-    </View>
+    <Switch
+      onValueChange={() => {
+        toggleDeleteAfterUpload();
+      }}
+      value={deleteAfterUpload}
+    />
   );
 }
-const styles = StyleSheet.create({
-  container: {
-    display: "flex",
-    flexDirection: "row",
-    alignItems: "center",
-    margin: 10,
-  },
 
-  text: {
-    flex: 1,
-  },
-});
 export default connect(mapStateToProps, mapDispatchToProps)(UploadDeleteSwitch);
diff --git a/translations/en-US/common.json b/translations/en-US/common.json
index 3c88c9f..537448a 100644
--- a/translations/en-US/common.json
+++ b/translations/en-US/common.json
@@ -21,7 +21,7 @@
 		},
 		"globalsearch": {
 			"labels": {
-				"entersearch": "Recent items"
+				"entersearch": "Job Search"
 			}
 		},
 		"jobdetail": {
diff --git a/util/theme.js b/util/theme.js
index e62977e..27e31b7 100644
--- a/util/theme.js
+++ b/util/theme.js
@@ -21,7 +21,7 @@ export default //Custom values were used as the overrides did not work.
             onBackground: "#1a1c1e",
             surface: "#fdfcff",
             onSurface: "#1a1c1e",
-            surfaceVariant: "#e0e2ec",
+            surfaceVariant: "#dededeff",
             onSurfaceVariant: "#43474e",
             outline: "#74777f",
             outlineVariant: "#c3c6cf",