no message

remove button container

fix for https://github.com/status-im/status-react/issues/657, and also Russian typo fixed
This commit is contained in:
Andrey Shovkoplyas 2017-01-30 19:32:25 +03:00 committed by Roman Volosovskyi
parent 0944df715f
commit 8110576228
5 changed files with 29 additions and 48 deletions

View File

@ -40,25 +40,23 @@
:style (st/toolbar chats-scrolled?)}])) :style (st/toolbar chats-scrolled?)}]))
(defn chats-action-button [] (defn chats-action-button []
[view {:style (st/action-buttons-container false 0) [action-button {:button-color color-blue
:pointerEvents :box-none} :offset-x 16
[action-button {:button-color color-blue :offset-y 22
:offset-x 16 :hide-shadow true
:offset-y -2 :spacing 13}
:hide-shadow true [action-button-item
:spacing 13} {:title (label :t/new-chat)
[action-button-item :buttonColor :#9b59b6
{:title (label :t/new-chat) :onPress #(dispatch [:navigate-to :group-contacts :people])}
:buttonColor :#9b59b6 [ion-icon {:name :md-create
:onPress #(dispatch [:navigate-to :group-contacts :people])} :style st/create-icon}]]
[ion-icon {:name :md-create [action-button-item
:style st/create-icon}]] {:title (label :t/new-group-chat)
[action-button-item :buttonColor :#1abc9c
{:title (label :t/new-group-chat) :onPress #(dispatch [:navigate-to :new-group])}
:buttonColor :#1abc9c [ion-icon {:name :md-person
:onPress #(dispatch [:navigate-to :new-group])} :style st/person-stalker-icon}]]])
[ion-icon {:name :md-person
:style st/person-stalker-icon}]]]])
(defn chat-shadow-item [] (defn chat-shadow-item []
[view {:height 3} [view {:height 3}

View File

@ -127,12 +127,3 @@
{:fontSize 20 {:fontSize 20
:height 22 :height 22
:color color-white}) :color color-white})
(defn action-buttons-container [animation? offset-y]
;; todo fix overlaying of parent view
{:position :absolute
:right 0
:height 230
:width 230
:bottom 24
:transform [{:translateY (if animation? offset-y 1)}]})

View File

@ -101,18 +101,17 @@
[line-view])])) [line-view])]))
(defn contacts-action-button [] (defn contacts-action-button []
[view st/buttons-container [action-button {:button-color color-blue
[action-button {:button-color color-blue :offset-x 16
:offset-x 16 :offset-y 22
:offset-y -2 :hide-shadow true
:hide-shadow true :spacing 13}
:spacing 13} [action-button-item
[action-button-item {:title (label :t/new-contact)
{:title (label :t/new-contact) :buttonColor :#9b59b6
:buttonColor :#9b59b6 :onPress #(dispatch [:navigate-to :new-contact])}
:onPress #(dispatch [:navigate-to :new-contact])} [ion-icon {:name :md-create
[ion-icon {:name :md-create :style create-icon}]]])
:style create-icon}]]]])
(defn contact-list [_] (defn contact-list [_]
(let [peoples (subscribe [:get-added-people-with-limit contacts-limit]) (let [peoples (subscribe [:get-added-people-with-limit contacts-limit])

View File

@ -201,13 +201,6 @@
{:textAlign :center {:textAlign :center
:color color-gray}) :color color-gray})
(def buttons-container
{:position :absolute
:bottom 24
:right 0
:width 220
:height 170})
(def qr-input (def qr-input
{:margin-right 42}) {:margin-right 42})

View File

@ -122,7 +122,7 @@
:show-all "ПОКАЗАТЬ ВСЕ" :show-all "ПОКАЗАТЬ ВСЕ"
:contacts-group-dapps "ÐApps" :contacts-group-dapps "ÐApps"
:contacts-group-people "Люди" :contacts-group-people "Люди"
:contacts-group-new-chat "Начать новый час" :contacts-group-new-chat "Начать новый чат"
:no-contacts "Пока нет контактов" :no-contacts "Пока нет контактов"
:show-qr "Показать QR" :show-qr "Показать QR"
:enter-address "Ввести адрес" :enter-address "Ввести адрес"