diff --git a/images/nav-back.png b/images/nav-back.png index 02f2f6fe85..6e7cdb7339 100644 Binary files a/images/nav-back.png and b/images/nav-back.png differ diff --git a/src/messenger/android/chat.cljs b/src/messenger/android/chat.cljs index 0a1bbdd3f7..2ec79f2994 100644 --- a/src/messenger/android/chat.cljs +++ b/src/messenger/android/chat.cljs @@ -183,17 +183,20 @@ [this] (let [{:keys [nav]} (om/get-computed this) messages-ds (load-messages)] - (view {:style {:flex 1}} + (view {:style {:flex 1 + :backgroundColor "white"}} (toolbar-android {:logo res/logo-icon :title "Chat name" :titleColor "#4A5258" :subtitle "Last seen just now" :subtitleColor "#AAB2B2" :navIcon res/nav-back-icon - :style {:backgroundColor "#e9eaed" + :style {:backgroundColor "white" :height 56} :onIconClicked (fn [] (nav-pop nav))}) + (view {:style {:backgroundColor "#F3F2F1" + :height 4}}) (list-view {:dataSource messages-ds :renderScrollComponent (fn [props] @@ -201,7 +204,8 @@ (clj->js (merge (js->clj props) {:inverted true})))) :renderRow render-row - :style {}}) + :style {:marginTop 4 + :backgroundColor "white"}}) (new-message))))) (def chat (om/factory Chat)) diff --git a/src/messenger/android/contacts_list.cljs b/src/messenger/android/contacts_list.cljs index e876ed2a35..7822ee9055 100644 --- a/src/messenger/android/contacts_list.cljs +++ b/src/messenger/android/contacts_list.cljs @@ -42,9 +42,7 @@ :marginBottom 5 :paddingLeft 15 :paddingRight 15 - :height 75 - :transform [{:translateX 0} - {:translateY 0}]}} + :height 75}} (view {:width 54 :height 54} ;;; photo @@ -61,10 +59,7 @@ :borderRadius 50 :width 54 :height 54 - :position "absolute" - ;; :top 2 - ;; :right 2 - }})) + :position "absolute"}})) ;;; online (when online (view {:position "absolute" @@ -176,14 +171,16 @@ (render [this] (let [{:keys [contacts-ds]} (om/props this) {:keys [nav]} (om/get-computed this)] - (view {:style {:flex 1}} + (view {:style {:flex 1 + :backgroundColor "#F3F2F1"}} (toolbar-android {:logo res/logo-icon :title "Chats" :titleColor "#4A5258" - :style {:backgroundColor "#e9eaed" + :style {:backgroundColor "white" :height 56}}) (list-view {:dataSource contacts-ds :renderRow (partial render-row nav) - :style {}}))))) + :style {:marginTop 4 + :backgroundColor "white"}}))))) (def contacts-list (om/factory ContactsList)) diff --git a/src/messenger/android/core.cljs b/src/messenger/android/core.cljs index ecde908242..effe5c1b28 100644 --- a/src/messenger/android/core.cljs +++ b/src/messenger/android/core.cljs @@ -42,7 +42,8 @@ (init-back-button-handler! nav) (let [{:keys [component]} (js->clj route :keywordize-keys true)] - (component (om/computed (om/props this) {:nav nav})))))})))) + (component (om/computed (om/props this) + {:nav nav})))))})))) (swap! state/app-state assoc :contacts-ds (data-source {:rowHasChanged (fn [row1 row2]