fix: wrong navigation bar color in transparent screens (#18451)
This commit is contained in:
parent
5926426672
commit
bf8461f007
|
@ -81,16 +81,12 @@
|
|||
|
||||
(def transparent-screen-options
|
||||
(merge
|
||||
(statusbar-and-navbar-root)
|
||||
{:modalPresentationStyle :overCurrentContext
|
||||
:theme :dark
|
||||
:layout {:componentBackgroundColor :transparent
|
||||
:orientation ["portrait"]
|
||||
:backgroundColor :transparent}}
|
||||
(if platform/android?
|
||||
{:statusBar {:backgroundColor :transparent
|
||||
:style :light
|
||||
:drawBehind true}}
|
||||
{:statusBar {:style :light}})))
|
||||
:backgroundColor :transparent}}))
|
||||
|
||||
(def sheet-options
|
||||
{:layout {:componentBackgroundColor :transparent
|
||||
|
@ -105,7 +101,7 @@
|
|||
{})})
|
||||
|
||||
(def dark-screen
|
||||
(merge (statusbar true)
|
||||
(merge (statusbar-and-navbar-root)
|
||||
{:theme :dark
|
||||
:layout {:componentBackgroundColor colors/neutral-95
|
||||
:orientation ["portrait"]
|
||||
|
|
|
@ -119,7 +119,7 @@
|
|||
:component lightbox/lightbox}
|
||||
|
||||
{:name :photo-selector
|
||||
:options {:sheet? true}
|
||||
:options (merge {:sheet? true} (options/statusbar-and-navbar-root))
|
||||
:component photo-selector/photo-selector}
|
||||
|
||||
{:name :camera-screen
|
||||
|
@ -202,14 +202,17 @@
|
|||
:component create-password/create-password}
|
||||
|
||||
{:name :enable-biometrics
|
||||
:options {:theme :dark
|
||||
:layout options/onboarding-transparent-layout
|
||||
:animations (merge transitions/new-to-status-modal-animations
|
||||
transitions/push-animations-for-transparent-background)
|
||||
:popGesture false
|
||||
:modalPresentationStyle :overCurrentContext
|
||||
:hardwareBackButton {:dismissModalOnPress false
|
||||
:popStackOnPress false}}
|
||||
:options (merge
|
||||
(options/statusbar-and-navbar-root)
|
||||
{:theme :dark
|
||||
:layout options/onboarding-transparent-layout
|
||||
:animations (merge
|
||||
transitions/new-to-status-modal-animations
|
||||
transitions/push-animations-for-transparent-background)
|
||||
:popGesture false
|
||||
:modalPresentationStyle :overCurrentContext
|
||||
:hardwareBackButton {:dismissModalOnPress false
|
||||
:popStackOnPress false}})
|
||||
:component enable-biometrics/view}
|
||||
|
||||
{:name :generating-keys
|
||||
|
@ -229,11 +232,14 @@
|
|||
:component enter-seed-phrase/enter-seed-phrase}
|
||||
|
||||
{:name :enable-notifications
|
||||
:options {:theme :dark
|
||||
:layout options/onboarding-transparent-layout
|
||||
:animations (merge transitions/new-to-status-modal-animations
|
||||
transitions/push-animations-for-transparent-background)
|
||||
:modalPresentationStyle :overCurrentContext}
|
||||
:options (merge
|
||||
(options/statusbar-and-navbar-root)
|
||||
{:theme :dark
|
||||
:layout options/onboarding-transparent-layout
|
||||
:animations (merge
|
||||
transitions/new-to-status-modal-animations
|
||||
transitions/push-animations-for-transparent-background)
|
||||
:modalPresentationStyle :overCurrentContext})
|
||||
:component enable-notifications/view}
|
||||
|
||||
{:name :identifiers
|
||||
|
@ -264,9 +270,11 @@
|
|||
:component sign-in/view}
|
||||
|
||||
{:name :syncing-progress
|
||||
:options {:theme :dark
|
||||
:layout options/onboarding-layout
|
||||
:popGesture false}
|
||||
:options (merge
|
||||
(options/statusbar-and-navbar-root)
|
||||
{:theme :dark
|
||||
:layout options/onboarding-layout
|
||||
:popGesture false})
|
||||
:component syncing-devices/view}
|
||||
|
||||
{:name :syncing-progress-intro
|
||||
|
@ -281,9 +289,11 @@
|
|||
:component syncing-results/view}
|
||||
|
||||
{:name :welcome
|
||||
:options {:theme :dark
|
||||
:layout options/onboarding-transparent-layout
|
||||
:animations transitions/push-animations-for-transparent-background}
|
||||
:options (merge
|
||||
(options/statusbar-and-navbar-root)
|
||||
{:theme :dark
|
||||
:layout options/onboarding-transparent-layout
|
||||
:animations transitions/push-animations-for-transparent-background})
|
||||
:component welcome/view}
|
||||
|
||||
{:name :emoji-picker
|
||||
|
|
Loading…
Reference in New Issue