diff --git a/src/quo2/components/buttons/button.cljs b/src/quo2/components/buttons/button.cljs index 16a546f18aec..532874fd4730 100644 --- a/src/quo2/components/buttons/button.cljs +++ b/src/quo2/components/buttons/button.cljs @@ -130,7 +130,7 @@ :pressed colors/neutral-80-opa-50 :disabled colors/neutral-80-opa-40}} :blur-bg {:icon-color colors/white - :icon-secondary-color colors/white-opa-40 + :icon-secondary-color colors/white-opa-70 :label-color colors/white :background-color {:default colors/white-opa-5 :pressed colors/white-opa-10 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 eda8e7483219..587f3afe21c7 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/style.cljs +++ b/src/status_im2/contexts/syncing/scan_sync_code/style.cljs @@ -65,15 +65,26 @@ :left (:x viewfinder) :top (:y viewfinder)}) +(def view-finder-border-container + {:flex-direction :row + :justify-content :space-between}) + (def camera-flash-button {:position :absolute :right 20 :bottom 20}) -(def border - {:border-color colors/white - :width 78 - :height 78}) +(defn border + [border1 border2 corner] + (assoc {:border-color colors/white + :width 78 + :height 78} + border1 + 2 + border2 + 2 + corner + 16)) (defn border-tip [top bottom right left] 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 6bf15de8ed93..f85131104564 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/view.cljs +++ b/src/status_im2/contexts/syncing/scan_sync_code/view.cljs @@ -142,8 +142,7 @@ (defn- border [border1 border2 corner] - [rn/view - (assoc style/border border1 2 border2 2 corner 16)]) + [rn/view {:style (style/border border1 border2 corner)}]) (defn- border-tip [{:keys [top bottom left right]}] @@ -158,7 +157,7 @@ [rn/view {:style (style/qr-view-finder-container size)} [rn/view - {:flex-direction :row :justify-content :space-between} + {:style style/view-finder-border-container} [rn/view [border :border-top-width :border-left-width :border-top-left-radius] [border-tip {:right -1 :top 0}] @@ -177,12 +176,12 @@ [border-tip {:right 0 :top -1}] [border-tip {:left -1 :bottom 0}]]] [quo/button - {:icon true - :type :blur-bg - :size 32 - :accessibility-label :camera-flash - :on-press #() - :style style/camera-flash-button} + {:icon true + :type :blur-bg + :size 32 + :accessibility-label :camera-flash + :override-background-color colors/neutral-80-opa-40 + :style style/camera-flash-button} :i/flashlight-off]] [quo/text {:size :paragraph-2