From 10eb21a66b614b4a24fad58eaeb7a8a029dd0e80 Mon Sep 17 00:00:00 2001
From: Alexander Pantyuhov <alwxndr@gmail.com>
Date: Tue, 8 Nov 2016 18:28:23 +0300
Subject: [PATCH] "Go to profile" icon (#428)

---
 .../components/chat_icon/screen.cljs          |  8 ++++++--
 .../components/chat_icon/styles.cljs          | 19 ++++++++++++++++---
 src/status_im/profile/screen.cljs             | 11 +++--------
 src/status_im/profile/styles.cljs             |  5 -----
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/status_im/components/chat_icon/screen.cljs b/src/status_im/components/chat_icon/screen.cljs
index 297bae9f6c..3720313890 100644
--- a/src/status_im/components/chat_icon/screen.cljs
+++ b/src/status_im/components/chat_icon/screen.cljs
@@ -25,7 +25,7 @@
            :style  (st/image-style size)}]])
 
 (defn dapp-badge [styles]
-  [view st/online-view-wrapper
+  [view (:online-view-wrapper styles)
    [view (:online-view styles)
     [view
      [view (:online-dot-left styles)]
@@ -55,6 +55,7 @@
 (defn chat-icon-view-chat-list [chat-id group-chat name color online]
   [chat-icon-view chat-id group-chat name online
    {:container              st/container-chat-list
+    :online-view-wrapper    st/online-view-wrapper
     :online-view            st/online-view
     :online-dot-left        st/online-dot-left
     :online-dot-right       st/online-dot-right
@@ -66,6 +67,7 @@
 (defn chat-icon-view-action [chat-id group-chat name color online]
   [chat-icon-view chat-id group-chat name online
    {:container              st/container
+    :online-view-wrapper    st/online-view-wrapper
     :online-view            st/online-view
     :online-dot-left        st/online-dot-left
     :online-dot-right       st/online-dot-right
@@ -77,17 +79,19 @@
 (defn chat-icon-view-menu-item [chat-id group-chat name color online]
   [chat-icon-view chat-id group-chat name online
    {:container              st/container-menu-item
+    :online-view-wrapper    st/online-view-menu-wrapper
     :online-view            st/online-view-menu-item
     :online-dot-left        st/online-dot-left-menu-item
     :online-dot-right       st/online-dot-right-menu-item
     :size                   24
     :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}])
 
 (defn chat-icon-message-status [chat-id group-chat name color online]
   [chat-icon-view chat-id group-chat name online
    {:container              st/container-message-status
+    :online-view-wrapper    st/online-view-wrapper
     :online-view            st/online-view
     :online-dot-left        st/online-dot-left
     :online-dot-right       st/online-dot-right
diff --git a/src/status_im/components/chat_icon/styles.cljs b/src/status_im/components/chat_icon/styles.cljs
index b7377b2336..8daff04f5d 100644
--- a/src/status_im/components/chat_icon/styles.cljs
+++ b/src/status_im/components/chat_icon/styles.cljs
@@ -96,6 +96,15 @@
    :border-radius    11
    :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
   {:position         :absolute
    :bottom           2
@@ -109,7 +118,9 @@
   (merge online-view
          {:width         14
           :height        14
-          :border-radius 7}))
+          :border-radius 7
+          :bottom 1
+          :right 1}))
 
 (def online-view-profile
   (merge online-view
@@ -140,9 +151,11 @@
           :width  3
           :height 3}))
 (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
-  (merge online-dot-menu-item {:left 6.3}))
+  (merge online-dot-menu-item {:left 8
+                               :top  5}))
 
 (def online-dot-profile
   (merge online-dot
diff --git a/src/status_im/profile/screen.cljs b/src/status_im/profile/screen.cljs
index 9d1a454492..0c4eb0d33a 100644
--- a/src/status_im/profile/screen.cljs
+++ b/src/status_im/profile/screen.cljs
@@ -156,13 +156,7 @@
       :value         (if (and email (not (str/blank? email)))
                        email
                        (label :t/not-specified))
-      :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)]]]]]])
+      :label         (label :t/email)}]]])
 
 (defview qr-modal []
   [qr [:get-in [:profile-edit :qr-code]]]
@@ -195,7 +189,8 @@
      [status-image-view {:account account
                          :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
        [selectable-field {:label (label :t/phone-number)
                           :value (if (and phone (not (str/blank? phone)))
diff --git a/src/status_im/profile/styles.cljs b/src/status_im/profile/styles.cljs
index 5c51c35879..59b1e3a6f4 100644
--- a/src/status_im/profile/styles.cljs
+++ b/src/status_im/profile/styles.cljs
@@ -138,11 +138,6 @@
 (def profile-input-text-non-editable
   {:color text1-disabled-color})
 
-(def report-user-container
-  {:margin-top    32
-   :margin-bottom 43
-   :align-items   :center})
-
 (def report-user-text
   {:font-size      14
    :line-height    21