Real last message, chat icon

Former-commit-id: a5350f9b9b

src/syng_im/chat/screen.cljs

@@ -32,13 +32,19 @@
       (assoc msg :text-color text-color
                  :background-color background-color))))
 
-(defn chat-photo [{:keys [photo-path]}]
+(defview default-chat-icon []
-  [view {:margin       10
+  [name  [:chat :name]
-         :borderRadius 50}
+   color [:chat :color]]
-   [image {:source (if (s/blank? photo-path)
+  [view (st/default-chat-icon color)
-                     res/user-no-photo
+   [text {:style st/default-chat-icon-text} (nth name 0)]])
-                     {:uri photo-path})
+
-           :style  st/chat-photo}]])
+(defview chat-photo []
+  [photo-path [:chat-photo]]
+  (if photo-path
+    [view st/contact-photo-container
+     [image {:source {:uri photo-path}
+             :style  st/chat-photo}]]
+    [default-chat-icon]))
 
 (defn contact-online [{:keys [online]}]
   (when online

src/syng_im/chat/styles/screen.cljs

@@ -21,8 +21,10 @@
    :elevation       2})
 
 (def icon-view
-  {:width  56
+  {:width       56
-   :height 56})
+   :height      56
+   :paddingTop  10
+   :paddingLeft 10})
 
 (def back-icon
   {:marginTop  21
@@ -153,6 +155,24 @@
    :fontFamily font
    :color      text2-color})
 
+(defn default-chat-icon [color]
+  {:width           36
+   :height          36
+   :alignItems      :center
+   :justifyContent  :center
+   :borderRadius    50
+   :backgroundColor color})
+
+(def default-chat-icon-text
+  {:marginTop  -2
+   :color      color-white
+   :fontFamily font
+   :fontSize   16
+   :lineHeight 20})
+
+(def contact-photo-container
+  {:borderRadius 50})
+
 (def chat-photo
   {:borderRadius 50
    :width        36

src/syng_im/chats_list/styles.cljs

@@ -8,6 +8,21 @@
                                                text2-color
                                                new-messages-count-color]]))
 
+(defn default-chat-icon [color]
+  {:width           40
+   :height          40
+   :alignItems      :center
+   :justifyContent  :center
+   :borderRadius    50
+   :backgroundColor color})
+
+(def default-chat-icon-text
+  {:marginTop  -2
+   :color      color-white
+   :fontFamily font
+   :fontSize   16
+   :lineHeight 20})
+
 (def contact-photo-container
   {:borderRadius 50})
 

src/syng_im/chats_list/views/chat_list_item.cljs

@@ -13,8 +13,8 @@
    {:on-press #(dispatch [:show-chat chat-id :push])}
    ;; TODO add [photo-path delivery-status new-messages-count online] values to chat-obj
    [view [chat-list-item-inner-view (merge chat
-                                           {:photo-path         nil
+                                           ;; TODO stub data
-                                            :delivery-status    :seen
+                                           {:delivery-status    :seen
                                             :new-messages-count 3
                                             :timestamp          "13:54"
                                             :online             true})]]])

src/syng_im/chats_list/views/inner_item.cljs

@@ -1,16 +1,19 @@
 (ns syng-im.chats-list.views.inner-item
-  (:require [clojure.string :as s]
+  (:require-macros [syng-im.utils.views :refer [defview]])
-            [syng-im.components.react :refer [view image icon text]]
+  (:require [syng-im.components.react :refer [view image icon text]]
-            [syng-im.chats-list.styles :as st]
+            [syng-im.chats-list.styles :as st]))
-            [syng-im.resources :as res]))
 
+(defn default-chat-icon [{:keys [name color]}]
+  [view (st/default-chat-icon color)
+   [text {:style st/default-chat-icon-text} (nth name 0)]])
 
-(defn contact-photo [photo-path]
+(defview contact-photo [chat]
-  [view st/contact-photo-container
+  [photo-path [:chat-photo (:chat-id chat)]]
-   [image {:source (if (s/blank? photo-path)
+  (if photo-path
-                     res/user-no-photo
+    [view st/contact-photo-container
-                     {:uri photo-path})
+     [image {:source {:uri photo-path}
-           :style  st/contact-photo-image}]])
+             :style  st/contact-photo-image}]]
+    [default-chat-icon chat]))
 
 (defn contact-online [online]
   (when online
@@ -19,11 +22,11 @@
      [view st/online-dot-right]]))
 
 (defn chat-list-item-inner-view
-  [{:keys [name photo-path delivery-status timestamp new-messages-count online
+  [{:keys [chat-id name photo-path delivery-status timestamp new-messages-count online
-           group-chat contacts]}]
+           group-chat contacts] :as chat}]
   [view st/chat-container
    [view st/photo-container
-    [contact-photo photo-path]
+    [contact-photo chat]
     [contact-online online]]
    [view st/item-container
     [view st/name-view
@@ -37,7 +40,8 @@
           "1 member")])]
     [text {:style         st/last-message-text
            :numberOfLines 2}
-     (repeatedly 5 #(str "Hi, I'm " name "! "))]]
+     (when-let [last-message (first (:messages chat))]
+       (:content last-message))]]
    [view
     [view st/status-container
      (when delivery-status

src/syng_im/constants.cljs

@@ -4,18 +4,9 @@
 
 (def server-address "http://rpc0.syng.im:20000/")
 ;; (def server-address "http://10.0.3.2:3000/")
+;; (def server-address "http://localhost:3000/")
 
 (def text-content-type "text/plain")
 (def content-type-command "command")
 (def content-type-command-request "command-request")
 (def content-type-status "status")
-
-
-(comment
-
-  (map (fn [c]
-         {:background c
-          :foreground c}) group-chat-colors)
-  (reverse group-chat-colors)
-
-  )

src/syng_im/contacts/subs.cljs

@@ -12,18 +12,21 @@
     (let [contacts (reaction (:contacts @db))]
       (reaction (sort-by :name (vals @contacts))))))
 
-(defn contacts-by-current-chat [fn db]
+(defn contacts-by-chat [fn db chat-id]
-  (let [current-chat-id (:current-chat-id @db)
+  (let [chat     (reaction (get-in @db [:chats chat-id]))
-        chat            (reaction (get-in @db [:chats current-chat-id]))
+        contacts (reaction (:contacts @db))]
-        contacts        (reaction (:contacts @db))]
     (reaction
-      (when @chat
+     (when @chat
-        (let [current-participants (->> @chat
+       (let [current-participants (->> @chat
-                                        :contacts
+                                       :contacts
-                                        (map :identity)
+                                       (map :identity)
-                                        set)]
+                                       set)]
-          (fn #(current-participants (:whisper-identity %))
+         (fn #(current-participants (:whisper-identity %))
-              (vals @contacts)))))))
+           (vals @contacts)))))))
+
+(defn contacts-by-current-chat [fn db]
+  (let [current-chat-id (:current-chat-id @db)]
+    (contacts-by-chat fn db current-chat-id)))
 
 (register-sub :contact
   (fn [db _]
@@ -37,3 +40,15 @@
 (register-sub :current-chat-contacts
   (fn [db _]
     (contacts-by-current-chat filter db)))
+
+(register-sub :chat-photo
+  (fn [db [_ chat-id]]
+    (let [chat-id  (or chat-id (:current-chat-id @db))
+          chat     (reaction (get-in @db [:chats chat-id]))
+          contacts (contacts-by-chat filter db chat-id)]
+      (reaction
+       (when @chat
+         (if (:group-chat @chat)
+           ;; TODO return group chat icon
+           nil
+           (:photo-path (first @contacts))))))))

src/syng_im/group_settings/styles/group_settings.cljs

@@ -56,12 +56,13 @@
   {:margin          10
    :width           36
    :height          36
+   :alignItems      :center
+   :justifyContent  :center
    :borderRadius    50
    :backgroundColor color})
 
 (def chat-icon-text
-  {:marginTop  7
+  {:marginTop  -2
-   :marginLeft 13
    :color      color-white
    :fontFamily font
    :fontSize   16