Channel name update in Context Tag (#14578)

* [Update][#14555] Channel name update in Context Tag

* [Update][#14555] Changes requested on Context Tag Component

* [Update][#14555] Changes requested on Context Tag Component
This commit is contained in:
Mohamed Javid 2022-12-21 17:33:58 +05:30 committed by GitHub
parent 270acefcf1
commit 7c2d76d00f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 15 deletions

View File

@ -1,5 +1,6 @@
(ns quo2.components.tags.context-tags (ns quo2.components.tags.context-tags
(:require [quo2.components.avatars.group-avatar :as group-avatar] (:require [quo2.components.avatars.group-avatar :as group-avatar]
[quo2.components.icon :as icons]
[quo2.components.markdown.text :as text] [quo2.components.markdown.text :as text]
[quo2.foundations.colors :as colors] [quo2.foundations.colors :as colors]
[quo2.theme :as quo2.theme] [quo2.theme :as quo2.theme]
@ -57,8 +58,13 @@
(trim-public-key public-key)]])) (trim-public-key public-key)]]))
(defn context-tag (defn context-tag
[params photo name] [_ _]
(let [text-style (params :text-style)] (fn [params photo name channel-name]
(let [text-style (:text-style params)
text-params {:weight :medium
:size :paragraph-2
:style (assoc text-style :justify-content :center)}
icon-color (colors/theme-colors colors/neutral-50 colors/neutral-40)]
[base-tag (assoc-in params [:style :padding-left] 3) [base-tag (assoc-in params [:style :padding-left] 3)
[rn/image [rn/image
{:style {:width 20 {:style {:width 20
@ -66,11 +72,17 @@
:background-color :white :background-color :white
:height 20} :height 20}
:source photo}] :source photo}]
[text/text [rn/view
(merge {:weight :medium {:style {:align-items :center
:size :paragraph-2} :flex-direction :row}}
{:style text-style}) [text/text text-params (str " " name)]
(str " " name)]])) (when channel-name
[:<>
[icons/icon
:i/chevron-right
{:color icon-color
:size 16}]
[text/text text-params (str "# " channel-name)]])]])))
(defn user-avatar-tag (defn user-avatar-tag
[] []

View File

@ -28,11 +28,22 @@
{:key :avatar {:key :avatar
:value "Avatar"} :value "Avatar"}
{:key :group-avatar {:key :group-avatar
:value "Group avatar"}]}]) :value "Group avatar"}
{:key :context-tag
:value "Context tag"}]}])
(def context-tag-descriptor
[{:label "Label"
:key :label
:type :text}
{:label "Channel Name"
:key :channel-name
:type :text}])
(defn cool-preview (defn cool-preview
[] []
(let [state (reagent/atom {:label "Name" (let [state (reagent/atom {:label "Name"
:channel-name "Channel"
:type :group-avatar})] :type :group-avatar})]
(fn [] (fn []
(let [contacts {example-pk {:public-key example-pk (let [contacts {example-pk {:public-key example-pk
@ -56,6 +67,7 @@
"Please select a user") "Please select a user")
descriptor descriptor
(cond (cond
(= (:type @state) :context-tag) (into main-descriptor context-tag-descriptor)
(= (:type @state) :group-avatar) (conj main-descriptor (= (:type @state) :group-avatar) (conj main-descriptor
{:label "Label" {:label "Label"
:key :label :key :label
@ -80,6 +92,8 @@
:flex-direction :row :flex-direction :row
:justify-content :center} :justify-content :center}
(case (:type @state) (case (:type @state)
:context-tag
[quo2/context-tag group-avatar-default-params {:uri example-photo2} (:label @state) (:channel-name @state)]
:group-avatar :group-avatar
[quo2/group-avatar-tag (:label @state) group-avatar-default-params] [quo2/group-avatar-tag (:label @state) group-avatar-default-params]
:public-key :public-key