status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-11 11:34:45 +00:00
Code Issues Projects Releases Wiki Activity

fix onboarding transition background color (#15900)

Browse Source
This commit is contained in:
flexsurfer 2023-05-15 16:28:08 +02:00 committed by GitHub
parent fa11c232cc
commit 05073e7453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im2/navigation/core.cljs
View File

@ -75,9 +75,7 @@
(get roots/themes root-id) (get roots/themes root-id)
root-id]) root-id])
(reset! state/root-id (or (get-in root [:root :stack :id]) root-id)) (reset! state/root-id (or (get-in root [:root :stack :id]) root-id))
(if root (navigation/set-root root))))
(navigation/set-root root)
(println "root" root-id root)))))
;; NAVIGATE-TO ;; NAVIGATE-TO
(defn navigate (defn navigate

14
src/status_im2/navigation/options.cljs
View File

@ -22,12 +22,20 @@
{:statusBar {:style (or status-bar-theme :light)}})) {:statusBar {:style (or status-bar-theme :light)}}))
(defn default-root (defn default-root
[& [status-bar-theme]] [& [status-bar-theme background-color]]
(merge (statusbar-and-navbar-root status-bar-theme) (merge (statusbar-and-navbar-root status-bar-theme)
{:topBar {:visible false} {:topBar {:visible false}
:layout {:componentBackgroundColor (colors/theme-colors colors/white colors/neutral-100) :layout {:componentBackgroundColor (or background-color
(colors/theme-colors colors/white colors/neutral-100))
:orientation :portrait :orientation :portrait
:backgroundColor (colors/theme-colors colors/white colors/neutral-100)}})) :backgroundColor (or background-color
(colors/theme-colors colors/white
colors/neutral-100))}}))
(def onboarding-layout
{:componentBackgroundColor colors/neutral-80-opa-80-blur
:orientation :portrait
:backgroundColor colors/neutral-80-opa-80-blur})
(defn navbar (defn navbar
([dark?] ([dark?]

2
src/status_im2/navigation/roots.cljs
View File

@ -96,7 +96,7 @@
{:stack {:id :intro {:stack {:id :intro
:children [{:component {:name :intro :children [{:component {:name :intro
:id :intro :id :intro
:options (options/default-root)}}]}}} :options (options/default-root nil colors/neutral-100)}}]}}}
:shell-stack :shell-stack
{:root {:root
{:stack {:id :shell-stack {:stack {:id :shell-stack

28
src/status_im2/navigation/screens.cljs
View File

@ -37,10 +37,7 @@
(concat (concat
(old-screens/screens) (old-screens/screens)
[{:name :intro [{:name :activity-center
:component intro/view}
{:name :activity-center
:options options/transparent-screen-options :options options/transparent-screen-options
:component activity-center/view} :component activity-center/view}
@ -95,50 +92,65 @@
:component settings-setup-syncing/view} :component settings-setup-syncing/view}
;; Onboarding ;; Onboarding
{:name :intro
:component intro/view}
{:name :profiles {:name :profiles
:options {:layout options/onboarding-layout}
:component profiles/views} :component profiles/views}
{:name :new-to-status {:name :new-to-status
:options {:layout options/onboarding-layout}
:component new-to-status/new-to-status} :component new-to-status/new-to-status}
{:name :create-profile {:name :create-profile
:options {:layout options/onboarding-layout}
:component create-profile/create-profile} :component create-profile/create-profile}
{:name :create-profile-password {:name :create-profile-password
:options {:insets {:top false}} :options {:insets {:top false}
:layout options/onboarding-layout}
:component create-password/create-password} :component create-password/create-password}
{:name :enable-biometrics {:name :enable-biometrics
:options {:layout options/onboarding-layout}
:component enable-biometrics/enable-biometrics} :component enable-biometrics/enable-biometrics}
{:name :generating-keys {:name :generating-keys
:options {:popGesture false :options {:layout options/onboarding-layout
:popGesture false
:hardwareBackButton {:dismissModalOnPress false :hardwareBackButton {:dismissModalOnPress false
:popStackOnPress false}} :popStackOnPress false}}
:component generating-keys/generating-keys} :component generating-keys/generating-keys}
{:name :enter-seed-phrase {:name :enter-seed-phrase
:options {:layout options/onboarding-layout}
:component enter-seed-phrase/enter-seed-phrase} :component enter-seed-phrase/enter-seed-phrase}
{:name :enable-notifications {:name :enable-notifications
:options {:popGesture false :options {:layout options/onboarding-layout
:popGesture false
:hardwareBackButton {:dismissModalOnPress false :hardwareBackButton {:dismissModalOnPress false
:popStackOnPress false}} :popStackOnPress false}}
:component enable-notifications/enable-notifications} :component enable-notifications/enable-notifications}
{:name :identifiers {:name :identifiers
:component identifiers/view :component identifiers/view
:options {:popGesture false :options {:layout options/onboarding-layout
:popGesture false
:hardwareBackButton {:dismissModalOnPress false :hardwareBackButton {:dismissModalOnPress false
:popStackOnPress false}}} :popStackOnPress false}}}
{:name :sign-in {:name :sign-in
:options {:layout options/onboarding-layout}
:component sign-in/view} :component sign-in/view}
{:name :syncing-devices {:name :syncing-devices
:options {:layout options/onboarding-layout}
:component syncing-devices/syncing-devices} :component syncing-devices/syncing-devices}
{:name :welcome {:name :welcome
:options {:layout options/onboarding-layout}
:component welcome/view}] :component welcome/view}]
(when config/quo-preview-enabled? (when config/quo-preview-enabled?