Merge pull request #136 from status-im/feature/#31
White actionbar and hide tabs bar on scroll
This commit is contained in:
commit
43961c2b7a
|
@ -1,8 +1,10 @@
|
||||||
(ns status-im.chats-list.screen
|
(ns status-im.chats-list.screen
|
||||||
|
(:require-macros [status-im.utils.views :refer [defview]])
|
||||||
(:require [re-frame.core :refer [subscribe dispatch]]
|
(:require [re-frame.core :refer [subscribe dispatch]]
|
||||||
[status-im.components.react :refer [list-view
|
[status-im.components.react :refer [list-view
|
||||||
list-item
|
list-item
|
||||||
view
|
view
|
||||||
|
animated-view
|
||||||
text
|
text
|
||||||
image
|
image
|
||||||
touchable-highlight]]
|
touchable-highlight]]
|
||||||
|
@ -13,45 +15,72 @@
|
||||||
action-button-item]]
|
action-button-item]]
|
||||||
[status-im.components.drawer.view :refer [drawer-view open-drawer]]
|
[status-im.components.drawer.view :refer [drawer-view open-drawer]]
|
||||||
[status-im.components.styles :refer [color-blue
|
[status-im.components.styles :refer [color-blue
|
||||||
|
toolbar-background1
|
||||||
toolbar-background2]]
|
toolbar-background2]]
|
||||||
[status-im.components.toolbar :refer [toolbar]]
|
[status-im.components.toolbar :refer [toolbar]]
|
||||||
[status-im.components.icons.ionicons :refer [icon]]
|
[status-im.components.icons.ionicons :refer [icon]]
|
||||||
[status-im.i18n :refer [label]]
|
[status-im.i18n :refer [label]]
|
||||||
[status-im.chats-list.styles :as st]))
|
[status-im.chats-list.styles :as st]
|
||||||
|
[status-im.components.tabs.styles :refer [tabs-height]]))
|
||||||
|
|
||||||
(defn chats-list-toolbar []
|
(defview chats-list-toolbar []
|
||||||
|
[chats-scrolled? [:get :chats-scrolled?]]
|
||||||
[toolbar {:nav-action {:image {:source {:uri :icon_hamburger}
|
[toolbar {:nav-action {:image {:source {:uri :icon_hamburger}
|
||||||
:style st/hamburger-icon}
|
:style st/hamburger-icon}
|
||||||
:handler open-drawer}
|
:handler open-drawer}
|
||||||
:title (label :t/chats)
|
:title (label :t/chats)
|
||||||
:background-color toolbar-background2
|
:background-color (if chats-scrolled?
|
||||||
|
toolbar-background1
|
||||||
|
toolbar-background2)
|
||||||
;; TODO implement search
|
;; TODO implement search
|
||||||
:action {:image {:source {:uri :icon_search}
|
:action {:image {:source {:uri :icon_search}
|
||||||
:style st/search-icon}
|
:style st/search-icon}
|
||||||
:handler (fn [])}}])
|
:handler (fn [])}}])
|
||||||
|
|
||||||
(defn chats-list []
|
(defn chats-list []
|
||||||
(let [chats (subscribe [:get :chats])]
|
(let [chats (subscribe [:get :chats])
|
||||||
|
chats-scrolled? (subscribe [:get :chats-scrolled?])
|
||||||
|
animation? (subscribe [:animations :tabs-bar-animation?])
|
||||||
|
tabs-bar-value (subscribe [:animations :tabs-bar-value])
|
||||||
|
container-height (r/atom 0)
|
||||||
|
content-height (r/atom 0)]
|
||||||
|
(dispatch [:set :chats-scrolled? false])
|
||||||
(fn []
|
(fn []
|
||||||
[drawer-view
|
[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
|
;;; if "maximazing" chat list will make scroll to 0,
|
||||||
:offsetY 16
|
;;; then disable maximazing
|
||||||
:offsetX 16}
|
:onLayout (fn [event]
|
||||||
[action-button-item
|
(when-not @chats-scrolled?
|
||||||
{:title (label :t/new-chat)
|
(let [height (.. event -nativeEvent -layout -height)]
|
||||||
:buttonColor :#9b59b6
|
(reset! container-height height))))
|
||||||
:onPress #(dispatch [:navigate-to :contact-list])}
|
:onContentSizeChange (fn [width height]
|
||||||
[icon {:name :android-create
|
(reset! content-height height))
|
||||||
:style st/create-icon}]]
|
:onScroll (fn [e]
|
||||||
[action-button-item
|
(let [offset (.. e -nativeEvent -contentOffset -y)
|
||||||
{:title (label :t/new-group-chat)
|
min-content-height (+ @container-height tabs-height)
|
||||||
:buttonColor :#1abc9c
|
scrolled? (and (< 0 offset) (< min-content-height @content-height))]
|
||||||
:onPress #(dispatch [:show-group-new])}
|
(dispatch [:set :chats-scrolled? scrolled?])
|
||||||
[icon {:name :person-stalker
|
(dispatch [:set-animation :tabs-bar-animation? true])))}]
|
||||||
:style st/person-stalker-icon}]]]]])))
|
[animated-view {:style (st/action-buttons-container @animation? (or @tabs-bar-value 0))
|
||||||
|
:pointerEvents :box-none}
|
||||||
|
[action-button {:buttonColor color-blue
|
||||||
|
:offsetY 16
|
||||||
|
:offsetX 16}
|
||||||
|
[action-button-item
|
||||||
|
{:title (label :t/new-chat)
|
||||||
|
:buttonColor :#9b59b6
|
||||||
|
:onPress #(dispatch [:navigate-to :contact-list])}
|
||||||
|
[icon {:name :android-create
|
||||||
|
:style st/create-icon}]]
|
||||||
|
[action-button-item
|
||||||
|
{:title (label :t/new-group-chat)
|
||||||
|
:buttonColor :#1abc9c
|
||||||
|
:onPress #(dispatch [:show-group-new])}
|
||||||
|
[icon {:name :person-stalker
|
||||||
|
:style st/person-stalker-icon}]]]]]])))
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
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]]))
|
||||||
|
|
||||||
(def chat-container
|
(def chat-container
|
||||||
{:flexDirection :row
|
{:flexDirection :row
|
||||||
|
@ -113,3 +114,11 @@
|
||||||
{:fontSize 20
|
{:fontSize 20
|
||||||
:height 22
|
:height 22
|
||||||
:color :white})
|
:color :white})
|
||||||
|
|
||||||
|
(defn action-buttons-container [animation? offset-y]
|
||||||
|
{:position :absolute
|
||||||
|
:left 0
|
||||||
|
:right 0
|
||||||
|
:top 0
|
||||||
|
:bottom 0
|
||||||
|
:transform [{:translateY (if animation? offset-y 1)}]})
|
||||||
|
|
|
@ -10,21 +10,21 @@
|
||||||
text2-color
|
text2-color
|
||||||
toolbar-background1]]))
|
toolbar-background1]]))
|
||||||
|
|
||||||
|
(def tabs-height 59)
|
||||||
(def tab-height 56)
|
(def tab-height 56)
|
||||||
|
|
||||||
(def tabs
|
(defn tabs-container [hidden? animation? offset-y]
|
||||||
{:flex 1
|
{:height tabs-height
|
||||||
:position :absolute
|
:backgroundColor color-white
|
||||||
:bottom 0
|
:marginBottom (if (or hidden? animation?)
|
||||||
:right 0
|
(- tabs-height) 0)
|
||||||
:left 0
|
:transform [{:translateY (if animation? offset-y 1)}]})
|
||||||
})
|
|
||||||
|
|
||||||
(def top-gradient
|
(def top-gradient
|
||||||
{:flexDirection :row
|
{:flexDirection :row
|
||||||
:height 3})
|
:height 3})
|
||||||
|
|
||||||
(def tabs-container
|
(def tabs-inner-container
|
||||||
{:flexDirection :row
|
{:flexDirection :row
|
||||||
:height tab-height
|
:height tab-height
|
||||||
:opacity 1
|
:opacity 1
|
||||||
|
@ -55,10 +55,9 @@
|
||||||
:alignItems :center})
|
:alignItems :center})
|
||||||
|
|
||||||
(defn tab-view-container [offset-x]
|
(defn tab-view-container [offset-x]
|
||||||
{:flex 1
|
{:position :absolute
|
||||||
:position :absolute
|
|
||||||
:top 0
|
:top 0
|
||||||
:left 0
|
:left 0
|
||||||
:right 0
|
:right 0
|
||||||
:bottom tab-height
|
:bottom 0
|
||||||
:transform [{:translateX offset-x}]})
|
:transform [{:translateX offset-x}]})
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
(:require-macros [status-im.utils.views :refer [defview]])
|
(:require-macros [status-im.utils.views :refer [defview]])
|
||||||
(:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
|
(:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
|
||||||
[status-im.components.react :refer [view
|
[status-im.components.react :refer [view
|
||||||
|
animated-view
|
||||||
text-input
|
text-input
|
||||||
text
|
text
|
||||||
image
|
image
|
||||||
|
@ -9,7 +10,8 @@
|
||||||
linear-gradient]]
|
linear-gradient]]
|
||||||
[reagent.core :as r]
|
[reagent.core :as r]
|
||||||
[status-im.components.tabs.styles :as st]
|
[status-im.components.tabs.styles :as st]
|
||||||
[status-im.components.tabs.tab :refer [tab]]))
|
[status-im.components.tabs.tab :refer [tab]]
|
||||||
|
[status-im.components.animation :as anim]))
|
||||||
|
|
||||||
(defn create-tab [index data selected-view-id]
|
(defn create-tab [index data selected-view-id]
|
||||||
(let [data (merge data {:key index
|
(let [data (merge data {:key index
|
||||||
|
@ -17,10 +19,43 @@
|
||||||
:selected-view-id selected-view-id})]
|
:selected-view-id selected-view-id})]
|
||||||
[tab data]))
|
[tab data]))
|
||||||
|
|
||||||
(defview tabs [{:keys [style tab-list selected-view-id]}]
|
(defn animation-logic [{:keys [hidden? val]}]
|
||||||
(let [style (merge st/tabs style)]
|
(let [was-hidden? (atom (not @hidden?))]
|
||||||
[view {:style style}
|
(fn [_]
|
||||||
[linear-gradient {:colors ["rgba(24, 52, 76, 0.01)" "rgba(24, 52, 76, 0.085)" "rgba(24, 52, 76, 0.165)"]
|
(when (not= @was-hidden? @hidden?)
|
||||||
:style st/top-gradient}]
|
(let [to-value (if @hidden? 0 (- st/tabs-height))]
|
||||||
[view st/tabs-container
|
(swap! was-hidden? not)
|
||||||
(doall (map-indexed #(create-tab %1 %2 selected-view-id) tab-list))]]))
|
(anim/start
|
||||||
|
(anim/timing val {:toValue to-value
|
||||||
|
:duration 300})
|
||||||
|
(fn [e]
|
||||||
|
;; if to-value was changed, then new animation has started
|
||||||
|
(when (= to-value (if @hidden? 0 (- st/tabs-height)))
|
||||||
|
(dispatch [:set-animation :tabs-bar-animation? false])))))))))
|
||||||
|
|
||||||
|
(defn tabs-container [& children]
|
||||||
|
(let [chats-scrolled? (subscribe [:get :chats-scrolled?])
|
||||||
|
animation? (subscribe [:animations :tabs-bar-animation?])
|
||||||
|
tabs-bar-value (subscribe [:animations :tabs-bar-value])
|
||||||
|
context {:hidden? chats-scrolled?
|
||||||
|
:val @tabs-bar-value}
|
||||||
|
on-update (animation-logic context)]
|
||||||
|
(anim/set-value @tabs-bar-value 0)
|
||||||
|
(r/create-class
|
||||||
|
{:component-did-mount
|
||||||
|
on-update
|
||||||
|
:component-did-update
|
||||||
|
on-update
|
||||||
|
:reagent-render
|
||||||
|
(fn [& children]
|
||||||
|
@chats-scrolled?
|
||||||
|
(into [animated-view {:style (st/tabs-container @chats-scrolled? @animation? @tabs-bar-value)
|
||||||
|
:pointerEvents (if @chats-scrolled? :none :auto)}]
|
||||||
|
children))})))
|
||||||
|
|
||||||
|
(defn tabs [{:keys [tab-list selected-view-id]}]
|
||||||
|
[tabs-container
|
||||||
|
[linear-gradient {:colors ["rgba(24, 52, 76, 0.01)" "rgba(24, 52, 76, 0.085)" "rgba(24, 52, 76, 0.165)"]
|
||||||
|
:style st/top-gradient}]
|
||||||
|
[view st/tabs-inner-container
|
||||||
|
(doall (map-indexed #(create-tab %1 %2 selected-view-id) tab-list))]])
|
||||||
|
|
|
@ -44,7 +44,8 @@
|
||||||
:message-input-buttons-scale 1
|
:message-input-buttons-scale 1
|
||||||
:messages-offset 0
|
:messages-offset 0
|
||||||
:commands-input-is-switching? false
|
:commands-input-is-switching? false
|
||||||
:response-resize? false}})
|
:response-resize? false
|
||||||
|
:tabs-bar-value (anim/create-value 0)}})
|
||||||
|
|
||||||
(def protocol-initialized-path [:protocol-initialized])
|
(def protocol-initialized-path [:protocol-initialized])
|
||||||
(defn chat-input-text-path [chat-id]
|
(defn chat-input-text-path [chat-id]
|
||||||
|
|
Loading…
Reference in New Issue