"Go to profile" icon (#428)

This commit is contained in:
Alexander Pantyuhov 2016-11-08 18:28:23 +03:00
parent 3819a0e8e5
commit 10eb21a66b
4 changed files with 25 additions and 18 deletions

View File

@ -25,7 +25,7 @@
:style (st/image-style size)}]]) :style (st/image-style size)}]])
(defn dapp-badge [styles] (defn dapp-badge [styles]
[view st/online-view-wrapper [view (:online-view-wrapper styles)
[view (:online-view styles) [view (:online-view styles)
[view [view
[view (:online-dot-left styles)] [view (:online-dot-left styles)]
@ -55,6 +55,7 @@
(defn chat-icon-view-chat-list [chat-id group-chat name color online] (defn chat-icon-view-chat-list [chat-id group-chat name color online]
[chat-icon-view chat-id group-chat name online [chat-icon-view chat-id group-chat name online
{:container st/container-chat-list {:container st/container-chat-list
:online-view-wrapper st/online-view-wrapper
:online-view st/online-view :online-view st/online-view
:online-dot-left st/online-dot-left :online-dot-left st/online-dot-left
:online-dot-right st/online-dot-right :online-dot-right st/online-dot-right
@ -66,6 +67,7 @@
(defn chat-icon-view-action [chat-id group-chat name color online] (defn chat-icon-view-action [chat-id group-chat name color online]
[chat-icon-view chat-id group-chat name online [chat-icon-view chat-id group-chat name online
{:container st/container {:container st/container
:online-view-wrapper st/online-view-wrapper
:online-view st/online-view :online-view st/online-view
:online-dot-left st/online-dot-left :online-dot-left st/online-dot-left
:online-dot-right st/online-dot-right :online-dot-right st/online-dot-right
@ -77,17 +79,19 @@
(defn chat-icon-view-menu-item [chat-id group-chat name color online] (defn chat-icon-view-menu-item [chat-id group-chat name color online]
[chat-icon-view chat-id group-chat name online [chat-icon-view chat-id group-chat name online
{:container st/container-menu-item {:container st/container-menu-item
:online-view-wrapper st/online-view-menu-wrapper
:online-view st/online-view-menu-item :online-view st/online-view-menu-item
:online-dot-left st/online-dot-left-menu-item :online-dot-left st/online-dot-left-menu-item
:online-dot-right st/online-dot-right-menu-item :online-dot-right st/online-dot-right-menu-item
:size 24 :size 24
:chat-icon st/chat-icon-menu-item :chat-icon st/chat-icon-menu-item
:default-chat-icon (st/default-chat-icon-menu-item color) :default-chat-icon (st/default-chat-icon-view-action color)
:default-chat-icon-text st/default-chat-icon-text}]) :default-chat-icon-text st/default-chat-icon-text}])
(defn chat-icon-message-status [chat-id group-chat name color online] (defn chat-icon-message-status [chat-id group-chat name color online]
[chat-icon-view chat-id group-chat name online [chat-icon-view chat-id group-chat name online
{:container st/container-message-status {:container st/container-message-status
:online-view-wrapper st/online-view-wrapper
:online-view st/online-view :online-view st/online-view
:online-dot-left st/online-dot-left :online-dot-left st/online-dot-left
:online-dot-right st/online-dot-right :online-dot-right st/online-dot-right

View File

@ -96,6 +96,15 @@
:border-radius 11 :border-radius 11
:background-color :white}) :background-color :white})
(def online-view-menu-wrapper
{:position :absolute
:bottom 0
:right -1
:width 16
:height 16
:border-radius 8
:background-color :white})
(def online-view (def online-view
{:position :absolute {:position :absolute
:bottom 2 :bottom 2
@ -109,7 +118,9 @@
(merge online-view (merge online-view
{:width 14 {:width 14
:height 14 :height 14
:border-radius 7})) :border-radius 7
:bottom 1
:right 1}))
(def online-view-profile (def online-view-profile
(merge online-view (merge online-view
@ -140,9 +151,11 @@
:width 3 :width 3
:height 3})) :height 3}))
(def online-dot-left-menu-item (def online-dot-left-menu-item
(merge online-dot-menu-item {:left 1.7})) (merge online-dot-menu-item {:left 2.5
:top 5}))
(def online-dot-right-menu-item (def online-dot-right-menu-item
(merge online-dot-menu-item {:left 6.3})) (merge online-dot-menu-item {:left 8
:top 5}))
(def online-dot-profile (def online-dot-profile
(merge online-dot (merge online-dot

View File

@ -156,13 +156,7 @@
:value (if (and email (not (str/blank? email))) :value (if (and email (not (str/blank? email)))
email email
(label :t/not-specified)) (label :t/not-specified))
:label (label :t/email)}] :label (label :t/email)}]]])
[view st/report-user-container
[touchable-highlight {:on-press (fn []
;; TODO not implemented
)}
[view [text {:style st/report-user-text} (label :t/report-user)]]]]]])
(defview qr-modal [] (defview qr-modal []
[qr [:get-in [:profile-edit :qr-code]]] [qr [:get-in [:profile-edit :qr-code]]]
@ -195,7 +189,8 @@
[status-image-view {:account account [status-image-view {:account account
:edit? edit?}] :edit? edit?}]
[scroll-view (merge st/profile-properties-container {:keyboardShouldPersistTaps true}) [scroll-view (merge st/profile-properties-container {:keyboardShouldPersistTaps true
:bounces false})
[view st/profile-property [view st/profile-property
[selectable-field {:label (label :t/phone-number) [selectable-field {:label (label :t/phone-number)
:value (if (and phone (not (str/blank? phone))) :value (if (and phone (not (str/blank? phone)))

View File

@ -138,11 +138,6 @@
(def profile-input-text-non-editable (def profile-input-text-non-editable
{:color text1-disabled-color}) {:color text1-disabled-color})
(def report-user-container
{:margin-top 32
:margin-bottom 43
:align-items :center})
(def report-user-text (def report-user-text
{:font-size 14 {:font-size 14
:line-height 21 :line-height 21