From 9d458108886e36490f2eda4f84938d15157d0ca2 Mon Sep 17 00:00:00 2001 From: Mohsen Date: Tue, 6 Feb 2024 21:37:47 +0300 Subject: [PATCH] [#18453] fix: design feedbacks --- src/quo/components/colors/color_picker/view.cljs | 2 +- .../contexts/profile/edit/accent_colour/style.cljs | 9 ++++----- .../contexts/profile/edit/accent_colour/view.cljs | 3 ++- src/status_im/navigation/options.cljs | 10 +++++++++- src/status_im/navigation/screens.cljs | 6 +++--- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/quo/components/colors/color_picker/view.cljs b/src/quo/components/colors/color_picker/view.cljs index fa02a7d3a79c..14579fc044ed 100644 --- a/src/quo/components/colors/color_picker/view.cljs +++ b/src/quo/components/colors/color_picker/view.cljs @@ -35,7 +35,7 @@ (when (and @ref (>= index 0)) (some-> ^js @ref (.scrollToIndex #js - {:animated true + {:animated false :index index :viewPosition 0.5}))))) 50))) diff --git a/src/status_im/contexts/profile/edit/accent_colour/style.cljs b/src/status_im/contexts/profile/edit/accent_colour/style.cljs index f826a2e50b2c..571bf77eb2f3 100644 --- a/src/status_im/contexts/profile/edit/accent_colour/style.cljs +++ b/src/status_im/contexts/profile/edit/accent_colour/style.cljs @@ -11,11 +11,10 @@ (def screen-container {:flex 1 :padding-top 14 - :padding-left 20 :justify-content :space-between}) -(def padding-right - {:padding-right 20}) +(def padding-horizontal + {:padding-horizontal 20}) (def color-title {:color colors/white-70-blur @@ -23,8 +22,8 @@ :margin-bottom 16}) (def button-wrapper - {:margin-vertical 12 - :padding-right 20}) + {:margin-vertical 12 + :padding-horizontal 20}) (def profile-card {:margin-top 22 diff --git a/src/status_im/contexts/profile/edit/accent_colour/view.cljs b/src/status_im/contexts/profile/edit/accent_colour/view.cljs index 023c52353b68..e0f8db4a0ef4 100644 --- a/src/status_im/contexts/profile/edit/accent_colour/view.cljs +++ b/src/status_im/contexts/profile/edit/accent_colour/view.cljs @@ -34,7 +34,7 @@ {:key :content :style style/screen-container} [rn/view {:style {:flex 1}} - [rn/view {:style style/padding-right} + [rn/view {:style style/padding-horizontal} [quo/text-combinations {:title (i18n/label :t/accent-colour)}] [quo/profile-card {:profile-picture profile-picture @@ -50,6 +50,7 @@ {:blur? true :default-selected @unsaved-custom-color :on-change on-change + :container-style style/padding-horizontal :window-width window-width}]] [rn/view {:style style/button-wrapper} [quo/button diff --git a/src/status_im/navigation/options.cljs b/src/status_im/navigation/options.cljs index 93b67c20be2d..db545150d295 100644 --- a/src/status_im/navigation/options.cljs +++ b/src/status_im/navigation/options.cljs @@ -2,7 +2,8 @@ (:require [quo.foundations.colors :as colors] [quo.theme :as quo.theme] - [react-native.platform :as platform])) + [react-native.platform :as platform] + [status-im.navigation.transitions :as transitions])) (defn default-options [] @@ -88,6 +89,13 @@ :orientation ["portrait"] :backgroundColor :transparent}})) +(def transparent-modal-screen-options + (merge + transparent-screen-options + {:animations (merge + transitions/new-to-status-modal-animations + transitions/push-animations-for-transparent-background)})) + (def sheet-options {:layout {:componentBackgroundColor :transparent :orientation ["portrait"] diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs index 782740120ceb..91a95c39b5c1 100644 --- a/src/status_im/navigation/screens.cljs +++ b/src/status_im/navigation/screens.cljs @@ -172,15 +172,15 @@ :component profiles/view} {:name :edit-profile - :options options/transparent-screen-options + :options options/transparent-modal-screen-options :component edit-profile/view} {:name :edit-accent-colour - :options options/transparent-screen-options + :options options/transparent-modal-screen-options :component edit-accent-colour/view} {:name :edit-name - :options options/transparent-screen-options + :options options/transparent-modal-screen-options :component edit-name/view} {:name :new-to-status