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

commands input

This commit is contained in:
Roman Volosovskyi 2016-06-29 09:27:21 +03:00
parent 8d13f5dc36
commit e6414c7101
10 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/status_im/chat/handlers/animation.cljs
View File

@ -37,11 +37,21 @@
(update :animations assoc :command-suggestions-height height)
(update-in [:animations :commands-height-changed] changed?)))))
(defn get-minimum-height
[{:keys [current-chat-id] :as db}]
(let [path [:chats current-chat-id :command-input :command :type]
type (get-in db path)]
(if (= :response type)
minimum-suggestion-height
minimum-command-suggestions-height)))
(register-handler :animate-show-response
[(after #(dispatch [:command-edit-mode]))]
(fn [{:keys [current-chat-id] :as db}]
(let [suggestions? (seq (get-in db [:suggestions current-chat-id]))
height (if suggestions? middle-height minimum-suggestion-height)]
height (if suggestions?
middle-height
(get-minimum-height db))]
(assoc-in db [:animations :to-response-height] height))))
(defn fix-height
@ -54,7 +64,7 @@
over-middle-position? (not under-middle-position?)
suggestions (get-in db [suggestions-key current-chat-id])
new-fixed (cond (not suggestions)
minimum
(minimum db)
(and under-middle-position? moving-up?)
middle-height
@ -66,7 +76,7 @@
max-height
(and under-middle-position? moving-down?)
minimum)]
(minimum db))]
(-> db
(assoc-in [:animations height-key] new-fixed)
(update-in [:animations height-signal-key] inc)))))
@ -75,10 +85,10 @@
(fix-height :command-suggestions-height
:commands-height-changed
:command-suggestions
minimum-command-suggestions-height))
(constantly minimum-command-suggestions-height)))
(register-handler :fix-response-height
(fix-height :to-response-height
:response-height-changed
:suggestions
minimum-suggestion-height))
get-minimum-height))

9
src/status_im/chat/styles/content_suggestions.cljs
View File

@ -45,12 +45,3 @@
(def container
{:backgroundColor color-white})
(def drag-down-touchable
{:height 22
:alignItems :center
:justifyContent :center})
(def drag-down-icon
{:width 16
:height 16})

12
src/status_im/chat/styles/dragdown.cljs Normal file
View File

@ -0,0 +1,12 @@
(ns status-im.chat.styles.dragdown
(:require [status-im.components.styles :refer [color-white]]))
(def drag-down-touchable
{:height 22
:background-color color-white
:alignItems :center
:justifyContent :center})
(def drag-down-icon
{:width 16
:height 16})

4
src/status_im/chat/styles/input.cljs
View File

@ -21,8 +21,8 @@
{:flexDirection :column
:marginTop 16
:marginBottom 16
:marginLeft 16
:marginRight 0
:marginLeft 0
:marginRight 8
:backgroundColor color
:height 24
:borderRadius 50})

10
src/status_im/chat/styles/suggestions.cljs
View File

@ -68,13 +68,3 @@
:height height
:backgroundColor color-white
:elevation 2})
(def drag-down-touchable
{:height 22
:background-color color-white
:alignItems :center
:justifyContent :center})
(def drag-down-icon
{:width 16
:height 16})

10
src/status_im/chat/subs.cljs
View File

@ -121,8 +121,12 @@
(register-sub :messages-offset
(fn []
(let [command? (subscribe [:command?])
command (subscribe [:get-chat-command])
suggestions (subscribe [:get-suggestions])]
;; todo fix magic values
(reaction (cond @command? c/request-info-height
(seq @suggestions) c/suggestions-header-height
:else 0)))))
(reaction
(let [type (:type @command)]
(cond (and @command? (= type :response)) c/request-info-height
(and @command? (= type :command)) c/suggestions-header-height
(seq @suggestions) c/suggestions-header-height
:else 0))))))

2
src/status_im/chat/views/command.cljs
View File

@ -29,7 +29,7 @@
(defn command-icon [command]
[view (st/command-text-container command)
[text {:style st/command-text} (:text command)]])
[text {:style st/command-text} (str "!" (:name command))]])
(defn cancel-button []
[touchable-highlight {:on-press cancel-command-input}

3
src/status_im/chat/views/message_input.cljs
View File

@ -47,12 +47,15 @@
(defview plain-message-input-view [{:keys [input-options validator]}]
[command? [:command?]
{:keys [type] :as command} [:get-chat-command]
input-command [:get-chat-command-content]
valid-plain-message? [:valid-plain-message?]
valid-command? [:valid-command? validator]]
[view st/input-container
[view st/input-view
[plain-message/commands-button]
(when (and command? (= :command type))
[command/command-icon command])
[message-input-container
[message-input input-options validator]]
;; TODO emoticons: not implemented

23
src/status_im/chat/views/response.cljs
View File

@ -12,6 +12,7 @@
touchable-highlight]]
[status-im.components.drag-drop :as drag]
[status-im.chat.styles.response :as st]
[status-im.chat.styles.dragdown :as ddst]
[status-im.components.animation :as anim]
[status-im.chat.suggestions-responder :as resp]))
@ -41,15 +42,19 @@
:fix-response-height)
command (subscribe [:get-chat-command])]
(fn [response-height]
[view (merge (drag/pan-handlers pan-responder)
{:style (st/request-info (:color @command))})
[drag-icon]
[view st/inner-container
[command-icon nil]
[info-container @command]
[touchable-highlight {:on-press #(dispatch [:start-cancel-command])}
[view st/cancel-container
[icon :close-white st/cancel-icon]]]]])))
(if (= :response (:type @command))
[view (merge (drag/pan-handlers pan-responder)
{:style (st/request-info (:color @command))})
[drag-icon]
[view st/inner-container
[command-icon nil]
[info-container @command]
[touchable-highlight {:on-press #(dispatch [:start-cancel-command])}
[view st/cancel-container
[icon :close-white st/cancel-icon]]]]]
[view (merge (drag/pan-handlers pan-responder)
{:style ddst/drag-down-touchable})
[icon :drag_down ddst/drag-down-icon]]))))
(defn container-animation-logic [{:keys [to-value val]}]
(let [to-value @to-value]

5
src/status_im/chat/views/suggestions.cljs
View File

@ -10,6 +10,7 @@
animated-view]]
[status-im.utils.listview :refer [to-datasource]]
[status-im.chat.styles.suggestions :as st]
[status-im.chat.styles.dragdown :as ddst]
[reagent.core :as r]
[status-im.components.animation :as anim]
[status-im.components.drag-drop :as drag]
@ -59,8 +60,8 @@
(fn [_]
[view
(merge (drag/pan-handlers pan-responder)
{:style st/drag-down-touchable})
[icon :drag_down st/drag-down-icon]])))
{:style ddst/drag-down-touchable})
[icon :drag_down ddst/drag-down-icon]])))
(defn container-animation-logic [{:keys [to-value val]}]
(let [to-value @to-value]