From a7fc30bf40b86aef35ddb8690302b927faef3dfd Mon Sep 17 00:00:00 2001 From: Mohsen Date: Fri, 24 Nov 2023 18:40:21 +0300 Subject: [PATCH] [#17986] feat: add emoji-hash to text-combination --- src/quo/components/text_combinations/style.cljs | 5 +++++ src/quo/components/text_combinations/view.cljs | 10 ++++++++-- .../quo_preview/text_combinations/preview.cljs | 7 ++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/quo/components/text_combinations/style.cljs b/src/quo/components/text_combinations/style.cljs index dc06fb28f4cf..37103d13f6a8 100644 --- a/src/quo/components/text_combinations/style.cljs +++ b/src/quo/components/text_combinations/style.cljs @@ -9,3 +9,8 @@ (def description-description-text {:margin-top 8}) + +(def emoji-hash + {:margin-top 8 + :letter-spacing 0.5 + :line-height 20.5}) diff --git a/src/quo/components/text_combinations/view.cljs b/src/quo/components/text_combinations/view.cljs index 534b00419ce1..e9bdae350c11 100644 --- a/src/quo/components/text_combinations/view.cljs +++ b/src/quo/components/text_combinations/view.cljs @@ -27,7 +27,8 @@ description-accessibility-label button-icon button-on-press - customization-color]}] + customization-color + emoji-hash]}] [rn/view {:style container-style} [rn/view {:style {:flex-direction :row @@ -55,6 +56,11 @@ :weight :regular :size :paragraph-1 :style style/description-description-text} - description])]) + description]) + (when emoji-hash + [text/text + {:number-of-lines 1 + :style style/emoji-hash} + emoji-hash])]) (def view (theme/with-theme view-internal)) diff --git a/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs b/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs index 3288ad12a608..661b39c07e69 100644 --- a/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs +++ b/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs @@ -8,8 +8,8 @@ (def descriptor [{:key :title :type :text} {:key :avatar :type :boolean} - {:key :description - :type :text}]) + {:key :description :type :text} + {:key :emoji-hash :type :text}]) (defn state->text-combinations-props [state] @@ -22,7 +22,8 @@ (let [state (reagent/atom {:title "Title" :title-accessibility-label :title :description "" - :description-accessibility-label :subtitle})] + :description-accessibility-label :subtitle + :emoji-hash "🐲🍀🎭🌟🚀🐠🌈🏰🔮🦉🐼🍉🎨🚲🌙🍔🌵"})] (fn [] [preview/preview-container {:state state