[BUG #2102] Fixed discover toolbar regression
This commit is contained in:
parent
1b7d2db71d
commit
9640b3d6cc
|
@ -9,11 +9,18 @@
|
|||
(def toolbar-icon-height 24)
|
||||
(def toolbar-icon-spacing 24)
|
||||
|
||||
;; TODO remove when toolbar will be replaced by toolbar2
|
||||
;; TODO remove both definitions when toolbar will be replaced by toolbar2
|
||||
(defn toolbar-wrapper [background-color flat?]
|
||||
{:background-color (or background-color toolbar-background1)
|
||||
:elevation (if flat? 0 2)})
|
||||
|
||||
(defstyle toolbar-old
|
||||
{:flex-direction :row
|
||||
:align-items :center
|
||||
:justify-content :space-between
|
||||
:android {:height 55}
|
||||
:ios {:height 56}})
|
||||
|
||||
(defnstyle toolbar [background-color flat?]
|
||||
{:flex 0
|
||||
:flex-direction :row
|
||||
|
|
|
@ -135,7 +135,7 @@
|
|||
style]}]
|
||||
(let [style (merge (tst/toolbar-wrapper background-color false) style)]
|
||||
[rn/view {:style style}
|
||||
[rn/view tst/toolbar
|
||||
[rn/view tst/toolbar-old
|
||||
(when-not hide-nav?
|
||||
[rn/view (tst/toolbar-nav-actions-container actions)
|
||||
[nav-button (or nav-action (if modal? act/default-close act/default-back))]])
|
||||
|
|
Loading…
Reference in New Issue