Delete unnecessary view nesting

This commit is contained in:
virvar 2016-05-03 16:45:06 +03:00
parent ac11508703
commit bbaff31570
1 changed files with 63 additions and 65 deletions

View File

@ -184,12 +184,10 @@
[actions-list-view navigator chat]]) [actions-list-view navigator chat]])
(defn toolbar [navigator chat show-actions] (defn toolbar [navigator chat show-actions]
[view {:style {:flex (if show-actions 1 0)}} [view {:style {:flexDirection "row"
[view {:style {:flexDirection "column" :height 56
:backgroundColor color-white :backgroundColor color-white
:elevation 2}} :elevation 2}}
[view {:style {:flexDirection "row"
:height 56}}
(when (not show-actions) (when (not show-actions)
[touchable-highlight {:on-press (fn [] [touchable-highlight {:on-press (fn []
(nav-pop navigator)) (nav-pop navigator))
@ -249,7 +247,7 @@
[view {:style {:width 56 [view {:style {:width 56
:height 56}} :height 56}}
[chat-photo {}] [chat-photo {}]
[contact-online {:online true}]]])]]]) [contact-online {:online true}]]])])
(defn chat [{:keys [navigator]}] (defn chat [{:keys [navigator]}]
(let [messages (subscribe [:get-chat-messages]) (let [messages (subscribe [:get-chat-messages])