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

Colors

This commit is contained in:
virvar 2016-02-26 18:22:54 +03:00
parent 22cda3f0fb
commit a4a8b888a5
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/nav-back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 530 B

After

Width:  |  Height:  |  Size: 985 B

10
src/messenger/android/chat.cljs
View File

@ -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))

17
src/messenger/android/contacts_list.cljs
View File

@ -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))

3
src/messenger/android/core.cljs
View File

@ -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]