Merge pull request #357 from status-im/bug/#350

Status styles in profile and drawer (#350)

Former-commit-id: eb50cdd83e

src/status_im/components/chat_icon/styles.cljs

@@ -111,9 +111,9 @@
 (def online-dot-right (merge online-dot {:left 10}))
 
 (def photo-pencil
-  {:margin-left  5
-   :margin-right 5
-   :margin-top   3
+  {:margin-left  8
+   :margin-right 2
+   :margin-top   6
    :font-size    12
    :color        :white})
 

src/status_im/components/drawer/styles.cljs

@@ -10,7 +10,8 @@
                                                  text1-color
                                                  text2-color
                                                  text3-color
-                                                 color-red]]))
+                                                 color-red]]
+            [status-im.utils.platform :as p]))
 
 (def drawer-menu
   {:flex             1
@@ -28,7 +29,7 @@
    :height        64})
 
 (def name-container
-  {:margin-top   -16
+  {:margin-top    (if p/ios? -13 -19)
    :margin-bottom -16
    :margin-left   16
    :margin-right  16})
@@ -44,7 +45,7 @@
 (def status-container
   {:margin-left  16
    :margin-right 16
-   :margin-top   4
+   :margin-top   (if p/ios? 5 5)
    :align-items  :center})
 
 (def status-input
@@ -52,7 +53,6 @@
    :height              56
    :font-size           14
    :padding-left        4
-   :line-height         20
    :text-align          :center
    :text-align-vertical :top
    :color               text2-color})

src/status_im/profile/screen.cljs

@@ -90,14 +90,13 @@
      :wrapper-style    st/username-wrapper
      :value            name
      :on-change-text   #(dispatch [:set-in [:profile-edit :name] %])}]
-   (if edit?
    [text-input {:style          st/status-input
                 :maxLength      140
+                :multiline      true
                 :editable       edit?
                 :placeholder    (label :t/profile-no-status)
                 :on-change-text #(dispatch [:set-in [:profile-edit :status] %])
-                  :default-value  status}]
-     [text {:style st/status-text} (highlight-tags status)])])
+                :default-value  status}]])
 
 (defview profile []
   [{whisper-identity :whisper-identity

src/status_im/profile/styles.cljs

@@ -11,7 +11,8 @@
                                                  text1-color
                                                  text1-disabled-color
                                                  text2-color
-                                                 color-red]]))
+                                                 color-red]]
+            [status-im.utils.platform :as p]))
 
 (def profile
   {:flex             1
@@ -54,7 +55,7 @@
 
 (def username-wrapper
   {:width         300
-   :margin-top    -22
+   :margin-top    (if p/ios? -18 -22)
    :margin-bottom -16})
 
 (defn username-input [edit? valid?]
@@ -76,20 +77,12 @@
   {:align-self   "stretch"
    :margin-left  16
    :margin-right 16
-   :height       40
-   :margin-top   0
+   :margin-top   (if p/ios? 6 1)
    :font-size    14
-   :line-height  20
+   :min-height   60
    :text-align   :center
    :color        text2-color})
 
-(def status-text
-  {:text-align   :center
-   :margin-left  0
-   :margin-right 0
-   :margin-top   10
-   :color        text2-color})
-
 (def btns-container
   {:margin-top     18
    :flex-direction :row})