parent
b9e3e213a1
commit
8bb880429a
|
@ -4,6 +4,7 @@
|
||||||
[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]]
|
||||||
|
@ -38,7 +39,9 @@
|
||||||
|
|
||||||
(defn chats-list []
|
(defn chats-list []
|
||||||
(let [chats (subscribe [:get :chats])
|
(let [chats (subscribe [:get :chats])
|
||||||
chat-scrolled? (subscribe [:get :chats-scrolled?])
|
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)
|
container-height (r/atom 0)
|
||||||
content-height (r/atom 0)]
|
content-height (r/atom 0)]
|
||||||
(dispatch [:set :chats-scrolled? false])
|
(dispatch [:set :chats-scrolled? false])
|
||||||
|
@ -53,7 +56,7 @@
|
||||||
;;; if "maximazing" chat list will make scroll to 0,
|
;;; if "maximazing" chat list will make scroll to 0,
|
||||||
;;; then disable maximazing
|
;;; then disable maximazing
|
||||||
:onLayout (fn [event]
|
:onLayout (fn [event]
|
||||||
(when-not @chat-scrolled?
|
(when-not @chats-scrolled?
|
||||||
(let [height (.. event -nativeEvent -layout -height)]
|
(let [height (.. event -nativeEvent -layout -height)]
|
||||||
(reset! container-height height))))
|
(reset! container-height height))))
|
||||||
:onContentSizeChange (fn [width height]
|
:onContentSizeChange (fn [width height]
|
||||||
|
@ -62,7 +65,10 @@
|
||||||
(let [offset (.. e -nativeEvent -contentOffset -y)
|
(let [offset (.. e -nativeEvent -contentOffset -y)
|
||||||
min-content-height (+ @container-height tabs-height)
|
min-content-height (+ @container-height tabs-height)
|
||||||
scrolled? (and (< 0 offset) (< min-content-height @content-height))]
|
scrolled? (and (< 0 offset) (< min-content-height @content-height))]
|
||||||
(dispatch [:set :chats-scrolled? scrolled?])))}]
|
(dispatch [:set :chats-scrolled? scrolled?])
|
||||||
|
(dispatch [:set-animation :tabs-bar-animation? true])))}]
|
||||||
|
[animated-view {:style (st/action-buttons-container @animation? (or @tabs-bar-value 0))
|
||||||
|
:pointerEvents :box-none}
|
||||||
[action-button {:buttonColor color-blue
|
[action-button {:buttonColor color-blue
|
||||||
:offsetY 16
|
:offsetY 16
|
||||||
:offsetX 16}
|
:offsetX 16}
|
||||||
|
@ -77,4 +83,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}]]]]]])))
|
||||||
|
|
|
@ -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)}]})
|
||||||
|
|
|
@ -13,10 +13,12 @@
|
||||||
(def tabs-height 59)
|
(def tabs-height 59)
|
||||||
(def tab-height 56)
|
(def tab-height 56)
|
||||||
|
|
||||||
(defn tabs-container [offset-y]
|
(defn tabs-container [hidden? animation? offset-y]
|
||||||
{:height tabs-height
|
{:height tabs-height
|
||||||
:backgroundColor color-white
|
:backgroundColor color-white
|
||||||
:marginBottom offset-y})
|
:marginBottom (if (or hidden? animation?)
|
||||||
|
(- tabs-height) 0)
|
||||||
|
:transform [{:translateY (if animation? offset-y 1)}]})
|
||||||
|
|
||||||
(def top-gradient
|
(def top-gradient
|
||||||
{:flexDirection :row
|
{:flexDirection :row
|
||||||
|
|
|
@ -20,21 +20,27 @@
|
||||||
[tab data]))
|
[tab data]))
|
||||||
|
|
||||||
(defn animation-logic [{:keys [hidden? val]}]
|
(defn animation-logic [{:keys [hidden? val]}]
|
||||||
|
(let [was-hidden? (atom (not @hidden?))]
|
||||||
(fn [_]
|
(fn [_]
|
||||||
(let [to-value (if @hidden? (- st/tab-height) 0)]
|
(when (not= @was-hidden? @hidden?)
|
||||||
|
(let [to-value (if @hidden? 0 (- st/tabs-height))]
|
||||||
|
(swap! was-hidden? not)
|
||||||
(anim/start
|
(anim/start
|
||||||
(anim/timing val {:toValue to-value
|
(anim/timing val {:toValue to-value
|
||||||
:duration 300})
|
:duration 300})
|
||||||
(fn [e]
|
(fn [e]
|
||||||
(when-not (.-finished e)
|
;; if to-value was changed, then new animation has started
|
||||||
nil))))))
|
(when (= to-value (if @hidden? 0 (- st/tabs-height)))
|
||||||
|
(dispatch [:set-animation :tabs-bar-animation? false])))))))))
|
||||||
|
|
||||||
(defn tabs-container [& children]
|
(defn tabs-container [& children]
|
||||||
(let [chats-scrolled? (subscribe [:get :chats-scrolled?])
|
(let [chats-scrolled? (subscribe [:get :chats-scrolled?])
|
||||||
anim-value (anim/create-value 0)
|
animation? (subscribe [:animations :tabs-bar-animation?])
|
||||||
|
tabs-bar-value (subscribe [:animations :tabs-bar-value])
|
||||||
context {:hidden? chats-scrolled?
|
context {:hidden? chats-scrolled?
|
||||||
:val anim-value}
|
:val @tabs-bar-value}
|
||||||
on-update (animation-logic context)]
|
on-update (animation-logic context)]
|
||||||
|
(anim/set-value @tabs-bar-value 0)
|
||||||
(r/create-class
|
(r/create-class
|
||||||
{:component-did-mount
|
{:component-did-mount
|
||||||
on-update
|
on-update
|
||||||
|
@ -43,7 +49,7 @@
|
||||||
:reagent-render
|
:reagent-render
|
||||||
(fn [& children]
|
(fn [& children]
|
||||||
@chats-scrolled?
|
@chats-scrolled?
|
||||||
(into [animated-view {:style (st/tabs-container anim-value)
|
(into [animated-view {:style (st/tabs-container @chats-scrolled? @animation? @tabs-bar-value)
|
||||||
:pointerEvents (if @chats-scrolled? :none :auto)}]
|
:pointerEvents (if @chats-scrolled? :none :auto)}]
|
||||||
children))})))
|
children))})))
|
||||||
|
|
||||||
|
|
|
@ -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