Fix android tabbar animation
Signed-off-by: Gheorghe Pinzaru <feross95@gmail.com>
This commit is contained in:
parent
dd7b3c21ae
commit
81070f07b0
|
@ -43,6 +43,7 @@
|
||||||
"react-native-mail"
|
"react-native-mail"
|
||||||
"react-native-shake"
|
"react-native-shake"
|
||||||
"@react-native-community/netinfo"
|
"@react-native-community/netinfo"
|
||||||
|
"react-native-gesture-handler"
|
||||||
"react-native-safe-area-context"]
|
"react-native-safe-area-context"]
|
||||||
;; Desktop modules
|
;; Desktop modules
|
||||||
:desktop-modules ["buffer"
|
:desktop-modules ["buffer"
|
||||||
|
|
|
@ -274,3 +274,6 @@
|
||||||
(def safe-area-consumer (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaConsumer")))
|
(def safe-area-consumer (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaConsumer")))
|
||||||
|
|
||||||
(def safe-area-view (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaView")))
|
(def safe-area-view (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaView")))
|
||||||
|
|
||||||
|
|
||||||
|
(def touchable-without-feedback-gesture (adapt-class (object/get js-dependencies/react-native-gesture-handler "TouchableWithoutFeedback")))
|
||||||
|
|
|
@ -42,3 +42,5 @@
|
||||||
(def react-navigation-native (js/require "@react-navigation/native"))
|
(def react-navigation-native (js/require "@react-navigation/native"))
|
||||||
(def react-navigation-stack (js/require "@react-navigation/stack"))
|
(def react-navigation-stack (js/require "@react-navigation/stack"))
|
||||||
(def react-navigation-bottom-tabs (js/require "@react-navigation/bottom-tabs"))
|
(def react-navigation-bottom-tabs (js/require "@react-navigation/bottom-tabs"))
|
||||||
|
|
||||||
|
(def react-native-gesture-handler (js/require "react-native-gesture-handler"))
|
|
@ -11,19 +11,17 @@
|
||||||
[status-im.i18n :as i18n]
|
[status-im.i18n :as i18n]
|
||||||
[re-frame.core :as re-frame]))
|
[re-frame.core :as re-frame]))
|
||||||
|
|
||||||
(defonce visible? (animation/create-value 0))
|
(defonce visible-native (animation/create-value 0))
|
||||||
|
|
||||||
(defonce minimized-state (reagent/atom nil))
|
|
||||||
(defonce last-to-value (atom 1))
|
(defonce last-to-value (atom 1))
|
||||||
|
|
||||||
(defn animate
|
(defn animate
|
||||||
([visible duration to]
|
([visible-native duration to]
|
||||||
(animate visible duration to nil))
|
(animate visible-native duration to nil))
|
||||||
([visible duration to callback]
|
([visible-native duration to callback]
|
||||||
(when (not= to @last-to-value)
|
(when (not= to @last-to-value)
|
||||||
(reset! last-to-value to)
|
(reset! last-to-value to)
|
||||||
(animation/start
|
(animation/start
|
||||||
(animation/timing visible
|
(animation/timing visible-native
|
||||||
{:toValue to
|
{:toValue to
|
||||||
:duration duration
|
:duration duration
|
||||||
:easing (animation/cubic)
|
:easing (animation/cubic)
|
||||||
|
@ -37,12 +35,8 @@
|
||||||
|
|
||||||
(defn minimize-bar [route-name]
|
(defn minimize-bar [route-name]
|
||||||
(if (main-tab? route-name)
|
(if (main-tab? route-name)
|
||||||
(do
|
(animate visible-native 150 0)
|
||||||
(reset! minimized-state false)
|
(animate visible-native 150 1)))
|
||||||
(animate visible? 150 0))
|
|
||||||
(do
|
|
||||||
(reset! minimized-state true)
|
|
||||||
(animate visible? 150 1))))
|
|
||||||
|
|
||||||
(def tabs-list-data
|
(def tabs-list-data
|
||||||
(->>
|
(->>
|
||||||
|
@ -73,31 +67,35 @@
|
||||||
(fn [{:keys [icon label active? nav-stack on-press
|
(fn [{:keys [icon label active? nav-stack on-press
|
||||||
accessibility-label count-subscription]}]
|
accessibility-label count-subscription]}]
|
||||||
(let [count (when count-subscription @(re-frame/subscribe [count-subscription]))]
|
(let [count (when count-subscription @(re-frame/subscribe [count-subscription]))]
|
||||||
[react/touchable-highlight {:style tabs.styles/touchable-container
|
[react/view {:style tabs.styles/touchable-container}
|
||||||
:on-press on-press
|
[react/touchable-without-feedback-gesture
|
||||||
:accessibility-label accessibility-label}
|
{:style {:height "100%"
|
||||||
[react/view {:style tabs.styles/tab-container}
|
:width "100%"}
|
||||||
[react/view {:style tabs.styles/icon-container}
|
:on-press on-press
|
||||||
[vector-icons/icon icon (tabs.styles/icon active?)]
|
:accessibility-label accessibility-label}
|
||||||
(when count
|
[react/view {:style tabs.styles/tab-container}
|
||||||
(cond
|
[react/view {:style tabs.styles/icon-container}
|
||||||
(or (pos? count) (pos? (:other count)))
|
[vector-icons/icon icon (tabs.styles/icon active?)]
|
||||||
[react/view {:style (if (= nav-stack :chat-stack)
|
(when count
|
||||||
tabs.styles/message-counter
|
(cond
|
||||||
tabs.styles/counter)}
|
(or (pos? count) (pos? (:other count)))
|
||||||
[badge/message-counter (or (:other count) count) true]]
|
[react/view {:style (if (= nav-stack :chat-stack)
|
||||||
(pos? (:public count))
|
tabs.styles/message-counter
|
||||||
[react/view {:style tabs.styles/counter-public-container}
|
tabs.styles/counter)}
|
||||||
[react/view {:style tabs.styles/counter-public
|
[badge/message-counter (or (:other count) count) true]]
|
||||||
:accessibility-label :public-unread-badge}]]))]
|
(pos? (:public count))
|
||||||
(when-not platform/desktop?
|
[react/view {:style tabs.styles/counter-public-container}
|
||||||
[react/view {:style tabs.styles/tab-title-container}
|
[react/view {:style tabs.styles/counter-public
|
||||||
[react/text {:style (tabs.styles/tab-title active?)}
|
:accessibility-label :public-unread-badge}]]))]
|
||||||
label]])]])))
|
(when-not platform/desktop?
|
||||||
|
[react/view {:style tabs.styles/tab-title-container}
|
||||||
|
[react/text {:style (tabs.styles/tab-title active?)}
|
||||||
|
label]])]]])))
|
||||||
|
|
||||||
(defn tabs []
|
(defn tabs []
|
||||||
(let [listeners (atom [])
|
(let [listeners (atom [])
|
||||||
keyboard-shown? (reagent/atom false)]
|
keyboard-shown? (reagent/atom false)
|
||||||
|
keyboard-visible (animation/create-value 0)]
|
||||||
(reagent/create-class
|
(reagent/create-class
|
||||||
{:component-did-mount
|
{:component-did-mount
|
||||||
(fn []
|
(fn []
|
||||||
|
@ -106,10 +104,20 @@
|
||||||
listeners
|
listeners
|
||||||
[(.addListener react/keyboard "keyboardDidShow"
|
[(.addListener react/keyboard "keyboardDidShow"
|
||||||
(fn []
|
(fn []
|
||||||
(reset! keyboard-shown? true)))
|
(reset! keyboard-shown? true)
|
||||||
|
(reagent/flush)
|
||||||
|
(animation/start
|
||||||
|
(animation/timing keyboard-visible
|
||||||
|
{:toValue 1
|
||||||
|
:duration 200}))))
|
||||||
(.addListener react/keyboard "keyboardDidHide"
|
(.addListener react/keyboard "keyboardDidHide"
|
||||||
(fn []
|
(fn []
|
||||||
(reset! keyboard-shown? false)))])))
|
(animation/start
|
||||||
|
(animation/timing keyboard-visible
|
||||||
|
{:toValue 0
|
||||||
|
:duration 200})
|
||||||
|
#(do (reset! keyboard-shown? false)
|
||||||
|
(reagent/flush)))))])))
|
||||||
:component-will-unmount
|
:component-will-unmount
|
||||||
(fn []
|
(fn []
|
||||||
(when (not-empty @listeners)
|
(when (not-empty @listeners)
|
||||||
|
@ -118,25 +126,24 @@
|
||||||
(.remove listener)))))
|
(.remove listener)))))
|
||||||
:reagent-render
|
:reagent-render
|
||||||
(fn [{:keys [navigate index inset]}]
|
(fn [{:keys [navigate index inset]}]
|
||||||
[react/animated-view {:style (tabs.styles/tabs-wrapper @keyboard-shown? @minimized-state inset)}
|
[react/animated-view {:style (tabs.styles/tabs-wrapper @keyboard-shown? keyboard-visible)
|
||||||
[react/animated-view {:style (tabs.styles/animated-container visible?)}
|
:pointer-events (if @keyboard-shown? "none" "auto")}
|
||||||
[react/view
|
[react/animated-view {:style (tabs.styles/space-handler inset)
|
||||||
{:style tabs.styles/tabs-container}
|
:pointer-events "none"}]
|
||||||
[react/view {:style tabs.styles/tabs}
|
[react/animated-view {:style (tabs.styles/animated-container visible-native inset)}
|
||||||
(for [[route-index
|
(for [[route-index
|
||||||
{:keys [nav-stack accessibility-label count-subscription content]}]
|
{:keys [nav-stack accessibility-label count-subscription content]}]
|
||||||
tabs-list-data
|
tabs-list-data
|
||||||
|
:let [{:keys [icon title]} content]]
|
||||||
:let [{:keys [icon title]} content]]
|
^{:key nav-stack}
|
||||||
^{:key nav-stack}
|
[tab
|
||||||
[tab
|
{:icon icon
|
||||||
{:icon icon
|
:label title
|
||||||
:label title
|
:on-press #(navigate (name nav-stack))
|
||||||
:on-press #(navigate (name nav-stack))
|
:accessibility-label accessibility-label
|
||||||
:accessibility-label accessibility-label
|
:count-subscription count-subscription
|
||||||
:count-subscription count-subscription
|
:active? (= (str index) (str route-index))
|
||||||
:active? (= (str index) (str route-index))
|
:nav-stack nav-stack}])]
|
||||||
:nav-stack nav-stack}])]]]
|
|
||||||
[react/view
|
[react/view
|
||||||
{:style (tabs.styles/ios-titles-cover inset)}]])})))
|
{:style (tabs.styles/ios-titles-cover inset)}]])})))
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
(def tabs-diff (- tabs-height minimized-tabs-height))
|
(def tabs-diff (- tabs-height minimized-tabs-height))
|
||||||
|
|
||||||
(def minimized-tab-ratio
|
(def minimized-tab-ratio
|
||||||
(/ minimized-tabs-height tabs-height))
|
(/ tabs-height minimized-tabs-height))
|
||||||
|
|
||||||
(def counter
|
(def counter
|
||||||
{:right 0
|
{:right 0
|
||||||
|
@ -81,30 +81,23 @@
|
||||||
{:color (if active? colors/blue colors/gray)
|
{:color (if active? colors/blue colors/gray)
|
||||||
:font-size 11})
|
:font-size 11})
|
||||||
|
|
||||||
(styles/def tabs-container
|
(defn animated-container [visible? inset]
|
||||||
{:height minimized-tabs-height
|
{:flex-direction :row
|
||||||
:align-self :stretch
|
:shadow-radius 4
|
||||||
|
:shadow-offset {:width 0 :height -5}
|
||||||
|
:shadow-opacity 0.3
|
||||||
|
:shadow-color "rgba(0, 9, 26, 0.12)"
|
||||||
|
:elevation 8
|
||||||
:background-color :white
|
:background-color :white
|
||||||
:ios {:shadow-radius 4
|
:position :absolute
|
||||||
:shadow-offset {:width 0 :height -5}
|
:left 0
|
||||||
:shadow-opacity 0.3
|
:right 0
|
||||||
:shadow-color "rgba(0, 9, 26, 0.12)"}
|
:height tabs-height
|
||||||
:desktop {:background-color :white
|
:bottom inset
|
||||||
:shadow-radius 4
|
:transform [{:translateY
|
||||||
:shadow-offset {:width 0 :height -5}
|
(animation/interpolate visible?
|
||||||
:shadow-opacity 0.3
|
{:inputRange [0 1]
|
||||||
:shadow-color "rgba(0, 9, 26, 0.12)"}})
|
:outputRange [0 tabs-diff]})}]})
|
||||||
|
|
||||||
(def tabs
|
|
||||||
{:align-self :stretch
|
|
||||||
:padding-horizontal 8
|
|
||||||
:flex-direction :row})
|
|
||||||
|
|
||||||
(defn animated-container [visible?]
|
|
||||||
{:transform [{:translateY
|
|
||||||
(animation/interpolate visible?
|
|
||||||
{:inputRange [0 1]
|
|
||||||
:outputRange [(- tabs-diff) 0]})}]})
|
|
||||||
|
|
||||||
(defn ios-titles-cover [inset]
|
(defn ios-titles-cover [inset]
|
||||||
{:background-color :white
|
{:background-color :white
|
||||||
|
@ -115,11 +108,18 @@
|
||||||
:right 0
|
:right 0
|
||||||
:left 0})
|
:left 0})
|
||||||
|
|
||||||
(defn tabs-wrapper [keyboard minimized inset]
|
(defn tabs-wrapper [keyboard visible]
|
||||||
(merge {:padding-bottom inset
|
(merge {:padding-horizontal 8
|
||||||
:elevation 8
|
:elevation 8
|
||||||
:padding-top (if minimized 0 tabs-diff)
|
:left 0
|
||||||
:background-color :white}
|
:right 0
|
||||||
|
:bottom 0
|
||||||
|
:transform [{:translateY
|
||||||
|
(animation/interpolate visible
|
||||||
|
{:inputRange [0 1]
|
||||||
|
:outputRange [0 tabs-height]})}]}
|
||||||
(when keyboard
|
(when keyboard
|
||||||
{:position :absolute
|
{:position :absolute})))
|
||||||
:bottom (- tabs-height)})))
|
|
||||||
|
(defn space-handler [inset]
|
||||||
|
{:height (+ inset minimized-tabs-height)})
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
[clojure.string :as string]
|
[clojure.string :as string]
|
||||||
[re-frame.core :as re-frame]
|
[re-frame.core :as re-frame]
|
||||||
[status-im.i18n :as i18n]
|
[status-im.i18n :as i18n]
|
||||||
[status-im.ui.components.tabbar.styles :as main-tabs.styles]
|
|
||||||
[status-im.ui.components.styles :as components.styles]
|
[status-im.ui.components.styles :as components.styles]
|
||||||
[status-im.constants :as constants]
|
[status-im.constants :as constants]
|
||||||
[status-im.utils.platform :as utils.platform]
|
[status-im.utils.platform :as utils.platform]
|
||||||
|
@ -112,7 +111,12 @@
|
||||||
:label :t/invite-friends}])])
|
:label :t/invite-friends}])])
|
||||||
|
|
||||||
(views/defview bottom-container [{:keys [on-press disabled label accessibility-label]}]
|
(views/defview bottom-container [{:keys [on-press disabled label accessibility-label]}]
|
||||||
[react/view {:style main-tabs.styles/tabs-container}
|
[react/view {:style {:height 52
|
||||||
|
:elevation 8
|
||||||
|
:shadow-radius 4
|
||||||
|
:shadow-offset {:width 0 :height -5}
|
||||||
|
:shadow-opacity 0.3
|
||||||
|
:shadow-color "rgba(0, 9, 26, 0.12)"}}
|
||||||
[react/view {:style components.styles/flex}]
|
[react/view {:style components.styles/flex}]
|
||||||
[react/view {:style styles/bottom-container}
|
[react/view {:style styles/bottom-container}
|
||||||
[components.common/bottom-button
|
[components.common/bottom-button
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
[status-im.i18n :as i18n]
|
[status-im.i18n :as i18n]
|
||||||
[reagent.core :as reagent]
|
[reagent.core :as reagent]
|
||||||
[clojure.string :as string]
|
[clojure.string :as string]
|
||||||
[status-im.ui.components.tabbar.styles :as main-tabs.styles]
|
|
||||||
[status-im.ui.components.colors :as colors]
|
[status-im.ui.components.colors :as colors]
|
||||||
[status-im.ui.components.icons.vector-icons :as icons]
|
[status-im.ui.components.icons.vector-icons :as icons]
|
||||||
[status-im.utils.platform :as utils.platform]
|
[status-im.utils.platform :as utils.platform]
|
||||||
|
@ -52,8 +51,12 @@
|
||||||
(defn footer [syncing]
|
(defn footer [syncing]
|
||||||
[react/touchable-highlight {:on-press (when-not @syncing
|
[react/touchable-highlight {:on-press (when-not @syncing
|
||||||
synchronize-installations!)
|
synchronize-installations!)
|
||||||
;; TODO: Inspect the need of coupling with tabbar here
|
:style {:height 52
|
||||||
:style main-tabs.styles/tabs-container}
|
:elevation 8
|
||||||
|
:shadow-radius 4
|
||||||
|
:shadow-offset {:width 0 :height -5}
|
||||||
|
:shadow-opacity 0.3
|
||||||
|
:shadow-color "rgba(0, 9, 26, 0.12)"}}
|
||||||
[react/view
|
[react/view
|
||||||
{:style styles/footer-content}
|
{:style styles/footer-content}
|
||||||
[react/text
|
[react/text
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
(ns status-im.ui.screens.routing.browser-stack
|
(ns status-im.ui.screens.routing.browser-stack
|
||||||
(:require [status-im.ui.screens.routing.core :as navigation]
|
(:require [status-im.ui.screens.routing.core :as navigation]
|
||||||
[status-im.ui.screens.browser.open-dapp.views :as open-dapp]
|
[status-im.ui.screens.browser.open-dapp.views :as open-dapp]
|
||||||
[status-im.ui.screens.browser.views :as browser]))
|
[status-im.ui.screens.browser.views :as browser]
|
||||||
|
[status-im.ui.components.tabbar.styles :as tabbar.styles]))
|
||||||
|
|
||||||
(defonce stack (navigation/create-stack))
|
(defonce stack (navigation/create-stack))
|
||||||
|
|
||||||
|
@ -9,6 +10,7 @@
|
||||||
[stack {:initial-route-name :open-dapp
|
[stack {:initial-route-name :open-dapp
|
||||||
:header-mode :none}
|
:header-mode :none}
|
||||||
[{:name :open-dapp
|
[{:name :open-dapp
|
||||||
|
:style {:padding-bottom tabbar.styles/tabs-diff}
|
||||||
:component open-dapp/open-dapp}
|
:component open-dapp/open-dapp}
|
||||||
{:name :browser
|
{:name :browser
|
||||||
:back-handler :noop
|
:back-handler :noop
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
[status-im.ui.screens.profile.group-chat.views :as profile.group-chat]
|
[status-im.ui.screens.profile.group-chat.views :as profile.group-chat]
|
||||||
[status-im.chat.models.loading :as chat.loading]
|
[status-im.chat.models.loading :as chat.loading]
|
||||||
[status-im.ui.screens.group.events :as group.events]
|
[status-im.ui.screens.group.events :as group.events]
|
||||||
|
[status-im.ui.components.tabbar.styles :as tabbar.styles]
|
||||||
[status-im.ui.screens.stickers.views :as stickers]))
|
[status-im.ui.screens.stickers.views :as stickers]))
|
||||||
|
|
||||||
(defonce stack (navigation/create-stack))
|
(defonce stack (navigation/create-stack))
|
||||||
|
@ -16,6 +17,7 @@
|
||||||
:header-mode :none}
|
:header-mode :none}
|
||||||
[{:name :home
|
[{:name :home
|
||||||
:on-focus [::chat.loading/offload-all-messages]
|
:on-focus [::chat.loading/offload-all-messages]
|
||||||
|
:style {:padding-bottom tabbar.styles/tabs-diff}
|
||||||
:component home/home}
|
:component home/home}
|
||||||
{:name :chat
|
{:name :chat
|
||||||
:on-focus [::chat.loading/load-messages]
|
:on-focus [::chat.loading/load-messages]
|
||||||
|
|
|
@ -45,14 +45,19 @@
|
||||||
(remove-back-handler-listener "hardwareBackPress" on-back-press))))
|
(remove-back-handler-listener "hardwareBackPress" on-back-press))))
|
||||||
#js [])))
|
#js [])))
|
||||||
|
|
||||||
(defn wrapped-screen-style [{:keys [insets]} insets-obj]
|
(defn wrapped-screen-style [{:keys [insets style]} insets-obj]
|
||||||
(merge
|
(merge
|
||||||
{:background-color :white
|
{:background-color :white
|
||||||
:flex 1}
|
:flex 1}
|
||||||
|
style
|
||||||
(when (get insets :bottom)
|
(when (get insets :bottom)
|
||||||
{:padding-bottom (oget insets-obj "bottom")})
|
{:padding-bottom (+ (oget insets-obj "bottom")
|
||||||
|
(get style :padding-bottom)
|
||||||
|
(get style :padding-vertical))})
|
||||||
(when (get insets :top true)
|
(when (get insets :top true)
|
||||||
{:padding-top (oget insets-obj "top")})))
|
{:padding-top (+ (oget insets-obj "top")
|
||||||
|
(get style :padding-top)
|
||||||
|
(get style :padding-vertical))})))
|
||||||
|
|
||||||
(defn presentation-type [{:keys [transition] :as opts}]
|
(defn presentation-type [{:keys [transition] :as opts}]
|
||||||
(if (and platform/ios? (= transition :presentation-ios))
|
(if (and platform/ios? (= transition :presentation-ios))
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
[status-im.ui.screens.profile.tribute-to-talk.views :as tr-to-talk]
|
[status-im.ui.screens.profile.tribute-to-talk.views :as tr-to-talk]
|
||||||
[status-im.ui.screens.hardwallet.pin.views :as hardwallet.pin]
|
[status-im.ui.screens.hardwallet.pin.views :as hardwallet.pin]
|
||||||
[status-im.ui.screens.hardwallet.settings.views :as hardwallet.settings]
|
[status-im.ui.screens.hardwallet.settings.views :as hardwallet.settings]
|
||||||
|
[status-im.ui.components.tabbar.styles :as tabbar.styles]
|
||||||
[status-im.ui.screens.routing.core :as navigation]))
|
[status-im.ui.screens.routing.core :as navigation]))
|
||||||
|
|
||||||
(defonce stack (navigation/create-stack))
|
(defonce stack (navigation/create-stack))
|
||||||
|
@ -43,6 +44,7 @@
|
||||||
[stack {:initial-route-name :my-profile
|
[stack {:initial-route-name :my-profile
|
||||||
:header-mode :none}
|
:header-mode :none}
|
||||||
[{:name :my-profile
|
[{:name :my-profile
|
||||||
|
:style {:padding-bottom tabbar.styles/tabs-diff}
|
||||||
:component profile.user/my-profile}
|
:component profile.user/my-profile}
|
||||||
{:name :contacts-list
|
{:name :contacts-list
|
||||||
:component contacts-list/contacts-list}
|
:component contacts-list/contacts-list}
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
[status-im.ui.screens.wallet.add-new.views :as add-account]
|
[status-im.ui.screens.wallet.add-new.views :as add-account]
|
||||||
[status-im.ui.screens.wallet.account-settings.views :as account-settings]
|
[status-im.ui.screens.wallet.account-settings.views :as account-settings]
|
||||||
[status-im.ui.screens.wallet.events :as wallet.events]
|
[status-im.ui.screens.wallet.events :as wallet.events]
|
||||||
|
[status-im.ui.components.tabbar.styles :as tabbar.styles]
|
||||||
[status-im.ui.screens.routing.core :as navigation]))
|
[status-im.ui.screens.routing.core :as navigation]))
|
||||||
|
|
||||||
(defonce stack (navigation/create-stack))
|
(defonce stack (navigation/create-stack))
|
||||||
|
@ -18,6 +19,7 @@
|
||||||
[stack {:initial-route-name :wallet
|
[stack {:initial-route-name :wallet
|
||||||
:header-mode :none}
|
:header-mode :none}
|
||||||
[{:name :wallet
|
[{:name :wallet
|
||||||
|
:style {:padding-bottom tabbar.styles/tabs-diff}
|
||||||
:component wallet.accounts/accounts-overview}
|
:component wallet.accounts/accounts-overview}
|
||||||
{:name :wallet-account
|
{:name :wallet-account
|
||||||
:component wallet.account/account}
|
:component wallet.account/account}
|
||||||
|
|
|
@ -66,3 +66,5 @@
|
||||||
(def react-navigation-stack #js {:createStackNavigator identity
|
(def react-navigation-stack #js {:createStackNavigator identity
|
||||||
:TransitionPresets #js {:ModalPresentationIOS #js {}}})
|
:TransitionPresets #js {:ModalPresentationIOS #js {}}})
|
||||||
(def react-navigation-bottom-tabs #js {:createBottomTabNavigator identity})
|
(def react-navigation-bottom-tabs #js {:createBottomTabNavigator identity})
|
||||||
|
|
||||||
|
(def react-native-gesture-handler #js {})
|
||||||
|
|
Loading…
Reference in New Issue