Merge pull request #401 from status-im/bug/#398
Upgrade react-native-action-button (#395, #398)
This commit is contained in:
commit
972f5685b6
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -131,6 +131,6 @@
|
|||
{:position :absolute
|
||||
:right 0
|
||||
:height 230
|
||||
:width 220
|
||||
:width 230
|
||||
:bottom 0
|
||||
:transform [{:translateY (if animation? offset-y 1)}]})
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -205,7 +205,7 @@
|
|||
{:position :absolute
|
||||
:bottom 0
|
||||
:right 0
|
||||
:width 200
|
||||
:width 220
|
||||
:height 170})
|
||||
|
||||
(def qr-input
|
||||
|
|
|
@ -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]]
|
||||
|
|
Loading…
Reference in New Issue