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

Add select command button 

Former-commit-id: a530cbbb65
This commit is contained in:
virvar 2016-04-06 16:40:31 +03:00
parent 2d7ae7c478
commit 756b682d68
9 changed files with 201 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -41,4 +41,5 @@ target/
# Figwheel # Figwheel
# #
figwheel_server.log figwheel_server.log
.nrepl-port

2
src/syng_im/android/core.cljs
View File

@ -56,5 +56,5 @@
(dispatch [:load-user-phone-number]) (dispatch [:load-user-phone-number])
(dispatch [:load-syng-contacts]) (dispatch [:load-syng-contacts])
;; TODO execute on first run only ;; TODO execute on first run only
;; (dispatch [:set-sign-up-chat]) (dispatch [:set-sign-up-chat])
(.registerComponent app-registry "SyngIm" #(r/reactify-component app-root))) (.registerComponent app-registry "SyngIm" #(r/reactify-component app-root)))

98
src/syng_im/components/chat/chat_message.cljs
View File

@ -12,7 +12,8 @@
[syng-im.navigation :refer [nav-pop]] [syng-im.navigation :refer [nav-pop]]
[syng-im.resources :as res] [syng-im.resources :as res]
[syng-im.constants :refer [text-content-type [syng-im.constants :refer [text-content-type
content-type-command]])) content-type-command
content-type-command-request]]))
(defn message-date [{:keys [date]}] (defn message-date [{:keys [date]}]
@ -66,45 +67,80 @@
(defn message-content-command [content] (defn message-content-command [content]
(let [{:keys [command content]} (commands/parse-command-msg-content content)] (let [{:keys [command content]} (commands/parse-command-msg-content content)]
[view {:style {:flexDirection "column"}} [view {:style {:flexDirection "column"}}
[view {:style {:margin 10 [view {:style {:marginTop -5
:marginLeft 0
:backgroundColor (:color command) :backgroundColor (:color command)
:borderRadius 10}} :borderRadius 10}}
[text {:style {:marginTop -2 [text {:style {:marginTop 0
:marginHorizontal 10 :marginHorizontal 10
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily "Avenir-Roman"
:color "white"}} :color "white"}}
(:text command)]] (:text command)]]
[text {:style {:marginTop -2 [text {:style {:marginTop 5
:marginHorizontal 10 :marginHorizontal 0
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily "Avenir-Roman"
:color "black"}} :color "black"}}
;; TODO isn't smart ;; TODO isn't smart
(if (= (:command command) :keypair-password) (if (= (:command command) :keypair-password)
"******" "******"
content)]])) content)]]))
(defn set-chat-command [command]
(dispatch [:set-chat-command (:command command)]))
(defn message-content-command-request [content outgoing]
(let [{:keys [command content]} (commands/parse-command-request-msg-content content)]
[view {:style {:marginTop 10}}
[view {:style (merge {:borderRadius 6
:paddingVertical 12
:paddingHorizontal 16}
(if outgoing
{:backgroundColor "#D3EEEF"}
{:backgroundColor "#FBF6E3"}))}
[text {:style {:fontSize 14
:fontFamily "Avenir-Roman"
:color "#4A5258"}}
content]]
[touchable-highlight {:style {:position "absolute"
:top -15
:left 20}
:onPress (fn []
(set-chat-command command))}
[view {:style {:width 30
:height 30
:borderRadius 50
:backgroundColor (:color command)}}
[image {:source res/att
:style {:width 17
:height 14
:position "absolute"
:top 8
:left 6}}]]]]))
(defn message-content [{:keys [content-type content outgoing]}] (defn message-content [{:keys [content-type content outgoing]}]
[view {:style (merge {:borderRadius 6} (if (= content-type content-type-command-request)
(if (= content-type text-content-type) [message-content-command-request content outgoing]
{:paddingVertical 12 [view {:style (merge {:borderRadius 6}
:paddingHorizontal 16} (if (= content-type text-content-type)
{:paddingVertical 14 {:paddingVertical 12
:paddingHorizontal 10}) :paddingHorizontal 16}
(if outgoing {:paddingVertical 14
{:backgroundColor "#D3EEEF"} :paddingHorizontal 10})
{:backgroundColor "#FBF6E3"}))} (if outgoing
(cond {:backgroundColor "#D3EEEF"}
(= content-type text-content-type) {:backgroundColor "#FBF6E3"}))}
[text {:style {:fontSize 14 (cond
:fontFamily "Avenir-Roman" (= content-type text-content-type)
:color "#4A5258"}} [text {:style {:fontSize 14
content] :fontFamily "Avenir-Roman"
(= content-type content-type-command) :color "#4A5258"}}
[message-content-command content] content]
:else [message-content-audio {:content content (= content-type content-type-command)
:content-type content-type}])]) [message-content-command content]
:else [message-content-audio {:content content
:content-type content-type}])]))
(defn message-delivery-status [{:keys [delivery-status]}] (defn message-delivery-status [{:keys [delivery-status]}]
[view {:style {:flexDirection "row" [view {:style {:flexDirection "row"

5
src/syng_im/components/chat/input/simple_command.cljs
View File

@ -69,8 +69,7 @@
:onChangeText (fn [new-text] :onChangeText (fn [new-text]
(set-input-message new-text)) (set-input-message new-text))
:onSubmitEditing (fn [e] :onSubmitEditing (fn [e]
(send-command chat-id command message) (send-command chat-id command message))}
(set-input-message nil))}
input-options) input-options)
message]]] message]]]
[touchable-highlight {:style {:marginTop 14 [touchable-highlight {:style {:marginTop 14
@ -79,7 +78,7 @@
:right 20 :right 20
:bottom 20} :bottom 20}
:onPress (fn [] :onPress (fn []
(cancel-command-input))} (send-command chat-id command message))}
[image {:source res/att [image {:source res/att
:style {:width 34 :style {:width 34
:height 28}}]]])))) :height 28}}]]]))))

2
src/syng_im/components/chat/plain_message_input.cljs
View File

@ -37,7 +37,7 @@
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily "Avenir-Roman"
:color "#9CBFC0"} :color "#9CBFC0"}
:autoFocus true :autoFocus false
:placeholder "Type your message here" :placeholder "Type your message here"
:onChangeText (fn [new-text] :onChangeText (fn [new-text]
(set-input-message new-text)) (set-input-message new-text))

1
src/syng_im/constants.cljs
View File

@ -7,3 +7,4 @@
(def text-content-type "text/plain") (def text-content-type "text/plain")
(def content-type-command "command") (def content-type-command "command")
(def content-type-command-request "command-request")

3
src/syng_im/handlers.cljs
View File

@ -144,7 +144,8 @@
(register-handler :send-chat-command (register-handler :send-chat-command
(fn [db [action chat-id command content]] (fn [db [action chat-id command content]]
(log/debug action "chat-id" chat-id "command" command "content" content) (log/debug action "chat-id" chat-id "command" command "content" content)
(let [msg (if (= chat-id "console") (let [db (set-chat-input-text db nil)
msg (if (= chat-id "console")
(sign-up-service/send-console-command command content) (sign-up-service/send-console-command command content)
;; TODO handle command, now sends as plain message ;; TODO handle command, now sends as plain message
(let [{msg-id :msg-id (let [{msg-id :msg-id

133
src/syng_im/handlers/sign_up.cljs
View File

@ -6,27 +6,35 @@
[syng-im.utils.logging :as log] [syng-im.utils.logging :as log]
[syng-im.utils.random :as random] [syng-im.utils.random :as random]
[syng-im.constants :refer [text-content-type [syng-im.constants :refer [text-content-type
content-type-command]])) content-type-command
content-type-command-request]]))
(defn intro [db] (defn intro [db]
(dispatch [:received-msg {:msg-id "1" (dispatch [:received-msg
:content "Hello there! It's Syng, a Dapp browser in your phone." {:msg-id "1"
:content-type text-content-type :content "Hello there! It's Syng, a Dapp browser in your phone."
:outgoing false :content-type text-content-type
:from "console" :outgoing false
:to "me"}]) :from "console"
(dispatch [:received-msg {:msg-id "2" :to "me"}])
:content "Syng uses a highly secure key-pair authentication type to provide you a reliable way to access your account" (dispatch [:received-msg
:content-type text-content-type {:msg-id "2"
:outgoing false :content (str "Syng uses a highly secure key-pair authentication type "
:from "console" "to provide you a reliable way to access your account")
:to "me"}]) :content-type text-content-type
(dispatch [:received-msg {:msg-id "3" :outgoing false
:content "A key pair has been generated and saved to your device. Create a password to secure your key" :from "console"
:content-type text-content-type :to "me"}])
:outgoing false (dispatch [:received-msg
:from "console" {:msg-id "3"
:to "me"}]) :content (commands/format-command-request-msg-content
:keypair-password
(str "A key pair has been generated and saved to your device. "
"Create a password to secure your key"))
:content-type content-type-command-request
:outgoing false
:from "console"
:to "me"}])
(dispatch [:set-chat-command :keypair-password]) (dispatch [:set-chat-command :keypair-password])
db) db)
@ -38,8 +46,95 @@
:content-type text-content-type :content-type text-content-type
:outgoing true}) :outgoing true})
(defn- handle-password [content]
;; TODO validate and save password
(dispatch [:received-msg
{:msg-id "4"
:content (str "OK great! Your password has been saved. Just to let you "
"know, you can always change it in the Console, by the way, "
"it's me, the Console, nice to meet you!")
:content-type text-content-type
:outgoing false
:from "console"
:to "me"}])
(dispatch [:received-msg
{:msg-id "5"
:content (str "I'll generate a passphrase for you so you can restore your "
"access or log in from another device")
:content-type text-content-type
:outgoing false
:from "console"
:to "me"}])
(dispatch [:received-msg
{:msg-id "6"
:content "Here's your passphrase:"
:content-type text-content-type
:outgoing false
:from "console"
:to "me"}])
;; TODO generate passphrase
(let [passphrase (str "The brash businessman's braggadocio and public squabbing with "
"candidates in the US presidential election")]
(dispatch [:received-msg
{:msg-id "7"
:content passphrase
:content-type text-content-type
:outgoing false
:from "console"
:to "me"}]))
(dispatch [:received-msg
{:msg-id "8"
:content "Make sure you had securely written it down"
:content-type text-content-type
:outgoing false
:from "console"
:to "me"}])
;; TODO highlight '!phone'
(dispatch [:received-msg
{:msg-id "9"
:content (commands/format-command-request-msg-content
:phone
(str "Your phone number is also required to use the app. Type the "
"exclamation mark or hit the icon to open the command list "
"and choose the !phone command") )
:content-type content-type-command-request
:outgoing false
:from "console"
:to "me"}]))
(defn- handle-phone [content]
;; TODO validate and save phone number
;; send phone to server
(dispatch [:received-msg
{:msg-id "10"
:content (commands/format-command-request-msg-content
:confirmation-code
(str "Thanks! We've sent you a text message with a confirmation "
"code. Please provide that code to confirm your phone number"))
:content-type content-type-command-request
:outgoing false
:from "console"
:to "me"}]))
(defn- handle-confirmation-code [content]
;; TODO validate confirmation code
;; send code to server
(dispatch [:received-msg
{:msg-id "10"
:content "Thanks!"
:content-type text-content-type
:outgoing false
:from "console"
:to "me"}]))
;; TODO store command key in a separate field ;; TODO store command key in a separate field
(defn send-console-command [command content] (defn send-console-command [command content]
(when (= command :keypair-password)
(handle-password content))
(when (= command :phone)
(handle-phone content))
(when (= command :confirmation-code)
(handle-confirmation-code content))
{:msg-id (random/id) {:msg-id (random/id)
:from "me" :from "me"
:to "console" :to "console"

12
src/syng_im/models/commands.cljs
View File

@ -21,6 +21,11 @@
:description "Send phone number" :description "Send phone number"
:color "#48ba30" :color "#48ba30"
:suggestion true} :suggestion true}
{:command :confirmation-code
:text "!confirmationCode"
:description "Send confirmation code"
:color "#019af0"
:suggestion true}
{:command :send {:command :send
:text "!send" :text "!send"
:description "Send location" :description "Send location"
@ -59,6 +64,11 @@
(defn format-command-msg-content [command content] (defn format-command-msg-content [command content]
(map-to-str {:command (name command) :content content})) (map-to-str {:command (name command) :content content}))
;; TODO temp
(defn parse-command-msg-content [content] (defn parse-command-msg-content [content]
(update (str-to-map content) :command #(get-command (keyword %)))) (update (str-to-map content) :command #(get-command (keyword %))))
(defn format-command-request-msg-content [command content]
(map-to-str {:command (name command) :content content}))
(defn parse-command-request-msg-content [content]
(update (str-to-map content) :command #(get-command (keyword %))))