From dc4ca898a87b2b2944904d1dbbdd8e85850aacbd Mon Sep 17 00:00:00 2001
From: criw <criw@protonmail.com>
Date: Fri, 23 Mar 2018 19:41:11 +0100
Subject: [PATCH] [FIX #3176] align group icons with chat name text

Top margins have been removed because they caused icons to be aligned
lower than text and width has been incremented since icons were cut off

[FIX #3176] changed icon's color to colors/gray

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
---
 resources/icons/group_chat.svg                |  2 +-
 resources/icons/public_chat.svg               |  2 +-
 src/status_im/ui/screens/home/styles.cljs     | 20 ++++---------------
 .../ui/screens/home/views/inner_item.cljs     |  5 +++--
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/resources/icons/group_chat.svg b/resources/icons/group_chat.svg
index b00e1937a2..b794cd71aa 100644
--- a/resources/icons/group_chat.svg
+++ b/resources/icons/group_chat.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <path fill-rule="evenodd" d="M10.6049112,13.393155 C10.0804564,13.1405737 9.49242253,12.9992378 8.87132141,12.9992378 C7.01413652,12.9992378 5.44743232,14.2733544 5,15.9988567 L9.87119489,15.9988567 L9.87119523,15.9982763 C9.87174918,15.0439692 10.1400709,14.1519051 10.6049112,13.393155 L10.6049112,13.393155 Z M8.8695035,11.9993648 C7.76507431,11.9993648 6.86975756,11.1040481 6.86975756,9.9996189 C6.86975756,8.89518972 7.76507431,7.99987297 8.8695035,7.99987297 C9.97393268,7.99987297 10.8692494,8.89518972 10.8692494,9.9996189 C10.8692494,11.1040481 9.97393268,11.9993648 8.8695035,11.9993648 Z M15.2705099,10.9994919 C14.1660807,10.9994919 13.270764,10.1041751 13.270764,8.99974593 C13.270764,7.89531675 14.1660807,7 15.2705099,7 C16.3749391,7 17.2702558,7.89531675 17.2702558,8.99974593 C17.2702558,10.1041751 16.3749391,10.9994919 15.2705099,10.9994919 Z M11.2710181,15.9988567 C11.2723004,13.7897788 13.0669332,11.9993648 15.2705093,11.9993648 C17.4785784,11.9993648 19.2687214,13.7896789 19.2700005,15.9988567 L11.2710181,15.9988567 L11.2710181,15.9988567 Z"/>
+  <path fill="" fill-rule="evenodd" d="M10.6049112,13.393155 C10.0804564,13.1405737 9.49242253,12.9992378 8.87132141,12.9992378 C7.01413652,12.9992378 5.44743232,14.2733544 5,15.9988567 L9.87119489,15.9988567 L9.87119523,15.9982763 C9.87174918,15.0439692 10.1400709,14.1519051 10.6049112,13.393155 L10.6049112,13.393155 Z M8.8695035,11.9993648 C7.76507431,11.9993648 6.86975756,11.1040481 6.86975756,9.9996189 C6.86975756,8.89518972 7.76507431,7.99987297 8.8695035,7.99987297 C9.97393268,7.99987297 10.8692494,8.89518972 10.8692494,9.9996189 C10.8692494,11.1040481 9.97393268,11.9993648 8.8695035,11.9993648 Z M15.2705099,10.9994919 C14.1660807,10.9994919 13.270764,10.1041751 13.270764,8.99974593 C13.270764,7.89531675 14.1660807,7 15.2705099,7 C16.3749391,7 17.2702558,7.89531675 17.2702558,8.99974593 C17.2702558,10.1041751 16.3749391,10.9994919 15.2705099,10.9994919 Z M11.2710181,15.9988567 C11.2723004,13.7897788 13.0669332,11.9993648 15.2705093,11.9993648 C17.4785784,11.9993648 19.2687214,13.7896789 19.2700005,15.9988567 L11.2710181,15.9988567 L11.2710181,15.9988567 Z"/>
 </svg>
diff --git a/resources/icons/public_chat.svg b/resources/icons/public_chat.svg
index 392a23aa5d..21ea618444 100644
--- a/resources/icons/public_chat.svg
+++ b/resources/icons/public_chat.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <path d="M9.30000305,13.6116448 L9.30000305,14.2549303 C9.30000305,15.0872758 9.96970237,15.7565957 10.8000031,15.7565957 C11.6015871,15.7565957 12.2591458,15.130838 12.2974091,14.3350564 L12.2974091,14.3343089 L13.7530212,14.6852519 C13.6606246,16.03924 12.4534859,17.2565957 10.8000031,17.2565957 C9.1431488,17.2565957 7.80000305,15.9175756 7.80000305,14.2549303 L7.80000305,13.25 L9.30000305,13.6116448 Z M7,9.5640553 C7,9.28775321 7.21398067,9.01255085 7.48839319,8.94687151 L14.5116068,7.2658985 C14.7813389,7.2013394 15,7.37198038 15,7.6527182 L15,13.3469573 C15,13.6251511 14.7860193,13.7994564 14.5116068,13.733777 L7.48839319,12.052804 C7.21866108,11.9882449 7,11.7105372 7,11.4356202 L7,9.5640553 Z M16,6.89585781 C16,6.4010892 16.3994783,6 16.9,6 C17.3970562,6 17.8,6.41009796 17.8,6.89585781 L17.8,14.1041422 C17.8,14.5989108 17.4005216,15 16.9,15 C16.4029437,15 16,14.589902 16,14.1041422 L16,6.89585781 Z"/>
+  <path fill="" d="M9.30000305,13.6116448 L9.30000305,14.2549303 C9.30000305,15.0872758 9.96970237,15.7565957 10.8000031,15.7565957 C11.6015871,15.7565957 12.2591458,15.130838 12.2974091,14.3350564 L12.2974091,14.3343089 L13.7530212,14.6852519 C13.6606246,16.03924 12.4534859,17.2565957 10.8000031,17.2565957 C9.1431488,17.2565957 7.80000305,15.9175756 7.80000305,14.2549303 L7.80000305,13.25 L9.30000305,13.6116448 Z M7,9.5640553 C7,9.28775321 7.21398067,9.01255085 7.48839319,8.94687151 L14.5116068,7.2658985 C14.7813389,7.2013394 15,7.37198038 15,7.6527182 L15,13.3469573 C15,13.6251511 14.7860193,13.7994564 14.5116068,13.733777 L7.48839319,12.052804 C7.21866108,11.9882449 7,11.7105372 7,11.4356202 L7,9.5640553 Z M16,6.89585781 C16,6.4010892 16.3994783,6 16.9,6 C17.3970562,6 17.8,6.41009796 17.8,6.89585781 L17.8,14.1041422 C17.8,14.5989108 17.4005216,15 16.9,15 C16.4029437,15 16,14.589902 16,14.1041422 L16,6.89585781 Z"/>
 </svg>
diff --git a/src/status_im/ui/screens/home/styles.cljs b/src/status_im/ui/screens/home/styles.cljs
index c8f26d552d..4290a6a0ed 100644
--- a/src/status_im/ui/screens/home/styles.cljs
+++ b/src/status_im/ui/screens/home/styles.cljs
@@ -74,26 +74,14 @@
    :font-size 16})
 
 (defstyle private-group-icon-container
-  {:width        16
+  {:width        20
    :height       12
-   :margin-right 6
-   :android      {:margin-top 4}
-   :ios          {:margin-top 2}})
-
-(def private-group-icon
-  {:width  16
-   :height 16})
+   :margin-right 6})
 
 (defstyle public-group-icon-container
-  {:width        16
+  {:width        20
    :height       12
-   :margin-right 6
-   :android      {:margin-top 4}
-   :ios          {:margin-top 2}})
-
-(def public-group-icon
-  {:width  16
-   :height 16})
+   :margin-right 6})
 
 (def last-message-container
   {:flex-shrink 1})
diff --git a/src/status_im/ui/screens/home/views/inner_item.cljs b/src/status_im/ui/screens/home/views/inner_item.cljs
index b58dbe4e28..2f6a05d640 100644
--- a/src/status_im/ui/screens/home/views/inner_item.cljs
+++ b/src/status_im/ui/screens/home/views/inner_item.cljs
@@ -11,6 +11,7 @@
             [status-im.utils.datetime :as time]
             [status-im.utils.gfycat.core :as gfycat]
             [status-im.constants :as const]
+            [status-im.ui.components.colors :as colors]
             [status-im.ui.components.icons.vector-icons :as vector-icons]
             [status-im.ui.components.chat-icon.screen :as chat-icon.screen]
             [status-im.ui.components.common.common :as components.common]))
@@ -70,10 +71,10 @@
     [react/view styles/name-view
      (when public-group?
        [react/view styles/public-group-icon-container
-        [vector-icons/icon :icons/public-chat {:style styles/public-group-icon}]])
+        [vector-icons/icon :icons/public-chat {:color colors/gray}]])
      (when private-group?
        [react/view styles/private-group-icon-container
-        [vector-icons/icon :icons/group-chat {:style styles/private-group-icon}]])
+        [vector-icons/icon :icons/group-chat {:color colors/gray}]])
      [react/view {:flex-shrink 1}
       [react/text {:style styles/name-text
                    :number-of-lines 1}