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

Merge pull request #36 from status-im/black-hit 

fix #24 black 'hit' states on button
This commit is contained in:
Jarrad 2016-04-26 12:35:59 +07:00
parent 2100e08a49 a41db711d0
commit 52dc1e625b
11 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/syng_im/components/chat.cljs
View File

@ -5,7 +5,6 @@
view view
text text
image image
touchable-highlight
navigator navigator
toolbar-android]] toolbar-android]]
[syng-im.components.realm :refer [list-view]] [syng-im.components.realm :refer [list-view]]

3
src/syng_im/components/chat/chat_message.cljs
View File

@ -176,7 +176,8 @@
(let [commands @commands-atom (let [commands @commands-atom
{:keys [command content]} (parse-command-request-msg-content commands content)] {:keys [command content]} (parse-command-request-msg-content commands content)]
[touchable-highlight {:onPress (fn [] [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 {:paddingRight 16}}
[view {:style (merge {:borderRadius 14 [view {:style (merge {:borderRadius 14
:padding 12} :padding 12}

3
src/syng_im/components/chat/chat_message_new.cljs
View File

@ -5,8 +5,7 @@
view view
image image
text text
text-input text-input]]
touchable-highlight]]
[syng-im.components.styles :refer [color-white]] [syng-im.components.styles :refer [color-white]]
[syng-im.components.chat.plain-message-input :refer [plain-message-input-view]] [syng-im.components.chat.plain-message-input :refer [plain-message-input-view]]
[syng-im.components.chat.input.simple-command :refer [simple-command-input-view]] [syng-im.components.chat.input.simple-command :refer [simple-command-input-view]]

6
src/syng_im/components/chat/input/simple_command.cljs
View File

@ -68,7 +68,8 @@
message] message]
(if (< 0 (count message)) (if (< 0 (count message))
[touchable-highlight {:on-press (fn [] [touchable-highlight {:on-press (fn []
(send-command chat-id command message))} (send-command chat-id command message))
:underlay-color :transparent}
[view {:style {:marginTop 10 [view {:style {:marginTop 10
:marginRight 10 :marginRight 10
:width 36 :width 36
@ -81,7 +82,8 @@
:width 15 :width 15
:height 15}}]]] :height 15}}]]]
[touchable-highlight {:on-press (fn [] [touchable-highlight {:on-press (fn []
(cancel-command-input))} (cancel-command-input))
:underlay-color :transparent}
[view {:style {:marginTop 10 [view {:style {:marginTop 10
:marginRight 10 :marginRight 10
:width 36 :width 36

3
src/syng_im/components/chat/input/simple_command_staged.cljs
View File

@ -47,7 +47,8 @@
:top 7 :top 7
:right 4} :right 4}
:onPress (fn [] :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 [image {:source res/icon-close-gray
:style {:width 10 :style {:width 10
:height 10}}]]] :height 10}}]]]

3
src/syng_im/components/chat/plain_message_input.cljs
View File

@ -70,7 +70,8 @@
(when (or (< 0 (count input-message)) (when (or (< 0 (count input-message))
(< 0 (count @staged-commands-atom))) (< 0 (count @staged-commands-atom)))
[touchable-highlight {:on-press (fn [] [touchable-highlight {:on-press (fn []
(send @chat input-message))} (send @chat input-message))
:underlay-color :transparent}
[view {:style {:marginTop 10 [view {:style {:marginTop 10
:marginRight 10 :marginRight 10
:width 36 :width 36

3
src/syng_im/components/chat/suggestions.cljs
View File

@ -21,7 +21,8 @@
(defn suggestion-list-item [suggestion] (defn suggestion-list-item [suggestion]
[touchable-highlight {:onPress (fn [] [touchable-highlight {:onPress (fn []
(set-command-input (keyword (:command suggestion))))} (set-command-input (keyword (:command suggestion))))
:underlay-color :transparent}
[view {:style {:flexDirection "row" [view {:style {:flexDirection "row"
:marginVertical 1 :marginVertical 1
:marginHorizontal 0 :marginHorizontal 0

3
src/syng_im/components/chats/chat_list_item.cljs
View File

@ -11,7 +11,8 @@
(defn chat-list-item [chat-obj navigator] (defn chat-list-item [chat-obj navigator]
[touchable-highlight {:on-press (fn [] [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 add [photo-path delivery-status new-messages-count online] values to chat-obj
;; TODO should chat-obj be clj-map? ;; TODO should chat-obj be clj-map?
[view {} [chat-list-item-inner-view (merge (js->clj chat-obj :keywordize-keys true) [view {} [chat-list-item-inner-view (merge (js->clj chat-obj :keywordize-keys true)

1
src/syng_im/components/chats/chats_list.cljs
View File

@ -4,7 +4,6 @@
view view
text text
image image
touchable-highlight
navigator navigator
toolbar-android]] toolbar-android]]
[syng-im.components.realm :refer [list-view]] [syng-im.components.realm :refer [list-view]]

4
src/syng_im/components/chats/new_group.cljs
View File

@ -81,8 +81,8 @@
:fontSize 14 :fontSize 14
:lineHeight 20}} :lineHeight 20}}
"Members"] "Members"]
[touchable-highlight {:on-press (fn [] [touchable-highlight {:on-press (fn [])
)} :underlay-color :transparent}
[view {:style {:flexDirection "row" [view {:style {:flexDirection "row"
:marginBottom 16}} :marginBottom 16}}
[image {:style {:marginVertical 19 [image {:style {:marginVertical 19

3
src/syng_im/components/contact_list/contact.cljs
View File

@ -10,5 +10,6 @@
(defn contact-view [{:keys [navigator contact]}] (defn contact-view [{:keys [navigator contact]}]
(let [{:keys [whisper-identity]} contact] (let [{:keys [whisper-identity]} contact]
[touchable-highlight {:onPress (fn [] [touchable-highlight {:onPress (fn []
(show-chat navigator whisper-identity))} (show-chat navigator whisper-identity))
:underlay-color :transparent}
[view {} [contact-inner-view contact]]])) [view {} [contact-inner-view contact]]]))