From f44d8421e69a455aeb1ab5394865e509186c719b Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 6 Jun 2025 08:58:03 -0700 Subject: [PATCH] Density changes. --- app.json | 2 +- .../screen-main/screen-main.component.jsx | 6 ++-- .../screen-media-browser.component.jsx | 28 +++++++++++++++++-- .../screen-settings.component.jsx | 2 +- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/app.json b/app.json index 3384c76..68588c3 100644 --- a/app.json +++ b/app.json @@ -4,7 +4,7 @@ "slug": "imexmobile", "version": "1.7.0", "extra": { - "expover": "2", + "expover": "3", "eas": { "projectId": "ffe01f3a-d507-4698-82cd-da1f1cad450b" } diff --git a/components/screen-main/screen-main.component.jsx b/components/screen-main/screen-main.component.jsx index 8efcb40..a85af88 100644 --- a/components/screen-main/screen-main.component.jsx +++ b/components/screen-main/screen-main.component.jsx @@ -27,8 +27,8 @@ import ScreenSettingsComponent from "../screen-settings/screen-settings.componen import ScreenSignIn from "../screen-sign-in/screen-sign-in.component"; import ScreenSplash from "../screen-splash/screen-splash.component"; import { SplitFactory } from "@splitsoftware/splitio-react-native"; -import * as Updates from 'expo-updates'; -import LogRocket from '@logrocket/react-native'; +import * as Updates from "expo-updates"; +import LogRocket from "@logrocket/react-native"; const ActiveJobStack = createNativeStackNavigator(); const MoreStack = createNativeStackNavigator(); @@ -164,7 +164,7 @@ export function ScreenMainComponent({ }, [checkUserSession]); useEffect(() => { - LogRocket.init('idt6oy/imex-mobile', { + LogRocket.init("idt6oy/imex-mobile", { updateId: Updates.isEmbeddedLaunch ? null : Updates.updateId, expoChannel: Updates.channel, }); diff --git a/components/screen-media-browser/screen-media-browser.component.jsx b/components/screen-media-browser/screen-media-browser.component.jsx index 3d8fabc..19131ef 100644 --- a/components/screen-media-browser/screen-media-browser.component.jsx +++ b/components/screen-media-browser/screen-media-browser.component.jsx @@ -18,6 +18,7 @@ import JobSpaceAvailable from "../job-space-available/job-space-available.compon import UploadProgressLocal from "../upload-progress-local/upload-progress-local.component"; import UploadDeleteSwitch from "../upload-delete-switch/upload-delete-switch.component"; import UploadProgress from "../upload-progress/upload-progress.component"; +import { SegmentedButtons } from "react-native-paper"; // import * as ImagePicker from "expo-image-picker"; // import { Button } from "react-native-paper"; // import * as MediaLibrary from "expo-media-library"; @@ -40,6 +41,7 @@ export function ImageBrowserScreen({ }) { const { t } = useTranslation(); const [uploads, setUploads] = useState(null); + const [density, setDensity] = useState(3); const [tick, setTick] = useState(0); // const [medialLibraryPermissionStatus, requestmediaLibraryPermission] = // ImagePicker.useMediaLibraryPermissions(); @@ -87,10 +89,10 @@ export function ImageBrowserScreen({ assetsType: [MediaType.photo, MediaType.video], minSelection: 1, // maxSelection: 3, - portraitCols: 4, - landscapeCols: 4, + portraitCols: density, + landscapeCols: density, }), - [] + [density] ); const widgetNavigator = useMemo( @@ -175,6 +177,26 @@ export function ImageBrowserScreen({ )} + + { + setDensity(value); + forceRerender(); + }} + buttons={[ + { + value: 4, + label: "Small", + }, + { + value: 3, + label: "Normal", + }, + { value: 2, label: "Large" }, + ]} + /> + {!selectedCameraJobId && ( {t("settings.labels.version", { - number: `${Constants.expoConfig.version}(${Application.nativeBuildVersion})`, + number: `${Constants.expoConfig.version}(${Application.nativeBuildVersion} - ${Constants.expoConfig.extra.expover})`, })}