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

Merge pull request #401 from status-im/bug/#398 

Upgrade react-native-action-button (#395, #398)

Former-commit-id: 972f5685b6
This commit is contained in:
Jarrad 2016-11-02 09:23:56 -05:00 committed by GitHub
parent 65db1a3347 928780f342
commit d14d9877c1
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -32,7 +32,7 @@
"re-natal": "0.2.38", "re-natal": "0.2.38",
"react": "^15.3.1", "react": "^15.3.1",
"react-native": "^0.36.0", "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-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-camera": "git+https://github.com/lwansbrough/react-native-camera.git",
"react-native-circle-checkbox": "github:paramoshkinandrew/ReactNativeCircleCheckbox", "react-native-circle-checkbox": "github:paramoshkinandrew/ReactNativeCircleCheckbox",

8
src/status_im/chats_list/screen.cljs
View File

@ -50,9 +50,11 @@
(defn chats-action-button [] (defn chats-action-button []
[view {:style (st/action-buttons-container false 0) [view {:style (st/action-buttons-container false 0)
:pointerEvents :box-none} :pointerEvents :box-none}
[action-button {:buttonColor color-blue [action-button {:button-color color-blue
:offsetY 16 :offset-x 16
:offsetX 16} :offset-y -2
:hide-shadow true
:spacing 13}
[action-button-item [action-button-item
{:title (label :t/new-chat) {:title (label :t/new-chat)
:buttonColor :#9b59b6 :buttonColor :#9b59b6

2
src/status_im/chats_list/styles.cljs
View File

@ -131,6 +131,6 @@
{:position :absolute {:position :absolute
:right 0 :right 0
:height 230 :height 230
:width 220 :width 230
:bottom 0 :bottom 0
:transform [{:translateY (if animation? offset-y 1)}]}) :transform [{:translateY (if animation? offset-y 1)}]})

8
src/status_im/contacts/screen.cljs
View File

@ -76,9 +76,11 @@
(defn contacts-action-button [] (defn contacts-action-button []
[view st/buttons-container [view st/buttons-container
[action-button {:buttonColor color-blue [action-button {:button-color color-blue
:offsetY 16 :offset-x 16
:offsetX 16} :offset-y -2
:hide-shadow true
:spacing 13}
[action-button-item [action-button-item
{:title (label :t/new-contact) {:title (label :t/new-contact)
:buttonColor :#9b59b6 :buttonColor :#9b59b6

2
src/status_im/contacts/styles.cljs
View File

@ -205,7 +205,7 @@
{:position :absolute {:position :absolute
:bottom 0 :bottom 0
:right 0 :right 0
:width 200 :width 220
:height 170}) :height 170})
(def qr-input (def qr-input

2
src/status_im/contacts/views/contact.cljs
View File

@ -6,7 +6,7 @@
[status-im.contacts.views.contact-inner :refer [contact-inner-view]])) [status-im.contacts.views.contact-inner :refer [contact-inner-view]]))
(defn on-press [whisper-identity] (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}] (defview contact-view [{:keys [whisper-identity] :as contact}]
[chat [:get-chat whisper-identity]] [chat [:get-chat whisper-identity]]