Camera fixes

status-im · Aug 29, 2019 · 14cab36 · 14cab36
1 parent e8f686a
commit 14cab36
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
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)