From a4a8b888a5401dc44f4e8685b5726d1becbabc8e Mon Sep 17 00:00:00 2001
From: virvar <revalka@gmail.com>
Date: Fri, 26 Feb 2016 18:22:54 +0300
Subject: [PATCH] Colors

---
 images/nav-back.png                      | Bin 530 -> 985 bytes
 src/messenger/android/chat.cljs          |  10 +++++++---
 src/messenger/android/contacts_list.cljs |  17 +++++++----------
 src/messenger/android/core.cljs          |   3 ++-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/images/nav-back.png b/images/nav-back.png
index 02f2f6fe852995aed9b84da3cbb002e6baf8d441..6e7cdb7339a20f6845d71fa909c6c500f01f0b71 100644
GIT binary patch
delta 974
zcmbQla+7_6WIY=L1H+>k<rYASEy>&6h2cL4F4((#GEjuGz$3Dlfr0lr2s1iq%&q_m
zvX^-Jy0SlDlH!v!zqEVf0tN==G*1`DkcwMxZ~14)gvzjgc>n%w+GUBZwL(jqGWuU_
zeY<bwM}Ee=N9->;2Zc<L+4ADtv|rB^Dl+w&s_Hf0mM#9KaO<9ss#~(7R!iHPb9`=9
zE4GAaewFvKnWB_+W5(S1?fVYN?Ma&<xo`gM8vplu@9(L6f0oC=1v{uzZ+$y+RZE}^
z?}O46b8^_ON^wt^6n^{dLf#quj6OSFtY4PDJ$>War;B+1E%bX{|E-sWn_-pStCf#<
z?V5rD;yb?|c=4R;P0>YDWvh!H_N?E0>se4Bn|)5{vBVFo4bkh?Gyd2Yawy~Q=djIp
z@`5|8_lx>E8}KLm__bx)W{vLpGq>b-aNlxb4-02!+qGA+W8a1A3nv%7ebspEM#S{n
z7j(azy0lYPy7{gpqg+`a(^d2O+52k6l};5O5UbMcdZ)KihiS)o*Vn5m>eM#Of3jA8
z=j}GRm`-_*kmrndUM({1=sW)-ZqD)9n&I6Ax?S^pdCuLDsA-*J%vL=s&W_#Qo;6@<
zmG&&Lslg3=y9xyF*30EY{LY?dE;KWqdD*mS+wO)){_<e?{X44mO@Dk{U2a~{ruymM
zbxW3AZ)iS!TG_MmgRw)ccrKTK-1j$~i)0jxt(jjH?uoA6#ql6c{4ei`V&DB%@k_3&
z&z#G6>#{!MoyU6h-aPXv&WG)HJt%R`Pwc^e_x&o#40=0GTl+L^PPDG;V)Z!rG3)E8
z3m-1nF>vciv3<F0&~?8pD>2RenYEFjb@Z<Kx94`>Ys$LsE;@7V0`t-%->*kDZ1Fp|
z_JylpCX)mMgJ=mGi@)5~vR+mX&l@jonplb%^2#oXCVz-He2Y7VIq1TcZ$AFs-<f}0
zblp9fW$yIokBfC2yzcRTtNWh6bdPwKsCcgVBJQnaG0&AX&R!Q;?$57gT~^0&!npQh
z=frna7WKAPyG}AKDT)bOx!t-w^hrVduc?MJfWfBDJ>eRkX4f*8r_2nZ;&a=-$>p;h
z^aq;#Do|v_tV##>nB#T+S9;E~{NDFaY0j~eH$O+YncFf<XK-kYRXSO;R@VM3(~>2E
zEYnZ3@iXrD*jY5&!T)O1Tu@?Md~IFmgdV0D#etqI?(b8!?rr^TDbCRM<DXT?_x8XV
lK?jbhkphC)LGHx=3~i4&Cu*}5vjFoVgQu&X%Q~loCIAf)vgH5(

delta 515
zcmcb~K8a<5WIYQ51B1uJ{hNW5Lb6AYF9SoB8UsT^3j@P1pisjL28L1t28LG&3=CE?
z7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<kJ24O~qS#u;97#O=eT^vIyZoRz~
z?RCUKq~)PhLH;A768UqkciZ*cX0X28{J6QPqrTV2D)hNgh{F5-?3^!4=AY%<yS|r^
zO(LNIMg)j%_`h#9)3+Op78;yh2g2>Pu*g18kM{~-tb5MQDRtm}4a1JZ#ry{>{)?Jd
zyl3Dz`<%Jy^Ua12HF^q)^Eo|EK4+ZtDY9Wp4WEMHd`6G6@%$d=;<-J}$Fplp*v}SF
zuT(D=pi(aupjOWppi$2jpjB_VAmU$;!_Ggc4NX728B{-?XYcv!%q7{dr-n<xcs|34
zv*r(&<Q8&QbpBVaai~2}w)F1=*}~rKeDa$%u^da%n|dJ9PhBX&-XxRdo_?xO<Imvv
zP7m@{s|ehXj(*7U?^=?9<HnuRUKeuKvkQf=*T^KY+!YKKaI8Eb?sP$JGn>E__Pa$*
zbypmGIwZbL5K20h+tRY4QC(6o?}?8~hs>|tN4>=lbQJV2*XzH~vEgX)^yw8Y6P_OD
zsek|B!c%86r8xyJHcj!^$zyPUff+_LynHQucL}RN?XH;Lz}RB&boFyt=akR{0LmH2
AnE(I)

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]