Skip to content

Commit 178cf06

Browse files
committed
feat: replaced old emoji component with new one
1 parent 58606dc commit 178cf06

File tree

4 files changed

+22
-11
lines changed

4 files changed

+22
-11
lines changed

src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs

-10
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,6 @@
145145
[rn/text {:style (style/status-text)}]
146146
(-> content :parsed-text peek :children))]])
147147

148-
;; EMOJI
149-
(defn emoji
150-
[]
151-
(fn [{:keys [content] :as message}]
152-
[rn/view (style/message-view message)
153-
[rn/view {:style (style/message-view-content)}
154-
[rn/view {:style (style/style-message-text)}
155-
[rn/text {:style (style/emoji-message message)}
156-
(:text content)]]]]))
157-
158148
;; STICKER
159149
(defn sticker
160150
[{:keys [content]}]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
(ns status-im.contexts.chat.messenger.messages.content.emoji.style)
2+
3+
(defn emoji-container
4+
[margin-top]
5+
{:flex-direction :row
6+
:margin-top margin-top})
7+
8+
(def emoji-text
9+
{:font-size 36
10+
:line-height 42})
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
(ns status-im.contexts.chat.messenger.messages.content.emoji.view
2+
(:require [react-native.core :as rn]
3+
[status-im.contexts.chat.messenger.messages.content.emoji.style :as style]))
4+
5+
(defn emoji-message
6+
[{:keys [content last-in-group? pinned]} {:keys [in-pinned-view?]}]
7+
(let [margin-top (if (or last-in-group? in-pinned-view? pinned) 8 0)]
8+
[rn/view {:style (style/emoji-container margin-top)}
9+
[rn/text {:style style/emoji-text}
10+
(:text content)]]))

src/status_im/contexts/chat/messenger/messages/content/view.cljs

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
[status-im.contexts.chat.messenger.messages.content.album.view :as album]
1616
[status-im.contexts.chat.messenger.messages.content.audio.view :as audio]
1717
[status-im.contexts.chat.messenger.messages.content.deleted.view :as content.deleted]
18+
[status-im.contexts.chat.messenger.messages.content.emoji.view :as emoji]
1819
[status-im.contexts.chat.messenger.messages.content.image.view :as image]
1920
[status-im.contexts.chat.messenger.messages.content.pin.view :as pin]
2021
[status-im.contexts.chat.messenger.messages.content.reactions.view :as reactions]
@@ -199,7 +200,7 @@
199200
[content.text/text-content message-data context]
200201

201202
constants/content-type-emoji
202-
[not-implemented/not-implemented [old-message/emoji message-data]]
203+
[emoji/emoji-message message-data context]
203204

204205
constants/content-type-sticker
205206
[not-implemented/not-implemented [old-message/sticker message-data]]

0 commit comments

Comments
 (0)