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

Actionbar shaders 

Former-commit-id: 80a119e2d8
This commit is contained in:
virvar 2016-02-26 18:35:55 +03:00
parent 152787d5c6
commit 7043f0526f
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,11 +101,12 @@
"03:39"))))) "03:39")))))
;;; delivery status ;;; delivery status
(when (and outgoing delivery-status) (when (and outgoing delivery-status)
(view {:style {:flexDirection "row"}} (view {:style {:flexDirection "row"
:marginTop 2}}
(image {:source (if (= (keyword delivery-status) :seen) (image {:source (if (= (keyword delivery-status) :seen)
res/seen-icon res/seen-icon
res/delivered-icon) res/delivered-icon)
:style {:marginTop 5 :style {:marginTop 6
:opacity 0.6}}) :opacity 0.6}})
(text {:style {:fontFamily "Avenir-Roman" (text {:style {:fontFamily "Avenir-Roman"
:fontSize 11 :fontSize 11
@ -192,11 +193,10 @@
:subtitleColor "#AAB2B2" :subtitleColor "#AAB2B2"
:navIcon res/nav-back-icon :navIcon res/nav-back-icon
:style {:backgroundColor "white" :style {:backgroundColor "white"
:height 56} :height 56
:elevation 2}
:onIconClicked (fn [] :onIconClicked (fn []
(nav-pop nav))}) (nav-pop nav))})
(view {:style {:backgroundColor "#F3F2F1"
:height 4}})
(list-view {:dataSource messages-ds (list-view {:dataSource messages-ds
:renderScrollComponent :renderScrollComponent
(fn [props] (fn [props]
@ -204,8 +204,7 @@
(clj->js (merge (js->clj props) (clj->js (merge (js->clj props)
{:inverted true})))) {:inverted true}))))
:renderRow render-row :renderRow render-row
:style {:marginTop 4 :style {:backgroundColor "white"}})
:backgroundColor "white"}})
(new-message))))) (new-message)))))
(def chat (om/factory Chat)) (def chat (om/factory Chat))

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

@ -177,10 +177,10 @@
:title "Chats" :title "Chats"
:titleColor "#4A5258" :titleColor "#4A5258"
:style {:backgroundColor "white" :style {:backgroundColor "white"
:height 56}}) :height 56
:elevation 2}})
(list-view {:dataSource contacts-ds (list-view {:dataSource contacts-ds
:renderRow (partial render-row nav) :renderRow (partial render-row nav)
:style {:marginTop 4 :style {:backgroundColor "white"}})))))
:backgroundColor "white"}})))))
(def contacts-list (om/factory ContactsList)) (def contacts-list (om/factory ContactsList))