status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pinned messages UI issues (#15687) 

* Pinned messages UI issues

* Fix

* Fixes
This commit is contained in:
Alexander 2023-04-24 15:31:07 +02:00 committed by GitHub
parent 4a42d20b0c
commit 5bf58bbaf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/status_im2/contexts/chat/menus/pinned_messages/style.cljs
View File

@ -4,7 +4,8 @@
(def heading (def heading
{:margin-horizontal 20}) {:margin-horizontal 20})
(def heading-container (defn heading-container
[]
{:flex-direction :row {:flex-direction :row
:background-color (colors/theme-colors colors/neutral-10 colors/neutral-80) :background-color (colors/theme-colors colors/neutral-10 colors/neutral-80)
:border-radius 20 :border-radius 20
@ -14,13 +15,17 @@
:padding 4 :padding 4
:margin-top 8}) :margin-top 8})
(def heading-text (defn heading-text
[]
{:margin-left 6 {:margin-left 6
:margin-right 4}) :margin-right 4
:color (colors/theme-colors colors/neutral-60 colors/neutral-20)})
(def chat-name-text (defn chat-name-text
[]
{:margin-left 4 {:margin-left 4
:margin-right 8}) :margin-right 8
:color (colors/theme-colors colors/neutral-60 colors/neutral-20)})
(defn list-footer (defn list-footer
[bottom-inset] [bottom-inset]

9
src/status_im2/contexts/chat/menus/pinned_messages/view.cljs
View File

@ -40,15 +40,14 @@
:style style/heading} :style style/heading}
(i18n/label :t/pinned-messages)] (i18n/label :t/pinned-messages)]
(when community (when community
[rn/view [rn/view {:style (style/heading-container)}
{:style style/heading-container} [rn/text {:style (style/heading-text)} (:name community)]
[rn/text {:style style/heading-text} (:name community)]
[quo/icon [quo/icon
:i/chevron-right :i/chevron-right
{:color (colors/theme-colors colors/neutral-50 colors/neutral-40) {:color (colors/theme-colors colors/neutral-60 colors/neutral-30)
:size 12}] :size 12}]
[rn/text [rn/text
{:style style/chat-name-text} {:style (style/chat-name-text)}
(str "# " (:chat-name current-chat))]])] (str "# " (:chat-name current-chat))]])]
(if (pos? (count pinned-messages)) (if (pos? (count pinned-messages))
[rn/flat-list [rn/flat-list

4
src/status_im2/contexts/chat/messages/content/pin/style.cljs
View File

@ -12,3 +12,7 @@
(def pin-author-text (def pin-author-text
{:color colors/primary-50 {:color colors/primary-50
:bottom 2}) :bottom 2})
(defn pinned-message-text
[]
{:color (colors/theme-colors colors/neutral-100 colors/white)})

5
src/status_im2/contexts/chat/messages/content/pin/view.cljs
View File

@ -51,7 +51,10 @@
:disabled in-popover? :disabled in-popover?
:on-press #(rf/dispatch [:chat.ui/show-profile from])} :on-press #(rf/dispatch [:chat.ui/show-profile from])}
[old-message/message-author-name from {} 20]] [old-message/message-author-name from {} 20]]
[rn/text {:style {:font-size 13}} (str " " (i18n/label :t/pinned-a-message))] [quo/text
{:size :label
:style (style/pinned-message-text)}
(str " " (i18n/label :t/pinned-a-message))]
[rn/text [rn/text
{:style (merge {:style (merge
{:padding-left 5 {:padding-left 5