From fcd5a16409a615da1cd68960d412263d732b5594 Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Thu, 8 Nov 2018 13:30:42 +0100 Subject: [PATCH] fixed styles for generated names on desktop Signed-off-by: Andrey Shovkoplyas --- src/status_im/ui/screens/chat/utils.cljs | 2 +- src/status_im/ui/screens/desktop/main/chat/styles.cljs | 10 +++++++--- src/status_im/ui/screens/desktop/main/chat/views.cljs | 8 +++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/status_im/ui/screens/chat/utils.cljs b/src/status_im/ui/screens/chat/utils.cljs index 3d3ad4bc58..cd6ac0edd7 100644 --- a/src/status_im/ui/screens/chat/utils.cljs +++ b/src/status_im/ui/screens/chat/utils.cljs @@ -8,7 +8,7 @@ [status-im.utils.http :as http])) (defn format-author [from username] - (str (when username (str username " :: ")) + (str (when username (str username " • ")) (gfycat/generate-gfy from))) ; TODO: We defensively generate the name for now, to be revisited when new protocol is defined (defn format-reply-author [from username current-public-key] diff --git a/src/status_im/ui/screens/desktop/main/chat/styles.cljs b/src/status_im/ui/screens/desktop/main/chat/styles.cljs index 9d03c327a7..b137e1ada6 100644 --- a/src/status_im/ui/screens/desktop/main/chat/styles.cljs +++ b/src/status_im/ui/screens/desktop/main/chat/styles.cljs @@ -37,9 +37,13 @@ :width 230}) (def author - {:color colors/black - :font-size 14 - :font-weight :bold}) + {:color colors/black + :font-weight "500" + :font-size 14}) + +(def author-generated + {:color colors/gray + :font-size 14}) (defn chat-box [height] {:height (+ height (* 2 chat-vertical-padding)) diff --git a/src/status_im/ui/screens/desktop/main/chat/views.cljs b/src/status_im/ui/screens/desktop/main/chat/views.cljs index 0033ccd1e8..0d80f0f8e2 100644 --- a/src/status_im/ui/screens/desktop/main/chat/views.cljs +++ b/src/status_im/ui/screens/desktop/main/chat/views.cljs @@ -60,9 +60,11 @@ (views/defview message-author-name [{:keys [from]}] (views/letsubs [incoming-name [:contacts/contact-name-by-identity from]] - (let [name (chat-utils/format-author from incoming-name)] - [react/touchable-highlight {:on-press #(re-frame/dispatch [:show-contact-dialog from name (boolean incoming-name)])} - [react/text {:style styles/author :font :medium} name]]))) + [react/view {:flex-direction :row} + (when incoming-name + [react/text {:style styles/author} incoming-name]) + [react/text {:style styles/author-generated} + (str (when incoming-name " • ") (gfycat/generate-gfy from))]])) (views/defview member-photo [from] (views/letsubs [current-public-key [:account/public-key]