status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[BUG #2102] Fixed discover toolbar regression

This commit is contained in:
Julien Eluard 2017-10-11 17:11:23 +02:00 committed by Oskar Thorén
parent 1b7d2db71d
commit 9640b3d6cc
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/status_im/components/toolbar_new/styles.cljs
View File

@ -9,11 +9,18 @@
(def toolbar-icon-height 24) (def toolbar-icon-height 24)
(def toolbar-icon-spacing 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?] (defn toolbar-wrapper [background-color flat?]
{:background-color (or background-color toolbar-background1) {:background-color (or background-color toolbar-background1)
:elevation (if flat? 0 2)}) :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?] (defnstyle toolbar [background-color flat?]
{:flex 0 {:flex 0
:flex-direction :row :flex-direction :row

2
src/status_im/components/toolbar_new/view.cljs
View File

@ -135,7 +135,7 @@
style]}] style]}]
(let [style (merge (tst/toolbar-wrapper background-color false) style)] (let [style (merge (tst/toolbar-wrapper background-color false) style)]
[rn/view {:style style} [rn/view {:style style}
[rn/view tst/toolbar [rn/view tst/toolbar-old
(when-not hide-nav? (when-not hide-nav?
[rn/view (tst/toolbar-nav-actions-container actions) [rn/view (tst/toolbar-nav-actions-container actions)
[nav-button (or nav-action (if modal? act/default-close act/default-back))]]) [nav-button (or nav-action (if modal? act/default-close act/default-back))]])