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

Move drawer to tabs view

This commit is contained in:
virvar 2016-06-16 13:11:01 +03:00
parent 7459b63251
commit 86117b3de2
4 changed files with 66 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
[status-im.chats-list.views.chat-list-item :refer [chat-list-item]] [status-im.chats-list.views.chat-list-item :refer [chat-list-item]]
[status-im.components.action-button :refer [action-button [status-im.components.action-button :refer [action-button
action-button-item]] action-button-item]]
[status-im.components.drawer.view :refer [drawer-view open-drawer]] [status-im.components.drawer.view :refer [open-drawer]]
[status-im.components.styles :refer [color-blue [status-im.components.styles :refer [color-blue
toolbar-background2]] toolbar-background2]]
[status-im.components.toolbar :refer [toolbar]] [status-im.components.toolbar :refer [toolbar]]
@ -33,25 +33,24 @@
(defn chats-list [] (defn chats-list []
(let [chats (subscribe [:get :chats])] (let [chats (subscribe [:get :chats])]
(fn [] (fn []
[drawer-view [view st/chats-container
[view st/chats-container [chats-list-toolbar]
[chats-list-toolbar] [list-view {:dataSource (to-datasource @chats)
[list-view {:dataSource (to-datasource @chats) :renderRow (fn [row _ _]
:renderRow (fn [row _ _] (list-item [chat-list-item row]))
(list-item [chat-list-item row])) :style st/list-container}]
:style st/list-container}] [action-button {:buttonColor color-blue
[action-button {:buttonColor color-blue :offsetY 16
:offsetY 16 :offsetX 16}
:offsetX 16} [action-button-item
[action-button-item {:title (label :t/new-chat)
{:title (label :t/new-chat) :buttonColor :#9b59b6
:buttonColor :#9b59b6 :onPress #(dispatch [:navigate-to :contact-list])}
:onPress #(dispatch [:navigate-to :contact-list])} [icon {:name :android-create
[icon {:name :android-create :style st/create-icon}]]
:style st/create-icon}]] [action-button-item
[action-button-item {:title (label :t/new-group-chat)
{:title (label :t/new-group-chat) :buttonColor :#1abc9c
:buttonColor :#1abc9c :onPress #(dispatch [:show-group-new])}
:onPress #(dispatch [:show-group-new])} [icon {:name :person-stalker
[icon {:name :person-stalker :style st/person-stalker-icon}]]]])))
:style st/person-stalker-icon}]]]]])))

14
src/status_im/components/main_tabs.cljs
View File

@ -10,6 +10,7 @@
image image
touchable-highlight touchable-highlight
get-dimensions]] get-dimensions]]
[status-im.components.drawer.view :refer [drawer-view]]
[status-im.components.animation :as anim] [status-im.components.animation :as anim]
[status-im.chats-list.screen :refer [chats-list]] [status-im.chats-list.screen :refer [chats-list]]
[status-im.discovery.screen :refer [discovery]] [status-im.discovery.screen :refer [discovery]]
@ -101,9 +102,10 @@
(defview main-tabs [] (defview main-tabs []
[view-id [:get :view-id] [view-id [:get :view-id]
tab-animation? [:get :prev-tab-view-id]] tab-animation? [:get :prev-tab-view-id]]
[view {:style common-st/flex} [drawer-view
[view {:style common-st/flex [view {:style common-st/flex}
:pointerEvents (if tab-animation? :none :auto)} [view {:style common-st/flex
(doall (map #(tab-view %) tab-list))] :pointerEvents (if tab-animation? :none :auto)}
[tabs {:selected-view-id view-id (doall (map #(tab-view %) tab-list))]
:tab-list tab-list}]]) [tabs {:selected-view-id view-id
:tab-list tab-list}]]])

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

@ -11,7 +11,7 @@
[status-im.contacts.views.contact :refer [contact-view]] [status-im.contacts.views.contact :refer [contact-view]]
[status-im.components.styles :refer [toolbar-background2]] [status-im.components.styles :refer [toolbar-background2]]
[status-im.components.toolbar :refer [toolbar]] [status-im.components.toolbar :refer [toolbar]]
[status-im.components.drawer.view :refer [drawer-view open-drawer]] [status-im.components.drawer.view :refer [open-drawer]]
[status-im.components.icons.ionicons :refer [icon]] [status-im.components.icons.ionicons :refer [icon]]
[status-im.components.styles :refer [color-blue [status-im.components.styles :refer [color-blue
hamburger-icon hamburger-icon
@ -37,23 +37,21 @@
(defview contact-list [] (defview contact-list []
[contacts [:get-contacts]] [contacts [:get-contacts]]
[drawer-view [view st/contacts-list-container
[view st/contacts-list-container [contact-list-toolbar]
[contact-list-toolbar] ;; todo what if there is no contacts, should we show some information
;; todo what if there is no contacts, should we show some information ;; about this?
;; about this? (when contacts
(when contacts [list-view {:dataSource (lw/to-datasource contacts)
[list-view {:dataSource (lw/to-datasource contacts) :enableEmptySections true
:enableEmptySections true :renderRow render-row
:renderRow render-row :style st/contacts-list}])
:style st/contacts-list}]) [action-button {:buttonColor color-blue
[action-button {:buttonColor color-blue :offsetY 16
:offsetY 16 :offsetX 16}
:offsetX 16} [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])} [icon {:name :android-create
[icon {:name :android-create :style create-icon}]]]])
:style create-icon}]]
]]])

38
src/status_im/contacts/views/new_contact.cljs
View File

@ -8,7 +8,6 @@
linear-gradient linear-gradient
touchable-highlight]] touchable-highlight]]
[status-im.components.toolbar :refer [toolbar]] [status-im.components.toolbar :refer [toolbar]]
[status-im.components.drawer.view :refer [drawer-view open-drawer]]
[status-im.components.styles :refer [color-purple [status-im.components.styles :refer [color-purple
color-white color-white
icon-search icon-search
@ -56,23 +55,20 @@
(defview new-contact [] (defview new-contact []
[{:keys [name whisper-identity phone-number] :as new-contact} [:get :new-contact]] [{:keys [name whisper-identity phone-number] :as new-contact} [:get :new-contact]]
[drawer-view [view st/contact-form-container
[view st/contact-form-container [linear-gradient {:colors ["rgba(182, 116, 241, 1)" "rgba(107, 147, 231, 1)" "rgba(43, 171, 238, 1)"]
[linear-gradient {:colors ["rgba(182, 116, 241, 1)" "rgba(107, 147, 231, 1)" "rgba(43, 171, 238, 1)"] :start [0, 0]
:start [0, 0] :end [0.5, 1]
:end [0.5, 1] :locations [0, 0.8, 1]
:locations [0, 0.8 ,1] :style st/gradient-background}]
:style st/gradient-background}] [toolbar {:background-color :transparent
:nav-action {:image {:source {:uri :icon_back_white}
[toolbar {:background-color :transparent :style icon-back}
:nav-action {:image {:source {:uri :icon_back_white} :handler #(dispatch [:navigate-back])}
:style icon-back} :custom-content toolbar-title
:handler #(dispatch [:navigate-back])} :action {:image {:source {:uri :icon_add}
:custom-content toolbar-title :style icon-search}
:action {:image {:source {:uri :icon_add} :handler #(dispatch [:add-new-contact new-contact])}}]
:style icon-search} [view st/form-container
:handler #(dispatch [:add-new-contact new-contact])}}] [contact-whisper-id-input whisper-identity]
[view st/form-container [contact-name-input name]]])
[contact-whisper-id-input whisper-identity]
[contact-name-input name]
]]])