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

merge develop 

Former-commit-id: 04440181b2
This commit is contained in:
Adrian Tiberius 2016-07-18 21:33:41 +03:00
parent 338deb9cc5 60b3a43966
commit a479ae3e15
30 changed files with 528 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/app/src/main/java/com/statusim/geth/module/GethModule.java
View File

@ -128,7 +128,12 @@ public class GethModule extends ReactContextBaseJavaModule implements LifecycleE
}
@ReactMethod
public void startNode(Callback callback) {
public void startNode(Callback callback, Callback onAlreadyRunning) {
if(GethService.isRunning()){
onAlreadyRunning.invoke();
return;
}
Activity currentActivity = getCurrentActivity();

2
android/app/src/main/java/com/statusim/geth/service/GethService.java
View File

@ -213,7 +213,7 @@ public class GethService extends Service {
String address = data.getString("address");
String password = data.getString("password");
// TODO: remove third argument
String result = Statusgo.Login(address, password);
String result = Statusgo.UnlockAccount(address, password, 0);
Log.d(TAG, "Unlocked account: " + result);
Bundle replyData = new Bundle();

2
project.clj
View File

@ -10,7 +10,7 @@
[prismatic/schema "1.0.4"]
^{:voom {:repo "git@github.com:status-im/status-lib.git"
:branch "master"}}
[status-im/protocol "0.1.1-20160630_153846-gbf92f5f"]
[status-im/protocol "0.1.1-20160706_085008-ge61756a"]
[natal-shell "0.1.6"]
[com.andrewmcveigh/cljs-time "0.4.0"]]
:plugins [[lein-cljsbuild "1.1.1"]

16
resources/commands.js
View File

@ -138,6 +138,12 @@ status.response({
name: "phone",
description: "Send phone number",
color: "#5fc48d",
validator: function (params) {
return {
validationHandler: "phone",
parameters: [params.value]
};
},
params: [{
name: "phone",
type: status.types.PHONE,
@ -156,6 +162,16 @@ status.command({
name: "help",
description: "Help",
color: "#7099e6",
/* Validator example
validator: function (params) {
if (params.value != "3") {
var error = status.components.view(
{backgroundColor: "red"},
[status.components.text({}, "ooops :(")]
);
return {errors: [error]}
}
},*/
params: [{
name: "query",
type: status.types.TEXT

9
resources/status.js
View File

@ -22,6 +22,7 @@ Command.prototype.create = function (com) {
this.name = com.name;
this.description = com.description;
this.handler = com.handler;
this.validator = com.validator;
this.color = com.color;
this.icon = com.icon;
this.params = com.params || [];
@ -83,13 +84,13 @@ function scrollView(options, elements) {
}
var status = {
command: function (n, d, h) {
command: function (h) {
var command = new Command();
return command.create(n, d, h);
return command.create(h);
},
response: function (n, d, h) {
response: function (h) {
var response = new Response();
return response.create(n, d, h);
return response.create(h);
},
types: {
TEXT: 'text',

8
src/status_im/accounts/login/screen.cljs
View File

@ -2,7 +2,7 @@
(:require-macros [status-im.utils.views :refer [defview]])
(:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
[status-im.components.react :refer [view
text
text-class
text-input
image
linear-gradient
@ -26,7 +26,7 @@
(def toolbar-title
[view toolbar-title-container
[text {:style (merge toolbar-title-text {:color color-white})}
[text-class {:style (merge toolbar-title-text {:color color-white})}
(label :t/login)]])
(defview address-input [address]
@ -83,9 +83,9 @@
[view st/recover-text-container
[touchable-highlight
{:on-press #()}
[text {:style st/recover-text} (label :t/recover-access)]]]
[text-class {:style st/recover-text} (label :t/recover-access)]]]
[view st/connect-button-container
[touchable-highlight
{:on-press #(dispatch [:login-account address password])}
[view st/connect-button
[text {:style st/connect-button-text} (label :t/connect)]]]]]])
[text-class {:style st/connect-button-text} (label :t/connect)]]]]]])

13
src/status_im/android/core.cljs
View File

@ -42,6 +42,7 @@
(defn app-root []
(let [signed-up (subscribe [:get :signed-up])
_ (log/debug "signed up: " @signed-up)
view-id (subscribe [:get :view-id])
account (subscribe [:get :user-identity])
keyboard-height (subscribe [:get :keyboard-height])]
@ -59,15 +60,21 @@
"keyboardDidShow"
(fn [e]
(let [h (.. e -endCoordinates -height)]
(when-not (= h keyboard-height)
(when-not (= h @keyboard-height)
(dispatch [:set :keyboard-height h])))))
(.addListener device-event-emitter
"keyboardDidHide"
(when-not (= 0 keyboard-height)
(when-not (= 0 @keyboard-height)
#(dispatch [:set :keyboard-height 0]))))
:render
(fn []
(let [startup-view (if @account @view-id (if (contains? #{:login :chat} @view-id) @view-id :accounts))]
(let [startup-view (if @account
(if @signed-up
@view-id
:chat)
(if (contains? #{:login :chat} @view-id)
@view-id
:accounts))]
(log/debug startup-view)
(case (if true startup-view :chat)
:discovery [main-tabs]

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

@ -21,10 +21,13 @@
[status-im.utils.phone-number :refer [format-phone-number]]
[status-im.utils.datetime :as time]
[status-im.components.react :refer [geth]]
[status-im.utils.logging :as log]
[status-im.components.jail :as j]
[status-im.utils.types :refer [json->clj]]
[status-im.commands.utils :refer [generate-hiccup]]))
[status-im.commands.utils :refer [generate-hiccup]]
status-im.chat.handlers.commands
status-im.chat.handlers.animation
status-im.chat.handlers.requests
status-im.chat.handlers.unviewed-messages))
(register-handler :set-show-actions
(fn [db [_ show-actions]]
@ -53,81 +56,15 @@
(assoc-in [:chats current-chat-id :command-input] {})
(update-in [:chats current-chat-id :input-text] safe-trim))))
(defn invoke-suggestions-handler!
[{:keys [current-chat-id canceled-command] :as db} _]
(when-not canceled-command
(let [{:keys [command content]} (get-in db [:chats current-chat-id :command-input])
{:keys [name type]} command
path [(if (= :command type) :commands :responses)
name
:params
0
:suggestions]
params {:value content}]
(j/call current-chat-id
path
params
#(dispatch [:suggestions-handler {:command command
:content content
:chat-id current-chat-id} %])))))
(register-handler :start-cancel-command
(u/side-effect!
(fn [db _]
(dispatch [:animate-cancel-command]))))
(def command-prefix "c ")
(defn cancel-command!
[{:keys [canceled-command]}]
(when canceled-command
(dispatch [:start-cancel-command])))
(register-handler :set-chat-command-content
[(after invoke-suggestions-handler!)
(after cancel-command!)]
(fn [{:keys [current-chat-id] :as db} [_ content]]
(let [starts-as-command? (str/starts-with? content command-prefix)
path [:chats current-chat-id :command-input :command :type]
command? (= :command (get-in db path))]
(as-> db db
(commands/set-chat-command-content db content)
(assoc-in db [:chats current-chat-id :input-text] nil)
(assoc db :canceled-command (and command? (not starts-as-command?)))))))
(defn update-input-text
[{:keys [current-chat-id] :as db} text]
(assoc-in db [:chats current-chat-id :input-text] text))
(defn invoke-command-preview!
[{:keys [current-chat-id staged-command]} _]
(let [{:keys [command content]} staged-command
{:keys [name type]} command
path [(if (= :command type) :commands :responses)
name
:preview]
params {:value content}]
(j/call current-chat-id
path
params
#(dispatch [:command-preview current-chat-id %]))))
(register-handler :stage-command
(after invoke-command-preview!)
(fn [{:keys [current-chat-id] :as db} _]
(let [db (update-input-text db nil)
{:keys [command content to-msg-id]}
(get-in db [:chats current-chat-id :command-input])
content' (if (= :command (:type command))
(subs content 2)
content)
command-info {:command command
:content content'
:to-message to-msg-id}]
(-> db
(commands/stage-command command-info)
(assoc :staged-command command-info)))))
(register-handler :set-message-input []
(fn [db [_ input]]
(assoc db :message-input input)))
@ -138,15 +75,6 @@
(when-let [message-input (:message-input db)]
(.blur message-input)))))
(register-handler :set-response-chat-command
[(after invoke-suggestions-handler!)
(after #(dispatch [:command-edit-mode]))
(after #(dispatch [:set-chat-input-text ""]))]
(fn [db [_ to-msg-id command-key]]
(-> db
(commands/set-response-chat-command to-msg-id command-key)
(assoc :canceled-command false))))
(defn update-text
[{:keys [current-chat-id] :as db} [_ text]]
(let [suggestions (get-in db [:command-suggestions current-chat-id])]
@ -215,6 +143,11 @@
(fn [db [_ {:keys [chat-id msg-id]}]]
(set-message-shown db chat-id msg-id)))
(defn default-delivery-status [chat-id]
(if (console? chat-id)
:seen
:pending))
(defn prepare-message
[{:keys [identity current-chat-id] :as db} _]
(let [text (get-in db [:chats current-chat-id :input-text])
@ -227,6 +160,7 @@
:to current-chat-id
:from identity
:content-type text-content-type
:delivery-status (default-delivery-status current-chat-id)
:outgoing true
:timestamp (time/now-ms)})]
(if command
@ -242,6 +176,7 @@
:to chat-id
:content content
:content-type content-type-command
:delivery-status (default-delivery-status chat-id)
:outgoing true
:preview preview-string
:rendered-preview preview
@ -283,12 +218,10 @@
[{:keys [new-message current-chat-id] :as db} _]
(when (and new-message (not-console? current-chat-id))
(let [{:keys [group-chat]} (get-in db [:chats current-chat-id])
content (:content new-message)]
message (select-keys new-message [:content :msg-id])]
(if group-chat
(api/send-group-user-msg {:group-id current-chat-id
:content content})
(api/send-user-msg {:to current-chat-id
:content content})))))
(api/send-group-user-msg (assoc message :group-id current-chat-id))
(api/send-user-msg (assoc message :to current-chat-id))))))
(defn save-message-to-realm!
[{:keys [new-message current-chat-id]} _]
@ -322,13 +255,6 @@
params
#(dispatch [:command-handler! com %])))))
(defn handle-commands
[{:keys [new-commands]}]
(doseq [{{content :content} :content
handler :handler} new-commands]
(when handler
(handler content))))
(register-handler :send-chat-msg
(-> prepare-message
((enrich prepare-staged-commans))
@ -341,21 +267,7 @@
((after save-commands-to-realm!))
((after dispatch-responded-requests!))
;; todo maybe it is better to track if it was handled or not
((after invoke-commands-handlers!))
((after handle-commands))))
(register-handler :unstage-command
(fn [db [_ staged-command]]
(commands/unstage-command db staged-command)))
(register-handler :set-chat-command
[(after invoke-suggestions-handler!)
(after #(dispatch [:command-edit-mode]))]
(fn [{:keys [current-chat-id] :as db} [_ command-key]]
(-> db
(commands/set-chat-command command-key)
(assoc-in [:chats current-chat-id :command-input :content] "c ")
(assoc :disable-input true))))
((after invoke-commands-handlers!))))
(register-handler :init-console-chat
(fn [db [_]]
@ -426,6 +338,7 @@
(assoc db :loaded-chats (chats/chats-list)))
(register-handler :initialize-chats
(after #(dispatch [:load-unviewed-messages!]))
((enrich initialize-chats) load-chats!))
(defn store-message!
@ -434,20 +347,27 @@
(defn dispatch-request!
[{:keys [new-message]} [_ {chat-id :from}]]
(log/debug "Dispatching request: " new-message)
(when (= (:content-type new-message) content-type-command-request)
(dispatch [:add-request chat-id new-message])))
(defn receive-message
[db [_ {chat-id :from :as message}]]
(let [message' (check-author-direction db chat-id message)]
(let [message' (-> db
(check-author-direction chat-id message)
(assoc :delivery-status :pending))]
(-> db
(add-message-to-db chat-id message')
(assoc :new-message message'))))
(defn dispatch-unviewed-message!
[{:keys [new-message]} [_ {chat-id :from}]]
(let [{:keys [msg-id]} new-message]
(dispatch [:add-unviewed-message chat-id msg-id])))
(register-handler :received-msg
[(after store-message!)
(after dispatch-request!)]
(after dispatch-request!)
(after dispatch-unviewed-message!)]
receive-message)
(register-handler :group-received-msg
@ -553,6 +473,7 @@
(assoc-in db [:edit-mode current-chat-id] mode)))
(register-handler :command-edit-mode
(after #(dispatch [:clear-validation-errors]))
(edit-mode-handler :command))
(register-handler :text-edit-mode
@ -574,3 +495,13 @@
(dispatch [:fix-commands-suggestions-height])))))]
(fn [db [_ h]]
(assoc db :layout-height h)))
(register-handler :send-seen!
(after (fn [_ [_ chat-id message-id]]
(when-not (console? chat-id))
(dispatch [:msg-seen chat-id message-id])))
(u/side-effect!
(fn [_ [_ chat-id message-id]]
(when-not (console? chat-id)
(api/send-seen chat-id message-id)))))

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

@ -3,6 +3,7 @@
[status-im.utils.handlers :refer [register-handler]]
[status-im.handlers.content-suggestions :refer [get-content-suggestions]]
[status-im.chat.constants :refer [input-height request-info-height
suggestions-header-height
minimum-command-suggestions-height
response-height-normal minimum-suggestion-height]]
[status-im.constants :refer [response-input-hiding-duration]]))
@ -15,45 +16,54 @@
([name middleware handler]
(register-handler name [(path :animations) middleware] handler)))
(animation-handler :animate-cancel-command
(register-handler :animate-cancel-command
(after #(dispatch [:text-edit-mode]))
(fn [db _]
(assoc db :to-response-height input-height)))
(fn [{:keys [current-chat-id] :as db} _]
(assoc-in db [:animations :to-response-height current-chat-id] input-height)))
(def response-height (+ input-height response-height-normal))
(defn update-response-height [db]
(assoc-in db [:animations :to-response-height] response-height))
(defn update-response-height
[{:keys [current-chat-id] :as db}]
(assoc-in db [:animations :to-response-height current-chat-id] response-height))
(register-handler :animate-command-suggestions
(fn [{:keys [current-chat-id] :as db} _]
(let [suggestions? (seq (get-in db [:command-suggestions current-chat-id]))
current (get-in db [:animations :command-suggestions-height])
(fn [{chat-id :current-chat-id :as db} _]
(let [suggestions? (seq (get-in db [:command-suggestions chat-id]))
current (get-in db [:animations :command-suggestions-height chat-id])
height (if suggestions? middle-height input-height)
changed? (if (and suggestions?
(not (nil? current))
(not= input-height current))
identity inc)]
(-> db
(update :animations assoc :command-suggestions-height height)
(assoc-in [:animations :command-suggestions-height chat-id] 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)]
type (get-in db path)
errors (get-in db [:validation-errors current-chat-id])
custom-errors (get-in db [:custom-validation-errors current-chat-id])
validation-height (if (or (seq errors) (seq custom-errors))
request-info-height
0)]
(+ validation-height
(if (= :response type)
minimum-suggestion-height
input-height)))
(if (zero? validation-height)
input-height
(+ input-height suggestions-header-height))))))
(register-handler :animate-show-response
[(after #(dispatch [:command-edit-mode]))]
;[(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
(get-minimum-height db))]
(assoc-in db [:animations :to-response-height] height))))
(assoc-in db [:animations :to-response-height current-chat-id] height))))
(defn fix-height
[height-key height-signal-key suggestions-key minimum]
@ -64,7 +74,7 @@
under-middle-position? (<= current middle-height)
over-middle-position? (not under-middle-position?)
suggestions (get-in db [suggestions-key current-chat-id])
old-fixed (get-in db [:animations height-key])
old-fixed (get-in db [:animations height-key current-chat-id])
new-fixed (cond (not suggestions)
(minimum db)
@ -89,7 +99,7 @@
(and under-middle-position? moving-down?)
(minimum db))]
(-> db
(assoc-in [:animations height-key] new-fixed)
(assoc-in [:animations height-key current-chat-id] new-fixed)
(update-in [:animations height-signal-key] inc)))))
(defn commands-min-height

188
src/status_im/chat/handlers/commands.cljs Normal file
View File

@ -0,0 +1,188 @@
(ns status-im.chat.handlers.commands
(:require [re-frame.core :refer [enrich after dispatch]]
[status-im.utils.handlers :refer [register-handler] :as u]
[status-im.components.jail :as j]
[status-im.models.commands :as commands]
[clojure.string :as str]
[status-im.commands.utils :as cu]
[status-im.utils.phone-number :as pn]
[status-im.i18n :as i18n]))
(def command-prefix "c ")
(defn invoke-suggestions-handler!
[{:keys [current-chat-id canceled-command] :as db} _]
(when-not canceled-command
(let [{:keys [command content]} (get-in db [:chats current-chat-id :command-input])
{:keys [name type]} command
path [(if (= :command type) :commands :responses)
name
:params
0
:suggestions]
params {:value content}]
(j/call current-chat-id
path
params
#(dispatch [:suggestions-handler {:command command
:content content
:chat-id current-chat-id} %])))))
(defn cancel-command!
[{:keys [canceled-command]}]
(when canceled-command
(dispatch [:start-cancel-command])))
(register-handler :set-chat-command-content
[(after invoke-suggestions-handler!)
(after cancel-command!)
(after #(dispatch [:clear-validation-errors]))]
(fn [{:keys [current-chat-id] :as db} [_ content]]
(let [starts-as-command? (str/starts-with? content command-prefix)
path [:chats current-chat-id :command-input :command :type]
command? (= :command (get-in db path))]
(as-> db db
(commands/set-chat-command-content db content)
(assoc-in db [:chats current-chat-id :input-text] nil)
(assoc db :canceled-command (and command? (not starts-as-command?)))))))
(defn invoke-command-preview!
[{:keys [staged-command]} [_ chat-id]]
(let [{:keys [command content]} staged-command
{:keys [name type]} command
path [(if (= :command type) :commands :responses)
name
:preview]
params {:value content}]
(j/call chat-id
path
params
#(dispatch [:command-preview chat-id %]))))
(defn content-by-command
[{:keys [type]} content]
(if (= :command type)
(subs content 2)
content))
(defn command-input
([{:keys [current-chat-id] :as db}]
(command-input db current-chat-id))
([db chat-id]
(get-in db [:chats chat-id :command-input])))
(register-handler ::validate!
(u/side-effect!
(fn [_ [_ {:keys [chat-id]} {:keys [error result]}]]
;; todo handle error
(when-not error
(let [{:keys [errors validationHandler parameters]} result]
(cond errors
(dispatch [::add-validation-errors chat-id errors])
validationHandler
(dispatch [::validation-handler!
chat-id
validationHandler
parameters])
:else (dispatch [::finish-command-staging chat-id])))))))
(defn start-validate! [db]
(let [{:keys [content command chat-id] :as data} (::command db)
{:keys [name type]} command
path [(if (= :command type) :commands :responses)
name
:validator]
params {:value content}]
(j/call chat-id
path
params
#(dispatch [::validate! data %]))))
(register-handler :stage-command
(after start-validate!)
(fn [{:keys [current-chat-id] :as db}]
(let [{:keys [command content]} (command-input db)
content' (content-by-command command content)]
(-> db
(assoc ::command {:content content'
:command command
:chat-id current-chat-id})
(assoc-in [:disable-staging current-chat-id] true)))))
(register-handler ::finish-command-staging
[(after #(dispatch [:start-cancel-command]))
(after invoke-command-preview!)]
(fn [db [_ chat-id]]
(let [db (assoc-in db [:chats chat-id :input-text] nil)
{:keys [command content to-msg-id]} (command-input db)
content' (content-by-command command content)
command-info {:command command
:content content'
:to-message to-msg-id}]
(-> db
(commands/stage-command command-info)
(assoc :staged-command command-info)
(assoc-in [:disable-staging chat-id] true)))))
(register-handler :unstage-command
(fn [db [_ staged-command]]
(commands/unstage-command db staged-command)))
(defn set-chat-command
[{:keys [current-chat-id] :as db} [_ command-key]]
(-> db
(commands/set-chat-command command-key)
(assoc-in [:chats current-chat-id :command-input :content] command-prefix)
(assoc :disable-input true)))
(register-handler :set-chat-command
[(after invoke-suggestions-handler!)
(after #(dispatch [:command-edit-mode]))]
set-chat-command)
(defn set-response-command [db [_ to-msg-id command-key]]
(-> db
(commands/set-response-chat-command to-msg-id command-key)
(assoc :canceled-command false)))
(register-handler :set-response-chat-command
[(after invoke-suggestions-handler!)
(after #(dispatch [:command-edit-mode]))
(after #(dispatch [:set-chat-input-text ""]))]
set-response-command)
(register-handler ::add-validation-errors
(fn [db [_ chat-id errors]]
(assoc-in db [:custom-validation-errors chat-id]
(map cu/generate-hiccup errors))))
(register-handler :clear-validation-errors
(fn [db]
(dissoc db :validation-errors :custom-validation-errors)))
(def validation-handlers
{:phone (fn [chat-id [number]]
(if (pn/valid-mobile-number? number)
(dispatch [::finish-command-staging chat-id])
(dispatch [::set-validation-error
chat-id
{:title (i18n/label :t/phone-number)
:description (i18n/label :t/invalid-phone)}])))})
(defn validator [name]
(validation-handlers (keyword name)))
(register-handler ::validation-handler!
(u/side-effect!
(fn [_ [_ chat-id name params]]
(when-let [handler (validator name)]
(handler chat-id params)))))
(register-handler ::set-validation-error
(after #(dispatch [:fix-response-height]))
(fn [db [_ chat-id error]]
(assoc-in db [:validation-errors chat-id] [error])))

44
src/status_im/chat/handlers/unviewed_messages.cljs Normal file
View File

@ -0,0 +1,44 @@
(ns status-im.chat.handlers.unviewed-messages
(:require [re-frame.core :refer [after enrich path dispatch]]
[status-im.utils.handlers :refer [register-handler]]
[status-im.persistence.realm.core :as realm]))
(defn delivered-messages []
(-> (realm/get-by-fields
:account :msgs
{:delivery-status :delivered
:outgoing false})
(realm/collection->map)))
(defn set-unviewed-messages [db]
(let [messages (->> (::raw-unviewed-messages db)
(group-by :chat-id)
(map (fn [[id messages]]
[id {:messages-ids (map :msg-id messages)
:count (count messages)}]))
(into {}))]
(-> db
(assoc :unviewed-messages messages)
(dissoc ::raw-unviewed-messages))))
(defn load-messages! [db]
(let [messages (delivered-messages)]
(assoc db ::raw-unviewed-messages messages)))
(register-handler ::set-unviewed-messages set-unviewed-messages)
(register-handler :load-unviewed-messages!
(after #(dispatch [::set-unviewed-messages]))
load-messages!)
(register-handler :add-unviewed-message
(path :unviewed-messages)
(fn [db [_ chat-id message-id]]
(-> db
(update-in [chat-id :messages-ids] conj message-id)
(update-in [chat-id :count] inc))))
(register-handler :remove-unviewed-messages
(path :unviewed-messages)
(fn [db [_ chat-id]]
(dissoc db chat-id)))

17
src/status_im/chat/styles/command_validation.cljs Normal file
View File

@ -0,0 +1,17 @@
(ns status-im.chat.styles.command-validation
(:require [status-im.components.styles :as st]
[status-im.chat.constants :as constants]))
(def messages-container
{:background-color :red
:height constants/request-info-height
:padding-left 16
:padding-top 14})
(def title
{:color :white
:font-size 12
:font-family st/font})
(def description
(assoc title :opacity 0.69))

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

@ -172,3 +172,29 @@
(fn [_ [_ message-id]]
(let [requests (subscribe [:get-requests])]
(reaction (not (some #(= message-id (:message-id %)) @requests))))))
(register-sub :validation-errors
(fn [db]
(let [current-chat-id (subscribe [:get-current-chat-id])]
(reaction (get-in @db [:validation-errors @current-chat-id])))))
(register-sub :custom-validation-errors
(fn [db]
(let [current-chat-id (subscribe [:get-current-chat-id])]
(reaction (get-in @db [:custom-validation-errors @current-chat-id])))))
(register-sub :unviewed-messages-count
(fn [db [_ chat-id]]
(reaction (get-in @db [:unviewed-messages chat-id :count]))))
(register-sub :command-suggestions-height
(fn [db]
(let [chat-id (subscribe [:get-current-chat-id])]
(reaction
(get-in @db [:animations :command-suggestions-height @chat-id])))))
(register-sub :response-height
(fn [db]
(let [chat-id (subscribe [:get-current-chat-id])]
(reaction
(get-in @db [:animations :to-response-height @chat-id])))))

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

@ -15,8 +15,7 @@
(dispatch [:set-chat-command-content message]))
(defn send-command []
(dispatch [:stage-command])
(cancel-command-input))
(dispatch [:stage-command]))
(defn valid? [message validator]
(if validator

30
src/status_im/chat/views/command_validation.cljs Normal file
View File

@ -0,0 +1,30 @@
(ns status-im.chat.views.command-validation
(:require-macros [status-im.utils.views :refer [defview]])
(:require [status-im.components.react :as c]
[status-im.chat.styles.command-validation :as st]
[status-im.utils.listview :as lw]))
(defn message [{:keys [title description]}]
(c/list-item
[c/view
[c/text st/title title]
[c/text st/description description]]))
(defn messages-list [errors]
[c/list-view {:renderRow message
:keyboardShouldPersistTaps true
:dataSource (lw/to-datasource errors)
:style st/messages-container}])
(defview validation-messages []
[validation-messages [:validation-errors]
custom-errors [:custom-validation-errors]
command? [:command?]]
[c/view
(cond (seq custom-errors)
(vec (concat [c/view] custom-errors))
(seq validation-messages)
[messages-list validation-messages]
:else nil)])

39
src/status_im/chat/views/message.cljs
View File

@ -120,20 +120,23 @@
[message-content-audio {:content content
:content-type content-type}]]])
(defn message-delivery-status [{:keys [delivery-status]}]
(defview message-delivery-status
[{:keys [delivery-status msg-id to] :as m}]
[status [:get-in [:message-status to msg-id]]]
[view st/delivery-view
[image {:source (case delivery-status
:delivered {:uri :icon_ok_small}
[image {:source (case (or status delivery-status)
:seen {:uri :icon_ok_small}
:seen-by-everyone {:uri :icon_ok_small}
:failed res/delivery-failed-icon)
:failed res/delivery-failed-icon
nil)
:style st/delivery-image}]
[text {:style st/delivery-text}
(case delivery-status
:delivered "Delivered"
(case (or status delivery-status)
:delivered "Sent"
:seen "Seen"
:seen-by-everyone "Seen by everyone"
:failed "Failed")]])
:failed "Failed"
"Pending")]])
(defn member-photo [{:keys [photo-path]}]
[view st/photo-view
@ -159,12 +162,11 @@
[message-delivery-status {:delivery-status delivery-status}])]]]))
(defn message-body
[{:keys [outgoing] :as message} content]
(let [delivery-status :seen]
[{:keys [outgoing delivery-status] :as message} content]
[view (st/message-body message)
content
(when (and outgoing delivery-status)
[message-delivery-status {:delivery-status delivery-status}])]))
(when outgoing
[message-delivery-status message])])
(defn message-container-animation-logic [{:keys [to-value val callback]}]
(fn [_]
@ -203,7 +205,18 @@
(into [view] children)))
(defn chat-message
[{:keys [outgoing delivery-status timestamp new-day group-chat]
[{:keys [outgoing delivery-status timestamp new-day group-chat msg-id chat-id]
:as message}]
(let [status (subscribe [:get-in [:message-status chat-id msg-id]])]
(r/create-class
{:component-did-mount
(fn []
(when (and (not outgoing)
(not= :seen delivery-status)
(not= :seen @status))
(dispatch [:send-seen! chat-id msg-id])))
:reagent-render
(fn [{:keys [outgoing delivery-status timestamp new-day group-chat]
:as message}]
[message-container message
;; TODO there is no new-day info in message
@ -216,4 +229,4 @@
incoming-group-message-body
message-body)
(merge message {:delivery-status (keyword delivery-status)
:incoming-group incoming-group})])]])
:incoming-group incoming-group})])]])})))

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

@ -2,6 +2,7 @@
(:require-macros [status-im.utils.views :refer [defview]])
(:require [re-frame.core :refer [subscribe]]
[status-im.components.react :refer [view
text
animated-view
icon
touchable-highlight
@ -48,20 +49,19 @@
input-options)
(if command? input-command input-message)])
(defview plain-message-input-view [{:keys [input-options validator]}]
(defview plain-message-input-view [{:keys [input-options]}]
[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]]
valid-plain-message? [:valid-plain-message?]]
[view st/input-container
[view st/input-view
[plain-message/commands-button]
[message-input-container
[message-input input-options validator]]
[message-input input-options]]
;; TODO emoticons: not implemented
[plain-message/smile-button]
(when (if command? valid-command? valid-plain-message?)
(when (or command? valid-plain-message?)
(let [on-press (if command?
command/send-command
plain-message/send)]

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

@ -18,8 +18,7 @@
(defn get-options [{:keys [type placeholder]} command-type]
(let [options (case (keyword type)
:phone {:input-options {:keyboardType :phone-pad}
:validator valid-mobile-number?}
:phone {:input-options {:keyboardType :phone-pad}}
:password {:input-options {:secureTextEntry true}}
:number {:input-options {:keyboardType :numeric}}
;; todo maybe nil is fine for now :)

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

@ -15,7 +15,8 @@
[status-im.chat.styles.dragdown :as ddst]
[status-im.components.animation :as anim]
[status-im.chat.suggestions-responder :as resp]
[status-im.chat.constants :as c]))
[status-im.chat.constants :as c]
[status-im.chat.views.command-validation :as cv]))
(defn drag-icon []
[view st/drag-container
@ -58,14 +59,14 @@
[icon :drag_down ddst/drag-down-icon]]))))
(defn container-animation-logic [{:keys [to-value val]}]
(let [to-value @to-value]
(when-let [to-value @to-value]
(when-not (= to-value (.-_value val))
(anim/start (anim/spring val {:toValue to-value})))))
(defn container [response-height & children]
(let [;; todo to-response-height, cur-response-height must be specific
;; for each chat
to-response-height (subscribe [:animations :to-response-height])
to-response-height (subscribe [:response-height])
changed (subscribe [:animations :response-height-changed])
context {:to-value to-response-height
:val response-height}
@ -83,8 +84,7 @@
(defview placeholder []
[suggestions [:get-content-suggestions]]
(when (seq suggestions)
[view st/input-placeholder]))
[view st/input-placeholder])
(defview response-suggestions-view []
[suggestions [:get-content-suggestions]]
@ -95,4 +95,5 @@
[container response-height
[request-info response-height]
[response-suggestions-view]
[cv/validation-messages]
[placeholder]]))

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

@ -104,7 +104,7 @@
(defn container [h & elements]
(let [;; todo to-response-height, cur-response-height must be specific
;; for each chat
to-response-height (subscribe [:animations :command-suggestions-height])
to-response-height (subscribe [:command-suggestions-height])
changed (subscribe [:animations :commands-height-changed])
context {:to-value to-response-height
:val h}

7
src/status_im/chats_list/views/inner_item.cljs
View File

@ -6,9 +6,10 @@
[status-im.utils.utils :refer [truncate-str]]
[status-im.utils.datetime :as time]))
(defn chat-list-item-inner-view
(defview chat-list-item-inner-view
[{:keys [chat-id name color new-messages-count
online group-chat contacts] :as chat}]
[unviewed-messages [:unviewed-messages-count chat-id]]
(let [last-message (first (:messages chat))]
[view st/chat-container
[view st/chat-icon-container
@ -43,6 +44,6 @@
(when (:timestamp last-message)
[text {:style st/datetime-text}
(time/to-short-str (:timestamp last-message))])])
(when (pos? new-messages-count)
(when (pos? unviewed-messages)
[view st/new-messages-container
[text {:style st/new-messages-text} new-messages-count]])]]))
[text {:style st/new-messages-text} unviewed-messages]])]]))

6
src/status_im/components/react.cljs
View File

@ -17,7 +17,11 @@
(def app-registry (get-react-property "AppRegistry"))
(def navigator (get-class "Navigator"))
(def text (get-class "Text"))
(def text-class (get-class "Text"))
(defn text
([s] [text-class s])
([{:keys [style] :as opts} s]
[text-class (if style opts {:style opts}) s]))
(def view (get-class "View"))
(def image (get-class "Image"))
(def touchable-highlight-class (get-class "TouchableHighlight"))

1
src/status_im/contacts/validations.cljs
View File

@ -7,7 +7,6 @@
(.isAddress js/Web3.prototype s))
(defn unique-identity? [identity]
(println identity)
(not (realm/exists? :account :contacts :whisper-identity identity)))
(defn valid-length? [identity]

3
src/status_im/db.cljs
View File

@ -40,8 +40,7 @@
:whisper-identity ""
:phone-number ""}
:disable-group-creation false
:animations {:to-response-height 0.1
;; todo clear this
:animations {;; todo clear this
:tabs-bar-value (anim/create-value 0)}})
(def protocol-initialized-path [:protocol-initialized])

8
src/status_im/handlers.cljs
View File

@ -12,7 +12,6 @@
[status-im.utils.handlers :refer [register-handler] :as u]
[status-im.models.protocol :as protocol]
status-im.chat.handlers
status-im.chat.handlers.animation
status-im.group-settings.handlers
status-im.navigation.handlers
status-im.contacts.handlers
@ -23,8 +22,7 @@
status-im.commands.handlers.jail
status-im.qr-scanner.handlers
status-im.accounts.handlers
status-im.protocol.handlers
status-im.chat.handlers.requests))
status-im.protocol.handlers))
;; -- Middleware ------------------------------------------------------------
;;
@ -108,7 +106,9 @@
(u/side-effect!
(fn [db _]
(log/debug "Starting node")
(.startNode geth (fn [result] (node-started db result))))))
(.startNode geth
(fn [result] (node-started db result))
#(log/debug "Geth already initialized")))))
(register-handler :crypt-initialized
(u/side-effect!

8
src/status_im/models/commands.cljs
View File

@ -1,11 +1,5 @@
(ns status-im.models.commands
(:require [clojure.string :refer [join split]]
[clojure.walk :refer [stringify-keys keywordize-keys]]
[re-frame.core :refer [subscribe dispatch]]
[status-im.db :as db]
[status-im.components.animation :as anim]
[status-im.components.styles :refer [color-blue color-dark-mint]]
[status-im.i18n :refer [label]]))
(:require [status-im.db :as db]))
(defn get-commands [{:keys [current-chat-id] :as db}]
(or (get-in db [:chats current-chat-id :commands]) {}))

7
src/status_im/models/messages.cljs
View File

@ -26,7 +26,8 @@
(defn save-message
;; todo remove chat-id parameter
[chat-id {:keys [msg-id content]
[chat-id {:keys [delivery-status msg-id content]
:or {delivery-status :pending}
:as message}]
(when-not (r/exists? :account :msgs :msg-id msg-id)
(r/write :account
@ -38,8 +39,8 @@
message
{:chat-id chat-id
:content content'
:timestamp (timestamp)
:delivery-status nil})]
:delivery-status delivery-status
:timestamp (timestamp)})]
(r/create :account :msgs message' true))))))
(defn command-type? [type]

38
src/status_im/protocol/handlers.cljs
View File

@ -4,7 +4,7 @@
(:require [status-im.utils.handlers :as u]
[status-im.utils.logging :as log]
[status-im.protocol.api :as api]
[re-frame.core :refer [dispatch debug]]
[re-frame.core :refer [dispatch after]]
[status-im.utils.handlers :refer [register-handler]]
[status-im.models.contacts :as contacts]
[status-im.protocol.api :refer [init-protocol]]
@ -18,8 +18,8 @@
(register-handler :initialize-protocol
(u/side-effect!
(fn [db [_ account]]
(init-protocol account (make-handler db)))))
(fn [{:keys [user-identity] :as db} [_ account]]
(init-protocol (or account user-identity) (make-handler db)))))
(register-handler :protocol-initialized
(fn [db [_ identity]]
@ -102,16 +102,28 @@
(log/debug action msg-id from group-id identity)
(participant-invited-to-group-msg group-id identity from msg-id))))
(register-handler :acked-msg
(u/side-effect!
(fn [_ [action from msg-id]]
(log/debug action from msg-id)
(defn update-message! [status]
(fn [_ [_ _ msg-id]]
(messages/update-message! {:msg-id msg-id
:delivery-status :delivered}))))
:delivery-status status})))
(defn update-message-status [status]
(fn [db [_ from msg-id]]
(let [current-status (get-in db [:message-status from msg-id])]
(if-not (= :seen current-status)
(assoc-in db [:message-status from msg-id] status)
db))))
(register-handler :acked-msg
(after (update-message! :delivered))
(update-message-status :delivered))
(register-handler :msg-delivery-failed
(u/side-effect!
(fn [_ [action msg-id]]
(log/debug action msg-id)
(messages/update-message! {:msg-id msg-id
:delivery-status :failed}))))
(after (update-message! :failed))
(update-message-status :failed))
(register-handler :msg-seen
[(after (update-message! :seen))
(after (fn [_ [_ chat-id]]
(dispatch [:remove-unviewed-messages chat-id])))]
(update-message-status :seen))

6
src/status_im/protocol/protocol_handler.cljs
View File

@ -22,8 +22,10 @@
(dispatch [:received-msg (assoc payload :from from :to to)]))
:msg-acked (let [{:keys [msg-id from]} event]
(dispatch [:acked-msg from msg-id]))
:delivery-failed (let [{:keys [msg-id]} event]
(dispatch [:msg-delivery-failed msg-id]))
:msg-seen (let [{:keys [msg-id from]} event]
(dispatch [:msg-seen from msg-id]))
:delivery-failed (let [{:keys [msg-id from]} event]
(dispatch [:msg-delivery-failed from msg-id]))
:new-group-chat (let [{:keys [from group-id identities group-name]} event]
(dispatch [:group-chat-invite-received from group-id identities group-name]))
:new-group-msg (let [{from :from

2
src/status_im/translations/en.cljs
View File

@ -140,4 +140,6 @@
;users
:add-account "Add account"
;validation
:invalid-phone "Invalid phone number"
})