fix: resolve activity centre design feedback (#17105)

This commit is contained in:
BalogunofAfrica 2023-08-29 16:55:11 +01:00 committed by GitHub
parent 141bf5a333
commit a47998a7a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 9 deletions

View File

@ -28,7 +28,7 @@
(defn message-container (defn message-container
[attachment] [attachment]
{:border-radius 12 {:border-radius 12
:margin-top 12 :margin-top 10
:padding-horizontal 12 :padding-horizontal 12
:padding-vertical (if (#{:photo :gif} attachment) 12 8) :padding-vertical (if (#{:photo :gif} attachment) 12 8)
:background-color colors/white-opa-5}) :background-color colors/white-opa-5})
@ -39,11 +39,14 @@
(defn title (defn title
[] []
{:color colors/white}) {:flex-shrink 1
:color colors/white})
(def timestamp (def timestamp
{:text-transform :none {:text-transform :none
:margin-left 8 :margin-left 8
:margin-top 4
:flex-shrink 0
:color colors/neutral-40}) :color colors/neutral-40})
(defn unread-dot (defn unread-dot
@ -65,10 +68,8 @@
:flex-wrap :wrap}) :flex-wrap :wrap})
(def top-section-container (def top-section-container
{:align-items :center {:flex-direction :row})
:flex-direction :row})
(def title-container (def title-container
{:flex 1 {:flex 1
:flex-direction :row :flex-direction :row})
:align-items :center})

View File

@ -52,7 +52,7 @@
(defn- activity-context (defn- activity-context
[context replying?] [context replying?]
(let [first-line-offset (if replying? 4 0) (let [first-line-offset (if replying? 4 0)
gap-between-lines 4] gap-between-lines 5]
(into [rn/view {:style (assoc style/context-container :margin-top first-line-offset)}] (into [rn/view {:style (assoc style/context-container :margin-top first-line-offset)}]
(mapcat (mapcat
(fn [detail] (fn [detail]
@ -130,6 +130,10 @@
(assoc :size size) (assoc :size size)
(assoc :type subtype) (assoc :type subtype)
(assoc :disabled? (and replying? disable-when (disable-when @reply-input))) (assoc :disabled? (and replying? disable-when (disable-when @reply-input)))
(assoc :inner-style
{:justify-content :center
:padding-bottom 0
:padding-top 0})
(update :container-style merge common-style {:margin-right 8})) (update :container-style merge common-style {:margin-right 8}))
label])) label]))

View File

@ -38,7 +38,7 @@
[customization-color pressed? theme] [customization-color pressed? theme]
(when pressed? (when pressed?
(if customization-color (if customization-color
(colors/custom-color-by-theme customization-color 50 60) (colors/custom-color (or customization-color :blue) 60)
(colors/theme-colors colors/primary-50 colors/primary-60 theme)))) (colors/theme-colors colors/primary-50 colors/primary-60 theme))))
(defn container-outer (defn container-outer

View File

@ -13,7 +13,7 @@
(merge default-container-style (merge default-container-style
{:min-height 24 {:min-height 24
:padding-horizontal 8 :padding-horizontal 8
:padding-vertical 1})) :padding-vertical 3}))
(def large-container-style (def large-container-style
(merge default-container-style (merge default-container-style