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

Fix group chat 

Former-commit-id: 69b0dbdb8d
This commit is contained in:
virvar 2016-05-17 13:26:20 +03:00
parent 2d32a5c507
commit 4eba7c0cd9
3 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/syng_im/chat/screen.cljs
View File

@ -224,12 +224,11 @@
:dataSource (to-datasource messages)}]))
(defview chat []
[is-active [:chat :is-active]
group-chat [:chat :group-chat]
[group-chat [:chat :group-chat]
show-actions-atom [:show-actions]]
[view st/chat-view
[chat-toolbar]
[messages-view group-chat]
(when group-chat [typing-all])
(when is-active [chat-message-new])
[chat-message-new]
(when show-actions-atom [actions-view])])

87
src/syng_im/group_settings/group_settings.cljs
View File

@ -1,4 +1,5 @@
(ns syng-im.group-settings.group-settings
(:require-macros [syng-im.utils.views :refer [defview]])
(:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
[syng-im.resources :as res]
[syng-im.components.react :refer [view
@ -38,7 +39,8 @@
[text {:style st/modal-remove-text}
"Remove"]]]]])
(defn chat-members [members]
(defview chat-members []
[members [:current-chat-contacts]]
[view st/chat-members-container
(for [member members]
^{:key member} [member-view member])])
@ -87,10 +89,9 @@
[text {:style st/modal-color-picker-save-btn-text}
"Save"]]]]])))
(defn chat-color-icon []
(let [chat-color (subscribe [:get-current-chat-color])]
(fn []
[view {:style (st/chat-color-icon @chat-color)}])))
(defview chat-color-icon []
[chat-color [:get-current-chat-color]]
[view {:style (st/chat-color-icon chat-color)}])
(defn settings-view []
;; TODO implement settings handlers
@ -121,48 +122,44 @@
(for [setting settings]
^{:key setting} [setting-view setting])]))
(defn chat-icon []
(let [chat-name (subscribe [:get-current-chat-name])
chat-color (subscribe [:get-current-chat-color])]
(fn []
[view (st/chat-icon @chat-color)
[text {:style st/chat-icon-text} (nth @chat-name 0)]])))
(defview chat-icon []
[chat-name [:get-current-chat-name]
chat-color [:get-current-chat-color]]
[view (st/chat-icon chat-color)
[text {:style st/chat-icon-text} (nth chat-name 0)]])
(defn new-group-toolbar []
[toolbar {:title "Chat settings"
:custom-action [chat-icon]}])
(defn group-settings []
(let [chat-name (subscribe [:get-current-chat-name])
members (subscribe [:current-chat-contacts])
selected-member (subscribe [:selected-group-chat-member])
show-color-picker (subscribe [:group-settings-show-color-picker])]
(fn []
[view st/group-settings
[new-group-toolbar]
[scroll-view st/body
[text {:style st/chat-name-text}
"Chat name"]
[view st/chat-name-value-container
[text {:style st/chat-name-value}
@chat-name]
[touchable-highlight {:style st/chat-name-btn-edit-container
:on-press show-chat-name-edit}
[text {:style st/chat-name-btn-edit-text}
"Edit"]]]
[text {:style st/members-text}
"Members"]
[touchable-highlight {:on-press (fn []
(dispatch [:show-add-participants]))}
[view st/add-members-container
[icon :add-gray st/add-members-icon]
[text {:style st/add-members-text}
"Add members"]]]
[chat-members (vals (js->clj @members :keywordize-keys true))]
[text {:style st/settings-text}
"Settings"]
[settings-view]]
(when @show-color-picker
[chat-color-picker])
(when @selected-member
[member-menu @selected-member])])))
(defview group-settings []
[chat-name [:get-current-chat-name]
selected-member [:selected-group-chat-member]
show-color-picker [:group-settings-show-color-picker]]
[view st/group-settings
[new-group-toolbar]
[scroll-view st/body
[text {:style st/chat-name-text}
"Chat name"]
[view st/chat-name-value-container
[text {:style st/chat-name-value}
chat-name]
[touchable-highlight {:style st/chat-name-btn-edit-container
:on-press show-chat-name-edit}
[text {:style st/chat-name-btn-edit-text}
"Edit"]]]
[text {:style st/members-text}
"Members"]
[touchable-highlight {:on-press #(dispatch [:show-add-participants])}
[view st/add-members-container
[icon :add-gray st/add-members-icon]
[text {:style st/add-members-text}
"Add members"]]]
[chat-members]
[text {:style st/settings-text}
"Settings"]
[settings-view]]
(when show-color-picker
[chat-color-picker])
(when selected-member
[member-menu selected-member])])

2
src/syng_im/navigation/handlers.cljs
View File

@ -57,7 +57,7 @@
(push-view db :contact-list)))
(defn clear-new-participants [db]
(assoc-in db :new-participants #{}))
(assoc db :new-participants #{}))
(register-handler :show-remove-participants
(fn [db _]