diff --git a/src/quo2/components/text_combinations/style.cljs b/src/quo2/components/text_combinations/style.cljs index 911364f23f..63f618a074 100644 --- a/src/quo2/components/text_combinations/style.cljs +++ b/src/quo2/components/text_combinations/style.cljs @@ -1,9 +1,5 @@ (ns quo2.components.text-combinations.style) -(defn container - [container-style] - (assoc container-style :margin-horizontal 20)) - (def title-container {:flex-direction :row :align-items :center}) diff --git a/src/quo2/components/text_combinations/view.cljs b/src/quo2/components/text_combinations/view.cljs index acb8216f1d..a8ecd5a882 100644 --- a/src/quo2/components/text_combinations/view.cljs +++ b/src/quo2/components/text_combinations/view.cljs @@ -23,9 +23,8 @@ avatar title-accessibility-label description - description-props description-accessibility-label]}] - [rn/view {:style (style/container container-style)} + [rn/view {:style container-style} [rn/view {:style style/title-container} (when avatar [rn/view {:style style/avatar-container} @@ -38,14 +37,12 @@ :number-of-lines 1 :size :heading-1} title]] - (case description - :description + (when description [text/text {:accessibility-label description-accessibility-label :weight :regular :size :paragraph-1 :style style/description-description-text} - description-props] - nil)]) + description])]) (def view (theme/with-theme view-internal)) diff --git a/src/status_im2/common/scroll_page/style.cljs b/src/status_im2/common/scroll_page/style.cljs index 21a9d42c91..de674d7a87 100644 --- a/src/status_im2/common/scroll_page/style.cljs +++ b/src/status_im2/common/scroll_page/style.cljs @@ -65,7 +65,7 @@ :border-color (colors/theme-colors colors/white colors/neutral-95) :position :absolute :top (- (+ picture-radius picture-border-width)) - :left (- (/ picture-radius 2) picture-border-width)})) + :left (+ (/ picture-radius 2) picture-border-width)})) (defn display-picture [theme] diff --git a/src/status_im2/contexts/communities/overview/view.cljs b/src/status_im2/contexts/communities/overview/view.cljs index d2ec65898d..7286fa1026 100644 --- a/src/status_im2/contexts/communities/overview/view.cljs +++ b/src/status_im2/contexts/communities/overview/view.cljs @@ -228,33 +228,22 @@ [category (update v :chats add-on-press)]) categorized-chats))) - (defn community-header - [title logo] + [title logo description] [quo/text-combinations {:container-style - {:margin-horizontal 0 - :padding-right 20 - :margin-top + {:margin-top (if logo 12 (+ scroll-page.style/picture-radius scroll-page.style/picture-border-width - 12))} + 12)) + :margin-bottom 12} :avatar logo :title title - :title-accessibility-label :chat-name-text}]) - -(defn community-description - [description] - [quo/text - {:accessibility-label :community-description-text - :number-of-lines 4 - :ellipsize-mode :tail - :weight :regular - :size :paragraph-1 - :style {:margin-top 8 :margin-bottom 12}} - description]) + :description description + :title-accessibility-label :community-title + :description-accessibility-label :community-description}]) (defn community-content [{:keys [name description joined images tags color id] @@ -268,9 +257,8 @@ [rn/view {:style style/community-content-container} (when-not collapsed? [status-tag pending? joined]) - [community-header name (when collapsed? (get-in images [:thumbnail :uri]))] - (when-not collapsed? - [community-description description]) + [community-header name (when collapsed? (get-in images [:thumbnail :uri])) + (when-not collapsed? description)] (when-not collapsed? [quo/community-tags {:tags tags diff --git a/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs b/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs index 9d2d3bee0e..5f4f14b8ab 100644 --- a/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs +++ b/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs @@ -13,11 +13,10 @@ (defn page-title [] [quo/text-combinations - {:container-style {:margin-top 12} + {:container-style {:margin-top 12 :margin-horizontal 20} :title (i18n/label :t/enable-biometrics) :title-accessibility-label :enable-biometrics-title - :description :description - :description-props (i18n/label :t/use-biometrics) + :description (i18n/label :t/use-biometrics) :description-accessibility-label :enable-biometrics-sub-title}]) (defn enable-biometrics-buttons diff --git a/src/status_im2/contexts/onboarding/enable_notifications/view.cljs b/src/status_im2/contexts/onboarding/enable_notifications/view.cljs index 5f3ed30c20..b59324d775 100644 --- a/src/status_im2/contexts/onboarding/enable_notifications/view.cljs +++ b/src/status_im2/contexts/onboarding/enable_notifications/view.cljs @@ -12,11 +12,10 @@ (defn page-title [] [quo/text-combinations - {:container-style {:margin-top 12} + {:container-style {:margin-top 12 :margin-horizontal 20} :title (i18n/label :t/intro-wizard-title6) :title-accessibility-label :notifications-title - :description :description - :description-props (i18n/label :t/enable-notifications-sub-title) + :description (i18n/label :t/enable-notifications-sub-title) :description-accessibility-label :notifications-sub-title}]) (defn enable-notification-buttons diff --git a/src/status_im2/contexts/onboarding/generating_keys/view.cljs b/src/status_im2/contexts/onboarding/generating_keys/view.cljs index 057ba36c06..00841fabf1 100644 --- a/src/status_im2/contexts/onboarding/generating_keys/view.cljs +++ b/src/status_im2/contexts/onboarding/generating_keys/view.cljs @@ -12,17 +12,20 @@ (defn generate-keys-title [] [quo/text-combinations - {:title (i18n/label :t/generating-keys)}]) + {:container-style {:margin-horizontal 20} + :title (i18n/label :t/generating-keys)}]) (defn saving-keys-title [] [quo/text-combinations - {:title (i18n/label :t/saving-keys-to-device)}]) + {:container-style {:margin-horizontal 20} + :title (i18n/label :t/saving-keys-to-device)}]) (defn keys-saved-title [] [quo/text-combinations - {:title (i18n/label :t/keys-saved)}]) + {:container-style {:margin-horizontal 20} + :title (i18n/label :t/keys-saved)}]) (def first-transition-delay-ms 2000) diff --git a/src/status_im2/contexts/onboarding/syncing/progress/view.cljs b/src/status_im2/contexts/onboarding/syncing/progress/view.cljs index e7b2b49ef1..4a372659ad 100644 --- a/src/status_im2/contexts/onboarding/syncing/progress/view.cljs +++ b/src/status_im2/contexts/onboarding/syncing/progress/view.cljs @@ -13,12 +13,11 @@ (defn page-title [pairing-progress?] [quo/text-combinations - {:container-style {:margin-top 56} + {:container-style {:margin-top 56 :margin-horizontal 20} :title (i18n/label (if pairing-progress? :t/sync-devices-title :t/sync-devices-error-title)) - :description :description - :description-props (i18n/label (if pairing-progress? + :description (i18n/label (if pairing-progress? :t/sync-devices-sub-title :t/sync-devices-error-sub-title)) :title-accessibility-label :progress-screen-title diff --git a/src/status_im2/contexts/onboarding/syncing/results/view.cljs b/src/status_im2/contexts/onboarding/syncing/results/view.cljs index 109a1d37f7..97da117057 100644 --- a/src/status_im2/contexts/onboarding/syncing/results/view.cljs +++ b/src/status_im2/contexts/onboarding/syncing/results/view.cljs @@ -14,10 +14,10 @@ (defn page-title [] [quo/text-combinations - {:title (i18n/label :t/sync-devices-complete-title) + {:container-style {:margin-horizontal 20} + :title (i18n/label :t/sync-devices-complete-title) :title-accessibility-label :sync-devices-title - :description :description - :description-props (i18n/label :t/sync-devices-complete-sub-title) + :description (i18n/label :t/sync-devices-complete-sub-title) :description-accessibility-label :sync-devices-complete-sub-title}]) (defn current-device diff --git a/src/status_im2/contexts/onboarding/welcome/view.cljs b/src/status_im2/contexts/onboarding/welcome/view.cljs index 1cc1aaf590..c360d8a8c4 100644 --- a/src/status_im2/contexts/onboarding/welcome/view.cljs +++ b/src/status_im2/contexts/onboarding/welcome/view.cljs @@ -12,13 +12,12 @@ [] (let [new-account? (rf/sub [:onboarding-2/new-account?])] [quo/text-combinations - {:container-style {:margin-top 12} + {:container-style {:margin-top 12 :margin-horizontal 20} :title (i18n/label (if new-account? :t/welcome-to-web3 :t/welcome-back)) :title-accessibility-label :welcome-title - :description :description - :description-props (i18n/label :t/welcome-to-web3-sub-title) + :description (i18n/label :t/welcome-to-web3-sub-title) :description-accessibility-label :welcome-sub-title}])) (defn dispatch-visibility-status-update