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

Staging area disabled (#562)

This commit is contained in:
alwx 2016-12-21 12:44:42 +03:00
parent c9366c1d2b
commit 80018f1cb8
15 changed files with 21 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/status_im/chat/handlers.cljs
View File

@ -203,24 +203,6 @@
(dispatch [:set-chat-command command type])
(dispatch [:set-chat-command-content text]))))
(register-handler :set-staged-commands-scroll-view
(fn [{:keys [current-chat-id] :as db} [_ view]]
(assoc-in db [:chats current-chat-id :staged-scroll-view] view)))
(register-handler :set-staged-commands-scroll-height
(fn [{:keys [current-chat-id] :as db} [_ height]]
(assoc-in db [:chats current-chat-id :staged-scroll-height] height)))
(register-handler :staged-commands-scroll-to
(u/side-effect!
(fn [{:keys [current-chat-id chats]} [_ height]]
(let [{:keys [staged-scroll-view staged-scroll-height]} (get chats current-chat-id)]
(when staged-scroll-view
(let [y (if (< 0 staged-scroll-height height)
(- height staged-scroll-height)
0)]
(.scrollTo staged-scroll-view (clj->js {:x 0 :y y}))))))))
(register-handler :set-message-input-view-height
(fn [{:keys [current-chat-id] :as db} [_ height]]
(assoc-in db [:chats current-chat-id :message-input-height] height)))

3
src/status_im/chat/handlers/commands.cljs
View File

@ -90,7 +90,8 @@
(status/call-jail chat-id
path
params
#(dispatch [:command-preview chat-id id %])))))
#(do (dispatch [:command-preview chat-id id %])
(dispatch [:send-chat-message]))))))
(defn command-input
([{:keys [current-chat-id] :as db}]

2
src/status_im/chat/handlers/send_message.cljs
View File

@ -182,7 +182,7 @@
(register-handler ::prepare-message
(u/side-effect!
(fn [{:keys [network-status]} [_ {:keys [chat-id identity message] :as params}]]
(fn [{:keys [network-status] :as db} [_ {:keys [chat-id identity message] :as params}]]
(let [{:keys [group-chat]} (get-in db [:chats chat-id])
clock-value (messages/get-last-clock-value chat-id)
message' (cu/check-author-direction

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

@ -23,7 +23,6 @@
[status-im.chat.views.datemark :refer [chat-datemark]]
[status-im.chat.views.response :refer [response-view]]
[status-im.chat.views.new-message :refer [chat-message-input-view]]
[status-im.chat.views.staged-commands :refer [staged-commands-view]]
[status-im.chat.views.actions :refer [actions-view]]
[status-im.chat.views.emoji :refer [emoji-view]]
[status-im.chat.views.bottom-info :refer [bottom-info-view]]
@ -173,7 +172,6 @@
(defview messages-container [messages]
[offset [:messages-offset]
staged-scroll-height [:get-chat-staged-commands-scroll-height]
messages-offset (anim/create-value 0)
context {:offset offset
:val messages-offset}
@ -181,7 +179,7 @@
{:component-did-mount on-update
:component-did-update on-update}
[animated-view
{:style (st/messages-container staged-scroll-height messages-offset)}
{:style (st/messages-container messages-offset)}
messages])
(defview chat []
@ -190,7 +188,6 @@
show-bottom-info? [:chat-ui-props :show-bottom-info?]
show-emoji? [:chat-ui-props :show-emoji?]
command? [:command?]
staged-commands [:get-chat-staged-commands]
layout-height [:get :layout-height]]
{:component-did-mount #(dispatch [:check-autorun])}
[view {:style st/chat-view
@ -203,8 +200,6 @@
[messages-view group-chat]]
;; todo uncomment this
#_(when @group-chat [typing-all])
(when (seq staged-commands)
[staged-commands-view staged-commands])
(when-not command?
[suggestion-container])
[response-view]
@ -215,4 +210,5 @@
[actions-view])
(when show-bottom-info?
[bottom-info-view])
[offline-view {:top (get-in platform-specific [:component-styles :status-bar :default :height])}]])
[offline-view {:top (get-in platform-specific
[:component-styles :status-bar :default :height])}]])

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

@ -70,54 +70,3 @@
:width 12
:height 12})
(defn staged-commands [message-input-height input-margin]
{:position :absolute
:background-color color-white
:bottom (+ message-input-height input-margin)
:left 0
:right 0
:max-height 150
:elevation 5})
(def staged-command-container
{:flex 1
:alignItems :flex-start
:flexDirection :column
:backgroundColor color-white})
(def staged-command-background
{:flexDirection :column
:margin-top 16
:margin-left 16
:margin-right 0
:padding-bottom 12
:padding-left 12
:backgroundColor chat-background
:borderRadius 14})
(def staged-command-header
{:flex-direction :row
:justify-content :space-between})
(def staged-command-info-container
{:flexDirection :row
:margin-top 12})
(def staged-command-cancel
{:padding-left 12
:padding-top 16
:padding-right 12})
(def staged-command-cancel-icon
{:width 16
:height 16})
(def staged-command-content
{:marginTop 5
:marginHorizontal 0
:fontSize 14
:color color-black})
(def staged-commands-bottom
{:height 16
:background-color "white"})

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

@ -49,10 +49,10 @@
:opacity 0.69
:color color-white})
(defn response-view [height input-margin staged-commands]
(defn response-view [height input-margin]
{:flexDirection :column
:position :absolute
:elevation (if (seq staged-commands) 5 4)
:elevation 4
:left 0
:right 0
:bottom input-margin

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

@ -16,10 +16,10 @@
(def toolbar-container
{})
(defn messages-container [staged-height bottom]
(defn messages-container [bottom]
{:flex 1
:padding-bottom bottom
:margin-bottom staged-height})
:margin-bottom 0})
(def toolbar-view
{:flexDirection :row

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

@ -67,7 +67,7 @@
:fontSize 12
:color text2-color})
(defn container [height input-margin staged-commands]
(defn container [height input-margin]
{:flexDirection :column
:position :absolute
:left 0
@ -75,7 +75,7 @@
:bottom input-margin
:height height
:backgroundColor color-white
:elevation (if (seq staged-commands) 5 4)})
:elevation 4})
(def request-container
{:height 56

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

@ -89,13 +89,6 @@
(let [commands (subscribe [:get-chat-staged-commands])]
(reaction (some #(= id (:to-message %)) @commands)))))
(register-sub :get-chat-staged-commands-scroll-height
(fn [db _]
(let [{:keys [staged-commands
staged-scroll-height]} (get-in @db [:chats (:current-chat-id @db)])]
(reaction
(if (seq staged-commands) staged-scroll-height 0)))))
(register-sub :get-message-input-view-height
(fn [db _]
(reaction (get-in @db [:chats (:current-chat-id @db) :message-input-height]))))

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

@ -5,7 +5,6 @@
[status-im.components.react :refer [view
scroll-view]]
[status-im.chat.views.message-input :refer [plain-message-input-view]]
[status-im.chat.views.staged-commands :refer [simple-command-staged-view]]
[status-im.chat.constants :refer [input-height]]
[status-im.utils.platform :refer [platform-specific]]
[status-im.chat.styles.message :as st]
@ -34,13 +33,11 @@
parameter [:get-command-parameter]
type [:command-type]
suggestions [:get-suggestions]
staged-commands [:get-chat-staged-commands]
message-input-height [:get-message-input-view-height]]
(let [on-top? (or (and (not (empty? suggestions))
(not command?))
(not= response-height input-height))
style (when-not (seq staged-commands)
(get-in platform-specific [:component-styles :chat :new-message]))]
style (get-in platform-specific [:component-styles :chat :new-message])]
[view {:style (merge (st/new-message-container margin on-top?) style)
:on-layout (fn [event]
(let [height (get-height event)]

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

@ -94,7 +94,6 @@
input-margin (subscribe [:input-margin])
changed (subscribe [:animations :response-height-changed])
animate? (subscribe [:animate?])
staged-commands (subscribe [:get-chat-staged-commands])
context {:to-value to-response-height
:val response-height
:animate? animate?}
@ -109,8 +108,7 @@
@to-response-height @changed
(into [animated-view {:style (st/response-view
response-height
@input-margin
@staged-commands)}]
@input-margin)}]
children))})))
(defn on-navigation-change

61
src/status_im/chat/views/staged_commands.cljs
View File

@ -1,61 +0,0 @@
(ns status-im.chat.views.staged-commands
(:require-macros [status-im.utils.views :refer [defview]])
(:require [re-frame.core :refer [subscribe dispatch]]
[status-im.components.react :refer [view
image
icon
text
touchable-highlight
scroll-view]]
[status-im.chat.styles.input :as st]
[status-im.chat.styles.command-pill :as pill-st]
[status-im.utils.platform :refer [platform-specific]]
[taoensso.timbre :as log]))
(defn cancel-command-input [staged-command]
(dispatch [:unstage-command staged-command]))
(defn get-height [event]
(.-height (.-layout (.-nativeEvent event))))
(defn simple-command-staged-view
[{:keys [command params] :as staged-command}]
(let [{:keys [type name]} command]
[view st/staged-command-container
[view st/staged-command-background
[view st/staged-command-header
[view st/staged-command-info-container
[view (pill-st/pill command)
[text {:style pill-st/pill-text}
(str
(if (= :command type) "!" "?")
name)]]]
[touchable-highlight {:style st/staged-command-cancel
:onPress #(cancel-command-input staged-command)}
[view [icon :close_small_gray
st/staged-command-cancel-icon]]]]
[view {:padding-right 12}
(if-let [preview (:preview staged-command)]
preview
[text {:style st/staged-command-content}
(if (= 1 (count params))
(first (vals params))
(str params))])]]]))
(defn staged-command-view [stage-command]
[simple-command-staged-view stage-command])
(defview staged-commands-view [staged-commands]
[message-input-height [:get-message-input-view-height]
input-margin [:input-margin]]
(let [style (when (seq staged-commands)
(get-in platform-specific [:component-styles :chat :new-message]))]
[view {:style (merge (st/staged-commands message-input-height input-margin)
style)}
[scroll-view {:bounces false
:ref #(dispatch [:set-staged-commands-scroll-view %])
:on-layout #(dispatch [:set-staged-commands-scroll-height (get-height %)])}
[view {:on-layout #(dispatch [:staged-commands-scroll-to (get-height %)])}
(for [command staged-commands]
^{:key command} [staged-command-view command])
[view st/staged-commands-bottom]]]]))

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

@ -109,7 +109,6 @@
input-margin (subscribe [:input-margin])
changed (subscribe [:animations :commands-height-changed])
animate? (subscribe [:animate?])
staged-commands (subscribe [:get-chat-staged-commands])
context {:to-value to-response-height
:val h
:animate? animate?}
@ -122,9 +121,9 @@
:reagent-render
(fn [h & elements]
@to-response-height @changed
(into [animated-view {:style (st/container h @input-margin @staged-commands)}] elements))})))
(into [animated-view {:style (st/container h @input-margin)}] elements))})))
(defview suggestion-container [any-staged-commands?]
(defview suggestion-container []
(let [h (anim/create-value c/input-height)]
[container h
[header h]

5
src/status_im/data_store/discover.cljs
View File

@ -1,5 +1,6 @@
(ns status-im.data-store.discover
(:require [status-im.data-store.realm.discover :as data-store]))
(:require [status-im.data-store.realm.discover :as data-store])
(:refer-clojure :exclude [exists?]))
(defn get-all
[ordering]
@ -24,4 +25,4 @@
(defn get-all-tags
[]
(data-store/get-all-tags))
(data-store/get-all-tags))

3
src/status_im/protocol/message_cache.cljs
View File

@ -1,4 +1,5 @@
(ns status-im.protocol.message-cache)
(ns status-im.protocol.message-cache
(:refer-clojure :exclude [exists?]))
(defonce messages-set (atom #{}))
(defonce messages-map (atom {}))