From 0d4cbd98e59c37885b7719d6cecd06efaaf41598 Mon Sep 17 00:00:00 2001 From: Julien Eluard Date: Wed, 18 Oct 2017 20:46:25 +0200 Subject: [PATCH] [ISSUE #2177] Moved component into ui --- env/test/env/android/main.cljs | 2 +- src/status_im/android/core.cljs | 2 +- src/status_im/android/platform.cljs | 2 +- src/status_im/chat/events.cljs | 2 +- src/status_im/chat/events/input.cljs | 2 +- src/status_im/chat/handlers.cljs | 10 ++--- .../chat/handlers/webview_bridge.cljs | 2 +- src/status_im/chat/models.cljs | 2 +- src/status_im/chat/models/input.cljs | 2 +- src/status_im/chat/new_chat/styles.cljs | 2 +- src/status_im/chat/new_chat/view.cljs | 20 +++++----- .../chat/new_public_chat/styles.cljs | 2 +- src/status_im/chat/new_public_chat/view.cljs | 10 ++--- src/status_im/chat/screen.cljs | 30 +++++++-------- src/status_im/chat/sign_up.cljs | 2 +- src/status_im/chat/styles/animations.cljs | 2 +- .../chat/styles/input/box_header.cljs | 2 +- src/status_im/chat/styles/input/emoji.cljs | 2 +- src/status_im/chat/styles/input/input.cljs | 2 +- .../chat/styles/input/input_actions.cljs | 2 +- .../chat/styles/input/result_box.cljs | 2 +- .../chat/styles/input/suggestions.cljs | 2 +- .../chat/styles/input/validation_message.cljs | 2 +- .../chat/styles/message/command_pill.cljs | 2 +- .../chat/styles/message/datemark.cljs | 2 +- .../chat/styles/message/message.cljs | 2 +- src/status_im/chat/styles/screen.cljs | 2 +- src/status_im/chat/views/actions.cljs | 4 +- .../chat/views/api/choose_contact.cljs | 6 +-- .../chat/views/api/geolocation/styles.cljs | 2 +- .../chat/views/api/geolocation/views.cljs | 6 +-- src/status_im/chat/views/bottom_info.cljs | 6 +-- .../views/input/animations/expandable.cljs | 6 +-- .../views/input/animations/responder.cljs | 6 +-- .../chat/views/input/box_header.cljs | 2 +- src/status_im/chat/views/input/emoji.cljs | 2 +- src/status_im/chat/views/input/input.cljs | 6 +-- .../chat/views/input/input_actions.cljs | 2 +- .../chat/views/input/result_box.cljs | 4 +- .../chat/views/input/suggestions.cljs | 2 +- src/status_im/chat/views/input/utils.cljs | 2 +- .../chat/views/input/validation_messages.cljs | 2 +- src/status_im/chat/views/input/web_view.cljs | 4 +- .../chat/views/message/datemark.cljs | 2 +- src/status_im/chat/views/message/message.cljs | 8 ++-- .../chat/views/message/request_message.cljs | 4 +- src/status_im/chat/views/toolbar_content.cljs | 2 +- src/status_im/commands/handlers/debug.cljs | 2 +- src/status_im/commands/handlers/jail.cljs | 2 +- src/status_im/commands/utils.cljs | 4 +- .../realm/schemas/account/v1/chat.cljs | 2 +- .../realm/schemas/account/v11/chat.cljs | 2 +- .../realm/schemas/account/v2/chat.cljs | 2 +- .../realm/schemas/account/v3/chat.cljs | 2 +- .../realm/schemas/account/v4/chat.cljs | 2 +- src/status_im/debug/handlers.cljs | 0 src/status_im/ios/core.cljs | 2 +- src/status_im/ios/platform.cljs | 2 +- src/status_im/native_module/impl/module.cljs | 4 +- src/status_im/network/net_info.cljs | 2 +- .../action_button/action_button.cljs | 10 ++--- .../components/action_button/styles.cljs | 4 +- .../{ => ui}/components/animation.cljs | 4 +- .../{ => ui}/components/button/styles.cljs | 4 +- .../{ => ui}/components/button/view.cljs | 6 +-- src/status_im/{ => ui}/components/camera.cljs | 2 +- .../components/carousel/carousel.cljs | 8 ++-- .../{ => ui}/components/carousel/styles.cljs | 2 +- .../{ => ui}/components/chat_icon/screen.cljs | 8 ++-- .../{ => ui}/components/chat_icon/styles.cljs | 4 +- .../{ => ui}/components/checkbox/styles.cljs | 4 +- .../{ => ui}/components/checkbox/view.cljs | 6 +-- .../{ => ui}/components/common/common.cljs | 10 ++--- .../{ => ui}/components/common/styles.cljs | 4 +- .../{ => ui}/components/contact/contact.cljs | 12 +++--- .../{ => ui}/components/contact/styles.cljs | 4 +- .../{ => ui}/components/context_menu.cljs | 6 +-- .../{ => ui}/components/drag_drop.cljs | 4 +- .../{ => ui}/components/drawer/styles.cljs | 4 +- .../{ => ui}/components/drawer/view.cljs | 16 ++++---- .../components/icons/custom_icons.cljs | 2 +- .../components/icons/vector_icons.cljs | 6 +-- .../components/image_button/styles.cljs | 4 +- .../components/image_button/view.cljs | 10 ++--- .../components/invertible_scroll_view.cljs | 2 +- .../{ => ui}/components/item_checkbox.cljs | 2 +- .../{ => ui}/components/list/styles.cljs | 4 +- .../{ => ui}/components/list/views.cljs | 8 ++-- .../{ => ui}/components/list_selection.cljs | 4 +- src/status_im/{ => ui}/components/mapbox.cljs | 6 +-- .../components/native_action_button.cljs | 2 +- src/status_im/{ => ui}/components/nfc.cljs | 2 +- .../{ => ui}/components/permissions.cljs | 2 +- .../{ => ui}/components/qr_code.cljs | 2 +- src/status_im/{ => ui}/components/react.cljs | 4 +- .../components/renderers/renderers.cljs | 6 +-- .../components/sortable_list_view.cljs | 4 +- .../{ => ui}/components/status_bar.cljs | 4 +- .../{ => ui}/components/status_view/view.cljs | 6 +-- .../{ => ui}/components/sticky_button.cljs | 6 +-- src/status_im/{ => ui}/components/styles.cljs | 2 +- .../components/sync_state/gradient.cljs | 8 ++-- .../components/sync_state/offline.cljs | 8 ++-- .../components/sync_state/styles.cljs | 2 +- .../{ => ui}/components/tabs/styles.cljs | 4 +- .../{ => ui}/components/tabs/views.cljs | 8 ++-- .../components/text_field/styles.cljs | 2 +- .../{ => ui}/components/text_field/view.cljs | 10 ++--- .../text_input_with_label/animation.cljs | 4 +- .../text_input_with_label/styles.cljs | 4 +- .../text_input_with_label/view.cljs | 10 ++--- .../{ => ui}/components/toolbar/actions.cljs | 4 +- .../{ => ui}/components/toolbar/styles.cljs | 4 +- .../{ => ui}/components/toolbar/view.cljs | 16 ++++---- .../ui/components/toolbar_new/actions.cljs | 0 .../ui/components/toolbar_new/styles.cljs | 0 .../ui/components/toolbar_new/view.cljs | 0 .../{ => ui}/components/webview_bridge.cljs | 2 +- .../ui/screens/accounts/login/styles.cljs | 2 +- .../ui/screens/accounts/login/views.cljs | 12 +++--- .../ui/screens/accounts/recover/styles.cljs | 2 +- .../ui/screens/accounts/recover/views.cljs | 20 +++++----- src/status_im/ui/screens/accounts/styles.cljs | 2 +- src/status_im/ui/screens/accounts/views.cljs | 22 +++++------ .../ui/screens/chats_list/styles.cljs | 4 +- .../ui/screens/chats_list/views.cljs | 28 +++++++------- .../screens/chats_list/views/inner_item.cljs | 8 ++-- .../screens/contacts/contact_list/views.cljs | 14 +++---- .../contacts/contact_list_modal/views.cljs | 20 +++++----- .../screens/contacts/new_contact/views.cljs | 12 +++--- src/status_im/ui/screens/contacts/styles.cljs | 4 +- src/status_im/ui/screens/contacts/views.cljs | 26 ++++++------- .../ui/screens/discover/all_dapps/views.cljs | 8 ++-- .../ui/screens/discover/components/views.cljs | 8 ++-- .../screens/discover/dapp_details/views.cljs | 10 ++--- .../discover/popular_hashtags/views.cljs | 6 +-- .../discover/recent_statuses/views.cljs | 4 +- .../discover/search_results/views.cljs | 6 +-- src/status_im/ui/screens/discover/styles.cljs | 2 +- src/status_im/ui/screens/discover/views.cljs | 14 +++---- src/status_im/ui/screens/events.cljs | 2 +- .../ui/screens/group/add_contacts/views.cljs | 37 +++++++++---------- .../ui/screens/group/chat_settings/views.cljs | 8 ++-- .../ui/screens/group/edit_contacts/views.cljs | 10 ++--- src/status_im/ui/screens/group/events.cljs | 2 +- .../ui/screens/group/reorder/views.cljs | 14 +++---- src/status_im/ui/screens/group/styles.cljs | 2 +- src/status_im/ui/screens/group/views.cljs | 22 +++++------ src/status_im/ui/screens/main_tabs/views.cljs | 14 +++---- .../network_settings/add_rpc/views.cljs | 10 ++--- .../network_details/views.cljs | 8 ++-- .../network_settings/parse_json/views.cljs | 8 ++-- .../ui/screens/network_settings/styles.cljs | 2 +- .../ui/screens/network_settings/views.cljs | 16 ++++---- .../ui/screens/profile/edit/views.cljs | 16 ++++---- src/status_im/ui/screens/profile/events.cljs | 2 +- .../screens/profile/photo_capture/views.cljs | 10 ++--- .../ui/screens/profile/qr_code/styles.cljs | 2 +- .../ui/screens/profile/qr_code/views.cljs | 8 ++-- src/status_im/ui/screens/profile/styles.cljs | 2 +- src/status_im/ui/screens/profile/views.cljs | 26 ++++++------- .../ui/screens/qr_scanner/events.cljs | 2 +- .../ui/screens/qr_scanner/styles.cljs | 4 +- .../ui/screens/qr_scanner/views.cljs | 8 ++-- src/status_im/ui/screens/views.cljs | 8 ++-- .../wallet/choose_recipient/styles.cljs | 2 +- .../wallet/choose_recipient/views.cljs | 12 +++--- .../screens/wallet/components/animations.cljs | 2 +- .../ui/screens/wallet/components/styles.cljs | 2 +- .../ui/screens/wallet/components/views.cljs | 8 ++-- .../ui/screens/wallet/main/styles.cljs | 2 +- .../ui/screens/wallet/main/views.cljs | 18 ++++----- .../ui/screens/wallet/request/styles.cljs | 2 +- .../ui/screens/wallet/request/views.cljs | 16 ++++---- .../ui/screens/wallet/send/animations.cljs | 2 +- .../ui/screens/wallet/send/styles.cljs | 2 +- .../wallet/send/transaction_sent/views.cljs | 8 ++-- .../ui/screens/wallet/send/views.cljs | 18 ++++----- src/status_im/ui/screens/wallet/styles.cljs | 2 +- .../screens/wallet/transactions/styles.cljs | 4 +- .../ui/screens/wallet/transactions/views.cljs | 18 ++++----- src/status_im/ui/screens/wallet/views.cljs | 4 +- .../ui/screens/wallet/wallet_list/styles.cljs | 2 +- .../ui/screens/wallet/wallet_list/views.cljs | 10 ++--- src/status_im/utils/notifications.cljs | 2 +- .../status_im/test/components/main_tabs.cljs | 3 -- test/cljs/status_im/test/runner.cljs | 2 - 187 files changed, 565 insertions(+), 571 deletions(-) create mode 100644 src/status_im/debug/handlers.cljs rename src/status_im/{ => ui}/components/action_button/action_button.cljs (69%) rename src/status_im/{ => ui}/components/action_button/styles.cljs (93%) rename src/status_im/{ => ui}/components/animation.cljs (89%) rename src/status_im/{ => ui}/components/button/styles.cljs (94%) rename src/status_im/{ => ui}/components/button/view.cljs (90%) rename src/status_im/{ => ui}/components/camera.cljs (94%) rename src/status_im/{ => ui}/components/carousel/carousel.cljs (97%) rename src/status_im/{ => ui}/components/carousel/styles.cljs (92%) rename src/status_im/{ => ui}/components/chat_icon/screen.cljs (96%) rename src/status_im/{ => ui}/components/chat_icon/styles.cljs (98%) rename src/status_im/{ => ui}/components/checkbox/styles.cljs (82%) rename src/status_im/{ => ui}/components/checkbox/view.cljs (54%) rename src/status_im/{ => ui}/components/common/common.cljs (87%) rename src/status_im/{ => ui}/components/common/styles.cljs (95%) rename src/status_im/{ => ui}/components/contact/contact.cljs (82%) rename src/status_im/{ => ui}/components/contact/styles.cljs (94%) rename src/status_im/{ => ui}/components/context_menu.cljs (94%) rename src/status_im/{ => ui}/components/drag_drop.cljs (75%) rename src/status_im/{ => ui}/components/drawer/styles.cljs (97%) rename src/status_im/{ => ui}/components/drawer/view.cljs (92%) rename src/status_im/{ => ui}/components/icons/custom_icons.cljs (80%) rename src/status_im/{ => ui}/components/icons/vector_icons.cljs (96%) rename src/status_im/{ => ui}/components/image_button/styles.cljs (82%) rename src/status_im/{ => ui}/components/image_button/view.cljs (69%) rename src/status_im/{ => ui}/components/invertible_scroll_view.cljs (84%) rename src/status_im/{ => ui}/components/item_checkbox.cljs (78%) rename src/status_im/{ => ui}/components/list/styles.cljs (93%) rename src/status_im/{ => ui}/components/list/views.cljs (95%) rename src/status_im/{ => ui}/components/list_selection.cljs (96%) rename src/status_im/{ => ui}/components/mapbox.cljs (78%) rename src/status_im/{ => ui}/components/native_action_button.cljs (86%) rename src/status_im/{ => ui}/components/nfc.cljs (96%) rename src/status_im/{ => ui}/components/permissions.cljs (96%) rename src/status_im/{ => ui}/components/qr_code.cljs (86%) rename src/status_im/{ => ui}/components/react.cljs (98%) rename src/status_im/{ => ui}/components/renderers/renderers.cljs (58%) rename src/status_im/{ => ui}/components/sortable_list_view.cljs (88%) rename src/status_im/{ => ui}/components/status_bar.cljs (81%) rename src/status_im/{ => ui}/components/status_view/view.cljs (84%) rename src/status_im/{ => ui}/components/sticky_button.cljs (85%) rename src/status_im/{ => ui}/components/styles.cljs (99%) rename src/status_im/{ => ui}/components/sync_state/gradient.cljs (95%) rename src/status_im/{ => ui}/components/sync_state/offline.cljs (88%) rename src/status_im/{ => ui}/components/sync_state/styles.cljs (95%) rename src/status_im/{ => ui}/components/tabs/styles.cljs (90%) rename src/status_im/{ => ui}/components/tabs/views.cljs (92%) rename src/status_im/{ => ui}/components/text_field/styles.cljs (96%) rename src/status_im/{ => ui}/components/text_field/view.cljs (97%) rename src/status_im/{ => ui}/components/text_input_with_label/animation.cljs (92%) rename src/status_im/{ => ui}/components/text_input_with_label/styles.cljs (94%) rename src/status_im/{ => ui}/components/text_input_with_label/view.cljs (92%) rename src/status_im/{ => ui}/components/toolbar/actions.cljs (93%) rename src/status_im/{ => ui}/components/toolbar/styles.cljs (96%) rename src/status_im/{ => ui}/components/toolbar/view.cljs (92%) create mode 100644 src/status_im/ui/components/toolbar_new/actions.cljs create mode 100644 src/status_im/ui/components/toolbar_new/styles.cljs create mode 100644 src/status_im/ui/components/toolbar_new/view.cljs rename src/status_im/{ => ui}/components/webview_bridge.cljs (85%) delete mode 100644 test/cljs/status_im/test/components/main_tabs.cljs diff --git a/env/test/env/android/main.cljs b/env/test/env/android/main.cljs index beea0fb9f5..b4ca6960a6 100644 --- a/env/test/env/android/main.cljs +++ b/env/test/env/android/main.cljs @@ -13,7 +13,7 @@ (def root-el (r/as-element [reloader])) (defn callback [] (swap! cnt inc) - (status-im.components.status/init-jail) + (status-im.ui.components.status/init-jail) (re-frame.core/dispatch [:load-commands!])) (figwheel/watch-and-reload diff --git a/src/status_im/android/core.cljs b/src/status_im/android/core.cljs index 1518d1b4fe..439fa8e7be 100644 --- a/src/status_im/android/core.cljs +++ b/src/status_im/android/core.cljs @@ -7,7 +7,7 @@ status-im.ui.screens.subs status-im.data-store.core [status-im.ui.screens.views :as views] - [status-im.components.react :as react] + [status-im.ui.components.react :as react] [status-im.native-module.core :as status] [status-im.utils.error-handler :as error-handler] [status-im.utils.utils :as utils] diff --git a/src/status_im/android/platform.cljs b/src/status_im/android/platform.cljs index 78eddb1a06..e8e62a8825 100644 --- a/src/status_im/android/platform.cljs +++ b/src/status_im/android/platform.cljs @@ -1,5 +1,5 @@ (ns status-im.android.platform - (:require [status-im.components.styles :as styles] + (:require [status-im.ui.components.styles :as styles] [status-im.react-native.js-dependencies :as rn-dependencies])) ;; DEPRECATION NOTICE diff --git a/src/status_im/chat/events.cljs b/src/status_im/chat/events.cljs index c7b562e1ca..9e005cb3ca 100644 --- a/src/status_im/chat/events.cljs +++ b/src/status_im/chat/events.cljs @@ -14,7 +14,7 @@ [status-im.ui.screens.navigation :as navigation] [status-im.protocol.core :as protocol] [status-im.constants :as const] - [status-im.components.list-selection :as list-selection] + [status-im.ui.components.list-selection :as list-selection] status-im.chat.events.input status-im.chat.events.commands status-im.chat.events.animation diff --git a/src/status_im/chat/events/input.cljs b/src/status_im/chat/events/input.cljs index aca3f7d90a..254a181f13 100644 --- a/src/status_im/chat/events/input.cljs +++ b/src/status_im/chat/events/input.cljs @@ -10,7 +10,7 @@ [status-im.chat.events.commands :as commands-events] [status-im.chat.events.animation :as animation-events] [status-im.bots.events :as bots-events] - [status-im.components.react :as react-comp] + [status-im.ui.components.react :as react-comp] [status-im.utils.datetime :as time] [status-im.utils.handlers :as handlers] [status-im.utils.random :as random] diff --git a/src/status_im/chat/handlers.cljs b/src/status_im/chat/handlers.cljs index 941f264245..9747bae312 100644 --- a/src/status_im/chat/handlers.cljs +++ b/src/status_im/chat/handlers.cljs @@ -3,21 +3,21 @@ (:require [re-frame.core :refer [enrich after debug dispatch reg-fx]] [cljs.core.async :as a] [clojure.string :as string] - [status-im.components.styles :refer [default-chat-color]] + [status-im.ui.components.styles :refer [default-chat-color]] [status-im.chat.constants :as chat-consts] [status-im.protocol.core :as protocol] - [status-im.data-store.chats :as chats] + [status-im.data-store.chats :as chats] [status-im.data-store.messages :as messages] [status-im.data-store.pending-messages :as pending-messages] [status-im.constants :refer [text-content-type content-type-command content-type-command-request console-chat-id]] - [status-im.utils.random :as random] - [status-im.utils.handlers :refer [register-handler register-handler-fx] :as u] + [status-im.utils.random :as random] + [status-im.utils.handlers :refer [register-handler register-handler-fx] :as u] status-im.chat.events status-im.chat.handlers.requests - status-im.chat.handlers.send-message + status-im.chat.handlers.send-message status-im.chat.handlers.webview-bridge)) (defn remove-chat diff --git a/src/status_im/chat/handlers/webview_bridge.cljs b/src/status_im/chat/handlers/webview_bridge.cljs index 2af3ead964..ed1419f169 100644 --- a/src/status_im/chat/handlers/webview_bridge.cljs +++ b/src/status_im/chat/handlers/webview_bridge.cljs @@ -3,7 +3,7 @@ [status-im.utils.handlers :as handlers] [status-im.utils.types :as types] [taoensso.timbre :as log] - [status-im.components.nfc :as nfc])) + [status-im.ui.components.nfc :as nfc])) (handlers/register-handler :set-webview-bridge (fn [db [_ bridge]] diff --git a/src/status_im/chat/models.cljs b/src/status_im/chat/models.cljs index 7328766114..3abfa410c2 100644 --- a/src/status_im/chat/models.cljs +++ b/src/status_im/chat/models.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.models - (:require [status-im.components.styles :as styles])) + (:require [status-im.ui.components.styles :as styles])) (defn set-chat-ui-props "Updates ui-props in active chat by merging provided kvs into them" diff --git a/src/status_im/chat/models/input.cljs b/src/status_im/chat/models/input.cljs index 53b1ce1eb9..6e20058185 100644 --- a/src/status_im/chat/models/input.cljs +++ b/src/status_im/chat/models/input.cljs @@ -1,7 +1,7 @@ (ns status-im.chat.models.input (:require [clojure.string :as str] [status-im.bots.constants :as bots-constants] - [status-im.components.react :as rc] + [status-im.ui.components.react :as rc] [status-im.native-module.core :as status] [status-im.chat.constants :as const] [status-im.chat.models.commands :as commands-model] diff --git a/src/status_im/chat/new_chat/styles.cljs b/src/status_im/chat/new_chat/styles.cljs index 444b3c65e4..a55a7f7878 100644 --- a/src/status_im/chat/new_chat/styles.cljs +++ b/src/status_im/chat/new_chat/styles.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.new-chat.styles - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def contacts-list-container {:flex 1 diff --git a/src/status_im/chat/new_chat/view.cljs b/src/status_im/chat/new_chat/view.cljs index 0e1aaa2501..b959b09ba4 100644 --- a/src/status_im/chat/new_chat/view.cljs +++ b/src/status_im/chat/new_chat/view.cljs @@ -1,16 +1,16 @@ (ns status-im.chat.new-chat.view (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] - [status-im.components.common.common :as common] - [status-im.components.renderers.renderers :as renderers] - [status-im.components.action-button.action-button :refer [action-button - action-separator]] - [status-im.components.action-button.styles :refer [actions-list]] - [status-im.components.react :refer [view text list-view list-item]] - [status-im.components.contact.contact :refer [contact-view]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :refer [toolbar-with-search]] - [status-im.components.drawer.view :refer [drawer-view]] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.renderers.renderers :as renderers] + [status-im.ui.components.action-button.action-button :refer [action-button + action-separator]] + [status-im.ui.components.action-button.styles :refer [actions-list]] + [status-im.ui.components.react :refer [view text list-view list-item]] + [status-im.ui.components.contact.contact :refer [contact-view]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :refer [toolbar-with-search]] + [status-im.ui.components.drawer.view :refer [drawer-view]] [status-im.chat.new-chat.styles :as styles] [status-im.utils.listview :as lw] [status-im.i18n :refer [label]])) diff --git a/src/status_im/chat/new_public_chat/styles.cljs b/src/status_im/chat/new_public_chat/styles.cljs index 04263118f2..4e1ddfb353 100644 --- a/src/status_im/chat/new_public_chat/styles.cljs +++ b/src/status_im/chat/new_public_chat/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.new-public-chat.styles (:require-macros [status-im.utils.styles :refer [defstyle]]) - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def group-chat-name-input {:font-size 17 diff --git a/src/status_im/chat/new_public_chat/view.cljs b/src/status_im/chat/new_public_chat/view.cljs index 7c3bde2318..7676045a77 100644 --- a/src/status_im/chat/new_public_chat/view.cljs +++ b/src/status_im/chat/new_public_chat/view.cljs @@ -2,11 +2,11 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] status-im.utils.db - [status-im.components.react :as react :refer [text]] - [status-im.components.text-field.view :refer [text-field]] - [status-im.components.styles :as components.styles] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.react :as react :refer [text]] + [status-im.ui.components.text-field.view :refer [text-field]] + [status-im.ui.components.styles :as components.styles] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.chat.new-public-chat.styles :as styles] [status-im.chat.new-public-chat.db :as v] [status-im.i18n :refer [label]] diff --git a/src/status_im/chat/screen.cljs b/src/status_im/chat/screen.cljs index eb459e18b2..a66d626df3 100644 --- a/src/status_im/chat/screen.cljs +++ b/src/status_im/chat/screen.cljs @@ -1,24 +1,24 @@ (ns status-im.chat.screen (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [status-im.components.react :refer [view - animated-view - text - modal - touchable-highlight - list-view - list-item]] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.chat-icon.screen :refer [chat-icon-view-action - chat-icon-view-menu-item]] + [status-im.ui.components.react :refer [view + animated-view + text + modal + touchable-highlight + list-view + list-item]] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.chat-icon.screen :refer [chat-icon-view-action + chat-icon-view-menu-item]] [status-im.chat.styles.screen :as st] [status-im.utils.listview :refer [to-datasource-inverted]] [status-im.utils.utils :refer [truncate-str]] [status-im.utils.datetime :as time] [status-im.utils.platform :as platform :refer [platform-specific]] - [status-im.components.invertible-scroll-view :refer [invertible-scroll-view]] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.invertible-scroll-view :refer [invertible-scroll-view]] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.chat.views.toolbar-content :refer [toolbar-content-view]] [status-im.chat.views.message.message :refer [chat-message]] [status-im.chat.views.message.datemark :refer [chat-datemark]] @@ -27,8 +27,8 @@ [status-im.chat.views.bottom-info :refer [bottom-info-view]] [status-im.chat.constants :as chat-const] [status-im.i18n :refer [label label-pluralize]] - [status-im.components.animation :as anim] - [status-im.components.sync-state.offline :refer [offline-view]] + [status-im.ui.components.animation :as anim] + [status-im.ui.components.sync-state.offline :refer [offline-view]] [status-im.constants :refer [content-type-status]] [taoensso.timbre :as log] [clojure.string :as str])) diff --git a/src/status_im/chat/sign_up.cljs b/src/status_im/chat/sign_up.cljs index d05a2df42d..dd25a87634 100644 --- a/src/status_im/chat/sign_up.cljs +++ b/src/status_im/chat/sign_up.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.sign-up (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [status-im.components.styles :refer [default-chat-color]] + [status-im.ui.components.styles :refer [default-chat-color]] [status-im.utils.random :as random] [status-im.constants :as const] [status-im.chat.constants :as chat-const] diff --git a/src/status_im/chat/styles/animations.cljs b/src/status_im/chat/styles/animations.cljs index 03f40336aa..3072eececf 100644 --- a/src/status_im/chat/styles/animations.cljs +++ b/src/status_im/chat/styles/animations.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.styles.animations - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def color-root-border "rgba(192, 198, 202, 0.28)") (def header-draggable-icon "rgba(73, 84, 93, 0.23)") diff --git a/src/status_im/chat/styles/input/box_header.cljs b/src/status_im/chat/styles/input/box_header.cljs index 42f564742f..4a5b05e2ab 100644 --- a/src/status_im/chat/styles/input/box_header.cljs +++ b/src/status_im/chat/styles/input/box_header.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.styles.input.box-header - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def header-height 33) diff --git a/src/status_im/chat/styles/input/emoji.cljs b/src/status_im/chat/styles/input/emoji.cljs index 724fd4f717..42cb7232a5 100644 --- a/src/status_im/chat/styles/input/emoji.cljs +++ b/src/status_im/chat/styles/input/emoji.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.styles.input.emoji - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def container-height 250) diff --git a/src/status_im/chat/styles/input/input.cljs b/src/status_im/chat/styles/input/input.cljs index 690c9868d4..d78437bc7d 100644 --- a/src/status_im/chat/styles/input/input.cljs +++ b/src/status_im/chat/styles/input/input.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.styles.input.input (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as common] + (:require [status-im.ui.components.styles :as common] [status-im.utils.platform :as platform] [taoensso.timbre :as log])) diff --git a/src/status_im/chat/styles/input/input_actions.cljs b/src/status_im/chat/styles/input/input_actions.cljs index 54e8a682bf..aaf40e894d 100644 --- a/src/status_im/chat/styles/input/input_actions.cljs +++ b/src/status_im/chat/styles/input/input_actions.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.styles.input.input-actions (:require-macros [status-im.utils.styles :refer [defnstyle]]) - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def actions-container {:flex-direction :row diff --git a/src/status_im/chat/styles/input/result_box.cljs b/src/status_im/chat/styles/input/result_box.cljs index 3793073cb8..93e5427dc9 100644 --- a/src/status_im/chat/styles/input/result_box.cljs +++ b/src/status_im/chat/styles/input/result_box.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.styles.input.result-box - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def color-root-border "rgba(192, 198, 202, 0.5)") diff --git a/src/status_im/chat/styles/input/suggestions.cljs b/src/status_im/chat/styles/input/suggestions.cljs index f67618e490..7e2a719ba6 100644 --- a/src/status_im/chat/styles/input/suggestions.cljs +++ b/src/status_im/chat/styles/input/suggestions.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.styles.input.suggestions (:require-macros [status-im.utils.styles :refer [defnstyle]]) - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def color-item-title-text "rgb(147, 155, 161)") (def color-item-suggestion-name "rgb(98, 143, 227)") diff --git a/src/status_im/chat/styles/input/validation_message.cljs b/src/status_im/chat/styles/input/validation_message.cljs index 5125912e05..9677559f51 100644 --- a/src/status_im/chat/styles/input/validation_message.cljs +++ b/src/status_im/chat/styles/input/validation_message.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.styles.input.validation-message (:require [status-im.chat.constants :as constants] - [status-im.components.styles :as common])) + [status-im.ui.components.styles :as common])) (defn root [bottom] {:flex-direction :column diff --git a/src/status_im/chat/styles/message/command_pill.cljs b/src/status_im/chat/styles/message/command_pill.cljs index 5043ee1323..0f0c5631d7 100644 --- a/src/status_im/chat/styles/message/command_pill.cljs +++ b/src/status_im/chat/styles/message/command_pill.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.styles.message.command-pill (:require [status-im.utils.platform :as p] - [status-im.components.styles :refer [color-white]])) + [status-im.ui.components.styles :refer [color-white]])) (defn pill [command] {:backgroundColor (:color command) diff --git a/src/status_im/chat/styles/message/datemark.cljs b/src/status_im/chat/styles/message/datemark.cljs index cc2aabfb15..1953439396 100644 --- a/src/status_im/chat/styles/message/datemark.cljs +++ b/src/status_im/chat/styles/message/datemark.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.styles.message.datemark - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def datemark-wrapper {:flex 1 diff --git a/src/status_im/chat/styles/message/message.cljs b/src/status_im/chat/styles/message/message.cljs index fac6c7f8e3..fa69f467fe 100644 --- a/src/status_im/chat/styles/message/message.cljs +++ b/src/status_im/chat/styles/message/message.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.styles.message.message (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :refer [color-white + (:require [status-im.ui.components.styles :refer [color-white color-black color-blue color-light-blue diff --git a/src/status_im/chat/styles/screen.cljs b/src/status_im/chat/styles/screen.cljs index 798677b8aa..b4ad457611 100644 --- a/src/status_im/chat/styles/screen.cljs +++ b/src/status_im/chat/styles/screen.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.styles.screen (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as component.styles])) + (:require [status-im.ui.components.styles :as component.styles])) (def chat-view {:flex 1 diff --git a/src/status_im/chat/views/actions.cljs b/src/status_im/chat/views/actions.cljs index 143a184ab1..9c987620dd 100644 --- a/src/status_im/chat/views/actions.cljs +++ b/src/status_im/chat/views/actions.cljs @@ -2,8 +2,8 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [status-im.chat.styles.screen :as styles] - [status-im.components.chat-icon.screen :as chat-icon.screen] - [status-im.components.react :as react] + [status-im.ui.components.chat-icon.screen :as chat-icon.screen] + [status-im.ui.components.react :as react] [status-im.i18n :as i18n] [status-im.utils.platform :as platform]) (:require-macros [status-im.utils.views :refer [defview letsubs]])) diff --git a/src/status_im/chat/views/api/choose_contact.cljs b/src/status_im/chat/views/api/choose_contact.cljs index 5d3d3e2f4f..a49f6120a3 100644 --- a/src/status_im/chat/views/api/choose_contact.cljs +++ b/src/status_im/chat/views/api/choose_contact.cljs @@ -2,12 +2,12 @@ (:require-macros [status-im.utils.views :refer [defview]]) (:require [reagent.core :as r] [re-frame.core :refer [dispatch subscribe]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text list-view list-item]] - [status-im.components.contact.contact :refer [contact-view]] - [status-im.components.renderers.renderers :as renderers] + [status-im.ui.components.contact.contact :refer [contact-view]] + [status-im.ui.components.renderers.renderers :as renderers] [status-im.utils.listview :as lw])) (defn render-row [arg-index bot-db-key] diff --git a/src/status_im/chat/views/api/geolocation/styles.cljs b/src/status_im/chat/views/api/geolocation/styles.cljs index c3882b21bb..c1eec87c51 100644 --- a/src/status_im/chat/views/api/geolocation/styles.cljs +++ b/src/status_im/chat/views/api/geolocation/styles.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.views.api.geolocation.styles - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (defn place-item-container [address] {:height (if address 74 52) diff --git a/src/status_im/chat/views/api/geolocation/views.cljs b/src/status_im/chat/views/api/geolocation/views.cljs index 9930290923..27f3a0a4e0 100644 --- a/src/status_im/chat/views/api/geolocation/views.cljs +++ b/src/status_im/chat/views/api/geolocation/views.cljs @@ -1,16 +1,16 @@ (ns status-im.chat.views.api.geolocation.views (:require-macros [status-im.utils.views :refer [defview letsubs]] [reagent.ratom :refer [reaction]]) - (:require [status-im.components.react :refer [view image text touchable-highlight]] + (:require [status-im.ui.components.react :refer [view image text touchable-highlight]] [reagent.core :as r] [goog.string :as gstr] [status-im.utils.utils :refer [http-get]] [status-im.utils.types :refer [json->clj]] [status-im.chat.views.api.geolocation.styles :as st] - [status-im.components.mapbox :refer [mapview]] + [status-im.ui.components.mapbox :refer [mapview]] [re-frame.core :refer [dispatch subscribe]] [status-im.i18n :refer [label]] - [status-im.components.react :as components])) + [status-im.ui.components.react :as components])) (def mapbox-api "https://api.mapbox.com/geocoding/v5/mapbox.places/") (def access-token "pk.eyJ1Ijoic3RhdHVzaW0iLCJhIjoiY2oydmtnZjRrMDA3czMzcW9kemR4N2lxayJ9.Rz8L6xdHBjfO8cR3CDf3Cw") diff --git a/src/status_im/chat/views/bottom_info.cljs b/src/status_im/chat/views/bottom_info.cljs index 742238b8e9..6c877dc8e2 100644 --- a/src/status_im/chat/views/bottom_info.cljs +++ b/src/status_im/chat/views/bottom_info.cljs @@ -2,7 +2,7 @@ (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] [reagent.core :as r] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view animated-view image text @@ -10,10 +10,10 @@ touchable-highlight list-view list-item]] - [status-im.components.chat-icon.screen :refer [chat-icon-view-menu-item]] + [status-im.ui.components.chat-icon.screen :refer [chat-icon-view-menu-item]] [status-im.chat.styles.screen :as st] [status-im.i18n :refer [label label-pluralize message-status-label]] - [status-im.components.animation :as anim] + [status-im.ui.components.animation :as anim] [status-im.utils.utils :refer [truncate-str]] [status-im.utils.identicon :refer [identicon]] [status-im.utils.listview :as lw] diff --git a/src/status_im/chat/views/input/animations/expandable.cljs b/src/status_im/chat/views/input/animations/expandable.cljs index 738a60fa73..a75b4e415d 100644 --- a/src/status_im/chat/views/input/animations/expandable.cljs +++ b/src/status_im/chat/views/input/animations/expandable.cljs @@ -3,9 +3,9 @@ (:require [reagent.core :as r] [reagent.impl.component :as rc] [re-frame.core :refer [dispatch subscribe]] - [status-im.components.animation :as anim] - [status-im.components.drag-drop :as drag] - [status-im.components.react :refer [view + [status-im.ui.components.animation :as anim] + [status-im.ui.components.drag-drop :as drag] + [status-im.ui.components.react :refer [view animated-view]] [status-im.chat.views.input.animations.responder :as resp] [status-im.chat.views.input.utils :as input-utils] diff --git a/src/status_im/chat/views/input/animations/responder.cljs b/src/status_im/chat/views/input/animations/responder.cljs index 4e5fb6daa1..f19a6c6e90 100644 --- a/src/status_im/chat/views/input/animations/responder.cljs +++ b/src/status_im/chat/views/input/animations/responder.cljs @@ -1,11 +1,11 @@ (ns status-im.chat.views.input.animations.responder - (:require [status-im.components.drag-drop :as drag] - [status-im.components.animation :as anim] + (:require [status-im.ui.components.drag-drop :as drag] + [status-im.ui.components.animation :as anim] [status-im.chat.views.input.utils :as input-utils] [re-frame.core :refer [dispatch]] [taoensso.timbre :as log] [status-im.utils.platform :as p] - [status-im.components.toolbar.styles :as toolbar-st])) + [status-im.ui.components.toolbar.styles :as toolbar-st])) ;; todo bad name. Ideas? (defn enough-dy [gesture] diff --git a/src/status_im/chat/views/input/box_header.cljs b/src/status_im/chat/views/input/box_header.cljs index bf59bbaf3c..41c01417de 100644 --- a/src/status_im/chat/views/input/box_header.cljs +++ b/src/status_im/chat/views/input/box_header.cljs @@ -1,7 +1,7 @@ (ns status-im.chat.views.input.box-header (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view touchable-highlight text icon]] diff --git a/src/status_im/chat/views/input/emoji.cljs b/src/status_im/chat/views/input/emoji.cljs index fc910f3a5f..0e8a1b3dad 100644 --- a/src/status_im/chat/views/input/emoji.cljs +++ b/src/status_im/chat/views/input/emoji.cljs @@ -1,7 +1,7 @@ (ns status-im.chat.views.input.emoji (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text icon emoji-picker]] diff --git a/src/status_im/chat/views/input/input.cljs b/src/status_im/chat/views/input/input.cljs index 3311f98699..23a749ebf5 100644 --- a/src/status_im/chat/views/input/input.cljs +++ b/src/status_im/chat/views/input/input.cljs @@ -14,8 +14,8 @@ [status-im.chat.views.input.result-box :as result-box] [status-im.chat.views.input.suggestions :as suggestions] [status-im.chat.views.input.validation-messages :as validation-messages] - [status-im.components.animation :as anim] - [status-im.components.react :refer [view + [status-im.ui.components.animation :as anim] + [status-im.ui.components.react :refer [view animated-view text icon @@ -23,7 +23,7 @@ text-input touchable-highlight dismiss-keyboard!]] - [status-im.components.icons.vector-icons :as vi] + [status-im.ui.components.icons.vector-icons :as vi] [status-im.i18n :as i18n] [status-im.utils.platform :as platform])) diff --git a/src/status_im/chat/views/input/input_actions.cljs b/src/status_im/chat/views/input/input_actions.cljs index 647c680e3a..c1aa3e45a8 100644 --- a/src/status_im/chat/views/input/input_actions.cljs +++ b/src/status_im/chat/views/input/input_actions.cljs @@ -4,7 +4,7 @@ [reagent.core :as r] [re-frame.core :refer [subscribe dispatch]] [taoensso.timbre :as log] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text icon touchable-highlight]] diff --git a/src/status_im/chat/views/input/result_box.cljs b/src/status_im/chat/views/input/result_box.cljs index 8fbd9d47ec..a4f0d5419a 100644 --- a/src/status_im/chat/views/input/result_box.cljs +++ b/src/status_im/chat/views/input/result_box.cljs @@ -1,14 +1,14 @@ (ns status-im.chat.views.input.result-box (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view scroll-view touchable-highlight text icon]] [status-im.chat.views.input.animations.expandable :refer [expandable-view]] [status-im.chat.views.input.box-header :as box-header] - [status-im.components.sync-state.offline :refer [offline-view]])) + [status-im.ui.components.sync-state.offline :refer [offline-view]])) (defview result-box-container [markup] [view {:flex 1} diff --git a/src/status_im/chat/views/input/suggestions.cljs b/src/status_im/chat/views/input/suggestions.cljs index eda8b91052..a555838048 100644 --- a/src/status_im/chat/views/input/suggestions.cljs +++ b/src/status_im/chat/views/input/suggestions.cljs @@ -1,7 +1,7 @@ (ns status-im.chat.views.input.suggestions (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view scroll-view touchable-highlight text diff --git a/src/status_im/chat/views/input/utils.cljs b/src/status_im/chat/views/input/utils.cljs index 566f5b3750..48cb2250e5 100644 --- a/src/status_im/chat/views/input/utils.cljs +++ b/src/status_im/chat/views/input/utils.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.views.input.utils (:require [taoensso.timbre :as log] - [status-im.components.toolbar.styles :as toolbar-st] + [status-im.ui.components.toolbar.styles :as toolbar-st] [status-im.utils.platform :as p])) (def min-height 19) diff --git a/src/status_im/chat/views/input/validation_messages.cljs b/src/status_im/chat/views/input/validation_messages.cljs index f580bc3e74..ac1f09717f 100644 --- a/src/status_im/chat/views/input/validation_messages.cljs +++ b/src/status_im/chat/views/input/validation_messages.cljs @@ -1,7 +1,7 @@ (ns status-im.chat.views.input.validation-messages (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :as re-frame] - [status-im.components.react :as c] + [status-im.ui.components.react :as c] [status-im.chat.styles.input.validation-message :as style] [status-im.utils.listview :as lw] [status-im.i18n :as i18n])) diff --git a/src/status_im/chat/views/input/web_view.cljs b/src/status_im/chat/views/input/web_view.cljs index c7a75eec29..b550d5dbe4 100644 --- a/src/status_im/chat/views/input/web_view.cljs +++ b/src/status_im/chat/views/input/web_view.cljs @@ -2,8 +2,8 @@ (:require-macros [status-im.utils.views :refer [defview]]) (:require [reagent.core :as r] [re-frame.core :refer [dispatch]] - [status-im.components.webview-bridge :refer [webview-bridge]] - [status-im.components.react :refer [view text] :as components] + [status-im.ui.components.webview-bridge :refer [webview-bridge]] + [status-im.ui.components.react :refer [view text] :as components] [status-im.native-module.core :as status] [status-im.i18n :refer [label]] [status-im.utils.js-resources :as js-res] diff --git a/src/status_im/chat/views/message/datemark.cljs b/src/status_im/chat/views/message/datemark.cljs index a350c8d0a1..8ed52f20a2 100644 --- a/src/status_im/chat/views/message/datemark.cljs +++ b/src/status_im/chat/views/message/datemark.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.views.message.datemark (:require [re-frame.core :refer [subscribe dispatch]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text]] [clojure.string :as str] [status-im.i18n :refer [label]] diff --git a/src/status_im/chat/views/message/message.cljs b/src/status_im/chat/views/message/message.cljs index e3d883ecee..80ce2f85ac 100644 --- a/src/status_im/chat/views/message/message.cljs +++ b/src/status_im/chat/views/message/message.cljs @@ -4,7 +4,7 @@ [clojure.walk :as walk] [reagent.core :as r] [status-im.i18n :refer [message-status-label]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text image icon @@ -14,8 +14,8 @@ autolink get-dimensions dismiss-keyboard!]] - [status-im.components.animation :as anim] - [status-im.components.list-selection :refer [share share-or-open-map]] + [status-im.ui.components.animation :as anim] + [status-im.ui.components.list-selection :refer [share share-or-open-map]] [status-im.chat.constants :as chat-consts] [status-im.chat.models.commands :as commands] [status-im.chat.styles.message.message :as st] @@ -29,7 +29,7 @@ content-type-status content-type-command content-type-command-request] :as c] - [status-im.components.chat-icon.screen :refer [chat-icon-message-status]] + [status-im.ui.components.chat-icon.screen :refer [chat-icon-message-status]] [status-im.utils.identicon :refer [identicon]] [status-im.utils.gfycat.core :refer [generate-gfy]] [status-im.utils.platform :as platform] diff --git a/src/status_im/chat/views/message/request_message.cljs b/src/status_im/chat/views/message/request_message.cljs index ea85066889..f86807dd9d 100644 --- a/src/status_im/chat/views/message/request_message.cljs +++ b/src/status_im/chat/views/message/request_message.cljs @@ -2,7 +2,7 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [subscribe dispatch]] [reagent.core :as r] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view animated-view text image @@ -10,7 +10,7 @@ touchable-highlight]] [status-im.chat.styles.message.message :as st] [status-im.chat.models.commands :as commands] - [status-im.components.animation :as anim] + [status-im.ui.components.animation :as anim] [taoensso.timbre :as log])) (def request-message-icon-scale-delay 600) diff --git a/src/status_im/chat/views/toolbar_content.cljs b/src/status_im/chat/views/toolbar_content.cljs index 53ad153b11..bf03635819 100644 --- a/src/status_im/chat/views/toolbar_content.cljs +++ b/src/status_im/chat/views/toolbar_content.cljs @@ -3,7 +3,7 @@ (:require [re-frame.core :refer [subscribe dispatch]] [clojure.string :as str] [cljs-time.core :as t] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text icon]] [status-im.i18n :refer [get-contact-translated diff --git a/src/status_im/commands/handlers/debug.cljs b/src/status_im/commands/handlers/debug.cljs index 6e1d664af6..fd2e4abed6 100644 --- a/src/status_im/commands/handlers/debug.cljs +++ b/src/status_im/commands/handlers/debug.cljs @@ -1,6 +1,6 @@ (ns status-im.commands.handlers.debug (:require [re-frame.core :as re-frame] - [status-im.components.react :as react] + [status-im.ui.components.react :as react] [status-im.data-store.accounts :as accounts] [status-im.data-store.messages :as messages] [status-im.utils.handlers :as handlers] diff --git a/src/status_im/commands/handlers/jail.cljs b/src/status_im/commands/handlers/jail.cljs index 618ba3f849..94eb7bda5f 100644 --- a/src/status_im/commands/handlers/jail.cljs +++ b/src/status_im/commands/handlers/jail.cljs @@ -5,7 +5,7 @@ [status-im.utils.types :refer [json->clj]] [status-im.commands.utils :refer [reg-handler]] [clojure.string :as s] - [status-im.components.react :as r] + [status-im.ui.components.react :as r] [status-im.constants :refer [console-chat-id]] [status-im.i18n :refer [get-contact-translated]] [taoensso.timbre :as log] diff --git a/src/status_im/commands/utils.cljs b/src/status_im/commands/utils.cljs index 265a0ef520..d3cdca6429 100644 --- a/src/status_im/commands/utils.cljs +++ b/src/status_im/commands/utils.cljs @@ -2,11 +2,11 @@ (:require [clojure.set :as set] [clojure.walk :as w] [re-frame.core :refer [dispatch trim-v]] - [status-im.components.react :as components] + [status-im.ui.components.react :as components] [status-im.chat.views.input.web-view :as chat-web-view] [status-im.chat.views.input.validation-messages :as chat-validation-messages] [status-im.chat.views.api.choose-contact :as choose-contact] - [status-im.components.qr-code :as qr] + [status-im.ui.components.qr-code :as qr] [status-im.chat.views.api.geolocation.views :as geolocation] [status-im.utils.handlers :refer [register-handler]] [taoensso.timbre :as log])) diff --git a/src/status_im/data_store/realm/schemas/account/v1/chat.cljs b/src/status_im/data_store/realm/schemas/account/v1/chat.cljs index c84f57c819..0dd367e62f 100644 --- a/src/status_im/data_store/realm/schemas/account/v1/chat.cljs +++ b/src/status_im/data_store/realm/schemas/account/v1/chat.cljs @@ -1,6 +1,6 @@ (ns status-im.data-store.realm.schemas.account.v1.chat (:require [taoensso.timbre :as log] - [status-im.components.styles :refer [default-chat-color]])) + [status-im.ui.components.styles :refer [default-chat-color]])) (def schema {:name :chat :primaryKey :chat-id diff --git a/src/status_im/data_store/realm/schemas/account/v11/chat.cljs b/src/status_im/data_store/realm/schemas/account/v11/chat.cljs index 660ab2f933..f1fd6378e2 100644 --- a/src/status_im/data_store/realm/schemas/account/v11/chat.cljs +++ b/src/status_im/data_store/realm/schemas/account/v11/chat.cljs @@ -1,6 +1,6 @@ (ns status-im.data-store.realm.schemas.account.v11.chat (:require [taoensso.timbre :as log] - [status-im.components.styles :refer [default-chat-color]])) + [status-im.ui.components.styles :refer [default-chat-color]])) (def schema {:name :chat :primaryKey :chat-id diff --git a/src/status_im/data_store/realm/schemas/account/v2/chat.cljs b/src/status_im/data_store/realm/schemas/account/v2/chat.cljs index 028f7305e6..67e0cd2fc8 100644 --- a/src/status_im/data_store/realm/schemas/account/v2/chat.cljs +++ b/src/status_im/data_store/realm/schemas/account/v2/chat.cljs @@ -1,6 +1,6 @@ (ns status-im.data-store.realm.schemas.account.v2.chat (:require [taoensso.timbre :as log] - [status-im.components.styles :refer [default-chat-color]])) + [status-im.ui.components.styles :refer [default-chat-color]])) (def schema {:name :chat :primaryKey :chat-id diff --git a/src/status_im/data_store/realm/schemas/account/v3/chat.cljs b/src/status_im/data_store/realm/schemas/account/v3/chat.cljs index 780b2e164b..125b076a78 100644 --- a/src/status_im/data_store/realm/schemas/account/v3/chat.cljs +++ b/src/status_im/data_store/realm/schemas/account/v3/chat.cljs @@ -1,6 +1,6 @@ (ns status-im.data-store.realm.schemas.account.v3.chat (:require [taoensso.timbre :as log] - [status-im.components.styles :refer [default-chat-color]])) + [status-im.ui.components.styles :refer [default-chat-color]])) (def schema {:name :chat :primaryKey :chat-id diff --git a/src/status_im/data_store/realm/schemas/account/v4/chat.cljs b/src/status_im/data_store/realm/schemas/account/v4/chat.cljs index d5cbf88ce4..ce88653e45 100644 --- a/src/status_im/data_store/realm/schemas/account/v4/chat.cljs +++ b/src/status_im/data_store/realm/schemas/account/v4/chat.cljs @@ -1,6 +1,6 @@ (ns status-im.data-store.realm.schemas.account.v4.chat (:require [taoensso.timbre :as log] - [status-im.components.styles :refer [default-chat-color]])) + [status-im.ui.components.styles :refer [default-chat-color]])) (def schema {:name :chat :primaryKey :chat-id diff --git a/src/status_im/debug/handlers.cljs b/src/status_im/debug/handlers.cljs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/status_im/ios/core.cljs b/src/status_im/ios/core.cljs index 3d99905655..7e3f37eec2 100644 --- a/src/status_im/ios/core.cljs +++ b/src/status_im/ios/core.cljs @@ -7,7 +7,7 @@ status-im.ui.screens.subs status-im.data-store.core [status-im.ui.screens.views :as views] - [status-im.components.react :as react] + [status-im.ui.components.react :as react] [status-im.native-module.core :as status] [status-im.utils.error-handler :as error-handler] [status-im.utils.utils :as utils] diff --git a/src/status_im/ios/platform.cljs b/src/status_im/ios/platform.cljs index c649a33c4b..ff29541422 100644 --- a/src/status_im/ios/platform.cljs +++ b/src/status_im/ios/platform.cljs @@ -1,5 +1,5 @@ (ns status-im.ios.platform - (:require [status-im.components.styles :as styles] + (:require [status-im.ui.components.styles :as styles] [status-im.i18n :refer [label]] [status-im.utils.utils :as utils] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/native_module/impl/module.cljs b/src/status_im/native_module/impl/module.cljs index a4debf1e38..97f75fa8d9 100644 --- a/src/status_im/native_module/impl/module.cljs +++ b/src/status_im/native_module/impl/module.cljs @@ -1,7 +1,7 @@ (ns status-im.native-module.impl.module (:require-macros [cljs.core.async.macros :as async :refer [go-loop go]]) - (:require [status-im.components.react :as r] + (:require [status-im.ui.components.react :as r] [re-frame.core :refer [dispatch]] [taoensso.timbre :as log] [cljs.core.async :as async :refer [ jail-result types/json->clj - (assoc :bot-id jail-id))] + (assoc :bot-id jail-id))] (callback result)))] (.callJail status jail-id (types/clj->json path) (types/clj->json params') cb)))))) diff --git a/src/status_im/network/net_info.cljs b/src/status_im/network/net_info.cljs index 9559c10f91..0f2ccfcca3 100644 --- a/src/status_im/network/net_info.cljs +++ b/src/status_im/network/net_info.cljs @@ -1,6 +1,6 @@ (ns status-im.network.net-info (:require [taoensso.timbre :as log] - [status-im.components.react :as react-components])) + [status-im.ui.components.react :as react-components])) (defn init [callback] (when react-components/net-info diff --git a/src/status_im/components/action_button/action_button.cljs b/src/status_im/ui/components/action_button/action_button.cljs similarity index 69% rename from src/status_im/components/action_button/action_button.cljs rename to src/status_im/ui/components/action_button/action_button.cljs index b712cb1b4c..cbf447fe75 100644 --- a/src/status_im/components/action_button/action_button.cljs +++ b/src/status_im/ui/components/action_button/action_button.cljs @@ -1,8 +1,8 @@ -(ns status-im.components.action-button.action-button - (:require [status-im.components.action-button.styles :as st] - [status-im.components.common.common :refer [list-separator]] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.react :as rn])) +(ns status-im.ui.components.action-button.action-button + (:require [status-im.ui.components.action-button.styles :as st] + [status-im.ui.components.common.common :refer [list-separator]] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.react :as rn])) (defn action-button [{:keys [label icon icon-opts on-press label-style cyrcle-color]}] [rn/touchable-highlight {:on-press on-press} diff --git a/src/status_im/components/action_button/styles.cljs b/src/status_im/ui/components/action_button/styles.cljs similarity index 93% rename from src/status_im/components/action_button/styles.cljs rename to src/status_im/ui/components/action_button/styles.cljs index 6b34b8d718..36059446c9 100644 --- a/src/status_im/components/action_button/styles.cljs +++ b/src/status_im/ui/components/action_button/styles.cljs @@ -1,7 +1,7 @@ -(ns status-im.components.action-button.styles +(ns status-im.ui.components.action-button.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) (:require [status-im.utils.platform :as p] - [status-im.components.styles :refer [color-white + [status-im.ui.components.styles :refer [color-white color-light-blue-transparent color-light-blue color-light-gray diff --git a/src/status_im/components/animation.cljs b/src/status_im/ui/components/animation.cljs similarity index 89% rename from src/status_im/components/animation.cljs rename to src/status_im/ui/components/animation.cljs index dc1a66a3e5..7c4eba0e91 100644 --- a/src/status_im/components/animation.cljs +++ b/src/status_im/ui/components/animation.cljs @@ -1,5 +1,5 @@ -(ns status-im.components.animation - (:require [status-im.components.react :refer [animated]])) +(ns status-im.ui.components.animation + (:require [status-im.ui.components.react :refer [animated]])) (defn start ([anim] (.start anim)) diff --git a/src/status_im/components/button/styles.cljs b/src/status_im/ui/components/button/styles.cljs similarity index 94% rename from src/status_im/components/button/styles.cljs rename to src/status_im/ui/components/button/styles.cljs index 7c003554a8..277137ce23 100644 --- a/src/status_im/components/button/styles.cljs +++ b/src/status_im/ui/components/button/styles.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.button.styles +(ns status-im.ui.components.button.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as styles] + (:require [status-im.ui.components.styles :as styles] [status-im.utils.platform :as platform])) (def border-color styles/color-white-transparent-3) diff --git a/src/status_im/components/button/view.cljs b/src/status_im/ui/components/button/view.cljs similarity index 90% rename from src/status_im/components/button/view.cljs rename to src/status_im/ui/components/button/view.cljs index 88c4ccddb6..9b92dded55 100644 --- a/src/status_im/components/button/view.cljs +++ b/src/status_im/ui/components/button/view.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.button.view - (:require [status-im.components.button.styles :as button.styles] - [status-im.components.react :as react] +(ns status-im.ui.components.button.view + (:require [status-im.ui.components.button.styles :as button.styles] + [status-im.ui.components.react :as react] [status-im.utils.platform :as platform])) (defn button-text [{:keys [disabled? text-style]} label] diff --git a/src/status_im/components/camera.cljs b/src/status_im/ui/components/camera.cljs similarity index 94% rename from src/status_im/components/camera.cljs rename to src/status_im/ui/components/camera.cljs index e5a6337133..4232455d76 100644 --- a/src/status_im/components/camera.cljs +++ b/src/status_im/ui/components/camera.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.camera +(ns status-im.ui.components.camera (:require [reagent.core :as r] [clojure.walk :refer [keywordize-keys]] [status-im.utils.platform :as platform] diff --git a/src/status_im/components/carousel/carousel.cljs b/src/status_im/ui/components/carousel/carousel.cljs similarity index 97% rename from src/status_im/components/carousel/carousel.cljs rename to src/status_im/ui/components/carousel/carousel.cljs index 7f0ae9ccd7..66435f0fb3 100644 --- a/src/status_im/components/carousel/carousel.cljs +++ b/src/status_im/ui/components/carousel/carousel.cljs @@ -1,12 +1,12 @@ -(ns status-im.components.carousel.carousel +(ns status-im.ui.components.carousel.carousel (:require [reagent.impl.component :as rc] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view scroll-view touchable-without-feedback text]] - [status-im.components.carousel.styles :as st] + [status-im.ui.components.carousel.styles :as st] [taoensso.timbre :as log] - [status-im.components.react :as r] + [status-im.ui.components.react :as r] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/components/carousel/styles.cljs b/src/status_im/ui/components/carousel/styles.cljs similarity index 92% rename from src/status_im/components/carousel/styles.cljs rename to src/status_im/ui/components/carousel/styles.cljs index 81d80efeac..c5db11ff3a 100644 --- a/src/status_im/components/carousel/styles.cljs +++ b/src/status_im/ui/components/carousel/styles.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.carousel.styles) +(ns status-im.ui.components.carousel.styles) (def scroll-view-container {:flex 1}) diff --git a/src/status_im/components/chat_icon/screen.cljs b/src/status_im/ui/components/chat_icon/screen.cljs similarity index 96% rename from src/status_im/components/chat_icon/screen.cljs rename to src/status_im/ui/components/chat_icon/screen.cljs index 12cf7eaf52..fd2b368d0b 100644 --- a/src/status_im/components/chat_icon/screen.cljs +++ b/src/status_im/ui/components/chat_icon/screen.cljs @@ -1,11 +1,11 @@ -(ns status-im.components.chat-icon.screen +(ns status-im.ui.components.chat-icon.screen (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text image]] - [status-im.components.chat-icon.styles :as st] - [status-im.components.styles :refer [default-chat-color]] + [status-im.ui.components.chat-icon.styles :as st] + [status-im.ui.components.styles :refer [default-chat-color]] [status-im.react-native.resources :as resources] [status-im.constants :refer [console-chat-id]] [clojure.string :as s])) diff --git a/src/status_im/components/chat_icon/styles.cljs b/src/status_im/ui/components/chat_icon/styles.cljs similarity index 98% rename from src/status_im/components/chat_icon/styles.cljs rename to src/status_im/ui/components/chat_icon/styles.cljs index 0faf00a594..8d651a0d13 100644 --- a/src/status_im/components/chat_icon/styles.cljs +++ b/src/status_im/ui/components/chat_icon/styles.cljs @@ -1,5 +1,5 @@ -(ns status-im.components.chat-icon.styles - (:require [status-im.components.styles :refer [color-white +(ns status-im.ui.components.chat-icon.styles + (:require [status-im.ui.components.styles :refer [color-white online-color]] [status-im.utils.platform :as p])) diff --git a/src/status_im/components/checkbox/styles.cljs b/src/status_im/ui/components/checkbox/styles.cljs similarity index 82% rename from src/status_im/components/checkbox/styles.cljs rename to src/status_im/ui/components/checkbox/styles.cljs index 9415d207f4..2b3e3e162d 100644 --- a/src/status_im/components/checkbox/styles.cljs +++ b/src/status_im/ui/components/checkbox/styles.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.checkbox.styles +(ns status-im.ui.components.checkbox.styles (:require-macros [status-im.utils.styles :refer [defnstyle]]) - (:require [status-im.components.styles :as st])) + (:require [status-im.ui.components.styles :as st])) (defnstyle icon-check-container [checked?] {:background-color (if checked? st/color-light-blue st/color-gray5) diff --git a/src/status_im/components/checkbox/view.cljs b/src/status_im/ui/components/checkbox/view.cljs similarity index 54% rename from src/status_im/components/checkbox/view.cljs rename to src/status_im/ui/components/checkbox/view.cljs index 0fdbdd7bb0..13767ae057 100644 --- a/src/status_im/components/checkbox/view.cljs +++ b/src/status_im/ui/components/checkbox/view.cljs @@ -1,7 +1,7 @@ -(ns status-im.components.checkbox.view +(ns status-im.ui.components.checkbox.view (:require [cljs.spec.alpha :as s] - [status-im.components.checkbox.styles :as cst] - [status-im.components.react :as rn] + [status-im.ui.components.checkbox.styles :as cst] + [status-im.ui.components.react :as rn] [status-im.utils.platform :as p])) (defn checkbox [{:keys [on-press checked?]}] diff --git a/src/status_im/components/common/common.cljs b/src/status_im/ui/components/common/common.cljs similarity index 87% rename from src/status_im/components/common/common.cljs rename to src/status_im/ui/components/common/common.cljs index b003eeac94..c0e829bf81 100644 --- a/src/status_im/components/common/common.cljs +++ b/src/status_im/ui/components/common/common.cljs @@ -1,10 +1,10 @@ -(ns status-im.components.common.common +(ns status-im.ui.components.common.common (:require-macros [status-im.utils.views :refer [defview letsubs]]) - (:require [status-im.components.react :as react] - [status-im.components.icons.vector-icons :as vector-icons] - [status-im.components.context-menu :refer [context-menu]] + (:require [status-im.ui.components.react :as react] + [status-im.ui.components.icons.vector-icons :as vector-icons] + [status-im.ui.components.context-menu :refer [context-menu]] [status-im.utils.platform :as platform] - [status-im.components.common.styles :as styles] + [status-im.ui.components.common.styles :as styles] [status-im.i18n :as i18n])) (defn top-shadow [] diff --git a/src/status_im/components/common/styles.cljs b/src/status_im/ui/components/common/styles.cljs similarity index 95% rename from src/status_im/components/common/styles.cljs rename to src/status_im/ui/components/common/styles.cljs index 40114232a2..ac5c851300 100644 --- a/src/status_im/components/common/styles.cljs +++ b/src/status_im/ui/components/common/styles.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.common.styles +(ns status-im.ui.components.common.styles (:require-macros [status-im.utils.styles :refer [defstyle]]) - (:require [status-im.components.styles :as styles])) + (:require [status-im.ui.components.styles :as styles])) (def gradient-top {:flexDirection :row diff --git a/src/status_im/components/contact/contact.cljs b/src/status_im/ui/components/contact/contact.cljs similarity index 82% rename from src/status_im/components/contact/contact.cljs rename to src/status_im/ui/components/contact/contact.cljs index 47b1afcad6..6d2dafac9b 100644 --- a/src/status_im/components/contact/contact.cljs +++ b/src/status_im/ui/components/contact/contact.cljs @@ -1,10 +1,10 @@ -(ns status-im.components.contact.contact +(ns status-im.ui.components.contact.contact (:require-macros [status-im.utils.views :refer [defview]]) - (:require [status-im.components.react :refer [view touchable-highlight text]] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.chat-icon.screen :refer [contact-icon-contacts-tab]] - [status-im.components.context-menu :refer [context-menu]] - [status-im.components.contact.styles :as st] + (:require [status-im.ui.components.react :refer [view touchable-highlight text]] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.chat-icon.screen :refer [contact-icon-contacts-tab]] + [status-im.ui.components.context-menu :refer [context-menu]] + [status-im.ui.components.contact.styles :as st] [status-im.utils.gfycat.core :refer [generate-gfy]] [status-im.i18n :refer [get-contact-translated label]])) diff --git a/src/status_im/components/contact/styles.cljs b/src/status_im/ui/components/contact/styles.cljs similarity index 94% rename from src/status_im/components/contact/styles.cljs rename to src/status_im/ui/components/contact/styles.cljs index 933343c626..f43b8f7b7e 100644 --- a/src/status_im/components/contact/styles.cljs +++ b/src/status_im/ui/components/contact/styles.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.contact.styles +(ns status-im.ui.components.contact.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as common] + (:require [status-im.ui.components.styles :as common] [status-im.utils.platform])) (defstyle contact-inner-container diff --git a/src/status_im/components/context_menu.cljs b/src/status_im/ui/components/context_menu.cljs similarity index 94% rename from src/status_im/components/context_menu.cljs rename to src/status_im/ui/components/context_menu.cljs index 750b7363ac..86ca9b71c9 100644 --- a/src/status_im/components/context_menu.cljs +++ b/src/status_im/ui/components/context_menu.cljs @@ -1,8 +1,8 @@ -(ns status-im.components.context-menu +(ns status-im.ui.components.context-menu (:require [reagent.core :as r] - [status-im.components.styles :as st] + [status-im.ui.components.styles :as st] [status-im.utils.platform :refer [platform-specific ios?]] - [status-im.components.react :as rn] + [status-im.ui.components.react :as rn] [status-im.react-native.js-dependencies :as rn-dependencies])) (defn- get-property [name] diff --git a/src/status_im/components/drag_drop.cljs b/src/status_im/ui/components/drag_drop.cljs similarity index 75% rename from src/status_im/components/drag_drop.cljs rename to src/status_im/ui/components/drag_drop.cljs index bc5f40e571..aae5e18acc 100644 --- a/src/status_im/components/drag_drop.cljs +++ b/src/status_im/ui/components/drag_drop.cljs @@ -1,5 +1,5 @@ -(ns status-im.components.drag-drop - (:require [status-im.components.react :refer [animated pan-responder]])) +(ns status-im.ui.components.drag-drop + (:require [status-im.ui.components.react :refer [animated pan-responder]])) (defn pan-handlers [pan-responder] (js->clj (.-panHandlers pan-responder))) diff --git a/src/status_im/components/drawer/styles.cljs b/src/status_im/ui/components/drawer/styles.cljs similarity index 97% rename from src/status_im/components/drawer/styles.cljs rename to src/status_im/ui/components/drawer/styles.cljs index 2263cbf9fa..ff2aa73936 100644 --- a/src/status_im/components/drawer/styles.cljs +++ b/src/status_im/ui/components/drawer/styles.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.drawer.styles +(ns status-im.ui.components.drawer.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def drawer {:flex 1 diff --git a/src/status_im/components/drawer/view.cljs b/src/status_im/ui/components/drawer/view.cljs similarity index 92% rename from src/status_im/components/drawer/view.cljs rename to src/status_im/ui/components/drawer/view.cljs index f76edab031..01a01ea6e7 100644 --- a/src/status_im/components/drawer/view.cljs +++ b/src/status_im/ui/components/drawer/view.cljs @@ -1,14 +1,14 @@ -(ns status-im.components.drawer.view +(ns status-im.ui.components.drawer.view (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [cljs.spec.alpha :as s] [clojure.string :as str] [reagent.core :as r] [re-frame.core :as rf] - [status-im.components.chat-icon.screen :as ci] - [status-im.components.common.common :as common] - [status-im.components.context-menu :as context-menu] - [status-im.components.drawer.styles :as st] - [status-im.components.react :refer [view + [status-im.ui.components.chat-icon.screen :as ci] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.context-menu :as context-menu] + [status-im.ui.components.drawer.styles :as st] + [status-im.ui.components.react :refer [view text text-input list-item @@ -18,8 +18,8 @@ touchable-highlight touchable-opacity dismiss-keyboard!]] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.status-view.view :as status-view] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.status-view.view :as status-view] [status-im.i18n :as i18n] [status-im.ui.screens.profile.db :as profile.db] [status-im.utils.datetime :as time] diff --git a/src/status_im/components/icons/custom_icons.cljs b/src/status_im/ui/components/icons/custom_icons.cljs similarity index 80% rename from src/status_im/components/icons/custom_icons.cljs rename to src/status_im/ui/components/icons/custom_icons.cljs index e9ece8c50b..e1e66dc73a 100644 --- a/src/status_im/components/icons/custom_icons.cljs +++ b/src/status_im/ui/components/icons/custom_icons.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.icons.custom-icons +(ns status-im.ui.components.icons.custom-icons (:require [reagent.core :as r] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/components/icons/vector_icons.cljs b/src/status_im/ui/components/icons/vector_icons.cljs similarity index 96% rename from src/status_im/components/icons/vector_icons.cljs rename to src/status_im/ui/components/icons/vector_icons.cljs index 0701a42b88..a52aa232b8 100644 --- a/src/status_im/components/icons/vector_icons.cljs +++ b/src/status_im/ui/components/icons/vector_icons.cljs @@ -1,9 +1,9 @@ -(ns status-im.components.icons.vector-icons +(ns status-im.ui.components.icons.vector-icons (:require-macros [status-im.utils.slurp :refer [slurp-svg]]) (:require [reagent.core :as reagent] [status-im.utils.platform :as platform] - [status-im.components.styles :as styles] - [status-im.components.react :as react] + [status-im.ui.components.styles :as styles] + [status-im.ui.components.react :as react] [status-im.react-native.js-dependencies :as rn-dependencies])) (defn get-property [name] diff --git a/src/status_im/components/image_button/styles.cljs b/src/status_im/ui/components/image_button/styles.cljs similarity index 82% rename from src/status_im/components/image_button/styles.cljs rename to src/status_im/ui/components/image_button/styles.cljs index 32905a9f66..48642b3b26 100644 --- a/src/status_im/components/image_button/styles.cljs +++ b/src/status_im/ui/components/image_button/styles.cljs @@ -1,5 +1,5 @@ -(ns status-im.components.image-button.styles - (:require [status-im.components.styles :refer [color-blue]])) +(ns status-im.ui.components.image-button.styles + (:require [status-im.ui.components.styles :refer [color-blue]])) (def image-button {:position :absolute diff --git a/src/status_im/components/image_button/view.cljs b/src/status_im/ui/components/image_button/view.cljs similarity index 69% rename from src/status_im/components/image_button/view.cljs rename to src/status_im/ui/components/image_button/view.cljs index ac2c599e9c..ae717a9326 100644 --- a/src/status_im/components/image_button/view.cljs +++ b/src/status_im/ui/components/image_button/view.cljs @@ -1,13 +1,13 @@ -(ns status-im.components.image-button.view +(ns status-im.ui.components.image-button.view (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text image touchable-highlight]] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.styles :refer [icon-scan]] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.styles :refer [icon-scan]] [status-im.i18n :refer [label]] - [status-im.components.image-button.styles :as st])) + [status-im.ui.components.image-button.styles :as st])) (defn image-button [{:keys [value style handler]}] [view st/image-button diff --git a/src/status_im/components/invertible_scroll_view.cljs b/src/status_im/ui/components/invertible_scroll_view.cljs similarity index 84% rename from src/status_im/components/invertible_scroll_view.cljs rename to src/status_im/ui/components/invertible_scroll_view.cljs index d7b00172d3..1f4722353f 100644 --- a/src/status_im/components/invertible_scroll_view.cljs +++ b/src/status_im/ui/components/invertible_scroll_view.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.invertible-scroll-view +(ns status-im.ui.components.invertible-scroll-view (:require [reagent.core :as r] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/components/item_checkbox.cljs b/src/status_im/ui/components/item_checkbox.cljs similarity index 78% rename from src/status_im/components/item_checkbox.cljs rename to src/status_im/ui/components/item_checkbox.cljs index 7bb8c02e23..0b817a3fa9 100644 --- a/src/status_im/components/item_checkbox.cljs +++ b/src/status_im/ui/components/item_checkbox.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.item-checkbox +(ns status-im.ui.components.item-checkbox (:require [reagent.core :as r] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/components/list/styles.cljs b/src/status_im/ui/components/list/styles.cljs similarity index 93% rename from src/status_im/components/list/styles.cljs rename to src/status_im/ui/components/list/styles.cljs index 587704bf21..59c23f27b8 100644 --- a/src/status_im/components/list/styles.cljs +++ b/src/status_im/ui/components/list/styles.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.list.styles +(ns status-im.ui.components.list.styles (:require-macros [status-im.utils.styles :refer [defstyle]]) - (:require [status-im.components.styles :as styles] + (:require [status-im.ui.components.styles :as styles] [status-im.utils.platform :as platform])) (def item diff --git a/src/status_im/components/list/views.cljs b/src/status_im/ui/components/list/views.cljs similarity index 95% rename from src/status_im/components/list/views.cljs rename to src/status_im/ui/components/list/views.cljs index 430fea47d8..f5835e88d6 100644 --- a/src/status_im/components/list/views.cljs +++ b/src/status_im/ui/components/list/views.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.list.views +(ns status-im.ui.components.list.views " Wrapper for react-native list components. @@ -19,9 +19,9 @@ [section-list {:sections [{:title \"\" :key :unik :render-fn render :data {:title \"\" :subtitle \"\"}}]}] " (:require [reagent.core :as r] - [status-im.components.list.styles :as lst] - [status-im.components.react :as rn] - [status-im.components.icons.vector-icons :as vi] + [status-im.ui.components.list.styles :as lst] + [status-im.ui.components.react :as rn] + [status-im.ui.components.icons.vector-icons :as vi] [status-im.utils.platform :as p])) (def flat-list-class (rn/get-class "FlatList")) diff --git a/src/status_im/components/list_selection.cljs b/src/status_im/ui/components/list_selection.cljs similarity index 96% rename from src/status_im/components/list_selection.cljs rename to src/status_im/ui/components/list_selection.cljs index b01cb63801..f0500ee917 100644 --- a/src/status_im/components/list_selection.cljs +++ b/src/status_im/ui/components/list_selection.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.list-selection +(ns status-im.ui.components.list-selection (:require [re-frame.core :refer [dispatch]] - [status-im.components.react :refer [copy-to-clipboard + [status-im.ui.components.react :refer [copy-to-clipboard sharing linking]] [status-im.utils.platform :refer [platform-specific ios?]] diff --git a/src/status_im/components/mapbox.cljs b/src/status_im/ui/components/mapbox.cljs similarity index 78% rename from src/status_im/components/mapbox.cljs rename to src/status_im/ui/components/mapbox.cljs index fdde7df033..012333c722 100644 --- a/src/status_im/components/mapbox.cljs +++ b/src/status_im/ui/components/mapbox.cljs @@ -1,10 +1,10 @@ -(ns status-im.components.mapbox +(ns status-im.ui.components.mapbox (:require [reagent.core :as r] - [status-im.components.styles :as common] + [status-im.ui.components.styles :as common] [status-im.i18n :refer [label]] [status-im.utils.platform :refer [platform-specific ios?]] [re-frame.core :refer [dispatch]] - [status-im.components.react :refer [view touchable-highlight text]] + [status-im.ui.components.react :refer [view touchable-highlight text]] [status-im.react-native.js-dependencies :as rn-dependencies])) (defn get-property [name] diff --git a/src/status_im/components/native_action_button.cljs b/src/status_im/ui/components/native_action_button.cljs similarity index 86% rename from src/status_im/components/native_action_button.cljs rename to src/status_im/ui/components/native_action_button.cljs index 07a484b689..4246fa836f 100644 --- a/src/status_im/components/native_action_button.cljs +++ b/src/status_im/ui/components/native_action_button.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.native-action-button +(ns status-im.ui.components.native-action-button (:require [reagent.core :as r] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/components/nfc.cljs b/src/status_im/ui/components/nfc.cljs similarity index 96% rename from src/status_im/components/nfc.cljs rename to src/status_im/ui/components/nfc.cljs index 957bab5de0..fab1ed14b9 100644 --- a/src/status_im/components/nfc.cljs +++ b/src/status_im/ui/components/nfc.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.nfc +(ns status-im.ui.components.nfc (:require [cljs.spec.alpha :as s] [status-im.utils.platform :as platform] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/components/permissions.cljs b/src/status_im/ui/components/permissions.cljs similarity index 96% rename from src/status_im/components/permissions.cljs rename to src/status_im/ui/components/permissions.cljs index f440f0fd6f..d7f9f3c40a 100644 --- a/src/status_im/components/permissions.cljs +++ b/src/status_im/ui/components/permissions.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.permissions +(ns status-im.ui.components.permissions (:require [status-im.utils.platform :as platform] [taoensso.timbre :as log] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/components/qr_code.cljs b/src/status_im/ui/components/qr_code.cljs similarity index 86% rename from src/status_im/components/qr_code.cljs rename to src/status_im/ui/components/qr_code.cljs index 300629786d..dc860dcda5 100644 --- a/src/status_im/components/qr_code.cljs +++ b/src/status_im/ui/components/qr_code.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.qr-code +(ns status-im.ui.components.qr-code (:require [reagent.core :as r] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/components/react.cljs b/src/status_im/ui/components/react.cljs similarity index 98% rename from src/status_im/components/react.cljs rename to src/status_im/ui/components/react.cljs index fe63e8228d..a941c7cecf 100644 --- a/src/status_im/components/react.cljs +++ b/src/status_im/ui/components/react.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.react +(ns status-im.ui.components.react (:require [reagent.core :as r] - [status-im.components.styles :as st] + [status-im.ui.components.styles :as st] [status-im.utils.utils :as u] [status-im.utils.platform :refer [platform-specific ios?]] [status-im.i18n :as i18n] diff --git a/src/status_im/components/renderers/renderers.cljs b/src/status_im/ui/components/renderers/renderers.cljs similarity index 58% rename from src/status_im/components/renderers/renderers.cljs rename to src/status_im/ui/components/renderers/renderers.cljs index ddf3c8d650..f9a4f2a848 100644 --- a/src/status_im/components/renderers/renderers.cljs +++ b/src/status_im/ui/components/renderers/renderers.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.renderers.renderers - (:require [status-im.components.react :refer [list-item]] - [status-im.components.common.common :as common])) +(ns status-im.ui.components.renderers.renderers + (:require [status-im.ui.components.react :refer [list-item]] + [status-im.ui.components.common.common :as common])) (defn list-separator-renderer [_ row-id _] (list-item diff --git a/src/status_im/components/sortable_list_view.cljs b/src/status_im/ui/components/sortable_list_view.cljs similarity index 88% rename from src/status_im/components/sortable_list_view.cljs rename to src/status_im/ui/components/sortable_list_view.cljs index 72feeb884d..12eb009425 100644 --- a/src/status_im/components/sortable_list_view.cljs +++ b/src/status_im/ui/components/sortable_list_view.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.sortable-list-view +(ns status-im.ui.components.sortable-list-view (:require [reagent.core :as r] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view touchable-highlight list-item]] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/components/status_bar.cljs b/src/status_im/ui/components/status_bar.cljs similarity index 81% rename from src/status_im/components/status_bar.cljs rename to src/status_im/ui/components/status_bar.cljs index 5403b62d01..e97fd4be2a 100644 --- a/src/status_im/components/status_bar.cljs +++ b/src/status_im/ui/components/status_bar.cljs @@ -1,5 +1,5 @@ -(ns status-im.components.status-bar - (:require [status-im.components.react :as ui] +(ns status-im.ui.components.status-bar + (:require [status-im.ui.components.react :as ui] [status-im.utils.platform :refer [platform-specific]])) (defn status-bar [{type :type diff --git a/src/status_im/components/status_view/view.cljs b/src/status_im/ui/components/status_view/view.cljs similarity index 84% rename from src/status_im/components/status_view/view.cljs rename to src/status_im/ui/components/status_view/view.cljs index cdd104e721..fbe9a9b3a1 100644 --- a/src/status_im/components/status_view/view.cljs +++ b/src/status_im/ui/components/status_view/view.cljs @@ -1,10 +1,10 @@ -(ns status-im.components.status-view.view +(ns status-im.ui.components.status-view.view (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch]] [clojure.string :as str] - [status-im.components.react :refer [view text]] + [status-im.ui.components.react :refer [view text]] [status-im.utils.platform :refer [platform-specific]] - [status-im.components.styles :refer [color-blue color-black color-blue4-faded]] + [status-im.ui.components.styles :refer [color-blue color-black color-blue4-faded]] [status-im.utils.utils :refer [hash-tag?]])) (defn tag-view [tag] diff --git a/src/status_im/components/sticky_button.cljs b/src/status_im/ui/components/sticky_button.cljs similarity index 85% rename from src/status_im/components/sticky_button.cljs rename to src/status_im/ui/components/sticky_button.cljs index 398af4ebdf..fd6d95c353 100644 --- a/src/status_im/components/sticky_button.cljs +++ b/src/status_im/ui/components/sticky_button.cljs @@ -1,9 +1,9 @@ -(ns status-im.components.sticky-button +(ns status-im.ui.components.sticky-button (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as common] + (:require [status-im.ui.components.styles :as common] [status-im.utils.platform :refer [platform-specific]] [status-im.utils.utils :as u] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text touchable-highlight]])) diff --git a/src/status_im/components/styles.cljs b/src/status_im/ui/components/styles.cljs similarity index 99% rename from src/status_im/components/styles.cljs rename to src/status_im/ui/components/styles.cljs index b0d03afe1b..da5109f30e 100644 --- a/src/status_im/components/styles.cljs +++ b/src/status_im/ui/components/styles.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.styles) +(ns status-im.ui.components.styles) ;; TODO(oskarth): Make a palette of all these colors diff --git a/src/status_im/components/sync_state/gradient.cljs b/src/status_im/ui/components/sync_state/gradient.cljs similarity index 95% rename from src/status_im/components/sync_state/gradient.cljs rename to src/status_im/ui/components/sync_state/gradient.cljs index a87fc3f01c..8e6072bf9d 100644 --- a/src/status_im/components/sync_state/gradient.cljs +++ b/src/status_im/ui/components/sync_state/gradient.cljs @@ -1,13 +1,13 @@ -(ns status-im.components.sync-state.gradient +(ns status-im.ui.components.sync-state.gradient (:require [re-frame.core :refer [subscribe dispatch]] [reagent.core :as r] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text animated-view linear-gradient get-dimensions]] - [status-im.components.sync-state.styles :as st] - [status-im.components.animation :as anim] + [status-im.ui.components.sync-state.styles :as st] + [status-im.ui.components.animation :as anim] [taoensso.timbre :as log])) (def gradient-animation-duration 700) diff --git a/src/status_im/components/sync_state/offline.cljs b/src/status_im/ui/components/sync_state/offline.cljs similarity index 88% rename from src/status_im/components/sync_state/offline.cljs rename to src/status_im/ui/components/sync_state/offline.cljs index 3ef986002f..7a3ab42715 100644 --- a/src/status_im/components/sync_state/offline.cljs +++ b/src/status_im/ui/components/sync_state/offline.cljs @@ -1,12 +1,12 @@ -(ns status-im.components.sync-state.offline +(ns status-im.ui.components.sync-state.offline (:require [re-frame.core :refer [subscribe dispatch]] [reagent.core :as r] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text animated-view get-dimensions]] - [status-im.components.sync-state.styles :as st] - [status-im.components.animation :as anim] + [status-im.ui.components.sync-state.styles :as st] + [status-im.ui.components.animation :as anim] [status-im.i18n :refer [label]])) (def window-width (:width (get-dimensions "window"))) diff --git a/src/status_im/components/sync_state/styles.cljs b/src/status_im/ui/components/sync_state/styles.cljs similarity index 95% rename from src/status_im/components/sync_state/styles.cljs rename to src/status_im/ui/components/sync_state/styles.cljs index 16312b3dbe..2da180dbe2 100644 --- a/src/status_im/components/sync_state/styles.cljs +++ b/src/status_im/ui/components/sync_state/styles.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.sync-state.styles +(ns status-im.ui.components.sync-state.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])) (def sync-style-gradient diff --git a/src/status_im/components/tabs/styles.cljs b/src/status_im/ui/components/tabs/styles.cljs similarity index 90% rename from src/status_im/components/tabs/styles.cljs rename to src/status_im/ui/components/tabs/styles.cljs index 7f832fc26b..789a4c3ec6 100644 --- a/src/status_im/components/tabs/styles.cljs +++ b/src/status_im/ui/components/tabs/styles.cljs @@ -1,5 +1,5 @@ -(ns status-im.components.tabs.styles - (:require [status-im.components.styles :as styles] +(ns status-im.ui.components.tabs.styles + (:require [status-im.ui.components.styles :as styles] [status-im.utils.platform :as platform]) (:require-macros [status-im.utils.styles :refer [defnstyle]])) diff --git a/src/status_im/components/tabs/views.cljs b/src/status_im/ui/components/tabs/views.cljs similarity index 92% rename from src/status_im/components/tabs/views.cljs rename to src/status_im/ui/components/tabs/views.cljs index af9f7a4fb9..bb08d139ba 100644 --- a/src/status_im/components/tabs/views.cljs +++ b/src/status_im/ui/components/tabs/views.cljs @@ -1,8 +1,8 @@ -(ns status-im.components.tabs.views +(ns status-im.ui.components.tabs.views (:require [re-frame.core :as re-frame] - [status-im.components.react :as react] - [status-im.components.styles :as styles] - [status-im.components.tabs.styles :as tabs.styles]) + [status-im.ui.components.react :as react] + [status-im.ui.components.styles :as styles] + [status-im.ui.components.tabs.styles :as tabs.styles]) (:require-macros [status-im.utils.views :refer [defview]])) (defview tab [index content tab-style on-press active?] diff --git a/src/status_im/components/text_field/styles.cljs b/src/status_im/ui/components/text_field/styles.cljs similarity index 96% rename from src/status_im/components/text_field/styles.cljs rename to src/status_im/ui/components/text_field/styles.cljs index 49b5ff4b53..852a0ab02d 100644 --- a/src/status_im/components/text_field/styles.cljs +++ b/src/status_im/ui/components/text_field/styles.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.text-field.styles +(ns status-im.ui.components.text-field.styles (:require [status-im.utils.platform :refer [platform-specific]])) diff --git a/src/status_im/components/text_field/view.cljs b/src/status_im/ui/components/text_field/view.cljs similarity index 97% rename from src/status_im/components/text_field/view.cljs rename to src/status_im/ui/components/text_field/view.cljs index 71c8ed4765..75f63e3aeb 100644 --- a/src/status_im/components/text_field/view.cljs +++ b/src/status_im/ui/components/text_field/view.cljs @@ -1,18 +1,18 @@ -(ns status-im.components.text-field.view +(ns status-im.ui.components.text-field.view (:require [clojure.string :as s] [re-frame.core :refer [subscribe dispatch dispatch-sync]] [reagent.core :as r] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text animated-text animated-view text-input touchable-opacity]] - [status-im.components.text-field.styles :as st] + [status-im.ui.components.text-field.styles :as st] [status-im.i18n :refer [label]] - [status-im.components.animation :as anim] + [status-im.ui.components.animation :as anim] [taoensso.timbre :as log] - [status-im.components.styles :refer [separator-color]])) + [status-im.ui.components.styles :refer [separator-color]])) (def config {:label-top 16 diff --git a/src/status_im/components/text_input_with_label/animation.cljs b/src/status_im/ui/components/text_input_with_label/animation.cljs similarity index 92% rename from src/status_im/components/text_input_with_label/animation.cljs rename to src/status_im/ui/components/text_input_with_label/animation.cljs index d8eb17ba98..712c75a997 100644 --- a/src/status_im/components/text_input_with_label/animation.cljs +++ b/src/status_im/ui/components/text_input_with_label/animation.cljs @@ -1,5 +1,5 @@ -(ns status-im.components.text-input-with-label.animation - (:require [status-im.components.animation :as animation] +(ns status-im.ui.components.text-input-with-label.animation + (:require [status-im.ui.components.animation :as animation] [clojure.string :as str])) (def anim-duration 200) diff --git a/src/status_im/components/text_input_with_label/styles.cljs b/src/status_im/ui/components/text_input_with_label/styles.cljs similarity index 94% rename from src/status_im/components/text_input_with_label/styles.cljs rename to src/status_im/ui/components/text_input_with_label/styles.cljs index eb10c5235a..6661de0cd1 100644 --- a/src/status_im/components/text_input_with_label/styles.cljs +++ b/src/status_im/ui/components/text_input_with_label/styles.cljs @@ -1,7 +1,7 @@ -(ns status-im.components.text-input-with-label.styles +(ns status-im.ui.components.text-input-with-label.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) (:require [status-im.utils.platform :refer [ios?]] - [status-im.components.styles :as common])) + [status-im.ui.components.styles :as common])) (defnstyle text-input [content-height] {:placeholder "" diff --git a/src/status_im/components/text_input_with_label/view.cljs b/src/status_im/ui/components/text_input_with_label/view.cljs similarity index 92% rename from src/status_im/components/text_input_with_label/view.cljs rename to src/status_im/ui/components/text_input_with_label/view.cljs index 5275810d5a..7d8537bbce 100644 --- a/src/status_im/components/text_input_with_label/view.cljs +++ b/src/status_im/ui/components/text_input_with_label/view.cljs @@ -1,15 +1,15 @@ -(ns status-im.components.text-input-with-label.view +(ns status-im.ui.components.text-input-with-label.view (:require [reagent.core :as r] - [status-im.components.animation :as animation] - [status-im.components.text-input-with-label.animation :refer [animate-label + [status-im.ui.components.animation :as animation] + [status-im.ui.components.text-input-with-label.animation :refer [animate-label text-input-on-focus text-input-on-blur]] - [status-im.components.react :refer [view + [status-im.ui.components.react :refer [view text animated-text animated-view text-input]] - [status-im.components.text-input-with-label.styles :as st] + [status-im.ui.components.text-input-with-label.styles :as st] [clojure.string :as str])) (defn get-init-props [{:keys [default-value]}] diff --git a/src/status_im/components/toolbar/actions.cljs b/src/status_im/ui/components/toolbar/actions.cljs similarity index 93% rename from src/status_im/components/toolbar/actions.cljs rename to src/status_im/ui/components/toolbar/actions.cljs index f474e63013..9209abbf52 100644 --- a/src/status_im/components/toolbar/actions.cljs +++ b/src/status_im/ui/components/toolbar/actions.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.toolbar.actions +(ns status-im.ui.components.toolbar.actions (:require [re-frame.core :refer [dispatch]] - [status-im.components.toolbar.styles :as st])) + [status-im.ui.components.toolbar.styles :as st])) (defn hamburger [handler] {:icon :icons/hamburger diff --git a/src/status_im/components/toolbar/styles.cljs b/src/status_im/ui/components/toolbar/styles.cljs similarity index 96% rename from src/status_im/components/toolbar/styles.cljs rename to src/status_im/ui/components/toolbar/styles.cljs index 97c2577404..79f13955a9 100644 --- a/src/status_im/components/toolbar/styles.cljs +++ b/src/status_im/ui/components/toolbar/styles.cljs @@ -1,6 +1,6 @@ -(ns status-im.components.toolbar.styles +(ns status-im.ui.components.toolbar.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as styles] + (:require [status-im.ui.components.styles :as styles] [status-im.utils.platform :as p])) (def toolbar-background1 styles/color-white) diff --git a/src/status_im/components/toolbar/view.cljs b/src/status_im/ui/components/toolbar/view.cljs similarity index 92% rename from src/status_im/components/toolbar/view.cljs rename to src/status_im/ui/components/toolbar/view.cljs index e6eee0d35a..9884fd9441 100644 --- a/src/status_im/components/toolbar/view.cljs +++ b/src/status_im/ui/components/toolbar/view.cljs @@ -1,13 +1,13 @@ -(ns status-im.components.toolbar.view +(ns status-im.ui.components.toolbar.view (:require [reagent.core :as r] [re-frame.core :as rf] - [status-im.components.react :as rn] - [status-im.components.sync-state.gradient :as sync-state-gradient-view] - [status-im.components.styles :as st] - [status-im.components.context-menu :as context-menu] - [status-im.components.toolbar.actions :as act] - [status-im.components.toolbar.styles :as tst] - [status-im.components.icons.vector-icons :as vi] + [status-im.ui.components.react :as rn] + [status-im.ui.components.sync-state.gradient :as sync-state-gradient-view] + [status-im.ui.components.styles :as st] + [status-im.ui.components.context-menu :as context-menu] + [status-im.ui.components.toolbar.actions :as act] + [status-im.ui.components.toolbar.styles :as tst] + [status-im.ui.components.icons.vector-icons :as vi] [status-im.utils.platform :as platform])) ;; Navigation item diff --git a/src/status_im/ui/components/toolbar_new/actions.cljs b/src/status_im/ui/components/toolbar_new/actions.cljs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/status_im/ui/components/toolbar_new/styles.cljs b/src/status_im/ui/components/toolbar_new/styles.cljs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/status_im/ui/components/toolbar_new/view.cljs b/src/status_im/ui/components/toolbar_new/view.cljs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/status_im/components/webview_bridge.cljs b/src/status_im/ui/components/webview_bridge.cljs similarity index 85% rename from src/status_im/components/webview_bridge.cljs rename to src/status_im/ui/components/webview_bridge.cljs index ff5f142841..2832b9323d 100644 --- a/src/status_im/components/webview_bridge.cljs +++ b/src/status_im/ui/components/webview_bridge.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.webview-bridge +(ns status-im.ui.components.webview-bridge (:require [reagent.core :as r] [status-im.react-native.js-dependencies :as rn-dependencies])) diff --git a/src/status_im/ui/screens/accounts/login/styles.cljs b/src/status_im/ui/screens/accounts/login/styles.cljs index e8dfb336d8..b3390d1909 100644 --- a/src/status_im/ui/screens/accounts/login/styles.cljs +++ b/src/status_im/ui/screens/accounts/login/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.accounts.login.styles (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]]) - (:require [status-im.components.styles :as st])) + (:require [status-im.ui.components.styles :as st])) (defstyle login-view {:flex 1 diff --git a/src/status_im/ui/screens/accounts/login/views.cljs b/src/status_im/ui/screens/accounts/login/views.cljs index 1670cbd436..9944aaca48 100644 --- a/src/status_im/ui/screens/accounts/login/views.cljs +++ b/src/status_im/ui/screens/accounts/login/views.cljs @@ -4,14 +4,14 @@ [re-frame.core :refer [dispatch dispatch-sync]] [status-im.ui.screens.accounts.styles :as ast] [status-im.ui.screens.accounts.views :refer [account-badge]] - [status-im.components.text-input-with-label.view :refer [text-input-with-label]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.toolbar.actions :as act] + [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as act] [status-im.ui.screens.accounts.login.styles :as st] - [status-im.components.react :as react] + [status-im.ui.components.react :as react] [status-im.i18n :as i18n] - [status-im.components.react :as components])) + [status-im.ui.components.react :as components])) (defn login-toolbar [] [toolbar/toolbar diff --git a/src/status_im/ui/screens/accounts/recover/styles.cljs b/src/status_im/ui/screens/accounts/recover/styles.cljs index 1df4b90e52..8c1d87e31d 100644 --- a/src/status_im/ui/screens/accounts/recover/styles.cljs +++ b/src/status_im/ui/screens/accounts/recover/styles.cljs @@ -1,5 +1,5 @@ (ns status-im.ui.screens.accounts.recover.styles - (:require [status-im.components.styles :as common] + (:require [status-im.ui.components.styles :as common] [status-im.utils.platform :refer [ios?]])) (def screen-container diff --git a/src/status_im/ui/screens/accounts/recover/views.cljs b/src/status_im/ui/screens/accounts/recover/views.cljs index 40bc6ae0af..3bc8e0990d 100644 --- a/src/status_im/ui/screens/accounts/recover/views.cljs +++ b/src/status_im/ui/screens/accounts/recover/views.cljs @@ -1,16 +1,16 @@ (ns status-im.ui.screens.accounts.recover.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] - [status-im.components.text-input-with-label.view :refer [text-input-with-label]] - [status-im.components.react :refer [view - text - image - keyboard-avoiding-view - touchable-highlight]] - [status-im.components.sticky-button :refer [sticky-button]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.toolbar.actions :as act] + [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] + [status-im.ui.components.react :refer [view + text + image + keyboard-avoiding-view + touchable-highlight]] + [status-im.ui.components.sticky-button :refer [sticky-button]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as act] [status-im.i18n :as i18n] [status-im.ui.screens.accounts.recover.styles :as st] [status-im.ui.screens.accounts.recover.db :as v] diff --git a/src/status_im/ui/screens/accounts/styles.cljs b/src/status_im/ui/screens/accounts/styles.cljs index feda81139b..359ad208bb 100644 --- a/src/status_im/ui/screens/accounts/styles.cljs +++ b/src/status_im/ui/screens/accounts/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.accounts.styles (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]]) - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def accounts-container {:flex 1 diff --git a/src/status_im/ui/screens/accounts/views.cljs b/src/status_im/ui/screens/accounts/views.cljs index cf09993a48..79cbbf71cd 100644 --- a/src/status_im/ui/screens/accounts/views.cljs +++ b/src/status_im/ui/screens/accounts/views.cljs @@ -2,19 +2,19 @@ (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [dispatch dispatch-sync]] [status-im.ui.screens.accounts.styles :as st] - [status-im.components.text-input-with-label.view :refer [text-input-with-label]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.actions :as act] - [status-im.components.common.common :as common] - [status-im.components.action-button.action-button :refer [action-button]] + [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.actions :as act] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.action-button.action-button :refer [action-button]] [status-im.utils.listview :as lw] [status-im.constants :refer [console-chat-id]] - [status-im.components.react :refer [view - text - list-view - list-item - image - touchable-highlight]] + [status-im.ui.components.react :refer [view + text + list-view + list-item + image + touchable-highlight]] [status-im.i18n :as i18n] [clojure.string :as str])) diff --git a/src/status_im/ui/screens/chats_list/styles.cljs b/src/status_im/ui/screens/chats_list/styles.cljs index 363236d529..3c4e9cf9eb 100644 --- a/src/status_im/ui/screens/chats_list/styles.cljs +++ b/src/status_im/ui/screens/chats_list/styles.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.chats-list.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as component.styles] - [status-im.components.tabs.styles :as tabs-st] + (:require [status-im.ui.components.styles :as component.styles] + [status-im.ui.components.tabs.styles :as tabs-st] [status-im.utils.platform :as p])) (defn toolbar [] diff --git a/src/status_im/ui/screens/chats_list/views.cljs b/src/status_im/ui/screens/chats_list/views.cljs index 439b664d45..2d23acb040 100644 --- a/src/status_im/ui/screens/chats_list/views.cljs +++ b/src/status_im/ui/screens/chats_list/views.cljs @@ -1,20 +1,20 @@ (ns status-im.ui.screens.chats-list.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :as re-frame] - [status-im.components.common.common :as common] - [status-im.components.renderers.renderers :as renderers] - [status-im.components.react :as react] - [status-im.components.native-action-button :refer [native-action-button]] - [status-im.components.drawer.view :as drawer] - [status-im.components.styles :refer [color-blue]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.toolbar.actions :as act] - [status-im.components.toolbar.styles :as tst] - [status-im.components.icons.custom-icons :refer [ion-icon]] - [status-im.components.sync-state.offline :refer [offline-view]] - [status-im.components.context-menu :refer [context-menu]] - [status-im.components.tabs.styles :refer [tabs-height]] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.renderers.renderers :as renderers] + [status-im.ui.components.react :as react] + [status-im.ui.components.native-action-button :refer [native-action-button]] + [status-im.ui.components.drawer.view :as drawer] + [status-im.ui.components.styles :refer [color-blue]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as act] + [status-im.ui.components.toolbar.styles :as tst] + [status-im.ui.components.icons.custom-icons :refer [ion-icon]] + [status-im.ui.components.sync-state.offline :refer [offline-view]] + [status-im.ui.components.context-menu :refer [context-menu]] + [status-im.ui.components.tabs.styles :refer [tabs-height]] [status-im.utils.listview :refer [to-datasource]] [status-im.ui.screens.chats-list.views.inner-item :as inner-item] [status-im.ui.screens.chats-list.styles :as st] diff --git a/src/status_im/ui/screens/chats_list/views/inner_item.cljs b/src/status_im/ui/screens/chats_list/views/inner_item.cljs index eaa2e280db..a03882fce7 100644 --- a/src/status_im/ui/screens/chats_list/views/inner_item.cljs +++ b/src/status_im/ui/screens/chats_list/views/inner_item.cljs @@ -2,10 +2,10 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [subscribe dispatch]] [clojure.string :as str] - [status-im.components.react :refer [view image text]] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.chat-icon.screen :refer [chat-icon-view-chat-list]] - [status-im.components.context-menu :refer [context-menu]] + [status-im.ui.components.react :refer [view image text]] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.chat-icon.screen :refer [chat-icon-view-chat-list]] + [status-im.ui.components.context-menu :refer [context-menu]] [status-im.ui.screens.chats-list.styles :as st] [status-im.utils.utils :refer [truncate-str]] [status-im.i18n :refer [get-contact-translated label label-pluralize]] diff --git a/src/status_im/ui/screens/contacts/contact_list/views.cljs b/src/status_im/ui/screens/contacts/contact_list/views.cljs index e7ccced9ae..63ed97c0f4 100644 --- a/src/status_im/ui/screens/contacts/contact_list/views.cljs +++ b/src/status_im/ui/screens/contacts/contact_list/views.cljs @@ -1,14 +1,14 @@ (ns status-im.ui.screens.contacts.contact-list.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] - [status-im.components.renderers.renderers :as renderers] - [status-im.components.contact.contact :refer [contact-view]] + [status-im.ui.components.renderers.renderers :as renderers] + [status-im.ui.components.contact.contact :refer [contact-view]] [status-im.ui.screens.contacts.views :refer [contact-options]] - [status-im.components.react :refer [view list-view list-item]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.toolbar.actions :as act] - [status-im.components.drawer.view :refer [drawer-view]] + [status-im.ui.components.react :refer [view list-view list-item]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as act] + [status-im.ui.components.drawer.view :refer [drawer-view]] [status-im.ui.screens.contacts.styles :as st] [status-im.utils.listview :as lw] [status-im.i18n :refer [label]])) diff --git a/src/status_im/ui/screens/contacts/contact_list_modal/views.cljs b/src/status_im/ui/screens/contacts/contact_list_modal/views.cljs index 1aea4cb220..8fa63b658e 100644 --- a/src/status_im/ui/screens/contacts/contact_list_modal/views.cljs +++ b/src/status_im/ui/screens/contacts/contact_list_modal/views.cljs @@ -1,16 +1,16 @@ (ns status-im.ui.screens.contacts.contact-list-modal.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] - [status-im.components.common.common :as common] - [status-im.components.renderers.renderers :as renderers] - [status-im.components.react :refer [view list-view list-item]] - [status-im.components.contact.contact :refer [contact-view]] - [status-im.components.action-button.action-button :refer [action-button - action-separator]] - [status-im.components.action-button.styles :refer [actions-list]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :refer [toolbar-with-search]] - [status-im.components.drawer.view :refer [drawer-view]] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.renderers.renderers :as renderers] + [status-im.ui.components.react :refer [view list-view list-item]] + [status-im.ui.components.contact.contact :refer [contact-view]] + [status-im.ui.components.action-button.action-button :refer [action-button + action-separator]] + [status-im.ui.components.action-button.styles :refer [actions-list]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :refer [toolbar-with-search]] + [status-im.ui.components.drawer.view :refer [drawer-view]] [status-im.ui.screens.contacts.styles :as st] [status-im.utils.listview :as lw] [status-im.i18n :refer [label]])) diff --git a/src/status_im/ui/screens/contacts/new_contact/views.cljs b/src/status_im/ui/screens/contacts/new_contact/views.cljs index 2b41927e3c..08e3ff2386 100644 --- a/src/status_im/ui/screens/contacts/new_contact/views.cljs +++ b/src/status_im/ui/screens/contacts/new_contact/views.cljs @@ -3,12 +3,12 @@ (:require [re-frame.core :as re-frame] [clojure.string :as string] [cljs.spec.alpha :as s] - [status-im.components.react :as react] - [status-im.components.text-field.view :as text-field] - [status-im.components.status-bar :as status-bar] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.styles :as components.styles :refer [icon-ok button-input-container button-input color-blue]] - [status-im.components.image-button.view :as scan-button] + [status-im.ui.components.react :as react] + [status-im.ui.components.text-field.view :as text-field] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.styles :as components.styles :refer [icon-ok button-input-container button-input color-blue]] + [status-im.ui.components.image-button.view :as scan-button] [status-im.i18n :as i18n] [status-im.ui.screens.contacts.db :as v] [status-im.ui.screens.contacts.styles :as st] diff --git a/src/status_im/ui/screens/contacts/styles.cljs b/src/status_im/ui/screens/contacts/styles.cljs index b8a073d747..35728f2e20 100644 --- a/src/status_im/ui/screens/contacts/styles.cljs +++ b/src/status_im/ui/screens/contacts/styles.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.contacts.styles (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]]) - (:require [status-im.components.styles :as common] - [status-im.components.tabs.styles :as tabs-st])) + (:require [status-im.ui.components.styles :as common] + [status-im.ui.components.tabs.styles :as tabs-st])) (def toolbar-actions {:flex-direction :row}) diff --git a/src/status_im/ui/screens/contacts/views.cljs b/src/status_im/ui/screens/contacts/views.cljs index 6ee95d327d..69d9c61cca 100644 --- a/src/status_im/ui/screens/contacts/views.cljs +++ b/src/status_im/ui/screens/contacts/views.cljs @@ -1,22 +1,22 @@ (ns status-im.ui.screens.contacts.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] - [status-im.components.common.common :as common] - [status-im.components.react :refer [view text touchable-highlight scroll-view]] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.native-action-button :refer [native-action-button - native-action-button-item]] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.toolbar.actions :as act] - [status-im.components.drawer.view :as drawer] - [status-im.components.icons.custom-icons :refer [ion-icon]] - [status-im.components.contact.contact :refer [contact-view]] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.react :refer [view text touchable-highlight scroll-view]] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.native-action-button :refer [native-action-button + native-action-button-item]] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as act] + [status-im.ui.components.drawer.view :as drawer] + [status-im.ui.components.icons.custom-icons :refer [ion-icon]] + [status-im.ui.components.contact.contact :refer [contact-view]] [status-im.utils.platform :refer [platform-specific ios? android?]] [status-im.utils.utils :as u] [status-im.i18n :refer [label]] [status-im.ui.screens.contacts.styles :as st] - [status-im.components.styles :refer [color-blue - create-icon]])) + [status-im.ui.screens.chats-list.styles :as chats-list.styles] + [status-im.ui.components.styles :refer [color-blue]])) (def ^:const contacts-limit 5) @@ -114,7 +114,7 @@ :buttonColor :#9b59b6 :onPress #(dispatch [:navigate-to :new-contact])} [ion-icon {:name :md-create - :style create-icon}]]]) + :style chats-list.styles/create-icon}]]]) (defview contact-groups-list [_] (letsubs [contacts [:get-added-contacts-with-limit contacts-limit] diff --git a/src/status_im/ui/screens/discover/all_dapps/views.cljs b/src/status_im/ui/screens/discover/all_dapps/views.cljs index 4a0f72fd79..390828f36f 100644 --- a/src/status_im/ui/screens/discover/all_dapps/views.cljs +++ b/src/status_im/ui/screens/discover/all_dapps/views.cljs @@ -2,13 +2,13 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [cljs.pprint :as pprint] [re-frame.core :as re-frame] - [status-im.components.react :as react] - [status-im.components.list.views :as list] - [status-im.components.chat-icon.screen :as chat-icon] + [status-im.ui.components.react :as react] + [status-im.ui.components.list.views :as list] + [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.screens.discover.components.views :as discover-components] [status-im.ui.screens.discover.styles :as styles] [status-im.i18n :as i18n] - [status-im.components.toolbar.view :as toolbar])) + [status-im.ui.components.toolbar.view :as toolbar])) (defn navigate-to-dapp [dapp] (do (re-frame/dispatch [:set :discover-current-dapp dapp]) diff --git a/src/status_im/ui/screens/discover/components/views.cljs b/src/status_im/ui/screens/discover/components/views.cljs index e4ff3d7570..f4f00705d5 100644 --- a/src/status_im/ui/screens/discover/components/views.cljs +++ b/src/status_im/ui/screens/discover/components/views.cljs @@ -2,13 +2,13 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :as re-frame] [clojure.string :as str] - [status-im.components.react :as react] + [status-im.ui.components.react :as react] [status-im.ui.screens.discover.styles :as styles] - [status-im.components.status-view.view :as view] + [status-im.ui.components.status-view.view :as view] [status-im.utils.gfycat.core :as gfycat] [status-im.utils.identicon :as identicon] - [status-im.components.chat-icon.screen :as chat-icon] - [status-im.components.icons.vector-icons :as vector-icons] + [status-im.ui.components.chat-icon.screen :as chat-icon] + [status-im.ui.components.icons.vector-icons :as vector-icons] [status-im.i18n :as i18n])) ;; TODO(oskarth): Too many positional args, refactor to map diff --git a/src/status_im/ui/screens/discover/dapp_details/views.cljs b/src/status_im/ui/screens/discover/dapp_details/views.cljs index 29bd344896..391f6963bb 100644 --- a/src/status_im/ui/screens/discover/dapp_details/views.cljs +++ b/src/status_im/ui/screens/discover/dapp_details/views.cljs @@ -1,11 +1,11 @@ (ns status-im.ui.screens.discover.dapp-details.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) - (:require [status-im.components.react :as react] + (:require [status-im.ui.components.react :as react] [status-im.ui.screens.discover.components.views :as components] - [status-im.components.chat-icon.screen :as chat-icon.screen] - [status-im.components.common.common :as common] - [status-im.components.icons.vector-icons :as vector-icons] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.chat-icon.screen :as chat-icon.screen] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.icons.vector-icons :as vector-icons] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.screens.discover.styles :as styles] [status-im.i18n :as i18n] [re-frame.core :as re-frame])) diff --git a/src/status_im/ui/screens/discover/popular_hashtags/views.cljs b/src/status_im/ui/screens/discover/popular_hashtags/views.cljs index 6f87d18f3d..0c36ff0259 100644 --- a/src/status_im/ui/screens/discover/popular_hashtags/views.cljs +++ b/src/status_im/ui/screens/discover/popular_hashtags/views.cljs @@ -1,12 +1,12 @@ (ns status-im.ui.screens.discover.popular-hashtags.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) - (:require [status-im.components.react :as react] + (:require [status-im.ui.components.react :as react] [status-im.ui.screens.discover.styles :as styles] [status-im.ui.screens.discover.components.views :as components] - [status-im.components.list.views :as list] + [status-im.ui.components.list.views :as list] [re-frame.core :as re-frame] [status-im.i18n :as i18n] - [status-im.components.toolbar.view :as toolbar])) + [status-im.ui.components.toolbar.view :as toolbar])) (defn render-tag [tag] [react/touchable-highlight {:on-press #(do (re-frame/dispatch [:set :discover-search-tags [tag]]) diff --git a/src/status_im/ui/screens/discover/recent_statuses/views.cljs b/src/status_im/ui/screens/discover/recent_statuses/views.cljs index b0febaf5cd..a30320e772 100644 --- a/src/status_im/ui/screens/discover/recent_statuses/views.cljs +++ b/src/status_im/ui/screens/discover/recent_statuses/views.cljs @@ -1,9 +1,9 @@ (ns status-im.ui.screens.discover.recent-statuses.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) - (:require [status-im.components.react :as react] + (:require [status-im.ui.components.react :as react] [status-im.ui.screens.discover.components.views :as components] [status-im.ui.screens.discover.styles :as styles] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.i18n :as i18n])) (defview discover-all-recent [] diff --git a/src/status_im/ui/screens/discover/search_results/views.cljs b/src/status_im/ui/screens/discover/search_results/views.cljs index 96e228650f..0b8e3a3cbd 100644 --- a/src/status_im/ui/screens/discover/search_results/views.cljs +++ b/src/status_im/ui/screens/discover/search_results/views.cljs @@ -1,12 +1,12 @@ (ns status-im.ui.screens.discover.search-results.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) - (:require [status-im.components.react :as react] - [status-im.components.icons.vector-icons :as vi] + (:require [status-im.ui.components.react :as react] + [status-im.ui.components.icons.vector-icons :as vi] [status-im.ui.screens.discover.components.views :as components] [status-im.i18n :as i18n] [status-im.ui.screens.discover.styles :as styles] [status-im.ui.screens.contacts.styles :as contacts-styles] - [status-im.components.toolbar.view :as toolbar])) + [status-im.ui.components.toolbar.view :as toolbar])) ;; TOOD(oskarth): Refactor this, very similar to discover-all-hashtags view (defview discover-search-results [] diff --git a/src/status_im/ui/screens/discover/styles.cljs b/src/status_im/ui/screens/discover/styles.cljs index 245aa24a9a..a5af5ccd68 100644 --- a/src/status_im/ui/screens/discover/styles.cljs +++ b/src/status_im/ui/screens/discover/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.discover.styles (:require-macros [status-im.utils.styles :refer [defstyle]]) - (:require [status-im.components.styles :as styles])) + (:require [status-im.ui.components.styles :as styles])) ;; Common diff --git a/src/status_im/ui/screens/discover/views.cljs b/src/status_im/ui/screens/discover/views.cljs index 0d8beada23..9c113d4398 100644 --- a/src/status_im/ui/screens/discover/views.cljs +++ b/src/status_im/ui/screens/discover/views.cljs @@ -2,18 +2,18 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :as re-frame] [clojure.string :as string] - [status-im.components.react :as react] - [status-im.components.icons.vector-icons :as vector-icons] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.toolbar.actions :as actions] - [status-im.components.drawer.view :as drawer] - [status-im.components.carousel.carousel :as carousel] + [status-im.ui.components.react :as react] + [status-im.ui.components.icons.vector-icons :as vector-icons] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as actions] + [status-im.ui.components.drawer.view :as drawer] + [status-im.ui.components.carousel.carousel :as carousel] [status-im.ui.screens.discover.components.views :as components] [status-im.ui.screens.discover.all-dapps.views :as all-dapps] [status-im.i18n :as i18n] [status-im.ui.screens.discover.styles :as styles] [status-im.ui.screens.contacts.styles :as contacts-st] - [status-im.components.list.views :as list] + [status-im.ui.components.list.views :as list] [status-im.react-native.resources :as resources])) (defn empty-section [image-kw title-kw body-kw] diff --git a/src/status_im/ui/screens/events.cljs b/src/status_im/ui/screens/events.cljs index cc32bfc4b1..4810614ea5 100644 --- a/src/status_im/ui/screens/events.cljs +++ b/src/status_im/ui/screens/events.cljs @@ -20,7 +20,7 @@ status-im.ui.screens.wallet.choose-recipient.events [re-frame.core :refer [dispatch reg-fx reg-cofx] :as re-frame] [status-im.native-module.core :as status] - [status-im.components.permissions :as permissions] + [status-im.ui.components.permissions :as permissions] [status-im.constants :refer [console-chat-id]] [status-im.data-store.core :as data-store] [status-im.i18n :as i18n] diff --git a/src/status_im/ui/screens/group/add_contacts/views.cljs b/src/status_im/ui/screens/group/add_contacts/views.cljs index aa2bdfbfbd..f83dab29cf 100644 --- a/src/status_im/ui/screens/group/add_contacts/views.cljs +++ b/src/status_im/ui/screens/group/add_contacts/views.cljs @@ -1,17 +1,16 @@ (ns status-im.ui.screens.group.add-contacts.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] - [status-im.components.renderers.renderers :as renderers] - [status-im.components.react :refer [view keyboard-avoiding-view - text list-view list-item]] - [status-im.components.sticky-button :refer [sticky-button]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :refer [toolbar-with-search]] + [status-im.ui.components.renderers.renderers :as renderers] + [status-im.ui.components.react :as react] + [status-im.ui.components.sticky-button :refer [sticky-button]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :refer [toolbar-with-search]] [status-im.utils.listview :refer [to-datasource]] [status-im.ui.screens.group.styles :as styles] [status-im.ui.screens.contacts.styles :as cstyles] [status-im.i18n :refer [label]] - [status-im.components.contact.contact :refer [toogle-contact-view]])) + [status-im.ui.components.contact.contact :refer [toogle-contact-view]])) (defn on-toggle [checked? whisper-identity] (let [action (if checked? :deselect-contact :select-contact)] @@ -28,14 +27,14 @@ [toogle-contact-view contact :is-participant-selected? on-toggle-participant]) (defn title-with-count [title count-value] - [view styles/toolbar-title-with-count - [text {:style styles/toolbar-title-with-count-text - :font :toolbar-title} + [react/view styles/toolbar-title-with-count + [react/text {:style styles/toolbar-title-with-count-text + :font :toolbar-title} title] (when (pos? count-value) - [view styles/toolbar-title-with-count-container - [text {:style styles/toolbar-title-with-count-text-count - :font :toolbar-title} + [react/view styles/toolbar-title-with-count-container + [react/text {:style styles/toolbar-title-with-count-text-count + :font :toolbar-title} count-value]])]) (defview toggle-list-toolbar [title contacts-count] @@ -49,11 +48,11 @@ :search-placeholder (label :t/search-contacts)}))) (defn toggle-list [contacts render-function] - [view {:flex 1} - [list-view + [react/view {:flex 1} + [react/list-view {:dataSource (to-datasource contacts) :renderRow (fn [row _ _] - (list-item ^{:key row} [render-function row])) + (react/list-item ^{:key row} [render-function row])) :renderSeparator renderers/list-separator-renderer :renderFooter renderers/list-footer-renderer :renderHeader renderers/list-header-renderer @@ -64,7 +63,7 @@ (letsubs [contacts [:all-added-group-contacts-filtered] selected-contacts-count [:selected-contacts-count] group-type [:get-group-type]] - [keyboard-avoiding-view {:style styles/group-container} + [react/keyboard-avoiding-view {:style styles/group-container} [status-bar] [toggle-list-toolbar (label (if (= group-type :contact-group) @@ -79,7 +78,7 @@ (letsubs [contacts [:all-group-not-added-contacts-filtered] group [:get-contact-group] selected-contacts-count [:selected-contacts-count]] - [keyboard-avoiding-view {:style styles/group-container} + [react/keyboard-avoiding-view {:style styles/group-container} [status-bar] [toggle-list-toolbar (:name group) selected-contacts-count] [toggle-list contacts group-toggle-contact] @@ -92,7 +91,7 @@ (letsubs [contacts [:contacts-filtered :all-new-contacts] chat-name [:chat :name] selected-contacts-count [:selected-participants-count]] - [keyboard-avoiding-view {:style styles/group-container} + [react/keyboard-avoiding-view {:style styles/group-container} [status-bar] [toggle-list-toolbar chat-name selected-contacts-count] [toggle-list contacts group-toggle-participant] diff --git a/src/status_im/ui/screens/group/chat_settings/views.cljs b/src/status_im/ui/screens/group/chat_settings/views.cljs index 40077c0ccc..f713f4f412 100644 --- a/src/status_im/ui/screens/group/chat_settings/views.cljs +++ b/src/status_im/ui/screens/group/chat_settings/views.cljs @@ -1,10 +1,10 @@ (ns status-im.ui.screens.group.chat-settings.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] - [status-im.components.contact.contact :refer [contact-view]] - [status-im.components.common.common :as common] - [status-im.components.react :refer [view scroll-view keyboard-avoiding-view]] - [status-im.components.sticky-button :refer [sticky-button]] + [status-im.ui.components.contact.contact :refer [contact-view]] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.react :refer [view scroll-view keyboard-avoiding-view]] + [status-im.ui.components.sticky-button :refer [sticky-button]] [status-im.ui.screens.group.styles :as styles] [status-im.ui.screens.group.views :refer [group-toolbar group-chat-settings-btns group-name-view add-btn more-btn]] diff --git a/src/status_im/ui/screens/group/edit_contacts/views.cljs b/src/status_im/ui/screens/group/edit_contacts/views.cljs index 2b287c7612..a783da9944 100644 --- a/src/status_im/ui/screens/group/edit_contacts/views.cljs +++ b/src/status_im/ui/screens/group/edit_contacts/views.cljs @@ -1,11 +1,11 @@ (ns status-im.ui.screens.group.edit-contacts.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] - [status-im.components.contact.contact :refer [contact-view]] - [status-im.components.renderers.renderers :as renderers] - [status-im.components.react :refer [view list-view list-item]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :refer [toolbar-with-search]] + [status-im.ui.components.contact.contact :refer [contact-view]] + [status-im.ui.components.renderers.renderers :as renderers] + [status-im.ui.components.react :refer [view list-view list-item]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :refer [toolbar-with-search]] [status-im.utils.listview :refer [to-datasource]] [status-im.ui.screens.group.styles :as styles] [status-im.i18n :refer [label]])) diff --git a/src/status_im/ui/screens/group/events.cljs b/src/status_im/ui/screens/group/events.cljs index 234639ff16..0fcdb9042e 100644 --- a/src/status_im/ui/screens/group/events.cljs +++ b/src/status_im/ui/screens/group/events.cljs @@ -2,7 +2,7 @@ (:require [status-im.protocol.core :as protocol] [re-frame.core :refer [dispatch reg-fx reg-cofx inject-cofx]] [status-im.utils.handlers :refer [register-handler-db register-handler-fx]] - [status-im.components.styles :refer [default-chat-color]] + [status-im.ui.components.styles :refer [default-chat-color]] [status-im.data-store.contact-groups :as groups] [clojure.string :as string] [status-im.utils.random :as random] diff --git a/src/status_im/ui/screens/group/reorder/views.cljs b/src/status_im/ui/screens/group/reorder/views.cljs index bcc67a0d81..f237cc17d6 100644 --- a/src/status_im/ui/screens/group/reorder/views.cljs +++ b/src/status_im/ui/screens/group/reorder/views.cljs @@ -2,13 +2,13 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [reagent.core :as reagent] [re-frame.core :refer [dispatch dispatch-sync]] - [status-im.components.react :refer [view text list-item]] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.sticky-button :refer [sticky-button]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.sortable-list-view :refer [sortable-list-view sortable-item]] - [status-im.components.common.common :as common] + [status-im.ui.components.react :refer [view text list-item]] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.sticky-button :refer [sticky-button]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.sortable-list-view :refer [sortable-list-view sortable-item]] + [status-im.ui.components.common.common :as common] [status-im.ui.screens.group.styles :as styles] [status-im.i18n :refer [label label-pluralize]])) diff --git a/src/status_im/ui/screens/group/styles.cljs b/src/status_im/ui/screens/group/styles.cljs index 8f05d6c368..c9cbcd92db 100644 --- a/src/status_im/ui/screens/group/styles.cljs +++ b/src/status_im/ui/screens/group/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.group.styles (:require-macros [status-im.utils.styles :refer [defstyle]]) - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (defn toolbar-icon [enabled?] {:width 20 diff --git a/src/status_im/ui/screens/group/views.cljs b/src/status_im/ui/screens/group/views.cljs index f46c6f4ed6..6054363d29 100644 --- a/src/status_im/ui/screens/group/views.cljs +++ b/src/status_im/ui/screens/group/views.cljs @@ -2,19 +2,19 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] [status-im.ui.screens.contacts.styles :as cstyles] - [status-im.components.common.common :as common] - [status-im.components.action-button.action-button :refer [action-button action-separator]] - [status-im.components.react :refer [view text touchable-highlight - keyboard-avoiding-view list-view list-item]] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.text-input-with-label.view :refer [text-input-with-label]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.action-button.action-button :refer [action-button action-separator]] + [status-im.ui.components.react :refer [view text touchable-highlight + keyboard-avoiding-view list-view list-item]] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.utils.platform :refer [platform-specific]] - [status-im.components.sticky-button :refer [sticky-button]] + [status-im.ui.components.sticky-button :refer [sticky-button]] [status-im.utils.listview :refer [to-datasource]] - [status-im.components.renderers.renderers :as renderers] - [status-im.components.contact.contact :refer [contact-view]] + [status-im.ui.components.renderers.renderers :as renderers] + [status-im.ui.components.contact.contact :refer [contact-view]] [status-im.ui.screens.group.styles :as styles] [status-im.i18n :refer [label]] [cljs.spec.alpha :as spec] diff --git a/src/status_im/ui/screens/main_tabs/views.cljs b/src/status_im/ui/screens/main_tabs/views.cljs index d1773d0756..3bed3d916c 100644 --- a/src/status_im/ui/screens/main_tabs/views.cljs +++ b/src/status_im/ui/screens/main_tabs/views.cljs @@ -1,11 +1,11 @@ (ns status-im.ui.screens.main-tabs.views - (:require [status-im.components.drawer.view :refer [drawer-view]] - [status-im.components.icons.vector-icons :as vector-icons] - [status-im.components.react :as react] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.styles :as styles] - [status-im.components.tabs.styles :as tabs.styles] - [status-im.components.tabs.views :as tabs] + (:require [status-im.ui.components.drawer.view :refer [drawer-view]] + [status-im.ui.components.icons.vector-icons :as vector-icons] + [status-im.ui.components.react :as react] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.styles :as styles] + [status-im.ui.components.tabs.styles :as tabs.styles] + [status-im.ui.components.tabs.views :as tabs] [status-im.i18n :as i18n] [status-im.ui.screens.chats-list.views :refer [chats-list]] [status-im.ui.screens.contacts.views :refer [contact-groups-list]] diff --git a/src/status_im/ui/screens/network_settings/add_rpc/views.cljs b/src/status_im/ui/screens/network_settings/add_rpc/views.cljs index bc1f58bbc6..63b97be1bb 100644 --- a/src/status_im/ui/screens/network_settings/add_rpc/views.cljs +++ b/src/status_im/ui/screens/network_settings/add_rpc/views.cljs @@ -1,12 +1,12 @@ (ns status-im.ui.screens.network-settings.add-rpc.views (:require [re-frame.core :refer [dispatch]] - [status-im.components.status-bar :as status-bar] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.text-input-with-label.view :refer [text-input-with-label]] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] [status-im.ui.screens.network-settings.views :as network-settings] - [status-im.components.react :as react] - [status-im.components.sticky-button :as sticky-button] + [status-im.ui.components.react :as react] + [status-im.ui.components.sticky-button :as sticky-button] [status-im.i18n :as i18n] [clojure.string :as str])) diff --git a/src/status_im/ui/screens/network_settings/network_details/views.cljs b/src/status_im/ui/screens/network_settings/network_details/views.cljs index ee0897cac5..59753963db 100644 --- a/src/status_im/ui/screens/network_settings/network_details/views.cljs +++ b/src/status_im/ui/screens/network_settings/network_details/views.cljs @@ -2,11 +2,11 @@ (:require-macros [status-im.utils.views :as views]) (:require [re-frame.core :as rf] - [status-im.components.status-bar :as status-bar] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.context-menu :as context-menu] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.context-menu :as context-menu] [status-im.ui.screens.network-settings.views :as network-settings] - [status-im.components.react :as react] + [status-im.ui.components.react :as react] [status-im.utils.platform :as platform] [status-im.i18n :as i18n] [status-im.ui.screens.network-settings.styles :as st])) diff --git a/src/status_im/ui/screens/network_settings/parse_json/views.cljs b/src/status_im/ui/screens/network_settings/parse_json/views.cljs index f0ee8b1c40..ba87ade3e1 100644 --- a/src/status_im/ui/screens/network_settings/parse_json/views.cljs +++ b/src/status_im/ui/screens/network_settings/parse_json/views.cljs @@ -1,11 +1,11 @@ (ns status-im.ui.screens.network-settings.parse-json.views (:require [re-frame.core :refer [dispatch]] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.screens.network-settings.views :as network-settings] - [status-im.components.react :refer [view text text-input]] - [status-im.components.sticky-button :as sticky-button] + [status-im.ui.components.react :refer [view text text-input]] + [status-im.ui.components.sticky-button :as sticky-button] [status-im.ui.screens.network-settings.styles :as st] [status-im.i18n :as i18n] [clojure.string :as str])) diff --git a/src/status_im/ui/screens/network_settings/styles.cljs b/src/status_im/ui/screens/network_settings/styles.cljs index da3532fb9f..85ff2e091d 100644 --- a/src/status_im/ui/screens/network_settings/styles.cljs +++ b/src/status_im/ui/screens/network_settings/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.network-settings.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as common])) + (:require [status-im.ui.components.styles :as common])) (def networks-list {:background-color common/color-light-gray}) diff --git a/src/status_im/ui/screens/network_settings/views.cljs b/src/status_im/ui/screens/network_settings/views.cljs index daf96ac507..91ad3d8bce 100644 --- a/src/status_im/ui/screens/network_settings/views.cljs +++ b/src/status_im/ui/screens/network_settings/views.cljs @@ -3,14 +3,14 @@ (:require [status-im.utils.listview :as lw] [re-frame.core :as rf] - [status-im.components.status-bar :as status-bar] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.action-button.action-button :as action-button] - [status-im.components.action-button.styles :as action-button-styles] - [status-im.components.react :as react] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.common.common :as common] - [status-im.components.renderers.renderers :as renderers] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.action-button.action-button :as action-button] + [status-im.ui.components.action-button.styles :as action-button-styles] + [status-im.ui.components.react :as react] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.renderers.renderers :as renderers] [status-im.ui.screens.network-settings.styles :as st] [status-im.i18n :as i18n])) diff --git a/src/status_im/ui/screens/profile/edit/views.cljs b/src/status_im/ui/screens/profile/edit/views.cljs index f6d8858a35..312466acfa 100644 --- a/src/status_im/ui/screens/profile/edit/views.cljs +++ b/src/status_im/ui/screens/profile/edit/views.cljs @@ -3,14 +3,14 @@ [clojure.string :as string] [re-frame.core :refer [dispatch]] [reagent.core :as reagent] - [status-im.components.camera :as camera] - [status-im.components.chat-icon.screen :refer [my-profile-icon]] - [status-im.components.context-menu :refer [context-menu]] - [status-im.components.react :as react] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.sticky-button :refer [sticky-button]] - [status-im.components.text-input-with-label.view :refer [text-input-with-label]] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.camera :as camera] + [status-im.ui.components.chat-icon.screen :refer [my-profile-icon]] + [status-im.ui.components.context-menu :refer [context-menu]] + [status-im.ui.components.react :as react] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.sticky-button :refer [sticky-button]] + [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.i18n :refer [label]] [status-im.ui.screens.profile.db :as db] [status-im.ui.screens.profile.events :as profile.events] diff --git a/src/status_im/ui/screens/profile/events.cljs b/src/status_im/ui/screens/profile/events.cljs index 4a8dffbf81..953058c8f3 100644 --- a/src/status_im/ui/screens/profile/events.cljs +++ b/src/status_im/ui/screens/profile/events.cljs @@ -2,7 +2,7 @@ (:require [clojure.spec.alpha :as spec] [clojure.string :as string] [re-frame.core :as re-frame :refer [reg-fx trim-v]] - [status-im.components.react :refer [show-image-picker]] + [status-im.ui.components.react :refer [show-image-picker]] [status-im.constants :refer [console-chat-id]] [status-im.ui.screens.profile.db :as db] [status-im.ui.screens.profile.navigation] diff --git a/src/status_im/ui/screens/profile/photo_capture/views.cljs b/src/status_im/ui/screens/profile/photo_capture/views.cljs index 168b04615c..ff39ea6c5f 100644 --- a/src/status_im/ui/screens/profile/photo_capture/views.cljs +++ b/src/status_im/ui/screens/profile/photo_capture/views.cljs @@ -1,11 +1,11 @@ (ns status-im.ui.screens.profile.photo-capture.views (:require [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im.components.camera :as camera] - [status-im.components.icons.custom-icons :as custom-icons] - [status-im.components.react :as react] - [status-im.components.status-bar :as status-bar] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.camera :as camera] + [status-im.ui.components.icons.custom-icons :as custom-icons] + [status-im.ui.components.react :as react] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.i18n :as i18n] [status-im.ui.screens.profile.photo-capture.styles :as styles] [status-im.utils.image-processing :as image-processing] diff --git a/src/status_im/ui/screens/profile/qr_code/styles.cljs b/src/status_im/ui/screens/profile/qr_code/styles.cljs index 20b4bb159d..cce348887f 100644 --- a/src/status_im/ui/screens/profile/qr_code/styles.cljs +++ b/src/status_im/ui/screens/profile/qr_code/styles.cljs @@ -1,5 +1,5 @@ (ns status-im.ui.screens.profile.qr-code.styles - (:require [status-im.components.styles :refer [color-white]])) + (:require [status-im.ui.components.styles :refer [color-white]])) (def photo-container {:flex 0.2 diff --git a/src/status_im/ui/screens/profile/qr_code/views.cljs b/src/status_im/ui/screens/profile/qr_code/views.cljs index fc4b7e2cc8..df36d6a4c3 100644 --- a/src/status_im/ui/screens/profile/qr_code/views.cljs +++ b/src/status_im/ui/screens/profile/qr_code/views.cljs @@ -1,10 +1,10 @@ (ns status-im.ui.screens.profile.qr-code.views (:require [clojure.string :as string] [re-frame.core :refer [dispatch]] - [status-im.components.qr-code :refer [qr-code]] - [status-im.components.react :as react] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.status-bar :refer [status-bar]] + [status-im.ui.components.qr-code :refer [qr-code]] + [status-im.ui.components.react :as react] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.status-bar :refer [status-bar]] [status-im.i18n :refer [label]] [status-im.ui.screens.profile.qr-code.styles :as styles] [status-im.utils.eip.eip67 :as eip67]) diff --git a/src/status_im/ui/screens/profile/styles.cljs b/src/status_im/ui/screens/profile/styles.cljs index 46820c577d..4595ad878b 100644 --- a/src/status_im/ui/screens/profile/styles.cljs +++ b/src/status_im/ui/screens/profile/styles.cljs @@ -1,5 +1,5 @@ (ns status-im.ui.screens.profile.styles - (:require [status-im.components.styles + (:require [status-im.ui.components.styles :as styles :refer [color-black diff --git a/src/status_im/ui/screens/profile/views.cljs b/src/status_im/ui/screens/profile/views.cljs index 25b6ade715..e145b1811b 100644 --- a/src/status_im/ui/screens/profile/views.cljs +++ b/src/status_im/ui/screens/profile/views.cljs @@ -1,26 +1,26 @@ (ns status-im.ui.screens.profile.views (:require [clojure.string :as string] [re-frame.core :refer [dispatch]] - [status-im.components.action-button.action-button + [status-im.ui.components.action-button.action-button :refer [action-button action-button-disabled action-separator]] - [status-im.components.action-button.styles :refer [actions-list]] - [status-im.components.chat-icon.screen :refer [my-profile-icon]] - [status-im.components.common.common :as common] - [status-im.components.context-menu :refer [context-menu]] - [status-im.components.list-selection :refer [share-options]] - [status-im.components.react :as react] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.status-bar :refer [status-bar]] - [status-im.components.styles :refer [color-blue]] - [status-im.components.toolbar.actions :as actions] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.action-button.styles :refer [actions-list]] + [status-im.ui.components.chat-icon.screen :refer [my-profile-icon]] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.context-menu :refer [context-menu]] + [status-im.ui.components.list-selection :refer [share-options]] + [status-im.ui.components.react :as react] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.styles :refer [color-blue]] + [status-im.ui.components.toolbar.actions :as actions] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.i18n :refer [label]] [status-im.ui.screens.profile.styles :as styles] [status-im.utils.datetime :as time] [status-im.utils.utils :refer [hash-tag?]] [status-im.utils.config :as config] - [status-im.components.icons.vector-icons :as vector-icons]) + [status-im.ui.components.icons.vector-icons :as vector-icons]) (:require-macros [status-im.utils.views :refer [defview letsubs]])) (defn my-profile-toolbar [] diff --git a/src/status_im/ui/screens/qr_scanner/events.cljs b/src/status_im/ui/screens/qr_scanner/events.cljs index a4d993620a..14650d814f 100644 --- a/src/status_im/ui/screens/qr_scanner/events.cljs +++ b/src/status_im/ui/screens/qr_scanner/events.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.qr-scanner.events (:require [re-frame.core :as re-frame] - [status-im.components.camera :as camera] + [status-im.ui.components.camera :as camera] [status-im.ui.screens.navigation :as nav] [status-im.utils.handlers :as u :refer [register-handler]] [status-im.utils.utils :as utils] diff --git a/src/status_im/ui/screens/qr_scanner/styles.cljs b/src/status_im/ui/screens/qr_scanner/styles.cljs index 476398236e..d81f830a54 100644 --- a/src/status_im/ui/screens/qr_scanner/styles.cljs +++ b/src/status_im/ui/screens/qr_scanner/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.qr-scanner.styles - (:require [status-im.components.styles :refer [color-white]] - [status-im.components.toolbar.styles :as toolbar.styles] + (:require [status-im.ui.components.styles :refer [color-white]] + [status-im.ui.components.toolbar.styles :as toolbar.styles] [status-im.utils.platform :as p])) (def barcode-scanner-container diff --git a/src/status_im/ui/screens/qr_scanner/views.cljs b/src/status_im/ui/screens/qr_scanner/views.cljs index 8451a3b563..7ca5c2072d 100644 --- a/src/status_im/ui/screens/qr_scanner/views.cljs +++ b/src/status_im/ui/screens/qr_scanner/views.cljs @@ -2,10 +2,10 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [reagent.core :as reagent] [re-frame.core :as re-frame] - [status-im.components.react :as react] - [status-im.components.camera :as camera] - [status-im.components.status-bar :as status-bar] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.react :as react] + [status-im.ui.components.camera :as camera] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.screens.qr-scanner.styles :as styles])) (defview qr-scanner-toolbar [title hide-nav?] diff --git a/src/status_im/ui/screens/views.cljs b/src/status_im/ui/screens/views.cljs index 07cfa19e33..f1f5a1e5a8 100644 --- a/src/status_im/ui/screens/views.cljs +++ b/src/status_im/ui/screens/views.cljs @@ -2,10 +2,10 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [re-frame.core :refer [dispatch]] [status-im.utils.platform :refer [android?]] - [status-im.components.react :refer [view modal]] - [status-im.components.styles :as common-styles] + [status-im.ui.components.react :refer [view modal]] + [status-im.ui.components.styles :as common-styles] [status-im.ui.screens.main-tabs.views :refer [main-tabs]] - [status-im.components.context-menu :refer [menu-context]] + [status-im.ui.components.context-menu :refer [menu-context]] [status-im.ui.screens.accounts.login.views :refer [login]] [status-im.ui.screens.accounts.recover.views :refer [recover recover-modal]] @@ -42,7 +42,7 @@ [status-im.ui.screens.wallet.transactions.views :as wallet-transactions] [status-im.ui.screens.wallet.send.transaction-sent.views :refer [transaction-sent transaction-sent-modal]] - [status-im.components.status-bar :as status-bar] + [status-im.ui.components.status-bar :as status-bar] [status-im.ui.screens.discover.search-results.views :as discover-search] [status-im.ui.screens.discover.recent-statuses.views :as discover-recent] diff --git a/src/status_im/ui/screens/wallet/choose_recipient/styles.cljs b/src/status_im/ui/screens/wallet/choose_recipient/styles.cljs index 0561bc01a5..6abe585725 100644 --- a/src/status_im/ui/screens/wallet/choose_recipient/styles.cljs +++ b/src/status_im/ui/screens/wallet/choose_recipient/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.wallet.choose-recipient.styles (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]]) - (:require [status-im.components.styles :as styles])) + (:require [status-im.ui.components.styles :as styles])) (def wallet-container {:flex 1 diff --git a/src/status_im/ui/screens/wallet/choose_recipient/views.cljs b/src/status_im/ui/screens/wallet/choose_recipient/views.cljs index 3f6017a456..37c41ccda8 100644 --- a/src/status_im/ui/screens/wallet/choose_recipient/views.cljs +++ b/src/status_im/ui/screens/wallet/choose_recipient/views.cljs @@ -2,12 +2,12 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [clojure.string :as string] [re-frame.core :as re-frame] - [status-im.components.camera :as camera] - [status-im.components.icons.vector-icons :as vector-icons] - [status-im.components.react :as react] - [status-im.components.status-bar :as status-bar] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.toolbar.actions :as act] + [status-im.ui.components.camera :as camera] + [status-im.ui.components.icons.vector-icons :as vector-icons] + [status-im.ui.components.react :as react] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as act] [status-im.i18n :as i18n] [status-im.ui.screens.wallet.choose-recipient.styles :as styles] [status-im.utils.platform :as platform] diff --git a/src/status_im/ui/screens/wallet/components/animations.cljs b/src/status_im/ui/screens/wallet/components/animations.cljs index f64776850d..c97422fd21 100644 --- a/src/status_im/ui/screens/wallet/components/animations.cljs +++ b/src/status_im/ui/screens/wallet/components/animations.cljs @@ -1,5 +1,5 @@ (ns status-im.ui.screens.wallet.components.animations - (:require [status-im.components.animation :as animation])) + (:require [status-im.ui.components.animation :as animation])) (defn animate-tooltip [bottom-value opacity-value] (fn [] diff --git a/src/status_im/ui/screens/wallet/components/styles.cljs b/src/status_im/ui/screens/wallet/components/styles.cljs index b7e609a236..fc6f4f8fa7 100644 --- a/src/status_im/ui/screens/wallet/components/styles.cljs +++ b/src/status_im/ui/screens/wallet/components/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.wallet.components.styles (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]]) - (:require [status-im.components.styles :as styles])) + (:require [status-im.ui.components.styles :as styles])) (def text-input {:color :white diff --git a/src/status_im/ui/screens/wallet/components/views.cljs b/src/status_im/ui/screens/wallet/components/views.cljs index 9ff9311e9b..f79671590f 100644 --- a/src/status_im/ui/screens/wallet/components/views.cljs +++ b/src/status_im/ui/screens/wallet/components/views.cljs @@ -1,12 +1,12 @@ (ns status-im.ui.screens.wallet.components.views (:require-macros [status-im.utils.views :as views]) - (:require [status-im.components.react :as react] - [status-im.components.styles :as components.styles] + (:require [status-im.ui.components.react :as react] + [status-im.ui.components.styles :as components.styles] [status-im.ui.screens.wallet.components.styles :as styles] [status-im.i18n :as i18n] [reagent.core :as reagent] - [status-im.components.icons.vector-icons :as vector-icons] - [status-im.components.animation :as animation] + [status-im.ui.components.icons.vector-icons :as vector-icons] + [status-im.ui.components.animation :as animation] [status-im.utils.money :as money] [status-im.utils.platform :as platform] [status-im.ui.screens.wallet.components.animations :as animations])) diff --git a/src/status_im/ui/screens/wallet/main/styles.cljs b/src/status_im/ui/screens/wallet/main/styles.cljs index e3d9071177..74f4c76e5a 100644 --- a/src/status_im/ui/screens/wallet/main/styles.cljs +++ b/src/status_im/ui/screens/wallet/main/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.wallet.main.styles (:require-macros [status-im.utils.styles :refer [defstyle]]) - (:require [status-im.components.styles :as styles] + (:require [status-im.ui.components.styles :as styles] [status-im.utils.platform :as platform])) ;; Toolbar diff --git a/src/status_im/ui/screens/wallet/main/views.cljs b/src/status_im/ui/screens/wallet/main/views.cljs index 922bc259a3..206159d50f 100644 --- a/src/status_im/ui/screens/wallet/main/views.cljs +++ b/src/status_im/ui/screens/wallet/main/views.cljs @@ -2,13 +2,13 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [clojure.string :as string] [re-frame.core :as rf] - [status-im.components.button.view :as btn] - [status-im.components.drawer.view :as drawer] - [status-im.components.list.views :as list] - [status-im.components.react :as react] - [status-im.components.icons.vector-icons :as vi] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.toolbar.actions :as act] + [status-im.ui.components.button.view :as btn] + [status-im.ui.components.drawer.view :as drawer] + [status-im.ui.components.list.views :as list] + [status-im.ui.components.react :as react] + [status-im.ui.components.icons.vector-icons :as vi] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as act] [status-im.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.utils.config :as config] @@ -17,8 +17,8 @@ [status-im.utils.utils :as utils] [status-im.ui.screens.wallet.main.styles :as styles] [status-im.ui.screens.wallet.styles :as wallet.styles] - [status-im.components.styles :as components.styles] - [status-im.components.button.styles :as button.styles] + [status-im.ui.components.styles :as components.styles] + [status-im.ui.components.button.styles :as button.styles] [status-im.ui.screens.wallet.views :as wallet.views])) (defn- show-not-implemented! [] diff --git a/src/status_im/ui/screens/wallet/request/styles.cljs b/src/status_im/ui/screens/wallet/request/styles.cljs index a2b4bdc2b3..3962429df1 100644 --- a/src/status_im/ui/screens/wallet/request/styles.cljs +++ b/src/status_im/ui/screens/wallet/request/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.wallet.request.styles (:require-macros [status-im.utils.styles :refer [defstyle]]) - (:require [status-im.components.styles :as styles])) + (:require [status-im.ui.components.styles :as styles])) (def network-container {:flex 1 diff --git a/src/status_im/ui/screens/wallet/request/views.cljs b/src/status_im/ui/screens/wallet/request/views.cljs index 820a892179..2c87919ed8 100644 --- a/src/status_im/ui/screens/wallet/request/views.cljs +++ b/src/status_im/ui/screens/wallet/request/views.cljs @@ -2,20 +2,20 @@ (:require-macros [status-im.utils.views :as views]) (:require [re-frame.core :as re-frame] - [status-im.components.react :as react] - [status-im.components.qr-code :as components.qr-code] - [status-im.components.toolbar.actions :as actions] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.status-bar :as status-bar] + [status-im.ui.components.react :as react] + [status-im.ui.components.qr-code :as components.qr-code] + [status-im.ui.components.toolbar.actions :as actions] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.status-bar :as status-bar] [status-im.ui.screens.wallet.styles :as wallet.styles] - [status-im.components.icons.vector-icons :as vi] + [status-im.ui.components.icons.vector-icons :as vi] [status-im.ui.screens.wallet.components.views :as components] [status-im.ui.screens.wallet.request.styles :as styles] - [status-im.components.styles :as components.styles] + [status-im.ui.components.styles :as components.styles] [status-im.i18n :as i18n] [status-im.utils.platform :as platform] [status-im.utils.eip.eip67 :as eip67] - [status-im.components.common.common :as common])) + [status-im.ui.components.common.common :as common])) (defn toolbar-view [] [toolbar/toolbar {:style wallet.styles/toolbar :hide-border? true} diff --git a/src/status_im/ui/screens/wallet/send/animations.cljs b/src/status_im/ui/screens/wallet/send/animations.cljs index da4842897b..3d9850805a 100644 --- a/src/status_im/ui/screens/wallet/send/animations.cljs +++ b/src/status_im/ui/screens/wallet/send/animations.cljs @@ -1,5 +1,5 @@ (ns status-im.ui.screens.wallet.send.animations - (:require [status-im.components.animation :as animation])) + (:require [status-im.ui.components.animation :as animation])) (defn animate-sign-panel [opacity-value bottom-value] (animation/start diff --git a/src/status_im/ui/screens/wallet/send/styles.cljs b/src/status_im/ui/screens/wallet/send/styles.cljs index 1590407003..a883623b38 100644 --- a/src/status_im/ui/screens/wallet/send/styles.cljs +++ b/src/status_im/ui/screens/wallet/send/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.wallet.send.styles (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]]) - (:require [status-im.components.styles :as styles])) + (:require [status-im.ui.components.styles :as styles])) (def toolbar {:background-color styles/color-blue5 diff --git a/src/status_im/ui/screens/wallet/send/transaction_sent/views.cljs b/src/status_im/ui/screens/wallet/send/transaction_sent/views.cljs index ddca0ae110..02bf9c2119 100644 --- a/src/status_im/ui/screens/wallet/send/transaction_sent/views.cljs +++ b/src/status_im/ui/screens/wallet/send/transaction_sent/views.cljs @@ -1,11 +1,11 @@ (ns status-im.ui.screens.wallet.send.transaction-sent.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) - (:require [status-im.components.react :as react] - [status-im.components.status-bar :as status-bar] - [status-im.components.icons.vector-icons :as vi] + (:require [status-im.ui.components.react :as react] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.icons.vector-icons :as vi] [status-im.ui.screens.wallet.styles :as wallet.styles] [status-im.ui.screens.wallet.send.transaction-sent.styles :as styles] - [status-im.components.styles :as components.styles] + [status-im.ui.components.styles :as components.styles] [re-frame.core :as re-frame] [status-im.ui.screens.wallet.components.views :as components] [status-im.i18n :as i18n] diff --git a/src/status_im/ui/screens/wallet/send/views.cljs b/src/status_im/ui/screens/wallet/send/views.cljs index 10c2e25f47..0a62c0d243 100644 --- a/src/status_im/ui/screens/wallet/send/views.cljs +++ b/src/status_im/ui/screens/wallet/send/views.cljs @@ -1,14 +1,14 @@ (ns status-im.ui.screens.wallet.send.views (:require [re-frame.core :as re-frame] - [status-im.components.animation :as animation] - [status-im.components.camera :as camera] - [status-im.components.common.common :as common] - [status-im.components.icons.vector-icons :as vector-icons] - [status-im.components.react :as react] - [status-im.components.status-bar :as status-bar] - [status-im.components.styles :as components.styles] - [status-im.components.toolbar.actions :as act] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.animation :as animation] + [status-im.ui.components.camera :as camera] + [status-im.ui.components.common.common :as common] + [status-im.ui.components.icons.vector-icons :as vector-icons] + [status-im.ui.components.react :as react] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.styles :as components.styles] + [status-im.ui.components.toolbar.actions :as act] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.i18n :as i18n] [status-im.ui.screens.wallet.components.views :as components] [status-im.ui.screens.wallet.send.animations :as send.animations] diff --git a/src/status_im/ui/screens/wallet/styles.cljs b/src/status_im/ui/screens/wallet/styles.cljs index 9d762b1653..28f2682010 100644 --- a/src/status_im/ui/screens/wallet/styles.cljs +++ b/src/status_im/ui/screens/wallet/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.wallet.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.components.styles :as styles])) + (:require [status-im.ui.components.styles :as styles])) ;; errors diff --git a/src/status_im/ui/screens/wallet/transactions/styles.cljs b/src/status_im/ui/screens/wallet/transactions/styles.cljs index d286e9f5e5..1eceb455e6 100644 --- a/src/status_im/ui/screens/wallet/transactions/styles.cljs +++ b/src/status_im/ui/screens/wallet/transactions/styles.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.wallet.transactions.styles (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]]) - (:require [status-im.components.styles :as styles] - [status-im.components.tabs.styles :as tabs.styles] + (:require [status-im.ui.components.styles :as styles] + [status-im.ui.components.tabs.styles :as tabs.styles] [status-im.utils.platform :as platform])) (def error-container diff --git a/src/status_im/ui/screens/wallet/transactions/views.cljs b/src/status_im/ui/screens/wallet/transactions/views.cljs index 8e3244fb2b..7d793567b5 100644 --- a/src/status_im/ui/screens/wallet/transactions/views.cljs +++ b/src/status_im/ui/screens/wallet/transactions/views.cljs @@ -1,14 +1,14 @@ (ns status-im.ui.screens.wallet.transactions.views (:require [re-frame.core :as re-frame] - [status-im.components.button.view :as button] - [status-im.components.checkbox.view :as checkbox] - [status-im.components.list.views :as list] - [status-im.components.react :as react] - [status-im.components.status-bar :as status-bar] - [status-im.components.styles :as styles] - [status-im.components.tabs.views :as tabs] - [status-im.components.toolbar.actions :as actions] - [status-im.components.toolbar.view :as toolbar] + [status-im.ui.components.button.view :as button] + [status-im.ui.components.checkbox.view :as checkbox] + [status-im.ui.components.list.views :as list] + [status-im.ui.components.react :as react] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.styles :as styles] + [status-im.ui.components.tabs.views :as tabs] + [status-im.ui.components.toolbar.actions :as actions] + [status-im.ui.components.toolbar.view :as toolbar] [status-im.i18n :as i18n] [status-im.ui.screens.wallet.transactions.styles :as transactions.styles] [status-im.ui.screens.wallet.views :as wallet.views] diff --git a/src/status_im/ui/screens/wallet/views.cljs b/src/status_im/ui/screens/wallet/views.cljs index 07542aa16f..42f319d323 100644 --- a/src/status_im/ui/screens/wallet/views.cljs +++ b/src/status_im/ui/screens/wallet/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.wallet.views - (:require [status-im.components.react :as react] + (:require [status-im.ui.components.react :as react] [status-im.ui.screens.wallet.styles :as styles] - [status-im.components.icons.vector-icons :as vector-icons] + [status-im.ui.components.icons.vector-icons :as vector-icons] [status-im.i18n :as i18n])) (defn- message-view [icon-container-style label] diff --git a/src/status_im/ui/screens/wallet/wallet_list/styles.cljs b/src/status_im/ui/screens/wallet/wallet_list/styles.cljs index 51d7d467f1..cca0ce7396 100644 --- a/src/status_im/ui/screens/wallet/wallet_list/styles.cljs +++ b/src/status_im/ui/screens/wallet/wallet_list/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.wallet.wallet-list.styles (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]]) - (:require [status-im.components.styles :as st] + (:require [status-im.ui.components.styles :as st] [status-im.utils.platform :as platform])) (def screen-container diff --git a/src/status_im/ui/screens/wallet/wallet_list/views.cljs b/src/status_im/ui/screens/wallet/wallet_list/views.cljs index f5baa3312c..069f359b5a 100644 --- a/src/status_im/ui/screens/wallet/wallet_list/views.cljs +++ b/src/status_im/ui/screens/wallet/wallet_list/views.cljs @@ -2,11 +2,11 @@ (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [clojure.string :as string] [re-frame.core :as re-frame] - [status-im.components.list.views :as list] - [status-im.components.react :as react] - [status-im.components.status-bar :as status-bar] - [status-im.components.toolbar.view :as toolbar] - [status-im.components.toolbar.actions :as actions] + [status-im.ui.components.list.views :as list] + [status-im.ui.components.react :as react] + [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as actions] [status-im.i18n :as i18n] [status-im.ui.screens.wallet.wallet-list.styles :as styles] [status-im.utils.utils :as utils])) diff --git a/src/status_im/utils/notifications.cljs b/src/status_im/utils/notifications.cljs index 3fe16e94a5..22bbee41a0 100644 --- a/src/status_im/utils/notifications.cljs +++ b/src/status_im/utils/notifications.cljs @@ -4,7 +4,7 @@ [status-im.react-native.js-dependencies :as rn] [status-im.utils.config :as config] [status-im.utils.utils :as utils] - [status-im.components.react :refer [copy-to-clipboard]] + [status-im.ui.components.react :refer [copy-to-clipboard]] [taoensso.timbre :as log])) ;; Work in progress namespace responsible for push notifications and interacting diff --git a/test/cljs/status_im/test/components/main_tabs.cljs b/test/cljs/status_im/test/components/main_tabs.cljs deleted file mode 100644 index c43ca77abe..0000000000 --- a/test/cljs/status_im/test/components/main_tabs.cljs +++ /dev/null @@ -1,3 +0,0 @@ -(ns status-im.test.components.main-tabs - (:require [cljs.test :refer-macros [deftest is testing]] - [status-im.ui.screens.main-tabs.views :as tabs])) diff --git a/test/cljs/status_im/test/runner.cljs b/test/cljs/status_im/test/runner.cljs index 4680e5f1e9..35278728bb 100644 --- a/test/cljs/status_im/test/runner.cljs +++ b/test/cljs/status_im/test/runner.cljs @@ -8,7 +8,6 @@ [status-im.test.profile.events] [status-im.test.bots.events] [status-im.test.chat.models.input] - [status-im.test.components.main-tabs] [status-im.test.i18n] [status-im.test.utils.utils] [status-im.test.utils.money] @@ -39,7 +38,6 @@ 'status-im.test.bots.events 'status-im.test.wallet.transactions.subs 'status-im.test.chat.models.input - 'status-im.test.components.main-tabs 'status-im.test.i18n 'status-im.test.utils.utils 'status-im.test.utils.money