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

Fix adv settings clicks, some styling changes

This commit is contained in:
Vitaliy Vlasov 2018-08-01 00:38:10 -06:00
parent 1dd9591b5e
commit 7c2c537a1a
No known key found for this signature in database
GPG Key ID: A7D57C347F2B2964
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/status_im/ui/screens/desktop/main/tabs/profile/styles.cljs
View File

@ -16,14 +16,19 @@
:height 56 :height 56
:align-self :stretch :align-self :stretch
:align-items :center :align-items :center
:background-color (if active? colors/gray-lighter colors/white) :background-color (if active? colors/gray-lighter colors/white)})
:margin-top 20})
(defn profile-row-text [color active?] (defn profile-row-text [color active?]
{:color color {:color color
:font-weight (if active? "600" :normal) :font-weight (if active? "600" :normal)
:font-size 16}) :font-size 16})
(def adv-settings
{:justify-content :space-between
:flex-direction :row
:align-items :center
:flex 1})
(def profile-photo (def profile-photo
{:border-radius 100 {:border-radius 100
:width 100 :width 100
@ -40,7 +45,7 @@
:height 45 :height 45
:width 240 :width 240
:margin-horizontal 50 :margin-horizontal 50
:margin-bottom 20 :margin-bottom 48
:border-radius 8 :border-radius 8
:background-color (colors/alpha colors/blue 0.1)}) :background-color (colors/alpha colors/blue 0.1)})

8
src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs
View File

@ -86,10 +86,10 @@
[react/view styles/profile-view [react/view styles/profile-view
[profile-badge user] [profile-badge user]
[share-contact-code] [share-contact-code]
[react/view {:style (styles/profile-row adv-settings-open?)} [react/touchable-highlight {:style (styles/profile-row adv-settings-open?)
[react/touchable-highlight {:on-press #(re-frame/dispatch [:navigate-to (if adv-settings-open? :home :advanced-settings)])} :on-press #(re-frame/dispatch [:navigate-to (if adv-settings-open? :home :advanced-settings)])}
[react/text {:style (styles/profile-row-text colors/black adv-settings-open?)} (i18n/label :t/advanced-settings)]] [react/view {:style styles/adv-settings}
[react/touchable-highlight {:on-press #(re-frame/dispatch [:navigate-to (if adv-settings-open? :intro :home)])} [react/text {:style (styles/profile-row-text colors/black adv-settings-open?)} (i18n/label :t/advanced-settings)]
[vector-icons/icon :icons/forward {:style {:tint-color colors/gray}}]]] [vector-icons/icon :icons/forward {:style {:tint-color colors/gray}}]]]
[react/view {:style (styles/profile-row false)} [react/view {:style (styles/profile-row false)}
[react/touchable-highlight {:on-press #(re-frame/dispatch [:logout])} [react/touchable-highlight {:on-press #(re-frame/dispatch [:logout])}