From 928780f34251465956e019eb2cdc22a33d0ea540 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Tue, 1 Nov 2016 15:22:38 +0200 Subject: [PATCH] upgrade react-native-action-button (fix #398) fix #395 Former-commit-id: cb433622c9a1f35bb6c41549e7d56307250bf4ac --- package.json | 2 +- src/status_im/chats_list/screen.cljs | 8 +++++--- src/status_im/chats_list/styles.cljs | 2 +- src/status_im/contacts/screen.cljs | 8 +++++--- src/status_im/contacts/styles.cljs | 2 +- src/status_im/contacts/views/contact.cljs | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 94e7efee8b..17c03a8d31 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "re-natal": "0.2.38", "react": "^15.3.1", "react-native": "^0.36.0", - "react-native-action-button": "^1.1.11", + "react-native-action-button": "2.0.13", "react-native-android-sms-listener": "github:adrian-tiberius/react-native-android-sms-listener#listener-bugfix", "react-native-camera": "git+https://github.com/lwansbrough/react-native-camera.git", "react-native-circle-checkbox": "github:paramoshkinandrew/ReactNativeCircleCheckbox", diff --git a/src/status_im/chats_list/screen.cljs b/src/status_im/chats_list/screen.cljs index e98a45fc5c..2aa4293fae 100644 --- a/src/status_im/chats_list/screen.cljs +++ b/src/status_im/chats_list/screen.cljs @@ -50,9 +50,11 @@ (defn chats-action-button [] [view {:style (st/action-buttons-container false 0) :pointerEvents :box-none} - [action-button {:buttonColor color-blue - :offsetY 16 - :offsetX 16} + [action-button {:button-color color-blue + :offset-x 16 + :offset-y -2 + :hide-shadow true + :spacing 13} [action-button-item {:title (label :t/new-chat) :buttonColor :#9b59b6 diff --git a/src/status_im/chats_list/styles.cljs b/src/status_im/chats_list/styles.cljs index 5d9920a262..d4554f4670 100644 --- a/src/status_im/chats_list/styles.cljs +++ b/src/status_im/chats_list/styles.cljs @@ -131,6 +131,6 @@ {:position :absolute :right 0 :height 230 - :width 220 + :width 230 :bottom 0 :transform [{:translateY (if animation? offset-y 1)}]}) diff --git a/src/status_im/contacts/screen.cljs b/src/status_im/contacts/screen.cljs index 60fab7c8ea..9bef7882f7 100644 --- a/src/status_im/contacts/screen.cljs +++ b/src/status_im/contacts/screen.cljs @@ -76,9 +76,11 @@ (defn contacts-action-button [] [view st/buttons-container - [action-button {:buttonColor color-blue - :offsetY 16 - :offsetX 16} + [action-button {:button-color color-blue + :offset-x 16 + :offset-y -2 + :hide-shadow true + :spacing 13} [action-button-item {:title (label :t/new-contact) :buttonColor :#9b59b6 diff --git a/src/status_im/contacts/styles.cljs b/src/status_im/contacts/styles.cljs index fbe4fac600..982518c7d0 100644 --- a/src/status_im/contacts/styles.cljs +++ b/src/status_im/contacts/styles.cljs @@ -205,7 +205,7 @@ {:position :absolute :bottom 0 :right 0 - :width 200 + :width 220 :height 170}) (def qr-input diff --git a/src/status_im/contacts/views/contact.cljs b/src/status_im/contacts/views/contact.cljs index 3056eb92cb..2d11be5334 100644 --- a/src/status_im/contacts/views/contact.cljs +++ b/src/status_im/contacts/views/contact.cljs @@ -6,7 +6,7 @@ [status-im.contacts.views.contact-inner :refer [contact-inner-view]])) (defn on-press [whisper-identity] - #(dispatch [:start-chat whisper-identity])) + #(dispatch [:start-chat whisper-identity {} :navigation-replace])) (defview contact-view [{:keys [whisper-identity] :as contact}] [chat [:get-chat whisper-identity]]