diff --git a/app.json b/app.json index efd10d5..e0cd5d6 100644 --- a/app.json +++ b/app.json @@ -4,19 +4,19 @@ "slug": "imexmobile", "version": "1.3.7", "extra": { - "expover": "2" + "expover": "3" }, "orientation": "default", "icon": "./assets/logo192noa.png", "ios": { "supportsTablet": true, "bundleIdentifier": "com.imex.imexmobile", - "buildNumber": "2", + "buildNumber": "3", "googleServicesFile": "./GoogleService-Info.plist" }, "android": { "package": "com.imex.imexmobile", - "versionCode": 1100015, + "versionCode": 1100016, "googleServicesFile": "./google-services.json" }, "splash": { diff --git a/components/job-documents/job-documents.component.jsx b/components/job-documents/job-documents.component.jsx index e50ea3e..ef692b5 100644 --- a/components/job-documents/job-documents.component.jsx +++ b/components/job-documents/job-documents.component.jsx @@ -33,6 +33,10 @@ export default function JobDocumentsComponent({ job, loading, refetch }) { DetermineFileType(doc.type) === "video" ? GenerateThumbUrl(doc) : GenerateSrcUrl(doc), + uri: + DetermineFileType(doc.type) === "video" + ? GenerateThumbUrl(doc) + : GenerateSrcUrl(doc), thumbUrl: GenerateThumbUrl(doc), }; }), diff --git a/components/media-cache-overlay/media-cache-overlay.component.jsx b/components/media-cache-overlay/media-cache-overlay.component.jsx index 9ece192..3489dc5 100644 --- a/components/media-cache-overlay/media-cache-overlay.component.jsx +++ b/components/media-cache-overlay/media-cache-overlay.component.jsx @@ -1,21 +1,27 @@ import { SafeAreaView } from "react-native"; import React from "react"; -import { ImageGallery } from "@georstat/react-native-image-gallery"; + +import ImageView from "react-native-image-viewing"; export default function MediaCacheOverlay({ photos, previewVisible, setPreviewVisible, imgIndex, + setImgIndex, }) { //const videoRef = React.useRef(null); + return ( - setPreviewVisible(false)} - isOpen={previewVisible} + setPreviewVisible(false)} + visible={previewVisible} images={photos} - initialIndex={imgIndex} + imageIndex={imgIndex} + onImageIndexChange={(...props) => { + console.log(props); + }} /> ); diff --git a/package.json b/package.json index d517bf3..5bf82ee 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "dependencies": { "@apollo/client": "^3.7.0-alpha.3", "@expo/vector-icons": "^13.0.0", - "@georstat/react-native-image-gallery": "^1.1.0", "@react-native-async-storage/async-storage": "~1.17.6", "@react-native-community/art": "^1.2.0", "@react-native-community/cli-debugger-ui": "^7.0.3", @@ -63,6 +62,7 @@ "react-native": "0.68.2", "react-native-gesture-handler": "~2.2.1", "react-native-image-gallery": "^2.1.5", + "react-native-image-viewing": "^0.2.2", "react-native-indicators": "^0.17.0", "react-native-pager-view": "5.4.15", "react-native-paper": "^4.11.2", diff --git a/yarn.lock b/yarn.lock index 7793f37..c96f8c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1819,11 +1819,6 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@georstat/react-native-image-gallery@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@georstat/react-native-image-gallery/-/react-native-image-gallery-1.1.0.tgz#85ec40cec9415f372c950a5d88e26c7123de3cc8" - integrity sha512-rRyZpEFWQXUAlzQqaMi3/r3ymFUKqoQd+Jx1BevUEurMcPAX5321x8BbJ0jo1j4JfWR/koZDwyRZgoitEO5QTA== - "@graphql-typed-document-node/core@^3.1.0", "@graphql-typed-document-node/core@^3.1.1": version "3.1.1" resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052" @@ -7630,6 +7625,11 @@ react-native-image-gallery@^2.1.5: react-mixin "^3.0.5" react-timer-mixin "^0.13.3" +react-native-image-viewing@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/react-native-image-viewing/-/react-native-image-viewing-0.2.2.tgz#fb26e57d7d3d9ce4559a3af3d244387c0367242b" + integrity sha512-osWieG+p/d2NPbAyonOMubttajtYEYiRGQaJA54slFxZ69j1V4/dCmcrVQry47ktVKy8/qpFwCpW1eT6MH5T2Q== + react-native-indicators@^0.17.0: version "0.17.0" resolved "https://registry.yarnpkg.com/react-native-indicators/-/react-native-indicators-0.17.0.tgz#92f95efaf5fb53be576dfe4e1980a25655a93f55"