From 84ba111f08c8638dfdbe4d612ae58915ec3a02ce Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Thu, 27 Oct 2016 14:54:24 +0300 Subject: [PATCH] fixes #387 Former-commit-id: 64c8e666ff641f746e09b4b7f9678e6521d72d5c --- src/status_im/chat/handlers.cljs | 14 ++- src/status_im/components/drawer/view.cljs | 133 ++++++++++++---------- 2 files changed, 79 insertions(+), 68 deletions(-) diff --git a/src/status_im/chat/handlers.cljs b/src/status_im/chat/handlers.cljs index 88f75215c9..16e56da248 100644 --- a/src/status_im/chat/handlers.cljs +++ b/src/status_im/chat/handlers.cljs @@ -344,14 +344,16 @@ ((after save-new-chat!)))) (defn update-chat! - [_ [_ chat]] - (chats/save chat)) + [_ [_ {:keys [name] :as chat}]] + (let [chat' (if name chat (dissoc chat :name))] + (chats/save chat'))) (register-handler :update-chat! - (-> (fn [db [_ {:keys [chat-id] :as chat}]] - (if (get-in db [:chats chat-id]) - (update-in db [:chats chat-id] merge chat) - db)) + (-> (fn [db [_ {:keys [chat-id name] :as chat}]] + (let [chat' (if name chat (dissoc chat :name))] + (if (get-in db [:chats chat-id]) + (update-in db [:chats chat-id] merge chat') + db))) ((after update-chat!)))) (register-handler :upsert-chat! diff --git a/src/status_im/components/drawer/view.cljs b/src/status_im/components/drawer/view.cljs index 19fd639362..0a14d8d711 100644 --- a/src/status_im/components/drawer/view.cljs +++ b/src/status_im/components/drawer/view.cljs @@ -17,7 +17,9 @@ [status-im.resources :as res] [status-im.utils.gfycat.core :refer [generate-gfy]] [status-im.i18n :refer [label]] - [status-im.components.react :refer [dismiss-keyboard!]])) + [status-im.components.react :refer [dismiss-keyboard!]] + [clojure.string :as str] + [cljs.spec :as s])) (defonce drawer-atom (atom)) @@ -42,67 +44,74 @@ :font :default} name]]) -(defview drawer-menu [] - [{:keys [name photo-path status]} [:get-current-account] - {new-name :name new-status :status} [:get :profile-edit] - keyboard-height [:get :keyboard-height]] - [view st/drawer-menu - [touchable-without-feedback {:on-press #(dismiss-keyboard!)} - [view st/drawer-menu - [touchable-opacity {:on-press #(dispatch [:navigate-to :my-profile])} - [view st/user-photo-container - [user-photo {:photo-path photo-path}]]] - [view st/name-container - [text-field - {:line-color :white - :focus-line-color :white - :placeholder (generate-gfy) - :editable true - :input-style (st/name-input-text (s/valid? ::v/name (or new-name name))) - :wrapper-style st/name-input-wrapper - :value name - :on-change-text #(dispatch [:set-in [:profile-edit :name] %]) - :on-end-editing #(dispatch [:account-update {:name new-name}])}]] - [view st/status-container - [text-input {:style st/status-input - :editable true - :multiline true - :blur-on-submit true - :maxLength 140 - :accessibility-label :input - :placeholder (label :t/profile-no-status) - :on-change-text #(dispatch [:set-in [:profile-edit :status] %]) - :on-blur (fn[] - (dispatch [:check-status-change new-status]) - (dispatch [:account-update {:status new-status}])) - :default-value status}]] - [view st/menu-items-container - [menu-item {:name (label :t/profile) - :handler #(dispatch [:navigate-to :my-profile])}] - [menu-item {:name (label :t/settings) - :handler (fn [] - ;; TODO not implemented - )}] - [menu-item {:name (label :t/discovery) - :handler #(dispatch [:navigate-to :discovery])}] - [menu-item {:name (label :t/contacts) - :handler #(dispatch [:navigate-to :contact-list])}] - [menu-item {:name (label :t/invite-friends) - :handler (fn [] - ;; TODO not implemented - )}] - [menu-item {:name (label :t/faq) - :handler (fn [])}]] - (when (= keyboard-height 0) - [view st/switch-users-container - [touchable-opacity {:onPress (fn [] - (close-drawer) - (dispatch [:navigate-to :accounts]) - ;; TODO not implemented - )} - [text {:style st/switch-users-text - :font :default} - (label :t/switch-users)]]])]]]) +(defn drawer-menu [] + (let + [account (subscribe [:get-current-account]) + profile (subscribe [:get :profile-edit]) + keyboard-height (subscribe [:get :keyboard-height]) + placeholder (generate-gfy)] + (fn [] + (let [{:keys [name photo-path status]} @account + {new-name :name new-status :status} @profile] + [view st/drawer-menu + [touchable-without-feedback {:on-press #(dismiss-keyboard!)} + [view st/drawer-menu + [touchable-opacity {:on-press #(dispatch [:navigate-to :my-profile])} + [view st/user-photo-container + [user-photo {:photo-path photo-path}]]] + [view st/name-container + [text-field + {:line-color :white + :focus-line-color :white + :placeholder placeholder + :editable true + :input-style (st/name-input-text (s/valid? ::v/name (or new-name name))) + :wrapper-style st/name-input-wrapper + :value name + :on-change-text #(dispatch [:set-in [:profile-edit :name] %]) + :on-end-editing #(when (and new-name (not (str/blank? new-name))) + (dispatch [:account-update {:name new-name}]))}]] + [view st/status-container + [text-input {:style st/status-input + :editable true + :multiline true + :blur-on-submit true + :maxLength 140 + :accessibility-label :input + :placeholder (label :t/profile-no-status) + :on-change-text #(dispatch [:set-in [:profile-edit :status] %]) + :on-blur (fn [] + (when (and new-status (not (str/blank? new-status))) + (dispatch [:check-status-change new-status]) + (dispatch [:account-update {:status new-status}]))) + :default-value status}]] + [view st/menu-items-container + [menu-item {:name (label :t/profile) + :handler #(dispatch [:navigate-to :my-profile])}] + [menu-item {:name (label :t/settings) + :handler (fn [] + ;; TODO not implemented + )}] + [menu-item {:name (label :t/discovery) + :handler #(dispatch [:navigate-to :discovery])}] + [menu-item {:name (label :t/contacts) + :handler #(dispatch [:navigate-to :contact-list])}] + [menu-item {:name (label :t/invite-friends) + :handler (fn [] + ;; TODO not implemented + )}] + [menu-item {:name (label :t/faq) + :handler (fn [])}]] + (when (= @keyboard-height 0) + [view st/switch-users-container + [touchable-opacity {:onPress (fn [] + (close-drawer) + (dispatch [:navigate-to :accounts]) + ;; TODO not implemented + )} + [text {:style st/switch-users-text + :font :default} + (label :t/switch-users)]]])]]])))) (defn drawer-view [items] [drawer-layout {:drawerWidth 260