status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#19183] fix: scan qr design issues (#19698)

This commit is contained in:
Mohsen 2024-04-23 13:01:08 +03:00 committed by GitHub
parent 7a1c29899b
commit 696fedcca2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/common/home/top_nav/view.cljs
View File

@ -35,7 +35,7 @@
{:avatar-on-press #(rf/dispatch [:open-modal :settings]) {:avatar-on-press #(rf/dispatch [:open-modal :settings])
:scan-on-press #(rf/dispatch [:open-modal :shell-qr-reader]) :scan-on-press #(rf/dispatch [:open-modal :shell-qr-reader])
:activity-center-on-press #(rf/dispatch [:activity-center/open]) :activity-center-on-press #(rf/dispatch [:activity-center/open])
:qr-code-on-press #(rf/dispatch [:open-modal :share-shell]) :qr-code-on-press #(rf/dispatch [:open-modal :screen/share-shell])
:container-style (merge style/top-nav-container container-style) :container-style (merge style/top-nav-container container-style)
:blur? blur? :blur? blur?
:jump-to? jump-to? :jump-to? jump-to?

38
src/status_im/common/scan_qr_code/view.cljs
View File

@ -3,7 +3,6 @@
[oops.core :as oops] [oops.core :as oops]
[quo.core :as quo] [quo.core :as quo]
[quo.foundations.colors :as colors] [quo.foundations.colors :as colors]
[quo.theme :as quo.theme]
[react-native.blur :as blur] [react-native.blur :as blur]
[react-native.camera-kit :as camera-kit] [react-native.camera-kit :as camera-kit]
[react-native.core :as rn] [react-native.core :as rn]
@ -31,7 +30,17 @@
:size 32 :size 32
:accessibility-label :close-scan-qr-code :accessibility-label :close-scan-qr-code
:on-press #(rf/dispatch [:navigate-back])} :on-press #(rf/dispatch [:navigate-back])}
:i/arrow-left]] :i/close]
[quo/button
{:icon-only? true
:type :grey
:background :blur
:size 32
:accessibility-label :show-qr-button
:on-press (fn []
(rf/dispatch [:navigate-back])
(rf/dispatch [:open-modal :screen/share-shell]))}
:i/qr-code]]
[quo/text [quo/text
{:size :heading-1 {:size :heading-1
:weight :semi-bold :weight :semi-bold
@ -171,8 +180,8 @@
{:style style/absolute-fill {:style style/absolute-fill
:blur-amount 10 :blur-amount 10
:blur-type :transparent :blur-type :transparent
:overlay-color colors/neutral-80-opa-80 :overlay-color colors/neutral-80-opa-80-blur
:background-color colors/neutral-80-opa-80}]]]) :background-color colors/neutral-80-opa-80-blur}]]])
(defn- set-listener-torch-off-on-app-inactive (defn- set-listener-torch-off-on-app-inactive
[torch-atm] [torch-atm]
@ -234,16 +243,15 @@
[:<> [:<>
[rn/view {:style style/scan-qr-code-container}] [rn/view {:style style/scan-qr-code-container}]
[qr-scan-hole-area qr-view-finder]]) [qr-scan-hole-area qr-view-finder]])
[scan-qr-code-tab @qr-view-finder (when subtitle true)] [scan-qr-code-tab @qr-view-finder true]
[rn/view {:style style/flex-spacer}] [rn/view {:style style/flex-spacer}]
(when show-camera? (when show-camera?
[quo.theme/provider :light [quo/button
[quo/button {:icon-only? true
{:icon-only? true :type :grey
:type :grey :background :photo
:background :photo :size style/flash-button-size
:size style/flash-button-size :accessibility-label :camera-flash
:accessibility-label :camera-flash :container-style (style/camera-flash-button @qr-view-finder)
:container-style (style/camera-flash-button @qr-view-finder) :on-press #(swap! torch? not)}
:on-press #(swap! torch? not)} flashlight-icon])]]))))
flashlight-icon]])]]))))

3
src/status_im/contexts/profile/settings/view.cljs
View File

@ -61,7 +61,8 @@
:icon-name :i/close :icon-name :i/close
:on-press #(rf/dispatch [:navigate-back]) :on-press #(rf/dispatch [:navigate-back])
:right-side [{:icon-name :i/qr-code :right-side [{:icon-name :i/qr-code
:on-press #(debounce/throttle-and-dispatch [:open-modal :share-shell] 1000)} :on-press #(debounce/throttle-and-dispatch [:open-modal :screen/share-shell]
1000)}
{:icon-name :i/share {:icon-name :i/share
:on-press #(rf/dispatch [:open-share :on-press #(rf/dispatch [:open-share
{:options {:message (:universal-profile-url {:options {:message (:universal-profile-url

2
src/status_im/navigation/screens.cljs
View File

@ -100,7 +100,7 @@
:options options/transparent-screen-options :options options/transparent-screen-options
:component activity-center/view} :component activity-center/view}
{:name :share-shell {:name :screen/share-shell
:options options/transparent-screen-options :options options/transparent-screen-options
:component share/view} :component share/view}

1
translations/en.json
View File

@ -2186,7 +2186,6 @@
"link-preview-loading-message": "Generating preview", "link-preview-loading-message": "Generating preview",
"to-scan-a-qr-enable-your-camera": "To scan a QR, enable your camera", "to-scan-a-qr-enable-your-camera": "To scan a QR, enable your camera",
"enable-camera": "Enable camera", "enable-camera": "Enable camera",
"ensure-qr-code-in-focus-to-scan": "Ensure that the QR code is in focus to scan",
"i-dont-have-status-on-another-device": "I don’t have Status on another device", "i-dont-have-status-on-another-device": "I don’t have Status on another device",
"ensure-qr-code-is-in-focus-to-scan": "Ensure that the QR code is in focus to scan", "ensure-qr-code-is-in-focus-to-scan": "Ensure that the QR code is in focus to scan",
"ensure-both-devices-are-on-the-same-network": "Ensure both devices are on the same network", "ensure-both-devices-are-on-the-same-network": "Ensure both devices are on the same network",