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 #137 from status-im/fix/single-drawer 

Single drawer

Former-commit-id: 5271fa7101
This commit is contained in:
Roman Volosovskyi 2016-06-22 10:49:22 +03:00 committed by GitHub
parent 748dfcae33 e464079a84
commit 5b02dcc928
4 changed files with 98 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,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-background1 toolbar-background1
toolbar-background2]] toolbar-background2]]
@ -46,7 +46,6 @@
content-height (r/atom 0)] content-height (r/atom 0)]
(dispatch [:set :chats-scrolled? false]) (dispatch [:set :chats-scrolled? false])
(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)
@ -83,4 +82,4 @@
: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}]]]]])))

4
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]]
[drawer-view
[view {:style common-st/flex} [view {:style common-st/flex}
[view {:style common-st/flex [view {:style common-st/flex
:pointerEvents (if tab-animation? :none :auto)} :pointerEvents (if tab-animation? :none :auto)}
(doall (map #(tab-view %) tab-list))] (doall (map #(tab-view %) tab-list))]
[tabs {:selected-view-id view-id [tabs {:selected-view-id view-id
:tab-list tab-list}]]) :tab-list tab-list}]]])

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

@ -13,7 +13,7 @@
action-button-item]] action-button-item]]
[status-im.contacts.views.contact :refer [contact-extended-view]] [status-im.contacts.views.contact :refer [contact-extended-view]]
[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
@ -63,7 +63,6 @@
contcats-count (subscribe [:contacts-count]) contcats-count (subscribe [:contacts-count])
show-toolbar-shadow? (r/atom false)] show-toolbar-shadow? (r/atom false)]
(fn [] (fn []
[drawer-view
[view st/contacts-list-container [view st/contacts-list-container
[contact-list-toolbar] [contact-list-toolbar]
[view {:style st/toolbar-shadow} [view {:style st/toolbar-shadow}
@ -97,4 +96,4 @@
: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}]]]])))

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

@ -9,7 +9,6 @@
touchable-highlight]] touchable-highlight]]
[status-im.utils.identicon :refer [identicon]] [status-im.utils.identicon :refer [identicon]]
[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
@ -57,12 +56,11 @@
(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 [toolbar {:background-color :transparent
@ -75,5 +73,4 @@
:handler #(dispatch [:add-new-contact (merge {:photo-path (identicon whisper-identity)} new-contact)])}}] :handler #(dispatch [:add-new-contact (merge {:photo-path (identicon whisper-identity)} new-contact)])}}]
[view st/form-container [view st/form-container
[contact-whisper-id-input whisper-identity] [contact-whisper-id-input whisper-identity]
[contact-name-input name] [contact-name-input name]]])
]]])