From b397411daaabe16929b5e0d1c51ec16c1d4e9b67 Mon Sep 17 00:00:00 2001 From: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com> Date: Tue, 20 Jun 2023 21:20:05 +0800 Subject: [PATCH] Upgrade `react-native-camera-kit` library to resolve camera issues in Sign In screen (#16248) Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com> --- android/build.gradle | 2 + ios/Podfile.lock | 18 +- nix/deps/gradle/deps.json | 526 +++++++++++++++--- nix/deps/gradle/deps.list | 34 +- nix/deps/gradle/deps.urls | 38 +- package.json | 2 +- src/mocks/js_dependencies.cljs | 4 +- src/react_native/camera_kit.cljs | 7 +- .../ui/screens/qr_scanner/views.cljs | 22 +- .../syncing/scan_sync_code/style.cljs | 9 +- .../contexts/syncing/scan_sync_code/view.cljs | 13 +- yarn.lock | 8 +- 12 files changed, 564 insertions(+), 119 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f5fbaa5163..d81cf95750 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,6 +5,8 @@ import org.apache.tools.ant.taskdefs.condition.Os * Project-wide gradle configuration properties for use by all modules */ ext { + // kotlin_version is needed for react-native-camera-kit library + kotlin_version = project.kotlinVersion RNNKotlinVersion = "1.6.20" RNGH_kotlinVersion = "1.6.20" buildToolsVersion = project.buildToolsVersion diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 005075d851..5015695ff4 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -247,8 +247,6 @@ PODS: - React-Core - react-native-blur (4.3.3): - React-Core - - react-native-camera-kit (8.0.4): - - React - react-native-cameraroll (4.0.4): - React-Core - react-native-config (1.5.0): @@ -348,6 +346,8 @@ PODS: - React-perflogger (= 0.69.10) - ReactNativeAudioToolkit (2.0.3): - React + - ReactNativeCameraKit (13.0.0): + - React-Core - ReactNativeNavigation (7.27.1): - HMSegmentedControl - React-Core @@ -421,7 +421,7 @@ PODS: - React-RCTText - ReactCommon/turbomodule/core - Yoga - - RNShare (7.0.1): + - RNShare (8.2.2): - React-Core - RNStaticSafeAreaInsets (2.2.0): - React-Core @@ -473,7 +473,6 @@ DEPENDENCIES: - react-native-background-timer (from `../node_modules/react-native-background-timer`) - react-native-blob-util (from `../node_modules/react-native-blob-util`) - "react-native-blur (from `../node_modules/@react-native-community/blur`)" - - react-native-camera-kit (from `../node_modules/react-native-camera-kit`) - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)" - react-native-config (from `../node_modules/react-native-config`) - react-native-image-resizer (from `../node_modules/react-native-image-resizer`) @@ -501,6 +500,7 @@ DEPENDENCIES: - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "ReactNativeAudioToolkit (from `../node_modules/@react-native-community/audio-toolkit`)" + - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`) - ReactNativeNavigation (from `../node_modules/react-native-navigation`) - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)" @@ -590,8 +590,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-blob-util" react-native-blur: :path: "../node_modules/@react-native-community/blur" - react-native-camera-kit: - :path: "../node_modules/react-native-camera-kit" react-native-cameraroll: :path: "../node_modules/@react-native-community/cameraroll" react-native-config: @@ -646,6 +644,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon" ReactNativeAudioToolkit: :path: "../node_modules/@react-native-community/audio-toolkit" + ReactNativeCameraKit: + :path: "../node_modules/react-native-camera-kit" ReactNativeNavigation: :path: "../node_modules/react-native-navigation" RNCAsyncStorage: @@ -730,7 +730,6 @@ SPEC CHECKSUMS: react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4 react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9 react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18 - react-native-camera-kit: 498a6d111a904834e0824e9073cfadef7303235f react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2 react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727 react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3 @@ -758,6 +757,7 @@ SPEC CHECKSUMS: React-runtimeexecutor: 5ebf1ddaa706bf2986123f22d2cad905443c2c5f ReactCommon: 65754b8932ea80272714988268bbfb9f303264a5 ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06 + ReactNativeCameraKit: 9d46a5d7dd544ca64aa9c03c150d2348faf437eb ReactNativeNavigation: 94979dd1572a3f093fc85d4599360530a1bed8c8 RNCAsyncStorage: b2489b49e38c85e10ed45a888d13a2a4c7b32ea1 RNCClipboard: 8148e21ac347c51fd6cd4b683389094c216bb543 @@ -772,8 +772,8 @@ SPEC CHECKSUMS: RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467 RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071 - RNReanimated: 06a228c5a245ef7b5b03f0efc29d76ce4db9031c - RNShare: 2dc2fcac3f7321cfd6b60a23ed4bf4d549f86f5f + RNReanimated: 3e375fc41870cc66c5152a38514c450f7adbc3e1 + RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8 RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d diff --git a/nix/deps/gradle/deps.json b/nix/deps/gradle/deps.json index 8186a2cfb4..8d9678990f 100644 --- a/nix/deps/gradle/deps.json +++ b/nix/deps/gradle/deps.json @@ -404,6 +404,66 @@ } }, + { + "path": "androidx/camera/camera-camera2/1.1.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "camera-camera2-1.1.0.pom": { + "sha1": "6bf92d6f3ca6bcf6177e39a1ad20a687fa33adca", + "sha256": "sha256-wTyfsIPJQwh0ljA5KaQTCHISCAgquQnvYLe3YxuF3QQ=" + }, + "camera-camera2-1.1.0.aar": { + "sha1": "dda35e13f2bb2c7907523aa9f5bd70576589fcd6", + "sha256": "sha256-q/B8I/a+lj/jaUPOTxOAcRrSK60ytuYr3d0WCtfZ3iI=" + } + } + }, + + { + "path": "androidx/camera/camera-core/1.1.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "camera-core-1.1.0.pom": { + "sha1": "829e3d2da0093a5266f2fc544692fa19e6e268a4", + "sha256": "sha256-UlIWWiDFa3poCuL0lPxVgE5jgSIsoh8fNzRRxZbamAs=" + }, + "camera-core-1.1.0.aar": { + "sha1": "7c3b5218f57adab60a7ff744ec5a0befa2f5d7f4", + "sha256": "sha256-xvrmgIHZ8zRMSuKznQldL21/Zw+fSzflRXTTGDy/nwg=" + } + } + }, + + { + "path": "androidx/camera/camera-lifecycle/1.1.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "camera-lifecycle-1.1.0.pom": { + "sha1": "3a706bf3632687ea72faf7b55ffd9b5b5a9c44b1", + "sha256": "sha256-nkiPWzYdHbQEZwEy+qIWhyYSSox5CIRB/bnP+s30oQM=" + }, + "camera-lifecycle-1.1.0.aar": { + "sha1": "04304bb6a036d3961e20cdf7bd6ca1e2537ff354", + "sha256": "sha256-ncRoVypzYnrkA+Op/6rXG8/ACvnQKqV6ulpXJtBiRrI=" + } + } + }, + + { + "path": "androidx/camera/camera-view/1.1.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "camera-view-1.1.0.pom": { + "sha1": "a1f65af7f7a7853b770ed66bb660da1afe56be37", + "sha256": "sha256-rzhQ3joch82axk6O3qpuADyZQHEJ8E7JXh0FIDsI3no=" + }, + "camera-view-1.1.0.aar": { + "sha1": "0a993004e0bae677ea88067dd7291c5701690f6b", + "sha256": "sha256-YS3kGZMd5LsrPW9PaUNXWSEdqXURmaNqUmZLKKJb2ow=" + } + } + }, + { "path": "androidx/cardview/cardview/1.0.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -659,6 +719,21 @@ } }, + { + "path": "androidx/core/core/1.3.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "core-1.3.2.pom": { + "sha1": "f2330ce1c60b69f99d55a498f32c0216807214e5", + "sha256": "sha256-r7XqSU3Qg+1ATNUfWA0hjjc2L4rjJuiTvuUhKQ7TSSA=" + }, + "core-1.3.2.aar": { + "sha1": "18a4755efb834c487bac7062e508465f0c853218", + "sha256": "sha256-lN4ZbNZ5UM/27z4axZAV+OqvYYQL3COPLPVN3vjdC+k=" + } + } + }, + { "path": "androidx/core/core/1.5.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -1034,6 +1109,21 @@ } }, + { + "path": "androidx/exifinterface/exifinterface/1.0.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "exifinterface-1.0.0.pom": { + "sha1": "33b6860f537daa47cfc3184f6e592b5271a71958", + "sha256": "sha256-7hXMtzn6ircuSGSeU6Pe8O4tWhEHNgGOeB3wBDf78rM=" + }, + "exifinterface-1.0.0.aar": { + "sha1": "1ab12ceadd49f94006e1ec0ea5fa51b701169cd5", + "sha256": "sha256-7ki+EKq49U7/9MFLd9EeELnu7kN51e9r8peikjxVzBE=" + } + } + }, + { "path": "androidx/exifinterface/exifinterface/1.1.0-beta01", "repo": "https://dl.google.com/dl/android/maven2", @@ -1079,6 +1169,21 @@ } }, + { + "path": "androidx/exifinterface/exifinterface/1.3.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "exifinterface-1.3.2.pom": { + "sha1": "2f7b38976ad64276465c1cb69a1e37e2fdaa4186", + "sha256": "sha256-jZqxpyQvwUP6YvQrXhYA3rPOV9af40I9lXqTgpFX7jc=" + }, + "exifinterface-1.3.2.aar": { + "sha1": "ce8e52ca0749a3b6d07758a26e1cc642180bb4d7", + "sha256": "sha256-h3DBgBA+C4wEoH60xZFTr2ObCeyiXerpvc2vhp0eW2s=" + } + } + }, + { "path": "androidx/fragment/fragment/1.0.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -1259,6 +1364,21 @@ } }, + { + "path": "androidx/lifecycle/lifecycle-livedata-core/2.1.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "lifecycle-livedata-core-2.1.0.pom": { + "sha1": "2a4b17102be06191a3f30047e9467dc483f0b1ee", + "sha256": "sha256-aDnS5oyP7kzDu/BOaykaauhCQD/NX42UTCeBTSlt7/M=" + }, + "lifecycle-livedata-core-2.1.0.aar": { + "sha1": "897d534c89162cb35f14e17d1d421e70667564eb", + "sha256": "sha256-oVB0PobDDt3xZgrUVLH4YEHv3vzRoDkyDEwm24f3EZo=" + } + } + }, + { "path": "androidx/lifecycle/lifecycle-livedata-core/2.3.1", "repo": "https://dl.google.com/dl/android/maven2", @@ -1289,6 +1409,21 @@ } }, + { + "path": "androidx/lifecycle/lifecycle-livedata/2.1.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "lifecycle-livedata-2.1.0.pom": { + "sha1": "d9ce2eab5e7f47299fd0653cab6862152257e10e", + "sha256": "sha256-HkxYDJleQc0YRVz7h+PkOVW+nbnsY6j7PHJZ8Bt8Tjw=" + }, + "lifecycle-livedata-2.1.0.aar": { + "sha1": "454b4bcf4ce0b860b4b4d6a16cba132bb7bbae8f", + "sha256": "sha256-JC5Ea+09s28N8Kqwy3+RBgvS2retytERet9U5yTNHSY=" + } + } + }, + { "path": "androidx/lifecycle/lifecycle-process/2.4.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -6734,6 +6869,126 @@ } }, + { + "path": "com/google/android/datatransport/transport-api/2.2.1", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "transport-api-2.2.1.pom": { + "sha1": "b8951898fd2f1feb2eea7c0d8f27f9f7b45f7a4f", + "sha256": "sha256-gRj4BbhV8Y8dEuWvWekUp/Ygb3G7HRGSqKuajbQQev4=" + }, + "transport-api-2.2.1.aar": { + "sha1": "acc1dce28c142de0cadf47f93feecdb60ccd564f", + "sha256": "sha256-5i9zuhx/XRX12G2OmimMQszQZI585gueMS8uzRI7XtA=" + } + } + }, + + { + "path": "com/google/android/datatransport/transport-backend-cct/2.3.3", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "transport-backend-cct-2.3.3.pom": { + "sha1": "49216d7116d050ba7871dc24a820f397723b775d", + "sha256": "sha256-q048jfi7aV1kZt85n0wuDal3wE0v3qijTuUSgWgxdbA=" + }, + "transport-backend-cct-2.3.3.aar": { + "sha1": "7bf90cd1dd597a1c1c7c6280a94653bd67005df4", + "sha256": "sha256-sioU1WClkNyHXpAkJLKaE6AtH68pe3w5qQB5Z/+tzL0=" + } + } + }, + + { + "path": "com/google/android/datatransport/transport-runtime/2.2.5", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "transport-runtime-2.2.5.pom": { + "sha1": "17dac636bc0d05067e9c0ca7fda604645315e81b", + "sha256": "sha256-OobJdOedeaVe6vmqZaww+mN2ik76zrF0Rvnmiu1ZpZA=" + }, + "transport-runtime-2.2.5.aar": { + "sha1": "b2eafcd68f8b3dfd0736cc76ca2302f8c3b0803c", + "sha256": "sha256-oAFZFYkYrlgsLIWd8fQ6+asyI0aik+urX2Xw5eS9yGU=" + } + } + }, + + { + "path": "com/google/android/datatransport/transport-runtime/2.2.6", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "transport-runtime-2.2.6.pom": { + "sha1": "715a978a4f34420d154b7cf4d3633b2e6f16b3d4", + "sha256": "sha256-r/BOLeKYJ3gn0gMcwmW1oooDDlQhCpujoBiqCFnSlYk=" + }, + "transport-runtime-2.2.6.aar": { + "sha1": "d1d64cc93289192f39c6905389457fef8aef26aa", + "sha256": "sha256-2DrSPBNEKWkRYckkdqPIPfI2zR+Lrb/U8AcjtOzNdBw=" + } + } + }, + + { + "path": "com/google/android/gms/play-services-basement/18.0.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "play-services-basement-18.0.0.pom": { + "sha1": "1a4fdb03eefb2ab366885414496749b003fb6948", + "sha256": "sha256-egPcMQWShulJf0NoMUnZEm0jRxft89265xB0f1f1q6k=" + }, + "play-services-basement-18.0.0.aar": { + "sha1": "1e804f5288f6cd645a872b17556f8f375bcbc274", + "sha256": "sha256-VcF3dGeQGi05nzJSOExJdihKo1/d/VmVRm2+rLSfndY=" + } + } + }, + + { + "path": "com/google/android/gms/play-services-base/18.0.1", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "play-services-base-18.0.1.pom": { + "sha1": "2515339950ea48ef3700b1b1073af9b431ff0182", + "sha256": "sha256-7Fwb6C1CX8qm2lTGICvCW8Y/1hUZ02w+6BP/rn0gPyU=" + }, + "play-services-base-18.0.1.aar": { + "sha1": "1db00193b2879dc27bd914d9d8596a080569a7c4", + "sha256": "sha256-KJbXb0Mr5SFnKVu5zkWt4lwxCu/8BNKM+NtqFYaOg94=" + } + } + }, + + { + "path": "com/google/android/gms/play-services-mlkit-barcode-scanning/18.0.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "play-services-mlkit-barcode-scanning-18.0.0.pom": { + "sha1": "d9130f44f15adf6ff7a6d639e43cbadb00120d4e", + "sha256": "sha256-DkQcU9rIp65KXI1EfjKJb5+pwLizIIUwab+kEnGboas=" + }, + "play-services-mlkit-barcode-scanning-18.0.0.aar": { + "sha1": "75c4844e216e96119c3793b62fa1470b4b80ab5a", + "sha256": "sha256-/YLsFP39rYXXZAL+KwPn7IHMr+BLzQwahkYoam2vGUs=" + } + } + }, + + { + "path": "com/google/android/gms/play-services-tasks/18.0.1", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "play-services-tasks-18.0.1.pom": { + "sha1": "bdca6948d70ec65d184b9de3df90217b85b4fff6", + "sha256": "sha256-8eDKIj7Obk9TM0p3cUkT5TZmeA9obo/wot6t7qtm6mQ=" + }, + "play-services-tasks-18.0.1.aar": { + "sha1": "319f361d7486eadccf0c3a3a28c27c50d8047655", + "sha256": "sha256-8QbbSMbM+o4TFaetxErs0C/3NV6z+n3Ny6jCg6jrFoE=" + } + } + }, + { "path": "com/google/android/material/material/1.0.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -6764,6 +7019,156 @@ } }, + { + "path": "com/google/android/odml/image/1.0.0-beta1", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "image-1.0.0-beta1.pom": { + "sha1": "277909caf35f348d4080c5a93b19e55096ce08d7", + "sha256": "sha256-eV9Hk8N17t9DMqA4EIKYGlznC3oKd2IhyiStnUDL6hw=" + }, + "image-1.0.0-beta1.aar": { + "sha1": "a508729dbdb2a0d27728b0ef42223bba53013d1c", + "sha256": "sha256-LnGqMfg6lBUnfxGd5nGVcm8H0XYOlULBEXeMMg46ofI=" + } + } + }, + + { + "path": "com/google/firebase/firebase-annotations/16.0.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "firebase-annotations-16.0.0.pom": { + "sha1": "e233c7dae7102b50652662ed4e88ec6ee55c7383", + "sha256": "sha256-gsbQQO3LPBWLW5hlYB0r10Kry9l8vZiQO94Fnajt0Ic=" + }, + "firebase-annotations-16.0.0.jar": { + "sha1": "dbeae20d6c97b747b59ef47b6dcf770ba1a60fa6", + "sha256": "sha256-iDDy6KXkNMvF5L0YEzBztuhRiozo7Czm87JzyR2WZMI=" + } + } + }, + + { + "path": "com/google/firebase/firebase-components/16.1.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "firebase-components-16.1.0.pom": { + "sha1": "a696f10fb931241c0c7b3d878fe5b617998d84f2", + "sha256": "sha256-gyDGcXbUFu3PWLZbLvSRtC+qE2DzzXvz2MLupCmK5w4=" + }, + "firebase-components-16.1.0.aar": { + "sha1": "07deeb3bf69a36aca993de511a66185057d368f1", + "sha256": "sha256-gukape0Ybu2vHyIQ9dJBum5EVs8MMpSdXNvhUrDi6Is=" + } + } + }, + + { + "path": "com/google/firebase/firebase-encoders-json/17.1.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "firebase-encoders-json-17.1.0.pom": { + "sha1": "a20291fb0613dfad7d1b270f90f6d9f77682ec08", + "sha256": "sha256-yCPL7XoOdb8w/tu6Qv8cDIdS49wW7cz30PLl1stpx6g=" + }, + "firebase-encoders-json-17.1.0.aar": { + "sha1": "4e99530e12de90cd59bed3ce436d41d5b1260efb", + "sha256": "sha256-gpXHVbytyHoqruW55Wjyf9E4/UX/EVmo7nR89MOjjYU=" + } + } + }, + + { + "path": "com/google/firebase/firebase-encoders/16.1.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "firebase-encoders-16.1.0.pom": { + "sha1": "b9c09069e689f1896fd81c6bf692a895164946da", + "sha256": "sha256-aHvVdE/cVPzkBKRAPrvbhH+/ZRubhyk6Slb8TY/Gjhw=" + }, + "firebase-encoders-16.1.0.jar": { + "sha1": "0267565db8531da1483692e27eb58f93ec894c78", + "sha256": "sha256-j4mnQpi7zMLFQzhSCKLwxn9gPOZ+bsIcx3LpjmiPfPU=" + } + } + }, + + { + "path": "com/google/mlkit/barcode-scanning-common/17.0.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "barcode-scanning-common-17.0.0.pom": { + "sha1": "a6c95e119e8516ce448edc21a4c7a8312155254e", + "sha256": "sha256-9cr4tnCn8EjBPuY3U28h2lK1m08iGAgd8yCYam4607Q=" + }, + "barcode-scanning-common-17.0.0.aar": { + "sha1": "e41ee14202141d001ae3d4447491f1f63b3b5601", + "sha256": "sha256-zQ6ecbg0B41Kin8J5y19fDoi4ljpYC2nrIYUZncEPxQ=" + } + } + }, + + { + "path": "com/google/mlkit/barcode-scanning/17.0.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "barcode-scanning-17.0.2.pom": { + "sha1": "e48d600b4acf7fe06864c60b5b8b445c95ae8605", + "sha256": "sha256-jyO9KN4is79lvMXqJElwkLIzCBrw1CUzMwWZZOwdPUU=" + }, + "barcode-scanning-17.0.2.aar": { + "sha1": "4790140e338050260bcdc09e2ef1a08a2f09c0f2", + "sha256": "sha256-gg65yuRc/x6ODQui/RkXMqiSUC2F/VJqo9dkpiQ0ZAI=" + } + } + }, + + { + "path": "com/google/mlkit/common/18.0.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "common-18.0.0.pom": { + "sha1": "aa31d9ffbdfeb4c9cfc12e45ff1d7c8705959e20", + "sha256": "sha256-5pvosxRQeO46y+2BUds5qhZuTMgof/pqckcNYyP1p5A=" + }, + "common-18.0.0.aar": { + "sha1": "c843f4c3aa57b86b71fb053f40bb30b2acd265e5", + "sha256": "sha256-QLiJc1m2NQP4tq1THtBzeuUe3w23R+pXutsJBSyZKD4=" + } + } + }, + + { + "path": "com/google/mlkit/vision-common/17.0.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "vision-common-17.0.0.pom": { + "sha1": "840ef249deed22655232189a7286a538baf04f58", + "sha256": "sha256-R5EQ8eqK7b720OG6i0nYJt4Dd43KZwNw2mk7vFtsGKw=" + }, + "vision-common-17.0.0.aar": { + "sha1": "e331b275471631a9039697ae563bd6b94102ffc2", + "sha256": "sha256-Dxc7POM8Z7kJfCzn2/DbkivKvKW05Oq5P6GcpwsDbIg=" + } + } + }, + + { + "path": "com/google/mlkit/vision-interfaces/16.0.0", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "vision-interfaces-16.0.0.pom": { + "sha1": "f18a3c21c309d57e4b532a38056862d8f38e8ae2", + "sha256": "sha256-AsiXAX1GyENvRdL4SjU7STRNZGABar7lcyWgrIXr0VQ=" + }, + "vision-interfaces-16.0.0.aar": { + "sha1": "9ff0ceb522bf48892529d65af543098373b1531f", + "sha256": "sha256-C6WOAfNs6Yn0/SSbSAvnY6h9VTkR96c4SWqhgnS1yX0=" + } + } + }, + { "path": "com/google/testing/platform/core-proto/0.0.8-alpha04", "repo": "https://dl.google.com/dl/android/maven2", @@ -7241,16 +7646,16 @@ }, { - "path": "com/adobe/xmp/xmpcore/5.1.2", + "path": "com/adobe/xmp/xmpcore/6.0.6", "repo": "https://repo.maven.apache.org/maven2", "files": { - "xmpcore-5.1.2.pom": { - "sha1": "5f77687c678a0a6d8bfa82bb6f2ef708f084ba00", - "sha256": "sha256-zOkuHvC+l0KzqtlTUErcaV1vCbYONVkG0jNDhnl2XKg=" + "xmpcore-6.0.6.pom": { + "sha1": "6a917e15f78165ed31482a339b9c6bd65900ebdd", + "sha256": "sha256-/5kclKMi2JShufIhMW1UXHtH0LP4Uf438vpECHpIoFU=" }, - "xmpcore-5.1.2.jar": { - "sha1": "55615fa2582424e38705487d1d3969af8554f637", - "sha256": "sha256-CtzWMAOq/wqHuTj2rMwtiQohacdRqbNogSN/hUYocJA=" + "xmpcore-6.0.6.jar": { + "sha1": "fb29d75ac313aed79013505b965d2378a87a9405", + "sha256": "sha256-Qy95ojgKPmW+p1TI0L4MCcaTjfrqH25hsBeEytbBjP8=" } } }, @@ -8216,16 +8621,16 @@ }, { - "path": "com/drewnoakes/metadata-extractor/2.9.1", + "path": "com/drewnoakes/metadata-extractor/2.12.0", "repo": "https://repo.maven.apache.org/maven2", "files": { - "metadata-extractor-2.9.1.pom": { - "sha1": "d2c2b713b72d2382621c74c16464018c334df65c", - "sha256": "sha256-mTb812v2IfucsegOk5AH3DCjx3p0hJkIgPHf1JxYagE=" + "metadata-extractor-2.12.0.pom": { + "sha1": "1e3a24770062e3f4d6fb9b9e80b64d7aa4fdb237", + "sha256": "sha256-odxWCuxbZlaa7O5YUqun4F/iEX+660IakMXhyRJV+k4=" }, - "metadata-extractor-2.9.1.jar": { - "sha1": "53fdf22be10c9d426ec63431c7342895bc642261", - "sha256": "sha256-TXOCVopeWqyWwmHY/WewMKUzmC7KxWPo7U8yeDHwsCQ=" + "metadata-extractor-2.12.0.jar": { + "sha1": "30dce2429145a41770e0d2bd0a8e8ba63f2137c8", + "sha256": "sha256-tlzqky+2RNl79mxrfUXmG2lnxyvsISb8PkyD9iWcHQU=" } } }, @@ -9450,6 +9855,17 @@ } }, + { + "path": "com/google/auto/auto-parent/7", + "repo": "https://repo.maven.apache.org/maven2", + "files": { + "auto-parent-7.pom": { + "sha1": "02ab24442738fb975a81595ef033f67a72358c1c", + "sha256": "sha256-pGQm/MtdMnBa2cu8mW94a9BIzIy90h2wRlABafFaQ1Y=" + } + } + }, + { "path": "com/google/auto/value/auto-value-annotations/1.6.2", "repo": "https://repo.maven.apache.org/maven2", @@ -9465,6 +9881,21 @@ } }, + { + "path": "com/google/auto/value/auto-value-annotations/1.6.3", + "repo": "https://repo.maven.apache.org/maven2", + "files": { + "auto-value-annotations-1.6.3.pom": { + "sha1": "8ccd7ba6d7ea8de204f17f6e509d77a76f06d298", + "sha256": "sha256-4fx4D37gJeZis9pycj2+KsjawKL4kg8mUxXE4b49dlw=" + }, + "auto-value-annotations-1.6.3.jar": { + "sha1": "b88c1bb7f149f6d2cc03898359283e57b08f39cc", + "sha256": "sha256-DpUf7owx9gJwvEZVOoWGABt7k9uxKuwGNzqpmhUDksA=" + } + } + }, + { "path": "com/google/auto/value/auto-value-annotations/1.10.1", "repo": "https://repo.maven.apache.org/maven2", @@ -9491,6 +9922,17 @@ } }, + { + "path": "com/google/auto/value/auto-value-parent/1.6.3", + "repo": "https://repo.maven.apache.org/maven2", + "files": { + "auto-value-parent-1.6.3.pom": { + "sha1": "7e21ec842ec2e34f4d8e277ef98be79401dce4c6", + "sha256": "sha256-5Z31cytMs01XJxgURvne2c5EJRMaChBiUZ7qGW3k2KE=" + } + } + }, + { "path": "com/google/auto/value/auto-value-parent/1.10.1", "repo": "https://repo.maven.apache.org/maven2", @@ -10834,32 +11276,6 @@ } }, - { - "path": "com/google/zxing/core/3.3.0", - "repo": "https://repo.maven.apache.org/maven2", - "files": { - "core-3.3.0.pom": { - "sha1": "1ddcd08882c0da8e917d92087e5651e234b5c79f", - "sha256": "sha256-yhw+TEhIdz1OWvowHBK8GKpLJtJHX/aWHOAm8tlAqr8=" - }, - "core-3.3.0.jar": { - "sha1": "73c49077166faa4c3c0059c5f583d1d7bd1475fe", - "sha256": "sha256-u6dyTgKpl87DghOvdxM+6OJLDVz1+n7LwWpPqT8R7g0=" - } - } - }, - - { - "path": "com/google/zxing/zxing-parent/3.3.0", - "repo": "https://repo.maven.apache.org/maven2", - "files": { - "zxing-parent-3.3.0.pom": { - "sha1": "c69d8576d8ec725cd091d25cbae2f276d44667db", - "sha256": "sha256-fGlRshaE9orE9pg9JuDwsBq15wZvi3S0rK/29jjtH/Y=" - } - } - }, - { "path": "com/intellij/annotations/12.0", "repo": "https://repo.maven.apache.org/maven2", @@ -17956,21 +18372,6 @@ } }, - { - "path": "org/slf4j/jcl-over-slf4j/2.0.7", - "repo": "https://repo.maven.apache.org/maven2", - "files": { - "jcl-over-slf4j-2.0.7.pom": { - "sha1": "15536e4a74a7aa317322a3d7814db8251de60d6f", - "sha256": "sha256-QzT/rbuOhgtdjjm7HHDDHO8BEGQ1EGZkQQsK9+vi8uc=" - }, - "jcl-over-slf4j-2.0.7.jar": { - "sha1": "f127fe5ee53404a8b3697cdd032dd1dd6a29dd77", - "sha256": "sha256-QYBnV+HSba5dbbLKfUpRdu7S1ucJzYZWTUoR2rBgF0I=" - } - } - }, - { "path": "org/slf4j/slf4j-api/1.7.21", "repo": "https://repo.maven.apache.org/maven2", @@ -18016,21 +18417,6 @@ } }, - { - "path": "org/slf4j/slf4j-jdk14/2.0.7", - "repo": "https://repo.maven.apache.org/maven2", - "files": { - "slf4j-jdk14-2.0.7.pom": { - "sha1": "31039eac9f263c48bda14efd90aef0fb7a5a0e6a", - "sha256": "sha256-VOEx2uUWaQ1EKNnHKzfiF11YDiN173kzFe6b0X38oe8=" - }, - "slf4j-jdk14-2.0.7.jar": { - "sha1": "d91cd16b55ffbd5f46c60d0173fd4eeccacfee2d", - "sha256": "sha256-+QRwmvIXDzzmzP1uWYOJndiYyBWkf8R1yNteKYKEd/c=" - } - } - }, - { "path": "org/slf4j/slf4j-parent/1.7.21", "repo": "https://repo.maven.apache.org/maven2", diff --git a/nix/deps/gradle/deps.list b/nix/deps/gradle/deps.list index 9441bde608..f14016b6c2 100644 --- a/nix/deps/gradle/deps.list +++ b/nix/deps/gradle/deps.list @@ -16,6 +16,10 @@ androidx.arch.core:core-runtime:2.0.0 androidx.arch.core:core-runtime:2.1.0 androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 androidx.autofill:autofill:1.1.0 +androidx.camera:camera-camera2:1.1.0 +androidx.camera:camera-core:1.1.0 +androidx.camera:camera-lifecycle:1.1.0 +androidx.camera:camera-view:1.1.0 androidx.cardview:cardview:1.0.0 androidx.collection:collection:1.0.0 androidx.collection:collection:1.1.0 @@ -27,6 +31,7 @@ androidx.coordinatorlayout:coordinatorlayout:1.1.0 androidx.core:core-ktx:1.6.0 androidx.core:core-splashscreen:1.0.0 androidx.core:core:1.1.0 +androidx.core:core:1.2.0 androidx.core:core:1.6.0 androidx.core:core:1.7.0 androidx.cursoradapter:cursoradapter:1.0.0 @@ -49,9 +54,12 @@ androidx.documentfile:documentfile:1.0.0 androidx.drawerlayout:drawerlayout:1.0.0 androidx.emoji2:emoji2-views-helper:1.0.0 androidx.emoji2:emoji2:1.0.0 +androidx.exifinterface:exifinterface:1.0.0 androidx.exifinterface:exifinterface:1.1.0-beta01 androidx.exifinterface:exifinterface:1.1.0-rc01 androidx.exifinterface:exifinterface:1.2.0 +androidx.exifinterface:exifinterface:1.3.2 +androidx.fragment:fragment:1.0.0 androidx.fragment:fragment:1.1.0 androidx.fragment:fragment:1.3.6 androidx.interpolator:interpolator:1.0.0 @@ -63,14 +71,17 @@ androidx.lifecycle:lifecycle-common:2.1.0 androidx.lifecycle:lifecycle-common:2.3.1 androidx.lifecycle:lifecycle-common:2.4.0 androidx.lifecycle:lifecycle-livedata-core:2.0.0 +androidx.lifecycle:lifecycle-livedata-core:2.1.0 androidx.lifecycle:lifecycle-livedata-core:2.3.1 androidx.lifecycle:lifecycle-livedata:2.0.0 +androidx.lifecycle:lifecycle-livedata:2.1.0 androidx.lifecycle:lifecycle-process:2.4.0 androidx.lifecycle:lifecycle-runtime:2.0.0 androidx.lifecycle:lifecycle-runtime:2.1.0 androidx.lifecycle:lifecycle-runtime:2.3.1 androidx.lifecycle:lifecycle-runtime:2.4.0 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 +androidx.lifecycle:lifecycle-viewmodel:2.0.0 androidx.lifecycle:lifecycle-viewmodel:2.1.0 androidx.lifecycle:lifecycle-viewmodel:2.3.1 androidx.loader:loader:1.0.0 @@ -106,7 +117,7 @@ commons-codec:commons-codec:1.11 commons-io:commons-io:2.4 commons-logging:commons-logging:1.1.1 commons-logging:commons-logging:1.2 -com.adobe.xmp:xmpcore:5.1.2 +com.adobe.xmp:xmpcore:6.0.6 com.afollestad.material-dialogs:commons:0.9.6.0 com.afollestad.material-dialogs:core:0.9.6.0 com.airbnb.android:lottie:3.4.4 @@ -433,7 +444,7 @@ com.diffplug.durian:durian-io:1.2.0 com.diffplug.spotless:spotless-lib-extra:2.30.0 com.diffplug.spotless:spotless-lib:2.30.0 com.diffplug.spotless:spotless-plugin-gradle:6.11.0 -com.drewnoakes:metadata-extractor:2.9.1 +com.drewnoakes:metadata-extractor:2.12.0 com.facebook.conceal:conceal:1.1.3 com.facebook.fbjni:fbjni-java-only:0.2.2 com.facebook.flipper:flipper-fresco-plugin:0.54.0 @@ -489,11 +500,20 @@ com.googlecode.concurrent-trees:concurrent-trees:2.6.1 com.googlecode.javaewah:JavaEWAH:1.1.13 com.googlecode.json-simple:json-simple:1.1 com.googlecode.juniversalchardet:juniversalchardet:1.0.3 +com.google.android.datatransport:transport-api:2.2.1 +com.google.android.datatransport:transport-backend-cct:2.3.3 +com.google.android.datatransport:transport-runtime:2.2.6 +com.google.android.gms:play-services-basement:18.0.0 +com.google.android.gms:play-services-base:18.0.1 +com.google.android.gms:play-services-mlkit-barcode-scanning:18.0.0 +com.google.android.gms:play-services-tasks:18.0.1 com.google.android.material:material:1.2.0-alpha03 +com.google.android.odml:image:1.0.0-beta1 com.google.android:annotations:4.1.1.4 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-common-protos:2.0.1 com.google.auto.value:auto-value-annotations:1.6.2 +com.google.auto.value:auto-value-annotations:1.6.3 com.google.auto.value:auto-value:1.5.2 com.google.code.findbugs:jsr305:1.3.9 com.google.code.findbugs:jsr305:3.0.2 @@ -512,6 +532,10 @@ com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.4 com.google.errorprone:error_prone_annotations:2.4.0 com.google.errorprone:error_prone_annotations:2.7.1 +com.google.firebase:firebase-annotations:16.0.0 +com.google.firebase:firebase-components:16.1.0 +com.google.firebase:firebase-encoders-json:17.1.0 +com.google.firebase:firebase-encoders:16.1.0 com.google.flatbuffers:flatbuffers-java:1.12.0 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:17.0 @@ -528,6 +552,11 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.j2objc:j2objc-annotations:1.3 com.google.jimfs:jimfs:1.1 +com.google.mlkit:barcode-scanning-common:17.0.0 +com.google.mlkit:barcode-scanning:17.0.2 +com.google.mlkit:common:18.0.0 +com.google.mlkit:vision-common:17.0.0 +com.google.mlkit:vision-interfaces:16.0.0 com.google.protobuf:protobuf-java-util:3.4.0 com.google.protobuf:protobuf-java-util:3.10.0 com.google.protobuf:protobuf-java-util:3.17.2 @@ -537,7 +566,6 @@ com.google.protobuf:protobuf-java:3.10.0 com.google.protobuf:protobuf-java:3.17.2 com.google.testing.platform:core-proto:0.0.8-alpha07 com.google.test.platform:core-proto:0.0.2-dev -com.google.zxing:core:3.3.0 com.intellij:annotations:12.0 com.parse.bolts:bolts-applinks:1.4.0 com.parse.bolts:bolts-tasks:1.4.0 diff --git a/nix/deps/gradle/deps.urls b/nix/deps/gradle/deps.urls index 781fb73b43..119a4a7a1e 100644 --- a/nix/deps/gradle/deps.urls +++ b/nix/deps/gradle/deps.urls @@ -25,6 +25,10 @@ https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.0.0/co https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.pom https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asynclayoutinflater/1.0.0/asynclayoutinflater-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/autofill/autofill/1.1.0/autofill-1.1.0.pom +https://dl.google.com/dl/android/maven2/androidx/camera/camera-camera2/1.1.0/camera-camera2-1.1.0.pom +https://dl.google.com/dl/android/maven2/androidx/camera/camera-core/1.1.0/camera-core-1.1.0.pom +https://dl.google.com/dl/android/maven2/androidx/camera/camera-lifecycle/1.1.0/camera-lifecycle-1.1.0.pom +https://dl.google.com/dl/android/maven2/androidx/camera/camera-view/1.1.0/camera-view-1.1.0.pom https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardview-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0.pom @@ -42,6 +46,7 @@ https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0.pom https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0.pom https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.0/core-1.3.0.pom https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.1/core-1.3.1.pom +https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.2/core-1.3.2.pom https://dl.google.com/dl/android/maven2/androidx/core/core/1.5.0/core-1.5.0.pom https://dl.google.com/dl/android/maven2/androidx/core/core/1.6.0/core-1.6.0.pom https://dl.google.com/dl/android/maven2/androidx/core/core/1.7.0/core-1.7.0.pom @@ -67,9 +72,11 @@ https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0 https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/emoji2/emoji2-views-helper/1.0.0/emoji2-views-helper-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/emoji2/emoji2/1.0.0/emoji2-1.0.0.pom +https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.0.0/exifinterface-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-beta01/exifinterface-1.1.0-beta01.pom https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-rc01/exifinterface-1.1.0-rc01.pom https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.2.0/exifinterface-1.2.0.pom +https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.3.2/exifinterface-1.3.2.pom https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fragment-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0.pom https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.3.6/fragment-1.3.6.pom @@ -82,8 +89,10 @@ https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1. https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.3.1/lifecycle-common-2.3.1.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.4.0/lifecycle-common-2.4.0.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.0.0/lifecycle-livedata-core-2.0.0.pom +https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.1.0/lifecycle-livedata-core-2.1.0.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.3.1/lifecycle-livedata-core-2.3.1.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.0.0/lifecycle-livedata-2.0.0.pom +https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.1.0/lifecycle-livedata-2.1.0.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-process/2.4.0/lifecycle-process-2.4.0.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.0.0/lifecycle-runtime-2.0.0.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0.pom @@ -447,8 +456,26 @@ https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.0.4/zipflinger- https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.1/zipflinger-7.2.1.pom https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.2/zipflinger-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.3.0/zipflinger-7.3.0.pom +https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.1/transport-api-2.2.1.pom +https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-backend-cct/2.3.3/transport-backend-cct-2.3.3.pom +https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.5/transport-runtime-2.2.5.pom +https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.6/transport-runtime-2.2.6.pom +https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/18.0.0/play-services-basement-18.0.0.pom +https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/18.0.1/play-services-base-18.0.1.pom +https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-mlkit-barcode-scanning/18.0.0/play-services-mlkit-barcode-scanning-18.0.0.pom +https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/18.0.1/play-services-tasks-18.0.1.pom https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0.pom https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom +https://dl.google.com/dl/android/maven2/com/google/android/odml/image/1.0.0-beta1/image-1.0.0-beta1.pom +https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-annotations/16.0.0/firebase-annotations-16.0.0.pom +https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/16.1.0/firebase-components-16.1.0.pom +https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders-json/17.1.0/firebase-encoders-json-17.1.0.pom +https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders/16.1.0/firebase-encoders-16.1.0.pom +https://dl.google.com/dl/android/maven2/com/google/mlkit/barcode-scanning-common/17.0.0/barcode-scanning-common-17.0.0.pom +https://dl.google.com/dl/android/maven2/com/google/mlkit/barcode-scanning/17.0.2/barcode-scanning-17.0.2.pom +https://dl.google.com/dl/android/maven2/com/google/mlkit/common/18.0.0/common-18.0.0.pom +https://dl.google.com/dl/android/maven2/com/google/mlkit/vision-common/17.0.0/vision-common-17.0.0.pom +https://dl.google.com/dl/android/maven2/com/google/mlkit/vision-interfaces/16.0.0/vision-interfaces-16.0.0.pom https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha04/core-proto-0.0.8-alpha04.pom https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha07/core-proto-0.0.8-alpha07.pom https://dl.google.com/dl/android/maven2/com/google/test/platform/core-proto/0.0.2-dev/core-proto-0.0.2-dev.pom @@ -481,7 +508,7 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.15/commons-co https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom -https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/5.1.2/xmpcore-5.1.2.pom +https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.0.6/xmpcore-6.0.6.pom https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom https://repo.maven.apache.org/maven2/com/airbnb/android/lottie/3.4.4/lottie-3.4.4.pom @@ -546,7 +573,7 @@ https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-io/1.2.0/durian- https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extra/2.30.0/spotless-lib-extra-2.30.0.pom https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.30.0/spotless-lib-2.30.0.pom https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-plugin-gradle/6.11.0/spotless-plugin-gradle-6.11.0.pom -https://repo.maven.apache.org/maven2/com/drewnoakes/metadata-extractor/2.9.1/metadata-extractor-2.9.1.pom +https://repo.maven.apache.org/maven2/com/drewnoakes/metadata-extractor/2.12.0/metadata-extractor-2.12.0.pom https://repo.maven.apache.org/maven2/com/facebook/conceal/conceal/1.1.3/conceal-1.1.3.pom https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni-java-only/0.2.2/fbjni-java-only-0.2.2.pom https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni/0.0.2/fbjni-0.0.2.pom @@ -631,9 +658,12 @@ https://repo.maven.apache.org/maven2/com/google/api/grpc/proto-google-common-pro https://repo.maven.apache.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.pom https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/3/auto-parent-3.pom https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/6/auto-parent-6.pom +https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/7/auto-parent-7.pom https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2.pom +https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.3/auto-value-annotations-1.6.3.pom https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.10.1/auto-value-annotations-1.10.1.pom https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.2/auto-value-parent-1.6.2.pom +https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.3/auto-value-parent-1.6.3.pom https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.10.1/auto-value-parent-1.10.1.pom https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.pom https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom @@ -735,8 +765,6 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.0.0-rc-2/protobuf-parent-4.0.0-rc-2.pom https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.1.4/truth-parent-1.1.4.pom https://repo.maven.apache.org/maven2/com/google/truth/truth/1.1.4/truth-1.1.4.pom -https://repo.maven.apache.org/maven2/com/google/zxing/core/3.3.0/core-3.3.0.pom -https://repo.maven.apache.org/maven2/com/google/zxing/zxing-parent/3.3.0/zxing-parent-3.3.0.pom https://repo.maven.apache.org/maven2/com/intellij/annotations/12.0/annotations-12.0.pom https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-applinks/1.4.0/bolts-applinks-1.4.0.pom https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0.pom @@ -1245,11 +1273,9 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.pom https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom -https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/2.0.7/jcl-over-slf4j-2.0.7.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.7/slf4j-api-2.0.7.pom -https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/2.0.7/slf4j-jdk14-2.0.7.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.21/slf4j-parent-1.7.21.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.30/slf4j-parent-1.7.30.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.0.7/slf4j-parent-2.0.7.pom diff --git a/package.json b/package.json index f35fd0e49a..0ed7b3a353 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "react-native": "0.69.10", "react-native-background-timer": "^2.1.1", "react-native-blob-util": "^0.13.18", - "react-native-camera-kit": "^8.0.4", + "react-native-camera-kit": "^13.0.0", "react-native-config": "^1.5.0", "react-native-dialogs": "^1.0.4", "react-native-draggable-flatlist": "^3.0.3", diff --git a/src/mocks/js_dependencies.cljs b/src/mocks/js_dependencies.cljs index 41d42c3d1b..4b24be10a8 100644 --- a/src/mocks/js_dependencies.cljs +++ b/src/mocks/js_dependencies.cljs @@ -305,7 +305,9 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return ( #js {:getInstallReferrer identity}) (def react-native-camera-kit - #js {:CameraKitCamera #js {}}) + #js + {:Camera #js {} + :CameraType #js {}}) (def react-native-push-notification #js diff --git a/src/react_native/camera_kit.cljs b/src/react_native/camera_kit.cljs index abee5ec44d..0963861adb 100644 --- a/src/react_native/camera_kit.cljs +++ b/src/react_native/camera_kit.cljs @@ -1,5 +1,8 @@ (ns react-native.camera-kit - (:require ["react-native-camera-kit" :refer (CameraKitCamera)] + (:require ["react-native-camera-kit" :refer (Camera CameraType)] [reagent.core :as reagent])) -(def camera (reagent/adapt-react-class CameraKitCamera)) +(def camera (reagent/adapt-react-class Camera)) + +(def camera-type-front (.-Front CameraType)) +(def camera-type-back (.-Back CameraType)) diff --git a/src/status_im/ui/screens/qr_scanner/views.cljs b/src/status_im/ui/screens/qr_scanner/views.cljs index aee959fd2f..fb930fc0c6 100644 --- a/src/status_im/ui/screens/qr_scanner/views.cljs +++ b/src/status_im/ui/screens/qr_scanner/views.cljs @@ -1,19 +1,16 @@ (ns status-im.ui.screens.qr-scanner.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) - (:require ["react-native-camera-kit" :refer (CameraKitCamera)] + (:require [react-native.camera-kit :as camera-kit] [clojure.string :as string] [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [reagent.core :as reagent] [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.components.topbar :as topbar] [status-im.ui.screens.qr-scanner.styles :as styles] [status-im2.config :as config])) -(def camera (reagent/adapt-react-class CameraKitCamera)) - (defn get-qr-code-data [^js event] (when-let [data (-> event .-nativeEvent .-codeStringValue)] @@ -97,12 +94,13 @@ [react/view {:flex 1} [react/with-activity-indicator {} - [camera - {:ref #(reset! camera-ref %) - :style {:flex 1} - :camera-options {:zoomMode :off} - :scan-barcode true - :on-read-code #(when-not @read-once? - (reset! read-once? true) - (on-barcode-read opts %))}]] + [camera-kit/camera + {:ref #(reset! camera-ref %) + :style {:flex 1} + :camera-type camera-kit/camera-type-back + :zoom-mode :off + :scan-barcode true + :on-read-code #(when-not @read-once? + (reset! read-once? true) + (on-barcode-read opts %))}]] [viewfinder (int (* 2 (/ (min height width) 3)))]])])) diff --git a/src/status_im2/contexts/syncing/scan_sync_code/style.cljs b/src/status_im2/contexts/syncing/scan_sync_code/style.cljs index 587f3afe21..2ab24afc4b 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/style.cljs +++ b/src/status_im2/contexts/syncing/scan_sync_code/style.cljs @@ -1,6 +1,5 @@ (ns status-im2.contexts.syncing.scan-sync-code.style - (:require [quo2.foundations.colors :as colors] - [status-im.utils.platform :as platform])) + (:require [quo2.foundations.colors :as colors])) (def screen-padding 20) @@ -142,13 +141,11 @@ :padding-bottom 12}) (def camera-style - {:height "100%" - :borderRadius 16 - :background-color :transparent}) + {:flex 1}) (def camera-container {:position :absolute - :top (if platform/android? 40 0) + :top 0 :left 0 :right 0 :bottom 0 diff --git a/src/status_im2/contexts/syncing/scan_sync_code/view.cljs b/src/status_im2/contexts/syncing/scan_sync_code/view.cljs index f851311045..4da77be781 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/view.cljs +++ b/src/status_im2/contexts/syncing/scan_sync_code/view.cljs @@ -240,11 +240,14 @@ [:<> [rn/view {:style style/camera-container} [camera-kit/camera - {:ref #(reset! camera-ref %) - :style style/camera-style - :camera-options {:zoomMode :off} - :scan-barcode true - :on-read-code on-read-code}]] + {:ref #(reset! camera-ref %) + :style style/camera-style + :camera-type camera-kit/camera-type-back + :zoom-mode :off + ;; https://github.com/status-im/status-mobile/issues/16243 + :torch-mode :off + :scan-barcode true + :on-read-code on-read-code}]] [hole-view/hole-view {:style style/hole :holes (if show-holes? diff --git a/yarn.lock b/yarn.lock index ab9436e8d7..a384d3dbb0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8974,10 +8974,10 @@ react-native-blob-util@^0.13.18: base-64 "0.1.0" glob "^7.1.6" -react-native-camera-kit@^8.0.4: - version "8.0.4" - resolved "https://registry.yarnpkg.com/react-native-camera-kit/-/react-native-camera-kit-8.0.4.tgz#8e350b37a205054ceb140a8babe1d032acdcdbd5" - integrity sha512-nzjZVufIF9gnSklufJhpALJP1Ghaj3/fDMYcm4Bvzbq6PAA0CqogX448C7TRWYOqGsE/jFcKagM/J7/M4AJzhw== +react-native-camera-kit@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/react-native-camera-kit/-/react-native-camera-kit-13.0.0.tgz#983d9146cdeb0ec0cb0c0a86b7fa5f7690df08f6" + integrity sha512-fnkyivCG2xzS+14/doP8pCAYNafYaTyg5J0t+JJltJdgKSHf328OG44Rd+fnbbEOydZxgy/bcuLB24R0kCbynw== dependencies: lodash "^4.14.2"