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

qr code should be white modal

This commit is contained in:
Andrey Shovkoplyas 2018-05-16 17:28:15 +03:00 committed by Roman Volosovskyi
parent 7cb17511e9
commit 54175caeba
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -139,6 +139,11 @@ android-ports-avd: ##@other Add reverse proxy to Android Device/Simulator
adb -e reverse tcp:3449 tcp:3449 adb -e reverse tcp:3449 tcp:3449
adb -e reverse tcp:4567 tcp:4567 adb -e reverse tcp:4567 tcp:4567
android-ports-genymotion: ##@other Add reverse proxy to Android Device/Simulator
adb -e reverse tcp:8081 tcp:8081
adb -e reverse tcp:3449 tcp:3449
adb -e reverse tcp:4567 tcp:4567
android-ports-real: ##@other Add reverse proxy to Android Device/Simulator android-ports-real: ##@other Add reverse proxy to Android Device/Simulator
adb -d reverse tcp:8081 tcp:8081 adb -d reverse tcp:8081 tcp:8081
adb -d reverse tcp:3449 tcp:3449 adb -d reverse tcp:3449 tcp:3449

8
src/status_im/ui/screens/profile/user/views.cljs
View File

@ -67,15 +67,15 @@
(defview qr-viewer [] (defview qr-viewer []
(letsubs [{:keys [value contact]} [:get :qr-modal]] (letsubs [{:keys [value contact]} [:get :qr-modal]]
[react/view styles/qr-code-viewer [react/view styles/qr-code-viewer
[status-bar/status-bar {:type :modal}] [status-bar/status-bar {:type :modal-white}]
[qr-viewer-toolbar (:name contact) value] [qr-viewer-toolbar (:name contact) value]
[qr-code-viewer/qr-code-viewer {:style styles/qr-code} [qr-code-viewer/qr-code-viewer {:style styles/qr-code}
value (i18n/label :t/qr-code-public-key-hint) (str value)]])) value (i18n/label :t/qr-code-public-key-hint) (str value)]]))
(defn- show-qr [contact source value] (defn- show-qr [contact source value]
#(re-frame/dispatch [:navigate-to :profile-qr-viewer {:contact contact #(re-frame/dispatch [:navigate-to-modal :profile-qr-viewer {:contact contact
:source source :source source
:value value}])) :value value}]))
(defn share-contact-code [current-account public-key] (defn share-contact-code [current-account public-key]
[react/touchable-highlight {:on-press (show-qr current-account :public-key public-key)} [react/touchable-highlight {:on-press (show-qr current-account :public-key public-key)}

2
src/status_im/ui/screens/views.cljs
View File

@ -151,13 +151,13 @@
:recent-recipients recent-recipients :recent-recipients recent-recipients
:recipient-qr-code recipient-qr-code :recipient-qr-code recipient-qr-code
:contact-code contact-code :contact-code contact-code
:profile-qr-viewer profile.user/qr-viewer
:backup-seed backup-seed :backup-seed backup-seed
[react/view [react/text (str "Unknown view: " view-id)]])) [react/view [react/text (str "Unknown view: " view-id)]]))
(defn get-modal-component [modal-view] (defn get-modal-component [modal-view]
(case modal-view (case modal-view
:qr-scanner qr-scanner :qr-scanner qr-scanner
:profile-qr-viewer profile.user/qr-viewer
:wallet-transactions-filter wallet-transactions/filter-history :wallet-transactions-filter wallet-transactions/filter-history
:wallet-settings-assets wallet-settings/manage-assets :wallet-settings-assets wallet-settings/manage-assets
:wallet-send-transaction-modal send-transaction-modal :wallet-send-transaction-modal send-transaction-modal