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

Long quoted message in the reply box is not cut, goes beyond reply box and overlapped by cancel button (#15382) 

* Long quoted message in the reply box is not cut, goes beyond reply box and overlapped by cancel button

* Lint fix
This commit is contained in:
Alexander 2023-03-17 10:18:14 +01:00 committed by GitHub
parent 2e0fa29806
commit 854e372f73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/status_im/ui2/screens/chat/components/reply/style.cljs
View File

@ -9,12 +9,25 @@
(defn quoted-message (defn quoted-message
[pin? in-chat-input?] [pin? in-chat-input?]
(merge {:flex-direction :row (merge {:flex-direction :row
:flex 1
:align-items :center :align-items :center
:width (if in-chat-input? "80%" "45%")} :width (if in-chat-input? "100%" "45%")}
(when-not pin? (when-not pin?
{:position :absolute {:left 22
:left 34 :margin-right 22})))
:top 3})))
(def reply-from
{:flex-direction :row
:align-items :center})
(def message-author-text
{:margin-left 4})
(def message-text
{:text-transform :none
:margin-left 4
:margin-top 2
:flex 1})
(def gradient (def gradient
{:position :absolute {:position :absolute

27
src/status_im/ui2/screens/chat/components/reply/view.cljs
View File

@ -64,6 +64,17 @@
:margin-top 2}} :margin-top 2}}
(i18n/label :t/message-deleted)]]) (i18n/label :t/message-deleted)]])
(defn reply-from
[{:keys [from identicon contact-name current-public-key]}]
[rn/view {:style style/reply-from}
[photos/member-photo from identicon 16]
[quo2.text/text
{:weight :semi-bold
:size :paragraph-2
:number-of-lines 1
:style style/message-author-text}
(format-reply-author from contact-name current-public-key)]])
(defn reply-message (defn reply-message
[{:keys [from identicon content-type contentType parsed-text content deleted? deleted-for-me?]} [{:keys [from identicon content-type contentType parsed-text content deleted? deleted-for-me?]}
in-chat-input? pin? recording-audio?] in-chat-input? pin? recording-audio?]
@ -84,13 +95,11 @@
[rn/view {:style (style/quoted-message pin? in-chat-input?)} [rn/view {:style (style/quoted-message pin? in-chat-input?)}
[reply-deleted-message]] [reply-deleted-message]]
[rn/view {:style (style/quoted-message pin? in-chat-input?)} [rn/view {:style (style/quoted-message pin? in-chat-input?)}
[photos/member-photo from identicon 16] [reply-from
[quo2.text/text {:from from
{:weight :semi-bold :identicon identicon
:size :paragraph-2 :contact-name contact-name
:number-of-lines 1 :current-public-key current-public-key}]
:style {:margin-left 4}}
(format-reply-author from contact-name current-public-key)]
[quo2.text/text [quo2.text/text
{:number-of-lines 1 {:number-of-lines 1
:size :label :size :label
@ -98,9 +107,7 @@
:accessibility-label :quoted-message :accessibility-label :quoted-message
:ellipsize-mode :tail :ellipsize-mode :tail
:style (merge :style (merge
{:text-transform :none style/message-text
:margin-left 4
:margin-top 2}
(when (or (= constants/content-type-image content-type) (when (or (= constants/content-type-image content-type)
(= constants/content-type-sticker content-type) (= constants/content-type-sticker content-type)
(= constants/content-type-audio content-type)) (= constants/content-type-audio content-type))