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

Merge pull request #612 from status-im/bug/#610 

Bigger area for cross on QR display screen (#610)
This commit is contained in:
Roman Volosovskyi 2017-01-03 13:07:43 +02:00 committed by GitHub
parent 82f88b3a36 c4e4400ccb
commit 8af289c543
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/status_im/accounts/styles.cljs
View File

@ -55,6 +55,13 @@
{:margin-left 8 {:margin-left 8
:margin-right 4})) :margin-right 4}))
(defn qr-code-container [dimensions]
{:background-color "white"
:width (:width dimensions)
:align-items :center
:justify-content :center
:padding 40})
(def photo-image (def photo-image
{:width 36 {:width 36
:height 36 :height 36
@ -78,6 +85,13 @@
:alignItems :center :alignItems :center
:justifyContent :center}) :justifyContent :center})
(def online-image-container
{:width 40
:height 40
:margin-right 4
:align-items :center
:justify-content :center})
(def bottom-actions-container (def bottom-actions-container
{:position :absolute {:position :absolute
:left 0 :left 0
@ -167,4 +181,4 @@
:background-color "#7597e4"}) :background-color "#7597e4"})
(def done-button-text (def done-button-text
{:color color-white}) {:color color-white})

11
src/status_im/accounts/views/qr_code.cljs
View File

@ -32,19 +32,16 @@
:number-of-lines 1} name]] :number-of-lines 1} name]]
[view st/online-container [view st/online-container
[touchable-highlight {:onPress #(dispatch [:navigate-back])} [touchable-highlight {:onPress #(dispatch [:navigate-back])}
[image {:source {:uri :icon_close_white} [view st/online-image-container
:style icon-close}]]]]] [image {:source {:uri :icon_close_white}
:style icon-close}]]]]]]
[view {:style st/qr-code [view {:style st/qr-code
:on-layout #(let [layout (.. % -nativeEvent -layout)] :on-layout #(let [layout (.. % -nativeEvent -layout)]
(dispatch [:set-in [:qr-modal :dimensions] {:width (.-width layout) (dispatch [:set-in [:qr-modal :dimensions] {:width (.-width layout)
:height (.-height layout)}]))} :height (.-height layout)}]))}
(when (:width dimensions) (when (:width dimensions)
[view {:style {:background-color "white" [view {:style (st/qr-code-container dimensions)}
:width (:width dimensions)
:align-items :center
:justify-content :center
:padding 40}}
[qr-code {:value (if amount? [qr-code {:value (if amount?
(prn-str {:address (get contact qr-source) (prn-str {:address (get contact qr-source)
:amount amount}) :amount amount})