fix status-bar color for new ui (#13641)

This commit is contained in:
Parvesh Monu 2022-07-13 17:12:02 +05:30 committed by GitHub
parent ec69ad6544
commit 08194b3c89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 16 deletions

View File

@ -1,9 +1,11 @@
(ns status-im.navigation2.core (ns status-im.navigation2.core
(:require [re-frame.core :as re-frame] (:require [re-frame.core :as re-frame]
[quo2.foundations.colors :as colors]
[status-im.ui.screens.views :as views] [status-im.ui.screens.views :as views]
[status-im.navigation2.utils :as nav2-utils]
[status-im.navigation2.roots :as roots] [status-im.navigation2.roots :as roots]
[status-im.utils.platform :as platform]
[status-im.navigation.roots :as nav-roots] [status-im.navigation.roots :as nav-roots]
[status-im.navigation2.utils :as nav2-utils]
["react-native-navigation" :refer (Navigation)])) ["react-native-navigation" :refer (Navigation)]))
(def tab-key-idx {:home 0 (def tab-key-idx {:home 0
@ -32,11 +34,13 @@
(str comp "-" id)) (str comp "-" id))
(defn get-options [show-topbar? options] (defn get-options [show-topbar? options]
(if show-topbar?
(merge options (merge options
(nav-roots/status-bar-options) (nav-roots/status-bar-options)
(nav-roots/merge-top-bar (nav-roots/topbar-options) options)) (when platform/android?
{:topBar {:visible false}})) {:navigationBar {:backgroundColor (colors/theme-colors colors/white colors/neutral-90)}})
(if show-topbar?
(nav-roots/merge-top-bar (nav-roots/topbar-options) options)
{:topBar {:visible false}})))
(defn change-stack-root [[comp _]] (defn change-stack-root [[comp _]]
(let [{:keys [options]} (get views/screens comp)] (let [{:keys [options]} (get views/screens comp)]

View File

@ -1,4 +1,14 @@
(ns status-im.navigation2.roots) (ns status-im.navigation2.roots
(:require [quo.theme :as theme]
[quo2.foundations.colors :as colors]
[status-im.utils.platform :as platform]))
(defn status-bar-options []
(if platform/android?
{:navigationBar {:backgroundColor colors/neutral-80}
:statusBar {:backgroundColor (colors/theme-colors colors/neutral-5 colors/neutral-95)
:style (if (theme/dark?) :light :dark)}}
{:statusBar {:style (if (theme/dark?) :light :dark)}}))
(defn roots [] (defn roots []
{:home-stack {:home-stack
@ -6,4 +16,5 @@
{:stack {:id :home-stack {:stack {:id :home-stack
:children [{:component {:name :chat-stack :children [{:component {:name :chat-stack
:id :chat-stack :id :chat-stack
:options {:topBar {:visible false}}}}]}}}}) :options (merge (status-bar-options)
{:topBar {:visible false}})}}]}}}})

View File

@ -16,15 +16,15 @@
:browser-stack @bottom-tabs/load-browser-tab? :browser-stack @bottom-tabs/load-browser-tab?
:wallet-stack @bottom-tabs/load-wallet-tab?)) :wallet-stack @bottom-tabs/load-wallet-tab?))
(defn stack-view [stack-id shared-values top-margin] (defn stack-view [stack-id shared-values]
(when (load-stack? stack-id) (when (load-stack? stack-id)
[:f> [:f>
(fn [] (fn []
[reanimated/view {:style (reanimated/apply-animations-to-style [reanimated/view {:style (reanimated/apply-animations-to-style
{:opacity (get shared-values (get constants/stacks-opacity-keywords stack-id)) {:opacity (get shared-values (get constants/stacks-opacity-keywords stack-id))
:pointer-events (get shared-values (get constants/stacks-pointer-keywords stack-id))} :pointer-events (get shared-values (get constants/stacks-pointer-keywords stack-id))}
{:top top-margin {:top 0
:bottom (if platform/ios? 79 55) :bottom (if platform/ios? 79 54)
:left 0 :left 0
:right 0 :right 0
:position :absolute})} :position :absolute})}
@ -36,10 +36,10 @@
(defn home-stack [shared-values] (defn home-stack [shared-values]
[:<> [:<>
[stack-view :communities-stack shared-values (if platform/ios? 47 0)] [stack-view :communities-stack shared-values]
[stack-view :chats-stack shared-values (if platform/ios? 47 0)] [stack-view :chats-stack shared-values]
[stack-view :browser-stack shared-values 0] [stack-view :browser-stack shared-values]
[stack-view :wallet-stack shared-values 0]]) [stack-view :wallet-stack shared-values]])
(defn home [] (defn home []
[:f> [:f>

View File

@ -18,6 +18,7 @@
[status-im.add-new.db :as db] [status-im.add-new.db :as db]
[status-im.utils.debounce :as debounce] [status-im.utils.debounce :as debounce]
[status-im.utils.utils :as utils] [status-im.utils.utils :as utils]
[quo.components.safe-area :as safe-area]
[status-im.ui.components.topbar :as topbar] [status-im.ui.components.topbar :as topbar]
[status-im.ui.components.plus-button :as components.plus-button] [status-im.ui.components.plus-button :as components.plus-button]
[status-im.ui.screens.chat.sheets :as sheets] [status-im.ui.screens.chat.sheets :as sheets]
@ -179,6 +180,20 @@
:accessibility-label :notifications-unread-badge}]])])) :accessibility-label :notifications-unread-badge}]])]))
(defn home [] (defn home []
[safe-area/consumer
(fn [insets]
[react/keyboard-avoiding-view {:style {:flex 1 :padding-top (:top insets)}
:ignore-offset true}
[topbar/topbar {:title (i18n/label :t/chat)
:navigation :none
:right-component [react/view {:flex-direction :row :margin-right 16}
[connectivity/connectivity-button]
[notifications-button]]}]
[chats-list]
[plus-button]
[tabbar/tabs-counts-subscriptions]])])
(defn home-old []
[react/keyboard-avoiding-view {:style {:flex 1} [react/keyboard-avoiding-view {:style {:flex 1}
:ignore-offset true} :ignore-offset true}
[topbar/topbar {:title (i18n/label :t/chat) [topbar/topbar {:title (i18n/label :t/chat)

View File

@ -216,7 +216,7 @@
;Home ;Home
{:name :home {:name :home
:component home/home} :component home/home-old}
;Chat ;Chat
{:name :chat {:name :chat