From 8f7e1d6aa5db99f5be946cafaed31a053d8e9218 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 25 Apr 2016 18:04:28 +0300 Subject: [PATCH 1/2] fix #24 black 'hit' states on button --- src/syng_im/components/chat/chat_message.cljs | 3 ++- src/syng_im/components/chat/input/simple_command.cljs | 3 ++- src/syng_im/components/chat/plain_message_input.cljs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/syng_im/components/chat/chat_message.cljs b/src/syng_im/components/chat/chat_message.cljs index 2e9c7696c2..1275c001f4 100644 --- a/src/syng_im/components/chat/chat_message.cljs +++ b/src/syng_im/components/chat/chat_message.cljs @@ -176,7 +176,8 @@ (let [commands @commands-atom {:keys [command content]} (parse-command-request-msg-content commands content)] [touchable-highlight {:onPress (fn [] - (set-chat-command msg-id command))} + (set-chat-command msg-id command)) + :underlay-color :transparent} [view {:style {:paddingRight 16}} [view {:style (merge {:borderRadius 14 :padding 12} diff --git a/src/syng_im/components/chat/input/simple_command.cljs b/src/syng_im/components/chat/input/simple_command.cljs index f8c678d369..2e45c0662f 100644 --- a/src/syng_im/components/chat/input/simple_command.cljs +++ b/src/syng_im/components/chat/input/simple_command.cljs @@ -68,7 +68,8 @@ message] (if (< 0 (count message)) [touchable-highlight {:on-press (fn [] - (send-command chat-id command message))} + (send-command chat-id command message)) + :underlay-color :transparent} [view {:style {:marginTop 10 :marginRight 10 :width 36 diff --git a/src/syng_im/components/chat/plain_message_input.cljs b/src/syng_im/components/chat/plain_message_input.cljs index f9b37f364c..3ddbc9be19 100644 --- a/src/syng_im/components/chat/plain_message_input.cljs +++ b/src/syng_im/components/chat/plain_message_input.cljs @@ -70,7 +70,8 @@ (when (or (< 0 (count input-message)) (< 0 (count @staged-commands-atom))) [touchable-highlight {:on-press (fn [] - (send @chat input-message))} + (send @chat input-message)) + :underlay-color :transparent} [view {:style {:marginTop 10 :marginRight 10 :width 36 From a41db711d0572f53d226cca6eb737a82912d0fe9 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 25 Apr 2016 18:11:42 +0300 Subject: [PATCH 2/2] :underlay-color for touchable-highlight component --- src/syng_im/components/chat.cljs | 1 - src/syng_im/components/chat/chat_message_new.cljs | 3 +-- src/syng_im/components/chat/input/simple_command.cljs | 3 ++- src/syng_im/components/chat/input/simple_command_staged.cljs | 3 ++- src/syng_im/components/chat/suggestions.cljs | 3 ++- src/syng_im/components/chats/chat_list_item.cljs | 3 ++- src/syng_im/components/chats/chats_list.cljs | 1 - src/syng_im/components/chats/new_group.cljs | 4 ++-- src/syng_im/components/contact_list/contact.cljs | 3 ++- 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/syng_im/components/chat.cljs b/src/syng_im/components/chat.cljs index 9fbe2e1720..a9cb044f50 100644 --- a/src/syng_im/components/chat.cljs +++ b/src/syng_im/components/chat.cljs @@ -5,7 +5,6 @@ view text image - touchable-highlight navigator toolbar-android]] [syng-im.components.realm :refer [list-view]] diff --git a/src/syng_im/components/chat/chat_message_new.cljs b/src/syng_im/components/chat/chat_message_new.cljs index e86e00a746..f050e32fa9 100644 --- a/src/syng_im/components/chat/chat_message_new.cljs +++ b/src/syng_im/components/chat/chat_message_new.cljs @@ -5,8 +5,7 @@ view image text - text-input - touchable-highlight]] + text-input]] [syng-im.components.styles :refer [color-white]] [syng-im.components.chat.plain-message-input :refer [plain-message-input-view]] [syng-im.components.chat.input.simple-command :refer [simple-command-input-view]] diff --git a/src/syng_im/components/chat/input/simple_command.cljs b/src/syng_im/components/chat/input/simple_command.cljs index 2e45c0662f..5896018f3e 100644 --- a/src/syng_im/components/chat/input/simple_command.cljs +++ b/src/syng_im/components/chat/input/simple_command.cljs @@ -82,7 +82,8 @@ :width 15 :height 15}}]]] [touchable-highlight {:on-press (fn [] - (cancel-command-input))} + (cancel-command-input)) + :underlay-color :transparent} [view {:style {:marginTop 10 :marginRight 10 :width 36 diff --git a/src/syng_im/components/chat/input/simple_command_staged.cljs b/src/syng_im/components/chat/input/simple_command_staged.cljs index 478d0ac6cd..ab92aaf958 100644 --- a/src/syng_im/components/chat/input/simple_command_staged.cljs +++ b/src/syng_im/components/chat/input/simple_command_staged.cljs @@ -47,7 +47,8 @@ :top 7 :right 4} :onPress (fn [] - (cancel-command-input chat-id staged-command))} + (cancel-command-input chat-id staged-command)) + :underlay-color :transparent} [image {:source res/icon-close-gray :style {:width 10 :height 10}}]]] diff --git a/src/syng_im/components/chat/suggestions.cljs b/src/syng_im/components/chat/suggestions.cljs index 7016029446..182845eb00 100644 --- a/src/syng_im/components/chat/suggestions.cljs +++ b/src/syng_im/components/chat/suggestions.cljs @@ -21,7 +21,8 @@ (defn suggestion-list-item [suggestion] [touchable-highlight {:onPress (fn [] - (set-command-input (keyword (:command suggestion))))} + (set-command-input (keyword (:command suggestion)))) + :underlay-color :transparent} [view {:style {:flexDirection "row" :marginVertical 1 :marginHorizontal 0 diff --git a/src/syng_im/components/chats/chat_list_item.cljs b/src/syng_im/components/chats/chat_list_item.cljs index 28538e9580..42d33c5a58 100644 --- a/src/syng_im/components/chats/chat_list_item.cljs +++ b/src/syng_im/components/chats/chat_list_item.cljs @@ -11,7 +11,8 @@ (defn chat-list-item [chat-obj navigator] [touchable-highlight {:on-press (fn [] - (dispatch [:show-chat (aget chat-obj "chat-id") navigator :push]))} + (dispatch [:show-chat (aget chat-obj "chat-id") navigator :push])) + :underlay-color :transparent} ;; TODO add [photo-path delivery-status new-messages-count online] values to chat-obj ;; TODO should chat-obj be clj-map? [view {} [chat-list-item-inner-view (merge (js->clj chat-obj :keywordize-keys true) diff --git a/src/syng_im/components/chats/chats_list.cljs b/src/syng_im/components/chats/chats_list.cljs index 314d1b354c..22709b51af 100644 --- a/src/syng_im/components/chats/chats_list.cljs +++ b/src/syng_im/components/chats/chats_list.cljs @@ -4,7 +4,6 @@ view text image - touchable-highlight navigator toolbar-android]] [syng-im.components.realm :refer [list-view]] diff --git a/src/syng_im/components/chats/new_group.cljs b/src/syng_im/components/chats/new_group.cljs index 76cf5ecc81..e977bffcaf 100644 --- a/src/syng_im/components/chats/new_group.cljs +++ b/src/syng_im/components/chats/new_group.cljs @@ -81,8 +81,8 @@ :fontSize 14 :lineHeight 20}} "Members"] - [touchable-highlight {:on-press (fn [] - )} + [touchable-highlight {:on-press (fn []) + :underlay-color :transparent} [view {:style {:flexDirection "row" :marginBottom 16}} [image {:style {:marginVertical 19 diff --git a/src/syng_im/components/contact_list/contact.cljs b/src/syng_im/components/contact_list/contact.cljs index 2b0ecea82c..32f3f34d9c 100644 --- a/src/syng_im/components/contact_list/contact.cljs +++ b/src/syng_im/components/contact_list/contact.cljs @@ -10,5 +10,6 @@ (defn contact-view [{:keys [navigator contact]}] (let [{:keys [whisper-identity]} contact] [touchable-highlight {:onPress (fn [] - (show-chat navigator whisper-identity))} + (show-chat navigator whisper-identity)) + :underlay-color :transparent} [view {} [contact-inner-view contact]]]))