Merge branch 'feature/#123' into feature/command-suggestions-animation

This commit is contained in:
Roman Volosovskyi 2016-06-27 12:38:31 +03:00
commit 463c824e57
3 changed files with 41 additions and 41 deletions

View File

@ -1,15 +1,15 @@
(ns status-im.chat.styles.message
(:require [status-im.components.styles :refer [font
color-light-blue-transparent
color-white
color-black
color-blue
selected-message-color
online-color
text1-color
text2-color]]
color-light-blue-transparent
color-white
color-black
color-blue
selected-message-color
online-color
text1-color
text2-color]]
[status-im.constants :refer [text-content-type
content-type-command]]))
content-type-command]]))
(def style-message-text
{:fontSize 14
@ -154,13 +154,12 @@
:transform [{:scale scale}]})
(def command-image-view
{:position :absolute
:top 0
:right 0
:width 24
:height 24
:borderRadius 50
:alignItems :center})
{:position :absolute
:top 0
:right 0
:width 24
:height 24
:alignItems :center})
(def command-request-image
{:position :absolute
@ -195,9 +194,9 @@
(def command-image
{:margin-top 5
:width 12
:height 13
:tintColor :#a9a9a9cc})
:width 12
:height 13
:tint-color :#a9a9a9cc})
(def command-text
(merge style-message-text

View File

@ -56,26 +56,22 @@
[view st/track-mark]
[text {:style st/track-duration-text} "03:39"]]])
(defn message-content-command [content preview]
(let [commands-atom (subscribe [:get-commands-and-responses])]
(fn [content preview]
(let [commands @commands-atom
{:keys [command content]}
(parse-command-msg-content commands content)]
[view st/content-command-view
[view st/command-container
[view (st/command-view command)
[text {:style st/command-name}
(str "!" (:name command))]]]
;; todo doesn't reflect design
(when-let [icon (:icon command)]
[view st/command-image-view
[image {:source {:uri icon}
:style st/command-image}]])
(if preview
preview
[text {:style st/command-text}
content])]))))
(defview message-content-command [content preview]
[commands [:get-commands-and-responses]]
(let [{:keys [command content]} (parse-command-msg-content commands content)
{:keys [name icon type]} command]
[view st/content-command-view
[view st/command-container
[view (st/command-view command)
[text {:style st/command-name}
(str (if (= :command type) "!" "") name)]]]
(when icon
[view st/command-image-view
[image {:source {:uri icon}
:style st/command-image}]])
(if preview
preview
[text {:style st/command-text} content])]))
(defn set-chat-command [msg-id command]
(dispatch [:set-response-chat-command msg-id (keyword (:name command))]))

View File

@ -61,11 +61,16 @@
(get-hash-by-file file))]
(assoc db ::valid-hash valid?)))
(defn mark-as [as coll]
(->> coll
(map (fn [[k v]] [k (assoc v :type as)]))
(into {})))
(defn add-commands
[db [id _ {:keys [commands responses]}]]
(-> db
(update-in [:chats id :commands] merge commands)
(update-in [:chats id :responses] merge responses)))
(update-in [:chats id :commands] merge (mark-as :command commands))
(update-in [:chats id :responses] merge (mark-as :response responses))))
(defn save-commands-js!
[_ [id file]]