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

Merge branch 'develop' into feature/#124

This commit is contained in:
Roman Volosovskyi 2016-07-06 17:53:34 +03:00
parent 88e5a0c9d8 faf9c786df
commit ee443d113f
5 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,12 @@
(ns status-im.chats-list.styles (ns status-im.chats-list.styles
(:require [status-im.components.styles :refer [font (:require [status-im.components.styles :refer [font
title-font title-font
color-white color-white
color-blue color-blue
online-color online-color
text1-color text1-color
text2-color text2-color
new-messages-count-color]] new-messages-count-color]]
[status-im.components.tabs.styles :refer [tabs-height]])) [status-im.components.tabs.styles :refer [tabs-height]]))
(def chat-container (def chat-container
@ -116,9 +116,10 @@
:color :white}) :color :white})
(defn action-buttons-container [animation? offset-y] (defn action-buttons-container [animation? offset-y]
{:position :absolute ;; todo fix overlaying of parent view
:left 0 {:position :absolute
:right 0 :right 0
:top 0 :height 230
:bottom 0 :width 80
:transform [{:translateY (if animation? offset-y 1)}]}) :bottom 0
:transform [{:translateY (if animation? offset-y 1)}]})

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

@ -103,9 +103,8 @@
[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 [drawer-view
[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}]]])

19
src/status_im/components/tabs/styles.cljs
View File

@ -14,7 +14,11 @@
(def tab-height 56) (def tab-height 56)
(defn tabs-container [hidden? animation? offset-y] (defn tabs-container [hidden? animation? offset-y]
{:height tabs-height {:position :absolute
:bottom 0
:left 0
:right 0
:height tabs-height
:backgroundColor color-white :backgroundColor color-white
:marginBottom (if (or hidden? animation?) :marginBottom (if (or hidden? animation?)
(- tabs-height) 0) (- tabs-height) 0)
@ -55,9 +59,10 @@
:alignItems :center}) :alignItems :center})
(defn tab-view-container [offset-x] (defn tab-view-container [offset-x]
{:position :absolute {:position :absolute
:top 0 :top 0
:left 0 :left 0
:right 0 :right 0
:bottom 0 :bottom 0
:transform [{:translateX offset-x}]}) :padding-bottom 59
:transform [{:translateX offset-x}]})

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

@ -88,12 +88,13 @@
[view st/empty-contact-groups [view st/empty-contact-groups
[react/icon :group_big st/empty-contacts-icon] [react/icon :group_big st/empty-contacts-icon]
[text {:style st/empty-contacts-text} (label :t/no-contacts)]]) [text {:style st/empty-contacts-text} (label :t/no-contacts)]])
[action-button {:buttonColor color-blue [view st/buttons-container
:offsetY 16 [action-button {:buttonColor color-blue
:offsetX 16} :offsetY 16
[action-button-item :offsetX 16}
{:title (label :t/new-contact) [action-button-item
:buttonColor :#9b59b6 {:title (label :t/new-contact)
:onPress #(dispatch [:navigate-to :new-contact])} :buttonColor :#9b59b6
[icon {:name :android-create :onPress #(dispatch [:navigate-to :new-contact])}
:style create-icon}]]]]))) [icon {:name :android-create
:style create-icon}]]]]])))

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

@ -180,3 +180,10 @@
(def address-explication (def address-explication
{:textAlign :center {:textAlign :center
:color "#838c93de"}) :color "#838c93de"})
(def buttons-container
{:position :absolute
:bottom 0
:right 0
:width 200
:height 170})