From f613dbd2dc94d66d9e42b1b8766bbf8b9e9e48ea Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Thu, 19 May 2016 18:03:15 +0300 Subject: [PATCH 1/9] add group chat/ messages in group chat Former-commit-id: a5f153bb664838e50fb13fd80534e0a8e660fe4b --- run-osx.sh | 6 +- src/syng_im/chat/handlers.cljs | 38 ++--- src/syng_im/chat/views/plain_input.cljs | 6 +- src/syng_im/db.cljs | 2 +- src/syng_im/group_settings/handlers.cljs | 2 +- src/syng_im/group_settings/screen.cljs | 13 +- src/syng_im/handlers.cljs | 165 +++++++++------------ src/syng_im/models/chats.cljs | 6 +- src/syng_im/models/messages.cljs | 19 ++- src/syng_im/new_group/handlers.cljs | 73 +++++++++ src/syng_im/new_group/screen.cljs | 74 +++++---- src/syng_im/new_group/subs.cljs | 9 ++ src/syng_im/new_group/views/contact.cljs | 27 ++-- src/syng_im/protocol/protocol_handler.cljs | 1 + src/syng_im/subs.cljs | 3 +- 15 files changed, 240 insertions(+), 204 deletions(-) create mode 100644 src/syng_im/new_group/handlers.cljs create mode 100644 src/syng_im/new_group/subs.cljs diff --git a/run-osx.sh b/run-osx.sh index 9f89a05857..4c66056ae4 100755 --- a/run-osx.sh +++ b/run-osx.sh @@ -38,10 +38,10 @@ fi if [ "$device_type" = "genymotion" ] then # Find Device based on Android version 6.0.0 -device=$(/Applications/Genymotion\ Shell.app/Contents/MacOS/genyshell -c "devices list" | grep "6.0.0") +device=$(genyshell -c "devices list" | grep "6.0.0") #echo ${device##*| } # Launch device in Genymotion -open -a /Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name "${device##*| }" +open -a ~/Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name "${device##*| }" fi # Install deps, prepare for genymotion and figwheel @@ -56,6 +56,6 @@ tab "react-native start" # echo "Press any key when emulator, figwheel and packager are ready" && read -n 1 sleep 10s -adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449 +adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449 && adb forward tcp:8082 tcp:8082 react-native run-android diff --git a/src/syng_im/chat/handlers.cljs b/src/syng_im/chat/handlers.cljs index 1691319b39..67acc9a6fa 100644 --- a/src/syng_im/chat/handlers.cljs +++ b/src/syng_im/chat/handlers.cljs @@ -11,7 +11,6 @@ [syng-im.chat.sign-up :as sign-up-service] [syng-im.models.chats :as chats] [syng-im.navigation.handlers :as nav] - [syng-im.models.chats :as c] [syng-im.utils.handlers :as u])) (register-handler :set-show-actions @@ -70,20 +69,6 @@ (register-handler :set-chat-input-text ((enrich update-command) update-text)) -(register-handler :send-group-chat-msg - (u/side-effect! - (fn [_ [_ chat-id text]] - (let [{msg-id :msg-id - {from :from} :msg} (api/send-group-user-msg {:group-id chat-id - :content text}) - msg {:msg-id msg-id - :from from - :to nil - :content text - :content-type text-content-type - :outgoing true}] - (messages/save-message chat-id msg))))) - (defn console? [s] (= "console" s)) @@ -168,10 +153,15 @@ (assoc-in db [:chats current-chat-id :staged-commands] [])) (defn send-message! - [{:keys [new-message current-chat-id]} _] + [{:keys [new-message current-chat-id] :as db} _] (when (and new-message (not-console? current-chat-id)) - (api/send-user-msg {:to current-chat-id - :content (:content new-message)}))) + (let [{:keys [group-chat]} (get-in db [:chats current-chat-id]) + content (:content new-message)] + (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}))))) (defn save-message-to-realm! [{:keys [new-message current-chat-id]} _] @@ -204,8 +194,7 @@ (register-handler :unstage-command (fn [db [_ staged-command]] - (let [] - (commands/unstage-command db staged-command)))) + (commands/unstage-command db staged-command))) (register-handler :set-chat-command (fn [db [_ command-key]] @@ -307,11 +296,7 @@ :group-chat false :is-active true :timestamp (.getTime (js/Date.)) - ;; todo how to choose color? - ;; todo do we need to have some color for not group chat? - :contacts [{:identity contcat-id - :text-color :#FFFFFF - :background-color :#AB7967}]}] + :contacts [{:identity contcat-id}]}] (assoc db :new-chat chat))) (defn add-chat [{:keys [new-chat] :as db} [_ chat-id]] @@ -331,8 +316,7 @@ (-> prepare-chat ((enrich add-chat)) ((after save-chat!)) - ((after open-chat!)) - debug)) + ((after open-chat!)))) (register-handler :switch-command-suggestions (fn [db [_]] diff --git a/src/syng_im/chat/views/plain_input.cljs b/src/syng_im/chat/views/plain_input.cljs index 0feee3d72c..61fb8ed09b 100644 --- a/src/syng_im/chat/views/plain_input.cljs +++ b/src/syng_im/chat/views/plain_input.cljs @@ -12,11 +12,7 @@ (defn send [chat input-message] (let [{:keys [group-chat chat-id]} chat] - (if group-chat - ;; todo how much are different both events? is there real reason - ;; for differentiation here? - (dispatch [:send-group-chat-msg chat-id input-message]) - (dispatch [:send-chat-msg])))) + (dispatch [:send-chat-msg]))) (defn message-valid? [staged-commands message] (or (and (pos? (count message)) diff --git a/src/syng_im/db.cljs b/src/syng_im/db.cljs index f031922451..92c9c0d645 100644 --- a/src/syng_im/db.cljs +++ b/src/syng_im/db.cljs @@ -11,13 +11,13 @@ :identity "me" :contacts [] :contacts-ids #{} + :selected-contacts #{} :current-chat-id "console" :chat {:command nil :last-message nil} :chats {} :chats-updated-signal 0 :show-actions false - :new-group #{} :new-participants #{} :signed-up true :view-id default-view diff --git a/src/syng_im/group_settings/handlers.cljs b/src/syng_im/group_settings/handlers.cljs index d38e52ab06..0871624cb1 100644 --- a/src/syng_im/group_settings/handlers.cljs +++ b/src/syng_im/group_settings/handlers.cljs @@ -31,7 +31,7 @@ (dispatch [:initialize-chats])) (register-handler :show-group-settings - (fn [db [action]] + (fn [db _] (let [chat-id (:current-chat-id db) chat-name (get-in db [:chats chat-id :name]) chat-color (get-in db [:chats chat-id :color]) diff --git a/src/syng_im/group_settings/screen.cljs b/src/syng_im/group_settings/screen.cljs index 9d3011b5fb..7e06fd98af 100644 --- a/src/syng_im/group_settings/screen.cljs +++ b/src/syng_im/group_settings/screen.cljs @@ -1,7 +1,6 @@ (ns syng-im.group-settings.screen (:require-macros [syng-im.utils.views :refer [defview]]) - (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.resources :as res] + (:require [re-frame.core :refer [subscribe dispatch]] [syng-im.components.react :refer [view text-input text @@ -13,12 +12,8 @@ scroll-view touchable-highlight]] [syng-im.components.toolbar :refer [toolbar]] - [syng-im.components.realm :refer [list-view]] - [syng-im.components.styles :refer [color-purple - text2-color]] [syng-im.group-settings.styles.group-settings :as st] - [syng-im.group-settings.views.member :refer [member-view]] - [reagent.core :as r])) + [syng-im.group-settings.views.member :refer [member-view]])) (defn remove-member [{:keys [whisper-identity]}] (dispatch [:chat-remove-member whisper-identity])) @@ -70,7 +65,7 @@ (dispatch [:set-chat-color])) (defview chat-color-picker [] - [show-color-picker [:group-settings-show-color-picker] + [show-color-picker [:get :group-settings-show-color-picker] new-color [:get :new-chat-color]] [modal {:animated false :transparent false @@ -128,7 +123,7 @@ [name [:chat :name] color [:chat :color]] [view (st/chat-icon color) - [text {:style st/chat-icon-text} (nth name 0)]]) + [text {:style st/chat-icon-text} (first name)]]) (defn new-group-toolbar [] [toolbar {:title "Chat settings" diff --git a/src/syng_im/handlers.cljs b/src/syng_im/handlers.cljs index 37f1e23311..5ca72c1d61 100644 --- a/src/syng_im/handlers.cljs +++ b/src/syng_im/handlers.cljs @@ -34,11 +34,13 @@ nav-pop]] [syng-im.utils.crypt :refer [gen-random-bytes]] [syng-im.utils.random :as random] + [syng-im.utils.handlers :as u] syng-im.chat.handlers [syng-im.group-settings.handlers :refer [delete-chat]] - [syng-im.navigation.handlers :as nav] + syng-im.navigation.handlers syng-im.discovery.handlers - syng-im.contacts.handlers)) + syng-im.contacts.handlers + syng-im.new-group.handlers)) ;; -- Middleware ------------------------------------------------------------ ;; @@ -61,45 +63,37 @@ (fn [db [_ k v]] (assoc db k v)))) -(defn preload-data! - [{:keys [view-id] :as db} _] - (nav/preload-data! db [nil view-id])) - (register-handler :initialize-db (fn [_ _] (assoc app-db :signed-up (storage/get kv/kv-store :signed-up)))) -(register-handler :set-loading - (fn [db [_ value]] - (assoc db :loading value))) - (register-handler :initialize-crypt - (fn [db _] - (log/debug "initializing crypt") - (gen-random-bytes 1024 (fn [{:keys [error buffer]}] - (if error - (do - (log/error "Failed to generate random bytes to initialize sjcl crypto") - (dispatch [:notify-user {:type :error - :error error}])) - (do - (->> (.toString buffer "hex") - (.toBits (.. js/ecc -sjcl -codec -hex)) - (.addEntropy (.. js/ecc -sjcl -random))) - (dispatch [:crypt-initialized]))))) - db)) + (u/side-effect! + (fn [_ _] + (log/debug "initializing crypt") + (gen-random-bytes 1024 (fn [{:keys [error buffer]}] + (if error + (do + (log/error "Failed to generate random bytes to initialize sjcl crypto") + (dispatch [:notify-user {:type :error + :error error}])) + (do + (->> (.toString buffer "hex") + (.toBits (.. js/ecc -sjcl -codec -hex)) + (.addEntropy (.. js/ecc -sjcl -random))) + (dispatch [:crypt-initialized])))))))) (register-handler :crypt-initialized - (fn [db _] - (log/debug "crypt initialized") - db)) + (u/side-effect! + (fn [_ _] + (log/debug "crypt initialized")))) (register-handler :load-commands - (fn [db [action]] - (log/debug action) - (load-commands) - db)) + (u/side-effect! + (fn [_ [action]] + (log/debug action) + (load-commands)))) (register-handler :set-commands (fn [db [action commands]] @@ -109,9 +103,9 @@ ;; -- Protocol -------------------------------------------------------------- (register-handler :initialize-protocol - (fn [db [_]] - (init-protocol (make-handler db)) - db)) + (u/side-effect! + (fn [db [_]] + (init-protocol (make-handler db))))) (register-handler :protocol-initialized (fn [db [_ identity]] @@ -174,55 +168,62 @@ :content-type text-content-type})) (register-handler :group-chat-invite-acked - (fn [db [action from group-id ack-msg-id]] - (log/debug action from group-id ack-msg-id) - (joined-chat-msg group-id from ack-msg-id))) + (u/side-effect! + (fn [_ [action from group-id ack-msg-id]] + (log/debug action from group-id ack-msg-id) + (joined-chat-msg group-id from ack-msg-id)))) (register-handler :participant-removed-from-group - (fn [db [action from group-id identity msg-id]] - (log/debug action msg-id from group-id identity) - (chat-remove-participants group-id [identity]) - (participant-removed-from-group-msg group-id identity from msg-id))) + (u/side-effect! + (fn [_ [action from group-id identity msg-id]] + (log/debug action msg-id from group-id identity) + (chat-remove-participants group-id [identity]) + (participant-removed-from-group-msg group-id identity from msg-id)))) (register-handler :you-removed-from-group - (fn [db [action from group-id msg-id]] - (log/debug action msg-id from group-id) - (you-removed-from-group-msg group-id from msg-id) - (set-chat-active group-id false))) + (u/side-effect! + (fn [_ [action from group-id msg-id]] + (log/debug action msg-id from group-id) + (you-removed-from-group-msg group-id from msg-id) + (set-chat-active group-id false)))) (register-handler :participant-left-group - (fn [db [action from group-id msg-id]] - (log/debug action msg-id from group-id) - (if (= (api/my-identity) from) - db - (participant-left-group-msg group-id from msg-id)))) + (u/side-effect! + (fn [_ [action from group-id msg-id]] + (log/debug action msg-id from group-id) + (when-not (= (api/my-identity) from) + (participant-left-group-msg group-id from msg-id))))) (register-handler :participant-invited-to-group - (fn [db [action from group-id identity msg-id]] - (log/debug action msg-id from group-id identity) - (participant-invited-to-group-msg group-id identity from msg-id))) + (u/side-effect! + (fn [_ [action from group-id identity msg-id]] + (log/debug action msg-id from group-id identity) + (participant-invited-to-group-msg group-id identity from msg-id)))) (register-handler :acked-msg - (fn [db [action from msg-id]] - (log/debug action from msg-id) - (update-message! {:msg-id msg-id - :delivery-status :delivered}))) + (u/side-effect! + (fn [_ [action from msg-id]] + (log/debug action from msg-id) + (update-message! {:msg-id msg-id + :delivery-status :delivered})))) (register-handler :msg-delivery-failed - (fn [db [action msg-id]] - (log/debug action msg-id) - (update-message! {:msg-id msg-id - :delivery-status :failed}))) + (u/side-effect! + (fn [_ [action msg-id]] + (log/debug action msg-id) + (update-message! {:msg-id msg-id + :delivery-status :failed})))) (register-handler :leave-group-chat - (fn [db [action]] - (log/debug action) - (let [chat-id (:current-chat-id db)] - (api/leave-group-chat chat-id) - (set-chat-active chat-id false) - (left-chat-msg chat-id) - (delete-chat chat-id) - (dispatch [:navigate-back])))) + (u/side-effect! + (fn [db [action]] + (log/debug action) + (let [chat-id (:current-chat-id db)] + (api/leave-group-chat chat-id) + (set-chat-active chat-id false) + (left-chat-msg chat-id) + (delete-chat chat-id) + (dispatch [:navigate-back]))))) ;; -- User data -------------------------------------------------------------- (register-handler :load-user-phone-number @@ -288,29 +289,3 @@ (api/group-remove-participant chat-id identity) (removed-participant-msg chat-id identity) db))) - -(defn update-new-group-selection [db identity add?] - (update-in db :new-group (fn [new-group] - (if add? - (conj new-group identity) - (disj new-group identity))))) - -(register-handler :select-for-new-group - (fn [db [_ identity add?]] - (update-new-group-selection db identity add?))) - -(register-handler :create-new-group - (fn [db [action group-name]] - (log/debug action) - (let [identities (vec (:new-group db)) - group-id (api/start-group-chat identities group-name) - db (create-chat db group-id identities true group-name)] - (dispatch [:show-chat group-id :replace]) - db))) - -(register-handler :group-chat-invite-received - (fn [db [action from group-id identities group-name]] - (log/debug action from group-id identities) - (if (chat-exists? group-id) - (re-join-group-chat db group-id identities group-name) - (create-chat db group-id identities true group-name)))) diff --git a/src/syng_im/models/chats.cljs b/src/syng_im/models/chats.cljs index de9ea76963..ce2d982ef6 100644 --- a/src/syng_im/models/chats.cljs +++ b/src/syng_im/models/chats.cljs @@ -44,8 +44,7 @@ (let [chat (assoc chat :last-msg-id (or last-msg-id ""))] (r/write #(r/create :chats chat)))) ([db chat-id identities group-chat? chat-name] - (if (chat-exists? chat-id) - db + (when-not (chat-exists? chat-id) (let [chat-name (or chat-name (get-chat-name chat-id identities)) _ (log/debug "creating chat" chat-name)] @@ -60,8 +59,7 @@ :timestamp (timestamp) :contacts contacts :last-msg-id ""})))) - (add-status-message chat-id) - db)))) + (add-status-message chat-id))))) (defn chat-contacts [chat-id] (-> (r/get-by-field :chats :chat-id chat-id) diff --git a/src/syng_im/models/messages.cljs b/src/syng_im/models/messages.cljs index 7f476de7f4..2706cad94a 100644 --- a/src/syng_im/models/messages.cljs +++ b/src/syng_im/models/messages.cljs @@ -17,19 +17,24 @@ [s] (keywordize-keys (apply hash-map (split s #"[;=]")))) +(def default-values + {:outgoing false + :to nil + :same-author false + :same-direction false}) + (defn save-message ;; todo remove chat-id parameter - [chat-id {:keys [to msg-id content outgoing] - ;; outgoing should be explicitely defined in handlers - :or {outgoing false - to nil} :as message}] + [chat-id {:keys [msg-id content] + :as message}] (when-not (r/exists? :msgs :msg-id msg-id) (r/write (fn [] (let [content' (if (string? content) content (map-to-str content)) - message' (merge message + message' (merge default-values + message {:chat-id chat-id :content content' :timestamp (timestamp) @@ -60,7 +65,7 @@ (defn clear-history [chat-id] (r/write - (fn [] - (r/delete (r/get-by-field :msgs :chat-id chat-id)))) + (fn [] + (r/delete (r/get-by-field :msgs :chat-id chat-id)))) ;; TODO temp. Update chat in db atom (dispatch [:initialize-chats])) diff --git a/src/syng_im/new_group/handlers.cljs b/src/syng_im/new_group/handlers.cljs new file mode 100644 index 0000000000..bbd07a1f60 --- /dev/null +++ b/src/syng_im/new_group/handlers.cljs @@ -0,0 +1,73 @@ +(ns syng-im.new-group.handlers + (:require [syng-im.protocol.api :as api] + [re-frame.core :refer [register-handler after dispatch debug enrich]] + [syng-im.models.chats :as chats] + [clojure.string :as s])) + +(defn deselect-contact + [db [_ id]] + (update db :selected-contacts disj id)) + +(register-handler :deselect-contact deselect-contact) + +(defn select-contact + [db [_ id]] + (update db :selected-contacts conj id)) + +(register-handler :select-contact select-contact) + +(defn start-group-chat! + [{:keys [selected-contacts] :as db} [_ group-name]] + (let [group-id (api/start-group-chat selected-contacts group-name)] + (assoc db :new-group-id group-id))) + +(defn group-name-from-contacts + [{:keys [contacts selected-contacts username]}] + (->> (select-keys contacts selected-contacts) + vals + (map :name) + (cons username) + (s/join ", "))) + +(defn prepare-chat + [{:keys [selected-contacts new-group-id] :as db} [_ group-name]] + (let [contacts (mapv #(hash-map :identity %) selected-contacts) + chat-name (if-not (s/blank? group-name) + group-name + (group-name-from-contacts db))] + (assoc db :new-chat {:chat-id new-group-id + :name chat-name + :group-chat true + :is-active true + :timestamp (.getTime (js/Date.)) + :contacts contacts + :same-author false + :same-direction false}))) + +(defn add-chat + [{:keys [new-chat] :as db} _] + (-> db + (assoc-in [:chats (:chat-id new-chat)] new-chat) + (assoc :selected-contacts #{}))) + +(defn create-chat! + [{:keys [new-chat]} _] + (chats/create-chat new-chat)) + +(defn show-chat! + [{:keys [new-group-id]} _] + (dispatch [:show-chat new-group-id :replace])) + +(register-handler :create-new-group + (-> start-group-chat! + ((enrich prepare-chat)) + ((enrich add-chat)) + ((after create-chat!)) + ((after show-chat!)))) + +; todo rewrite +(register-handler :group-chat-invite-received + (fn [db [action from group-id identities group-name]] + (if (chats/chat-exists? group-id) + (chats/re-join-group-chat db group-id identities group-name) + (chats/create-chat db group-id identities true group-name)))) diff --git a/src/syng_im/new_group/screen.cljs b/src/syng_im/new_group/screen.cljs index 5e7843c86b..85a344022b 100644 --- a/src/syng_im/new_group/screen.cljs +++ b/src/syng_im/new_group/screen.cljs @@ -1,5 +1,6 @@ (ns syng-im.new-group.screen - (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] + (:require-macros [syng-im.utils.views :refer [defview]]) + (:require [re-frame.core :refer [subscribe dispatch]] [syng-im.resources :as res] [syng-im.components.react :refer [view text-input @@ -16,43 +17,38 @@ [syng-im.new-group.styles :as st])) -(defn new-group-toolbar [] - (let [group-name (subscribe [:get ::group-name])] - (fn [] - [toolbar - {:title "New group chat" - :action {:image {:source res/v ;; {:uri "icon_search"} - :style st/toolbar-icon} - :handler #(dispatch [:create-new-group @group-name])}}]))) +(defview new-group-toolbar [] + [group-name [:get ::group-name]] + [toolbar + {:title "New group chat" + :action {:image {:source res/v ;; {:uri "icon_search"} + :style st/toolbar-icon} + :handler #(dispatch [:create-new-group group-name])}}]) -(defn group-name-input [] - (let [group-name (subscribe [:get ::group-name])] - (fn [] - [text-input - {:underlineColorAndroid color-purple - :style st/group-name-input - :autoFocus true - :placeholder "Group Name" - :onChangeText #(dispatch [:set ::group-name %]) - :onSubmitEditing #(dispatch [:set ::group-name nil])} - @group-name]))) +(defview group-name-input [] + [group-name [:get ::group-name]] + [text-input + {:underlineColorAndroid color-purple + :style st/group-name-input + :autoFocus true + :placeholder "Group Name" + :onChangeText #(dispatch [:set ::group-name %])} + group-name]) -(defn new-group [] - (let [contacts (subscribe [:all-contacts])] - (fn [] - (let [contacts-ds (to-datasource @contacts)] - [view st/new-group-container - [new-group-toolbar] - [view st/chat-name-container - [text {:style st/chat-name-text} "Chat name"] - [group-name-input] - [text {:style st/members-text} "Members"] - [touchable-highlight {:on-press (fn [])} - [view st/add-container - [icon :add_gray st/add-icon] - [text {:style st/add-text} "Add members"]]] - [list-view - {:dataSource contacts-ds - :renderRow (fn [row _ _] - (list-item [new-group-contact row])) - :style st/contacts-list}]]])))) +(defview new-group [] + [contacts [:all-contacts]] + [view st/new-group-container + [new-group-toolbar] + [view st/chat-name-container + [text {:style st/chat-name-text} "Chat name"] + [group-name-input] + [text {:style st/members-text} "Members"] + [touchable-highlight {:on-press (fn [])} + [view st/add-container + [icon :add_gray st/add-icon] + [text {:style st/add-text} "Add members"]]] + [list-view + {:dataSource (to-datasource contacts) + :renderRow (fn [row _ _] + (list-item [new-group-contact row])) + :style st/contacts-list}]]]) diff --git a/src/syng_im/new_group/subs.cljs b/src/syng_im/new_group/subs.cljs new file mode 100644 index 0000000000..62fc941747 --- /dev/null +++ b/src/syng_im/new_group/subs.cljs @@ -0,0 +1,9 @@ +(ns syng-im.new-group.subs + (:require-macros [reagent.ratom :refer [reaction]]) + (:require [re-frame.core :refer [register-sub]])) + +(register-sub :is-contact-selected? + (fn [db [_ id]] + (-> (:selected-contacts @db) + (contains? id) + (reaction)))) diff --git a/src/syng_im/new_group/views/contact.cljs b/src/syng_im/new_group/views/contact.cljs index 2a12eb2bc5..6701e9fafc 100644 --- a/src/syng_im/new_group/views/contact.cljs +++ b/src/syng_im/new_group/views/contact.cljs @@ -1,19 +1,22 @@ (ns syng-im.new-group.views.contact + (:require-macros [syng-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] [syng-im.components.react :refer [view]] [syng-im.contacts.views.contact-inner :refer [contact-inner-view]] [syng-im.components.item-checkbox :refer [item-checkbox]] - [reagent.core :as r] [syng-im.new-group.styles :as st])) -(defn new-group-contact [{:keys [whisper-identity] :as contact}] - (let [checked (r/atom false)] - (fn [] - [view st/contact-container - [item-checkbox - {:onToggle (fn [checked?] - (reset! checked checked?) - (dispatch [:select-for-new-group whisper-identity checked?])) - :checked @checked - :size 30}] - [contact-inner-view contact]]))) +(defn on-toggle [whisper-identity] + (fn [checked?] + (println checked?) + (let [action (if checked? :select-contact :deselect-contact)] + (dispatch [action whisper-identity])))) + +(defview new-group-contact [{:keys [whisper-identity] :as contact}] + [checked [:is-contact-selected? whisper-identity]] + [view st/contact-container + [item-checkbox + {:onToggle (on-toggle whisper-identity) + :checked checked + :size 30}] + [contact-inner-view contact]]) diff --git a/src/syng_im/protocol/protocol_handler.cljs b/src/syng_im/protocol/protocol_handler.cljs index dadeee0b5f..4e6f1f94cf 100644 --- a/src/syng_im/protocol/protocol_handler.cljs +++ b/src/syng_im/protocol/protocol_handler.cljs @@ -10,6 +10,7 @@ (defn make-handler [db] {:ethereum-rpc-url ethereum-rpc-url :identity (stored-identity db) + ;; :active-group-ids is never used in protocol :active-group-ids (active-group-chats) :storage kv/kv-store :handler (fn [{:keys [event-type] :as event}] diff --git a/src/syng_im/subs.cljs b/src/syng_im/subs.cljs index b2d895730c..055e3e8760 100644 --- a/src/syng_im/subs.cljs +++ b/src/syng_im/subs.cljs @@ -4,7 +4,8 @@ syng-im.chat.subs syng-im.group-settings.subs syng-im.discovery.subs - syng-im.contacts.subs)) + syng-im.contacts.subs + syng-im.new-group.subs)) (register-sub :get (fn [db [_ k]] From 2312cd7a14c97b8903baeaafc6ec01d6f28128c2 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Thu, 19 May 2016 18:09:32 +0300 Subject: [PATCH 2/9] revert run-osx.sh Former-commit-id: 9f5c3df150f36d9ba8c8994c03d4a0e2a1addbf7 --- run-osx.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run-osx.sh b/run-osx.sh index 4c66056ae4..9f89a05857 100755 --- a/run-osx.sh +++ b/run-osx.sh @@ -38,10 +38,10 @@ fi if [ "$device_type" = "genymotion" ] then # Find Device based on Android version 6.0.0 -device=$(genyshell -c "devices list" | grep "6.0.0") +device=$(/Applications/Genymotion\ Shell.app/Contents/MacOS/genyshell -c "devices list" | grep "6.0.0") #echo ${device##*| } # Launch device in Genymotion -open -a ~/Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name "${device##*| }" +open -a /Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name "${device##*| }" fi # Install deps, prepare for genymotion and figwheel @@ -56,6 +56,6 @@ tab "react-native start" # echo "Press any key when emulator, figwheel and packager are ready" && read -n 1 sleep 10s -adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449 && adb forward tcp:8082 tcp:8082 +adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449 react-native run-android From b5763bb8ada80b8b1a3cbeb2060671f640628e26 Mon Sep 17 00:00:00 2001 From: Jarrad Date: Thu, 19 May 2016 18:31:56 +0200 Subject: [PATCH 3/9] syng to status Former-commit-id: 6a5250247ca0de762169548c2ff109486b709f13 --- .gitignore | 2 +- CHANGELOG.md | 4 +- README.md | 2 +- android/app/BUCK | 4 +- android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 2 +- .../{syngim => statusim}/MainActivity.java | 2 +- doc/intro.md | 2 +- env/dev/env/android/main.cljs | 2 +- env/dev/env/ios/main.cljs | 2 +- env/prod/env/android/main.cljs | 2 +- env/prod/env/ios/main.cljs | 2 +- ios/pom.xml | 6 +- project.clj | 4 +- src/{syng_im => status_im}/android/core.cljs | 34 +++++------ src/{syng_im => status_im}/chat/handlers.cljs | 22 ++++---- src/{syng_im => status_im}/chat/screen.cljs | 20 +++---- src/{syng_im => status_im}/chat/sign_up.cljs | 18 +++--- .../chat/styles/content_suggestions.cljs | 4 +- .../chat/styles/input.cljs | 4 +- .../chat/styles/message.cljs | 6 +- .../chat/styles/plain_input.cljs | 4 +- .../chat/styles/screen.cljs | 4 +- .../chat/styles/suggestions.cljs | 4 +- src/{syng_im => status_im}/chat/subs.cljs | 10 ++-- .../chat/suggestions.cljs | 8 +-- .../chat/views/command.cljs | 8 +-- .../chat/views/confirmation_code.cljs | 4 +- .../chat/views/content_suggestions.cljs | 10 ++-- .../chat/views/message.cljs | 12 ++-- .../chat/views/money.cljs | 4 +- .../chat/views/new_message.cljs | 20 +++---- .../chat/views/password.cljs | 4 +- .../chat/views/phone.cljs | 6 +- .../chat/views/plain_input.cljs | 8 +-- .../chat/views/staged_command.cljs | 8 +-- .../chat/views/suggestions.cljs | 8 +-- .../chats_list/screen.cljs | 20 +++---- .../chats_list/styles.cljs | 4 +- .../chats_list/views/chat_list_item.cljs | 8 +-- .../chats_list/views/inner_item.cljs | 8 +-- .../components/action_button.cljs | 2 +- .../components/carousel/carousel.cljs | 8 +-- .../components/carousel/styles.cljs | 4 +- .../components/drawer/styles.cljs | 4 +- .../components/drawer/view.cljs | 8 +-- .../components/icons/ionicons.cljs | 2 +- .../components/invertible_scroll_view.cljs | 2 +- .../components/item_checkbox.cljs | 2 +- .../components/react.cljs | 4 +- .../components/realm.cljs | 2 +- .../components/spinner.cljs | 2 +- .../components/styles.cljs | 2 +- .../components/toolbar.cljs | 8 +-- src/{syng_im => status_im}/constants.cljs | 4 +- .../contacts/handlers.cljs | 12 ++-- .../contacts/screen.cljs | 16 +++--- .../contacts/styles.cljs | 4 +- src/{syng_im => status_im}/contacts/subs.cljs | 2 +- .../contacts/views/contact.cljs | 8 +-- .../contacts/views/contact_inner.cljs | 8 +-- src/{syng_im => status_im}/db.cljs | 2 +- .../discovery/handlers.cljs | 10 ++-- .../discovery/model.cljs | 10 ++-- .../discovery/screen.cljs | 14 ++--- .../discovery/styles.cljs | 4 +- .../discovery/subs.cljs | 2 +- src/{syng_im => status_im}/discovery/tag.cljs | 14 ++--- .../discovery/views/popular.cljs | 14 ++--- .../discovery/views/popular_list.cljs | 12 ++-- .../discovery/views/popular_list_item.cljs | 6 +- .../discovery/views/recent.cljs | 12 ++-- .../group_settings/handlers.cljs | 6 +- .../group_settings/screen.cljs | 12 ++-- .../group_settings/styles/chat_name_edit.cljs | 4 +- .../group_settings/styles/group_settings.cljs | 4 +- .../group_settings/styles/member.cljs | 4 +- .../group_settings/subs.cljs | 4 +- .../group_settings/views/chat_name_edit.cljs | 12 ++-- .../group_settings/views/member.cljs | 8 +-- src/{syng_im => status_im}/handlers.cljs | 56 +++++++++---------- .../handlers/content_suggestions.cljs | 6 +- .../handlers/server.cljs | 6 +- src/{syng_im => status_im}/ios/core.cljs | 6 +- src/{syng_im => status_im}/models/chats.cljs | 14 ++--- .../models/commands.cljs | 6 +- .../models/contacts.cljs | 6 +- .../models/messages.cljs | 12 ++-- .../models/protocol.cljs | 12 ++-- src/{syng_im => status_im}/navigation.cljs | 2 +- .../navigation/handlers.cljs | 2 +- .../new_group/handlers.cljs | 6 +- .../new_group/screen.cljs | 18 +++--- .../new_group/styles.cljs | 4 +- .../new_group/subs.cljs | 2 +- .../new_group/views/contact.cljs | 12 ++-- .../participants/styles.cljs | 2 +- .../participants/views/contact.cljs | 10 ++-- .../participants/views/create.cljs | 14 ++--- .../participants/views/remove.cljs | 14 ++--- .../persistence/realm.cljs | 6 +- .../persistence/realm_queries.cljs | 4 +- .../persistence/simple_kv_store.cljs | 8 +-- .../profile/screen.cljs | 10 ++-- .../profile/styles.cljs | 4 +- .../protocol/protocol_handler.cljs | 12 ++-- src/{syng_im => status_im}/resources.cljs | 2 +- src/status_im/subs.cljs | 12 ++++ src/{syng_im => status_im}/utils/crypt.cljs | 2 +- src/{syng_im => status_im}/utils/event.cljs | 2 +- .../utils/handlers.cljs | 2 +- .../utils/listview.cljs | 4 +- .../utils/phone_number.cljs | 2 +- src/{syng_im => status_im}/utils/types.cljs | 2 +- src/{syng_im => status_im}/utils/utils.cljs | 4 +- src/{syng_im => status_im}/utils/views.clj | 2 +- src/syng_im/subs.cljs | 12 ---- test/{syng_im => status_im}/core_test.clj | 4 +- test/status_im/syng_im/core_test.clj | 7 +++ 119 files changed, 442 insertions(+), 435 deletions(-) rename android/app/src/main/java/com/{syngim => statusim}/MainActivity.java (99%) rename src/{syng_im => status_im}/android/core.cljs (64%) rename src/{syng_im => status_im}/chat/handlers.cljs (94%) rename src/{syng_im => status_im}/chat/screen.cljs (93%) rename src/{syng_im => status_im}/chat/sign_up.cljs (94%) rename src/{syng_im => status_im}/chat/styles/content_suggestions.cljs (94%) rename src/{syng_im => status_im}/chat/styles/input.cljs (96%) rename src/{syng_im => status_im}/chat/styles/message.cljs (97%) rename src/{syng_im => status_im}/chat/styles/plain_input.cljs (91%) rename src/{syng_im => status_im}/chat/styles/screen.cljs (98%) rename src/{syng_im => status_im}/chat/styles/suggestions.cljs (95%) rename src/{syng_im => status_im}/chat/subs.cljs (90%) rename src/{syng_im => status_im}/chat/suggestions.cljs (93%) rename src/{syng_im => status_im}/chat/views/command.cljs (90%) rename src/{syng_im => status_im}/chat/views/confirmation_code.cljs (51%) rename src/{syng_im => status_im}/chat/views/content_suggestions.cljs (81%) rename src/{syng_im => status_im}/chat/views/message.cljs (95%) rename src/{syng_im => status_im}/chat/views/money.cljs (52%) rename src/{syng_im => status_im}/chat/views/new_message.cljs (66%) rename src/{syng_im => status_im}/chat/views/password.cljs (69%) rename src/{syng_im => status_im}/chat/views/phone.cljs (58%) rename src/{syng_im => status_im}/chat/views/plain_input.cljs (90%) rename src/{syng_im => status_im}/chat/views/staged_command.cljs (85%) rename src/{syng_im => status_im}/chat/views/suggestions.cljs (88%) rename src/{syng_im => status_im}/chats_list/screen.cljs (74%) rename src/{syng_im => status_im}/chats_list/styles.cljs (97%) rename src/{syng_im => status_im}/chats_list/views/chat_list_item.cljs (80%) rename src/{syng_im => status_im}/chats_list/views/inner_item.cljs (88%) rename src/{syng_im => status_im}/components/action_button.cljs (81%) rename src/{syng_im => status_im}/components/carousel/carousel.cljs (97%) rename src/{syng_im => status_im}/components/carousel/styles.cljs (90%) rename src/{syng_im => status_im}/components/drawer/styles.cljs (94%) rename src/{syng_im => status_im}/components/drawer/view.cljs (93%) rename src/{syng_im => status_im}/components/icons/ionicons.cljs (79%) rename src/{syng_im => status_im}/components/invertible_scroll_view.cljs (83%) rename src/{syng_im => status_im}/components/item_checkbox.cljs (81%) rename src/{syng_im => status_im}/components/react.cljs (95%) rename src/{syng_im => status_im}/components/realm.cljs (89%) rename src/{syng_im => status_im}/components/spinner.cljs (83%) rename src/{syng_im => status_im}/components/styles.cljs (96%) rename src/{syng_im => status_im}/components/toolbar.cljs (92%) rename src/{syng_im => status_im}/constants.cljs (83%) rename src/{syng_im => status_im}/contacts/handlers.cljs (91%) rename src/{syng_im => status_im}/contacts/screen.cljs (71%) rename src/{syng_im => status_im}/contacts/styles.cljs (94%) rename src/{syng_im => status_im}/contacts/subs.cljs (97%) rename src/{syng_im => status_im}/contacts/views/contact.cljs (62%) rename src/{syng_im => status_im}/contacts/views/contact_inner.cljs (79%) rename src/{syng_im => status_im}/db.cljs (99%) rename src/{syng_im => status_im}/discovery/handlers.cljs (91%) rename src/{syng_im => status_im}/discovery/model.cljs (92%) rename src/{syng_im => status_im}/discovery/screen.cljs (83%) rename src/{syng_im => status_im}/discovery/styles.cljs (97%) rename src/{syng_im => status_im}/discovery/subs.cljs (95%) rename src/{syng_im => status_im}/discovery/tag.cljs (79%) rename src/{syng_im => status_im}/discovery/views/popular.cljs (55%) rename src/{syng_im => status_im}/discovery/views/popular_list.cljs (77%) rename src/{syng_im => status_im}/discovery/views/popular_list_item.cljs (73%) rename src/{syng_im => status_im}/discovery/views/recent.cljs (63%) rename src/{syng_im => status_im}/group_settings/handlers.cljs (93%) rename src/{syng_im => status_im}/group_settings/screen.cljs (94%) rename src/{syng_im => status_im}/group_settings/styles/chat_name_edit.cljs (78%) rename src/{syng_im => status_im}/group_settings/styles/group_settings.cljs (97%) rename src/{syng_im => status_im}/group_settings/styles/member.cljs (94%) rename src/{syng_im => status_im}/group_settings/subs.cljs (79%) rename src/{syng_im => status_im}/group_settings/views/chat_name_edit.cljs (73%) rename src/{syng_im => status_im}/group_settings/views/member.cljs (87%) rename src/{syng_im => status_im}/handlers.cljs (88%) rename src/{syng_im => status_im}/handlers/content_suggestions.cljs (84%) rename src/{syng_im => status_im}/handlers/server.cljs (78%) rename src/{syng_im => status_im}/ios/core.cljs (93%) rename src/{syng_im => status_im}/models/chats.cljs (92%) rename src/{syng_im => status_im}/models/commands.cljs (97%) rename src/{syng_im => status_im}/models/contacts.cljs (88%) rename src/{syng_im => status_im}/models/messages.cljs (88%) rename src/{syng_im => status_im}/models/protocol.cljs (69%) rename src/{syng_im => status_im}/navigation.cljs (93%) rename src/{syng_im => status_im}/navigation/handlers.cljs (98%) rename src/{syng_im => status_im}/new_group/handlers.cljs (94%) rename src/{syng_im => status_im}/new_group/screen.cljs (77%) rename src/{syng_im => status_im}/new_group/styles.cljs (94%) rename src/{syng_im => status_im}/new_group/subs.cljs (89%) rename src/{syng_im => status_im}/new_group/views/contact.cljs (60%) rename src/{syng_im => status_im}/participants/styles.cljs (92%) rename src/{syng_im => status_im}/participants/views/contact.cljs (68%) rename src/{syng_im => status_im}/participants/views/create.cljs (66%) rename src/{syng_im => status_im}/participants/views/remove.cljs (73%) rename src/{syng_im => status_im}/persistence/realm.cljs (97%) rename src/{syng_im => status_im}/persistence/realm_queries.cljs (83%) rename src/{syng_im => status_im}/persistence/simple_kv_store.cljs (73%) rename src/{syng_im => status_im}/profile/screen.cljs (94%) rename src/{syng_im => status_im}/profile/styles.cljs (97%) rename src/{syng_im => status_im}/protocol/protocol_handler.cljs (90%) rename src/{syng_im => status_im}/resources.cljs (97%) create mode 100644 src/status_im/subs.cljs rename src/{syng_im => status_im}/utils/crypt.cljs (96%) rename src/{syng_im => status_im}/utils/event.cljs (79%) rename src/{syng_im => status_im}/utils/handlers.cljs (81%) rename src/{syng_im => status_im}/utils/listview.cljs (80%) rename src/{syng_im => status_im}/utils/phone_number.cljs (94%) rename src/{syng_im => status_im}/utils/types.cljs (62%) rename src/{syng_im => status_im}/utils/utils.cljs (95%) rename src/{syng_im => status_im}/utils/views.clj (96%) delete mode 100644 src/syng_im/subs.cljs rename test/{syng_im => status_im}/core_test.clj (60%) create mode 100644 test/status_im/syng_im/core_test.clj diff --git a/.gitignore b/.gitignore index 2e228c8a6d..14773fe52f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ project.xcworkspace .idea .gradle local.properties -syng-im.iml +status-im.iml # node.js # diff --git a/CHANGELOG.md b/CHANGELOG.md index e03cc81c3e..77afa77091 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,5 +20,5 @@ All notable changes to this project will be documented in this file. This change - Files from the new template. - Widget maker public API - `make-widget-sync`. -[unreleased]: https://github.com/your-name/syng-im/compare/0.1.1...HEAD -[0.1.1]: https://github.com/your-name/syng-im/compare/0.1.0...0.1.1 +[unreleased]: https://github.com/your-name/status-im/compare/0.1.1...HEAD +[0.1.1]: https://github.com/your-name/status-im/compare/0.1.0...0.1.1 diff --git a/README.md b/README.md index 54b510765e..3635c7175e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# syng-im +# status-im A Clojure library designed to ... well, that part is up to you. diff --git a/android/app/BUCK b/android/app/BUCK index 0268e87833..8e2329a84c 100644 --- a/android/app/BUCK +++ b/android/app/BUCK @@ -46,13 +46,13 @@ android_library( android_build_config( name = 'build_config', - package = 'com.syngim', + package = 'com.statusim', ) android_resource( name = 'res', res = 'src/main/res', - package = 'com.syngim', + package = 'com.statusim', ) android_binary( diff --git a/android/app/build.gradle b/android/app/build.gradle index c291fec7de..965c39b784 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,7 +81,7 @@ android { buildToolsVersion "23.0.1" defaultConfig { - applicationId "com.syngim" + applicationId "com.statusim" minSdkVersion 16 targetSdkVersion 22 versionCode 1 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 335316253b..a7eb44af57 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.statusim"> diff --git a/android/app/src/main/java/com/syngim/MainActivity.java b/android/app/src/main/java/com/statusim/MainActivity.java similarity index 99% rename from android/app/src/main/java/com/syngim/MainActivity.java rename to android/app/src/main/java/com/statusim/MainActivity.java index b080070f49..492bd5d8e9 100644 --- a/android/app/src/main/java/com/syngim/MainActivity.java +++ b/android/app/src/main/java/com/statusim/MainActivity.java @@ -1,4 +1,4 @@ -package com.syngim; +package com.statusim; import com.facebook.react.ReactActivity; import io.realm.react.RealmReactPackage; diff --git a/doc/intro.md b/doc/intro.md index 7a0eb4e81c..b3702d4122 100644 --- a/doc/intro.md +++ b/doc/intro.md @@ -1,3 +1,3 @@ -# Introduction to syng-im +# Introduction to status-im TODO: write [great documentation](http://jacobian.org/writing/what-to-write/) diff --git a/env/dev/env/android/main.cljs b/env/dev/env/android/main.cljs index f80f25c166..f0c3d96fca 100644 --- a/env/dev/env/android/main.cljs +++ b/env/dev/env/android/main.cljs @@ -1,6 +1,6 @@ (ns ^:figwheel-no-load env.android.main (:require [reagent.core :as r] - [syng-im.android.core :as core] + [status-im.android.core :as core] [figwheel.client :as figwheel :include-macros true])) (enable-console-print!) diff --git a/env/dev/env/ios/main.cljs b/env/dev/env/ios/main.cljs index f5c132e346..3f518fd9da 100644 --- a/env/dev/env/ios/main.cljs +++ b/env/dev/env/ios/main.cljs @@ -1,6 +1,6 @@ (ns ^:figwheel-no-load env.ios.main (:require [reagent.core :as r] - [syng-im.ios.core :as core] + [status-im.ios.core :as core] [figwheel.client :as figwheel :include-macros true])) (enable-console-print!) diff --git a/env/prod/env/android/main.cljs b/env/prod/env/android/main.cljs index f112100ec7..b1e717e078 100644 --- a/env/prod/env/android/main.cljs +++ b/env/prod/env/android/main.cljs @@ -1,5 +1,5 @@ (ns env.android.main - (:require [syng-im.android.core :as core])) + (:require [status-im.android.core :as core])) (core/init) diff --git a/env/prod/env/ios/main.cljs b/env/prod/env/ios/main.cljs index 11392b5e72..67664f36de 100644 --- a/env/prod/env/ios/main.cljs +++ b/env/prod/env/ios/main.cljs @@ -1,5 +1,5 @@ (ns env.ios.main - (:require [syng-im.ios.core :as core])) + (:require [status-im.ios.core :as core])) (core/init) diff --git a/ios/pom.xml b/ios/pom.xml index 1f41b6d02b..81fa2f3170 100644 --- a/ios/pom.xml +++ b/ios/pom.xml @@ -9,8 +9,8 @@ - ci.syng.im - http://ci.syng.im:8081/artifactory/libs-release-local/ + ci.status.im + http://ci.status.im:8081/artifactory/libs-release-local/ @@ -23,7 +23,7 @@ - syng-im + status-im ios-geth 1.4.0-201603151613-92d65cf zip diff --git a/project.clj b/project.clj index 8e27322b77..c5972733d3 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject syng-im "0.1.0-SNAPSHOT" +(defproject status-im "0.1.0-SNAPSHOT" :description "FIXME: write description" :url "http://example.com/FIXME" :license {:name "Eclipse Public License" @@ -10,7 +10,7 @@ [prismatic/schema "1.0.4"] ^{:voom {:repo "https://github.com/status-im/status-lib.git" :branch "feature-discover"}} - [syng-im/protocol "0.1.1-20160506_171115-ge2c95c1"] + [status-im/protocol "0.1.1-20160506_171115-ge2c95c1"] [natal-shell "0.1.6"]] :plugins [[lein-cljsbuild "1.1.1"] [lein-figwheel "0.5.0-2"]] diff --git a/src/syng_im/android/core.cljs b/src/status_im/android/core.cljs similarity index 64% rename from src/syng_im/android/core.cljs rename to src/status_im/android/core.cljs index a7c6315b1e..39eaabced2 100644 --- a/src/syng_im/android/core.cljs +++ b/src/status_im/android/core.cljs @@ -1,24 +1,24 @@ -(ns syng-im.android.core +(ns status-im.android.core (:require-macros [natal-shell.back-android :refer [add-event-listener remove-event-listener]]) (:require [reagent.core :as r :refer [atom]] [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.handlers] - [syng-im.subs] - [syng-im.components.react :refer [navigator app-registry]] - [syng-im.contacts.screen :refer [contact-list]] - [syng-im.discovery.screen :refer [discovery]] - [syng-im.discovery.tag :refer [discovery-tag]] - [syng-im.chat.screen :refer [chat]] - [syng-im.chats-list.screen :refer [chats-list]] - [syng-im.new-group.screen :refer [new-group]] - [syng-im.participants.views.create :refer [new-participants]] - [syng-im.participants.views.remove :refer [remove-participants]] - [syng-im.group-settings.screen :refer [group-settings]] - [syng-im.group-settings.views.chat-name-edit :refer [chat-name-edit]] - [syng-im.profile.screen :refer [profile my-profile]] - [syng-im.utils.utils :refer [toast]] - [syng-im.utils.encryption])) + [status-im.handlers] + [status-im.subs] + [status-im.components.react :refer [navigator app-registry]] + [status-im.contacts.screen :refer [contact-list]] + [status-im.discovery.screen :refer [discovery]] + [status-im.discovery.tag :refer [discovery-tag]] + [status-im.chat.screen :refer [chat]] + [status-im.chats-list.screen :refer [chats-list]] + [status-im.new-group.screen :refer [new-group]] + [status-im.participants.views.create :refer [new-participants]] + [status-im.participants.views.remove :refer [remove-participants]] + [status-im.group-settings.screen :refer [group-settings]] + [status-im.group-settings.views.chat-name-edit :refer [chat-name-edit]] + [status-im.profile.screen :refer [profile my-profile]] + [status-im.utils.utils :refer [toast]] + [status-im.utils.encryption])) (defn init-back-button-handler! [] (let [new-listener (fn [] diff --git a/src/syng_im/chat/handlers.cljs b/src/status_im/chat/handlers.cljs similarity index 94% rename from src/syng_im/chat/handlers.cljs rename to src/status_im/chat/handlers.cljs index 67acc9a6fa..9317aef352 100644 --- a/src/syng_im/chat/handlers.cljs +++ b/src/status_im/chat/handlers.cljs @@ -1,17 +1,17 @@ -(ns syng-im.chat.handlers +(ns status-im.chat.handlers (:require [re-frame.core :refer [register-handler enrich after debug dispatch]] - [syng-im.models.commands :as commands] + [status-im.models.commands :as commands] [clojure.string :as str] - [syng-im.chat.suggestions :as suggestions] - [syng-im.protocol.api :as api] - [syng-im.models.messages :as messages] - [syng-im.constants :refer [text-content-type + [status-im.chat.suggestions :as suggestions] + [status-im.protocol.api :as api] + [status-im.models.messages :as messages] + [status-im.constants :refer [text-content-type content-type-command]] - [syng-im.utils.random :as random] - [syng-im.chat.sign-up :as sign-up-service] - [syng-im.models.chats :as chats] - [syng-im.navigation.handlers :as nav] - [syng-im.utils.handlers :as u])) + [status-im.utils.random :as random] + [status-im.chat.sign-up :as sign-up-service] + [status-im.models.chats :as chats] + [status-im.navigation.handlers :as nav] + [status-im.utils.handlers :as u])) (register-handler :set-show-actions (fn [db [_ show-actions]] diff --git a/src/syng_im/chat/screen.cljs b/src/status_im/chat/screen.cljs similarity index 93% rename from src/syng_im/chat/screen.cljs rename to src/status_im/chat/screen.cljs index dd355b4223..17f7293fee 100644 --- a/src/syng_im/chat/screen.cljs +++ b/src/status_im/chat/screen.cljs @@ -1,21 +1,21 @@ -(ns syng-im.chat.screen - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.chat.screen + (:require-macros [status-im.utils.views :refer [defview]]) (:require [clojure.string :as s] [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view text image icon touchable-highlight list-view list-item]] - [syng-im.chat.styles.screen :as st] - [syng-im.resources :as res] - [syng-im.utils.listview :refer [to-datasource]] - [syng-im.components.invertible-scroll-view :refer [invertible-scroll-view]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.chat.views.message :refer [chat-message]] - [syng-im.chat.views.new-message :refer [chat-message-new]])) + [status-im.chat.styles.screen :as st] + [status-im.resources :as res] + [status-im.utils.listview :refer [to-datasource]] + [status-im.components.invertible-scroll-view :refer [invertible-scroll-view]] + [status-im.components.toolbar :refer [toolbar]] + [status-im.chat.views.message :refer [chat-message]] + [status-im.chat.views.new-message :refer [chat-message-new]])) (defn contacts-by-identity [contacts] diff --git a/src/syng_im/chat/sign_up.cljs b/src/status_im/chat/sign_up.cljs similarity index 94% rename from src/syng_im/chat/sign_up.cljs rename to src/status_im/chat/sign_up.cljs index 8cef60aac0..6d03846cb8 100644 --- a/src/syng_im/chat/sign_up.cljs +++ b/src/status_im/chat/sign_up.cljs @@ -1,13 +1,13 @@ -(ns syng-im.chat.sign-up - ;syng-im.handlers.sign-up +(ns status-im.chat.sign-up + ;status-im.handlers.sign-up (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.persistence.simple-kv-store :as kv] - [syng-im.protocol.state.storage :as s] - [syng-im.models.chats :as c] - [syng-im.utils.utils :refer [log on-error http-post toast]] - [syng-im.utils.random :as random] - [syng-im.utils.phone-number :refer [format-phone-number]] - [syng-im.constants :refer [text-content-type + [status-im.persistence.simple-kv-store :as kv] + [status-im.protocol.state.storage :as s] + [status-im.models.chats :as c] + [status-im.utils.utils :refer [log on-error http-post toast]] + [status-im.utils.random :as random] + [status-im.utils.phone-number :refer [format-phone-number]] + [status-im.constants :refer [text-content-type content-type-command content-type-command-request content-type-status]])) diff --git a/src/syng_im/chat/styles/content_suggestions.cljs b/src/status_im/chat/styles/content_suggestions.cljs similarity index 94% rename from src/syng_im/chat/styles/content_suggestions.cljs rename to src/status_im/chat/styles/content_suggestions.cljs index 60c670fada..198468a549 100644 --- a/src/syng_im/chat/styles/content_suggestions.cljs +++ b/src/status_im/chat/styles/content_suggestions.cljs @@ -1,5 +1,5 @@ -(ns syng-im.chat.styles.content-suggestions - (:require [syng-im.components.styles :refer [font +(ns status-im.chat.styles.content-suggestions + (:require [status-im.components.styles :refer [font color-light-blue-transparent color-white color-black diff --git a/src/syng_im/chat/styles/input.cljs b/src/status_im/chat/styles/input.cljs similarity index 96% rename from src/syng_im/chat/styles/input.cljs rename to src/status_im/chat/styles/input.cljs index dcbc893f86..474cd2a115 100644 --- a/src/syng_im/chat/styles/input.cljs +++ b/src/status_im/chat/styles/input.cljs @@ -1,5 +1,5 @@ -(ns syng-im.chat.styles.input - (:require [syng-im.components.styles :refer [font +(ns status-im.chat.styles.input + (:require [status-im.components.styles :refer [font color-white color-blue text1-color diff --git a/src/syng_im/chat/styles/message.cljs b/src/status_im/chat/styles/message.cljs similarity index 97% rename from src/syng_im/chat/styles/message.cljs rename to src/status_im/chat/styles/message.cljs index 356419841b..79e3cb24a7 100644 --- a/src/syng_im/chat/styles/message.cljs +++ b/src/status_im/chat/styles/message.cljs @@ -1,5 +1,5 @@ -(ns syng-im.chat.styles.message - (:require [syng-im.components.styles :refer [font +(ns status-im.chat.styles.message + (:require [status-im.components.styles :refer [font color-light-blue-transparent color-white color-black @@ -8,7 +8,7 @@ online-color text1-color text2-color]] - [syng-im.constants :refer [text-content-type + [status-im.constants :refer [text-content-type content-type-command]])) (def style-message-text diff --git a/src/syng_im/chat/styles/plain_input.cljs b/src/status_im/chat/styles/plain_input.cljs similarity index 91% rename from src/syng_im/chat/styles/plain_input.cljs rename to src/status_im/chat/styles/plain_input.cljs index a3a85967a2..b8806518dd 100644 --- a/src/syng_im/chat/styles/plain_input.cljs +++ b/src/status_im/chat/styles/plain_input.cljs @@ -1,5 +1,5 @@ -(ns syng-im.chat.styles.plain-input - (:require [syng-im.components.styles :refer [font +(ns status-im.chat.styles.plain-input + (:require [status-im.components.styles :refer [font text2-color color-white color-blue]])) diff --git a/src/syng_im/chat/styles/screen.cljs b/src/status_im/chat/styles/screen.cljs similarity index 98% rename from src/syng_im/chat/styles/screen.cljs rename to src/status_im/chat/styles/screen.cljs index f3e74ac123..5faa905fd6 100644 --- a/src/syng_im/chat/styles/screen.cljs +++ b/src/status_im/chat/styles/screen.cljs @@ -1,5 +1,5 @@ -(ns syng-im.chat.styles.screen - (:require [syng-im.components.styles :refer [font +(ns status-im.chat.styles.screen + (:require [status-im.components.styles :refer [font title-font color-white chat-background diff --git a/src/syng_im/chat/styles/suggestions.cljs b/src/status_im/chat/styles/suggestions.cljs similarity index 95% rename from src/syng_im/chat/styles/suggestions.cljs rename to src/status_im/chat/styles/suggestions.cljs index 7eeae72192..2d5eaaab8e 100644 --- a/src/syng_im/chat/styles/suggestions.cljs +++ b/src/status_im/chat/styles/suggestions.cljs @@ -1,5 +1,5 @@ -(ns syng-im.chat.styles.suggestions - (:require [syng-im.components.styles :refer [font +(ns status-im.chat.styles.suggestions + (:require [status-im.components.styles :refer [font color-light-blue-transparent color-white color-black diff --git a/src/syng_im/chat/subs.cljs b/src/status_im/chat/subs.cljs similarity index 90% rename from src/syng_im/chat/subs.cljs rename to src/status_im/chat/subs.cljs index 6e20718820..d5df5f5716 100644 --- a/src/syng_im/chat/subs.cljs +++ b/src/status_im/chat/subs.cljs @@ -1,12 +1,12 @@ -(ns syng-im.chat.subs +(ns status-im.chat.subs (:require-macros [reagent.ratom :refer [reaction]]) (:require [re-frame.core :refer [register-sub]] - [syng-im.db :as db] + [status-im.db :as db] ;todo handlers in subs?... - [syng-im.chat.suggestions :refer + [status-im.chat.suggestions :refer [get-suggestions typing-command? get-content-suggestions]] - [syng-im.models.commands :as commands] - [syng-im.handlers.content-suggestions :refer [get-content-suggestions]])) + [status-im.models.commands :as commands] + [status-im.handlers.content-suggestions :refer [get-content-suggestions]])) (register-sub :chat-properties (fn [db [_ properties]] diff --git a/src/syng_im/chat/suggestions.cljs b/src/status_im/chat/suggestions.cljs similarity index 93% rename from src/syng_im/chat/suggestions.cljs rename to src/status_im/chat/suggestions.cljs index d5a04d50f1..dcdc0d3db4 100644 --- a/src/syng_im/chat/suggestions.cljs +++ b/src/status_im/chat/suggestions.cljs @@ -1,13 +1,13 @@ -(ns syng-im.chat.suggestions +(ns status-im.chat.suggestions (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.db :as db] - [syng-im.models.commands :refer [commands + [status-im.db :as db] + [status-im.models.commands :refer [commands suggestions get-commands get-chat-command-request get-chat-command-to-msg-id clear-staged-commands]] - [syng-im.utils.utils :refer [log on-error http-get]] + [status-im.utils.utils :refer [log on-error http-get]] [clojure.string :as s])) (defn suggestion? [text] diff --git a/src/syng_im/chat/views/command.cljs b/src/status_im/chat/views/command.cljs similarity index 90% rename from src/syng_im/chat/views/command.cljs rename to src/status_im/chat/views/command.cljs index 688e3d0736..ab90de0426 100644 --- a/src/syng_im/chat/views/command.cljs +++ b/src/status_im/chat/views/command.cljs @@ -1,13 +1,13 @@ -(ns syng-im.chat.views.command +(ns status-im.chat.views.command (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view icon text text-input touchable-highlight]] - [syng-im.chat.views.content-suggestions :refer + [status-im.chat.views.content-suggestions :refer [content-suggestions-view]] - [syng-im.chat.styles.input :as st])) + [status-im.chat.styles.input :as st])) (defn cancel-command-input [] (dispatch [:cancel-command])) diff --git a/src/syng_im/chat/views/confirmation_code.cljs b/src/status_im/chat/views/confirmation_code.cljs similarity index 51% rename from src/syng_im/chat/views/confirmation_code.cljs rename to src/status_im/chat/views/confirmation_code.cljs index 9e98fb9c46..b1d5f4c94e 100644 --- a/src/syng_im/chat/views/confirmation_code.cljs +++ b/src/status_im/chat/views/confirmation_code.cljs @@ -1,6 +1,6 @@ -(ns syng-im.chat.views.confirmation-code +(ns status-im.chat.views.confirmation-code (:require - [syng-im.chat.views.command :refer [simple-command-input-view]])) + [status-im.chat.views.command :refer [simple-command-input-view]])) (defn confirmation-code-input-view [command] [simple-command-input-view command {:keyboardType :numeric}]) diff --git a/src/syng_im/chat/views/content_suggestions.cljs b/src/status_im/chat/views/content_suggestions.cljs similarity index 81% rename from src/syng_im/chat/views/content_suggestions.cljs rename to src/status_im/chat/views/content_suggestions.cljs index a2e67c8cfc..20fb1df9e5 100644 --- a/src/syng_im/chat/views/content_suggestions.cljs +++ b/src/status_im/chat/views/content_suggestions.cljs @@ -1,14 +1,14 @@ -(ns syng-im.chat.views.content-suggestions - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.chat.views.content-suggestions + (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view icon text touchable-highlight list-view list-item]] - [syng-im.chat.styles.content-suggestions :as st] - [syng-im.utils.listview :refer [to-datasource]])) + [status-im.chat.styles.content-suggestions :as st] + [status-im.utils.listview :refer [to-datasource]])) (defn set-command-content [content] (dispatch [:set-chat-command-content content])) diff --git a/src/syng_im/chat/views/message.cljs b/src/status_im/chat/views/message.cljs similarity index 95% rename from src/syng_im/chat/views/message.cljs rename to src/status_im/chat/views/message.cljs index b7fe165406..d1b9750f5f 100644 --- a/src/syng_im/chat/views/message.cljs +++ b/src/status_im/chat/views/message.cljs @@ -1,15 +1,15 @@ -(ns syng-im.chat.views.message +(ns status-im.chat.views.message (:require [clojure.string :as s] [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view text image touchable-highlight]] - [syng-im.chat.styles.message :as st] - [syng-im.models.commands :refer [parse-command-msg-content + [status-im.chat.styles.message :as st] + [status-im.models.commands :refer [parse-command-msg-content parse-command-request]] - [syng-im.resources :as res] - [syng-im.constants :refer [text-content-type + [status-im.resources :as res] + [status-im.constants :refer [text-content-type content-type-status content-type-command content-type-command-request]])) diff --git a/src/syng_im/chat/views/money.cljs b/src/status_im/chat/views/money.cljs similarity index 52% rename from src/syng_im/chat/views/money.cljs rename to src/status_im/chat/views/money.cljs index 4706009bfd..0051b597f6 100644 --- a/src/syng_im/chat/views/money.cljs +++ b/src/status_im/chat/views/money.cljs @@ -1,6 +1,6 @@ -(ns syng-im.chat.views.money +(ns status-im.chat.views.money (:require - [syng-im.chat.views.command :refer [simple-command-input-view]])) + [status-im.chat.views.command :refer [simple-command-input-view]])) (defn money-input-view [command] [simple-command-input-view command diff --git a/src/syng_im/chat/views/new_message.cljs b/src/status_im/chat/views/new_message.cljs similarity index 66% rename from src/syng_im/chat/views/new_message.cljs rename to src/status_im/chat/views/new_message.cljs index 988e0de9d6..29b203a067 100644 --- a/src/syng_im/chat/views/new_message.cljs +++ b/src/status_im/chat/views/new_message.cljs @@ -1,15 +1,15 @@ -(ns syng-im.chat.views.new-message +(ns status-im.chat.views.new-message (:require [re-frame.core :refer [subscribe]] - [syng-im.components.react :refer [view]] - [syng-im.chat.views.plain-input :refer [plain-message-input-view]] - [syng-im.chat.views.command :refer [simple-command-input-view]] - [syng-im.chat.views.phone :refer [phone-input-view]] - [syng-im.chat.views.password :refer [password-input-view]] - [syng-im.chat.views.confirmation-code :refer [confirmation-code-input-view]] - [syng-im.chat.views.money :refer [money-input-view]] - [syng-im.chat.views.staged-command :refer [simple-command-staged-view]] - [syng-im.chat.styles.message :as st])) + [status-im.components.react :refer [view]] + [status-im.chat.views.plain-input :refer [plain-message-input-view]] + [status-im.chat.views.command :refer [simple-command-input-view]] + [status-im.chat.views.phone :refer [phone-input-view]] + [status-im.chat.views.password :refer [password-input-view]] + [status-im.chat.views.confirmation-code :refer [confirmation-code-input-view]] + [status-im.chat.views.money :refer [money-input-view]] + [status-im.chat.views.staged-command :refer [simple-command-staged-view]] + [status-im.chat.styles.message :as st])) (defn staged-command-view [stage-command] [simple-command-staged-view stage-command]) diff --git a/src/syng_im/chat/views/password.cljs b/src/status_im/chat/views/password.cljs similarity index 69% rename from src/syng_im/chat/views/password.cljs rename to src/status_im/chat/views/password.cljs index 253464ce0c..cc87e05fff 100644 --- a/src/syng_im/chat/views/password.cljs +++ b/src/status_im/chat/views/password.cljs @@ -1,6 +1,6 @@ -(ns syng-im.chat.views.password +(ns status-im.chat.views.password (:require - [syng-im.chat.views.command + [status-im.chat.views.command :refer [simple-command-input-view]])) (defn password-input-view [command] diff --git a/src/syng_im/chat/views/phone.cljs b/src/status_im/chat/views/phone.cljs similarity index 58% rename from src/syng_im/chat/views/phone.cljs rename to src/status_im/chat/views/phone.cljs index 2cf361bf32..f74ad65568 100644 --- a/src/syng_im/chat/views/phone.cljs +++ b/src/status_im/chat/views/phone.cljs @@ -1,8 +1,8 @@ -(ns syng-im.chat.views.phone +(ns status-im.chat.views.phone (:require - [syng-im.chat.views.command + [status-im.chat.views.command :refer [simple-command-input-view]] - [syng-im.utils.phone-number :refer [valid-mobile-number?]])) + [status-im.utils.phone-number :refer [valid-mobile-number?]])) (defn phone-input-view [command] [simple-command-input-view command {:keyboardType :phone-pad} diff --git a/src/syng_im/chat/views/plain_input.cljs b/src/status_im/chat/views/plain_input.cljs similarity index 90% rename from src/syng_im/chat/views/plain_input.cljs rename to src/status_im/chat/views/plain_input.cljs index 61fb8ed09b..9b6bea54c5 100644 --- a/src/syng_im/chat/views/plain_input.cljs +++ b/src/status_im/chat/views/plain_input.cljs @@ -1,11 +1,11 @@ -(ns syng-im.chat.views.plain-input +(ns status-im.chat.views.plain-input (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view icon touchable-highlight text-input]] - [syng-im.chat.views.suggestions :refer [suggestions-view]] - [syng-im.chat.styles.plain-input :as st])) + [status-im.chat.views.suggestions :refer [suggestions-view]] + [status-im.chat.styles.plain-input :as st])) (defn set-input-message [message] (dispatch [:set-chat-input-text message])) diff --git a/src/syng_im/chat/views/staged_command.cljs b/src/status_im/chat/views/staged_command.cljs similarity index 85% rename from src/syng_im/chat/views/staged_command.cljs rename to src/status_im/chat/views/staged_command.cljs index c7a0b50568..be8c811459 100644 --- a/src/syng_im/chat/views/staged_command.cljs +++ b/src/status_im/chat/views/staged_command.cljs @@ -1,11 +1,11 @@ -(ns syng-im.chat.views.staged-command +(ns status-im.chat.views.staged-command (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view image text touchable-highlight]] - [syng-im.resources :as res] - [syng-im.chat.styles.input :as st])) + [status-im.resources :as res] + [status-im.chat.styles.input :as st])) (defn cancel-command-input [staged-command] (dispatch [:unstage-command staged-command])) diff --git a/src/syng_im/chat/views/suggestions.cljs b/src/status_im/chat/views/suggestions.cljs similarity index 88% rename from src/syng_im/chat/views/suggestions.cljs rename to src/status_im/chat/views/suggestions.cljs index 854344ae43..9a170cd5a5 100644 --- a/src/syng_im/chat/views/suggestions.cljs +++ b/src/status_im/chat/views/suggestions.cljs @@ -1,13 +1,13 @@ -(ns syng-im.chat.views.suggestions +(ns status-im.chat.views.suggestions (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view text icon touchable-highlight list-view list-item]] - [syng-im.utils.listview :refer [to-datasource]] - [syng-im.chat.styles.suggestions :as st])) + [status-im.utils.listview :refer [to-datasource]] + [status-im.chat.styles.suggestions :as st])) (defn set-command-input [command] (dispatch [:set-chat-command command])) diff --git a/src/syng_im/chats_list/screen.cljs b/src/status_im/chats_list/screen.cljs similarity index 74% rename from src/syng_im/chats_list/screen.cljs rename to src/status_im/chats_list/screen.cljs index 55c4457540..4187748604 100644 --- a/src/syng_im/chats_list/screen.cljs +++ b/src/status_im/chats_list/screen.cljs @@ -1,21 +1,21 @@ -(ns syng-im.chats-list.screen +(ns status-im.chats-list.screen (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [list-view + [status-im.components.react :refer [list-view list-item view text image touchable-highlight]] - [syng-im.utils.listview :refer [to-datasource]] + [status-im.utils.listview :refer [to-datasource]] [reagent.core :as r] - [syng-im.chats-list.views.chat-list-item :refer [chat-list-item]] - [syng-im.components.action-button :refer [action-button + [status-im.chats-list.views.chat-list-item :refer [chat-list-item]] + [status-im.components.action-button :refer [action-button action-button-item]] - [syng-im.components.drawer.view :refer [drawer-view open-drawer]] - [syng-im.components.styles :refer [color-blue]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.components.icons.ionicons :refer [icon]] - [syng-im.chats-list.styles :as st])) + [status-im.components.drawer.view :refer [drawer-view open-drawer]] + [status-im.components.styles :refer [color-blue]] + [status-im.components.toolbar :refer [toolbar]] + [status-im.components.icons.ionicons :refer [icon]] + [status-im.chats-list.styles :as st])) (defn chats-list-toolbar [] diff --git a/src/syng_im/chats_list/styles.cljs b/src/status_im/chats_list/styles.cljs similarity index 97% rename from src/syng_im/chats_list/styles.cljs rename to src/status_im/chats_list/styles.cljs index 5b37f27122..645db00014 100644 --- a/src/syng_im/chats_list/styles.cljs +++ b/src/status_im/chats_list/styles.cljs @@ -1,5 +1,5 @@ -(ns syng-im.chats-list.styles - (:require [syng-im.components.styles :refer [font +(ns status-im.chats-list.styles + (:require [status-im.components.styles :refer [font title-font color-white color-blue diff --git a/src/syng_im/chats_list/views/chat_list_item.cljs b/src/status_im/chats_list/views/chat_list_item.cljs similarity index 80% rename from src/syng_im/chats_list/views/chat_list_item.cljs rename to src/status_im/chats_list/views/chat_list_item.cljs index 3673701ccc..db7dfd5f83 100644 --- a/src/syng_im/chats_list/views/chat_list_item.cljs +++ b/src/status_im/chats_list/views/chat_list_item.cljs @@ -1,11 +1,11 @@ -(ns syng-im.chats-list.views.chat-list-item +(ns status-im.chats-list.views.chat-list-item (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view text image touchable-highlight]] - [syng-im.components.styles :refer [font]] - [syng-im.chats-list.views.inner-item :refer + [status-im.components.styles :refer [font]] + [status-im.chats-list.views.inner-item :refer [chat-list-item-inner-view]])) (defn chat-list-item [{:keys [chat-id] :as chat}] diff --git a/src/syng_im/chats_list/views/inner_item.cljs b/src/status_im/chats_list/views/inner_item.cljs similarity index 88% rename from src/syng_im/chats_list/views/inner_item.cljs rename to src/status_im/chats_list/views/inner_item.cljs index 0e43c75426..fc0851183a 100644 --- a/src/syng_im/chats_list/views/inner_item.cljs +++ b/src/status_im/chats_list/views/inner_item.cljs @@ -1,8 +1,8 @@ -(ns syng-im.chats-list.views.inner-item +(ns status-im.chats-list.views.inner-item (:require [clojure.string :as s] - [syng-im.components.react :refer [view image icon text]] - [syng-im.chats-list.styles :as st] - [syng-im.resources :as res])) + [status-im.components.react :refer [view image icon text]] + [status-im.chats-list.styles :as st] + [status-im.resources :as res])) (defn contact-photo [photo-path] diff --git a/src/syng_im/components/action_button.cljs b/src/status_im/components/action_button.cljs similarity index 81% rename from src/syng_im/components/action_button.cljs rename to src/status_im/components/action_button.cljs index bfabb5ad0e..db303f5f6d 100644 --- a/src/syng_im/components/action_button.cljs +++ b/src/status_im/components/action_button.cljs @@ -1,4 +1,4 @@ -(ns syng-im.components.action-button +(ns status-im.components.action-button (:require [reagent.core :as r])) (set! js/window.ActionButton (js/require "react-native-action-button")) diff --git a/src/syng_im/components/carousel/carousel.cljs b/src/status_im/components/carousel/carousel.cljs similarity index 97% rename from src/syng_im/components/carousel/carousel.cljs rename to src/status_im/components/carousel/carousel.cljs index 28831eb3ec..c3181df6ce 100644 --- a/src/syng_im/components/carousel/carousel.cljs +++ b/src/status_im/components/carousel/carousel.cljs @@ -1,11 +1,11 @@ -(ns syng-im.components.carousel.carousel - (:require [syng-im.components.react :refer [android? +(ns status-im.components.carousel.carousel + (:require [status-im.components.react :refer [android? view scroll-view touchable-without-feedback text]] - [syng-im.components.carousel.styles :as st] - [syng-im.utils.logging :as log])) + [status-im.components.carousel.styles :as st] + [status-im.utils.logging :as log])) (defn window-page-width [] diff --git a/src/syng_im/components/carousel/styles.cljs b/src/status_im/components/carousel/styles.cljs similarity index 90% rename from src/syng_im/components/carousel/styles.cljs rename to src/status_im/components/carousel/styles.cljs index b9a05aaff1..a1ccc020bf 100644 --- a/src/syng_im/components/carousel/styles.cljs +++ b/src/status_im/components/carousel/styles.cljs @@ -1,5 +1,5 @@ -(ns syng-im.components.carousel.styles - (:require [syng-im.components.styles :refer [font +(ns status-im.components.carousel.styles + (:require [status-im.components.styles :refer [font title-font color-white chat-background diff --git a/src/syng_im/components/drawer/styles.cljs b/src/status_im/components/drawer/styles.cljs similarity index 94% rename from src/syng_im/components/drawer/styles.cljs rename to src/status_im/components/drawer/styles.cljs index 4e26767b26..01955625a0 100644 --- a/src/syng_im/components/drawer/styles.cljs +++ b/src/status_im/components/drawer/styles.cljs @@ -1,5 +1,5 @@ -(ns syng-im.components.drawer.styles - (:require [syng-im.components.styles :refer [font +(ns status-im.components.drawer.styles + (:require [status-im.components.styles :refer [font color-light-blue-transparent color-white color-black diff --git a/src/syng_im/components/drawer/view.cljs b/src/status_im/components/drawer/view.cljs similarity index 93% rename from src/syng_im/components/drawer/view.cljs rename to src/status_im/components/drawer/view.cljs index 6edf297ac2..5101c6eaaa 100644 --- a/src/syng_im/components/drawer/view.cljs +++ b/src/status_im/components/drawer/view.cljs @@ -1,8 +1,8 @@ -(ns syng-im.components.drawer.view +(ns status-im.components.drawer.view (:require [clojure.string :as s] [re-frame.core :refer [subscribe dispatch dispatch-sync]] [reagent.core :as r] - [syng-im.components.react :refer [android? + [status-im.components.react :refer [android? view text image @@ -10,8 +10,8 @@ toolbar-android drawer-layout-android touchable-opacity]] - [syng-im.resources :as res] - [syng-im.components.drawer.styles :as st])) + [status-im.resources :as res] + [status-im.components.drawer.styles :as st])) (defonce drawer-atom (atom)) diff --git a/src/syng_im/components/icons/ionicons.cljs b/src/status_im/components/icons/ionicons.cljs similarity index 79% rename from src/syng_im/components/icons/ionicons.cljs rename to src/status_im/components/icons/ionicons.cljs index 2b76fe5233..885af057d5 100644 --- a/src/syng_im/components/icons/ionicons.cljs +++ b/src/status_im/components/icons/ionicons.cljs @@ -1,4 +1,4 @@ -(ns syng-im.components.icons.ionicons +(ns status-im.components.icons.ionicons (:require [reagent.core :as r])) (set! js/window.Ionicons (js/require "react-native-vector-icons/Ionicons")) diff --git a/src/syng_im/components/invertible_scroll_view.cljs b/src/status_im/components/invertible_scroll_view.cljs similarity index 83% rename from src/syng_im/components/invertible_scroll_view.cljs rename to src/status_im/components/invertible_scroll_view.cljs index fea247863c..daf873a773 100644 --- a/src/syng_im/components/invertible_scroll_view.cljs +++ b/src/status_im/components/invertible_scroll_view.cljs @@ -1,4 +1,4 @@ -(ns syng-im.components.invertible-scroll-view) +(ns status-im.components.invertible-scroll-view) (set! js/window.InvertibleScrollView (js/require "react-native-invertible-scroll-view")) diff --git a/src/syng_im/components/item_checkbox.cljs b/src/status_im/components/item_checkbox.cljs similarity index 81% rename from src/syng_im/components/item_checkbox.cljs rename to src/status_im/components/item_checkbox.cljs index 3ddea93b7f..97d43ecd37 100644 --- a/src/syng_im/components/item_checkbox.cljs +++ b/src/status_im/components/item_checkbox.cljs @@ -1,4 +1,4 @@ -(ns syng-im.components.item-checkbox +(ns status-im.components.item-checkbox (:require [reagent.core :as r])) (set! js/window.ItemCheckbox (js/require "react-native-circle-checkbox")) diff --git a/src/syng_im/components/react.cljs b/src/status_im/components/react.cljs similarity index 95% rename from src/syng_im/components/react.cljs rename to src/status_im/components/react.cljs index 58c99aa6e4..d45088bd05 100644 --- a/src/syng_im/components/react.cljs +++ b/src/status_im/components/react.cljs @@ -1,6 +1,6 @@ -(ns syng-im.components.react +(ns status-im.components.react (:require [reagent.core :as r] - [syng-im.components.styles :as st])) + [status-im.components.styles :as st])) (set! js/window.React (js/require "react-native")) diff --git a/src/syng_im/components/realm.cljs b/src/status_im/components/realm.cljs similarity index 89% rename from src/syng_im/components/realm.cljs rename to src/status_im/components/realm.cljs index f9ea17d84e..eff8c1fee5 100644 --- a/src/syng_im/components/realm.cljs +++ b/src/status_im/components/realm.cljs @@ -1,4 +1,4 @@ -(ns syng-im.components.realm +(ns status-im.components.realm (:require [reagent.core :as r])) (set! js/window.RealmReactNative (js/require "realm/react-native")) diff --git a/src/syng_im/components/spinner.cljs b/src/status_im/components/spinner.cljs similarity index 83% rename from src/syng_im/components/spinner.cljs rename to src/status_im/components/spinner.cljs index 1526967e10..fe4d760d5e 100644 --- a/src/syng_im/components/spinner.cljs +++ b/src/status_im/components/spinner.cljs @@ -1,4 +1,4 @@ -(ns syng-im.components.spinner +(ns status-im.components.spinner (:require [reagent.core :as r])) (def react-spinner (.-default (js/require "react-native-loading-spinner-overlay"))) diff --git a/src/syng_im/components/styles.cljs b/src/status_im/components/styles.cljs similarity index 96% rename from src/syng_im/components/styles.cljs rename to src/status_im/components/styles.cljs index 786555bcf1..421224dc92 100644 --- a/src/syng_im/components/styles.cljs +++ b/src/status_im/components/styles.cljs @@ -1,4 +1,4 @@ -(ns syng-im.components.styles) +(ns status-im.components.styles) (def font "sans-serif") ;; (def font "Avenir-Roman") diff --git a/src/syng_im/components/toolbar.cljs b/src/status_im/components/toolbar.cljs similarity index 92% rename from src/syng_im/components/toolbar.cljs rename to src/status_im/components/toolbar.cljs index 72ef406a0e..d7a164a624 100644 --- a/src/syng_im/components/toolbar.cljs +++ b/src/status_im/components/toolbar.cljs @@ -1,19 +1,19 @@ -(ns syng-im.components.toolbar +(ns status-im.components.toolbar (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view text-input icon text image touchable-highlight]] - [syng-im.components.styles :refer [font + [status-im.components.styles :refer [font title-font color-white color-purple text1-color text2-color toolbar-background1]] - [syng-im.components.realm :refer [list-view]] + [status-im.components.realm :refer [list-view]] [reagent.core :as r])) (defn toolbar [{:keys [title nav-action hide-nav? action custom-action diff --git a/src/syng_im/constants.cljs b/src/status_im/constants.cljs similarity index 83% rename from src/syng_im/constants.cljs rename to src/status_im/constants.cljs index 84fbff6b8a..abfd54bf77 100644 --- a/src/syng_im/constants.cljs +++ b/src/status_im/constants.cljs @@ -1,8 +1,8 @@ -(ns syng-im.constants) +(ns status-im.constants) (def ethereum-rpc-url "http://localhost:8545") -(def server-address "http://rpc0.syng.im:20000/") +(def server-address "http://rpc0.status.im:20000/") ;; (def server-address "http://10.0.3.2:3000/") (def text-content-type "text/plain") diff --git a/src/syng_im/contacts/handlers.cljs b/src/status_im/contacts/handlers.cljs similarity index 91% rename from src/syng_im/contacts/handlers.cljs rename to src/status_im/contacts/handlers.cljs index ac58a379ba..7a384d04fd 100644 --- a/src/syng_im/contacts/handlers.cljs +++ b/src/status_im/contacts/handlers.cljs @@ -1,11 +1,11 @@ -(ns syng-im.contacts.handlers +(ns status-im.contacts.handlers (:require [re-frame.core :refer [register-handler after dispatch]] - [syng-im.models.contacts :as contacts] - [syng-im.utils.crypt :refer [encrypt]] + [status-im.models.contacts :as contacts] + [status-im.utils.crypt :refer [encrypt]] [clojure.string :as s] - [syng-im.utils.utils :refer [http-post]] - [syng-im.utils.phone-number :refer [format-phone-number]] - [syng-im.utils.handlers :as u])) + [status-im.utils.utils :refer [http-post]] + [status-im.utils.phone-number :refer [format-phone-number]] + [status-im.utils.handlers :as u])) (defn save-contact [_ [_ contact]] diff --git a/src/syng_im/contacts/screen.cljs b/src/status_im/contacts/screen.cljs similarity index 71% rename from src/syng_im/contacts/screen.cljs rename to src/status_im/contacts/screen.cljs index 3e16b78380..12cee44a65 100644 --- a/src/syng_im/contacts/screen.cljs +++ b/src/status_im/contacts/screen.cljs @@ -1,16 +1,16 @@ -(ns syng-im.contacts.screen - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.contacts.screen + (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.components.react :refer [view text + [status-im.components.react :refer [view text image touchable-highlight list-view list-item]] - [syng-im.contacts.views.contact :refer [contact-view]] - [syng-im.components.styles :refer [toolbar-background2]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.contacts.styles :as st] - [syng-im.utils.listview :as lw])) + [status-im.contacts.views.contact :refer [contact-view]] + [status-im.components.styles :refer [toolbar-background2]] + [status-im.components.toolbar :refer [toolbar]] + [status-im.contacts.styles :as st] + [status-im.utils.listview :as lw])) (defn render-row [row _ _] (list-item [contact-view row])) diff --git a/src/syng_im/contacts/styles.cljs b/src/status_im/contacts/styles.cljs similarity index 94% rename from src/syng_im/contacts/styles.cljs rename to src/status_im/contacts/styles.cljs index 819c5582eb..4cbec2cdff 100644 --- a/src/syng_im/contacts/styles.cljs +++ b/src/status_im/contacts/styles.cljs @@ -1,5 +1,5 @@ -(ns syng-im.contacts.styles - (:require [syng-im.components.styles :refer [font +(ns status-im.contacts.styles + (:require [status-im.components.styles :refer [font title-font text1-color color-white diff --git a/src/syng_im/contacts/subs.cljs b/src/status_im/contacts/subs.cljs similarity index 97% rename from src/syng_im/contacts/subs.cljs rename to src/status_im/contacts/subs.cljs index d889f12b60..a85f20866a 100644 --- a/src/syng_im/contacts/subs.cljs +++ b/src/status_im/contacts/subs.cljs @@ -1,4 +1,4 @@ -(ns syng-im.contacts.subs +(ns status-im.contacts.subs (:require-macros [reagent.ratom :refer [reaction]]) (:require [re-frame.core :refer [register-sub]])) diff --git a/src/syng_im/contacts/views/contact.cljs b/src/status_im/contacts/views/contact.cljs similarity index 62% rename from src/syng_im/contacts/views/contact.cljs rename to src/status_im/contacts/views/contact.cljs index 861a4c3cfa..f253789990 100644 --- a/src/syng_im/contacts/views/contact.cljs +++ b/src/status_im/contacts/views/contact.cljs @@ -1,8 +1,8 @@ -(ns syng-im.contacts.views.contact - (:require-macros [syng-im.utils.views :refer [defview]]) - (:require [syng-im.components.react :refer [view touchable-highlight]] +(ns status-im.contacts.views.contact + (:require-macros [status-im.utils.views :refer [defview]]) + (:require [status-im.components.react :refer [view touchable-highlight]] [re-frame.core :refer [dispatch subscribe]] - [syng-im.contacts.views.contact-inner :refer [contact-inner-view]])) + [status-im.contacts.views.contact-inner :refer [contact-inner-view]])) (defn on-press [chat whisper-identity] (if chat diff --git a/src/syng_im/contacts/views/contact_inner.cljs b/src/status_im/contacts/views/contact_inner.cljs similarity index 79% rename from src/syng_im/contacts/views/contact_inner.cljs rename to src/status_im/contacts/views/contact_inner.cljs index d96ed3cd35..0c62dbd650 100644 --- a/src/syng_im/contacts/views/contact_inner.cljs +++ b/src/status_im/contacts/views/contact_inner.cljs @@ -1,8 +1,8 @@ -(ns syng-im.contacts.views.contact-inner +(ns status-im.contacts.views.contact-inner (:require [clojure.string :as s] - [syng-im.components.react :refer [view image text]] - [syng-im.resources :as res] - [syng-im.contacts.styles :as st])) + [status-im.components.react :refer [view image text]] + [status-im.resources :as res] + [status-im.contacts.styles :as st])) (defn contact-photo [{:keys [photo-path]}] [view st/contact-photo-container diff --git a/src/syng_im/db.cljs b/src/status_im/db.cljs similarity index 99% rename from src/syng_im/db.cljs rename to src/status_im/db.cljs index 92c9c0d645..af51988239 100644 --- a/src/syng_im/db.cljs +++ b/src/status_im/db.cljs @@ -1,4 +1,4 @@ -(ns syng-im.db +(ns status-im.db (:require [schema.core :as s :include-macros true])) ;; schema of app-db diff --git a/src/syng_im/discovery/handlers.cljs b/src/status_im/discovery/handlers.cljs similarity index 91% rename from src/syng_im/discovery/handlers.cljs rename to src/status_im/discovery/handlers.cljs index 2efd7543ed..2b227acefa 100644 --- a/src/syng_im/discovery/handlers.cljs +++ b/src/status_im/discovery/handlers.cljs @@ -1,9 +1,9 @@ -(ns syng-im.discovery.handlers +(ns status-im.discovery.handlers (:require [re-frame.core :refer [register-handler after dispatch enrich]] - [syng-im.protocol.api :as api] - [syng-im.navigation.handlers :as nav] - [syng-im.discovery.model :as discoveries] - [syng-im.utils.handlers :as u])) + [status-im.protocol.api :as api] + [status-im.navigation.handlers :as nav] + [status-im.discovery.model :as discoveries] + [status-im.utils.handlers :as u])) (defmethod nav/preload-data! :discovery [{:keys [discoveries] :as db} _] diff --git a/src/syng_im/discovery/model.cljs b/src/status_im/discovery/model.cljs similarity index 92% rename from src/syng_im/discovery/model.cljs rename to src/status_im/discovery/model.cljs index 40d92407b2..6547321ff7 100644 --- a/src/syng_im/discovery/model.cljs +++ b/src/status_im/discovery/model.cljs @@ -1,8 +1,8 @@ -(ns syng-im.discovery.model - ;syng-im.models.discoveries - (:require [syng-im.utils.logging :as log] - [syng-im.persistence.realm :as realm] - [syng-im.persistence.realm :as r])) +(ns status-im.discovery.model + ;status-im.models.discoveries + (:require [status-im.utils.logging :as log] + [status-im.persistence.realm :as realm] + [status-im.persistence.realm :as r])) (defn get-tag [tag] (log/debug "Getting tag: " tag) diff --git a/src/syng_im/discovery/screen.cljs b/src/status_im/discovery/screen.cljs similarity index 83% rename from src/syng_im/discovery/screen.cljs rename to src/status_im/discovery/screen.cljs index 8f51f391ac..d5d62f5925 100644 --- a/src/syng_im/discovery/screen.cljs +++ b/src/status_im/discovery/screen.cljs @@ -1,15 +1,15 @@ -(ns syng-im.discovery.screen - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.discovery.screen + (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [dispatch subscribe]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view scroll-view text text-input]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.discovery.views.popular :refer [popular]] - [syng-im.discovery.views.recent :refer [discovery-recent]] - [syng-im.discovery.styles :as st])) + [status-im.components.toolbar :refer [toolbar]] + [status-im.discovery.views.popular :refer [popular]] + [status-im.discovery.views.recent :refer [discovery-recent]] + [status-im.discovery.styles :as st])) (defn get-hashtags [status] (let [hashtags (map #(subs % 1) (re-seq #"#[^ !?,;:.]+" status))] diff --git a/src/syng_im/discovery/styles.cljs b/src/status_im/discovery/styles.cljs similarity index 97% rename from src/syng_im/discovery/styles.cljs rename to src/status_im/discovery/styles.cljs index 11a76ab13c..d1d5d650eb 100644 --- a/src/syng_im/discovery/styles.cljs +++ b/src/status_im/discovery/styles.cljs @@ -1,5 +1,5 @@ -(ns syng-im.discovery.styles - (:require [syng-im.components.styles :refer [font +(ns status-im.discovery.styles + (:require [status-im.components.styles :refer [font title-font color-white chat-background diff --git a/src/syng_im/discovery/subs.cljs b/src/status_im/discovery/subs.cljs similarity index 95% rename from src/syng_im/discovery/subs.cljs rename to src/status_im/discovery/subs.cljs index 053094706b..3426ccf178 100644 --- a/src/syng_im/discovery/subs.cljs +++ b/src/status_im/discovery/subs.cljs @@ -1,4 +1,4 @@ -(ns syng-im.discovery.subs +(ns status-im.discovery.subs (:require-macros [reagent.ratom :refer [reaction]]) (:require [re-frame.core :refer [register-sub]])) diff --git a/src/syng_im/discovery/tag.cljs b/src/status_im/discovery/tag.cljs similarity index 79% rename from src/syng_im/discovery/tag.cljs rename to src/status_im/discovery/tag.cljs index 455adce8fc..1b4f0fbc9b 100644 --- a/src/syng_im/discovery/tag.cljs +++ b/src/status_im/discovery/tag.cljs @@ -1,12 +1,12 @@ -(ns syng-im.discovery.tag +(ns status-im.discovery.tag (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.utils.logging :as log] - [syng-im.utils.listview :refer [to-datasource]] - [syng-im.components.react :refer [view text list-view list-item]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.discovery.views.popular-list-item :refer [popular-list-item]] - [syng-im.discovery.styles :as st])) + [status-im.utils.logging :as log] + [status-im.utils.listview :refer [to-datasource]] + [status-im.components.react :refer [view text list-view list-item]] + [status-im.components.toolbar :refer [toolbar]] + [status-im.discovery.views.popular-list-item :refer [popular-list-item]] + [status-im.discovery.styles :as st])) (defn render-row [row _ _] (list-item [popular-list-item row])) diff --git a/src/syng_im/discovery/views/popular.cljs b/src/status_im/discovery/views/popular.cljs similarity index 55% rename from src/syng_im/discovery/views/popular.cljs rename to src/status_im/discovery/views/popular.cljs index 8d95e8d094..65b47fdf05 100644 --- a/src/syng_im/discovery/views/popular.cljs +++ b/src/status_im/discovery/views/popular.cljs @@ -1,13 +1,13 @@ -(ns syng-im.discovery.views.popular - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.discovery.views.popular + (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe]] - [syng-im.utils.logging :as log] - [syng-im.components.react :refer [android? + [status-im.utils.logging :as log] + [status-im.components.react :refer [android? text]] - [syng-im.components.carousel.carousel :refer [carousel]] - [syng-im.discovery.styles :as st] - [syng-im.discovery.views.popular-list :refer [discovery-popular-list]])) + [status-im.components.carousel.carousel :refer [carousel]] + [status-im.discovery.styles :as st] + [status-im.discovery.views.popular-list :refer [discovery-popular-list]])) (defn page-width [] (.-width (.get (.. js/React -Dimensions) "window"))) diff --git a/src/syng_im/discovery/views/popular_list.cljs b/src/status_im/discovery/views/popular_list.cljs similarity index 77% rename from src/syng_im/discovery/views/popular_list.cljs rename to src/status_im/discovery/views/popular_list.cljs index 78426570f6..a1d539aa14 100644 --- a/src/syng_im/discovery/views/popular_list.cljs +++ b/src/status_im/discovery/views/popular_list.cljs @@ -1,15 +1,15 @@ -(ns syng-im.discovery.views.popular-list - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.discovery.views.popular-list + (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view list-view list-item touchable-highlight text]] - [syng-im.discovery.styles :as st] - [syng-im.utils.listview :refer [to-datasource]] - [syng-im.discovery.views.popular-list-item :refer [popular-list-item]])) + [status-im.discovery.styles :as st] + [status-im.utils.listview :refer [to-datasource]] + [status-im.discovery.views.popular-list-item :refer [popular-list-item]])) (defn render-row [row _ _] (list-item [popular-list-item row])) diff --git a/src/syng_im/discovery/views/popular_list_item.cljs b/src/status_im/discovery/views/popular_list_item.cljs similarity index 73% rename from src/syng_im/discovery/views/popular_list_item.cljs rename to src/status_im/discovery/views/popular_list_item.cljs index 6812cf4d1c..adc1334e96 100644 --- a/src/syng_im/discovery/views/popular_list_item.cljs +++ b/src/status_im/discovery/views/popular_list_item.cljs @@ -1,6 +1,6 @@ -(ns syng-im.discovery.views.popular-list-item - (:require [syng-im.components.react :refer [view text image]] - [syng-im.discovery.styles :as st] +(ns status-im.discovery.views.popular-list-item + (:require [status-im.components.react :refer [view text image]] + [status-im.discovery.styles :as st] [reagent.core :as r])) (defn popular-list-item diff --git a/src/syng_im/discovery/views/recent.cljs b/src/status_im/discovery/views/recent.cljs similarity index 63% rename from src/syng_im/discovery/views/recent.cljs rename to src/status_im/discovery/views/recent.cljs index e690890b2b..bb4849bcae 100644 --- a/src/syng_im/discovery/views/recent.cljs +++ b/src/status_im/discovery/views/recent.cljs @@ -1,11 +1,11 @@ -(ns syng-im.discovery.views.recent - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.discovery.views.recent + (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe]] - [syng-im.components.react :refer [view list-view list-item]] - [syng-im.utils.listview :refer [to-datasource]] - [syng-im.discovery.styles :as st] - [syng-im.discovery.views.popular-list-item + [status-im.components.react :refer [view list-view list-item]] + [status-im.utils.listview :refer [to-datasource]] + [status-im.discovery.styles :as st] + [status-im.discovery.views.popular-list-item :refer [popular-list-item]])) (defn render-row [row _ _] diff --git a/src/syng_im/group_settings/handlers.cljs b/src/status_im/group_settings/handlers.cljs similarity index 93% rename from src/syng_im/group_settings/handlers.cljs rename to src/status_im/group_settings/handlers.cljs index 0871624cb1..d62ae27276 100644 --- a/src/syng_im/group_settings/handlers.cljs +++ b/src/status_im/group_settings/handlers.cljs @@ -1,7 +1,7 @@ -(ns syng-im.group-settings.handlers +(ns status-im.group-settings.handlers (:require [re-frame.core :refer [register-handler debug dispatch]] - [syng-im.persistence.realm :as r] - [syng-im.models.messages :refer [clear-history]])) + [status-im.persistence.realm :as r] + [status-im.models.messages :refer [clear-history]])) (defn set-chat-name [db] (let [chat-id (:current-chat-id db) diff --git a/src/syng_im/group_settings/screen.cljs b/src/status_im/group_settings/screen.cljs similarity index 94% rename from src/syng_im/group_settings/screen.cljs rename to src/status_im/group_settings/screen.cljs index 7e06fd98af..7199d142a3 100644 --- a/src/syng_im/group_settings/screen.cljs +++ b/src/status_im/group_settings/screen.cljs @@ -1,7 +1,7 @@ -(ns syng-im.group-settings.screen - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.group-settings.screen + (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view text-input text image @@ -11,9 +11,9 @@ picker-item scroll-view touchable-highlight]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.group-settings.styles.group-settings :as st] - [syng-im.group-settings.views.member :refer [member-view]])) + [status-im.components.toolbar :refer [toolbar]] + [status-im.group-settings.styles.group-settings :as st] + [status-im.group-settings.views.member :refer [member-view]])) (defn remove-member [{:keys [whisper-identity]}] (dispatch [:chat-remove-member whisper-identity])) diff --git a/src/syng_im/group_settings/styles/chat_name_edit.cljs b/src/status_im/group_settings/styles/chat_name_edit.cljs similarity index 78% rename from src/syng_im/group_settings/styles/chat_name_edit.cljs rename to src/status_im/group_settings/styles/chat_name_edit.cljs index 0a5afb59d3..d185480652 100644 --- a/src/syng_im/group_settings/styles/chat_name_edit.cljs +++ b/src/status_im/group_settings/styles/chat_name_edit.cljs @@ -1,5 +1,5 @@ -(ns syng-im.group-settings.styles.chat-name-edit - (:require [syng-im.components.styles :refer [font +(ns status-im.group-settings.styles.chat-name-edit + (:require [status-im.components.styles :refer [font color-white text1-color]])) diff --git a/src/syng_im/group_settings/styles/group_settings.cljs b/src/status_im/group_settings/styles/group_settings.cljs similarity index 97% rename from src/syng_im/group_settings/styles/group_settings.cljs rename to src/status_im/group_settings/styles/group_settings.cljs index 092ab7387e..ee0db62b50 100644 --- a/src/syng_im/group_settings/styles/group_settings.cljs +++ b/src/status_im/group_settings/styles/group_settings.cljs @@ -1,5 +1,5 @@ -(ns syng-im.group-settings.styles.group-settings - (:require [syng-im.components.styles :refer [font +(ns status-im.group-settings.styles.group-settings + (:require [status-im.components.styles :refer [font font-medium title-font color-white diff --git a/src/syng_im/group_settings/styles/member.cljs b/src/status_im/group_settings/styles/member.cljs similarity index 94% rename from src/syng_im/group_settings/styles/member.cljs rename to src/status_im/group_settings/styles/member.cljs index a25ea0cd5a..e5ef3f9f58 100644 --- a/src/syng_im/group_settings/styles/member.cljs +++ b/src/status_im/group_settings/styles/member.cljs @@ -1,5 +1,5 @@ -(ns syng-im.group-settings.styles.member - (:require [syng-im.components.styles :refer [font +(ns status-im.group-settings.styles.member + (:require [status-im.components.styles :refer [font title-font text1-color text2-color diff --git a/src/syng_im/group_settings/subs.cljs b/src/status_im/group_settings/subs.cljs similarity index 79% rename from src/syng_im/group_settings/subs.cljs rename to src/status_im/group_settings/subs.cljs index 8ef774b5f6..55085b2256 100644 --- a/src/syng_im/group_settings/subs.cljs +++ b/src/status_im/group_settings/subs.cljs @@ -1,7 +1,7 @@ -(ns syng-im.group-settings.subs +(ns status-im.group-settings.subs (:require-macros [reagent.ratom :refer [reaction]]) (:require [re-frame.core :refer [register-sub]] - [syng-im.models.contacts :refer [contact-by-identity]])) + [status-im.models.contacts :refer [contact-by-identity]])) (register-sub :group-settings-selected-member (fn [db [_]] diff --git a/src/syng_im/group_settings/views/chat_name_edit.cljs b/src/status_im/group_settings/views/chat_name_edit.cljs similarity index 73% rename from src/syng_im/group_settings/views/chat_name_edit.cljs rename to src/status_im/group_settings/views/chat_name_edit.cljs index 7ba34e6dd7..523b94653b 100644 --- a/src/syng_im/group_settings/views/chat_name_edit.cljs +++ b/src/status_im/group_settings/views/chat_name_edit.cljs @@ -1,11 +1,11 @@ -(ns syng-im.group-settings.views.chat-name-edit - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.group-settings.views.chat-name-edit + (:require-macros [status-im.utils.views :refer [defview]]) (:require [reagent.core :as r] [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.components.react :refer [view text-input]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.group-settings.styles.chat-name-edit :as st] - [syng-im.components.styles :refer [toolbar-background2 + [status-im.components.react :refer [view text-input]] + [status-im.components.toolbar :refer [toolbar]] + [status-im.group-settings.styles.chat-name-edit :as st] + [status-im.components.styles :refer [toolbar-background2 text2-color]])) (defn save-group-chat-name [] diff --git a/src/syng_im/group_settings/views/member.cljs b/src/status_im/group_settings/views/member.cljs similarity index 87% rename from src/syng_im/group_settings/views/member.cljs rename to src/status_im/group_settings/views/member.cljs index 6584724755..73889c611f 100644 --- a/src/syng_im/group_settings/views/member.cljs +++ b/src/status_im/group_settings/views/member.cljs @@ -1,13 +1,13 @@ -(ns syng-im.group-settings.views.member +(ns status-im.group-settings.views.member (:require [clojure.string :as s] [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view image text icon touchable-highlight]] - [syng-im.resources :as res] - [syng-im.group-settings.styles.member :as st])) + [status-im.resources :as res] + [status-im.group-settings.styles.member :as st])) (defn contact-photo [{:keys [photo-path]}] [view st/contact-photo-container diff --git a/src/syng_im/handlers.cljs b/src/status_im/handlers.cljs similarity index 88% rename from src/syng_im/handlers.cljs rename to src/status_im/handlers.cljs index 5ca72c1d61..e7d2687eed 100644 --- a/src/syng_im/handlers.cljs +++ b/src/status_im/handlers.cljs @@ -1,46 +1,46 @@ -(ns syng-im.handlers +(ns status-im.handlers (:require [re-frame.core :refer [register-handler after dispatch debug enrich]] [schema.core :as s :include-macros true] - [syng-im.persistence.realm :as r] - [syng-im.db :refer [app-db schema]] - [syng-im.persistence.simple-kv-store :as kv] - [syng-im.protocol.state.storage :as storage] - [syng-im.db :as db :refer [app-db schema]] - [syng-im.protocol.api :refer [init-protocol]] - [syng-im.protocol.protocol-handler :refer [make-handler]] - [syng-im.models.protocol :refer [update-identity + [status-im.persistence.realm :as r] + [status-im.db :refer [app-db schema]] + [status-im.persistence.simple-kv-store :as kv] + [status-im.protocol.state.storage :as storage] + [status-im.db :as db :refer [app-db schema]] + [status-im.protocol.api :refer [init-protocol]] + [status-im.protocol.protocol-handler :refer [make-handler]] + [status-im.models.protocol :refer [update-identity set-initialized]] - [syng-im.models.contacts :as contacts] - [syng-im.models.messages :refer [save-message + [status-im.models.contacts :as contacts] + [status-im.models.messages :refer [save-message update-message! clear-history]] - [syng-im.models.commands :refer [set-commands]] - [syng-im.handlers.server :as server] - [syng-im.chat.suggestions :refer [load-commands]] - [syng-im.models.chats :refer [chat-exists? + [status-im.models.commands :refer [set-commands]] + [status-im.handlers.server :as server] + [status-im.chat.suggestions :refer [load-commands]] + [status-im.models.chats :refer [chat-exists? create-chat chat-add-participants chat-remove-participants set-chat-active re-join-group-chat chat-by-id2]] - [syng-im.utils.logging :as log] - [syng-im.protocol.api :as api] - [syng-im.constants :refer [text-content-type + [status-im.utils.logging :as log] + [status-im.protocol.api :as api] + [status-im.constants :refer [text-content-type content-type-command]] - [syng-im.navigation :refer [nav-push + [status-im.navigation :refer [nav-push nav-replace nav-pop]] - [syng-im.utils.crypt :refer [gen-random-bytes]] - [syng-im.utils.random :as random] - [syng-im.utils.handlers :as u] - syng-im.chat.handlers - [syng-im.group-settings.handlers :refer [delete-chat]] - syng-im.navigation.handlers - syng-im.discovery.handlers - syng-im.contacts.handlers - syng-im.new-group.handlers)) + [status-im.utils.crypt :refer [gen-random-bytes]] + [status-im.utils.random :as random] + [status-im.utils.handlers :as u] + status-im.chat.handlers + [status-im.group-settings.handlers :refer [delete-chat]] + status-im.navigation.handlers + status-im.discovery.handlers + status-im.contacts.handlers + status-im.new-group.handlers)) ;; -- Middleware ------------------------------------------------------------ ;; diff --git a/src/syng_im/handlers/content_suggestions.cljs b/src/status_im/handlers/content_suggestions.cljs similarity index 84% rename from src/syng_im/handlers/content_suggestions.cljs rename to src/status_im/handlers/content_suggestions.cljs index 8906558ff2..f4457f931f 100644 --- a/src/syng_im/handlers/content_suggestions.cljs +++ b/src/status_im/handlers/content_suggestions.cljs @@ -1,7 +1,7 @@ -(ns syng-im.handlers.content-suggestions +(ns status-im.handlers.content-suggestions (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.db :as db] - [syng-im.utils.logging :as log] + [status-im.db :as db] + [status-im.utils.logging :as log] [clojure.string :as s])) (def suggestions diff --git a/src/syng_im/handlers/server.cljs b/src/status_im/handlers/server.cljs similarity index 78% rename from src/syng_im/handlers/server.cljs rename to src/status_im/handlers/server.cljs index 70c0a45fe7..5d9674c1d7 100644 --- a/src/syng_im/handlers/server.cljs +++ b/src/status_im/handlers/server.cljs @@ -1,7 +1,7 @@ -(ns syng-im.handlers.server +(ns status-im.handlers.server (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.utils.utils :refer [log on-error http-post]] - [syng-im.utils.logging :as log])) + [status-im.utils.utils :refer [log on-error http-post]] + [status-im.utils.logging :as log])) (defn sign-up [db phone-number handler] diff --git a/src/syng_im/ios/core.cljs b/src/status_im/ios/core.cljs similarity index 93% rename from src/syng_im/ios/core.cljs rename to src/status_im/ios/core.cljs index c84d1c2404..ea7c6c27c8 100644 --- a/src/syng_im/ios/core.cljs +++ b/src/status_im/ios/core.cljs @@ -1,8 +1,8 @@ -(ns syng-im.ios.core +(ns status-im.ios.core (:require [reagent.core :as r :refer [atom]] [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.handlers] - [syng-im.subs])) + [status-im.handlers] + [status-im.subs])) (set! js/window.React (js/require "react-native")) diff --git a/src/syng_im/models/chats.cljs b/src/status_im/models/chats.cljs similarity index 92% rename from src/syng_im/models/chats.cljs rename to src/status_im/models/chats.cljs index ce2d982ef6..33e003a10d 100644 --- a/src/syng_im/models/chats.cljs +++ b/src/status_im/models/chats.cljs @@ -1,13 +1,13 @@ -(ns syng-im.models.chats +(ns status-im.models.chats (:require [clojure.set :refer [difference]] [re-frame.core :refer [dispatch]] - [syng-im.persistence.realm :as r] - [syng-im.utils.random :as random :refer [timestamp]] + [status-im.persistence.realm :as r] + [status-im.utils.random :as random :refer [timestamp]] [clojure.string :refer [join blank?]] - [syng-im.utils.logging :as log] - [syng-im.constants :refer [content-type-status]] - [syng-im.models.messages :refer [save-message]] - [syng-im.persistence.realm-queries :refer [include-query]])) + [status-im.utils.logging :as log] + [status-im.constants :refer [content-type-status]] + [status-im.models.messages :refer [save-message]] + [status-im.persistence.realm-queries :refer [include-query]])) (defn chat-name-from-contacts [identities] (let [chat-name (->> identities diff --git a/src/syng_im/models/commands.cljs b/src/status_im/models/commands.cljs similarity index 97% rename from src/syng_im/models/commands.cljs rename to src/status_im/models/commands.cljs index c35492bd0a..4ade2ed196 100644 --- a/src/syng_im/models/commands.cljs +++ b/src/status_im/models/commands.cljs @@ -1,9 +1,9 @@ -(ns syng-im.models.commands +(ns status-im.models.commands (:require [clojure.string :refer [join split]] [clojure.walk :refer [stringify-keys keywordize-keys]] [re-frame.core :refer [subscribe dispatch]] - [syng-im.db :as db] - [syng-im.components.styles :refer [color-blue color-dark-mint]])) + [status-im.db :as db] + [status-im.components.styles :refer [color-blue color-dark-mint]])) ;; todo delete (def commands [{:command :money diff --git a/src/syng_im/models/contacts.cljs b/src/status_im/models/contacts.cljs similarity index 88% rename from src/syng_im/models/contacts.cljs rename to src/status_im/models/contacts.cljs index f47986ebca..ec286b17a6 100644 --- a/src/syng_im/models/contacts.cljs +++ b/src/status_im/models/contacts.cljs @@ -1,6 +1,6 @@ -(ns syng-im.models.contacts - (:require [syng-im.persistence.realm :as r] - [syng-im.persistence.realm-queries :refer [include-query +(ns status-im.models.contacts + (:require [status-im.persistence.realm :as r] + [status-im.persistence.realm-queries :refer [include-query exclude-query]])) (defn get-contacts [] diff --git a/src/syng_im/models/messages.cljs b/src/status_im/models/messages.cljs similarity index 88% rename from src/syng_im/models/messages.cljs rename to src/status_im/models/messages.cljs index 2706cad94a..80e4656e8b 100644 --- a/src/syng_im/models/messages.cljs +++ b/src/status_im/models/messages.cljs @@ -1,13 +1,13 @@ -(ns syng-im.models.messages - (:require [syng-im.persistence.realm :as r] +(ns status-im.models.messages + (:require [status-im.persistence.realm :as r] [re-frame.core :refer [dispatch]] [cljs.reader :refer [read-string]] - [syng-im.utils.random :refer [timestamp]] - [syng-im.db :as db] - [syng-im.utils.logging :as log] + [status-im.utils.random :refer [timestamp]] + [status-im.db :as db] + [status-im.utils.logging :as log] [clojure.string :refer [join split]] [clojure.walk :refer [stringify-keys keywordize-keys]] - [syng-im.constants :as c])) + [status-im.constants :as c])) (defn- map-to-str [m] diff --git a/src/syng_im/models/protocol.cljs b/src/status_im/models/protocol.cljs similarity index 69% rename from src/syng_im/models/protocol.cljs rename to src/status_im/models/protocol.cljs index aff7283d97..abe2ad110f 100644 --- a/src/syng_im/models/protocol.cljs +++ b/src/status_im/models/protocol.cljs @@ -1,12 +1,12 @@ -(ns syng-im.models.protocol +(ns status-im.models.protocol (:require [cljs.reader :refer [read-string]] - [syng-im.protocol.state.storage :as s] - [syng-im.utils.encryption :refer [password-encrypt + [status-im.protocol.state.storage :as s] + [status-im.utils.encryption :refer [password-encrypt password-decrypt]] - [syng-im.utils.types :refer [to-edn-string]] + [status-im.utils.types :refer [to-edn-string]] [re-frame.db :refer [app-db]] - [syng-im.db :as db] - [syng-im.persistence.simple-kv-store :as kv])) + [status-im.db :as db] + [status-im.persistence.simple-kv-store :as kv])) (defn set-initialized [db initialized?] (assoc-in db db/protocol-initialized-path initialized?)) diff --git a/src/syng_im/navigation.cljs b/src/status_im/navigation.cljs similarity index 93% rename from src/syng_im/navigation.cljs rename to src/status_im/navigation.cljs index 9c95aa81b2..f80b7d3df7 100644 --- a/src/syng_im/navigation.cljs +++ b/src/status_im/navigation.cljs @@ -1,4 +1,4 @@ -(ns syng-im.navigation) +(ns status-im.navigation) (def ^{:dynamic true :private true} *nav-render* "Flag to suppress navigator re-renders from outside om when pushing/popping." diff --git a/src/syng_im/navigation/handlers.cljs b/src/status_im/navigation/handlers.cljs similarity index 98% rename from src/syng_im/navigation/handlers.cljs rename to src/status_im/navigation/handlers.cljs index 36dd8a768d..28f331a78a 100644 --- a/src/syng_im/navigation/handlers.cljs +++ b/src/status_im/navigation/handlers.cljs @@ -1,4 +1,4 @@ -(ns syng-im.navigation.handlers +(ns status-im.navigation.handlers (:require [re-frame.core :refer [register-handler dispatch debug enrich after]])) diff --git a/src/syng_im/new_group/handlers.cljs b/src/status_im/new_group/handlers.cljs similarity index 94% rename from src/syng_im/new_group/handlers.cljs rename to src/status_im/new_group/handlers.cljs index bbd07a1f60..7c890399fd 100644 --- a/src/syng_im/new_group/handlers.cljs +++ b/src/status_im/new_group/handlers.cljs @@ -1,7 +1,7 @@ -(ns syng-im.new-group.handlers - (:require [syng-im.protocol.api :as api] +(ns status-im.new-group.handlers + (:require [status-im.protocol.api :as api] [re-frame.core :refer [register-handler after dispatch debug enrich]] - [syng-im.models.chats :as chats] + [status-im.models.chats :as chats] [clojure.string :as s])) (defn deselect-contact diff --git a/src/syng_im/new_group/screen.cljs b/src/status_im/new_group/screen.cljs similarity index 77% rename from src/syng_im/new_group/screen.cljs rename to src/status_im/new_group/screen.cljs index 85a344022b..c58832e1dc 100644 --- a/src/syng_im/new_group/screen.cljs +++ b/src/status_im/new_group/screen.cljs @@ -1,8 +1,8 @@ -(ns syng-im.new-group.screen - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.new-group.screen + (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.resources :as res] - [syng-im.components.react :refer [view + [status-im.resources :as res] + [status-im.components.react :refer [view text-input text image @@ -10,11 +10,11 @@ touchable-highlight list-view list-item]] - [syng-im.components.styles :refer [color-purple]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.utils.listview :refer [to-datasource]] - [syng-im.new-group.views.contact :refer [new-group-contact]] - [syng-im.new-group.styles :as st])) + [status-im.components.styles :refer [color-purple]] + [status-im.components.toolbar :refer [toolbar]] + [status-im.utils.listview :refer [to-datasource]] + [status-im.new-group.views.contact :refer [new-group-contact]] + [status-im.new-group.styles :as st])) (defview new-group-toolbar [] diff --git a/src/syng_im/new_group/styles.cljs b/src/status_im/new_group/styles.cljs similarity index 94% rename from src/syng_im/new_group/styles.cljs rename to src/status_im/new_group/styles.cljs index 695c616ea9..cd16b8dcc8 100644 --- a/src/syng_im/new_group/styles.cljs +++ b/src/status_im/new_group/styles.cljs @@ -1,5 +1,5 @@ -(ns syng-im.new-group.styles - (:require [syng-im.components.styles :refer [font +(ns status-im.new-group.styles + (:require [status-im.components.styles :refer [font title-font color-white color-purple diff --git a/src/syng_im/new_group/subs.cljs b/src/status_im/new_group/subs.cljs similarity index 89% rename from src/syng_im/new_group/subs.cljs rename to src/status_im/new_group/subs.cljs index 62fc941747..57d01e1aae 100644 --- a/src/syng_im/new_group/subs.cljs +++ b/src/status_im/new_group/subs.cljs @@ -1,4 +1,4 @@ -(ns syng-im.new-group.subs +(ns status-im.new-group.subs (:require-macros [reagent.ratom :refer [reaction]]) (:require [re-frame.core :refer [register-sub]])) diff --git a/src/syng_im/new_group/views/contact.cljs b/src/status_im/new_group/views/contact.cljs similarity index 60% rename from src/syng_im/new_group/views/contact.cljs rename to src/status_im/new_group/views/contact.cljs index 6701e9fafc..a87b7d5fe2 100644 --- a/src/syng_im/new_group/views/contact.cljs +++ b/src/status_im/new_group/views/contact.cljs @@ -1,10 +1,10 @@ -(ns syng-im.new-group.views.contact - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.new-group.views.contact + (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.components.react :refer [view]] - [syng-im.contacts.views.contact-inner :refer [contact-inner-view]] - [syng-im.components.item-checkbox :refer [item-checkbox]] - [syng-im.new-group.styles :as st])) + [status-im.components.react :refer [view]] + [status-im.contacts.views.contact-inner :refer [contact-inner-view]] + [status-im.components.item-checkbox :refer [item-checkbox]] + [status-im.new-group.styles :as st])) (defn on-toggle [whisper-identity] (fn [checked?] diff --git a/src/syng_im/participants/styles.cljs b/src/status_im/participants/styles.cljs similarity index 92% rename from src/syng_im/participants/styles.cljs rename to src/status_im/participants/styles.cljs index 482436f30a..20436fb19a 100644 --- a/src/syng_im/participants/styles.cljs +++ b/src/status_im/participants/styles.cljs @@ -1,4 +1,4 @@ -(ns syng-im.participants.styles) +(ns status-im.participants.styles) (def participants-container {:flex 1 diff --git a/src/syng_im/participants/views/contact.cljs b/src/status_im/participants/views/contact.cljs similarity index 68% rename from src/syng_im/participants/views/contact.cljs rename to src/status_im/participants/views/contact.cljs index f193f24deb..de6ccd9287 100644 --- a/src/syng_im/participants/views/contact.cljs +++ b/src/status_im/participants/views/contact.cljs @@ -1,10 +1,10 @@ -(ns syng-im.participants.views.contact +(ns status-im.participants.views.contact (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.components.react :refer [view]] - [syng-im.contacts.views.contact-inner :refer [contact-inner-view]] - [syng-im.components.item-checkbox :refer [item-checkbox]] + [status-im.components.react :refer [view]] + [status-im.contacts.views.contact-inner :refer [contact-inner-view]] + [status-im.components.item-checkbox :refer [item-checkbox]] [reagent.core :as r] - [syng-im.participants.styles :as st])) + [status-im.participants.styles :as st])) (defn participant-contact [{:keys [whisper-identity] :as contact}] ;; todo must be moved to handlers diff --git a/src/syng_im/participants/views/create.cljs b/src/status_im/participants/views/create.cljs similarity index 66% rename from src/syng_im/participants/views/create.cljs rename to src/status_im/participants/views/create.cljs index 20a84dfbfa..a0ede9b5ef 100644 --- a/src/syng_im/participants/views/create.cljs +++ b/src/status_im/participants/views/create.cljs @@ -1,12 +1,12 @@ -(ns syng-im.participants.views.create +(ns status-im.participants.views.create (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.resources :as res] - [syng-im.components.react :refer [view list-view list-item]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.utils.listview :refer [to-datasource]] - [syng-im.participants.views.contact :refer [participant-contact]] + [status-im.resources :as res] + [status-im.components.react :refer [view list-view list-item]] + [status-im.components.toolbar :refer [toolbar]] + [status-im.utils.listview :refer [to-datasource]] + [status-im.participants.views.contact :refer [participant-contact]] [reagent.core :as r] - [syng-im.participants.styles :as st])) + [status-im.participants.styles :as st])) (defn new-participants-toolbar [] [toolbar diff --git a/src/syng_im/participants/views/remove.cljs b/src/status_im/participants/views/remove.cljs similarity index 73% rename from src/syng_im/participants/views/remove.cljs rename to src/status_im/participants/views/remove.cljs index 40ff3528f7..68aa8f0cd4 100644 --- a/src/syng_im/participants/views/remove.cljs +++ b/src/status_im/participants/views/remove.cljs @@ -1,15 +1,15 @@ -(ns syng-im.participants.views.remove +(ns status-im.participants.views.remove (:require [re-frame.core :refer [subscribe dispatch]] - [syng-im.resources :as res] - [syng-im.components.react :refer [view text-input text image + [status-im.resources :as res] + [status-im.components.react :refer [view text-input text image touchable-highlight list-view list-item]] - [syng-im.components.toolbar :refer [toolbar]] - [syng-im.utils.listview :refer [to-datasource]] - [syng-im.participants.views.contact + [status-im.components.toolbar :refer [toolbar]] + [status-im.utils.listview :refer [to-datasource]] + [status-im.participants.views.contact :refer [participant-contact]] [reagent.core :as r] - [syng-im.participants.styles :as st])) + [status-im.participants.styles :as st])) (defn remove-participants-toolbar [] [toolbar diff --git a/src/syng_im/persistence/realm.cljs b/src/status_im/persistence/realm.cljs similarity index 97% rename from src/syng_im/persistence/realm.cljs rename to src/status_im/persistence/realm.cljs index af5050cf78..242f98bb9c 100644 --- a/src/syng_im/persistence/realm.cljs +++ b/src/status_im/persistence/realm.cljs @@ -1,7 +1,7 @@ -(ns syng-im.persistence.realm +(ns status-im.persistence.realm (:require [cljs.reader :refer [read-string]] - [syng-im.utils.logging :as log] - [syng-im.utils.types :refer [to-string]]) + [status-im.utils.logging :as log] + [status-im.utils.types :refer [to-string]]) (:refer-clojure :exclude [exists?])) (set! js/window.Realm (js/require "realm")) diff --git a/src/syng_im/persistence/realm_queries.cljs b/src/status_im/persistence/realm_queries.cljs similarity index 83% rename from src/syng_im/persistence/realm_queries.cljs rename to src/status_im/persistence/realm_queries.cljs index 3b8309b329..93e4028ab8 100644 --- a/src/syng_im/persistence/realm_queries.cljs +++ b/src/status_im/persistence/realm_queries.cljs @@ -1,6 +1,6 @@ -(ns syng-im.persistence.realm-queries +(ns status-im.persistence.realm-queries (:require [clojure.string :as s] - [syng-im.utils.types :refer [to-string]])) + [status-im.utils.types :refer [to-string]])) (defn include-query [field-name values] (->> values diff --git a/src/syng_im/persistence/simple_kv_store.cljs b/src/status_im/persistence/simple_kv_store.cljs similarity index 73% rename from src/syng_im/persistence/simple_kv_store.cljs rename to src/status_im/persistence/simple_kv_store.cljs index 3781154d60..84dd85bff3 100644 --- a/src/syng_im/persistence/simple_kv_store.cljs +++ b/src/status_im/persistence/simple_kv_store.cljs @@ -1,7 +1,7 @@ -(ns syng-im.persistence.simple-kv-store - (:require [syng-im.protocol.state.storage :as st] - [syng-im.persistence.realm :as r] - [syng-im.utils.types :refer [to-edn-string]])) +(ns status-im.persistence.simple-kv-store + (:require [status-im.protocol.state.storage :as st] + [status-im.persistence.realm :as r] + [status-im.utils.types :refer [to-edn-string]])) (defrecord SimpleKvStore [] st/Storage diff --git a/src/syng_im/profile/screen.cljs b/src/status_im/profile/screen.cljs similarity index 94% rename from src/syng_im/profile/screen.cljs rename to src/status_im/profile/screen.cljs index 9d075c4999..3f0c8d2779 100644 --- a/src/syng_im/profile/screen.cljs +++ b/src/status_im/profile/screen.cljs @@ -1,16 +1,16 @@ -(ns syng-im.profile.screen - (:require-macros [syng-im.utils.views :refer [defview]]) +(ns status-im.profile.screen + (:require-macros [status-im.utils.views :refer [defview]]) (:require [clojure.string :as s] [re-frame.core :refer [subscribe dispatch]] - [syng-im.components.react :refer [view + [status-im.components.react :refer [view text image icon scroll-view touchable-highlight touchable-opacity]] - [syng-im.resources :as res] - [syng-im.profile.styles :as st])) + [status-im.resources :as res] + [status-im.profile.styles :as st])) (defn user-photo [{:keys [photo-path]}] [image {:source (if (s/blank? photo-path) diff --git a/src/syng_im/profile/styles.cljs b/src/status_im/profile/styles.cljs similarity index 97% rename from src/syng_im/profile/styles.cljs rename to src/status_im/profile/styles.cljs index 545016ca4d..fe2c71a76e 100644 --- a/src/syng_im/profile/styles.cljs +++ b/src/status_im/profile/styles.cljs @@ -1,5 +1,5 @@ -(ns syng-im.profile.styles - (:require [syng-im.components.styles :refer [font +(ns status-im.profile.styles + (:require [status-im.components.styles :refer [font color-light-blue-transparent color-white color-black diff --git a/src/syng_im/protocol/protocol_handler.cljs b/src/status_im/protocol/protocol_handler.cljs similarity index 90% rename from src/syng_im/protocol/protocol_handler.cljs rename to src/status_im/protocol/protocol_handler.cljs index 4e6f1f94cf..cd0d44c812 100644 --- a/src/syng_im/protocol/protocol_handler.cljs +++ b/src/status_im/protocol/protocol_handler.cljs @@ -1,10 +1,10 @@ -(ns syng-im.protocol.protocol-handler - (:require [syng-im.utils.logging :as log] - [syng-im.constants :refer [ethereum-rpc-url]] +(ns status-im.protocol.protocol-handler + (:require [status-im.utils.logging :as log] + [status-im.constants :refer [ethereum-rpc-url]] [re-frame.core :refer [dispatch]] - [syng-im.models.protocol :refer [stored-identity]] - [syng-im.persistence.simple-kv-store :as kv] - [syng-im.models.chats :refer [active-group-chats]])) + [status-im.models.protocol :refer [stored-identity]] + [status-im.persistence.simple-kv-store :as kv] + [status-im.models.chats :refer [active-group-chats]])) (defn make-handler [db] diff --git a/src/syng_im/resources.cljs b/src/status_im/resources.cljs similarity index 97% rename from src/syng_im/resources.cljs rename to src/status_im/resources.cljs index 90d8e09223..e8c41190d6 100644 --- a/src/syng_im/resources.cljs +++ b/src/status_im/resources.cljs @@ -1,4 +1,4 @@ -(ns syng-im.resources) +(ns status-im.resources) (def logo-icon (js/require "./images/logo.png")) (def nav-back-icon (js/require "./images/nav-back.png")) diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs new file mode 100644 index 0000000000..8c1125d35d --- /dev/null +++ b/src/status_im/subs.cljs @@ -0,0 +1,12 @@ +(ns status-im.subs + (:require-macros [reagent.ratom :refer [reaction]]) + (:require [re-frame.core :refer [register-sub]] + status-im.chat.subs + status-im.group-settings.subs + status-im.discovery.subs + status-im.contacts.subs + status-im.new-group.subs)) + +(register-sub :get + (fn [db [_ k]] + (reaction (k @db)))) diff --git a/src/syng_im/utils/crypt.cljs b/src/status_im/utils/crypt.cljs similarity index 96% rename from src/syng_im/utils/crypt.cljs rename to src/status_im/utils/crypt.cljs index c015330c14..722581d10c 100644 --- a/src/syng_im/utils/crypt.cljs +++ b/src/status_im/utils/crypt.cljs @@ -1,4 +1,4 @@ -(ns syng-im.utils.crypt +(ns status-im.utils.crypt (:require [goog.crypt :refer [byteArrayToHex]] [clojure.string :as s]) (:import goog.crypt.Sha256)) diff --git a/src/syng_im/utils/event.cljs b/src/status_im/utils/event.cljs similarity index 79% rename from src/syng_im/utils/event.cljs rename to src/status_im/utils/event.cljs index bb47182867..54f49e05e0 100644 --- a/src/syng_im/utils/event.cljs +++ b/src/status_im/utils/event.cljs @@ -1,4 +1,4 @@ -(ns syng-im.utils.event +(ns status-im.utils.event (:require [cljs.core.async :refer [ Date: Thu, 19 May 2016 18:32:38 +0200 Subject: [PATCH 4/9] Syng to Status Former-commit-id: 134c040c3e28667f01d4e218a9a8a4ab0b4c57cf --- .re-natal | 2 +- .../main/java/com/statusim/MainActivity.java | 2 +- android/app/src/main/res/values/strings.xml | 2 +- android/settings.gradle | 2 +- ios/SyngIm.xcodeproj/project.pbxproj | 90 +++++++++---------- .../xcshareddata/xcschemes/SyngIm.xcscheme | 36 ++++---- ios/SyngIm/AppDelegate.m | 2 +- ios/SyngIm/Base.lproj/LaunchScreen.xib | 2 +- ios/SyngImTests/SyngImTests.m | 4 +- package.json | 2 +- src/status_im/android/core.cljs | 2 +- src/status_im/chat/sign_up.cljs | 4 +- src/status_im/ios/core.cljs | 2 +- 13 files changed, 76 insertions(+), 76 deletions(-) diff --git a/.re-natal b/.re-natal index 54a57bc450..1a80495307 100644 --- a/.re-natal +++ b/.re-natal @@ -1,5 +1,5 @@ { - "name": "SyngIm", + "name": "StatusIm", "interface": "reagent", "androidHost": "10.0.3.2", "modules": [ diff --git a/android/app/src/main/java/com/statusim/MainActivity.java b/android/app/src/main/java/com/statusim/MainActivity.java index 492bd5d8e9..dd040b4921 100644 --- a/android/app/src/main/java/com/statusim/MainActivity.java +++ b/android/app/src/main/java/com/statusim/MainActivity.java @@ -54,7 +54,7 @@ public class MainActivity extends ReactActivity { */ @Override protected String getMainComponentName() { - return "SyngIm"; + return "StatusIm"; } /** diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 7b66980444..fb87cafc71 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - SyngIm + StatusIm diff --git a/android/settings.gradle b/android/settings.gradle index 784925e19a..b767740db4 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'SyngIm' +rootProject.name = 'StatusIm' include ':app' diff --git a/ios/SyngIm.xcodeproj/project.pbxproj b/ios/SyngIm.xcodeproj/project.pbxproj index 2507b89bfe..d933ac7b4f 100644 --- a/ios/SyngIm.xcodeproj/project.pbxproj +++ b/ios/SyngIm.xcodeproj/project.pbxproj @@ -12,7 +12,7 @@ 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; }; 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; }; 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; }; - 00E356F31AD99517003FC87E /* SyngImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* SyngImTests.m */; }; + 00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; }; 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; }; 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; }; 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; }; @@ -65,7 +65,7 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = 13B07F861A680F5B00A75B9A; - remoteInfo = SyngIm; + remoteInfo = StatusIm; }; 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -111,18 +111,18 @@ 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj; sourceTree = ""; }; 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj; sourceTree = ""; }; 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = ""; }; - 00E356EE1AD99517003FC87E /* SyngImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SyngImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 00E356F21AD99517003FC87E /* SyngImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SyngImTests.m; sourceTree = ""; }; + 00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = ""; }; 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj; sourceTree = ""; }; 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* SyngIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SyngIm.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = SyngIm/AppDelegate.h; sourceTree = ""; }; - 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = SyngIm/AppDelegate.m; sourceTree = ""; }; + 13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = ""; }; + 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = StatusIm/AppDelegate.m; sourceTree = ""; }; 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SyngIm/Images.xcassets; sourceTree = ""; }; - 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SyngIm/Info.plist; sourceTree = ""; }; - 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = SyngIm/main.m; sourceTree = ""; }; + 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = ""; }; + 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = ""; }; + 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.xcodeproj; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../node_modules/react-native/Libraries/Text/RCTText.xcodeproj; sourceTree = ""; }; @@ -196,13 +196,13 @@ name = Products; sourceTree = ""; }; - 00E356EF1AD99517003FC87E /* SyngImTests */ = { + 00E356EF1AD99517003FC87E /* StatusImTests */ = { isa = PBXGroup; children = ( - 00E356F21AD99517003FC87E /* SyngImTests.m */, + 00E356F21AD99517003FC87E /* StatusImTests.m */, 00E356F01AD99517003FC87E /* Supporting Files */, ); - path = SyngImTests; + path = StatusImTests; sourceTree = ""; }; 00E356F01AD99517003FC87E /* Supporting Files */ = { @@ -229,7 +229,7 @@ name = Products; sourceTree = ""; }; - 13B07FAE1A68108700A75B9A /* SyngIm */ = { + 13B07FAE1A68108700A75B9A /* StatusIm */ = { isa = PBXGroup; children = ( 008F07F21AC5B25A0029DE68 /* main.jsbundle */, @@ -240,7 +240,7 @@ 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, 13B07FB71A68108700A75B9A /* main.m */, ); - name = SyngIm; + name = StatusIm; sourceTree = ""; }; 146834001AC3E56700842450 /* Products */ = { @@ -287,9 +287,9 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 13B07FAE1A68108700A75B9A /* SyngIm */, + 13B07FAE1A68108700A75B9A /* StatusIm */, 832341AE1AAA6A7D00B99B32 /* Libraries */, - 00E356EF1AD99517003FC87E /* SyngImTests */, + 00E356EF1AD99517003FC87E /* StatusImTests */, 83CBBA001A601CBA00E9B192 /* Products */, ); indentWidth = 2; @@ -299,8 +299,8 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* SyngIm.app */, - 00E356EE1AD99517003FC87E /* SyngImTests.xctest */, + 13B07F961A680F5B00A75B9A /* StatusIm.app */, + 00E356EE1AD99517003FC87E /* StatusImTests.xctest */, ); name = Products; sourceTree = ""; @@ -308,9 +308,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* SyngImTests */ = { + 00E356ED1AD99517003FC87E /* StatusImTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "SyngImTests" */; + buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */; buildPhases = ( 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, @@ -321,14 +321,14 @@ dependencies = ( 00E356F51AD99517003FC87E /* PBXTargetDependency */, ); - name = SyngImTests; - productName = SyngImTests; - productReference = 00E356EE1AD99517003FC87E /* SyngImTests.xctest */; + name = StatusImTests; + productName = StatusImTests; + productReference = 00E356EE1AD99517003FC87E /* StatusImTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 13B07F861A680F5B00A75B9A /* SyngIm */ = { + 13B07F861A680F5B00A75B9A /* StatusIm */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "SyngIm" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */; buildPhases = ( 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, @@ -339,9 +339,9 @@ ); dependencies = ( ); - name = SyngIm; + name = StatusIm; productName = "Hello World"; - productReference = 13B07F961A680F5B00A75B9A /* SyngIm.app */; + productReference = 13B07F961A680F5B00A75B9A /* StatusIm.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -359,7 +359,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "SyngIm" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "StatusIm" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -414,8 +414,8 @@ ); projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* SyngIm */, - 00E356ED1AD99517003FC87E /* SyngImTests */, + 13B07F861A680F5B00A75B9A /* StatusIm */, + 00E356ED1AD99517003FC87E /* StatusImTests */, ); }; /* End PBXProject section */ @@ -535,7 +535,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 00E356F31AD99517003FC87E /* SyngImTests.m in Sources */, + 00E356F31AD99517003FC87E /* StatusImTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -553,7 +553,7 @@ /* Begin PBXTargetDependency section */ 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* SyngIm */; + target = 13B07F861A680F5B00A75B9A /* StatusIm */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -565,7 +565,7 @@ 13B07FB21A68108700A75B9A /* Base */, ); name = LaunchScreen.xib; - path = SyngIm; + path = StatusIm; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -583,11 +583,11 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = SyngImTests/Info.plist; + INFOPLIST_FILE = StatusImTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SyngIm.app/SyngIm"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm"; }; name = Debug; }; @@ -600,11 +600,11 @@ "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", ); - INFOPLIST_FILE = SyngImTests/Info.plist; + INFOPLIST_FILE = StatusImTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SyngIm.app/SyngIm"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm"; }; name = Release; }; @@ -618,10 +618,10 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - INFOPLIST_FILE = "SyngIm/Info.plist"; + INFOPLIST_FILE = "StatusIm/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = SyngIm; + PRODUCT_NAME = StatusIm; }; name = Debug; }; @@ -634,10 +634,10 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - INFOPLIST_FILE = "SyngIm/Info.plist"; + INFOPLIST_FILE = "StatusIm/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = SyngIm; + PRODUCT_NAME = StatusIm; }; name = Release; }; @@ -730,7 +730,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "SyngImTests" */ = { + 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 00E356F61AD99517003FC87E /* Debug */, @@ -739,7 +739,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "SyngIm" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -748,7 +748,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "SyngIm" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "StatusIm" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme b/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme index 2222337849..3afad3bbfb 100644 --- a/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme +++ b/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "StatusIm.app" + BlueprintName = "StatusIm" + ReferencedContainer = "container:StatusIm.xcodeproj"> + BuildableName = "StatusImTests.xctest" + BlueprintName = "StatusImTests" + ReferencedContainer = "container:StatusIm.xcodeproj"> @@ -47,9 +47,9 @@ + BuildableName = "StatusImTests.xctest" + BlueprintName = "StatusImTests" + ReferencedContainer = "container:StatusIm.xcodeproj"> @@ -57,9 +57,9 @@ + BuildableName = "StatusIm.app" + BlueprintName = "StatusIm" + ReferencedContainer = "container:StatusIm.xcodeproj"> @@ -77,9 +77,9 @@ + BuildableName = "StatusIm.app" + BlueprintName = "StatusIm" + ReferencedContainer = "container:StatusIm.xcodeproj"> @@ -96,9 +96,9 @@ + BuildableName = "StatusIm.app" + BlueprintName = "StatusIm" + ReferencedContainer = "container:StatusIm.xcodeproj"> diff --git a/ios/SyngIm/AppDelegate.m b/ios/SyngIm/AppDelegate.m index 26b6070974..8d0df9f4bc 100644 --- a/ios/SyngIm/AppDelegate.m +++ b/ios/SyngIm/AppDelegate.m @@ -44,7 +44,7 @@ // jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation - moduleName:@"SyngIm" + moduleName:@"StatusIm" initialProperties:nil launchOptions:launchOptions]; diff --git a/ios/SyngIm/Base.lproj/LaunchScreen.xib b/ios/SyngIm/Base.lproj/LaunchScreen.xib index 55e9a29a81..99ee1ebed3 100644 --- a/ios/SyngIm/Base.lproj/LaunchScreen.xib +++ b/ios/SyngIm/Base.lproj/LaunchScreen.xib @@ -18,7 +18,7 @@ -