[Fix] QR Viewfinder overlap with segmented tabs in Sign in (#15568)

This commit is contained in:
Mohamed Javid 2023-04-06 19:45:54 +08:00 committed by GitHub
parent 5be2cd949b
commit 0656ad8cb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions

View File

@ -15,7 +15,8 @@
[status-im2.contexts.onboarding.common.background.view :as background] [status-im2.contexts.onboarding.common.background.view :as background]
[status-im2.contexts.onboarding.sign-in.style :as style] [status-im2.contexts.onboarding.sign-in.style :as style]
[utils.i18n :as i18n] [utils.i18n :as i18n]
[utils.re-frame :as rf])) [utils.re-frame :as rf]
[utils.transforms :as transforms]))
(defonce camera-permission-granted? (reagent/atom false)) (defonce camera-permission-granted? (reagent/atom false))
@ -85,14 +86,20 @@
(defn- qr-scan-hole-area (defn- qr-scan-hole-area
[qr-view-finder] [qr-view-finder]
[rn/view (let [status-bar-height (rn/status-bar-height)]
{:style style/qr-view-finder [rn/view
:on-layout (fn [event] {:style style/qr-view-finder
(let [layout (js->clj (oops/oget event "nativeEvent.layout") :on-layout (fn [event]
:keywordize-keys (let [layout (transforms/js->clj (oops/oget event "nativeEvent.layout"))
true) width (:width layout)
view-finder (assoc layout :height (:width layout))] y (if platform/android?
(reset! qr-view-finder view-finder)))}]) (+ status-bar-height (:y layout))
(:y layout))
view-finder (-> layout
(assoc :height width)
(assoc :y y))]
(reset! qr-view-finder view-finder)))}]))
(defn- border (defn- border
[border1 border2 corner] [border1 border2 corner]