From 2d8b0107e354637ce27c9c336a5e5f2d64b0f2e1 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 30 Jul 2020 14:58:00 +0200 Subject: [PATCH] replace camera library Signed-off-by: andrey --- ios/Podfile.lock | 16 +- nix/deps/gradle/deps.json | 434 ++---------------- nix/deps/gradle/deps.list | 26 +- nix/deps/gradle/deps.urls | 39 +- nix/deps/gradle/proj.list | 2 +- package.json | 2 +- src/status_im/ui/components/camera.cljs | 46 +- .../ui/screens/qr_scanner/views.cljs | 29 +- yarn.lock | 15 +- 9 files changed, 72 insertions(+), 537 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4d4888f0f0..a8418ad01e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -239,13 +239,7 @@ PODS: - React-jsinspector (0.62.2) - react-native-background-timer (2.2.0): - React - - react-native-camera (3.26.0): - - React - - react-native-camera/RCT (= 3.26.0) - - react-native-camera/RN (= 3.26.0) - - react-native-camera/RCT (3.26.0): - - React - - react-native-camera/RN (3.26.0): + - react-native-camera-kit (8.0.4): - React - react-native-cameraroll (1.6.2): - React @@ -415,7 +409,7 @@ DEPENDENCIES: - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - react-native-background-timer (from `../node_modules/react-native-background-timer`) - - react-native-camera (from `../node_modules/react-native-camera`) + - react-native-camera-kit (from `../node_modules/react-native-camera-kit`) - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)" - react-native-image-resizer (from `../node_modules/react-native-image-resizer`) - react-native-mail (from `../node_modules/react-native-mail`) @@ -510,8 +504,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector" react-native-background-timer: :path: "../node_modules/react-native-background-timer" - react-native-camera: - :path: "../node_modules/react-native-camera" + react-native-camera-kit: + :path: "../node_modules/react-native-camera-kit" react-native-cameraroll: :path: "../node_modules/@react-native-community/cameraroll" react-native-image-resizer: @@ -616,7 +610,7 @@ SPEC CHECKSUMS: React-jsiexecutor: 1540d1c01bb493ae3124ed83351b1b6a155db7da React-jsinspector: 512e560d0e985d0e8c479a54a4e5c147a9c83493 react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4 - react-native-camera: 2b74be8edc1103c4c46d1f4e5f41723d9ff052cc + react-native-camera-kit: 498a6d111a904834e0824e9073cfadef7303235f react-native-cameraroll: ac69828fc43b9dbf92149714fd739577d38e4448 react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3 react-native-mail: 7e37dfbe93ff0d4c7df346b738854dbed533e86f diff --git a/nix/deps/gradle/deps.json b/nix/deps/gradle/deps.json index 3af8024e14..79a1cb576c 100644 --- a/nix/deps/gradle/deps.json +++ b/nix/deps/gradle/deps.json @@ -489,20 +489,6 @@ } }, - { - "path": "androidx/exifinterface/exifinterface/1.0.0/exifinterface-1.0.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "33b6860f537daa47cfc3184f6e592b5271a71958", - "sha256": "1czjzcvh9w0xg2702dh725d2vvphvsim77k490pbg2ps76vwq5gf" - }, - "jar": { - "sha1": "1ab12ceadd49f94006e1ec0ea5fa51b701169cd5", - "sha256": "04fcaly958lpy9myzmbr8gpfxf8h3v8pfjy1ykzlxxdqm88bwj7f" - } - }, - { "path": "androidx/exifinterface/exifinterface/1.1.0-beta01/exifinterface-1.1.0-beta01", "host": "https://dl.google.com/dl/android/maven2", @@ -615,20 +601,6 @@ } }, - { - "path": "androidx/legacy/legacy-support-v4/1.0.0/legacy-support-v4-1.0.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "a0c16ebb4d57f6ec356dd8756285537c0d8b67dd", - "sha256": "0n3wza06dp618jbnvjqvi12slx23hxbi7plfjaxz4w7v9h9gp27d" - }, - "jar": { - "sha1": "03e1271b351e1209661b9fd769cd6681a31678fe", - "sha256": "1c40ah2qjrdis0zirbj44p6jfwc52qadab82953qlf0gbx4c3zkq" - } - }, - { "path": "androidx/lifecycle/lifecycle-common/2.0.0/lifecycle-common-2.0.0", "host": "https://dl.google.com/dl/android/maven2", @@ -853,20 +825,6 @@ } }, - { - "path": "androidx/media/media/1.0.0/media-1.0.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "86e15c4ec92837de49486f1ad9827d689a6186d8", - "sha256": "04blvk2wipmqznwd4vynsci8ryvp6rxl1c2gvj2asschhkvybpww" - }, - "jar": { - "sha1": "7f92bbaf670497a9a1105124122fb20cee61e58c", - "sha256": "1vnr1ir0lr673zmxn9vzipl17r1jf4nrirjifi50r1xc5dxm4fxj" - } - }, - { "path": "androidx/multidex/multidex/2.0.1/multidex-2.0.1", "host": "https://dl.google.com/dl/android/maven2", @@ -1441,20 +1399,6 @@ } }, - { - "path": "com/android/support/support-compat/26.1.0/support-compat-26.1.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "fdb7266853fa71155bab2e696e4ace2f44f8dfc3", - "sha256": "0a5rxf00f7p6vj6bj29fsyz0ckgl7d4dllmdlb4k69iql215kqi6" - }, - "jar": { - "sha1": "1e1c8ffc01d277d8f01dfd11d5d2ce3a2af4b98c", - "sha256": "0c60lrf18mksn007ja2cdi05p2aa4w9gq368qq2ifsvnz4fa0vbx" - } - }, - { "path": "com/android/support/support-compat/27.0.1/support-compat-27.0.1", "host": "https://dl.google.com/dl/android/maven2", @@ -1483,20 +1427,6 @@ } }, - { - "path": "com/android/support/support-core-ui/26.1.0/support-core-ui-26.1.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "3b5b814f4fd0cf809db6922009daa2842009c84e", - "sha256": "1l40nk4z2glxy5ql41hzi0j6w7hp5lqlhkbzg643qgap3dcd2g3w" - }, - "jar": { - "sha1": "e306308d54052a1ded7bf9c2f5c2fdf5152a1f22", - "sha256": "1zsmqx7pa9zvkh4ww5hgfnz55avwah3l89pch6l5wcwr2l2kixc2" - } - }, - { "path": "com/android/support/support-core-ui/27.0.1/support-core-ui-27.0.1", "host": "https://dl.google.com/dl/android/maven2", @@ -1525,20 +1455,6 @@ } }, - { - "path": "com/android/support/support-core-utils/26.1.0/support-core-utils-26.1.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "04751a3bb1a065130c1618549318c9a8b0328ab2", - "sha256": "0hs7lvp55n1adg58ch9ycrankkjpi2dvfglxwdw67rpnm7pvf958" - }, - "jar": { - "sha1": "1bfaae21c4d5c5532c5e732071e9ce234cd58cff", - "sha256": "12jw2nshl6na76cgj5dsyjq79wrkhfc5cx5d3lxix5rhni76vnjg" - } - }, - { "path": "com/android/support/support-core-utils/27.0.1/support-core-utils-27.0.1", "host": "https://dl.google.com/dl/android/maven2", @@ -1567,20 +1483,6 @@ } }, - { - "path": "com/android/support/support-fragment/26.1.0/support-fragment-26.1.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "3db6198de6ef0c0178e33fc53a6d873d30d53b79", - "sha256": "0siydfzw5jpjwnmd2xvq94jpnm8bd9nfdfpdqlhmgcljh8sylxq2" - }, - "jar": { - "sha1": "ddacf369bb98dd6558606558de8ddcd53895cf91", - "sha256": "0ckbswlb3zbngicdsr7vxdvi4gznlmih8bv9c28ikzj0xxlk7ax0" - } - }, - { "path": "com/android/support/support-fragment/27.0.1/support-fragment-27.0.1", "host": "https://dl.google.com/dl/android/maven2", @@ -1609,20 +1511,6 @@ } }, - { - "path": "com/android/support/support-media-compat/26.1.0/support-media-compat-26.1.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "f1b57b8b374dcd9878853973d6bb030f2dea610f", - "sha256": "13xcds0ggz2p0kq146wnhfx05m17m5k7ykwghkyrrkpzynrc1bzf" - }, - "jar": { - "sha1": "09fb587f27cde19aa8f2e50c5c9ee645d9aec44d", - "sha256": "12p9lf2p5qj074xkwb6b4nywb5pfymq8w35rvvmj5zqfsiyfx34x" - } - }, - { "path": "com/android/support/support-v4/26.0.2/support-v4-26.0.2", "host": "https://dl.google.com/dl/android/maven2", @@ -1637,20 +1525,6 @@ } }, - { - "path": "com/android/support/support-v4/26.1.0/support-v4-26.1.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "2560ebaad416fb32fc979550b83f47f1e1ad58e4", - "sha256": "0f63cg77zy2m9caahpjcvmwrikqqiyn3znh2n0agc7splpdbybkg" - }, - "jar": { - "sha1": "444114b772e5eee3e66f9236ace4acc1964a33b8", - "sha256": "1jma9hhksh5wqkl4dl677fsprycqf5skp4yb38ir2xxyw5fkin1n" - } - }, - { "path": "com/android/support/support-vector-drawable/26.0.2/support-vector-drawable-26.0.2", "host": "https://dl.google.com/dl/android/maven2", @@ -3485,48 +3359,6 @@ } }, - { - "path": "com/google/android/gms/play-services-auth-base/16.0.0/play-services-auth-base-16.0.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "a739f8e4fab46e152bb57fc8cf3f22da862e7779", - "sha256": "1krqwvy75wavlmpws1x33x671haa5byknb1krbf957m8pmh4g81l" - }, - "jar": { - "sha1": "6691446e870b1fa8e5bb0a8742aa00d129d68b18", - "sha256": "1l7c09hdvd2wkn8jwxaxymyyy4kc5kgw8ljvggzrs7cd5ynh5p2i" - } - }, - - { - "path": "com/google/android/gms/play-services-basement/16.0.1/play-services-basement-16.0.1", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "324f657b74d96b21711a95ea726bdbb9600779c3", - "sha256": "0him0zl0mrnpii96l12s80f418n3k61y2w23yyg7ggxk8441v053" - }, - "jar": { - "sha1": "924c32f9c032821afc94dec82c0f40e81310f67e", - "sha256": "1in7hwcflqmy9bx3msvy6rsvkbkkp1varmv1c7vhxrf4hwggv2z0" - } - }, - - { - "path": "com/google/android/gms/play-services-basement/16.1.0/play-services-basement-16.1.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "6ad4d4111a91644babdf987c684a8434c3c29516", - "sha256": "0ancmw7r77yq4kjdsyzxcan688l3s7s179p59qa0lb0zv4s5fqav" - }, - "jar": { - "sha1": "4e03a61a346ae963fe1856938e62c1b810de37ad", - "sha256": "02vw1w69f459y1ssslvz2zsamhl1f2xlf8i7ih9n5zf28cjklfac" - } - }, - { "path": "com/google/android/gms/play-services-basement/17.0.0/play-services-basement-17.0.0", "host": "https://dl.google.com/dl/android/maven2", @@ -3541,20 +3373,6 @@ } }, - { - "path": "com/google/android/gms/play-services-base/16.0.1/play-services-base-16.0.1", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "17575b11d629d81dfca742c2e9842edf16f5099d", - "sha256": "0ch5wvjy5jr74z756qn01w9irfz9bxs2j38qvrgvdlf42x1klrhy" - }, - "jar": { - "sha1": "8f06f2d24b1f01db76a0a226b544d0dd7937b32e", - "sha256": "0nv5fkv8zzsn6454qmiw279sv2xq997p61nvyd8bq69j1iw0r8dc" - } - }, - { "path": "com/google/android/gms/play-services-base/17.0.0/play-services-base-17.0.0", "host": "https://dl.google.com/dl/android/maven2", @@ -3569,34 +3387,6 @@ } }, - { - "path": "com/google/android/gms/play-services-clearcut/16.0.0/play-services-clearcut-16.0.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "e1d672e2ed3b7fc6a94fdc9316b3c5fa345fdc1d", - "sha256": "0s76r4v1sz1cribx2703iycy1lb19rhd0wbnfajwpn71k998bdlv" - }, - "jar": { - "sha1": "3ef3f2f12bffd8c7d314b9358d02830e47eed81d", - "sha256": "0lmbda8pbg65a6d7pdl4r9mj2nhk4dx81qzj6bbw7dv0xikirf4c" - } - }, - - { - "path": "com/google/android/gms/play-services-flags/16.0.1/play-services-flags-16.0.1", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "f4f29bc9b759e0cc72a8d8ab1af80d030b153d1d", - "sha256": "05vxl4a5jyac3nzz17gjh0awbmxw6hmghln6mll46d4r2x15ywki" - }, - "jar": { - "sha1": "40ec115409a56b9f60e947f8c226240449bcdd8f", - "sha256": "1cxvdhd8jj049i3p42hf1yy7dzb0pwxlzihs20wk9d3dn6bfj5k6" - } - }, - { "path": "com/google/android/gms/play-services-iid/17.0.0/play-services-iid-17.0.0", "host": "https://dl.google.com/dl/android/maven2", @@ -3611,34 +3401,6 @@ } }, - { - "path": "com/google/android/gms/play-services-phenotype/16.0.0/play-services-phenotype-16.0.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "25608ee8ddbf259b091bf7f6751ff1e4b8632f6b", - "sha256": "0h39cjak599spvk4fqh12d9bjcvwrd9q1niyvhrxkj40fxa6zj3d" - }, - "jar": { - "sha1": "693386367b6e26f757a92702458bc9fa018f2c27", - "sha256": "0mb17dyxgkpsqmrjgvma5yldvg2nl4yb68axyvp7plr57qdm34pk" - } - }, - - { - "path": "com/google/android/gms/play-services-stats/16.0.1/play-services-stats-16.0.1", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "7da66fe8b1e0b73d416974aa84078b59c90cd052", - "sha256": "11bbyhz2613yvx3063qi9vkcpp9w430jmx377y6v8fi7501q2fc3" - }, - "jar": { - "sha1": "0d5ca5898019c0913d163dbfeaa42b77b148716c", - "sha256": "0s339i6szxbkascrgczv9nlcj3x8ksmlpjcm496ygmmzmn0q4bav" - } - }, - { "path": "com/google/android/gms/play-services-stats/17.0.0/play-services-stats-17.0.0", "host": "https://dl.google.com/dl/android/maven2", @@ -3653,20 +3415,6 @@ } }, - { - "path": "com/google/android/gms/play-services-tasks/16.0.1/play-services-tasks-16.0.1", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "9d2270f8d3cc0cca2c73f9b0a0ce7bc43c88fce4", - "sha256": "0jhyccxf9qmqcqlqlvdakfy20zpbdfllvyqlqfp1q3cgachgivd0" - }, - "jar": { - "sha1": "565e6572641c926a370f1eaa1e0b963172ef8516", - "sha256": "0dawyg2bxwpq2k509navp9qg6cqk8wsp9vlmy8a9i3fcs7c1h75k" - } - }, - { "path": "com/google/android/gms/play-services-tasks/17.0.0/play-services-tasks-17.0.0", "host": "https://dl.google.com/dl/android/maven2", @@ -3681,48 +3429,6 @@ } }, - { - "path": "com/google/android/gms/play-services-vision-common/17.0.2/play-services-vision-common-17.0.2", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "f0cc3db5eb49a5f98bb7209826b4f29572cbf8e2", - "sha256": "1aq8895hk008qmjy7i1q4nlvlcppp5jp4qbvp52xv04aklpsr5i6" - }, - "jar": { - "sha1": "af8adbde98349556338665902b9f9a6ea1cda060", - "sha256": "1zr5v07yalsxb3w21629zjxxpr2ilc4mbdynnap30fad84nj83sa" - } - }, - - { - "path": "com/google/android/gms/play-services-vision-image-label/17.0.2/play-services-vision-image-label-17.0.2", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "3bd99765abe7798a8314e184281abe4e23115a81", - "sha256": "11xw45hn49qlcgxi692q39wg7zwrxscp7753armsf6sv4fdsi0zf" - }, - "jar": { - "sha1": "2ce482bc7183983bc8a83197bc20025975304dd8", - "sha256": "1plc8lhiiyg2w9p53nk9mrl9qxrn4z11jsja9kjbmvssxqacrl6f" - } - }, - - { - "path": "com/google/android/gms/play-services-vision/17.0.2/play-services-vision-17.0.2", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "14847cde7015ebec0864910b2c2775dbab55aa6e", - "sha256": "0ca4lwbjrm2mgkwn6kjxy2cbvx7fxhbzc6zw9bsn4qdvcfyyq513" - }, - "jar": { - "sha1": "9c21f12498ca761c62fcc22ac4a1efab9538fd09", - "sha256": "01xqv2zdy2if0fm28l2kfj86dyj1adq977nvhy8v0kzscvxgv0d0" - } - }, - { "path": "com/google/android/material/material/1.1.0/material-1.1.0", "host": "https://dl.google.com/dl/android/maven2", @@ -3737,90 +3443,6 @@ } }, - { - "path": "com/google/firebase/firebase-common/16.0.3/firebase-common-16.0.3", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "f1196f0fb6daa1f39e506a11b1f563ef96e81021", - "sha256": "0s7vzygbsdzxzwdzqdmy1jcc5fjylmg9qy8rgazwqrv5g7vsd2rw" - }, - "jar": { - "sha1": "2060ba8e8e30dd53553b8f78e123cd2de9d78420", - "sha256": "1kwvfllkiqid86rfy6nswrvp4msh43dfmkcsbwg5an7pqvabzdix" - } - }, - - { - "path": "com/google/firebase/firebase-iid-interop/16.0.1/firebase-iid-interop-16.0.1", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "f794ecf0c507aaddf71562424fb4086cca8374a6", - "sha256": "0jzq9ad0x1garp2c84vw89jyyyra4mkg3fc9lfa3qllpxldn8rw1" - }, - "jar": { - "sha1": "8707ad5e1fdd9182313a5eb5edd16e1a839cdd75", - "sha256": "0fv9g5zcw55pwjl3cq79alb320sqx14x41lj44v4iza6jcmk51ia" - } - }, - - { - "path": "com/google/firebase/firebase-iid/17.0.3/firebase-iid-17.0.3", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "67c552bcd0eee63f1c76f95fc6635f9b1fc5daa0", - "sha256": "151s4k7zb6dav84hlv61qd4g6af16wfk5d8s08514rqyrwrkyxil" - }, - "jar": { - "sha1": "228c141bcd3e51ffbb303761fc201ed1f7498753", - "sha256": "1x68iqzz3hfbf1zj66nn4vm2s875l601qc05v2js3cg399va9a8d" - } - }, - - { - "path": "com/google/firebase/firebase-ml-common/17.0.0/firebase-ml-common-17.0.0", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "6696102710812b9aae3b3286241bc287bfb5f0b1", - "sha256": "1wjrszq2mhgl14z9liwkv860d6f8n219d5r66s9a2rg0pv5hn9d2" - }, - "jar": { - "sha1": "dd9742016d701006d00944d6e2995e910b2595ab", - "sha256": "0aakwxcmrzcq072mykqshyak6a9q0qaxncbc24djsj9qian5c1b1" - } - }, - - { - "path": "com/google/firebase/firebase-ml-vision-face-model/17.0.2/firebase-ml-vision-face-model-17.0.2", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "e1fd7a8b87a80bba683bd330cec6dccb482ae698", - "sha256": "1fbbi5n1rwwqwvfj4l136lfa3k5gwp5cgz5m53139v1abjcdy90k" - }, - "jar": { - "sha1": "f9a04dd345be0b81433d0dc4672d3b80bda0a15a", - "sha256": "1y6lbp06fa9c3y86ndh1i6p1fx7s53zfvfyv2cmay5l3myjcjw9j" - } - }, - - { - "path": "com/google/firebase/firebase-ml-vision/19.0.3/firebase-ml-vision-19.0.3", - "host": "https://dl.google.com/dl/android/maven2", - "type": "aar", - "pom": { - "sha1": "8ee670031b99c6c94194802ac6fbe03837e55942", - "sha256": "0mispjmcxcvxg8vzaz5jl3lmr7i176k7n7b74xpbs0h3gxyf3vnn" - }, - "jar": { - "sha1": "53dffc1401dc7d4e5e6c87a6de7ce0984d1274b1", - "sha256": "1ilcsaxm054bb41mm5rgrnx6yhs9w97im6vbbnlkz31xa4b52k8z" - } - }, - { "path": "com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0", "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", @@ -4102,16 +3724,16 @@ }, { - "path": "com/adobe/xmp/xmpcore/5.1.3/xmpcore-5.1.3", + "path": "com/adobe/xmp/xmpcore/5.1.2/xmpcore-5.1.2", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "06d606b34c939189aefbd001cd00f41cc658e295", - "sha256": "08xli45zrpx444hqa3fkf0widijgwwzfanh76h819gks5758pc38" + "sha1": "5f77687c678a0a6d8bfa82bb6f2ef708f084ba00", + "sha256": "1a2wfrwqchrks835jd8fnq4nypb9vi550lyrmarl55xyy0g2xsfc" }, "jar": { - "sha1": "57e70c3b10ff269fff9adfa7a31d61af0df30757", - "sha256": "1ajx4vmp67pqxk1dr7azbv5s6w4314n4p80c1ysyn575y43yj6w2" + "sha1": "55615fa2582424e38705487d1d3969af8554f637", + "sha256": "143h5138azr3h5lb7aaiqxlj22l95p6arxiqp63hmzxa0cqddp0a" } }, @@ -4886,16 +4508,16 @@ }, { - "path": "com/drewnoakes/metadata-extractor/2.11.0/metadata-extractor-2.11.0", + "path": "com/drewnoakes/metadata-extractor/2.9.1/metadata-extractor-2.9.1", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "6b5149ad79090d37071b6490ca8085f89b81ac86", - "sha256": "1207aza23zwnxsrbxj9knd2v049ia6yr58f0nbr6rcafz2vm2kh6" + "sha1": "d2c2b713b72d2382621c74c16464018c334df65c", + "sha256": "00bab2fd9pzih049k13lgb3s6c6w0y8963p8n6fgn8gndgbzqdlr" }, "jar": { - "sha1": "5f11883f6d06a16ca5fb8a9edf7c6c1237a92da0", - "sha256": "1xqd9maxnnm8wr1q03hcc86wc8jxxjyp7np235qgvyqsn335dv7m" + "sha1": "53fdf22be10c9d426ec63431c7342895bc642261", + "sha256": "095hy0qphcjgxpl67ifa5sc3799hn1kzvn31qabaqnjyi9b84wsd" } }, @@ -5946,26 +5568,26 @@ }, { - "path": "com/google/zxing/core/3.3.3/core-3.3.3", + "path": "com/google/zxing/core/3.3.0/core-3.3.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "3fc07a37b124d3f9e134854b4c7bf7dc120bcae7", - "sha256": "0d79wvchvfbncjhla3xfhzgkwam8fs54s20pkw24i3hrjjmggnm8" + "sha1": "1ddcd08882c0da8e917d92087e5651e234b5c79f", + "sha256": "1gxa83cz49p03jbgcps7s8k4pahqph91qc7sb973sxs89163w76a" }, "jar": { - "sha1": "b640badcc97f18867c4dfd249ef8d20ec0204c07", - "sha256": "1685yb9xdh13bi697km6n0q2jp95svi22rih541wwjryjhggh82q" + "sha1": "73c49077166faa4c3c0059c5f583d1d7bd1475fe", + "sha256": "03gf24zsjkvaq75pxypmbh6lpqp87q9pgbqkhb1wx5x9097759xv" } }, { - "path": "com/google/zxing/zxing-parent/3.3.3/zxing-parent-3.3.3", + "path": "com/google/zxing/zxing-parent/3.3.0/zxing-parent-3.3.0", "host": "https://repo.maven.apache.org/maven2", "type": "pom", "pom": { - "sha1": "04a296fa43c718f9c67efccf4201b6c08f9cbea7", - "sha256": "0i6lzbd3qiav0c05317h7kfd89g7iw9wjl1msnbrxmh5d1xibm2n" + "sha1": "c69d8576d8ec725cd091d25cbae2f276d44667db", + "sha256": "1xhzxlwgdxmgmjs792vg0vkva6mhy3h2cgcqyv28mxl42sr52sbw" } }, @@ -6054,16 +5676,16 @@ }, { - "path": "com/squareup/okhttp3/okhttp/4.8.0/okhttp-4.8.0", + "path": "com/squareup/okhttp3/okhttp/4.8.1/okhttp-4.8.1", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "91ea03c0fc8232da16e047141260d223bf58d4a7", - "sha256": "15rmf7w2pcqmqvz8fwxbnp6fg3570r7xsyvg0bm5h87ax3c8qakk" + "sha1": "06674a5ab0fe82b134a2fe02a18ccf9c51e9a0b2", + "sha256": "08dyq3vxk27na7d5g3p100vi5ihplf6ylrsyibg7lzfc4sxdawmc" }, "jar": { - "sha1": "5c34a8c35bb3fd5ec39d3a67ceae691d0f3eb455", - "sha256": "168mvl4jhrb5vid1lw2r612j4ydsz3r2qznr0jahav91qma85mh4" + "sha1": "dd36d61fbfa0a33c805e3d92f64e0832234c56c6", + "sha256": "1scg21n0a41rhv2n4crx62kmfl5yavj45hgl97acw3c7kccgaggi" } }, @@ -7736,16 +7358,16 @@ }, { - "path": "org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0", + "path": "org/checkerframework/checker-qual/3.6.0/checker-qual-3.6.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "408a4451ff5bdef60400a49657867db100ea0f83", - "sha256": "08apndxq787glqdn6r0734nizck7qw7yd4imh2hk3nwflywb6di8" + "sha1": "cc9a54c245d87d07533a5534ec607d88a66ea82a", + "sha256": "16hhzdvv7jlwzvfjaf5f2l4b7n0lbwnwgkbfhx3i6r7zgpw320yl" }, "jar": { - "sha1": "2f50520c8abea66fbd8d26e481d3aef5c673b510", - "sha256": "19556pzrqcwwmavx3yrbnm6b9kcbjnv3cf2pq9pn15cay6rr16bj" + "sha1": "b39405a5894b39073ad0e70671edd39b673e259a", + "sha256": "0c751lskwkdkkl9ch6scfcxim2sn0knl6mmwzskfq2dpdb4djkrv" } }, diff --git a/nix/deps/gradle/deps.list b/nix/deps/gradle/deps.list index f33780c971..17cca30c66 100644 --- a/nix/deps/gradle/deps.list +++ b/nix/deps/gradle/deps.list @@ -27,7 +27,6 @@ androidx.databinding:databinding-compiler-common:3.3.1 androidx.databinding:databinding-compiler-common:3.5.3 androidx.documentfile:documentfile:1.0.0 androidx.drawerlayout:drawerlayout:1.0.0 -androidx.exifinterface:exifinterface:1.0.0 androidx.exifinterface:exifinterface:1.1.0-beta01 androidx.exifinterface:exifinterface:1.1.0-rc01 androidx.fragment:fragment:1.0.0 @@ -36,7 +35,6 @@ androidx.fragment:fragment:1.2.1 androidx.interpolator:interpolator:1.0.0 androidx.legacy:legacy-support-core-ui:1.0.0 androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.legacy:legacy-support-v4:1.0.0 androidx.lifecycle:lifecycle-common:2.0.0 androidx.lifecycle:lifecycle-common:2.1.0 androidx.lifecycle:lifecycle-common:2.2.0 @@ -52,7 +50,6 @@ androidx.lifecycle:lifecycle-viewmodel:2.1.0 androidx.lifecycle:lifecycle-viewmodel:2.2.0 androidx.loader:loader:1.0.0 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.media:media:1.0.0 androidx.multidex:multidex:2.0.1 androidx.print:print:1.0.0 androidx.recyclerview:recyclerview:1.0.0 @@ -79,7 +76,7 @@ commons-codec:commons-codec:1.10 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.3 +com.adobe.xmp:xmpcore:5.1.2 com.afollestad.material-dialogs:commons:0.9.6.0 com.afollestad.material-dialogs:core:0.9.6.0 com.android.databinding:baseLibrary:1.0-rc5 @@ -274,7 +271,7 @@ com.android.tools:sdk-common:26.0.1 com.android.tools:sdk-common:26.2.1 com.android.tools:sdk-common:26.3.1 com.android.tools:sdk-common:26.5.3 -com.drewnoakes:metadata-extractor:2.11.0 +com.drewnoakes:metadata-extractor:2.9.1 com.facebook.conceal:conceal:1.1.3 com.facebook.fbjni:fbjni-java-only:0.0.3 com.facebook.flipper:flipper-fresco-plugin:0.35.0 @@ -306,22 +303,11 @@ com.github.status-im:function:0.0.1 com.github.yalantis:ucrop:2.2.5-native com.googlecode.json-simple:json-simple:1.1 com.googlecode.juniversalchardet:juniversalchardet:1.0.3 -com.google.android.gms:play-services-auth-base:16.0.0 -com.google.android.gms:play-services-basement:16.1.0 com.google.android.gms:play-services-basement:17.0.0 -com.google.android.gms:play-services-base:16.0.1 com.google.android.gms:play-services-base:17.0.0 -com.google.android.gms:play-services-clearcut:16.0.0 -com.google.android.gms:play-services-flags:16.0.1 com.google.android.gms:play-services-iid:17.0.0 -com.google.android.gms:play-services-phenotype:16.0.0 -com.google.android.gms:play-services-stats:16.0.1 com.google.android.gms:play-services-stats:17.0.0 -com.google.android.gms:play-services-tasks:16.0.1 com.google.android.gms:play-services-tasks:17.0.0 -com.google.android.gms:play-services-vision-common:17.0.2 -com.google.android.gms:play-services-vision-image-label:17.0.2 -com.google.android.gms:play-services-vision:17.0.2 com.google.android.material:material:1.1.0 com.google.auto.value:auto-value:1.5.2 com.google.code.findbugs:jsr305:1.3.9 @@ -333,12 +319,6 @@ com.google.code.gson:gson:2.8.5 com.google.errorprone:error_prone_annotations:2.0.18 com.google.errorprone:error_prone_annotations:2.2.0 com.google.errorprone:error_prone_annotations:2.3.1 -com.google.firebase:firebase-common:16.0.3 -com.google.firebase:firebase-iid-interop:16.0.1 -com.google.firebase:firebase-iid:17.0.3 -com.google.firebase:firebase-ml-common:17.0.0 -com.google.firebase:firebase-ml-vision-face-model:17.0.2 -com.google.firebase:firebase-ml-vision:19.0.3 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:17.0 com.google.guava:guava:22.0 @@ -351,7 +331,7 @@ com.google.jimfs:jimfs:1.1 com.google.protobuf:protobuf-java-util:3.4.0 com.google.protobuf:protobuf-java:3.0.0 com.google.protobuf:protobuf-java:3.4.0 -com.google.zxing:core:3.3.3 +com.google.zxing:core:3.3.0 com.intellij:annotations:12.0 com.parse.bolts:bolts-tasks:1.4.0 com.squareup.okhttp3:okhttp-urlconnection:3.12.1 diff --git a/nix/deps/gradle/deps.urls b/nix/deps/gradle/deps.urls index 73ced39c7f..e48e0a496a 100644 --- a/nix/deps/gradle/deps.urls +++ b/nix/deps/gradle/deps.urls @@ -33,7 +33,6 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compile https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.3/databinding-compiler-common-3.5.3.pom https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0/documentfile-1.0.0.pom 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/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/fragment/fragment/1.0.0/fragment-1.0.0.pom @@ -42,7 +41,6 @@ https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.1/fragmen https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-ui/1.0.0/legacy-support-core-ui-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-utils/1.0.0/legacy-support-core-utils-1.0.0.pom -https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-v4/1.0.0/legacy-support-v4-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.0.0/lifecycle-common-2.0.0.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0.pom https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.2.0/lifecycle-common-2.2.0.pom @@ -59,7 +57,6 @@ https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.2.0/lifecycle-viewmodel-2.2.0.pom https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/localbroadcastmanager/localbroadcastmanager/1.0.0/localbroadcastmanager-1.0.0.pom -https://dl.google.com/dl/android/maven2/androidx/media/media/1.0.0/media-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/multidex/multidex/2.0.1/multidex-2.0.1.pom https://dl.google.com/dl/android/maven2/androidx/print/print/1.0.0/print-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.0.0/recyclerview-1.0.0.pom @@ -101,21 +98,15 @@ https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/ https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/26.1.0/support-annotations-26.1.0.pom https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/27.0.1/support-annotations-27.0.1.pom https://dl.google.com/dl/android/maven2/com/android/support/support-compat/26.0.2/support-compat-26.0.2.pom -https://dl.google.com/dl/android/maven2/com/android/support/support-compat/26.1.0/support-compat-26.1.0.pom https://dl.google.com/dl/android/maven2/com/android/support/support-compat/27.0.1/support-compat-27.0.1.pom https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui/26.0.2/support-core-ui-26.0.2.pom -https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui/26.1.0/support-core-ui-26.1.0.pom https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui/27.0.1/support-core-ui-27.0.1.pom https://dl.google.com/dl/android/maven2/com/android/support/support-core-utils/26.0.2/support-core-utils-26.0.2.pom -https://dl.google.com/dl/android/maven2/com/android/support/support-core-utils/26.1.0/support-core-utils-26.1.0.pom https://dl.google.com/dl/android/maven2/com/android/support/support-core-utils/27.0.1/support-core-utils-27.0.1.pom https://dl.google.com/dl/android/maven2/com/android/support/support-fragment/26.0.2/support-fragment-26.0.2.pom -https://dl.google.com/dl/android/maven2/com/android/support/support-fragment/26.1.0/support-fragment-26.1.0.pom https://dl.google.com/dl/android/maven2/com/android/support/support-fragment/27.0.1/support-fragment-27.0.1.pom https://dl.google.com/dl/android/maven2/com/android/support/support-media-compat/26.0.2/support-media-compat-26.0.2.pom -https://dl.google.com/dl/android/maven2/com/android/support/support-media-compat/26.1.0/support-media-compat-26.1.0.pom https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.0.2/support-v4-26.0.2.pom -https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.1.0/support-v4-26.1.0.pom https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/26.0.2/support-vector-drawable-26.0.2.pom https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/27.0.1/support-vector-drawable-27.0.1.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.2.1/crash-26.2.1.pom @@ -247,30 +238,12 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk- https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.3.1/sdk-common-26.3.1.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.3/sdk-common-26.5.3.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-auth-base/16.0.0/play-services-auth-base-16.0.0.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/16.0.1/play-services-basement-16.0.1.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/16.1.0/play-services-basement-16.1.0.pom https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/17.0.0/play-services-basement-17.0.0.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/16.0.1/play-services-base-16.0.1.pom https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/17.0.0/play-services-base-17.0.0.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-clearcut/16.0.0/play-services-clearcut-16.0.0.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-flags/16.0.1/play-services-flags-16.0.1.pom https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-iid/17.0.0/play-services-iid-17.0.0.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-phenotype/16.0.0/play-services-phenotype-16.0.0.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-stats/16.0.1/play-services-stats-16.0.1.pom https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-stats/17.0.0/play-services-stats-17.0.0.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/16.0.1/play-services-tasks-16.0.1.pom https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/17.0.0/play-services-tasks-17.0.0.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-vision-common/17.0.2/play-services-vision-common-17.0.2.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-vision-image-label/17.0.2/play-services-vision-image-label-17.0.2.pom -https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-vision/17.0.2/play-services-vision-17.0.2.pom https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.1.0/material-1.1.0.pom -https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/16.0.3/firebase-common-16.0.3.pom -https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid-interop/16.0.1/firebase-iid-interop-16.0.1.pom -https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid/17.0.3/firebase-iid-17.0.3.pom -https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-ml-common/17.0.0/firebase-ml-common-17.0.0.pom -https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-ml-vision-face-model/17.0.2/firebase-ml-vision-face-model-17.0.2.pom -https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-ml-vision/19.0.3/firebase-ml-vision-19.0.3.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fbjni/fbjni-java-only/0.0.3/fbjni-java-only-0.0.3.pom @@ -291,7 +264,7 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.14/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.3/xmpcore-5.1.3.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/android/databinding/baseLibrary/1.0-rc5/baseLibrary-1.0-rc5.pom https://repo.maven.apache.org/maven2/com/android/databinding/compilerCommon/1.0-rc5/compilerCommon-1.0-rc5.pom https://repo.maven.apache.org/maven2/com/android/tools/annotations/24.1.3/annotations-24.1.3.pom @@ -347,7 +320,7 @@ https://repo.maven.apache.org/maven2/com/android/tools/sdklib/24.5.0/sdklib-24.5 https://repo.maven.apache.org/maven2/com/android/tools/sdk-common/24.1.3/sdk-common-24.1.3.pom https://repo.maven.apache.org/maven2/com/android/tools/sdk-common/24.3.1/sdk-common-24.3.1.pom https://repo.maven.apache.org/maven2/com/android/tools/sdk-common/24.5.0/sdk-common-24.5.0.pom -https://repo.maven.apache.org/maven2/com/drewnoakes/metadata-extractor/2.11.0/metadata-extractor-2.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/facebook/conceal/conceal/1.1.3/conceal-1.1.3.pom https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni/0.0.2/fbjni-0.0.2.pom https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-base/2.0.0/animated-base-2.0.0.pom @@ -429,15 +402,15 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/p 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.0.1/truth-parent-1.0.1.pom https://repo.maven.apache.org/maven2/com/google/truth/truth/1.0.1/truth-1.0.1.pom -https://repo.maven.apache.org/maven2/com/google/zxing/core/3.3.3/core-3.3.3.pom -https://repo.maven.apache.org/maven2/com/google/zxing/zxing-parent/3.3.3/zxing-parent-3.3.3.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-tasks/1.4.0/bolts-tasks-1.4.0.pom https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.pom https://repo.maven.apache.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3.12.1/okhttp-urlconnection-3.12.1.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.pom -https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.8.0/okhttp-4.8.0.pom +https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.8.1/okhttp-4.8.1.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.pom @@ -576,7 +549,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.pom https://repo.maven.apache.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.pom https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom -https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom +https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.6.0/checker-qual-3.6.0.pom https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom diff --git a/nix/deps/gradle/proj.list b/nix/deps/gradle/proj.list index 0a84983821..cdbb6bb464 100644 --- a/nix/deps/gradle/proj.list +++ b/nix/deps/gradle/proj.list @@ -1,6 +1,6 @@ app react-native-background-timer -react-native-camera +react-native-camera-kit react-native-community_async-storage react-native-community_audio-toolkit react-native-community_cameraroll diff --git a/package.json b/package.json index 5188af8e71..3864419df4 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "react-dom": "^16.4.2", "react-native": "0.62.2", "react-native-background-timer": "^2.1.1", - "react-native-camera": "^3.3.3", + "react-native-camera-kit": "^8.0.4", "react-native-config": "git+https://github.com/status-im/react-native-config.git#v0.11.2-3-status", "react-native-dark-mode": "^0.2.2", "react-native-device-info": "^5.6.1", diff --git a/src/status_im/ui/components/camera.cljs b/src/status_im/ui/components/camera.cljs index f8c10bcea6..824f3d5c41 100644 --- a/src/status_im/ui/components/camera.cljs +++ b/src/status_im/ui/components/camera.cljs @@ -1,44 +1,10 @@ (ns status-im.ui.components.camera - (:require [goog.object :as object] - [reagent.core :as reagent] + (:require [reagent.core :as reagent] [clojure.string :as string] - [clojure.walk :as walk] - [oops.core :refer [oget]] - ["react-native-camera" :refer (RNCamera)])) + ["react-native-camera-kit" :refer (CameraKitCamera)])) -(defn- constants [t] - (-> RNCamera - (object/get "Constants") - (object/get t) - (js->clj) - (walk/keywordize-keys))) +(def camera (reagent/adapt-react-class CameraKitCamera)) -(def aspects (constants "Orientation")) -(def capture-targets (constants "CaptureTarget")) -(def torch-modes (constants "FlashMode")) - -(defn set-torch [state] - (set! (.-flashMode RNCamera) (get torch-modes state))) - -(defn request-access-ios [then else] - (-> (.checkVideoAuthorizationStatus RNCamera) - (.then (fn [allowed?] (if allowed? (then) (else)))) - (.catch else))) - -(def camera (reagent/adapt-react-class RNCamera)) - -(defn get-qr-code-data [^js code] - (when-let [data (.-data code)] - (string/trim data))) - -(defn on-layout [layout] - (fn [evt] - (reset! layout {:width (oget evt "nativeEvent" "layout" "width") - :height (oget evt "nativeEvent" "layout" "height")}))) - -(defn on-tap [camera-ref layout focus-object] - (fn [coord] - (when (and @camera-ref (:width @layout)) - (let [{:keys [width height]} @layout - {:keys [x y]} (js->clj coord :keywordize-keys true)] - (reset! focus-object (clj->js {:x (/ x width) :y (/ y height) :autoExposure true})))))) \ No newline at end of file +(defn get-qr-code-data [^js event] + (when-let [data (-> event .-nativeEvent .-codeStringValue)] + (string/trim data))) \ No newline at end of file diff --git a/src/status_im/ui/screens/qr_scanner/views.cljs b/src/status_im/ui/screens/qr_scanner/views.cljs index 362a1864f6..804479fe3f 100644 --- a/src/status_im/ui/screens/qr_scanner/views.cljs +++ b/src/status_im/ui/screens/qr_scanner/views.cljs @@ -10,7 +10,6 @@ [status-im.ui.components.colors :as colors] [status-im.utils.config :as config] [quo.core :as quo] - [reagent.core :as reagent] [quo.components.safe-area :as safe-area])) (defn- topbar [_ {:keys [title] :as opts}] @@ -66,30 +65,26 @@ (re-frame/dispatch [:qr-scanner.callback/scan-qr-code-success opts (camera/get-qr-code-data data)])) (defview qr-scanner [] - (letsubs [read-once? (atom false) + (letsubs [read-once? (atom false) {:keys [height width]} [:dimensions/window] camera-flashlight [:wallet.send/camera-flashlight] - opts [:get-screen-params] - camera-ref (atom nil) - focus-object (reagent/atom nil) - layout (atom nil)] + opts [:get-screen-params] + camera-ref (atom nil)] (if config/qr-test-menu-enabled? [qr-test-view opts] [safe-area/consumer (fn [insets] - [react/view {:flex 1 :background-color colors/black-persist + [react/view {:flex 1 :background-color colors/black-persist :padding-top (:top insets) :padding-bottom (:bottom insets)} [topbar camera-flashlight opts] [react/with-activity-indicator {} [camera/camera - {:ref #(reset! camera-ref %) - :style {:flex 1} - :capture-audio false - :on-layout (camera/on-layout layout) - :auto-focus-point-of-interest @focus-object - :on-tap (camera/on-tap camera-ref layout focus-object) - :on-bar-code-read #(when-not @read-once? - (reset! read-once? true) - (on-barcode-read opts %))}]] - [viewfinder (int (* 2 (/ (min height width) 3)))]])]))) + {: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 %))}]] + [viewfinder (int (* 2 (/ (min height width) 3)))]])]))) \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index b4f10087cb..be5d4d9121 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5100,6 +5100,11 @@ lodash@^3.10.0: resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y= +lodash@^4.14.2: + version "4.17.19" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" + integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.3.0: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" @@ -6508,12 +6513,12 @@ react-native-background-timer@^2.1.1: resolved "https://registry.yarnpkg.com/react-native-background-timer/-/react-native-background-timer-2.2.0.tgz#ff82d30899209b924983cc00e6ce174b8de5054a" integrity sha512-Y7N6diSFko/FCJPMmB0PoBlmY1kEcma7qDVwn8t7zi12GLqpe/Vwls97onkSD8/QL+BR33BygUHOrLTPwgeKfg== -react-native-camera@^3.3.3: - version "3.26.0" - resolved "https://registry.yarnpkg.com/react-native-camera/-/react-native-camera-3.26.0.tgz#80f37124c524d76ae79f55f3975ed73b6515aa49" - integrity sha512-W/h89LN+jujlzc89nWpvukbfnbFO+Fskf6PR23pP6zminpJDIArHabWLd1mQoJ3p6r+gUJ8I4bgsxUmSMgLAgA== +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== dependencies: - prop-types "^15.6.2" + lodash "^4.14.2" "react-native-config@git+https://github.com/status-im/react-native-config.git#v0.11.2-3-status": version "0.11.2"