Camera fixes

status-im · Sep 2, 2019 · fd0dfeb · fd0dfeb
1 parent debce38
commit fd0dfeb
Show file tree

Hide file tree

Showing 9 changed files with 414 additions and 779 deletions.
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -21,7 +21,7 @@
 # $keytool -genkey -v -keystore ./status-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias status
 
 # Version requirements used throughout the Gradle scripts
-minSdkVersion=18
+minSdkVersion=23
 compileSdkVersion=28
 targetSdkVersion=28
 buildToolsVersion=28.0.3

diff --git a/externs.js b/externs.js
@@ -487,6 +487,7 @@ var TopLevel = {
     "SyncInstallation" : function () {},
     "SyncInstallationHandler" : function () {},
     "t" : function () {},
+    "takePictureAsync" : function () {},
     "Text" : function () {},
     "text" : function () {},
     "TextEncoder" : function () {},

diff --git a/mobile_files/package.json.orig b/mobile_files/package.json.orig
@@ -32,7 +32,7 @@
     "react-dom": "16.4.2",
     "react-native": "0.60.5",
     "react-native-background-timer": "2.1.0-alpha.6",
-    "react-native-camera": "3.0.1",
+    "react-native-camera": "3.3.0",
     "react-native-config": "git+https://github.com/status-im/react-native-config.git#0.11.2-1",
     "react-native-crypto": "2.1.1",
     "react-native-dialogs": "1.0.4",
@@ -58,7 +58,8 @@
     "react-native-svg-transformer": "^0.12.1",
     "react-native-touch-id": "^4.4.1",
     "react-native-udp": "2.6.1",
-    "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#community-webview",
+    "react-native-webview": "^6.11.1",
+    "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#fix/community-webview",
     "react-navigation": "^3.11.0",
     "string_decoder": "0.10.31",
     "text-encoding": "^0.6.4",

diff --git a/mobile_files/yarn.lock b/mobile_files/yarn.lock
diff --git a/react-native/src/mobile/status_im/react_native/js_dependencies.cljs b/react-native/src/mobile/status_im/react_native/js_dependencies.cljs
@@ -4,7 +4,7 @@
 (defn fs []                 (js/require "react-native-fs"))
 (defn http-bridge []        (js/require "react-native-http-bridge"))
 (defn keychain []           (js/require "react-native-keychain"))
-(def qr-code                (js-require/js-require "qrcode"))
+(def qr-code                (js/require "qrcode"))
 (def react-native           (js/require "react-native"))
 (defn status-keycard []     (js/require "react-native-status-keycard"))
 (defn webview-bridge []     (js/require "react-native-webview-bridge"))

diff --git a/src/status_im/ui/components/camera.cljs b/src/status_im/ui/components/camera.cljs
@@ -6,19 +6,19 @@
 
 (defn default-camera [] (.-RNCamera (js-dependencies/camera)))
 
-; (defn constants [t]
-;   (-> (default-camera)
-;       (object/get "Constants")
-;       (object/get t)
-;       (js->clj)
-;       (walk/keywordize-keys)))
+(defn constants [t]
+  (-> (default-camera)
+      (object/get "Constants")
+      (object/get t)
+      (js->clj)
+      (walk/keywordize-keys)))
 
-; (def aspects (constants "Orientation"))
-; (def capture-targets (constants "CaptureTarget"))
-;(def torch-modes (constants "FlashMode"))
+(def aspects (constants "Orientation"))
+(def capture-targets (constants "CaptureTarget"))
+(def torch-modes (constants "FlashMode"))
 
-; (defn set-torch [state]
-;   (set! (.-flashMode (default-camera)) (get torch-modes state)))
+(defn set-torch [state]
+  (set! (.-flashMode (default-camera)) (get torch-modes state)))
 
 (defn request-access-ios [then else]
   (-> (.checkVideoAuthorizationStatus (default-camera))

diff --git a/src/status_im/ui/screens/profile/photo_capture/views.cljs b/src/status_im/ui/screens/profile/photo_capture/views.cljs
@@ -12,7 +12,7 @@
             [status-im.ui.components.icons.vector-icons :as icons]))
 
 (defn image-captured [data]
-  (let [path       (.-path data)
+  (let [path       (.-uri data)
         _          (log/debug "Captured image: " path)
         on-success (fn [base64]
                      (log/debug "Captured success: " base64)
@@ -39,7 +39,7 @@
       [react/view styles/button
        [react/touchable-highlight {:on-press (fn []
                                                (let [camera @camera-ref]
-                                                 (-> (.capture camera)
+                                                 (-> (.takePictureAsync camera)
                                                      (.then image-captured)
                                                      (.catch #(log/debug "Error capturing image: " %)))))}
         [react/view

diff --git a/src/status_im/ui/screens/qr_scanner/views.cljs b/src/status_im/ui/screens/qr_scanner/views.cljs
@@ -40,7 +40,6 @@
                                            (do (reset! barcode-read? true)
                                                (on-barcode-read identifier %))))
                        :ref           #(reset! camera-initialized? true)
-                       :captureAudio  false
                        :style         styles/barcode-scanner}])
      [react/view styles/rectangle-container
       [react/view styles/rectangle

diff --git a/src/status_im/ui/screens/wallet/choose_recipient/views.cljs b/src/status_im/ui/screens/wallet/choose_recipient/views.cljs
@@ -59,8 +59,6 @@
       [react/with-activity-indicator
        {}
        [camera/camera {:style         styles/preview
-                       :aspect        :fill
-                       :captureAudio  false
                        ;:torchMode     (camera/set-torch camera-flashlight)
                        :onBarCodeRead #(when-not @read-once?
                                          (reset! read-once? true)