From 6f9bcd1bb1754f7735d33e966717c82e32415c2f Mon Sep 17 00:00:00 2001 From: flexsurfer Date: Tue, 17 Oct 2023 17:27:18 +0200 Subject: [PATCH] rename quo2 (#17660) --- Makefile | 1 - RELEASES.md | 2 +- scripts/lint-old-quo-usage.sh | 13 - scripts/lint-re-frame-in-quo-components.sh | 4 +- shadow-cljs.edn | 2 +- src/{quo2 => quo}/README.md | 26 +- .../animated_header_flatlist/style.cljs | 4 +- .../animated_header_flatlist/view.cljs | 10 +- .../account_avatar/component_spec.cljs | 8 +- .../avatars/account_avatar/style.cljs | 4 +- .../avatars/account_avatar/view.cljs | 6 +- .../channel_avatar/component_spec.cljs | 4 +- .../avatars/channel_avatar/style.cljs | 4 +- .../avatars/channel_avatar/view.cljs | 12 +- .../collection_avatar/component_spec.cljs | 6 +- .../avatars/collection_avatar/style.cljs | 4 +- .../avatars/collection_avatar/view.cljs | 6 +- .../components/avatars/group_avatar.cljs | 0 .../avatars/group_avatar/style.cljs | 4 +- .../components/avatars/group_avatar/view.cljs | 10 +- .../components/avatars/icon_avatar.cljs | 8 +- .../avatars/user_avatar/component_spec.cljs | 4 +- .../components/avatars/user_avatar/style.cljs | 4 +- .../components/avatars/user_avatar/view.cljs | 12 +- .../avatars/wallet_user_avatar.cljs | 8 +- .../banners/banner/component_spec.cljs | 4 +- .../components/banners/banner/style.cljs | 4 +- .../components/banners/banner/view.cljs | 14 +- .../browser/browser_input/component_spec.cljs | 4 +- .../browser/browser_input/style.cljs | 6 +- .../browser/browser_input/view.cljs | 12 +- .../buttons/button/component_spec.cljs | 4 +- .../components/buttons/button/properties.cljs | 4 +- .../components/buttons/button/style.cljs | 2 +- .../components/buttons/button/view.cljs | 22 +- .../composer_button/component_spec.cljs | 4 +- .../buttons/composer_button/style.cljs | 4 +- .../buttons/composer_button/view.cljs | 10 +- .../buttons/dynamic_button/style.cljs | 2 +- .../buttons/dynamic_button/view.cljs | 12 +- .../predictive_keyboard/component_spec.cljs | 4 +- .../buttons/predictive_keyboard/style.cljs | 2 +- .../buttons/predictive_keyboard/view.cljs | 12 +- .../buttons/slide_button/animations.cljs | 4 +- .../buttons/slide_button/component_spec.cljs | 6 +- .../buttons/slide_button/constants.cljs | 2 +- .../buttons/slide_button/style.cljs | 6 +- .../buttons/slide_button/utils.cljs | 6 +- .../components/buttons/slide_button/view.cljs | 18 +- .../buttons/wallet_button/component_spec.cljs | 4 +- .../buttons/wallet_button/style.cljs | 4 +- .../buttons/wallet_button/view.cljs | 12 +- .../buttons/wallet_ctas/component_spec.cljs | 4 +- .../components/buttons/wallet_ctas/style.cljs | 2 +- .../components/buttons/wallet_ctas/view.cljs | 12 +- .../calendar/calendar/component_spec.cljs | 4 +- .../calendar/calendar/days_grid/style.cljs | 2 +- .../calendar/calendar/days_grid/utils.cljs | 2 +- .../calendar/days_grid/utils_test.cljs | 4 +- .../calendar/calendar/days_grid/view.cljs | 8 +- .../calendar/month_picker/component_spec.cljs | 4 +- .../calendar/calendar/month_picker/style.cljs | 4 +- .../calendar/calendar/month_picker/utils.cljs | 2 +- .../calendar/month_picker/utils_test.cljs | 4 +- .../calendar/calendar/month_picker/view.cljs | 12 +- .../components/calendar/calendar/style.cljs | 4 +- .../components/calendar/calendar/utils.cljs | 2 +- .../calendar/calendar/utils_test.cljs | 4 +- .../components/calendar/calendar/view.cljs | 16 +- .../calendar/weekdays_header/style.cljs | 4 +- .../calendar/weekdays_header/view.cljs | 8 +- .../calendar/calendar/years_list/style.cljs | 4 +- .../calendar/calendar/years_list/view.cljs | 10 +- .../calendar/calendar_day/component_spec.cljs | 4 +- .../calendar/calendar_day/style.cljs | 4 +- .../calendar/calendar_day/view.cljs | 8 +- .../calendar_year/component_spec.cljs | 4 +- .../calendar/calendar_year/style.cljs | 4 +- .../calendar/calendar_year/view.cljs | 8 +- .../components/code/common/style.cljs | 4 +- .../components/code/common/view.cljs | 8 +- .../components/code/snippet/view.cljs | 6 +- .../components/code/snippet_preview/view.cljs | 4 +- .../components/colors/color/style.cljs | 4 +- .../components/colors/color/view.cljs | 10 +- .../colors/color_picker/component_spec.cljs | 4 +- .../components/colors/color_picker/view.cljs | 4 +- .../components/common/no_flicker_image.cljs | 2 +- .../common/not_implemented/style.cljs | 4 +- .../common/not_implemented/view.cljs | 6 +- .../common/notification_dot/style.cljs | 4 +- .../common/notification_dot/view.cljs | 6 +- src/quo/components/common/separator/view.cljs | 16 + .../common/unread_grey_dot/style.cljs | 4 +- .../common/unread_grey_dot/view.cljs | 4 +- .../components/community/banner/style.cljs | 6 +- .../components/community/banner/view.cljs | 10 +- .../components/community/channel_actions.cljs | 10 +- .../community/community_card_view.cljs | 10 +- .../community/community_list_view.cljs | 20 +- .../components/community/community_view.cljs | 16 +- .../components/community/icon.cljs | 2 +- .../components/community/style.cljs | 6 +- .../components/community/token_gating.cljs | 10 +- .../counter/counter/component_spec.cljs | 4 +- .../components/counter/counter/style.cljs | 4 +- .../components/counter/counter/view.cljs | 10 +- .../counter/step/component_spec.cljs | 4 +- .../components/counter/step/style.cljs | 4 +- .../components/counter/step/view.cljs | 8 +- .../components/dividers/date.cljs | 8 +- .../divider_label/component_spec.cljs | 4 +- .../dividers/divider_label/style.cljs | 4 +- .../dividers/divider_label/view.cljs | 12 +- .../dividers/divider_line/style.cljs | 4 +- .../dividers/divider_line/view.cljs | 6 +- .../components/dividers/new_messages.cljs | 8 +- .../strength_divider/component_spec.cljs | 4 +- .../dividers/strength_divider/style.cljs | 2 +- .../dividers/strength_divider/view.cljs | 10 +- .../action_drawers/component_spec.cljs | 4 +- .../drawers/action_drawers/style.cljs | 4 +- .../drawers/action_drawers/view.cljs | 12 +- .../bottom_actions/component_spec.cljs | 4 +- .../drawers/bottom_actions/style.cljs | 4 +- .../drawers/bottom_actions/view.cljs | 10 +- .../documentation_drawers/component_spec.cljs | 4 +- .../drawers/documentation_drawers/style.cljs | 4 +- .../drawers/documentation_drawers/view.cljs | 10 +- .../drawer_buttons/component_spec.cljs | 4 +- .../drawers/drawer_buttons/style.cljs | 4 +- .../drawers/drawer_buttons/view.cljs | 10 +- .../drawers/drawer_top/component_spec.cljs | 4 +- .../components/drawers/drawer_top/style.cljs | 4 +- .../components/drawers/drawer_top/view.cljs | 22 +- .../permission_context/component_spec.cljs | 4 +- .../drawers/permission_context/style.cljs | 4 +- .../drawers/permission_context/view.cljs | 6 +- .../dropdowns/dropdown/component_spec.cljs | 4 +- .../dropdowns/dropdown/properties.cljs | 4 +- .../components/dropdowns/dropdown/style.cljs | 2 +- .../components/dropdowns/dropdown/view.cljs | 14 +- .../network_dropdown/component_spec.cljs | 6 +- .../dropdowns/network_dropdown/style.cljs | 4 +- .../dropdowns/network_dropdown/view.cljs | 8 +- .../empty_state/empty_state/styles.cljs | 4 +- .../empty_state/empty_state/view.cljs | 10 +- .../gradient_cover/component_spec.cljs | 4 +- .../gradient/gradient_cover/style.cljs | 2 +- .../gradient/gradient_cover/view.cljs | 8 +- .../interactive_graph/component_spec.cljs | 4 +- .../graph/interactive_graph/style.cljs | 4 +- .../graph/interactive_graph/view.cljs | 10 +- src/{quo2 => quo}/components/graph/utils.cljs | 2 +- .../components/graph/utils_test.cljs | 4 +- .../graph/wallet_graph/component_spec.cljs | 4 +- .../components/graph/wallet_graph/style.cljs | 4 +- .../components/graph/wallet_graph/view.cljs | 12 +- src/{quo2 => quo}/components/header.cljs | 10 +- src/{quo2 => quo}/components/icon.cljs | 10 +- src/{quo2 => quo}/components/icons/icons.clj | 2 +- src/{quo2 => quo}/components/icons/icons.cljs | 4 +- src/{quo2 => quo}/components/icons/svg.cljs | 4 +- .../components/info/info_message.cljs | 12 +- .../info/information_box/component_spec.cljs | 4 +- .../info/information_box/style.cljs | 4 +- .../components/info/information_box/view.cljs | 12 +- .../inputs/address_input/component_spec.cljs | 6 +- .../inputs/address_input/style.cljs | 6 +- .../components/inputs/address_input/view.cljs | 12 +- .../inputs/input/component_spec.cljs | 4 +- .../components/inputs/input/style.cljs | 6 +- .../components/inputs/input/view.cljs | 10 +- .../inputs/locked_input/component_spec.cljs | 4 +- .../components/inputs/locked_input/style.cljs | 4 +- .../components/inputs/locked_input/view.cljs | 12 +- .../inputs/profile_input/component_spec.cljs | 4 +- .../inputs/profile_input/style.cljs | 4 +- .../components/inputs/profile_input/view.cljs | 10 +- .../recovery_phrase/component_spec.cljs | 4 +- .../inputs/recovery_phrase/style.cljs | 6 +- .../inputs/recovery_phrase/view.cljs | 6 +- .../components/inputs/search_input/style.cljs | 6 +- .../components/inputs/search_input/view.cljs | 8 +- .../inputs/title_input/component_spec.cljs | 4 +- .../components/inputs/title_input/style.cljs | 4 +- .../components/inputs/title_input/view.cljs | 10 +- .../components/keycard/component_spec.cljs | 4 +- .../components/keycard/style.cljs | 4 +- .../components/keycard/view.cljs | 12 +- .../links/link_preview/component_spec.cljs | 4 +- .../components/links/link_preview/style.cljs | 4 +- .../components/links/link_preview/view.cljs | 8 +- .../links/url_preview/component_spec.cljs | 4 +- .../components/links/url_preview/style.cljs | 4 +- .../components/links/url_preview/view.cljs | 10 +- .../url_preview_list/component_spec.cljs | 4 +- .../links/url_preview_list/style.cljs | 2 +- .../links/url_preview_list/view.cljs | 6 +- .../list_items/account/component_spec.cljs | 6 +- .../components/list_items/account/style.cljs | 4 +- .../components/list_items/account/view.cljs | 14 +- .../account_list_card/component_spec.cljs | 4 +- .../list_items/account_list_card/style.cljs | 4 +- .../list_items/account_list_card/view.cljs | 14 +- .../list_items/address/component_spec.cljs | 6 +- .../components/list_items/address/style.cljs | 4 +- .../components/list_items/address/view.cljs | 12 +- .../list_items/channel/component_spec.cljs | 4 +- .../components/list_items/channel/style.cljs | 4 +- .../components/list_items/channel/view.cljs | 18 +- .../list_items/community/component_spec.cljs | 4 +- .../list_items/community/style.cljs | 6 +- .../components/list_items/community/view.cljs | 16 +- .../list_items/dapp/component_spec.cljs | 4 +- .../components/list_items/dapp/style.cljs | 4 +- .../components/list_items/dapp/view.cljs | 12 +- .../components/list_items/menu_item.cljs | 8 +- .../list_items/preview_list/properties.cljs | 2 +- .../list_items/preview_list/view.cljs | 12 +- .../saved_address/component_spec.cljs | 6 +- .../list_items/saved_address/style.cljs | 4 +- .../list_items/saved_address/view.cljs | 14 +- .../saved_contact_address/component_spec.cljs | 6 +- .../saved_contact_address/style.cljs | 4 +- .../saved_contact_address/view.cljs | 16 +- .../token_value/component_spec.cljs | 4 +- .../list_items/token_value/style.cljs | 4 +- .../list_items/token_value/view.cljs | 16 +- .../components/list_items/user_list.cljs | 14 +- .../components/loaders/skeleton.cljs | 8 +- .../loaders/skeleton_list/component_spec.cljs | 6 +- .../loaders/skeleton_list/constants.cljs | 2 +- .../loaders/skeleton_list/style.cljs | 4 +- .../loaders/skeleton_list/view.cljs | 10 +- .../markdown/list/component_spec.cljs | 4 +- .../components/markdown/list/style.cljs | 2 +- .../components/markdown/list/view.cljs | 16 +- .../components/markdown/text.cljs | 8 +- .../markdown/text_component_spec.cljs | 4 +- .../components/messages/author/style.cljs | 4 +- .../components/messages/author/view.cljs | 10 +- .../components/messages/gap.cljs | 10 +- .../messages/system_message/style.cljs | 4 +- .../messages/system_message/view.cljs | 12 +- .../navigation/bottom_nav_tab/styles.cljs | 4 +- .../navigation/bottom_nav_tab/view.cljs | 10 +- .../floating_shell_button/style.cljs | 2 +- .../floating_shell_button/view.cljs | 6 +- .../components/navigation/page_nav/style.cljs | 4 +- .../components/navigation/page_nav/view.cljs | 22 +- .../navigation/top_nav/component_spec.cljs | 4 +- .../components/navigation/top_nav/style.cljs | 2 +- .../components/navigation/top_nav/view.cljs | 14 +- .../notifications/activity_log/style.cljs | 4 +- .../notifications/activity_log/view.cljs | 16 +- .../activity_logs_photos/style.cljs | 2 +- .../activity_logs_photos/view.cljs | 6 +- .../notifications/count_down_circle.cljs | 6 +- .../notification/component_spec.cljs | 6 +- .../notifications/notification/style.cljs | 6 +- .../notifications/notification/view.cljs | 6 +- .../components/notifications/toast/style.cljs | 6 +- .../components/notifications/toast/view.cljs | 14 +- .../keyboard_key/component_spec.cljs | 4 +- .../numbered_keyboard/keyboard_key/style.cljs | 4 +- .../numbered_keyboard/keyboard_key/view.cljs | 10 +- .../numbered_keyboard/style.cljs | 2 +- .../numbered_keyboard/view.cljs | 8 +- .../small_option_card/component_spec.cljs | 4 +- .../onboarding/small_option_card/style.cljs | 4 +- .../onboarding/small_option_card/view.cljs | 10 +- .../password/tips/component_spec.cljs | 4 +- .../components/password/tips/style.cljs | 4 +- .../components/password/tips/view.cljs | 6 +- .../components/profile/collectible/style.cljs | 4 +- .../components/profile/collectible/view.cljs | 6 +- .../profile/profile_card/style.cljs | 4 +- .../components/profile/profile_card/view.cljs | 16 +- .../select_profile/component_spec.cljs | 4 +- .../profile/select_profile/style.cljs | 4 +- .../profile/select_profile/view.cljs | 8 +- .../profile/showcase_nav/component_spec.cljs | 4 +- .../profile/showcase_nav/style.cljs | 4 +- .../components/profile/showcase_nav/view.cljs | 8 +- .../record_audio/buttons/delete_button.cljs | 10 +- .../record_audio/buttons/lock_button.cljs | 12 +- .../record_audio/buttons/record_button.cljs | 8 +- .../buttons/record_button_big.cljs | 10 +- .../record_audio/buttons/send_button.cljs | 10 +- .../record_audio/component_spec.cljs | 4 +- .../record_audio/record_audio/helpers.cljs | 2 +- .../record_audio/record_audio/style.cljs | 4 +- .../record_audio/record_audio/view.cljs | 24 +- .../soundtrack/component_spec.cljs | 4 +- .../record_audio/soundtrack/style.cljs | 2 +- .../record_audio/soundtrack/view.cljs | 8 +- .../selectors/disclaimer/component_spec.cljs | 4 +- .../selectors/disclaimer/style.cljs | 4 +- .../components/selectors/disclaimer/view.cljs | 8 +- .../selectors/filter/component_spec.cljs | 4 +- .../components/selectors/filter/style.cljs | 4 +- .../components/selectors/filter/view.cljs | 8 +- .../components/selectors/react/style.cljs | 2 +- .../components/selectors/react/view.cljs | 6 +- .../selectors/react_selector/style.cljs | 4 +- .../selectors/react_selector/view.cljs | 14 +- .../selectors/reaction_resource.clj | 2 +- .../selectors/reaction_resource.cljs | 4 +- .../reactions_selector/component_spec.cljs | 4 +- .../selectors/reactions_selector/style.cljs | 4 +- .../selectors/reactions_selector/view.cljs | 6 +- .../selectors/selectors/component_spec.cljs | 4 +- .../components/selectors/selectors/style.cljs | 4 +- .../components/selectors/selectors/view.cljs | 8 +- .../components/settings/accounts/style.cljs | 4 +- .../components/settings/accounts/view.cljs | 12 +- .../settings/category/component_spec.cljs | 4 +- .../settings/category/reorder/view.cljs | 14 +- .../settings/category/settings/view.cljs | 12 +- .../components/settings/category/style.cljs | 4 +- .../components/settings/category/view.cljs | 10 + .../settings/data_item/component_spec.cljs | 4 +- .../components/settings/data_item/style.cljs | 4 +- .../components/settings/data_item/view.cljs | 20 +- .../settings/privacy_option/style.cljs | 4 +- .../settings/privacy_option/view.cljs | 14 +- .../settings/reorder_item/component_spec.cljs | 6 +- .../settings/reorder_item/items/item.cljs | 12 +- .../reorder_item/items/item_placeholder.cljs | 6 +- .../reorder_item/items/item_skeleton.cljs | 9 + .../reorder_item/items/item_tabs.cljs | 14 +- .../settings/reorder_item/style.cljs | 4 +- .../settings/reorder_item/types.cljs | 2 +- .../settings/reorder_item/view.cljs | 16 + .../settings/section_label/view.cljs | 8 +- .../settings_item/component_spec.cljs | 4 +- .../settings/settings_item/style.cljs | 4 +- .../settings/settings_item/view.cljs | 24 +- .../components/share/qr_code/style.cljs | 4 +- .../components/share/qr_code/view.cljs | 12 +- .../share/share_qr_code/component_spec.cljs | 4 +- .../components/share/share_qr_code/style.cljs | 4 +- .../components/share/share_qr_code/view.cljs | 12 +- .../switchers/base_card/component_spec.cljs | 6 +- .../components/switchers/base_card/style.cljs | 4 +- .../components/switchers/base_card/view.cljs | 6 +- .../switchers/card_content/style.cljs | 4 +- .../switchers/card_content/view.cljs | 16 +- .../switchers/card_main_info/style.cljs | 6 + .../switchers/card_main_info/view.cljs | 6 +- .../group_messaging_card/component_spec.cljs | 6 +- .../switchers/group_messaging_card/style.cljs | 4 +- .../switchers/group_messaging_card/view.cljs | 14 +- .../components/switchers/utils.cljs | 2 +- .../components/tabs/account_selector.cljs | 14 +- .../components/tabs/segmented_tab.cljs | 8 +- .../components/tabs/tab/style.cljs | 4 +- .../components/tabs/tab/view.cljs | 12 +- .../components/tabs/tabs/style.cljs | 2 +- .../components/tabs/tabs/view.cljs | 8 +- .../components/tags/base_tag.cljs | 2 +- .../components/tags/context_tag/style.cljs | 4 +- .../components/tags/context_tag/view.cljs | 20 +- .../tags/network_tags/component_spec.cljs | 4 +- .../components/tags/network_tags/style.cljs | 4 +- .../components/tags/network_tags/view.cljs | 10 +- .../tags/number_tag/component_spec.cljs | 4 +- .../components/tags/number_tag/style.cljs | 4 +- .../components/tags/number_tag/view.cljs | 10 +- .../components/tags/permission_tag.cljs | 10 +- .../components/tags/status_tags.cljs | 10 +- .../tags/status_tags_component_spec.cljs | 6 +- src/{quo2 => quo}/components/tags/tag.cljs | 12 +- src/{quo2 => quo}/components/tags/tags.cljs | 4 +- .../tags/tiny_tag/component_spec.cljs | 4 +- .../components/tags/tiny_tag/style.cljs | 4 +- .../components/tags/tiny_tag/view.cljs | 8 +- .../components/tags/token_tag.cljs | 10 +- .../components/text_combinations/style.cljs | 2 +- .../components/text_combinations/view.cljs | 8 +- .../wallet/account_card/component_spec.cljs | 4 +- .../components/wallet/account_card/style.cljs | 4 +- .../components/wallet/account_card/view.cljs | 16 +- .../wallet/account_origin/component_spec.cljs | 4 +- .../wallet/account_origin/style.cljs | 4 +- .../wallet/account_origin/view.cljs | 14 +- .../account_overview/component_spec.cljs | 4 +- .../wallet/account_overview/style.cljs | 4 +- .../wallet/account_overview/view.cljs | 12 +- .../wallet/keypair/component_spec.cljs | 4 +- .../components/wallet/keypair/style.cljs | 4 +- .../components/wallet/keypair/view.cljs | 20 +- .../wallet/network_amount/component_spec.cljs | 4 +- .../wallet/network_amount/style.cljs | 4 +- .../wallet/network_amount/view.cljs | 10 +- .../wallet/network_bridge/component_spec.cljs | 4 +- .../wallet/network_bridge/style.cljs | 4 +- .../wallet/network_bridge/view.cljs | 14 +- .../components/wallet/network_link/view.cljs | 6 +- .../wallet/progress_bar/component_spec.cljs | 6 +- .../components/wallet/progress_bar/style.cljs | 4 +- .../components/wallet/progress_bar/view.cljs | 6 +- .../wallet/summary_info/component_spec.cljs | 4 +- .../components/wallet/summary_info/style.cljs | 4 +- .../components/wallet/summary_info/view.cljs | 16 +- .../wallet/token_input/component_spec.cljs | 4 +- .../components/wallet/token_input/style.cljs | 6 +- .../components/wallet/token_input/view.cljs | 20 +- .../transaction_summary/component_spec.cljs | 4 +- .../wallet/transaction_summary/style.cljs | 4 +- .../wallet/transaction_summary/view.cljs | 12 +- .../wallet_activity/component_spec.cljs | 4 +- .../wallet/wallet_activity/style.cljs | 4 +- .../wallet/wallet_activity/view.cljs | 12 +- .../wallet_overview/component_spec.cljs | 4 +- .../wallet/wallet_overview/style.cljs | 4 +- .../wallet/wallet_overview/view.cljs | 12 +- src/quo/core.cljs | 381 ++++++++++++++++++ src/quo/core_spec.cljs | 86 ++++ src/{quo2 => quo}/foundations/colors.cljs | 4 +- .../foundations/colors_test.cljs | 4 +- src/{quo2 => quo}/foundations/common.cljs | 2 +- .../foundations/customization_colors.cljs | 4 +- src/{quo2 => quo}/foundations/resources.cljs | 2 +- src/{quo2 => quo}/foundations/shadows.cljs | 6 +- src/{quo2 => quo}/foundations/typography.cljs | 2 +- src/{quo2 => quo}/theme.cljs | 6 +- ...-page-should-match-image-render-button.png | Bin 145933 -> 0 bytes src/quo2/__visual_tests__/button.e2e.js | 49 --- .../components/common/separator/view.cljs | 16 - .../components/settings/category/view.cljs | 10 - .../reorder_item/items/item_skeleton.cljs | 9 - .../settings/reorder_item/view.cljs | 16 - .../switchers/card_main_info/style.cljs | 6 - src/quo2/core.cljs | 381 ------------------ src/quo2/core_spec.cljs | 86 ---- src/status_im/bottom_sheet/sheets.cljs | 2 +- src/status_im/bottom_sheet/styles.cljs | 2 +- src/status_im/communities/core.cljs | 8 +- src/status_im/multiaccounts/core.cljs | 2 +- src/status_im/signals/core.cljs | 2 +- .../ui/components/chat_icon/screen.cljs | 6 +- src/status_im/ui/components/topbar.cljs | 6 +- .../ui/screens/chat/message/gap.cljs | 4 +- .../ui/screens/chat/message/legacy_view.cljs | 6 +- .../screens/chat/styles/message/message.cljs | 8 +- .../ui/screens/home/views/inner_item.cljs | 24 +- .../ui/screens/profile/contact/views.cljs | 4 +- .../ui/screens/profile/user/views.cljs | 8 +- .../profile/visibility_status/styles.cljs | 4 +- .../profile/visibility_status/utils.cljs | 8 +- src/status_im/ui/screens/screens.cljs | 2 +- .../ui/screens/wallet/account/views.cljs | 24 +- .../ui/screens/wallet/accounts/common.cljs | 12 +- .../ui/screens/wallet/accounts/views.cljs | 36 +- .../ui/screens/wallet/send/views.cljs | 24 +- src/status_im2/common/bottom_sheet/style.cljs | 4 +- src/status_im2/common/bottom_sheet/view.cljs | 6 +- .../common/bottom_sheet_screen/style.cljs | 4 +- .../common/bottom_sheet_screen/view.cljs | 2 +- .../common/confirmation_drawer/style.cljs | 2 +- .../common/confirmation_drawer/view.cljs | 2 +- src/status_im2/common/contact_list/view.cljs | 2 +- .../common/contact_list_item/view.cljs | 2 +- src/status_im2/common/device_permissions.cljs | 2 +- src/status_im2/common/home/actions/view.cljs | 4 +- src/status_im2/common/home/banner/view.cljs | 6 +- .../common/home/empty_state/view.cljs | 2 +- .../common/home/title_column/view.cljs | 2 +- src/status_im2/common/home/top_nav/view.cljs | 2 +- src/status_im2/common/mute_drawer/style.cljs | 2 +- src/status_im2/common/mute_drawer/view.cljs | 2 +- .../common/password_authentication/view.cljs | 2 +- src/status_im2/common/plus_button/view.cljs | 2 +- src/status_im2/common/qr_codes/view.cljs | 2 +- src/status_im2/common/scroll_page/style.cljs | 2 +- src/status_im2/common/scroll_page/view.cljs | 2 +- .../enter_password/view.cljs | 2 +- .../forgot_password_doc/view.cljs | 2 +- .../password_input/view.cljs | 6 +- .../standard_auth/view.cljs | 4 +- src/status_im2/common/theme/core.cljs | 4 +- src/status_im2/common/toasts/view.cljs | 2 +- .../contexts/add_new_contact/style.cljs | 4 +- .../contexts/add_new_contact/views.cljs | 2 +- .../contexts/chat/actions/view.cljs | 2 +- .../contexts/chat/camera/style.cljs | 2 +- src/status_im2/contexts/chat/camera/view.cljs | 4 +- .../contexts/chat/composer/actions/view.cljs | 4 +- .../contexts/chat/composer/constants.cljs | 2 +- .../contexts/chat/composer/edit/view.cljs | 4 +- .../chat/composer/gradients/style.cljs | 2 +- .../contexts/chat/composer/images/style.cljs | 6 +- .../contexts/chat/composer/images/view.cljs | 6 +- .../chat/composer/link_preview/view.cljs | 2 +- .../chat/composer/mentions/style.cljs | 2 +- .../contexts/chat/composer/reply/view.cljs | 4 +- .../contexts/chat/composer/style.cljs | 6 +- .../contexts/chat/composer/sub_view.cljs | 2 +- .../contexts/chat/composer/view.cljs | 4 +- src/status_im2/contexts/chat/events.cljs | 2 +- .../contexts/chat/group_details/style.cljs | 2 +- .../contexts/chat/group_details/view.cljs | 4 +- .../chat/home/chat_list_item/style.cljs | 6 +- .../chat/home/chat_list_item/view.cljs | 8 +- .../chat/home/contact_request/style.cljs | 2 +- .../chat/home/contact_request/view.cljs | 6 +- src/status_im2/contexts/chat/home/view.cljs | 2 +- .../contexts/chat/lightbox/bottom_view.cljs | 2 +- .../contexts/chat/lightbox/style.cljs | 2 +- .../chat/lightbox/text_sheet/style.cljs | 2 +- .../chat/lightbox/text_sheet/view.cljs | 2 +- .../contexts/chat/lightbox/top_view.cljs | 4 +- .../contexts/chat/lightbox/utils.cljs | 2 +- .../contexts/chat/lightbox/view.cljs | 2 +- .../chat/menus/pinned_messages/style.cljs | 2 +- .../chat/menus/pinned_messages/view.cljs | 4 +- .../contexts/chat/messages/avatar/view.cljs | 2 +- .../contact_requests/bottom_drawer.cljs | 4 +- .../chat/messages/content/album/style.cljs | 2 +- .../chat/messages/content/album/view.cljs | 4 +- .../chat/messages/content/audio/style.cljs | 4 +- .../chat/messages/content/audio/view.cljs | 4 +- .../chat/messages/content/deleted/view.cljs | 2 +- .../messages/content/link_preview/view.cljs | 2 +- .../chat/messages/content/pin/style.cljs | 2 +- .../chat/messages/content/pin/view.cljs | 4 +- .../chat/messages/content/reactions/view.cljs | 4 +- .../chat/messages/content/status/style.cljs | 2 +- .../chat/messages/content/status/view.cljs | 4 +- .../contexts/chat/messages/content/style.cljs | 2 +- .../chat/messages/content/text/style.cljs | 2 +- .../chat/messages/content/text/view.cljs | 4 +- .../contexts/chat/messages/content/view.cljs | 6 +- .../chat/messages/delete_message/events.cljs | 2 +- .../delete_message_for_me/events.cljs | 2 +- .../contexts/chat/messages/drawers/style.cljs | 2 +- .../contexts/chat/messages/drawers/view.cljs | 4 +- .../chat/messages/link_preview/style.cljs | 4 +- .../chat/messages/link_preview/view.cljs | 2 +- .../contexts/chat/messages/list/style.cljs | 2 +- .../contexts/chat/messages/list/view.cljs | 6 +- .../chat/messages/navigation/style.cljs | 2 +- .../chat/messages/navigation/view.cljs | 6 +- .../chat/messages/pin/banner/style.cljs | 2 +- .../chat/messages/pin/banner/view.cljs | 2 +- .../contexts/chat/messages/pin/events.cljs | 2 +- .../contexts/chat/new_chat/view.cljs | 6 +- .../photo_selector/album_selector/style.cljs | 2 +- .../photo_selector/album_selector/view.cljs | 4 +- .../contexts/chat/photo_selector/style.cljs | 2 +- .../contexts/chat/photo_selector/view.cljs | 4 +- .../communities/actions/chat/view.cljs | 2 +- .../actions/community_options/view.cljs | 2 +- .../actions/community_rules_list/view.cljs | 2 +- .../actions/generic_menu/view.cljs | 2 +- .../communities/actions/home_plus/view.cljs | 2 +- .../communities/actions/leave/view.cljs | 2 +- .../actions/request_to_join/style.cljs | 2 +- .../actions/request_to_join/view.cljs | 2 +- .../actions/token_gating/view.cljs | 2 +- .../contexts/communities/discover/view.cljs | 6 +- .../contexts/communities/home/style.cljs | 2 +- .../contexts/communities/home/view.cljs | 4 +- .../contexts/communities/overview/style.cljs | 2 +- .../contexts/communities/overview/view.cljs | 2 +- .../drawers/nickname_drawer/style.cljs | 2 +- .../drawers/nickname_drawer/view.cljs | 6 +- .../contexts/emoji_picker/style.cljs | 4 +- .../contexts/emoji_picker/view.cljs | 6 +- .../onboarding/common/background/style.cljs | 2 +- .../onboarding/common/carousel/style.cljs | 2 +- .../onboarding/common/carousel/view.cljs | 2 +- .../onboarding/common/overlay/style.cljs | 2 +- .../onboarding/create_password/style.cljs | 2 +- .../onboarding/create_password/view.cljs | 2 +- .../onboarding/create_profile/style.cljs | 2 +- .../onboarding/create_profile/view.cljs | 4 +- .../onboarding/enable_biometrics/view.cljs | 2 +- .../enable_notifications/style.cljs | 2 +- .../onboarding/enable_notifications/view.cljs | 2 +- .../onboarding/enter_seed_phrase/view.cljs | 4 +- .../onboarding/generating_keys/view.cljs | 2 +- .../identifiers/profile_card/style.cljs | 4 +- .../identifiers/profile_card/view.cljs | 4 +- .../contexts/onboarding/identifiers/view.cljs | 2 +- .../contexts/onboarding/intro/style.cljs | 2 +- .../contexts/onboarding/intro/view.cljs | 2 +- .../onboarding/new_to_status/style.cljs | 2 +- .../onboarding/new_to_status/view.cljs | 4 +- .../select_photo/method_menu/view.cljs | 2 +- .../contexts/onboarding/sign_in/style.cljs | 2 +- .../onboarding/syncing/progress/style.cljs | 2 +- .../onboarding/syncing/progress/view.cljs | 2 +- .../onboarding/syncing/results/style.cljs | 2 +- .../onboarding/syncing/results/view.cljs | 4 +- .../contexts/onboarding/welcome/style.cljs | 2 +- .../contexts/onboarding/welcome/view.cljs | 2 +- .../contexts/profile/profiles/style.cljs | 2 +- .../contexts/profile/profiles/view.cljs | 6 +- .../animated_header_list.cljs | 6 +- .../quo_preview/avatars/account_avatar.cljs | 6 +- .../quo_preview/avatars/channel_avatar.cljs | 2 +- .../avatars/collection_avatar.cljs | 2 +- .../quo_preview/avatars/group_avatar.cljs | 2 +- .../quo_preview/avatars/icon_avatar.cljs | 2 +- .../quo_preview/avatars/user_avatar.cljs | 2 +- .../avatars/wallet_user_avatar.cljs | 2 +- .../contexts/quo_preview/banners/banner.cljs | 2 +- .../quo_preview/browser/browser_input.cljs | 2 +- .../contexts/quo_preview/buttons/button.cljs | 2 +- .../quo_preview/buttons/composer_button.cljs | 2 +- .../quo_preview/buttons/dynamic_button.cljs | 2 +- .../buttons/predictive_keyboard.cljs | 4 +- .../quo_preview/buttons/slide_button.cljs | 2 +- .../quo_preview/buttons/wallet_button.cljs | 2 +- .../quo_preview/buttons/wallet_ctas.cljs | 2 +- .../quo_preview/calendar/calendar.cljs | 2 +- .../quo_preview/calendar/calendar_day.cljs | 2 +- .../quo_preview/calendar/calendar_year.cljs | 2 +- .../contexts/quo_preview/code/snippet.cljs | 2 +- .../quo_preview/code/snippet_preview.cljs | 2 +- .../contexts/quo_preview/colors/color.cljs | 2 +- .../quo_preview/colors/color_picker.cljs | 2 +- .../contexts/quo_preview/common.cljs | 8 +- .../community/channel_actions.cljs | 2 +- .../community/community_card_view.cljs | 2 +- .../community_membership_list_view.cljs | 2 +- .../quo_preview/community/discover_card.cljs | 2 +- .../quo_preview/community/token_gating.cljs | 4 +- .../contexts/quo_preview/counter/counter.cljs | 2 +- .../contexts/quo_preview/counter/step.cljs | 2 +- .../contexts/quo_preview/dividers/date.cljs | 2 +- .../quo_preview/dividers/divider_label.cljs | 2 +- .../quo_preview/dividers/divider_line.cljs | 2 +- .../quo_preview/dividers/new_messages.cljs | 2 +- .../dividers/strength_divider.cljs | 2 +- .../quo_preview/drawers/action_drawers.cljs | 2 +- .../quo_preview/drawers/bottom_actions.cljs | 2 +- .../drawers/documentation_drawers.cljs | 4 +- .../quo_preview/drawers/drawer_buttons.cljs | 4 +- .../quo_preview/drawers/drawer_top.cljs | 2 +- .../drawers/permission_drawers.cljs | 6 +- .../quo_preview/dropdowns/dropdown.cljs | 2 +- .../dropdowns/network_dropdown.cljs | 4 +- .../quo_preview/empty_state/empty_state.cljs | 2 +- .../quo_preview/foundations/shadows.cljs | 8 +- .../quo_preview/gradient/gradient_cover.cljs | 4 +- .../quo_preview/graph/interactive_graph.cljs | 6 +- .../quo_preview/graph/wallet_graph.cljs | 2 +- .../quo_preview/info/info_message.cljs | 2 +- .../quo_preview/info/information_box.cljs | 2 +- .../quo_preview/inputs/address_input.cljs | 2 +- .../contexts/quo_preview/inputs/input.cljs | 2 +- .../quo_preview/inputs/locked_input.cljs | 2 +- .../quo_preview/inputs/profile_input.cljs | 2 +- .../inputs/recovery_phrase_input.cljs | 2 +- .../quo_preview/inputs/search_input.cljs | 2 +- .../quo_preview/inputs/title_input.cljs | 2 +- .../contexts/quo_preview/keycard/keycard.cljs | 2 +- .../quo_preview/links/link_preview.cljs | 2 +- .../quo_preview/links/url_preview.cljs | 2 +- .../quo_preview/links/url_preview_list.cljs | 2 +- .../quo_preview/list_items/account.cljs | 2 +- .../list_items/account_list_card.cljs | 2 +- .../quo_preview/list_items/address.cljs | 2 +- .../quo_preview/list_items/channel.cljs | 2 +- .../list_items/community_list.cljs | 4 +- .../contexts/quo_preview/list_items/dapp.cljs | 4 +- .../quo_preview/list_items/preview_lists.cljs | 4 +- .../quo_preview/list_items/saved_address.cljs | 2 +- .../list_items/saved_contact_address.cljs | 2 +- .../quo_preview/list_items/token_value.cljs | 2 +- .../quo_preview/list_items/user_list.cljs | 2 +- .../quo_preview/loaders/skeleton_list.cljs | 2 +- src/status_im2/contexts/quo_preview/main.cljs | 4 +- .../contexts/quo_preview/markdown/list.cljs | 2 +- .../contexts/quo_preview/markdown/text.cljs | 2 +- .../contexts/quo_preview/messages/author.cljs | 2 +- .../contexts/quo_preview/messages/gap.cljs | 2 +- .../quo_preview/messages/system_message.cljs | 2 +- .../navigation/bottom_nav_tab.cljs | 4 +- .../navigation/floating_shell_button.cljs | 2 +- .../quo_preview/navigation/page_nav.cljs | 6 +- .../quo_preview/navigation/top_nav.cljs | 4 +- .../notifications/activity_logs.cljs | 6 +- .../notifications/activity_logs_photos.cljs | 2 +- .../notifications/notification.cljs | 2 +- .../quo_preview/notifications/toast.cljs | 4 +- .../numbered_keyboard/keyboard_key.cljs | 2 +- .../numbered_keyboard/numbered_keyboard.cljs | 2 +- .../onboarding/small_option_card.cljs | 4 +- .../contexts/quo_preview/password/tips.cljs | 4 +- .../contexts/quo_preview/preview.cljs | 8 +- .../quo_preview/profile/collectible.cljs | 2 +- .../quo_preview/profile/profile_card.cljs | 2 +- .../quo_preview/profile/select_profile.cljs | 2 +- .../quo_preview/profile/showcase_nav.cljs | 2 +- .../record_audio/record_audio.cljs | 2 +- .../quo_preview/selectors/disclaimer.cljs | 2 +- .../quo_preview/selectors/filter.cljs | 2 +- .../contexts/quo_preview/selectors/react.cljs | 4 +- .../quo_preview/selectors/react_selector.cljs | 4 +- .../selectors/reactions_selector.cljs | 2 +- .../quo_preview/selectors/selectors.cljs | 2 +- .../quo_preview/settings/accounts.cljs | 2 +- .../quo_preview/settings/category.cljs | 2 +- .../quo_preview/settings/data_item.cljs | 2 +- .../quo_preview/settings/privacy_option.cljs | 2 +- .../quo_preview/settings/reorder_item.cljs | 8 +- .../quo_preview/settings/section_label.cljs | 2 +- .../quo_preview/settings/settings_item.cljs | 2 +- .../contexts/quo_preview/share/qr_code.cljs | 4 +- .../quo_preview/share/share_qr_code.cljs | 2 +- .../contexts/quo_preview/style.cljs | 4 +- .../switcher/group_messaging_card.cljs | 2 +- .../quo_preview/switcher/switcher_cards.cljs | 2 +- .../quo_preview/tabs/account_selector.cljs | 4 +- .../quo_preview/tabs/segmented_tab.cljs | 8 +- .../contexts/quo_preview/tabs/tabs.cljs | 2 +- .../quo_preview/tags/context_tags.cljs | 4 +- .../quo_preview/tags/network_tags.cljs | 4 +- .../contexts/quo_preview/tags/number_tag.cljs | 2 +- .../quo_preview/tags/permission_tag.cljs | 4 +- .../quo_preview/tags/status_tags.cljs | 6 +- .../contexts/quo_preview/tags/tag.cljs | 4 +- .../contexts/quo_preview/tags/tags.cljs | 4 +- .../contexts/quo_preview/tags/tiny_tag.cljs | 2 +- .../contexts/quo_preview/tags/token_tag.cljs | 6 +- .../text_combinations/preview.cljs | 4 +- .../quo_preview/wallet/account_card.cljs | 8 +- .../quo_preview/wallet/account_origin.cljs | 2 +- .../quo_preview/wallet/account_overview.cljs | 2 +- .../contexts/quo_preview/wallet/keypair.cljs | 2 +- .../quo_preview/wallet/network_amount.cljs | 2 +- .../quo_preview/wallet/network_bridge.cljs | 2 +- .../quo_preview/wallet/network_link.cljs | 2 +- .../quo_preview/wallet/progress_bar.cljs | 2 +- .../quo_preview/wallet/summary_info.cljs | 2 +- .../quo_preview/wallet/token_input.cljs | 4 +- .../wallet/transaction_summary.cljs | 4 +- .../quo_preview/wallet/wallet_activity.cljs | 4 +- .../quo_preview/wallet/wallet_overview.cljs | 4 +- .../shell/activity_center/drawer/view.cljs | 4 +- .../shell/activity_center/events.cljs | 2 +- .../shell/activity_center/header/view.cljs | 2 +- .../notification/admin/view.cljs | 2 +- .../notification/common/style.cljs | 2 +- .../notification/common/view.cljs | 4 +- .../notification/community_kicked/view.cljs | 2 +- .../notification/community_request/view.cljs | 2 +- .../notification/contact_requests/view.cljs | 2 +- .../contact_verification/view.cljs | 2 +- .../notification/membership/view.cljs | 2 +- .../notification/mentions/style.cljs | 2 +- .../notification/mentions/view.cljs | 2 +- .../notification/reply/style.cljs | 2 +- .../notification/reply/view.cljs | 2 +- .../contexts/shell/activity_center/style.cljs | 2 +- .../activity_center/tabs/empty_tab/view.cljs | 2 +- .../shell/activity_center/tabs/view.cljs | 2 +- .../jump_to/components/bottom_tabs/style.cljs | 2 +- .../jump_to/components/bottom_tabs/view.cljs | 4 +- .../components/floating_screens/style.cljs | 2 +- .../components/floating_screens/view.cljs | 2 +- .../jump_to/components/home_stack/style.cljs | 2 +- .../jump_to/components/home_stack/view.cljs | 2 +- .../components/jump_to_screen/style.cljs | 2 +- .../components/jump_to_screen/view.cljs | 6 +- .../components/switcher_cards/style.cljs | 2 +- .../components/switcher_cards/view.cljs | 4 +- .../contexts/shell/jump_to/shared_values.cljs | 2 +- .../contexts/shell/jump_to/utils.cljs | 2 +- .../contexts/shell/jump_to/view.cljs | 2 +- .../contexts/shell/share/events.cljs | 2 +- .../contexts/shell/share/style.cljs | 2 +- src/status_im2/contexts/shell/share/view.cljs | 4 +- .../contexts/syncing/device/style.cljs | 2 +- .../contexts/syncing/device/view.cljs | 2 +- .../syncing/enter_sync_code/style.cljs | 4 +- .../syncing/enter_sync_code/view.cljs | 4 +- .../syncing/scan_sync_code/style.cljs | 2 +- .../contexts/syncing/scan_sync_code/view.cljs | 4 +- .../syncing/scan_sync_code_page/style.cljs | 2 +- .../contexts/syncing/setup_syncing/style.cljs | 2 +- .../contexts/syncing/setup_syncing/view.cljs | 4 +- .../syncing/syncing_devices_list/style.cljs | 2 +- .../syncing/syncing_devices_list/view.cljs | 4 +- .../syncing/syncing_instructions/style.cljs | 2 +- .../syncing/syncing_instructions/view.cljs | 2 +- .../wallet/account/tabs/about/view.cljs | 4 +- .../wallet/account/tabs/dapps/style.cljs | 2 +- .../wallet/account/tabs/dapps/view.cljs | 4 +- .../contexts/wallet/account/tabs/view.cljs | 2 +- .../contexts/wallet/account/view.cljs | 4 +- .../contexts/wallet/address_watch/view.cljs | 4 +- .../contexts/wallet/collectible/view.cljs | 2 +- .../wallet/common/activity_tab/view.cljs | 2 +- .../wallet/common/collectibles_tab/view.cljs | 2 +- .../wallet/common/empty_tab/view.cljs | 2 +- .../contexts/wallet/common/temp.cljs | 4 +- .../contexts/wallet/create_account/style.cljs | 2 +- .../contexts/wallet/create_account/view.cljs | 4 +- src/status_im2/contexts/wallet/home/view.cljs | 2 +- .../contexts/wallet/saved_address/view.cljs | 2 +- .../contexts/wallet/saved_addresses/view.cljs | 2 +- .../wallet/send/select_address/view.cljs | 4 +- src/status_im2/core.cljs | 12 +- src/status_im2/navigation/options.cljs | 4 +- src/status_im2/navigation/roots.cljs | 4 +- src/status_im2/navigation/view.cljs | 4 +- src/status_im2/subs/contact.cljs | 2 +- src/status_im2/subs/profile.cljs | 2 +- src/test_helpers/component.cljs | 2 +- 815 files changed, 2547 insertions(+), 2610 deletions(-) delete mode 100644 scripts/lint-old-quo-usage.sh rename src/{quo2 => quo}/README.md (89%) rename src/{quo2 => quo}/components/animated_header_flatlist/style.cljs (95%) rename src/{quo2 => quo}/components/animated_header_flatlist/view.cljs (95%) rename src/{quo2 => quo}/components/avatars/account_avatar/component_spec.cljs (94%) rename src/{quo2 => quo}/components/avatars/account_avatar/style.cljs (94%) rename src/{quo2 => quo}/components/avatars/account_avatar/view.cljs (86%) rename src/{quo2 => quo}/components/avatars/channel_avatar/component_spec.cljs (90%) rename src/{quo2 => quo}/components/avatars/channel_avatar/style.cljs (91%) rename src/{quo2 => quo}/components/avatars/channel_avatar/view.cljs (90%) rename src/{quo2 => quo}/components/avatars/collection_avatar/component_spec.cljs (71%) rename src/{quo2 => quo}/components/avatars/collection_avatar/style.cljs (70%) rename src/{quo2 => quo}/components/avatars/collection_avatar/view.cljs (73%) rename src/{quo2 => quo}/components/avatars/group_avatar.cljs (100%) rename src/{quo2 => quo}/components/avatars/group_avatar/style.cljs (85%) rename src/{quo2 => quo}/components/avatars/group_avatar/view.cljs (86%) rename src/{quo2 => quo}/components/avatars/icon_avatar.cljs (89%) rename src/{quo2 => quo}/components/avatars/user_avatar/component_spec.cljs (82%) rename src/{quo2 => quo}/components/avatars/user_avatar/style.cljs (97%) rename src/{quo2 => quo}/components/avatars/user_avatar/view.cljs (94%) rename src/{quo2 => quo}/components/avatars/wallet_user_avatar.cljs (92%) rename src/{quo2 => quo}/components/banners/banner/component_spec.cljs (89%) rename src/{quo2 => quo}/components/banners/banner/style.cljs (84%) rename src/{quo2 => quo}/components/banners/banner/view.cljs (74%) rename src/{quo2 => quo}/components/browser/browser_input/component_spec.cljs (94%) rename src/{quo2 => quo}/components/browser/browser_input/style.cljs (90%) rename src/{quo2 => quo}/components/browser/browser_input/view.cljs (95%) rename src/{quo2 => quo}/components/buttons/button/component_spec.cljs (85%) rename src/{quo2 => quo}/components/buttons/button/properties.cljs (98%) rename src/{quo2 => quo}/components/buttons/button/style.cljs (99%) rename src/{quo2 => quo}/components/buttons/button/view.cljs (91%) rename src/{quo2 => quo}/components/buttons/composer_button/component_spec.cljs (91%) rename src/{quo2 => quo}/components/buttons/composer_button/style.cljs (92%) rename src/{quo2 => quo}/components/buttons/composer_button/view.cljs (83%) rename src/{quo2 => quo}/components/buttons/dynamic_button/style.cljs (96%) rename src/{quo2 => quo}/components/buttons/dynamic_button/view.cljs (93%) rename src/{quo2 => quo}/components/buttons/predictive_keyboard/component_spec.cljs (85%) rename src/{quo2 => quo}/components/buttons/predictive_keyboard/style.cljs (81%) rename src/{quo2 => quo}/components/buttons/predictive_keyboard/view.cljs (88%) rename src/{quo2 => quo}/components/buttons/slide_button/animations.cljs (97%) rename src/{quo2 => quo}/components/buttons/slide_button/component_spec.cljs (95%) rename src/{quo2 => quo}/components/buttons/slide_button/constants.cljs (79%) rename src/{quo2 => quo}/components/buttons/slide_button/style.cljs (92%) rename src/{quo2 => quo}/components/buttons/slide_button/utils.cljs (91%) rename src/{quo2 => quo}/components/buttons/slide_button/view.cljs (91%) rename src/{quo2 => quo}/components/buttons/wallet_button/component_spec.cljs (92%) rename src/{quo2 => quo}/components/buttons/wallet_button/style.cljs (86%) rename src/{quo2 => quo}/components/buttons/wallet_button/view.cljs (79%) rename src/{quo2 => quo}/components/buttons/wallet_ctas/component_spec.cljs (73%) rename src/{quo2 => quo}/components/buttons/wallet_ctas/style.cljs (87%) rename src/{quo2 => quo}/components/buttons/wallet_ctas/view.cljs (84%) rename src/{quo2 => quo}/components/calendar/calendar/component_spec.cljs (95%) rename src/{quo2 => quo}/components/calendar/calendar/days_grid/style.cljs (69%) rename src/{quo2 => quo}/components/calendar/calendar/days_grid/utils.cljs (97%) rename src/{quo2 => quo}/components/calendar/calendar/days_grid/utils_test.cljs (94%) rename src/{quo2 => quo}/components/calendar/calendar/days_grid/view.cljs (87%) rename src/{quo2 => quo}/components/calendar/calendar/month_picker/component_spec.cljs (86%) rename src/{quo2 => quo}/components/calendar/calendar/month_picker/style.cljs (74%) rename src/{quo2 => quo}/components/calendar/calendar/month_picker/utils.cljs (92%) rename src/{quo2 => quo}/components/calendar/calendar/month_picker/utils_test.cljs (86%) rename src/{quo2 => quo}/components/calendar/calendar/month_picker/view.cljs (75%) rename src/{quo2 => quo}/components/calendar/calendar/style.cljs (80%) rename src/{quo2 => quo}/components/calendar/calendar/utils.cljs (92%) rename src/{quo2 => quo}/components/calendar/calendar/utils_test.cljs (91%) rename src/{quo2 => quo}/components/calendar/calendar/view.cljs (73%) rename src/{quo2 => quo}/components/calendar/calendar/weekdays_header/style.cljs (79%) rename src/{quo2 => quo}/components/calendar/calendar/weekdays_header/view.cljs (71%) rename src/{quo2 => quo}/components/calendar/calendar/years_list/style.cljs (90%) rename src/{quo2 => quo}/components/calendar/calendar/years_list/view.cljs (83%) rename src/{quo2 => quo}/components/calendar/calendar_day/component_spec.cljs (79%) rename src/{quo2 => quo}/components/calendar/calendar_day/style.cljs (95%) rename src/{quo2 => quo}/components/calendar/calendar_day/view.cljs (83%) rename src/{quo2 => quo}/components/calendar/calendar_year/component_spec.cljs (79%) rename src/{quo2 => quo}/components/calendar/calendar_year/style.cljs (87%) rename src/{quo2 => quo}/components/calendar/calendar_year/view.cljs (75%) rename src/{quo2 => quo}/components/code/common/style.cljs (97%) rename src/{quo2 => quo}/components/code/common/view.cljs (96%) rename src/{quo2 => quo}/components/code/snippet/view.cljs (71%) rename src/{quo2 => quo}/components/code/snippet_preview/view.cljs (62%) rename src/{quo2 => quo}/components/colors/color/style.cljs (94%) rename src/{quo2 => quo}/components/colors/color/view.cljs (88%) rename src/{quo2 => quo}/components/colors/color_picker/component_spec.cljs (90%) rename src/{quo2 => quo}/components/colors/color_picker/view.cljs (93%) rename src/{quo2 => quo}/components/common/no_flicker_image.cljs (97%) rename src/{quo2 => quo}/components/common/not_implemented/style.cljs (76%) rename src/{quo2 => quo}/components/common/not_implemented/view.cljs (60%) rename src/{quo2 => quo}/components/common/notification_dot/style.cljs (89%) rename src/{quo2 => quo}/components/common/notification_dot/view.cljs (72%) create mode 100644 src/quo/components/common/separator/view.cljs rename src/{quo2 => quo}/components/common/unread_grey_dot/style.cljs (71%) rename src/{quo2 => quo}/components/common/unread_grey_dot/view.cljs (68%) rename src/{quo2 => quo}/components/community/banner/style.cljs (83%) rename src/{quo2 => quo}/components/community/banner/view.cljs (85%) rename src/{quo2 => quo}/components/community/channel_actions.cljs (79%) rename src/{quo2 => quo}/components/community/community_card_view.cljs (92%) rename src/{quo2 => quo}/components/community/community_list_view.cljs (90%) rename src/{quo2 => quo}/components/community/community_view.cljs (91%) rename src/{quo2 => quo}/components/community/icon.cljs (91%) rename src/{quo2 => quo}/components/community/style.cljs (98%) rename src/{quo2 => quo}/components/community/token_gating.cljs (88%) rename src/{quo2 => quo}/components/counter/counter/component_spec.cljs (89%) rename src/{quo2 => quo}/components/counter/counter/style.cljs (93%) rename src/{quo2 => quo}/components/counter/counter/view.cljs (85%) rename src/{quo2 => quo}/components/counter/step/component_spec.cljs (84%) rename src/{quo2 => quo}/components/counter/step/style.cljs (93%) rename src/{quo2 => quo}/components/counter/step/view.cljs (85%) rename src/{quo2 => quo}/components/dividers/date.cljs (74%) rename src/{quo2 => quo}/components/dividers/divider_label/component_spec.cljs (86%) rename src/{quo2 => quo}/components/dividers/divider_label/style.cljs (92%) rename src/{quo2 => quo}/components/dividers/divider_label/view.cljs (87%) rename src/{quo2 => quo}/components/dividers/divider_line/style.cljs (79%) rename src/{quo2 => quo}/components/dividers/divider_line/view.cljs (55%) rename src/{quo2 => quo}/components/dividers/new_messages.cljs (83%) rename src/{quo2 => quo}/components/dividers/strength_divider/component_spec.cljs (92%) rename src/{quo2 => quo}/components/dividers/strength_divider/style.cljs (78%) rename src/{quo2 => quo}/components/dividers/strength_divider/view.cljs (92%) rename src/{quo2 => quo}/components/drawers/action_drawers/component_spec.cljs (96%) rename src/{quo2 => quo}/components/drawers/action_drawers/style.cljs (92%) rename src/{quo2 => quo}/components/drawers/action_drawers/view.cljs (91%) rename src/{quo2 => quo}/components/drawers/bottom_actions/component_spec.cljs (86%) rename src/{quo2 => quo}/components/drawers/bottom_actions/style.cljs (90%) rename src/{quo2 => quo}/components/drawers/bottom_actions/view.cljs (88%) rename src/{quo2 => quo}/components/drawers/documentation_drawers/component_spec.cljs (89%) rename src/{quo2 => quo}/components/drawers/documentation_drawers/style.cljs (84%) rename src/{quo2 => quo}/components/drawers/documentation_drawers/view.cljs (84%) rename src/{quo2 => quo}/components/drawers/drawer_buttons/component_spec.cljs (95%) rename src/{quo2 => quo}/components/drawers/drawer_buttons/style.cljs (95%) rename src/{quo2 => quo}/components/drawers/drawer_buttons/view.cljs (97%) rename src/{quo2 => quo}/components/drawers/drawer_top/component_spec.cljs (97%) rename src/{quo2 => quo}/components/drawers/drawer_top/style.cljs (86%) rename src/{quo2 => quo}/components/drawers/drawer_top/view.cljs (91%) rename src/{quo2 => quo}/components/drawers/permission_context/component_spec.cljs (73%) rename src/{quo2 => quo}/components/drawers/permission_context/style.cljs (87%) rename src/{quo2 => quo}/components/drawers/permission_context/view.cljs (62%) rename src/{quo2 => quo}/components/dropdowns/dropdown/component_spec.cljs (91%) rename src/{quo2 => quo}/components/dropdowns/dropdown/properties.cljs (98%) rename src/{quo2 => quo}/components/dropdowns/dropdown/style.cljs (96%) rename src/{quo2 => quo}/components/dropdowns/dropdown/view.cljs (89%) rename src/{quo2 => quo}/components/dropdowns/network_dropdown/component_spec.cljs (86%) rename src/{quo2 => quo}/components/dropdowns/network_dropdown/style.cljs (90%) rename src/{quo2 => quo}/components/dropdowns/network_dropdown/view.cljs (78%) rename src/{quo2 => quo}/components/empty_state/empty_state/styles.cljs (84%) rename src/{quo2 => quo}/components/empty_state/empty_state/view.cljs (87%) rename src/{quo2 => quo}/components/gradient/gradient_cover/component_spec.cljs (60%) rename src/{quo2 => quo}/components/gradient/gradient_cover/style.cljs (58%) rename src/{quo2 => quo}/components/gradient/gradient_cover/view.cljs (78%) rename src/{quo2 => quo}/components/graph/interactive_graph/component_spec.cljs (71%) rename src/{quo2 => quo}/components/graph/interactive_graph/style.cljs (92%) rename src/{quo2 => quo}/components/graph/interactive_graph/view.cljs (96%) rename src/{quo2 => quo}/components/graph/utils.cljs (99%) rename src/{quo2 => quo}/components/graph/utils_test.cljs (98%) rename src/{quo2 => quo}/components/graph/wallet_graph/component_spec.cljs (81%) rename src/{quo2 => quo}/components/graph/wallet_graph/style.cljs (82%) rename src/{quo2 => quo}/components/graph/wallet_graph/view.cljs (91%) rename src/{quo2 => quo}/components/header.cljs (97%) rename src/{quo2 => quo}/components/icon.cljs (88%) rename src/{quo2 => quo}/components/icons/icons.clj (96%) rename src/{quo2 => quo}/components/icons/icons.cljs (72%) rename src/{quo2 => quo}/components/icons/svg.cljs (98%) rename src/{quo2 => quo}/components/info/info_message.cljs (86%) rename src/{quo2 => quo}/components/info/information_box/component_spec.cljs (90%) rename src/{quo2 => quo}/components/info/information_box/style.cljs (96%) rename src/{quo2 => quo}/components/info/information_box/view.cljs (90%) rename src/{quo2 => quo}/components/inputs/address_input/component_spec.cljs (97%) rename src/{quo2 => quo}/components/inputs/address_input/style.cljs (89%) rename src/{quo2 => quo}/components/inputs/address_input/view.cljs (96%) rename src/{quo2 => quo}/components/inputs/input/component_spec.cljs (96%) rename src/{quo2 => quo}/components/inputs/input/style.cljs (97%) rename src/{quo2 => quo}/components/inputs/input/view.cljs (97%) rename src/{quo2 => quo}/components/inputs/locked_input/component_spec.cljs (85%) rename src/{quo2 => quo}/components/inputs/locked_input/style.cljs (85%) rename src/{quo2 => quo}/components/inputs/locked_input/view.cljs (81%) rename src/{quo2 => quo}/components/inputs/profile_input/component_spec.cljs (76%) rename src/{quo2 => quo}/components/inputs/profile_input/style.cljs (86%) rename src/{quo2 => quo}/components/inputs/profile_input/view.cljs (86%) rename src/{quo2 => quo}/components/inputs/recovery_phrase/component_spec.cljs (96%) rename src/{quo2 => quo}/components/inputs/recovery_phrase/style.cljs (90%) rename src/{quo2 => quo}/components/inputs/recovery_phrase/view.cljs (96%) rename src/{quo2 => quo}/components/inputs/search_input/style.cljs (93%) rename src/{quo2 => quo}/components/inputs/search_input/view.cljs (95%) rename src/{quo2 => quo}/components/inputs/title_input/component_spec.cljs (91%) rename src/{quo2 => quo}/components/inputs/title_input/style.cljs (94%) rename src/{quo2 => quo}/components/inputs/title_input/view.cljs (92%) rename src/{quo2 => quo}/components/keycard/component_spec.cljs (83%) rename src/{quo2 => quo}/components/keycard/style.cljs (94%) rename src/{quo2 => quo}/components/keycard/view.cljs (85%) rename src/{quo2 => quo}/components/links/link_preview/component_spec.cljs (94%) rename src/{quo2 => quo}/components/links/link_preview/style.cljs (92%) rename src/{quo2 => quo}/components/links/link_preview/view.cljs (91%) rename src/{quo2 => quo}/components/links/url_preview/component_spec.cljs (91%) rename src/{quo2 => quo}/components/links/url_preview/style.cljs (93%) rename src/{quo2 => quo}/components/links/url_preview/view.cljs (89%) rename src/{quo2 => quo}/components/links/url_preview_list/component_spec.cljs (93%) rename src/{quo2 => quo}/components/links/url_preview_list/style.cljs (72%) rename src/{quo2 => quo}/components/links/url_preview_list/view.cljs (95%) rename src/{quo2 => quo}/components/list_items/account/component_spec.cljs (96%) rename src/{quo2 => quo}/components/list_items/account/style.cljs (97%) rename src/{quo2 => quo}/components/list_items/account/view.cljs (94%) rename src/{quo2 => quo}/components/list_items/account_list_card/component_spec.cljs (81%) rename src/{quo2 => quo}/components/list_items/account_list_card/style.cljs (90%) rename src/{quo2 => quo}/components/list_items/account_list_card/view.cljs (83%) rename src/{quo2 => quo}/components/list_items/address/component_spec.cljs (92%) rename src/{quo2 => quo}/components/list_items/address/style.cljs (91%) rename src/{quo2 => quo}/components/list_items/address/view.cljs (88%) rename src/{quo2 => quo}/components/list_items/channel/component_spec.cljs (92%) rename src/{quo2 => quo}/components/list_items/channel/style.cljs (95%) rename src/{quo2 => quo}/components/list_items/channel/view.cljs (84%) rename src/{quo2 => quo}/components/list_items/community/component_spec.cljs (95%) rename src/{quo2 => quo}/components/list_items/community/style.cljs (94%) rename src/{quo2 => quo}/components/list_items/community/view.cljs (93%) rename src/{quo2 => quo}/components/list_items/dapp/component_spec.cljs (87%) rename src/{quo2 => quo}/components/list_items/dapp/style.cljs (94%) rename src/{quo2 => quo}/components/list_items/dapp/view.cljs (85%) rename src/{quo2 => quo}/components/list_items/menu_item.cljs (92%) rename src/{quo2 => quo}/components/list_items/preview_list/properties.cljs (96%) rename src/{quo2 => quo}/components/list_items/preview_list/view.cljs (91%) rename src/{quo2 => quo}/components/list_items/saved_address/component_spec.cljs (93%) rename src/{quo2 => quo}/components/list_items/saved_address/style.cljs (92%) rename src/{quo2 => quo}/components/list_items/saved_address/view.cljs (89%) rename src/{quo2 => quo}/components/list_items/saved_contact_address/component_spec.cljs (92%) rename src/{quo2 => quo}/components/list_items/saved_contact_address/style.cljs (93%) rename src/{quo2 => quo}/components/list_items/saved_contact_address/view.cljs (89%) rename src/{quo2 => quo}/components/list_items/token_value/component_spec.cljs (91%) rename src/{quo2 => quo}/components/list_items/token_value/style.cljs (92%) rename src/{quo2 => quo}/components/list_items/token_value/view.cljs (89%) rename src/{quo2 => quo}/components/list_items/user_list.cljs (84%) rename src/{quo2 => quo}/components/loaders/skeleton.cljs (95%) rename src/{quo2 => quo}/components/loaders/skeleton_list/component_spec.cljs (85%) rename src/{quo2 => quo}/components/loaders/skeleton_list/constants.cljs (98%) rename src/{quo2 => quo}/components/loaders/skeleton_list/style.cljs (86%) rename src/{quo2 => quo}/components/loaders/skeleton_list/view.cljs (93%) rename src/{quo2 => quo}/components/markdown/list/component_spec.cljs (93%) rename src/{quo2 => quo}/components/markdown/list/style.cljs (86%) rename src/{quo2 => quo}/components/markdown/list/view.cljs (86%) rename src/{quo2 => quo}/components/markdown/text.cljs (90%) rename src/{quo2 => quo}/components/markdown/text_component_spec.cljs (78%) rename src/{quo2 => quo}/components/messages/author/style.cljs (89%) rename src/{quo2 => quo}/components/messages/author/view.cljs (91%) rename src/{quo2 => quo}/components/messages/gap.cljs (96%) rename src/{quo2 => quo}/components/messages/system_message/style.cljs (96%) rename src/{quo2 => quo}/components/messages/system_message/view.cljs (95%) rename src/{quo2 => quo}/components/navigation/bottom_nav_tab/styles.cljs (78%) rename src/{quo2 => quo}/components/navigation/bottom_nav_tab/view.cljs (93%) rename src/{quo2 => quo}/components/navigation/floating_shell_button/style.cljs (89%) rename src/{quo2 => quo}/components/navigation/floating_shell_button/view.cljs (89%) rename src/{quo2 => quo}/components/navigation/page_nav/style.cljs (96%) rename src/{quo2 => quo}/components/navigation/page_nav/view.cljs (94%) rename src/{quo2 => quo}/components/navigation/top_nav/component_spec.cljs (92%) rename src/{quo2 => quo}/components/navigation/top_nav/style.cljs (94%) rename src/{quo2 => quo}/components/navigation/top_nav/view.cljs (94%) rename src/{quo2 => quo}/components/notifications/activity_log/style.cljs (94%) rename src/{quo2 => quo}/components/notifications/activity_log/view.cljs (93%) rename src/{quo2 => quo}/components/notifications/activity_logs_photos/style.cljs (80%) rename src/{quo2 => quo}/components/notifications/activity_logs_photos/view.cljs (77%) rename src/{quo2 => quo}/components/notifications/count_down_circle.cljs (97%) rename src/{quo2 => quo}/components/notifications/notification/component_spec.cljs (90%) rename src/{quo2 => quo}/components/notifications/notification/style.cljs (86%) rename src/{quo2 => quo}/components/notifications/notification/view.cljs (92%) rename src/{quo2 => quo}/components/notifications/toast/style.cljs (91%) rename src/{quo2 => quo}/components/notifications/toast/view.cljs (89%) rename src/{quo2 => quo}/components/numbered_keyboard/keyboard_key/component_spec.cljs (92%) rename src/{quo2 => quo}/components/numbered_keyboard/keyboard_key/style.cljs (88%) rename src/{quo2 => quo}/components/numbered_keyboard/keyboard_key/view.cljs (87%) rename src/{quo2 => quo}/components/numbered_keyboard/numbered_keyboard/style.cljs (78%) rename src/{quo2 => quo}/components/numbered_keyboard/numbered_keyboard/view.cljs (88%) rename src/{quo2 => quo}/components/onboarding/small_option_card/component_spec.cljs (93%) rename src/{quo2 => quo}/components/onboarding/small_option_card/style.cljs (91%) rename src/{quo2 => quo}/components/onboarding/small_option_card/view.cljs (91%) rename src/{quo2 => quo}/components/password/tips/component_spec.cljs (87%) rename src/{quo2 => quo}/components/password/tips/style.cljs (80%) rename src/{quo2 => quo}/components/password/tips/view.cljs (79%) rename src/{quo2 => quo}/components/profile/collectible/style.cljs (93%) rename src/{quo2 => quo}/components/profile/collectible/view.cljs (94%) rename src/{quo2 => quo}/components/profile/profile_card/style.cljs (92%) rename src/{quo2 => quo}/components/profile/profile_card/view.cljs (91%) rename src/{quo2 => quo}/components/profile/select_profile/component_spec.cljs (80%) rename src/{quo2 => quo}/components/profile/select_profile/style.cljs (90%) rename src/{quo2 => quo}/components/profile/select_profile/view.cljs (88%) rename src/{quo2 => quo}/components/profile/showcase_nav/component_spec.cljs (91%) rename src/{quo2 => quo}/components/profile/showcase_nav/style.cljs (80%) rename src/{quo2 => quo}/components/profile/showcase_nav/view.cljs (88%) rename src/{quo2 => quo}/components/record_audio/record_audio/buttons/delete_button.cljs (94%) rename src/{quo2 => quo}/components/record_audio/record_audio/buttons/lock_button.cljs (93%) rename src/{quo2 => quo}/components/record_audio/record_audio/buttons/record_button.cljs (75%) rename src/{quo2 => quo}/components/record_audio/record_audio/buttons/record_button_big.cljs (97%) rename src/{quo2 => quo}/components/record_audio/record_audio/buttons/send_button.cljs (94%) rename src/{quo2 => quo}/components/record_audio/record_audio/component_spec.cljs (98%) rename src/{quo2 => quo}/components/record_audio/record_audio/helpers.cljs (94%) rename src/{quo2 => quo}/components/record_audio/record_audio/style.cljs (98%) rename src/{quo2 => quo}/components/record_audio/record_audio/view.cljs (97%) rename src/{quo2 => quo}/components/record_audio/soundtrack/component_spec.cljs (96%) rename src/{quo2 => quo}/components/record_audio/soundtrack/style.cljs (91%) rename src/{quo2 => quo}/components/record_audio/soundtrack/view.cljs (91%) rename src/{quo2 => quo}/components/selectors/disclaimer/component_spec.cljs (90%) rename src/{quo2 => quo}/components/selectors/disclaimer/style.cljs (85%) rename src/{quo2 => quo}/components/selectors/disclaimer/view.cljs (73%) rename src/{quo2 => quo}/components/selectors/filter/component_spec.cljs (84%) rename src/{quo2 => quo}/components/selectors/filter/style.cljs (94%) rename src/{quo2 => quo}/components/selectors/filter/view.cljs (83%) rename src/{quo2 => quo}/components/selectors/react/style.cljs (83%) rename src/{quo2 => quo}/components/selectors/react/view.cljs (86%) rename src/{quo2 => quo}/components/selectors/react_selector/style.cljs (95%) rename src/{quo2 => quo}/components/selectors/react_selector/view.cljs (82%) rename src/{quo2 => quo}/components/selectors/reaction_resource.clj (94%) rename src/{quo2 => quo}/components/selectors/reaction_resource.cljs (66%) rename src/{quo2 => quo}/components/selectors/reactions_selector/component_spec.cljs (87%) rename src/{quo2 => quo}/components/selectors/reactions_selector/style.cljs (76%) rename src/{quo2 => quo}/components/selectors/reactions_selector/view.cljs (80%) rename src/{quo2 => quo}/components/selectors/selectors/component_spec.cljs (94%) rename src/{quo2 => quo}/components/selectors/selectors/style.cljs (98%) rename src/{quo2 => quo}/components/selectors/selectors/view.cljs (94%) rename src/{quo2 => quo}/components/settings/accounts/style.cljs (95%) rename src/{quo2 => quo}/components/settings/accounts/view.cljs (82%) rename src/{quo2 => quo}/components/settings/category/component_spec.cljs (94%) rename src/{quo2 => quo}/components/settings/category/reorder/view.cljs (77%) rename src/{quo2 => quo}/components/settings/category/settings/view.cljs (66%) rename src/{quo2 => quo}/components/settings/category/style.cljs (93%) create mode 100644 src/quo/components/settings/category/view.cljs rename src/{quo2 => quo}/components/settings/data_item/component_spec.cljs (98%) rename src/{quo2 => quo}/components/settings/data_item/style.cljs (95%) rename src/{quo2 => quo}/components/settings/data_item/view.cljs (89%) rename src/{quo2 => quo}/components/settings/privacy_option/style.cljs (96%) rename src/{quo2 => quo}/components/settings/privacy_option/view.cljs (86%) rename src/{quo2 => quo}/components/settings/reorder_item/component_spec.cljs (85%) rename src/{quo2 => quo}/components/settings/reorder_item/items/item.cljs (83%) rename src/{quo2 => quo}/components/settings/reorder_item/items/item_placeholder.cljs (65%) create mode 100644 src/quo/components/settings/reorder_item/items/item_skeleton.cljs rename src/{quo2 => quo}/components/settings/reorder_item/items/item_tabs.cljs (75%) rename src/{quo2 => quo}/components/settings/reorder_item/style.cljs (97%) rename src/{quo2 => quo}/components/settings/reorder_item/types.cljs (65%) create mode 100644 src/quo/components/settings/reorder_item/view.cljs rename src/{quo2 => quo}/components/settings/section_label/view.cljs (86%) rename src/{quo2 => quo}/components/settings/settings_item/component_spec.cljs (94%) rename src/{quo2 => quo}/components/settings/settings_item/style.cljs (94%) rename src/{quo2 => quo}/components/settings/settings_item/view.cljs (84%) rename src/{quo2 => quo}/components/share/qr_code/style.cljs (91%) rename src/{quo2 => quo}/components/share/qr_code/view.cljs (85%) rename src/{quo2 => quo}/components/share/share_qr_code/component_spec.cljs (89%) rename src/{quo2 => quo}/components/share/share_qr_code/style.cljs (91%) rename src/{quo2 => quo}/components/share/share_qr_code/view.cljs (82%) rename src/{quo2 => quo}/components/switchers/base_card/component_spec.cljs (79%) rename src/{quo2 => quo}/components/switchers/base_card/style.cljs (84%) rename src/{quo2 => quo}/components/switchers/base_card/view.cljs (86%) rename src/{quo2 => quo}/components/switchers/card_content/style.cljs (84%) rename src/{quo2 => quo}/components/switchers/card_content/view.cljs (83%) create mode 100644 src/quo/components/switchers/card_main_info/style.cljs rename src/{quo2 => quo}/components/switchers/card_main_info/view.cljs (74%) rename src/{quo2 => quo}/components/switchers/group_messaging_card/component_spec.cljs (95%) rename src/{quo2 => quo}/components/switchers/group_messaging_card/style.cljs (76%) rename src/{quo2 => quo}/components/switchers/group_messaging_card/view.cljs (69%) rename src/{quo2 => quo}/components/switchers/utils.cljs (93%) rename src/{quo2 => quo}/components/tabs/account_selector.cljs (90%) rename src/{quo2 => quo}/components/tabs/segmented_tab.cljs (92%) rename src/{quo2 => quo}/components/tabs/tab/style.cljs (98%) rename src/{quo2 => quo}/components/tabs/tab/view.cljs (93%) rename src/{quo2 => quo}/components/tabs/tabs/style.cljs (89%) rename src/{quo2 => quo}/components/tabs/tabs/view.cljs (97%) rename src/{quo2 => quo}/components/tags/base_tag.cljs (97%) rename src/{quo2 => quo}/components/tags/context_tag/style.cljs (97%) rename src/{quo2 => quo}/components/tags/context_tag/view.cljs (92%) rename src/{quo2 => quo}/components/tags/network_tags/component_spec.cljs (86%) rename src/{quo2 => quo}/components/tags/network_tags/style.cljs (94%) rename src/{quo2 => quo}/components/tags/network_tags/view.cljs (71%) rename src/{quo2 => quo}/components/tags/number_tag/component_spec.cljs (83%) rename src/{quo2 => quo}/components/tags/number_tag/style.cljs (96%) rename src/{quo2 => quo}/components/tags/number_tag/view.cljs (77%) rename src/{quo2 => quo}/components/tags/permission_tag.cljs (96%) rename src/{quo2 => quo}/components/tags/status_tags.cljs (95%) rename src/{quo2 => quo}/components/tags/status_tags_component_spec.cljs (89%) rename src/{quo2 => quo}/components/tags/tag.cljs (94%) rename src/{quo2 => quo}/components/tags/tags.cljs (99%) rename src/{quo2 => quo}/components/tags/tiny_tag/component_spec.cljs (81%) rename src/{quo2 => quo}/components/tags/tiny_tag/style.cljs (90%) rename src/{quo2 => quo}/components/tags/tiny_tag/view.cljs (67%) rename src/{quo2 => quo}/components/tags/token_tag.cljs (94%) rename src/{quo2 => quo}/components/text_combinations/style.cljs (79%) rename src/{quo2 => quo}/components/text_combinations/view.cljs (87%) rename src/{quo2 => quo}/components/wallet/account_card/component_spec.cljs (94%) rename src/{quo2 => quo}/components/wallet/account_card/style.cljs (97%) rename src/{quo2 => quo}/components/wallet/account_card/view.cljs (94%) rename src/{quo2 => quo}/components/wallet/account_origin/component_spec.cljs (98%) rename src/{quo2 => quo}/components/wallet/account_origin/style.cljs (92%) rename src/{quo2 => quo}/components/wallet/account_origin/view.cljs (92%) rename src/{quo2 => quo}/components/wallet/account_overview/component_spec.cljs (94%) rename src/{quo2 => quo}/components/wallet/account_overview/style.cljs (96%) rename src/{quo2 => quo}/components/wallet/account_overview/view.cljs (95%) rename src/{quo2 => quo}/components/wallet/keypair/component_spec.cljs (95%) rename src/{quo2 => quo}/components/wallet/keypair/style.cljs (91%) rename src/{quo2 => quo}/components/wallet/keypair/view.cljs (86%) rename src/{quo2 => quo}/components/wallet/network_amount/component_spec.cljs (67%) rename src/{quo2 => quo}/components/wallet/network_amount/style.cljs (77%) rename src/{quo2 => quo}/components/wallet/network_amount/view.cljs (68%) rename src/{quo2 => quo}/components/wallet/network_bridge/component_spec.cljs (90%) rename src/{quo2 => quo}/components/wallet/network_bridge/style.cljs (90%) rename src/{quo2 => quo}/components/wallet/network_bridge/view.cljs (85%) rename src/{quo2 => quo}/components/wallet/network_link/view.cljs (96%) rename src/{quo2 => quo}/components/wallet/progress_bar/component_spec.cljs (96%) rename src/{quo2 => quo}/components/wallet/progress_bar/style.cljs (94%) rename src/{quo2 => quo}/components/wallet/progress_bar/view.cljs (63%) rename src/{quo2 => quo}/components/wallet/summary_info/component_spec.cljs (95%) rename src/{quo2 => quo}/components/wallet/summary_info/style.cljs (92%) rename src/{quo2 => quo}/components/wallet/summary_info/view.cljs (85%) rename src/{quo2 => quo}/components/wallet/token_input/component_spec.cljs (80%) rename src/{quo2 => quo}/components/wallet/token_input/style.cljs (88%) rename src/{quo2 => quo}/components/wallet/token_input/view.cljs (84%) rename src/{quo2 => quo}/components/wallet/transaction_summary/component_spec.cljs (86%) rename src/{quo2 => quo}/components/wallet/transaction_summary/style.cljs (94%) rename src/{quo2 => quo}/components/wallet/transaction_summary/view.cljs (93%) rename src/{quo2 => quo}/components/wallet/wallet_activity/component_spec.cljs (79%) rename src/{quo2 => quo}/components/wallet/wallet_activity/style.cljs (95%) rename src/{quo2 => quo}/components/wallet/wallet_activity/view.cljs (94%) rename src/{quo2 => quo}/components/wallet/wallet_overview/component_spec.cljs (73%) rename src/{quo2 => quo}/components/wallet/wallet_overview/style.cljs (93%) rename src/{quo2 => quo}/components/wallet/wallet_overview/view.cljs (92%) create mode 100644 src/quo/core.cljs create mode 100644 src/quo/core_spec.cljs rename src/{quo2 => quo}/foundations/colors.cljs (99%) rename src/{quo2 => quo}/foundations/colors_test.cljs (95%) rename src/{quo2 => quo}/foundations/common.cljs (80%) rename src/{quo2 => quo}/foundations/customization_colors.cljs (88%) rename src/{quo2 => quo}/foundations/resources.cljs (98%) rename src/{quo2 => quo}/foundations/shadows.cljs (97%) rename src/{quo2 => quo}/foundations/typography.cljs (97%) rename src/{quo2 => quo}/theme.cljs (89%) delete mode 100644 src/quo2/__visual_tests__/__image_snapshots__/ios/iPhone 11 Pro/button-e-2-e-js-default-renders-button-page-should-match-image-render-button.png delete mode 100644 src/quo2/__visual_tests__/button.e2e.js delete mode 100644 src/quo2/components/common/separator/view.cljs delete mode 100644 src/quo2/components/settings/category/view.cljs delete mode 100644 src/quo2/components/settings/reorder_item/items/item_skeleton.cljs delete mode 100644 src/quo2/components/settings/reorder_item/view.cljs delete mode 100644 src/quo2/components/switchers/card_main_info/style.cljs delete mode 100644 src/quo2/core.cljs delete mode 100644 src/quo2/core_spec.cljs diff --git a/Makefile b/Makefile index 5ff58301c4..b457eb67d3 100644 --- a/Makefile +++ b/Makefile @@ -312,7 +312,6 @@ lint: export TARGET := clojure lint: export CLJ_LINTER_PRINT_WARNINGS ?= false lint: ##@test Run code style checks @sh scripts/lint-re-frame-in-quo-components.sh && \ - sh scripts/lint-old-quo-usage.sh && \ clj-kondo --config .clj-kondo/config.edn --cache false --fail-level error --lint src $(if $(filter $(CLJ_LINTER_PRINT_WARNINGS),true),,| grep -v ': warning: ') && \ ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \ zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \ diff --git a/RELEASES.md b/RELEASES.md index 7550484505..528e9860bb 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -25,7 +25,7 @@ ### Redesign -* Quo2, Switcher Navigation by @Parveshdhull in https://github.com/status-im/status-mobile/pull/13167 +* quo, Switcher Navigation by @Parveshdhull in https://github.com/status-im/status-mobile/pull/13167 * Switcher and Bottom Tabs Animations and UI Performance Improvements by @Parveshdhull in https://github.com/status-im/status-mobile/pull/13470 * feat: add token tag component (#13599) by @J-Son89 in https://github.com/status-im/status-mobile/pull/13644 * [13565] icon-avatar component by @ibrkhalil in https://github.com/status-im/status-mobile/pull/13692 diff --git a/scripts/lint-old-quo-usage.sh b/scripts/lint-old-quo-usage.sh deleted file mode 100644 index 9bb79a595b..0000000000 --- a/scripts/lint-old-quo-usage.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env sh - -set -euo pipefail - -QUO_USAGES=$(grep -r -E '\[quo\.[^ ]* :(?:as|refer)|\[quo\.[^ ]*\]' --include '*.cljs' --include '*.clj' './src/status_im2' --exclude='./src/status_im2/common/theme/core.cljs' || true) - -echo -e "\nChecking 'status_im2' namespace for 'quo' namespace usage." - -if [ -n "$QUO_USAGES" ]; then - echo -e "\033[0;31mERROR: Usage of the old 'quo' namespace detected in 'status_im2' code. Please update to 'quo2'. \n" - echo -e "$QUO_USAGES \033[0m" - exit 1 -fi diff --git a/scripts/lint-re-frame-in-quo-components.sh b/scripts/lint-re-frame-in-quo-components.sh index aa108bad96..faf6aae8de 100755 --- a/scripts/lint-re-frame-in-quo-components.sh +++ b/scripts/lint-re-frame-in-quo-components.sh @@ -1,9 +1,9 @@ #!/usr/bin/env sh -INVALID_CHANGES=$(grep -E -r '(re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|evt|status-im\.|status-im2\.)' --include '*.cljs' --include '*.clj' './src/quo2') +INVALID_CHANGES=$(grep -E -r '(re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|evt|status-im\.|status-im2\.)' --include '*.cljs' --include '*.clj' './src/quo') if test -n "$INVALID_CHANGES"; then - echo "WARNING: re-frame, status-im are not allowed in quo2 components" + echo "WARNING: re-frame, status-im are not allowed in quo components" echo '' echo "$INVALID_CHANGES" exit 1 diff --git a/shadow-cljs.edn b/shadow-cljs.edn index ad3d71b565..72abfc1c64 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -148,7 +148,7 @@ :compiler-options {:optimizations :simple :source-map false}} :component-test {:target :npm-module - :entries [quo2.core-spec status-im2.core-spec] + :entries [quo.core-spec status-im2.core-spec] :ns-regexp "component-spec$" :output-dir "component-spec" :compiler-options {:warnings-as-errors false diff --git a/src/quo2/README.md b/src/quo/README.md similarity index 89% rename from src/quo2/README.md rename to src/quo/README.md index dac79a9067..9f29132283 100644 --- a/src/quo2/README.md +++ b/src/quo/README.md @@ -27,7 +27,7 @@ and the component name is `Banner`. Therefore, the structure should look like: ``` -quo2/ +quo/ └── components/ └── banners/ └── banner/ @@ -63,7 +63,7 @@ In the image above we can see the properties are `Type`, `State`, `Size`, `Icon`, `Theme`, and `Background`. Translated to Clojure: ```clojure -;; ns quo2.components.buttons.button.view +;; ns quo.components.buttons.button.view (def view [{:keys [type state size icon theme background]}] ...) @@ -114,7 +114,7 @@ if events are triggered as intended and that all component variations are rendered. We use [React Native Testing Library](https://callstack.github.io/react-native-testing-library/). There are dozens of examples in the repository, so use them as a reference. A -good and complete example is [quo2.components.avatars.user-avatar.component-spec](/src/quo2/components/avatars/user_avatar/component_spec.cljs) +good and complete example is [quo.components.avatars.user-avatar.component-spec](/src/quo/components/avatars/user_avatar/component_spec.cljs) ## Do not couple the library with re-frame @@ -142,15 +142,15 @@ Our goal is to make all design system components *themeable*, which means they should not use, nor fallback to the OS theme, because themes are *contextual* and can be overridden in specific parts of the app. -To achieve this, use the higher-order function `quo2.theme/with-theme` to +To achieve this, use the higher-order function `quo.theme/with-theme` to automatically inject the current theme context (based on the [React Context API](https://react.dev/learn/passing-data-deeply-with-context)). Use the following pattern: ```clojure -(ns quo2.components...view - (:require [quo2.theme :as quo.theme])) +(ns quo.components...view + (:require [quo.theme :as quo.theme])) (defn- view-internal [{:keys [theme]}] ...) @@ -159,30 +159,30 @@ Use the following pattern: ``` Then pass the `theme` value down to all functions that may rely on the OS theme, -like `quo2.foundations.colors/theme-colors` or `quo2.foundations.shadows/get`. +like `quo.foundations.colors/theme-colors` or `quo.foundations.shadows/get`. ## Avoid using quo's version number in namespace aliases -When requiring quo2 namespaces, don't use the version number in the +When requiring quo namespaces, don't use the version number in the [alias](https://clojure.org/guides/learn/namespaces#_require), unless for a special reason you need to require both the old and new namespaces in the same file. > [!NOTE] > Keep in mind that, at the moment, we need to keep both `src/quo/` and -> `src/quo2/` directories in the repository, but eventually the old one will go +> `src/quo/` directories in the repository, but eventually the old one will go > away and the version number will lose its meaning. ```clojure ;; bad (ns ... - (require [quo2.theme :as quo2.theme] - [quo2.core :as quo2])) + (require [quo.theme :as quo.theme] + [quo.core :as quo])) ;; good (ns ... - (require [quo2.theme :as quo.theme] - [quo2.core :as quo])) + (require [quo.theme :as quo.theme] + [quo.core :as quo])) ``` ## Preview screens diff --git a/src/quo2/components/animated_header_flatlist/style.cljs b/src/quo/components/animated_header_flatlist/style.cljs similarity index 95% rename from src/quo2/components/animated_header_flatlist/style.cljs rename to src/quo/components/animated_header_flatlist/style.cljs index b926ba7560..568dd86388 100644 --- a/src/quo2/components/animated_header_flatlist/style.cljs +++ b/src/quo/components/animated_header_flatlist/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.animated-header-flatlist.style +(ns quo.components.animated-header-flatlist.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) (defn container-view diff --git a/src/quo2/components/animated_header_flatlist/view.cljs b/src/quo/components/animated_header_flatlist/view.cljs similarity index 95% rename from src/quo2/components/animated_header_flatlist/view.cljs rename to src/quo/components/animated_header_flatlist/view.cljs index 07c4307db9..6ff13a0f3c 100644 --- a/src/quo2/components/animated_header_flatlist/view.cljs +++ b/src/quo/components/animated_header_flatlist/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.animated-header-flatlist.view +(ns quo.components.animated-header-flatlist.view (:require [oops.core :as oops] - [quo2.components.animated-header-flatlist.style :as style] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.animated-header-flatlist.style :as style] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.fast-image :as fast-image] [react-native.platform :as platform] diff --git a/src/quo2/components/avatars/account_avatar/component_spec.cljs b/src/quo/components/avatars/account_avatar/component_spec.cljs similarity index 94% rename from src/quo2/components/avatars/account_avatar/component_spec.cljs rename to src/quo/components/avatars/account_avatar/component_spec.cljs index 742c4d8c22..0be906c59a 100644 --- a/src/quo2/components/avatars/account_avatar/component_spec.cljs +++ b/src/quo/components/avatars/account_avatar/component_spec.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.avatars.account-avatar.component-spec +(ns quo.components.avatars.account-avatar.component-spec (:require - [quo2.components.avatars.account-avatar.style :as style] - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.foundations.colors :as colors] + [quo.components.avatars.account-avatar.style :as style] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.foundations.colors :as colors] [test-helpers.component :as h])) (h/describe "Account Avatar" diff --git a/src/quo2/components/avatars/account_avatar/style.cljs b/src/quo/components/avatars/account_avatar/style.cljs similarity index 94% rename from src/quo2/components/avatars/account_avatar/style.cljs rename to src/quo/components/avatars/account_avatar/style.cljs index 0ee32d2782..97fbc34aaf 100644 --- a/src/quo2/components/avatars/account_avatar/style.cljs +++ b/src/quo/components/avatars/account_avatar/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.avatars.account-avatar.style +(ns quo.components.avatars.account-avatar.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def default-size 80) (def default-border-radius 16) diff --git a/src/quo2/components/avatars/account_avatar/view.cljs b/src/quo/components/avatars/account_avatar/view.cljs similarity index 86% rename from src/quo2/components/avatars/account_avatar/view.cljs rename to src/quo/components/avatars/account_avatar/view.cljs index f77e0ca73e..156330b242 100644 --- a/src/quo2/components/avatars/account_avatar/view.cljs +++ b/src/quo/components/avatars/account_avatar/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.avatars.account-avatar.view +(ns quo.components.avatars.account-avatar.view (:require [clojure.string :as string] - [quo2.components.avatars.account-avatar.style :as style] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/avatars/channel_avatar/component_spec.cljs b/src/quo/components/avatars/channel_avatar/component_spec.cljs similarity index 90% rename from src/quo2/components/avatars/channel_avatar/component_spec.cljs rename to src/quo/components/avatars/channel_avatar/component_spec.cljs index 2030f6230d..50beb5ac7c 100644 --- a/src/quo2/components/avatars/channel_avatar/component_spec.cljs +++ b/src/quo/components/avatars/channel_avatar/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.avatars.channel-avatar.component-spec +(ns quo.components.avatars.channel-avatar.component-spec (:require - [quo2.components.avatars.channel-avatar.view :as component] + [quo.components.avatars.channel-avatar.view :as component] [test-helpers.component :as h])) (h/describe "Channel Avatar" diff --git a/src/quo2/components/avatars/channel_avatar/style.cljs b/src/quo/components/avatars/channel_avatar/style.cljs similarity index 91% rename from src/quo2/components/avatars/channel_avatar/style.cljs rename to src/quo/components/avatars/channel_avatar/style.cljs index 448e484223..2f5333e0a4 100644 --- a/src/quo2/components/avatars/channel_avatar/style.cljs +++ b/src/quo/components/avatars/channel_avatar/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.avatars.channel-avatar.style +(ns quo.components.avatars.channel-avatar.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def lock-icon-size 12) diff --git a/src/quo2/components/avatars/channel_avatar/view.cljs b/src/quo/components/avatars/channel_avatar/view.cljs similarity index 90% rename from src/quo2/components/avatars/channel_avatar/view.cljs rename to src/quo/components/avatars/channel_avatar/view.cljs index 21ef938a3f..437770c19c 100644 --- a/src/quo2/components/avatars/channel_avatar/view.cljs +++ b/src/quo/components/avatars/channel_avatar/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.avatars.channel-avatar.view +(ns quo.components.avatars.channel-avatar.view (:require [clojure.string :as string] - [quo2.components.avatars.channel-avatar.style :as style] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.channel-avatar.style :as style] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.string])) diff --git a/src/quo2/components/avatars/collection_avatar/component_spec.cljs b/src/quo/components/avatars/collection_avatar/component_spec.cljs similarity index 71% rename from src/quo2/components/avatars/collection_avatar/component_spec.cljs rename to src/quo/components/avatars/collection_avatar/component_spec.cljs index f083e809da..bbcf7a4613 100644 --- a/src/quo2/components/avatars/collection_avatar/component_spec.cljs +++ b/src/quo/components/avatars/collection_avatar/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.avatars.collection-avatar.component-spec +(ns quo.components.avatars.collection-avatar.component-spec (:require - [quo2.components.avatars.collection-avatar.view :as collection-avatar] - [quo2.foundations.resources :as resources] + [quo.components.avatars.collection-avatar.view :as collection-avatar] + [quo.foundations.resources :as resources] [test-helpers.component :as h])) (h/describe "collection avatar" diff --git a/src/quo2/components/avatars/collection_avatar/style.cljs b/src/quo/components/avatars/collection_avatar/style.cljs similarity index 70% rename from src/quo2/components/avatars/collection_avatar/style.cljs rename to src/quo/components/avatars/collection_avatar/style.cljs index 6e16682eba..43e2b8d58f 100644 --- a/src/quo2/components/avatars/collection_avatar/style.cljs +++ b/src/quo/components/avatars/collection_avatar/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.avatars.collection-avatar.style +(ns quo.components.avatars.collection-avatar.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn collection-avatar [theme] diff --git a/src/quo2/components/avatars/collection_avatar/view.cljs b/src/quo/components/avatars/collection_avatar/view.cljs similarity index 73% rename from src/quo2/components/avatars/collection_avatar/view.cljs rename to src/quo/components/avatars/collection_avatar/view.cljs index 18e6d5f190..c4436d2b3c 100644 --- a/src/quo2/components/avatars/collection_avatar/view.cljs +++ b/src/quo/components/avatars/collection_avatar/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.avatars.collection-avatar.view +(ns quo.components.avatars.collection-avatar.view (:require - [quo2.components.avatars.collection-avatar.style :as style] - [quo2.theme :as quo.theme] + [quo.components.avatars.collection-avatar.style :as style] + [quo.theme :as quo.theme] [react-native.fast-image :as fast-image])) (defn- view-internal diff --git a/src/quo2/components/avatars/group_avatar.cljs b/src/quo/components/avatars/group_avatar.cljs similarity index 100% rename from src/quo2/components/avatars/group_avatar.cljs rename to src/quo/components/avatars/group_avatar.cljs diff --git a/src/quo2/components/avatars/group_avatar/style.cljs b/src/quo/components/avatars/group_avatar/style.cljs similarity index 85% rename from src/quo2/components/avatars/group_avatar/style.cljs rename to src/quo/components/avatars/group_avatar/style.cljs index 38e2b1217d..99c8875653 100644 --- a/src/quo2/components/avatars/group_avatar/style.cljs +++ b/src/quo/components/avatars/group_avatar/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.avatars.group-avatar.style +(ns quo.components.avatars.group-avatar.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [{:keys [container-size customization-color theme]}] diff --git a/src/quo2/components/avatars/group_avatar/view.cljs b/src/quo/components/avatars/group_avatar/view.cljs similarity index 86% rename from src/quo2/components/avatars/group_avatar/view.cljs rename to src/quo/components/avatars/group_avatar/view.cljs index 5fbcb507cb..d248881e7f 100644 --- a/src/quo2/components/avatars/group_avatar/view.cljs +++ b/src/quo/components/avatars/group_avatar/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.avatars.group-avatar.view +(ns quo.components.avatars.group-avatar.view (:require - [quo2.components.avatars.group-avatar.style :as style] - [quo2.components.icon :as icon] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.group-avatar.style :as style] + [quo.components.icon :as icon] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.fast-image :as fast-image])) diff --git a/src/quo2/components/avatars/icon_avatar.cljs b/src/quo/components/avatars/icon_avatar.cljs similarity index 89% rename from src/quo2/components/avatars/icon_avatar.cljs rename to src/quo/components/avatars/icon_avatar.cljs index 530d38d7b7..124e020def 100644 --- a/src/quo2/components/avatars/icon_avatar.cljs +++ b/src/quo/components/avatars/icon_avatar.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.avatars.icon-avatar +(ns quo.components.avatars.icon-avatar (:require - [quo2.components.icon :as icons] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (def ^:private sizes diff --git a/src/quo2/components/avatars/user_avatar/component_spec.cljs b/src/quo/components/avatars/user_avatar/component_spec.cljs similarity index 82% rename from src/quo2/components/avatars/user_avatar/component_spec.cljs rename to src/quo/components/avatars/user_avatar/component_spec.cljs index b218871723..1fd149b0bd 100644 --- a/src/quo2/components/avatars/user_avatar/component_spec.cljs +++ b/src/quo/components/avatars/user_avatar/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.avatars.user-avatar.component-spec +(ns quo.components.avatars.user-avatar.component-spec (:require - [quo2.components.avatars.user-avatar.view :as user-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] [test-helpers.component :as h])) (defonce mock-picture {:uri (js/require "../resources/images/mock2/user_picture_male4.png")}) diff --git a/src/quo2/components/avatars/user_avatar/style.cljs b/src/quo/components/avatars/user_avatar/style.cljs similarity index 97% rename from src/quo2/components/avatars/user_avatar/style.cljs rename to src/quo/components/avatars/user_avatar/style.cljs index c37330d53c..191f1394b6 100644 --- a/src/quo2/components/avatars/user_avatar/style.cljs +++ b/src/quo/components/avatars/user_avatar/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.avatars.user-avatar.style +(ns quo.components.avatars.user-avatar.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def sizes {:big {:dimensions 80 diff --git a/src/quo2/components/avatars/user_avatar/view.cljs b/src/quo/components/avatars/user_avatar/view.cljs similarity index 94% rename from src/quo2/components/avatars/user_avatar/view.cljs rename to src/quo/components/avatars/user_avatar/view.cljs index 37b98322d0..621ef9845e 100644 --- a/src/quo2/components/avatars/user_avatar/view.cljs +++ b/src/quo/components/avatars/user_avatar/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.avatars.user-avatar.view +(ns quo.components.avatars.user-avatar.view (:require - [quo2.components.avatars.user-avatar.style :as style] - [quo2.components.common.no-flicker-image :as no-flicker-image] - [quo2.components.markdown.text :as text] - [quo2.theme] + [quo.components.avatars.user-avatar.style :as style] + [quo.components.common.no-flicker-image :as no-flicker-image] + [quo.components.markdown.text :as text] + [quo.theme] [react-native.core :as rn] [react-native.fast-image :as fast-image] utils.string)) @@ -108,4 +108,4 @@ :else {:uri profile-picture})}])])) -(def user-avatar (quo2.theme/with-theme user-avatar-internal)) +(def user-avatar (quo.theme/with-theme user-avatar-internal)) diff --git a/src/quo2/components/avatars/wallet_user_avatar.cljs b/src/quo/components/avatars/wallet_user_avatar.cljs similarity index 92% rename from src/quo2/components/avatars/wallet_user_avatar.cljs rename to src/quo/components/avatars/wallet_user_avatar.cljs index 33b10aa247..a50d56295b 100644 --- a/src/quo2/components/avatars/wallet_user_avatar.cljs +++ b/src/quo/components/avatars/wallet_user_avatar.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.avatars.wallet-user-avatar +(ns quo.components.avatars.wallet-user-avatar (:require [clojure.string :as string] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (def circle-sizes diff --git a/src/quo2/components/banners/banner/component_spec.cljs b/src/quo/components/banners/banner/component_spec.cljs similarity index 89% rename from src/quo2/components/banners/banner/component_spec.cljs rename to src/quo/components/banners/banner/component_spec.cljs index 49e2f1adc3..4ffe30e7dc 100644 --- a/src/quo2/components/banners/banner/component_spec.cljs +++ b/src/quo/components/banners/banner/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.banners.banner.component-spec +(ns quo.components.banners.banner.component-spec (:require ["@testing-library/react-native" :as rtl] - [quo2.components.banners.banner.view :as banner] + [quo.components.banners.banner.view :as banner] [reagent.core :as reagent])) (defn render-banner diff --git a/src/quo2/components/banners/banner/style.cljs b/src/quo/components/banners/banner/style.cljs similarity index 84% rename from src/quo2/components/banners/banner/style.cljs rename to src/quo/components/banners/banner/style.cljs index 708dcadbb7..273bcab2ab 100644 --- a/src/quo2/components/banners/banner/style.cljs +++ b/src/quo/components/banners/banner/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.banners.banner.style +(ns quo.components.banners.banner.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container diff --git a/src/quo2/components/banners/banner/view.cljs b/src/quo/components/banners/banner/view.cljs similarity index 74% rename from src/quo2/components/banners/banner/view.cljs rename to src/quo/components/banners/banner/view.cljs index 39c0282d6a..e932e401dc 100644 --- a/src/quo2/components/banners/banner/view.cljs +++ b/src/quo/components/banners/banner/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.banners.banner.view +(ns quo.components.banners.banner.view (:require - [quo2.components.banners.banner.style :as style] - [quo2.components.counter.counter.view :as counter] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.banners.banner.style :as style] + [quo.components.counter.counter.view :as counter] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/browser/browser_input/component_spec.cljs b/src/quo/components/browser/browser_input/component_spec.cljs similarity index 94% rename from src/quo2/components/browser/browser_input/component_spec.cljs rename to src/quo/components/browser/browser_input/component_spec.cljs index ebdea6d385..16ed4d7586 100644 --- a/src/quo2/components/browser/browser_input/component_spec.cljs +++ b/src/quo/components/browser/browser_input/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.browser.browser-input.component-spec +(ns quo.components.browser.browser-input.component-spec (:require - [quo2.components.browser.browser-input.view :as browser-input] + [quo.components.browser.browser-input.view :as browser-input] [test-helpers.component :as h])) (h/describe "Browser input" diff --git a/src/quo2/components/browser/browser_input/style.cljs b/src/quo/components/browser/browser_input/style.cljs similarity index 90% rename from src/quo2/components/browser/browser_input/style.cljs rename to src/quo/components/browser/browser_input/style.cljs index 54206c81b3..021324c5b1 100644 --- a/src/quo2/components/browser/browser_input/style.cljs +++ b/src/quo/components/browser/browser_input/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.browser.browser-input.style +(ns quo.components.browser.browser-input.style (:require - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors])) + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors])) (def clear-icon-container {:align-items :center diff --git a/src/quo2/components/browser/browser_input/view.cljs b/src/quo/components/browser/browser_input/view.cljs similarity index 95% rename from src/quo2/components/browser/browser_input/view.cljs rename to src/quo/components/browser/browser_input/view.cljs index 98aa35bff3..fd3ee874ac 100644 --- a/src/quo2/components/browser/browser_input/view.cljs +++ b/src/quo/components/browser/browser_input/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.browser.browser-input.view +(ns quo.components.browser.browser-input.view (:require [clojure.string :as string] - [quo2.components.browser.browser-input.style :as style] - [quo2.components.icon :as icon] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo2.theme] + [quo.components.browser.browser-input.style :as style] + [quo.components.icon :as icon] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.platform :as platform] [reagent.core :as reagent])) @@ -142,4 +142,4 @@ (when on-clear (on-clear))) :theme theme}])]])))) -(def view (quo2.theme/with-theme view-internal)) +(def view (quo.theme/with-theme view-internal)) diff --git a/src/quo2/components/buttons/button/component_spec.cljs b/src/quo/components/buttons/button/component_spec.cljs similarity index 85% rename from src/quo2/components/buttons/button/component_spec.cljs rename to src/quo/components/buttons/button/component_spec.cljs index dd86bb721f..a28d720d45 100644 --- a/src/quo2/components/buttons/button/component_spec.cljs +++ b/src/quo/components/buttons/button/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.buttons.button.component-spec +(ns quo.components.buttons.button.component-spec (:require - [quo2.components.buttons.button.view :as button] + [quo.components.buttons.button.view :as button] [test-helpers.component :as h])) (h/describe "button tests" diff --git a/src/quo2/components/buttons/button/properties.cljs b/src/quo/components/buttons/button/properties.cljs similarity index 98% rename from src/quo2/components/buttons/button/properties.cljs rename to src/quo/components/buttons/button/properties.cljs index ebe937a435..50a596d439 100644 --- a/src/quo2/components/buttons/button/properties.cljs +++ b/src/quo/components/buttons/button/properties.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.buttons.button.properties +(ns quo.components.buttons.button.properties (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def backgrounds #{:photo :blur}) diff --git a/src/quo2/components/buttons/button/style.cljs b/src/quo/components/buttons/button/style.cljs similarity index 99% rename from src/quo2/components/buttons/button/style.cljs rename to src/quo/components/buttons/button/style.cljs index cf5ec51bf6..74186ca875 100644 --- a/src/quo2/components/buttons/button/style.cljs +++ b/src/quo/components/buttons/button/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.buttons.button.style) +(ns quo.components.buttons.button.style) (def blur-view {:position :absolute diff --git a/src/quo2/components/buttons/button/view.cljs b/src/quo/components/buttons/button/view.cljs similarity index 91% rename from src/quo2/components/buttons/button/view.cljs rename to src/quo/components/buttons/button/view.cljs index 425a12cca8..37df55236a 100644 --- a/src/quo2/components/buttons/button/view.cljs +++ b/src/quo/components/buttons/button/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.buttons.button.view +(ns quo.components.buttons.button.view (:require - [quo2.components.buttons.button.properties :as button-properties] - [quo2.components.buttons.button.style :as style] - [quo2.components.icon :as quo2.icons] - [quo2.components.markdown.text :as text] - [quo2.foundations.customization-colors :as customization-colors] - [quo2.theme :as theme] + [quo.components.buttons.button.properties :as button-properties] + [quo.components.buttons.button.style :as style] + [quo.components.icon :as quo.icons] + [quo.components.markdown.text :as text] + [quo.foundations.customization-colors :as customization-colors] + [quo.theme :as theme] [react-native.blur :as blur] [react-native.core :as rn] [reagent.core :as reagent])) @@ -91,7 +91,7 @@ :style style/blur-view}]) (when icon-top [rn/view - [quo2.icons/icon icon-top + [quo.icons/icon icon-top {:container-style {:margin-bottom 2} :color icon-color :size icon-size}]]) @@ -100,13 +100,13 @@ {:style (style/icon-left-icon-style {:size size :icon-size icon-size})} - [quo2.icons/icon icon-left + [quo.icons/icon icon-left {:color icon-color :size icon-size}]]) [rn/view (cond icon-only? - [quo2.icons/icon children + [quo.icons/icon children {:color label-color :size icon-size}] @@ -125,7 +125,7 @@ {:style (style/icon-right-icon-style {:size size :icon-size icon-size})} - [quo2.icons/icon icon-right + [quo.icons/icon icon-right {:color icon-color :size icon-size}]])]]])))) diff --git a/src/quo2/components/buttons/composer_button/component_spec.cljs b/src/quo/components/buttons/composer_button/component_spec.cljs similarity index 91% rename from src/quo2/components/buttons/composer_button/component_spec.cljs rename to src/quo/components/buttons/composer_button/component_spec.cljs index d6cac0913f..f1d8106db5 100644 --- a/src/quo2/components/buttons/composer_button/component_spec.cljs +++ b/src/quo/components/buttons/composer_button/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.buttons.composer-button.component-spec +(ns quo.components.buttons.composer-button.component-spec (:require - [quo2.components.buttons.composer-button.view :as composer-button] + [quo.components.buttons.composer-button.view :as composer-button] [test-helpers.component :as h])) (h/describe "button tests" diff --git a/src/quo2/components/buttons/composer_button/style.cljs b/src/quo/components/buttons/composer_button/style.cljs similarity index 92% rename from src/quo2/components/buttons/composer_button/style.cljs rename to src/quo/components/buttons/composer_button/style.cljs index 33358acb24..0d7ebcd006 100644 --- a/src/quo2/components/buttons/composer_button/style.cljs +++ b/src/quo/components/buttons/composer_button/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.buttons.composer-button.style +(ns quo.components.buttons.composer-button.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn get-border-color [{:keys [pressed? blur? theme]}] diff --git a/src/quo2/components/buttons/composer_button/view.cljs b/src/quo/components/buttons/composer_button/view.cljs similarity index 83% rename from src/quo2/components/buttons/composer_button/view.cljs rename to src/quo/components/buttons/composer_button/view.cljs index 6da2233178..4a66a67185 100644 --- a/src/quo2/components/buttons/composer_button/view.cljs +++ b/src/quo/components/buttons/composer_button/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.buttons.composer-button.view +(ns quo.components.buttons.composer-button.view (:require - [quo2.components.buttons.composer-button.style :as style] - [quo2.components.icon :as quo2.icons] - [quo2.theme :as theme] + [quo.components.buttons.composer-button.style :as style] + [quo.components.icon :as quo.icons] + [quo.theme :as theme] [react-native.core :as rn] [reagent.core :as reagent])) @@ -23,7 +23,7 @@ :theme theme :disabled? disabled?}) container-style)} - [quo2.icons/icon icon + [quo.icons/icon icon {:color (style/get-label-color {:blur? blur? :theme theme})}]]))) diff --git a/src/quo2/components/buttons/dynamic_button/style.cljs b/src/quo/components/buttons/dynamic_button/style.cljs similarity index 96% rename from src/quo2/components/buttons/dynamic_button/style.cljs rename to src/quo/components/buttons/dynamic_button/style.cljs index 6f0dd75d56..d2e58e4493 100644 --- a/src/quo2/components/buttons/dynamic_button/style.cljs +++ b/src/quo/components/buttons/dynamic_button/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.buttons.dynamic-button.style) +(ns quo.components.buttons.dynamic-button.style) (defn container [type] diff --git a/src/quo2/components/buttons/dynamic_button/view.cljs b/src/quo/components/buttons/dynamic_button/view.cljs similarity index 93% rename from src/quo2/components/buttons/dynamic_button/view.cljs rename to src/quo/components/buttons/dynamic_button/view.cljs index 3b47f6fa45..1b75bcb86a 100644 --- a/src/quo2/components/buttons/dynamic_button/view.cljs +++ b/src/quo/components/buttons/dynamic_button/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.buttons.dynamic-button.view +(ns quo.components.buttons.dynamic-button.view (:require - [quo2.components.buttons.dynamic-button.style :as style] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.buttons.dynamic-button.style :as style] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/buttons/predictive_keyboard/component_spec.cljs b/src/quo/components/buttons/predictive_keyboard/component_spec.cljs similarity index 85% rename from src/quo2/components/buttons/predictive_keyboard/component_spec.cljs rename to src/quo/components/buttons/predictive_keyboard/component_spec.cljs index b7ef338a52..b96360ac9f 100644 --- a/src/quo2/components/buttons/predictive_keyboard/component_spec.cljs +++ b/src/quo/components/buttons/predictive_keyboard/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.buttons.predictive-keyboard.component-spec +(ns quo.components.buttons.predictive-keyboard.component-spec (:require - [quo2.components.buttons.predictive-keyboard.view :as predictive-keyboard] + [quo.components.buttons.predictive-keyboard.view :as predictive-keyboard] [test-helpers.component :as h])) (h/describe "predictive-keyboard" diff --git a/src/quo2/components/buttons/predictive_keyboard/style.cljs b/src/quo/components/buttons/predictive_keyboard/style.cljs similarity index 81% rename from src/quo2/components/buttons/predictive_keyboard/style.cljs rename to src/quo/components/buttons/predictive_keyboard/style.cljs index e8e4f9316c..34db1748fc 100644 --- a/src/quo2/components/buttons/predictive_keyboard/style.cljs +++ b/src/quo/components/buttons/predictive_keyboard/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.buttons.predictive-keyboard.style) +(ns quo.components.buttons.predictive-keyboard.style) (defn wrapper [type] diff --git a/src/quo2/components/buttons/predictive_keyboard/view.cljs b/src/quo/components/buttons/predictive_keyboard/view.cljs similarity index 88% rename from src/quo2/components/buttons/predictive_keyboard/view.cljs rename to src/quo/components/buttons/predictive_keyboard/view.cljs index 3e649afbda..7dc7cd10c4 100644 --- a/src/quo2/components/buttons/predictive_keyboard/view.cljs +++ b/src/quo/components/buttons/predictive_keyboard/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.buttons.predictive-keyboard.view +(ns quo.components.buttons.predictive-keyboard.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.buttons.predictive-keyboard.style :as style] - [quo2.components.info.info-message :as info-message] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.buttons.button.view :as button] + [quo.components.buttons.predictive-keyboard.style :as style] + [quo.components.info.info-message :as info-message] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient])) diff --git a/src/quo2/components/buttons/slide_button/animations.cljs b/src/quo/components/buttons/slide_button/animations.cljs similarity index 97% rename from src/quo2/components/buttons/slide_button/animations.cljs rename to src/quo/components/buttons/slide_button/animations.cljs index 8216bbd1b7..5425efa1a7 100644 --- a/src/quo2/components/buttons/slide_button/animations.cljs +++ b/src/quo/components/buttons/slide_button/animations.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.buttons.slide-button.animations +(ns quo.components.buttons.slide-button.animations (:require [oops.core :as oops] - [quo2.components.buttons.slide-button.utils :as utils] + [quo.components.buttons.slide-button.utils :as utils] [react-native.gesture :as gesture] [react-native.reanimated :as reanimated])) diff --git a/src/quo2/components/buttons/slide_button/component_spec.cljs b/src/quo/components/buttons/slide_button/component_spec.cljs similarity index 95% rename from src/quo2/components/buttons/slide_button/component_spec.cljs rename to src/quo/components/buttons/slide_button/component_spec.cljs index d21a09d01a..0995581a12 100644 --- a/src/quo2/components/buttons/slide_button/component_spec.cljs +++ b/src/quo/components/buttons/slide_button/component_spec.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.buttons.slide-button.component-spec +(ns quo.components.buttons.slide-button.component-spec (:require ["@testing-library/react-native" :as rtl] ["react-native-gesture-handler/jest-utils" :as gestures-jest] - [quo2.components.buttons.slide-button.constants :as constants] - [quo2.components.buttons.slide-button.view :as slide-button] + [quo.components.buttons.slide-button.constants :as constants] + [quo.components.buttons.slide-button.view :as slide-button] [reagent.core :as r] [test-helpers.component :as h])) diff --git a/src/quo2/components/buttons/slide_button/constants.cljs b/src/quo/components/buttons/slide_button/constants.cljs similarity index 79% rename from src/quo2/components/buttons/slide_button/constants.cljs rename to src/quo/components/buttons/slide_button/constants.cljs index f073c7ae98..974b6d1a35 100644 --- a/src/quo2/components/buttons/slide_button/constants.cljs +++ b/src/quo/components/buttons/slide_button/constants.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.buttons.slide-button.constants) +(ns quo.components.buttons.slide-button.constants) (def track-padding 4) diff --git a/src/quo2/components/buttons/slide_button/style.cljs b/src/quo/components/buttons/slide_button/style.cljs similarity index 92% rename from src/quo2/components/buttons/slide_button/style.cljs rename to src/quo/components/buttons/slide_button/style.cljs index 1e7ed844ce..399f57f762 100644 --- a/src/quo2/components/buttons/slide_button/style.cljs +++ b/src/quo/components/buttons/slide_button/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.buttons.slide-button.style +(ns quo.components.buttons.slide-button.style (:require - [quo2.components.buttons.slide-button.constants :as constants] - [quo2.components.buttons.slide-button.utils :as utils] + [quo.components.buttons.slide-button.constants :as constants] + [quo.components.buttons.slide-button.utils :as utils] [react-native.reanimated :as reanimated])) (def absolute-fill diff --git a/src/quo2/components/buttons/slide_button/utils.cljs b/src/quo/components/buttons/slide_button/utils.cljs similarity index 91% rename from src/quo2/components/buttons/slide_button/utils.cljs rename to src/quo/components/buttons/slide_button/utils.cljs index 5e9a69559a..fb53aedee3 100644 --- a/src/quo2/components/buttons/slide_button/utils.cljs +++ b/src/quo/components/buttons/slide_button/utils.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.buttons.slide-button.utils +(ns quo.components.buttons.slide-button.utils (:require - [quo2.components.buttons.slide-button.constants :as constants] - [quo2.foundations.colors :as colors])) + [quo.components.buttons.slide-button.constants :as constants] + [quo.foundations.colors :as colors])) (defn main-color "`customization-color` Customization color" diff --git a/src/quo2/components/buttons/slide_button/view.cljs b/src/quo/components/buttons/slide_button/view.cljs similarity index 91% rename from src/quo2/components/buttons/slide_button/view.cljs rename to src/quo/components/buttons/slide_button/view.cljs index d10a1c0912..e299480a34 100644 --- a/src/quo2/components/buttons/slide_button/view.cljs +++ b/src/quo/components/buttons/slide_button/view.cljs @@ -1,14 +1,14 @@ -(ns quo2.components.buttons.slide-button.view +(ns quo.components.buttons.slide-button.view (:require [oops.core :as oops] - [quo2.components.buttons.slide-button.animations :as animations] - [quo2.components.buttons.slide-button.constants :as constants] - [quo2.components.buttons.slide-button.style :as style] - [quo2.components.buttons.slide-button.utils :as utils] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.buttons.slide-button.animations :as animations] + [quo.components.buttons.slide-button.constants :as constants] + [quo.components.buttons.slide-button.style :as style] + [quo.components.buttons.slide-button.utils :as utils] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.reanimated :as reanimated] diff --git a/src/quo2/components/buttons/wallet_button/component_spec.cljs b/src/quo/components/buttons/wallet_button/component_spec.cljs similarity index 92% rename from src/quo2/components/buttons/wallet_button/component_spec.cljs rename to src/quo/components/buttons/wallet_button/component_spec.cljs index 6536e86bf2..514f532096 100644 --- a/src/quo2/components/buttons/wallet_button/component_spec.cljs +++ b/src/quo/components/buttons/wallet_button/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.buttons.wallet-button.component-spec +(ns quo.components.buttons.wallet-button.component-spec (:require - [quo2.components.buttons.wallet-button.view :as wallet-button] + [quo.components.buttons.wallet-button.view :as wallet-button] [test-helpers.component :as h])) (h/describe "button tests" diff --git a/src/quo2/components/buttons/wallet_button/style.cljs b/src/quo/components/buttons/wallet_button/style.cljs similarity index 86% rename from src/quo2/components/buttons/wallet_button/style.cljs rename to src/quo/components/buttons/wallet_button/style.cljs index b84537b7f5..bef3ca4875 100644 --- a/src/quo2/components/buttons/wallet_button/style.cljs +++ b/src/quo/components/buttons/wallet_button/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.buttons.wallet-button.style +(ns quo.components.buttons.wallet-button.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn get-border-color [{:keys [pressed? theme]}] diff --git a/src/quo2/components/buttons/wallet_button/view.cljs b/src/quo/components/buttons/wallet_button/view.cljs similarity index 79% rename from src/quo2/components/buttons/wallet_button/view.cljs rename to src/quo/components/buttons/wallet_button/view.cljs index 56ee86bc13..b9f0bda9e3 100644 --- a/src/quo2/components/buttons/wallet_button/view.cljs +++ b/src/quo/components/buttons/wallet_button/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.buttons.wallet-button.view +(ns quo.components.buttons.wallet-button.view (:require - [quo2.components.buttons.wallet-button.style :as style] - [quo2.components.icon :as quo2.icons] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.buttons.wallet-button.style :as style] + [quo.components.icon :as quo.icons] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn] [reagent.core :as reagent])) @@ -23,7 +23,7 @@ :theme theme :disabled? disabled?}) container-style)} - [quo2.icons/icon icon + [quo.icons/icon icon {:color (colors/theme-colors colors/neutral-100 colors/white theme)}]]))) (def view (theme/with-theme view-internal)) diff --git a/src/quo2/components/buttons/wallet_ctas/component_spec.cljs b/src/quo/components/buttons/wallet_ctas/component_spec.cljs similarity index 73% rename from src/quo2/components/buttons/wallet_ctas/component_spec.cljs rename to src/quo/components/buttons/wallet_ctas/component_spec.cljs index 8a2f08deed..5870c82fac 100644 --- a/src/quo2/components/buttons/wallet_ctas/component_spec.cljs +++ b/src/quo/components/buttons/wallet_ctas/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.buttons.wallet-ctas.component-spec +(ns quo.components.buttons.wallet-ctas.component-spec (:require - [quo2.components.buttons.wallet-ctas.view :as wallet-ctas] + [quo.components.buttons.wallet-ctas.view :as wallet-ctas] [test-helpers.component :as h])) (h/describe "Wallet CTAs test" diff --git a/src/quo2/components/buttons/wallet_ctas/style.cljs b/src/quo/components/buttons/wallet_ctas/style.cljs similarity index 87% rename from src/quo2/components/buttons/wallet_ctas/style.cljs rename to src/quo/components/buttons/wallet_ctas/style.cljs index 394a7d05c0..265469a790 100644 --- a/src/quo2/components/buttons/wallet_ctas/style.cljs +++ b/src/quo/components/buttons/wallet_ctas/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.buttons.wallet-ctas.style) +(ns quo.components.buttons.wallet-ctas.style) (def container {:padding-top 24 diff --git a/src/quo2/components/buttons/wallet_ctas/view.cljs b/src/quo/components/buttons/wallet_ctas/view.cljs similarity index 84% rename from src/quo2/components/buttons/wallet_ctas/view.cljs rename to src/quo/components/buttons/wallet_ctas/view.cljs index 74afeba4d1..0cfd9ac798 100644 --- a/src/quo2/components/buttons/wallet_ctas/view.cljs +++ b/src/quo/components/buttons/wallet_ctas/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.buttons.wallet-ctas.view +(ns quo.components.buttons.wallet-ctas.view (:require - [quo2.components.buttons.wallet-button.view :as wallet-button] - [quo2.components.buttons.wallet-ctas.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.buttons.wallet-button.view :as wallet-button] + [quo.components.buttons.wallet-ctas.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/calendar/calendar/component_spec.cljs b/src/quo/components/calendar/calendar/component_spec.cljs similarity index 95% rename from src/quo2/components/calendar/calendar/component_spec.cljs rename to src/quo/components/calendar/calendar/component_spec.cljs index 53564e5c3c..d3d0cc1a44 100644 --- a/src/quo2/components/calendar/calendar/component_spec.cljs +++ b/src/quo/components/calendar/calendar/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.calendar.calendar.component-spec +(ns quo.components.calendar.calendar.component-spec (:require [cljs-time.core :as time] - [quo2.components.calendar.calendar.view :as calendar] + [quo.components.calendar.calendar.view :as calendar] [test-helpers.component :as h])) (def start-date (time/date-time (time/year (time/now)) (time/month (time/now)) 5)) diff --git a/src/quo2/components/calendar/calendar/days_grid/style.cljs b/src/quo/components/calendar/calendar/days_grid/style.cljs similarity index 69% rename from src/quo2/components/calendar/calendar/days_grid/style.cljs rename to src/quo/components/calendar/calendar/days_grid/style.cljs index 25d1d63635..cc7242b638 100644 --- a/src/quo2/components/calendar/calendar/days_grid/style.cljs +++ b/src/quo/components/calendar/calendar/days_grid/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.calendar.calendar.days-grid.style) +(ns quo.components.calendar.calendar.days-grid.style) (def container-days {:flex-grow 1 diff --git a/src/quo2/components/calendar/calendar/days_grid/utils.cljs b/src/quo/components/calendar/calendar/days_grid/utils.cljs similarity index 97% rename from src/quo2/components/calendar/calendar/days_grid/utils.cljs rename to src/quo/components/calendar/calendar/days_grid/utils.cljs index a6639513ea..137f286ac8 100644 --- a/src/quo2/components/calendar/calendar/days_grid/utils.cljs +++ b/src/quo/components/calendar/calendar/days_grid/utils.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.calendar.calendar.days-grid.utils +(ns quo.components.calendar.calendar.days-grid.utils (:require [cljs-time.core :as time] [utils.number :as utils.number])) diff --git a/src/quo2/components/calendar/calendar/days_grid/utils_test.cljs b/src/quo/components/calendar/calendar/days_grid/utils_test.cljs similarity index 94% rename from src/quo2/components/calendar/calendar/days_grid/utils_test.cljs rename to src/quo/components/calendar/calendar/days_grid/utils_test.cljs index 583360e00a..ce98e1137f 100644 --- a/src/quo2/components/calendar/calendar/days_grid/utils_test.cljs +++ b/src/quo/components/calendar/calendar/days_grid/utils_test.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.calendar.calendar.days-grid.utils-test +(ns quo.components.calendar.calendar.days-grid.utils-test (:require [cljs-time.core :as time] [cljs.test :refer-macros [deftest is testing]] - [quo2.components.calendar.calendar.days-grid.utils :as utils])) + [quo.components.calendar.calendar.days-grid.utils :as utils])) (deftest day-grid-test (let [day-grid-result (utils/day-grid "2023" "7")] diff --git a/src/quo2/components/calendar/calendar/days_grid/view.cljs b/src/quo/components/calendar/calendar/days_grid/view.cljs similarity index 87% rename from src/quo2/components/calendar/calendar/days_grid/view.cljs rename to src/quo/components/calendar/calendar/days_grid/view.cljs index 20692ba0e0..719f9df4c2 100644 --- a/src/quo2/components/calendar/calendar/days_grid/view.cljs +++ b/src/quo/components/calendar/calendar/days_grid/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.calendar.calendar.days-grid.view +(ns quo.components.calendar.calendar.days-grid.view (:require [cljs-time.core :as time] - [quo2.components.calendar.calendar-day.view :as calendar-day] - [quo2.components.calendar.calendar.days-grid.style :as style] - [quo2.components.calendar.calendar.days-grid.utils :as utils] + [quo.components.calendar.calendar-day.view :as calendar-day] + [quo.components.calendar.calendar.days-grid.style :as style] + [quo.components.calendar.calendar.days-grid.utils :as utils] [react-native.core :as rn])) (defn- day-view diff --git a/src/quo2/components/calendar/calendar/month_picker/component_spec.cljs b/src/quo/components/calendar/calendar/month_picker/component_spec.cljs similarity index 86% rename from src/quo2/components/calendar/calendar/month_picker/component_spec.cljs rename to src/quo/components/calendar/calendar/month_picker/component_spec.cljs index d0fe6affcf..e56c70caa5 100644 --- a/src/quo2/components/calendar/calendar/month_picker/component_spec.cljs +++ b/src/quo/components/calendar/calendar/month_picker/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.calendar.calendar.month-picker.component-spec +(ns quo.components.calendar.calendar.month-picker.component-spec (:require - [quo2.components.calendar.calendar.month-picker.view :as month-picker] + [quo.components.calendar.calendar.month-picker.view :as month-picker] [test-helpers.component :as h])) (h/describe "month-picker component" diff --git a/src/quo2/components/calendar/calendar/month_picker/style.cljs b/src/quo/components/calendar/calendar/month_picker/style.cljs similarity index 74% rename from src/quo2/components/calendar/calendar/month_picker/style.cljs rename to src/quo/components/calendar/calendar/month_picker/style.cljs index 4053be71f7..307068ecfc 100644 --- a/src/quo2/components/calendar/calendar/month_picker/style.cljs +++ b/src/quo/components/calendar/calendar/month_picker/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.calendar.calendar.month-picker.style +(ns quo.components.calendar.calendar.month-picker.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container {:align-items :center diff --git a/src/quo2/components/calendar/calendar/month_picker/utils.cljs b/src/quo/components/calendar/calendar/month_picker/utils.cljs similarity index 92% rename from src/quo2/components/calendar/calendar/month_picker/utils.cljs rename to src/quo/components/calendar/calendar/month_picker/utils.cljs index 78c59da18c..626ed4249e 100644 --- a/src/quo2/components/calendar/calendar/month_picker/utils.cljs +++ b/src/quo/components/calendar/calendar/month_picker/utils.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.calendar.calendar.month-picker.utils +(ns quo.components.calendar.calendar.month-picker.utils (:require [utils.datetime :as datetime])) diff --git a/src/quo2/components/calendar/calendar/month_picker/utils_test.cljs b/src/quo/components/calendar/calendar/month_picker/utils_test.cljs similarity index 86% rename from src/quo2/components/calendar/calendar/month_picker/utils_test.cljs rename to src/quo/components/calendar/calendar/month_picker/utils_test.cljs index 3385bb1b19..1051fc7fc9 100644 --- a/src/quo2/components/calendar/calendar/month_picker/utils_test.cljs +++ b/src/quo/components/calendar/calendar/month_picker/utils_test.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.calendar.calendar.month-picker.utils-test +(ns quo.components.calendar.calendar.month-picker.utils-test (:require [cljs.test :refer-macros [deftest is testing]] - [quo2.components.calendar.calendar.month-picker.utils :as utils])) + [quo.components.calendar.calendar.month-picker.utils :as utils])) (deftest format-month-year-test (testing "returns correct format for given year and month" diff --git a/src/quo2/components/calendar/calendar/month_picker/view.cljs b/src/quo/components/calendar/calendar/month_picker/view.cljs similarity index 75% rename from src/quo2/components/calendar/calendar/month_picker/view.cljs rename to src/quo/components/calendar/calendar/month_picker/view.cljs index 7ee6ae4181..c915ae2d55 100644 --- a/src/quo2/components/calendar/calendar/month_picker/view.cljs +++ b/src/quo/components/calendar/calendar/month_picker/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.calendar.calendar.month-picker.view +(ns quo.components.calendar.calendar.month-picker.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.calendar.calendar.month-picker.style :as style] - [quo2.components.calendar.calendar.month-picker.utils :as utils] - [quo2.components.markdown.text :as text] - [quo2.theme :as theme] + [quo.components.buttons.button.view :as button] + [quo.components.calendar.calendar.month-picker.style :as style] + [quo.components.calendar.calendar.month-picker.utils :as utils] + [quo.components.markdown.text :as text] + [quo.theme :as theme] [react-native.core :as rn] [utils.number :as utils.number])) diff --git a/src/quo2/components/calendar/calendar/style.cljs b/src/quo/components/calendar/calendar/style.cljs similarity index 80% rename from src/quo2/components/calendar/calendar/style.cljs rename to src/quo/components/calendar/calendar/style.cljs index a9b31951e5..35e111449c 100644 --- a/src/quo2/components/calendar/calendar/style.cljs +++ b/src/quo/components/calendar/calendar/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.calendar.calendar.style +(ns quo.components.calendar.calendar.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [theme] diff --git a/src/quo2/components/calendar/calendar/utils.cljs b/src/quo/components/calendar/calendar/utils.cljs similarity index 92% rename from src/quo2/components/calendar/calendar/utils.cljs rename to src/quo/components/calendar/calendar/utils.cljs index 8a3881948c..1742532cfc 100644 --- a/src/quo2/components/calendar/calendar/utils.cljs +++ b/src/quo/components/calendar/calendar/utils.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.calendar.calendar.utils +(ns quo.components.calendar.calendar.utils (:require [clojure.string :as string] [utils.datetime :as datetime] diff --git a/src/quo2/components/calendar/calendar/utils_test.cljs b/src/quo/components/calendar/calendar/utils_test.cljs similarity index 91% rename from src/quo2/components/calendar/calendar/utils_test.cljs rename to src/quo/components/calendar/calendar/utils_test.cljs index 59f9b6b355..a2da1d7ac1 100644 --- a/src/quo2/components/calendar/calendar/utils_test.cljs +++ b/src/quo/components/calendar/calendar/utils_test.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.calendar.calendar.utils-test +(ns quo.components.calendar.calendar.utils-test (:require [cljs.test :refer-macros [deftest is testing]] [clojure.string :as string] - [quo2.components.calendar.calendar.utils :as utils] + [quo.components.calendar.calendar.utils :as utils] [utils.datetime :as datetime] [utils.number :as utils.number])) diff --git a/src/quo2/components/calendar/calendar/view.cljs b/src/quo/components/calendar/calendar/view.cljs similarity index 73% rename from src/quo2/components/calendar/calendar/view.cljs rename to src/quo/components/calendar/calendar/view.cljs index ec8bebe8f1..831bc57883 100644 --- a/src/quo2/components/calendar/calendar/view.cljs +++ b/src/quo/components/calendar/calendar/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.calendar.calendar.view +(ns quo.components.calendar.calendar.view (:require - [quo2.components.calendar.calendar.days-grid.view :as days-grid] - [quo2.components.calendar.calendar.month-picker.view :as month-picker] - [quo2.components.calendar.calendar.style :as style] - [quo2.components.calendar.calendar.utils :as utils] - [quo2.components.calendar.calendar.weekdays-header.view :as weekdays-header] - [quo2.components.calendar.calendar.years-list.view :as years-list] - [quo2.theme :as theme] + [quo.components.calendar.calendar.days-grid.view :as days-grid] + [quo.components.calendar.calendar.month-picker.view :as month-picker] + [quo.components.calendar.calendar.style :as style] + [quo.components.calendar.calendar.utils :as utils] + [quo.components.calendar.calendar.weekdays-header.view :as weekdays-header] + [quo.components.calendar.calendar.years-list.view :as years-list] + [quo.theme :as theme] [react-native.core :as rn] [reagent.core :as reagent] [utils.number :as utils.number])) diff --git a/src/quo2/components/calendar/calendar/weekdays_header/style.cljs b/src/quo/components/calendar/calendar/weekdays_header/style.cljs similarity index 79% rename from src/quo2/components/calendar/calendar/weekdays_header/style.cljs rename to src/quo/components/calendar/calendar/weekdays_header/style.cljs index 3301af6a96..a4d056309f 100644 --- a/src/quo2/components/calendar/calendar/weekdays_header/style.cljs +++ b/src/quo/components/calendar/calendar/weekdays_header/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.calendar.calendar.weekdays-header.style +(ns quo.components.calendar.calendar.weekdays-header.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container-weekday-row {:flex-direction :row diff --git a/src/quo2/components/calendar/calendar/weekdays_header/view.cljs b/src/quo/components/calendar/calendar/weekdays_header/view.cljs similarity index 71% rename from src/quo2/components/calendar/calendar/weekdays_header/view.cljs rename to src/quo/components/calendar/calendar/weekdays_header/view.cljs index 2c1f7c70b5..ffb269c392 100644 --- a/src/quo2/components/calendar/calendar/weekdays_header/view.cljs +++ b/src/quo/components/calendar/calendar/weekdays_header/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.calendar.calendar.weekdays-header.view +(ns quo.components.calendar.calendar.weekdays-header.view (:require - [quo2.components.calendar.calendar.weekdays-header.style :as style] - [quo2.components.markdown.text :as text] - [quo2.theme :as theme] + [quo.components.calendar.calendar.weekdays-header.style :as style] + [quo.components.markdown.text :as text] + [quo.theme :as theme] [react-native.core :as rn] [utils.datetime :as datetime] [utils.i18n :as i18n])) diff --git a/src/quo2/components/calendar/calendar/years_list/style.cljs b/src/quo/components/calendar/calendar/years_list/style.cljs similarity index 90% rename from src/quo2/components/calendar/calendar/years_list/style.cljs rename to src/quo/components/calendar/calendar/years_list/style.cljs index 1d2df1365f..9a3c14208f 100644 --- a/src/quo2/components/calendar/calendar/years_list/style.cljs +++ b/src/quo/components/calendar/calendar/years_list/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.calendar.calendar.years-list.style +(ns quo.components.calendar.calendar.years-list.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn gradient-start-color [theme] diff --git a/src/quo2/components/calendar/calendar/years_list/view.cljs b/src/quo/components/calendar/calendar/years_list/view.cljs similarity index 83% rename from src/quo2/components/calendar/calendar/years_list/view.cljs rename to src/quo/components/calendar/calendar/years_list/view.cljs index 3d274860f4..c7b379ca6f 100644 --- a/src/quo2/components/calendar/calendar/years_list/view.cljs +++ b/src/quo/components/calendar/calendar/years_list/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.calendar.calendar.years-list.view +(ns quo.components.calendar.calendar.years-list.view (:require - [quo2.components.calendar.calendar-year.view :as calendar-year] - [quo2.components.calendar.calendar.utils :as utils] - [quo2.components.calendar.calendar.years-list.style :as style] - [quo2.theme :as theme] + [quo.components.calendar.calendar-year.view :as calendar-year] + [quo.components.calendar.calendar.utils :as utils] + [quo.components.calendar.calendar.years-list.style :as style] + [quo.theme :as theme] [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient])) diff --git a/src/quo2/components/calendar/calendar_day/component_spec.cljs b/src/quo/components/calendar/calendar_day/component_spec.cljs similarity index 79% rename from src/quo2/components/calendar/calendar_day/component_spec.cljs rename to src/quo/components/calendar/calendar_day/component_spec.cljs index 0f1303a615..bba079901f 100644 --- a/src/quo2/components/calendar/calendar_day/component_spec.cljs +++ b/src/quo/components/calendar/calendar_day/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.calendar.calendar-day.component-spec +(ns quo.components.calendar.calendar-day.component-spec (:require - [quo2.components.calendar.calendar-day.view :as calendar-day] + [quo.components.calendar.calendar-day.view :as calendar-day] [test-helpers.component :as h])) (h/describe "calendar-day component" diff --git a/src/quo2/components/calendar/calendar_day/style.cljs b/src/quo/components/calendar/calendar_day/style.cljs similarity index 95% rename from src/quo2/components/calendar/calendar_day/style.cljs rename to src/quo/components/calendar/calendar_day/style.cljs index bd60e7d4c2..2bc34223ec 100644 --- a/src/quo2/components/calendar/calendar_day/style.cljs +++ b/src/quo/components/calendar/calendar_day/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.calendar.calendar-day.style +(ns quo.components.calendar.calendar-day.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def wrapper {:flex 1 diff --git a/src/quo2/components/calendar/calendar_day/view.cljs b/src/quo/components/calendar/calendar_day/view.cljs similarity index 83% rename from src/quo2/components/calendar/calendar_day/view.cljs rename to src/quo/components/calendar/calendar_day/view.cljs index 2f4ef8d3ce..1f169b7753 100644 --- a/src/quo2/components/calendar/calendar_day/view.cljs +++ b/src/quo/components/calendar/calendar_day/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.calendar.calendar-day.view +(ns quo.components.calendar.calendar-day.view (:require - [quo2.components.calendar.calendar-day.style :as style] - [quo2.components.markdown.text :as text] - [quo2.theme :as theme] + [quo.components.calendar.calendar-day.style :as style] + [quo.components.markdown.text :as text] + [quo.theme :as theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/calendar/calendar_year/component_spec.cljs b/src/quo/components/calendar/calendar_year/component_spec.cljs similarity index 79% rename from src/quo2/components/calendar/calendar_year/component_spec.cljs rename to src/quo/components/calendar/calendar_year/component_spec.cljs index 0ea9c73d01..2efd2601e3 100644 --- a/src/quo2/components/calendar/calendar_year/component_spec.cljs +++ b/src/quo/components/calendar/calendar_year/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.calendar.calendar-year.component-spec +(ns quo.components.calendar.calendar-year.component-spec (:require - [quo2.components.calendar.calendar-year.view :as calendar-year] + [quo.components.calendar.calendar-year.view :as calendar-year] [test-helpers.component :as h])) (h/describe "calendar-year component" diff --git a/src/quo2/components/calendar/calendar_year/style.cljs b/src/quo/components/calendar/calendar_year/style.cljs similarity index 87% rename from src/quo2/components/calendar/calendar_year/style.cljs rename to src/quo/components/calendar/calendar_year/style.cljs index 8b5c632aeb..795ebda7e1 100644 --- a/src/quo2/components/calendar/calendar_year/style.cljs +++ b/src/quo/components/calendar/calendar_year/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.calendar.calendar-year.style +(ns quo.components.calendar.calendar-year.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container-base {:align-items :center diff --git a/src/quo2/components/calendar/calendar_year/view.cljs b/src/quo/components/calendar/calendar_year/view.cljs similarity index 75% rename from src/quo2/components/calendar/calendar_year/view.cljs rename to src/quo/components/calendar/calendar_year/view.cljs index c2989f2799..7fc37cdefe 100644 --- a/src/quo2/components/calendar/calendar_year/view.cljs +++ b/src/quo/components/calendar/calendar_year/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.calendar.calendar-year.view +(ns quo.components.calendar.calendar-year.view (:require - [quo2.components.calendar.calendar-year.style :as style] - [quo2.components.markdown.text :as text] - [quo2.theme :as theme] + [quo.components.calendar.calendar-year.style :as style] + [quo.components.markdown.text :as text] + [quo.theme :as theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/code/common/style.cljs b/src/quo/components/code/common/style.cljs similarity index 97% rename from src/quo2/components/code/common/style.cljs rename to src/quo/components/code/common/style.cljs index d2c66c50f7..bc3b698604 100644 --- a/src/quo2/components/code/common/style.cljs +++ b/src/quo/components/code/common/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.code.common.style +(ns quo.components.code.common.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) ;; Example themes: ;; https://github.com/react-syntax-highlighter/react-syntax-highlighter/tree/master/src/styles/hljs diff --git a/src/quo2/components/code/common/view.cljs b/src/quo/components/code/common/view.cljs similarity index 96% rename from src/quo2/components/code/common/view.cljs rename to src/quo/components/code/common/view.cljs index 5acde3b8cc..a51fc79cfe 100644 --- a/src/quo2/components/code/common/view.cljs +++ b/src/quo/components/code/common/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.code.common.view +(ns quo.components.code.common.view (:require [cljs-bean.core :as bean] [clojure.string :as string] - [quo2.components.buttons.button.view :as button] - [quo2.components.code.common.style :as style] - [quo2.components.markdown.text :as text] + [quo.components.buttons.button.view :as button] + [quo.components.code.common.style :as style] + [quo.components.markdown.text :as text] [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient] [react-native.syntax-highlighter :as highlighter] diff --git a/src/quo2/components/code/snippet/view.cljs b/src/quo/components/code/snippet/view.cljs similarity index 71% rename from src/quo2/components/code/snippet/view.cljs rename to src/quo/components/code/snippet/view.cljs index 7dfe9711a4..569e00e663 100644 --- a/src/quo2/components/code/snippet/view.cljs +++ b/src/quo/components/code/snippet/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.code.snippet.view +(ns quo.components.code.snippet.view (:require - [quo2.components.code.common.view :as code-common] - [quo2.theme :as theme])) + [quo.components.code.common.view :as code-common] + [quo.theme :as theme])) (defn- view-internal [_] diff --git a/src/quo2/components/code/snippet_preview/view.cljs b/src/quo/components/code/snippet_preview/view.cljs similarity index 62% rename from src/quo2/components/code/snippet_preview/view.cljs rename to src/quo/components/code/snippet_preview/view.cljs index 866e10e6ba..bea8eea44b 100644 --- a/src/quo2/components/code/snippet_preview/view.cljs +++ b/src/quo/components/code/snippet_preview/view.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.code.snippet-preview.view +(ns quo.components.code.snippet-preview.view (:require - [quo2.components.code.common.view :as code-common])) + [quo.components.code.common.view :as code-common])) (defn view [{:keys [language]} children] diff --git a/src/quo2/components/colors/color/style.cljs b/src/quo/components/colors/color/style.cljs similarity index 94% rename from src/quo2/components/colors/color/style.cljs rename to src/quo/components/colors/color/style.cljs index f5cf2c8abe..1f79005491 100644 --- a/src/quo2/components/colors/color/style.cljs +++ b/src/quo/components/colors/color/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.colors.color.style +(ns quo.components.colors.color.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def color-button-common {:width 48 diff --git a/src/quo2/components/colors/color/view.cljs b/src/quo/components/colors/color/view.cljs similarity index 88% rename from src/quo2/components/colors/color/view.cljs rename to src/quo/components/colors/color/view.cljs index 9c87b8d70f..0de44ec59f 100644 --- a/src/quo2/components/colors/color/view.cljs +++ b/src/quo/components/colors/color/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.colors.color.view +(ns quo.components.colors.color.view (:require - [quo2.components.colors.color.style :as style] - [quo2.components.icon :as icon] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.colors.color.style :as style] + [quo.components.icon :as icon] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- feng-shui diff --git a/src/quo2/components/colors/color_picker/component_spec.cljs b/src/quo/components/colors/color_picker/component_spec.cljs similarity index 90% rename from src/quo2/components/colors/color_picker/component_spec.cljs rename to src/quo/components/colors/color_picker/component_spec.cljs index 612ceccc94..84000ce1b7 100644 --- a/src/quo2/components/colors/color_picker/component_spec.cljs +++ b/src/quo/components/colors/color_picker/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.colors.color-picker.component-spec +(ns quo.components.colors.color-picker.component-spec (:require - [quo2.components.colors.color-picker.view :as color-picker] + [quo.components.colors.color-picker.view :as color-picker] [reagent.core :as reagent] [test-helpers.component :as h])) diff --git a/src/quo2/components/colors/color_picker/view.cljs b/src/quo/components/colors/color_picker/view.cljs similarity index 93% rename from src/quo2/components/colors/color_picker/view.cljs rename to src/quo/components/colors/color_picker/view.cljs index 986ba5552a..dda976d03d 100644 --- a/src/quo2/components/colors/color_picker/view.cljs +++ b/src/quo/components/colors/color_picker/view.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.colors.color-picker.view +(ns quo.components.colors.color-picker.view (:require - [quo2.components.colors.color.view :as color] + [quo.components.colors.color.view :as color] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/common/no_flicker_image.cljs b/src/quo/components/common/no_flicker_image.cljs similarity index 97% rename from src/quo2/components/common/no_flicker_image.cljs rename to src/quo/components/common/no_flicker_image.cljs index fc15b4bd90..5368bd74b2 100644 --- a/src/quo2/components/common/no_flicker_image.cljs +++ b/src/quo/components/common/no_flicker_image.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.common.no-flicker-image +(ns quo.components.common.no-flicker-image (:require [oops.core :as oops] [react-native.core :as rn] diff --git a/src/quo2/components/common/not_implemented/style.cljs b/src/quo/components/common/not_implemented/style.cljs similarity index 76% rename from src/quo2/components/common/not_implemented/style.cljs rename to src/quo/components/common/not_implemented/style.cljs index 1b7903caff..0c348e48d5 100644 --- a/src/quo2/components/common/not_implemented/style.cljs +++ b/src/quo/components/common/not_implemented/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.common.not-implemented.style +(ns quo.components.common.not-implemented.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn text [blur? theme] diff --git a/src/quo2/components/common/not_implemented/view.cljs b/src/quo/components/common/not_implemented/view.cljs similarity index 60% rename from src/quo2/components/common/not_implemented/view.cljs rename to src/quo/components/common/not_implemented/view.cljs index 0d24604bd2..0f0e8a34dd 100644 --- a/src/quo2/components/common/not_implemented/view.cljs +++ b/src/quo/components/common/not_implemented/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.common.not-implemented.view +(ns quo.components.common.not-implemented.view (:require - [quo2.components.common.not-implemented.style :as style] - [quo2.theme :as quo.theme] + [quo.components.common.not-implemented.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/common/notification_dot/style.cljs b/src/quo/components/common/notification_dot/style.cljs similarity index 89% rename from src/quo2/components/common/notification_dot/style.cljs rename to src/quo/components/common/notification_dot/style.cljs index 63ac928e1f..08c857da15 100644 --- a/src/quo2/components/common/notification_dot/style.cljs +++ b/src/quo/components/common/notification_dot/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.common.notification-dot.style +(ns quo.components.common.notification-dot.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def ^:const size 8) diff --git a/src/quo2/components/common/notification_dot/view.cljs b/src/quo/components/common/notification_dot/view.cljs similarity index 72% rename from src/quo2/components/common/notification_dot/view.cljs rename to src/quo/components/common/notification_dot/view.cljs index 4b0c735642..1ab62bce8e 100644 --- a/src/quo2/components/common/notification_dot/view.cljs +++ b/src/quo/components/common/notification_dot/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.common.notification-dot.view +(ns quo.components.common.notification-dot.view (:require - [quo2.components.common.notification-dot.style :as style] - [quo2.theme :as quo.theme] + [quo.components.common.notification-dot.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn view-internal diff --git a/src/quo/components/common/separator/view.cljs b/src/quo/components/common/separator/view.cljs new file mode 100644 index 0000000000..b54a0fda75 --- /dev/null +++ b/src/quo/components/common/separator/view.cljs @@ -0,0 +1,16 @@ +(ns quo.components.common.separator.view + (:require + [quo.foundations.colors :as quo.colors] + [react-native.core :as rn])) + +(defn separator + [{:keys [style]}] + [rn/view + {:style + (merge + style + {:background-color (quo.colors/theme-colors + quo.colors/neutral-10 + quo.colors/neutral-80) + :align-self :stretch + :height 1})}]) diff --git a/src/quo2/components/common/unread_grey_dot/style.cljs b/src/quo/components/common/unread_grey_dot/style.cljs similarity index 71% rename from src/quo2/components/common/unread_grey_dot/style.cljs rename to src/quo/components/common/unread_grey_dot/style.cljs index b3201d71ff..61e4d4e4da 100644 --- a/src/quo2/components/common/unread_grey_dot/style.cljs +++ b/src/quo/components/common/unread_grey_dot/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.common.unread-grey-dot.style +(ns quo.components.common.unread-grey-dot.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def unread-grey-dot {:width 8 diff --git a/src/quo2/components/common/unread_grey_dot/view.cljs b/src/quo/components/common/unread_grey_dot/view.cljs similarity index 68% rename from src/quo2/components/common/unread_grey_dot/view.cljs rename to src/quo/components/common/unread_grey_dot/view.cljs index e5ab848f5c..a1877b0691 100644 --- a/src/quo2/components/common/unread_grey_dot/view.cljs +++ b/src/quo/components/common/unread_grey_dot/view.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.common.unread-grey-dot.view +(ns quo.components.common.unread-grey-dot.view (:require - [quo2.components.common.unread-grey-dot.style :as style] + [quo.components.common.unread-grey-dot.style :as style] [react-native.core :as rn])) (defn unread-grey-dot diff --git a/src/quo2/components/community/banner/style.cljs b/src/quo/components/community/banner/style.cljs similarity index 83% rename from src/quo2/components/community/banner/style.cljs rename to src/quo/components/community/banner/style.cljs index 03a27b9251..51f31511e7 100644 --- a/src/quo2/components/community/banner/style.cljs +++ b/src/quo/components/community/banner/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.community.banner.style +(ns quo.components.community.banner.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.shadows :as shadows])) + [quo.foundations.colors :as colors] + [quo.foundations.shadows :as shadows])) (defn community-card [theme] diff --git a/src/quo2/components/community/banner/view.cljs b/src/quo/components/community/banner/view.cljs similarity index 85% rename from src/quo2/components/community/banner/view.cljs rename to src/quo/components/community/banner/view.cljs index cbd46d8eec..07eb36b3e1 100644 --- a/src/quo2/components/community/banner/view.cljs +++ b/src/quo/components/community/banner/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.community.banner.view +(ns quo.components.community.banner.view (:require - [quo2.components.community.banner.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.community.banner.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn])) (defn- card-title-and-description diff --git a/src/quo2/components/community/channel_actions.cljs b/src/quo/components/community/channel_actions.cljs similarity index 79% rename from src/quo2/components/community/channel_actions.cljs rename to src/quo/components/community/channel_actions.cljs index 82f41beef1..3737097012 100644 --- a/src/quo2/components/community/channel_actions.cljs +++ b/src/quo/components/community/channel_actions.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.community.channel-actions +(ns quo.components.community.channel-actions (:require - [quo2.components.community.style :as style] - [quo2.components.counter.counter.view :as counter] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] + [quo.components.community.style :as style] + [quo.components.counter.counter.view :as counter] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] [react-native.core :as rn])) (defn channel-action diff --git a/src/quo2/components/community/community_card_view.cljs b/src/quo/components/community/community_card_view.cljs similarity index 92% rename from src/quo2/components/community/community_card_view.cljs rename to src/quo/components/community/community_card_view.cljs index 301a05cecb..52d25b6600 100644 --- a/src/quo2/components/community/community_card_view.cljs +++ b/src/quo/components/community/community_card_view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.community.community-card-view +(ns quo.components.community.community-card-view (:require - [quo2.components.community.community-view :as community-view] - [quo2.components.community.icon :as icon] - [quo2.components.community.style :as style] - [quo2.theme :as quo.theme] + [quo.components.community.community-view :as community-view] + [quo.components.community.icon :as icon] + [quo.components.community.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- loading-card-view diff --git a/src/quo2/components/community/community_list_view.cljs b/src/quo/components/community/community_list_view.cljs similarity index 90% rename from src/quo2/components/community/community_list_view.cljs rename to src/quo/components/community/community_list_view.cljs index 162865ebb3..91b63e4a5e 100644 --- a/src/quo2/components/community/community_list_view.cljs +++ b/src/quo/components/community/community_list_view.cljs @@ -1,14 +1,14 @@ -(ns quo2.components.community.community-list-view +(ns quo.components.community.community-list-view (:require - [quo2.components.common.unread-grey-dot.view :refer [unread-grey-dot]] - [quo2.components.community.community-view :as community-view] - [quo2.components.community.icon :as community-icon] - [quo2.components.community.style :as style] - [quo2.components.counter.counter.view :as counter] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.common.unread-grey-dot.view :refer [unread-grey-dot]] + [quo.components.community.community-view :as community-view] + [quo.components.community.icon :as community-icon] + [quo.components.community.style :as style] + [quo.components.counter.counter.view :as counter] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn notification-view diff --git a/src/quo2/components/community/community_view.cljs b/src/quo/components/community/community_view.cljs similarity index 91% rename from src/quo2/components/community/community_view.cljs rename to src/quo/components/community/community_view.cljs index 3076c61117..a852e5c64b 100644 --- a/src/quo2/components/community/community_view.cljs +++ b/src/quo/components/community/community_view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.community.community-view +(ns quo.components.community.community-view (:require - [quo2.components.community.style :as style] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.tags.permission-tag :as permission] - [quo2.components.tags.tag :as tag] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.community.style :as style] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.tags.permission-tag :as permission] + [quo.components.tags.tag :as tag] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn] [react-native.gesture :as gesture] utils.money)) diff --git a/src/quo2/components/community/icon.cljs b/src/quo/components/community/icon.cljs similarity index 91% rename from src/quo2/components/community/icon.cljs rename to src/quo/components/community/icon.cljs index cb00826155..631e0635e7 100644 --- a/src/quo2/components/community/icon.cljs +++ b/src/quo/components/community/icon.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.community.icon +(ns quo.components.community.icon (:require [react-native.core :as rn])) diff --git a/src/quo2/components/community/style.cljs b/src/quo/components/community/style.cljs similarity index 98% rename from src/quo2/components/community/style.cljs rename to src/quo/components/community/style.cljs index 4a74111537..036e544911 100644 --- a/src/quo2/components/community/style.cljs +++ b/src/quo/components/community/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.community.style +(ns quo.components.community.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.shadows :as shadows])) + [quo.foundations.colors :as colors] + [quo.foundations.shadows :as shadows])) (defn community-card [radius theme] diff --git a/src/quo2/components/community/token_gating.cljs b/src/quo/components/community/token_gating.cljs similarity index 88% rename from src/quo2/components/community/token_gating.cljs rename to src/quo/components/community/token_gating.cljs index a3e1d0b29c..0de2b1d6cb 100644 --- a/src/quo2/components/community/token_gating.cljs +++ b/src/quo/components/community/token_gating.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.community.token-gating +(ns quo.components.community.token-gating (:require [clojure.string :as string] - [quo2.components.community.style :as style] - [quo2.components.markdown.text :as text] - [quo2.components.tags.token-tag :as token-tag] - [quo2.theme :as quo.theme] + [quo.components.community.style :as style] + [quo.components.markdown.text :as text] + [quo.components.tags.token-tag :as token-tag] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/counter/counter/component_spec.cljs b/src/quo/components/counter/counter/component_spec.cljs similarity index 89% rename from src/quo2/components/counter/counter/component_spec.cljs rename to src/quo/components/counter/counter/component_spec.cljs index ebfb49a0e6..562f332f66 100644 --- a/src/quo2/components/counter/counter/component_spec.cljs +++ b/src/quo/components/counter/counter/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.counter.counter.component-spec +(ns quo.components.counter.counter.component-spec (:require - [quo2.components.counter.counter.view :as counter] + [quo.components.counter.counter.view :as counter] [test-helpers.component :as h])) (h/describe "counter component" diff --git a/src/quo2/components/counter/counter/style.cljs b/src/quo/components/counter/counter/style.cljs similarity index 93% rename from src/quo2/components/counter/counter/style.cljs rename to src/quo/components/counter/counter/style.cljs index 32fd570d5a..b5b8ad8292 100644 --- a/src/quo2/components/counter/counter/style.cljs +++ b/src/quo/components/counter/counter/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.counter.counter.style +(ns quo.components.counter.counter.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn get-color [type customization-color theme] diff --git a/src/quo2/components/counter/counter/view.cljs b/src/quo/components/counter/counter/view.cljs similarity index 85% rename from src/quo2/components/counter/counter/view.cljs rename to src/quo/components/counter/counter/view.cljs index 2ec7565887..fdaedc5a82 100644 --- a/src/quo2/components/counter/counter/view.cljs +++ b/src/quo/components/counter/counter/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.counter.counter.view +(ns quo.components.counter.counter.view (:require - [quo2.components.counter.counter.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.counter.counter.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.number])) diff --git a/src/quo2/components/counter/step/component_spec.cljs b/src/quo/components/counter/step/component_spec.cljs similarity index 84% rename from src/quo2/components/counter/step/component_spec.cljs rename to src/quo/components/counter/step/component_spec.cljs index e5933d38ce..5a7f11a857 100644 --- a/src/quo2/components/counter/step/component_spec.cljs +++ b/src/quo/components/counter/step/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.counter.step.component-spec +(ns quo.components.counter.step.component-spec (:require - [quo2.components.counter.step.view :as step] + [quo.components.counter.step.view :as step] [test-helpers.component :as h])) (h/describe "step component" diff --git a/src/quo2/components/counter/step/style.cljs b/src/quo/components/counter/step/style.cljs similarity index 93% rename from src/quo2/components/counter/step/style.cljs rename to src/quo/components/counter/step/style.cljs index 7722a36b35..985cdae4d3 100644 --- a/src/quo2/components/counter/step/style.cljs +++ b/src/quo/components/counter/step/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.counter.step.style +(ns quo.components.counter.step.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container-base {:align-items :center diff --git a/src/quo2/components/counter/step/view.cljs b/src/quo/components/counter/step/view.cljs similarity index 85% rename from src/quo2/components/counter/step/view.cljs rename to src/quo/components/counter/step/view.cljs index cc8309cf85..a6423257b0 100644 --- a/src/quo2/components/counter/step/view.cljs +++ b/src/quo/components/counter/step/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.counter.step.view +(ns quo.components.counter.step.view (:require - [quo2.components.counter.step.style :as style] - [quo2.components.markdown.text :as text] - [quo2.theme :as theme] + [quo.components.counter.step.style :as style] + [quo.components.markdown.text :as text] + [quo.theme :as theme] [react-native.core :as rn] [utils.number])) diff --git a/src/quo2/components/dividers/date.cljs b/src/quo/components/dividers/date.cljs similarity index 74% rename from src/quo2/components/dividers/date.cljs rename to src/quo/components/dividers/date.cljs index 705c7423ab..48532ad399 100644 --- a/src/quo2/components/dividers/date.cljs +++ b/src/quo/components/dividers/date.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.dividers.date +(ns quo.components.dividers.date (:require - [quo2.components.common.separator.view :as separator] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] + [quo.components.common.separator.view :as separator] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] [react-native.core :as rn])) (defn date diff --git a/src/quo2/components/dividers/divider_label/component_spec.cljs b/src/quo/components/dividers/divider_label/component_spec.cljs similarity index 86% rename from src/quo2/components/dividers/divider_label/component_spec.cljs rename to src/quo/components/dividers/divider_label/component_spec.cljs index a920967431..d396e6e64a 100644 --- a/src/quo2/components/dividers/divider_label/component_spec.cljs +++ b/src/quo/components/dividers/divider_label/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.dividers.divider-label.component-spec +(ns quo.components.dividers.divider-label.component-spec (:require - [quo2.components.dividers.divider-label.view :as divider-label] + [quo.components.dividers.divider-label.view :as divider-label] [test-helpers.component :as h])) (h/describe "Divider Label" diff --git a/src/quo2/components/dividers/divider_label/style.cljs b/src/quo/components/dividers/divider_label/style.cljs similarity index 92% rename from src/quo2/components/dividers/divider_label/style.cljs rename to src/quo/components/dividers/divider_label/style.cljs index 1ce4068c50..6d7ce9cab2 100644 --- a/src/quo2/components/dividers/divider_label/style.cljs +++ b/src/quo/components/dividers/divider_label/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.dividers.divider-label.style +(ns quo.components.dividers.divider-label.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn get-height [tight?] diff --git a/src/quo2/components/dividers/divider_label/view.cljs b/src/quo/components/dividers/divider_label/view.cljs similarity index 87% rename from src/quo2/components/dividers/divider_label/view.cljs rename to src/quo/components/dividers/divider_label/view.cljs index 523da938f2..5207e3c441 100644 --- a/src/quo2/components/dividers/divider_label/view.cljs +++ b/src/quo/components/dividers/divider_label/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.dividers.divider-label.view +(ns quo.components.dividers.divider-label.view (:require - [quo2.components.counter.counter.view :as counter] - [quo2.components.dividers.divider-label.style :as style] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.theme :as quo.theme] + [quo.components.counter.counter.view :as counter] + [quo.components.dividers.divider-label.style :as style] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/dividers/divider_line/style.cljs b/src/quo/components/dividers/divider_line/style.cljs similarity index 79% rename from src/quo2/components/dividers/divider_line/style.cljs rename to src/quo/components/dividers/divider_line/style.cljs index 8b05ebf965..aaef0944af 100644 --- a/src/quo2/components/dividers/divider_line/style.cljs +++ b/src/quo/components/dividers/divider_line/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.dividers.divider-line.style +(ns quo.components.dividers.divider-line.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn divider-line [{:keys [blur? container-style theme]}] diff --git a/src/quo2/components/dividers/divider_line/view.cljs b/src/quo/components/dividers/divider_line/view.cljs similarity index 55% rename from src/quo2/components/dividers/divider_line/view.cljs rename to src/quo/components/dividers/divider_line/view.cljs index 4734641c68..d9b57bf661 100644 --- a/src/quo2/components/dividers/divider_line/view.cljs +++ b/src/quo/components/dividers/divider_line/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.dividers.divider-line.view +(ns quo.components.dividers.divider-line.view (:require - [quo2.components.dividers.divider-line.style :as style] - [quo2.theme :as quo.theme] + [quo.components.dividers.divider-line.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/dividers/new_messages.cljs b/src/quo/components/dividers/new_messages.cljs similarity index 83% rename from src/quo2/components/dividers/new_messages.cljs rename to src/quo/components/dividers/new_messages.cljs index 2eef50b27e..53cab96b2e 100644 --- a/src/quo2/components/dividers/new_messages.cljs +++ b/src/quo/components/dividers/new_messages.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.dividers.new-messages +(ns quo.components.dividers.new-messages (:require - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient])) diff --git a/src/quo2/components/dividers/strength_divider/component_spec.cljs b/src/quo/components/dividers/strength_divider/component_spec.cljs similarity index 92% rename from src/quo2/components/dividers/strength_divider/component_spec.cljs rename to src/quo/components/dividers/strength_divider/component_spec.cljs index 16df8adc24..ef9b1d51a6 100644 --- a/src/quo2/components/dividers/strength_divider/component_spec.cljs +++ b/src/quo/components/dividers/strength_divider/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.dividers.strength-divider.component-spec +(ns quo.components.dividers.strength-divider.component-spec (:require - [quo2.components.dividers.strength-divider.view :as strength-divider] + [quo.components.dividers.strength-divider.view :as strength-divider] [test-helpers.component :as h])) (h/describe "select-profile component" diff --git a/src/quo2/components/dividers/strength_divider/style.cljs b/src/quo/components/dividers/strength_divider/style.cljs similarity index 78% rename from src/quo2/components/dividers/strength_divider/style.cljs rename to src/quo/components/dividers/strength_divider/style.cljs index b232c09fc7..e59381a0b5 100644 --- a/src/quo2/components/dividers/strength_divider/style.cljs +++ b/src/quo/components/dividers/strength_divider/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.dividers.strength-divider.style) +(ns quo.components.dividers.strength-divider.style) (def container {:height 40 diff --git a/src/quo2/components/dividers/strength_divider/view.cljs b/src/quo/components/dividers/strength_divider/view.cljs similarity index 92% rename from src/quo2/components/dividers/strength_divider/view.cljs rename to src/quo/components/dividers/strength_divider/view.cljs index ebd1659f08..b98d93ccdd 100644 --- a/src/quo2/components/dividers/strength_divider/view.cljs +++ b/src/quo/components/dividers/strength_divider/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.dividers.strength-divider.view +(ns quo.components.dividers.strength-divider.view (:require - [quo2.components.dividers.strength-divider.style :as style] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] + [quo.components.dividers.strength-divider.style :as style] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient] [react-native.svg :as svg] diff --git a/src/quo2/components/drawers/action_drawers/component_spec.cljs b/src/quo/components/drawers/action_drawers/component_spec.cljs similarity index 96% rename from src/quo2/components/drawers/action_drawers/component_spec.cljs rename to src/quo/components/drawers/action_drawers/component_spec.cljs index 92a0864b56..b5ae5b557f 100644 --- a/src/quo2/components/drawers/action_drawers/component_spec.cljs +++ b/src/quo/components/drawers/action_drawers/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.action-drawers.component-spec +(ns quo.components.drawers.action-drawers.component-spec (:require - [quo2.components.drawers.action-drawers.view :as action-drawer] + [quo.components.drawers.action-drawers.view :as action-drawer] [test-helpers.component :as h])) (h/describe "action drawer" diff --git a/src/quo2/components/drawers/action_drawers/style.cljs b/src/quo/components/drawers/action_drawers/style.cljs similarity index 92% rename from src/quo2/components/drawers/action_drawers/style.cljs rename to src/quo/components/drawers/action_drawers/style.cljs index 84c22347af..7e0c5e5439 100644 --- a/src/quo2/components/drawers/action_drawers/style.cljs +++ b/src/quo/components/drawers/action_drawers/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.action-drawers.style +(ns quo.components.drawers.action-drawers.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn divider [theme] diff --git a/src/quo2/components/drawers/action_drawers/view.cljs b/src/quo/components/drawers/action_drawers/view.cljs similarity index 91% rename from src/quo2/components/drawers/action_drawers/view.cljs rename to src/quo/components/drawers/action_drawers/view.cljs index 58adc163d6..cc4c5b2e36 100644 --- a/src/quo2/components/drawers/action_drawers/view.cljs +++ b/src/quo/components/drawers/action_drawers/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.drawers.action-drawers.view +(ns quo.components.drawers.action-drawers.view (:require - [quo2.components.drawers.action-drawers.style :as style] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.drawers.action-drawers.style :as style] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- get-icon-color diff --git a/src/quo2/components/drawers/bottom_actions/component_spec.cljs b/src/quo/components/drawers/bottom_actions/component_spec.cljs similarity index 86% rename from src/quo2/components/drawers/bottom_actions/component_spec.cljs rename to src/quo/components/drawers/bottom_actions/component_spec.cljs index 7ca2d86ea9..cbdd87994f 100644 --- a/src/quo2/components/drawers/bottom_actions/component_spec.cljs +++ b/src/quo/components/drawers/bottom_actions/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.bottom-actions.component-spec +(ns quo.components.drawers.bottom-actions.component-spec (:require - [quo2.components.drawers.bottom-actions.view :as bottom-actions] + [quo.components.drawers.bottom-actions.view :as bottom-actions] [test-helpers.component :as h])) (h/describe "bottom actions tests" diff --git a/src/quo2/components/drawers/bottom_actions/style.cljs b/src/quo/components/drawers/bottom_actions/style.cljs similarity index 90% rename from src/quo2/components/drawers/bottom_actions/style.cljs rename to src/quo/components/drawers/bottom_actions/style.cljs index 6f490efbbe..b47b033825 100644 --- a/src/quo2/components/drawers/bottom_actions/style.cljs +++ b/src/quo/components/drawers/bottom_actions/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.bottom-actions.style +(ns quo.components.drawers.bottom-actions.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def buttons-container {:flex-direction :row diff --git a/src/quo2/components/drawers/bottom_actions/view.cljs b/src/quo/components/drawers/bottom_actions/view.cljs similarity index 88% rename from src/quo2/components/drawers/bottom_actions/view.cljs rename to src/quo/components/drawers/bottom_actions/view.cljs index 8f2523985a..ab98de3e72 100644 --- a/src/quo2/components/drawers/bottom_actions/view.cljs +++ b/src/quo/components/drawers/bottom_actions/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.drawers.bottom-actions.view +(ns quo.components.drawers.bottom-actions.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.drawers.bottom-actions.style :as style] - [quo2.components.markdown.text :as text] - [quo2.theme :as quo.theme] + [quo.components.buttons.button.view :as button] + [quo.components.drawers.bottom-actions.style :as style] + [quo.components.markdown.text :as text] + [quo.theme :as quo.theme] [react-native.core :as rn])) (def default-props diff --git a/src/quo2/components/drawers/documentation_drawers/component_spec.cljs b/src/quo/components/drawers/documentation_drawers/component_spec.cljs similarity index 89% rename from src/quo2/components/drawers/documentation_drawers/component_spec.cljs rename to src/quo/components/drawers/documentation_drawers/component_spec.cljs index 27b2377765..2265332dec 100644 --- a/src/quo2/components/drawers/documentation_drawers/component_spec.cljs +++ b/src/quo/components/drawers/documentation_drawers/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.documentation-drawers.component-spec +(ns quo.components.drawers.documentation-drawers.component-spec (:require - [quo2.components.drawers.documentation-drawers.view :as documentation-drawers] + [quo.components.drawers.documentation-drawers.view :as documentation-drawers] [test-helpers.component :as h])) (h/describe "Documentation drawers component" diff --git a/src/quo2/components/drawers/documentation_drawers/style.cljs b/src/quo/components/drawers/documentation_drawers/style.cljs similarity index 84% rename from src/quo2/components/drawers/documentation_drawers/style.cljs rename to src/quo/components/drawers/documentation_drawers/style.cljs index a8f9aefd06..2968e4d576 100644 --- a/src/quo2/components/drawers/documentation_drawers/style.cljs +++ b/src/quo/components/drawers/documentation_drawers/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.documentation-drawers.style +(ns quo.components.drawers.documentation-drawers.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.safe-area :as safe-area])) (def outer-container diff --git a/src/quo2/components/drawers/documentation_drawers/view.cljs b/src/quo/components/drawers/documentation_drawers/view.cljs similarity index 84% rename from src/quo2/components/drawers/documentation_drawers/view.cljs rename to src/quo/components/drawers/documentation_drawers/view.cljs index d9ddd62866..8448605941 100644 --- a/src/quo2/components/drawers/documentation_drawers/view.cljs +++ b/src/quo/components/drawers/documentation_drawers/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.drawers.documentation-drawers.view +(ns quo.components.drawers.documentation-drawers.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.drawers.documentation-drawers.style :as style] - [quo2.components.markdown.text :as text] - [quo2.theme :as quo.theme] + [quo.components.buttons.button.view :as button] + [quo.components.drawers.documentation-drawers.style :as style] + [quo.components.markdown.text :as text] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.gesture :as gesture])) diff --git a/src/quo2/components/drawers/drawer_buttons/component_spec.cljs b/src/quo/components/drawers/drawer_buttons/component_spec.cljs similarity index 95% rename from src/quo2/components/drawers/drawer_buttons/component_spec.cljs rename to src/quo/components/drawers/drawer_buttons/component_spec.cljs index c272b49f47..2fc4f9c391 100644 --- a/src/quo2/components/drawers/drawer_buttons/component_spec.cljs +++ b/src/quo/components/drawers/drawer_buttons/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.drawer-buttons.component-spec +(ns quo.components.drawers.drawer-buttons.component-spec (:require - [quo2.components.drawers.drawer-buttons.view :as drawer-buttons] + [quo.components.drawers.drawer-buttons.view :as drawer-buttons] [react-native.core :as rn] [react-native.safe-area :as safe-area] [test-helpers.component :as h])) diff --git a/src/quo2/components/drawers/drawer_buttons/style.cljs b/src/quo/components/drawers/drawer_buttons/style.cljs similarity index 95% rename from src/quo2/components/drawers/drawer_buttons/style.cljs rename to src/quo/components/drawers/drawer_buttons/style.cljs index f79bb0bbfb..7229d8c992 100644 --- a/src/quo2/components/drawers/drawer_buttons/style.cljs +++ b/src/quo/components/drawers/drawer_buttons/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.drawer-buttons.style +(ns quo.components.drawers.drawer-buttons.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) (defn outer-container diff --git a/src/quo2/components/drawers/drawer_buttons/view.cljs b/src/quo/components/drawers/drawer_buttons/view.cljs similarity index 97% rename from src/quo2/components/drawers/drawer_buttons/view.cljs rename to src/quo/components/drawers/drawer_buttons/view.cljs index c01db3de71..f5fc930117 100644 --- a/src/quo2/components/drawers/drawer_buttons/view.cljs +++ b/src/quo/components/drawers/drawer_buttons/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.drawers.drawer-buttons.view +(ns quo.components.drawers.drawer-buttons.view (:require - [quo2.components.drawers.drawer-buttons.style :as style] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] + [quo.components.drawers.drawer-buttons.style :as style] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] [react-native.blur :as blur] [react-native.core :as rn] [react-native.platform :as platform] diff --git a/src/quo2/components/drawers/drawer_top/component_spec.cljs b/src/quo/components/drawers/drawer_top/component_spec.cljs similarity index 97% rename from src/quo2/components/drawers/drawer_top/component_spec.cljs rename to src/quo/components/drawers/drawer_top/component_spec.cljs index 5f8d1155eb..1a90f4be26 100644 --- a/src/quo2/components/drawers/drawer_top/component_spec.cljs +++ b/src/quo/components/drawers/drawer_top/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.drawer-top.component-spec +(ns quo.components.drawers.drawer-top.component-spec (:require - [quo2.core :as quo] + [quo.core :as quo] [test-helpers.component :as h])) (h/describe "drawer top tests" diff --git a/src/quo2/components/drawers/drawer_top/style.cljs b/src/quo/components/drawers/drawer_top/style.cljs similarity index 86% rename from src/quo2/components/drawers/drawer_top/style.cljs rename to src/quo/components/drawers/drawer_top/style.cljs index af5846e802..5589f58f10 100644 --- a/src/quo2/components/drawers/drawer_top/style.cljs +++ b/src/quo/components/drawers/drawer_top/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.drawer-top.style +(ns quo.components.drawers.drawer-top.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container {:padding-horizontal 20 diff --git a/src/quo2/components/drawers/drawer_top/view.cljs b/src/quo/components/drawers/drawer_top/view.cljs similarity index 91% rename from src/quo2/components/drawers/drawer_top/view.cljs rename to src/quo/components/drawers/drawer_top/view.cljs index 30c42a67c6..477e88cfe6 100644 --- a/src/quo2/components/drawers/drawer_top/view.cljs +++ b/src/quo/components/drawers/drawer_top/view.cljs @@ -1,15 +1,15 @@ -(ns quo2.components.drawers.drawer-top.view +(ns quo.components.drawers.drawer-top.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.avatars.icon-avatar :as icon-avatar] - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.buttons.button.view :as button] - [quo2.components.drawers.drawer-top.style :as style] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.tags.context-tag.view :as context-tag] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.avatars.icon-avatar :as icon-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.buttons.button.view :as button] + [quo.components.drawers.drawer-top.style :as style] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.tags.context-tag.view :as context-tag] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/drawers/permission_context/component_spec.cljs b/src/quo/components/drawers/permission_context/component_spec.cljs similarity index 73% rename from src/quo2/components/drawers/permission_context/component_spec.cljs rename to src/quo/components/drawers/permission_context/component_spec.cljs index bbdbe0e57b..2dbf9467e8 100644 --- a/src/quo2/components/drawers/permission_context/component_spec.cljs +++ b/src/quo/components/drawers/permission_context/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.permission-context.component-spec +(ns quo.components.drawers.permission-context.component-spec (:require - [quo2.components.drawers.permission-context.view :as permission-context] + [quo.components.drawers.permission-context.view :as permission-context] [react-native.core :as rn] [test-helpers.component :as h])) diff --git a/src/quo2/components/drawers/permission_context/style.cljs b/src/quo/components/drawers/permission_context/style.cljs similarity index 87% rename from src/quo2/components/drawers/permission_context/style.cljs rename to src/quo/components/drawers/permission_context/style.cljs index e2ee00d21a..ec0a15871a 100644 --- a/src/quo2/components/drawers/permission_context/style.cljs +++ b/src/quo/components/drawers/permission_context/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.drawers.permission-context.style +(ns quo.components.drawers.permission-context.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.safe-area :as safe-area])) (def radius 20) diff --git a/src/quo2/components/drawers/permission_context/view.cljs b/src/quo/components/drawers/permission_context/view.cljs similarity index 62% rename from src/quo2/components/drawers/permission_context/view.cljs rename to src/quo/components/drawers/permission_context/view.cljs index 6cea75038a..4934d46225 100644 --- a/src/quo2/components/drawers/permission_context/view.cljs +++ b/src/quo/components/drawers/permission_context/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.drawers.permission-context.view +(ns quo.components.drawers.permission-context.view (:require - [quo2.components.drawers.permission-context.style :as style] - [quo2.foundations.colors :as colors] + [quo.components.drawers.permission-context.style :as style] + [quo.foundations.colors :as colors] [react-native.core :as rn])) (defn view diff --git a/src/quo2/components/dropdowns/dropdown/component_spec.cljs b/src/quo/components/dropdowns/dropdown/component_spec.cljs similarity index 91% rename from src/quo2/components/dropdowns/dropdown/component_spec.cljs rename to src/quo/components/dropdowns/dropdown/component_spec.cljs index 8c6bc38c5d..b3c06e3a0c 100644 --- a/src/quo2/components/dropdowns/dropdown/component_spec.cljs +++ b/src/quo/components/dropdowns/dropdown/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.dropdowns.dropdown.component-spec +(ns quo.components.dropdowns.dropdown.component-spec (:require - [quo2.components.dropdowns.dropdown.view :as dropdown] + [quo.components.dropdowns.dropdown.view :as dropdown] [test-helpers.component :as h])) (h/describe "Dropdown" diff --git a/src/quo2/components/dropdowns/dropdown/properties.cljs b/src/quo/components/dropdowns/dropdown/properties.cljs similarity index 98% rename from src/quo2/components/dropdowns/dropdown/properties.cljs rename to src/quo/components/dropdowns/dropdown/properties.cljs index 59cc9c6c45..a727214232 100644 --- a/src/quo2/components/dropdowns/dropdown/properties.cljs +++ b/src/quo/components/dropdowns/dropdown/properties.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.dropdowns.dropdown.properties +(ns quo.components.dropdowns.dropdown.properties (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def backgrounds #{:photo :blur}) diff --git a/src/quo2/components/dropdowns/dropdown/style.cljs b/src/quo/components/dropdowns/dropdown/style.cljs similarity index 96% rename from src/quo2/components/dropdowns/dropdown/style.cljs rename to src/quo/components/dropdowns/dropdown/style.cljs index 7bab033dec..c59a43f66f 100644 --- a/src/quo2/components/dropdowns/dropdown/style.cljs +++ b/src/quo/components/dropdowns/dropdown/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.dropdowns.dropdown.style) +(ns quo.components.dropdowns.dropdown.style) (def gap 4) diff --git a/src/quo2/components/dropdowns/dropdown/view.cljs b/src/quo/components/dropdowns/dropdown/view.cljs similarity index 89% rename from src/quo2/components/dropdowns/dropdown/view.cljs rename to src/quo/components/dropdowns/dropdown/view.cljs index 25d0f28ce6..52d3d1ea1a 100644 --- a/src/quo2/components/dropdowns/dropdown/view.cljs +++ b/src/quo/components/dropdowns/dropdown/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.dropdowns.dropdown.view +(ns quo.components.dropdowns.dropdown.view (:require - [quo2.components.dropdowns.dropdown.properties :as properties] - [quo2.components.dropdowns.dropdown.style :as style] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.foundations.customization-colors :as customization-colors] - [quo2.theme :as theme] + [quo.components.dropdowns.dropdown.properties :as properties] + [quo.components.dropdowns.dropdown.style :as style] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.foundations.customization-colors :as customization-colors] + [quo.theme :as theme] [react-native.blur :as blur] [react-native.core :as rn])) diff --git a/src/quo2/components/dropdowns/network_dropdown/component_spec.cljs b/src/quo/components/dropdowns/network_dropdown/component_spec.cljs similarity index 86% rename from src/quo2/components/dropdowns/network_dropdown/component_spec.cljs rename to src/quo/components/dropdowns/network_dropdown/component_spec.cljs index 84091b4da6..fbd6090d0d 100644 --- a/src/quo2/components/dropdowns/network_dropdown/component_spec.cljs +++ b/src/quo/components/dropdowns/network_dropdown/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.dropdowns.network-dropdown.component-spec +(ns quo.components.dropdowns.network-dropdown.component-spec (:require - [quo2.components.dropdowns.network-dropdown.view :as network-dropdown] - [quo2.foundations.resources :as quo.resources] + [quo.components.dropdowns.network-dropdown.view :as network-dropdown] + [quo.foundations.resources :as quo.resources] [test-helpers.component :as h])) (def ^:private networks-list diff --git a/src/quo2/components/dropdowns/network_dropdown/style.cljs b/src/quo/components/dropdowns/network_dropdown/style.cljs similarity index 90% rename from src/quo2/components/dropdowns/network_dropdown/style.cljs rename to src/quo/components/dropdowns/network_dropdown/style.cljs index 025c46d9f6..cb0efe2b57 100644 --- a/src/quo2/components/dropdowns/network_dropdown/style.cljs +++ b/src/quo/components/dropdowns/network_dropdown/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.dropdowns.network-dropdown.style +(ns quo.components.dropdowns.network-dropdown.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container-border-color [{:keys [state blur? theme pressed?]}] diff --git a/src/quo2/components/dropdowns/network_dropdown/view.cljs b/src/quo/components/dropdowns/network_dropdown/view.cljs similarity index 78% rename from src/quo2/components/dropdowns/network_dropdown/view.cljs rename to src/quo/components/dropdowns/network_dropdown/view.cljs index 951d6864dd..35c2b9fbaa 100644 --- a/src/quo2/components/dropdowns/network_dropdown/view.cljs +++ b/src/quo/components/dropdowns/network_dropdown/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.dropdowns.network-dropdown.view +(ns quo.components.dropdowns.network-dropdown.view (:require - [quo2.components.dropdowns.network-dropdown.style :as style] - [quo2.components.list-items.preview-list.view :as preview-list] - [quo2.theme :as quo.theme] + [quo.components.dropdowns.network-dropdown.style :as style] + [quo.components.list-items.preview-list.view :as preview-list] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/empty_state/empty_state/styles.cljs b/src/quo/components/empty_state/empty_state/styles.cljs similarity index 84% rename from src/quo2/components/empty_state/empty_state/styles.cljs rename to src/quo/components/empty_state/empty_state/styles.cljs index c5bcfc7570..1824d8c078 100644 --- a/src/quo2/components/empty_state/empty_state/styles.cljs +++ b/src/quo/components/empty_state/empty_state/styles.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.empty-state.empty-state.styles +(ns quo.components.empty-state.empty-state.styles (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container {:padding 12 diff --git a/src/quo2/components/empty_state/empty_state/view.cljs b/src/quo/components/empty_state/empty_state/view.cljs similarity index 87% rename from src/quo2/components/empty_state/empty_state/view.cljs rename to src/quo/components/empty_state/empty_state/view.cljs index 648c76c41f..9f1b1af595 100644 --- a/src/quo2/components/empty_state/empty_state/view.cljs +++ b/src/quo/components/empty_state/empty_state/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.empty-state.empty-state.view +(ns quo.components.empty-state.empty-state.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.empty-state.empty-state.styles :as styles] - [quo2.components.markdown.text :as text] - [quo2.theme :as theme] + [quo.components.buttons.button.view :as button] + [quo.components.empty-state.empty-state.styles :as styles] + [quo.components.markdown.text :as text] + [quo.theme :as theme] [react-native.core :as rn] [react-native.fast-image :as fast-image])) diff --git a/src/quo2/components/gradient/gradient_cover/component_spec.cljs b/src/quo/components/gradient/gradient_cover/component_spec.cljs similarity index 60% rename from src/quo2/components/gradient/gradient_cover/component_spec.cljs rename to src/quo/components/gradient/gradient_cover/component_spec.cljs index 693027d3a8..b18d10b03c 100644 --- a/src/quo2/components/gradient/gradient_cover/component_spec.cljs +++ b/src/quo/components/gradient/gradient_cover/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.gradient.gradient-cover.component-spec +(ns quo.components.gradient.gradient-cover.component-spec (:require - [quo2.components.gradient.gradient-cover.view :as gradient-cover] + [quo.components.gradient.gradient-cover.view :as gradient-cover] [test-helpers.component :as h])) (h/describe "gradient cover" diff --git a/src/quo2/components/gradient/gradient_cover/style.cljs b/src/quo/components/gradient/gradient_cover/style.cljs similarity index 58% rename from src/quo2/components/gradient/gradient_cover/style.cljs rename to src/quo/components/gradient/gradient_cover/style.cljs index feee187b65..e758e9af6d 100644 --- a/src/quo2/components/gradient/gradient_cover/style.cljs +++ b/src/quo/components/gradient/gradient_cover/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.gradient.gradient-cover.style) +(ns quo.components.gradient.gradient-cover.style) (defn root-container [opacity] diff --git a/src/quo2/components/gradient/gradient_cover/view.cljs b/src/quo/components/gradient/gradient_cover/view.cljs similarity index 78% rename from src/quo2/components/gradient/gradient_cover/view.cljs rename to src/quo/components/gradient/gradient_cover/view.cljs index 88ee8dff55..1d8fe5068e 100644 --- a/src/quo2/components/gradient/gradient_cover/view.cljs +++ b/src/quo/components/gradient/gradient_cover/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.gradient.gradient-cover.view +(ns quo.components.gradient.gradient-cover.view (:require - [quo2.components.gradient.gradient-cover.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.gradient.gradient-cover.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.linear-gradient :as linear-gradient])) (defn- view-internal diff --git a/src/quo2/components/graph/interactive_graph/component_spec.cljs b/src/quo/components/graph/interactive_graph/component_spec.cljs similarity index 71% rename from src/quo2/components/graph/interactive_graph/component_spec.cljs rename to src/quo/components/graph/interactive_graph/component_spec.cljs index df78161333..8c52766e5d 100644 --- a/src/quo2/components/graph/interactive_graph/component_spec.cljs +++ b/src/quo/components/graph/interactive_graph/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.graph.interactive-graph.component-spec +(ns quo.components.graph.interactive-graph.component-spec (:require - [quo2.components.graph.interactive-graph.view :as interactive-graph] + [quo.components.graph.interactive-graph.view :as interactive-graph] [test-helpers.component :as h])) (defn data diff --git a/src/quo2/components/graph/interactive_graph/style.cljs b/src/quo/components/graph/interactive_graph/style.cljs similarity index 92% rename from src/quo2/components/graph/interactive_graph/style.cljs rename to src/quo/components/graph/interactive_graph/style.cljs index ce632ae683..9cd48a164e 100644 --- a/src/quo2/components/graph/interactive_graph/style.cljs +++ b/src/quo/components/graph/interactive_graph/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.graph.interactive-graph.style +(ns quo.components.graph.interactive-graph.style (:require - [quo2.foundations.typography :as typography])) + [quo.foundations.typography :as typography])) (defn x-axis-label-text [width y-axis-label-text-color] diff --git a/src/quo2/components/graph/interactive_graph/view.cljs b/src/quo/components/graph/interactive_graph/view.cljs similarity index 96% rename from src/quo2/components/graph/interactive_graph/view.cljs rename to src/quo/components/graph/interactive_graph/view.cljs index 85407c8f6c..342cfb718e 100644 --- a/src/quo2/components/graph/interactive_graph/view.cljs +++ b/src/quo/components/graph/interactive_graph/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.graph.interactive-graph.view +(ns quo.components.graph.interactive-graph.view (:require - [quo2.components.graph.interactive-graph.style :as style] - [quo2.components.graph.utils :as utils] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.graph.interactive-graph.style :as style] + [quo.components.graph.utils :as utils] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.charts :as charts] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/graph/utils.cljs b/src/quo/components/graph/utils.cljs similarity index 99% rename from src/quo2/components/graph/utils.cljs rename to src/quo/components/graph/utils.cljs index 5b64a071fa..25dc9617e9 100644 --- a/src/quo2/components/graph/utils.cljs +++ b/src/quo/components/graph/utils.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.graph.utils +(ns quo.components.graph.utils (:require [clojure.string :as string] [goog.string :as gstring])) diff --git a/src/quo2/components/graph/utils_test.cljs b/src/quo/components/graph/utils_test.cljs similarity index 98% rename from src/quo2/components/graph/utils_test.cljs rename to src/quo/components/graph/utils_test.cljs index 545a1083c9..f59bac5444 100644 --- a/src/quo2/components/graph/utils_test.cljs +++ b/src/quo/components/graph/utils_test.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.graph.utils-test +(ns quo.components.graph.utils-test (:require [cljs.test :refer-macros [deftest is testing]] - [quo2.components.graph.utils :as utils])) + [quo.components.graph.utils :as utils])) (deftest find-highest-value (testing "Find highest value with a single map" diff --git a/src/quo2/components/graph/wallet_graph/component_spec.cljs b/src/quo/components/graph/wallet_graph/component_spec.cljs similarity index 81% rename from src/quo2/components/graph/wallet_graph/component_spec.cljs rename to src/quo/components/graph/wallet_graph/component_spec.cljs index 1353dc4c07..6b3d6470ac 100644 --- a/src/quo2/components/graph/wallet_graph/component_spec.cljs +++ b/src/quo/components/graph/wallet_graph/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.graph.wallet-graph.component-spec +(ns quo.components.graph.wallet-graph.component-spec (:require - [quo2.components.graph.wallet-graph.view :as wallet-graph] + [quo.components.graph.wallet-graph.view :as wallet-graph] [test-helpers.component :as h])) (defn data diff --git a/src/quo2/components/graph/wallet_graph/style.cljs b/src/quo/components/graph/wallet_graph/style.cljs similarity index 82% rename from src/quo2/components/graph/wallet_graph/style.cljs rename to src/quo/components/graph/wallet_graph/style.cljs index 0c64785df3..da6657d6b5 100644 --- a/src/quo2/components/graph/wallet_graph/style.cljs +++ b/src/quo/components/graph/wallet_graph/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.graph.wallet-graph.style +(ns quo.components.graph.wallet-graph.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def gradient-background {:height 294 diff --git a/src/quo2/components/graph/wallet_graph/view.cljs b/src/quo/components/graph/wallet_graph/view.cljs similarity index 91% rename from src/quo2/components/graph/wallet_graph/view.cljs rename to src/quo/components/graph/wallet_graph/view.cljs index cbdff06fe4..bf611e26fd 100644 --- a/src/quo2/components/graph/wallet_graph/view.cljs +++ b/src/quo/components/graph/wallet_graph/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.graph.wallet-graph.view +(ns quo.components.graph.wallet-graph.view (:require - [quo2.components.graph.utils :as utils] - [quo2.components.graph.wallet-graph.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.graph.utils :as utils] + [quo.components.graph.wallet-graph.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.charts :as charts] [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient])) diff --git a/src/quo2/components/header.cljs b/src/quo/components/header.cljs similarity index 97% rename from src/quo2/components/header.cljs rename to src/quo/components/header.cljs index c1bb0dc2bf..7016004938 100644 --- a/src/quo2/components/header.cljs +++ b/src/quo/components/header.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.header +(ns quo.components.header (:require [oops.core :refer [oget]] - [quo2.components.buttons.button.view :as button] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.buttons.button.view :as button] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.reanimated :as reanimated] [reagent.core :as reagent])) diff --git a/src/quo2/components/icon.cljs b/src/quo/components/icon.cljs similarity index 88% rename from src/quo2/components/icon.cljs rename to src/quo/components/icon.cljs index 3c2744aa04..6ec2e08d79 100644 --- a/src/quo2/components/icon.cljs +++ b/src/quo/components/icon.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.icon +(ns quo.components.icon (:require [clojure.string :as string] - [quo2.components.icons.icons :as icons] - [quo2.components.icons.svg :as icons.svg] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icons.icons :as icons] + [quo.components.icons.svg :as icons.svg] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- valid-color? diff --git a/src/quo2/components/icons/icons.clj b/src/quo/components/icons/icons.clj similarity index 96% rename from src/quo2/components/icons/icons.clj rename to src/quo/components/icons/icons.clj index f480b03184..65a722dcdd 100644 --- a/src/quo2/components/icons/icons.clj +++ b/src/quo/components/icons/icons.clj @@ -1,4 +1,4 @@ -(ns quo2.components.icons.icons +(ns quo.components.icons.icons (:require [clojure.java.io :as io] [clojure.string :as string])) diff --git a/src/quo2/components/icons/icons.cljs b/src/quo/components/icons/icons.cljs similarity index 72% rename from src/quo2/components/icons/icons.cljs rename to src/quo/components/icons/icons.cljs index 15506ab390..8164ee0ecf 100644 --- a/src/quo2/components/icons/icons.cljs +++ b/src/quo/components/icons/icons.cljs @@ -1,5 +1,5 @@ -(ns quo2.components.icons.icons - (:require-macros [quo2.components.icons.icons :as icons]) +(ns quo.components.icons.icons + (:require-macros [quo.components.icons.icons :as icons]) (:require [taoensso.timbre :as log])) diff --git a/src/quo2/components/icons/svg.cljs b/src/quo/components/icons/svg.cljs similarity index 98% rename from src/quo2/components/icons/svg.cljs rename to src/quo/components/icons/svg.cljs index 9860265365..bc82ed608e 100644 --- a/src/quo2/components/icons/svg.cljs +++ b/src/quo/components/icons/svg.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.icons.svg +(ns quo.components.icons.svg "Declare icons in this namespace when they have two possible colors, because the ReactNative `:tint-color` prop affects all non-transparent pixels of PNGs. If the icon has only one color, prefer a PNG. Keep all SVG components private and expose them by name in the `icons` var." (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.svg :as svg])) (defn- container diff --git a/src/quo2/components/info/info_message.cljs b/src/quo/components/info/info_message.cljs similarity index 86% rename from src/quo2/components/info/info_message.cljs rename to src/quo/components/info/info_message.cljs index 2747e867aa..9a5ad131f8 100644 --- a/src/quo2/components/info/info_message.cljs +++ b/src/quo/components/info/info_message.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.info.info-message +(ns quo.components.info.info-message (:require - [quo2.components.icon :as quo2.icons] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.icon :as quo.icons] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn])) (def themes @@ -37,7 +37,7 @@ {:style (merge {:flex-direction :row :align-items :center} style)} - [quo2.icons/icon icon + [quo.icons/icon icon {:color icon-color :no-color no-icon-color? :size icon-size}] diff --git a/src/quo2/components/info/information_box/component_spec.cljs b/src/quo/components/info/information_box/component_spec.cljs similarity index 90% rename from src/quo2/components/info/information_box/component_spec.cljs rename to src/quo/components/info/information_box/component_spec.cljs index 065c8f3af7..d87fcea2ef 100644 --- a/src/quo2/components/info/information_box/component_spec.cljs +++ b/src/quo/components/info/information_box/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.info.information-box.component-spec +(ns quo.components.info.information-box.component-spec (:require - [quo2.components.info.information-box.view :as view] + [quo.components.info.information-box.view :as view] [test-helpers.component :as h])) (h/describe "Info - Information Box" diff --git a/src/quo2/components/info/information_box/style.cljs b/src/quo/components/info/information_box/style.cljs similarity index 96% rename from src/quo2/components/info/information_box/style.cljs rename to src/quo/components/info/information_box/style.cljs index 3e29ae94d0..31682ee33d 100644 --- a/src/quo2/components/info/information_box/style.cljs +++ b/src/quo/components/info/information_box/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.info.information-box.style +(ns quo.components.info.information-box.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def ^:private themes {:light {:default {:bg colors/white diff --git a/src/quo2/components/info/information_box/view.cljs b/src/quo/components/info/information_box/view.cljs similarity index 90% rename from src/quo2/components/info/information_box/view.cljs rename to src/quo/components/info/information_box/view.cljs index 1f908a6ca9..f983df0e98 100644 --- a/src/quo2/components/info/information_box/view.cljs +++ b/src/quo/components/info/information_box/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.info.information-box.view +(ns quo.components.info.information-box.view (:require [clojure.string :as string] - [quo2.components.buttons.button.view :as button] - [quo2.components.icon :as icons] - [quo2.components.info.information-box.style :as style] - [quo2.components.markdown.text :as text] - [quo2.theme :as theme] + [quo.components.buttons.button.view :as button] + [quo.components.icon :as icons] + [quo.components.info.information-box.style :as style] + [quo.components.markdown.text :as text] + [quo.theme :as theme] [react-native.core :as rn])) (defn- info-type->button-type diff --git a/src/quo2/components/inputs/address_input/component_spec.cljs b/src/quo/components/inputs/address_input/component_spec.cljs similarity index 97% rename from src/quo2/components/inputs/address_input/component_spec.cljs rename to src/quo/components/inputs/address_input/component_spec.cljs index f06210cb4c..5b36044903 100644 --- a/src/quo2/components/inputs/address_input/component_spec.cljs +++ b/src/quo/components/inputs/address_input/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.inputs.address-input.component-spec +(ns quo.components.inputs.address-input.component-spec (:require - [quo2.components.inputs.address-input.view :as address-input] - [quo2.foundations.colors :as colors] + [quo.components.inputs.address-input.view :as address-input] + [quo.foundations.colors :as colors] [react-native.clipboard :as clipboard] [test-helpers.component :as h])) diff --git a/src/quo2/components/inputs/address_input/style.cljs b/src/quo/components/inputs/address_input/style.cljs similarity index 89% rename from src/quo2/components/inputs/address_input/style.cljs rename to src/quo/components/inputs/address_input/style.cljs index 1257cd73f5..465e28b5be 100644 --- a/src/quo2/components/inputs/address_input/style.cljs +++ b/src/quo/components/inputs/address_input/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.inputs.address-input.style +(ns quo.components.inputs.address-input.style (:require - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] [react-native.platform :as platform])) (def container diff --git a/src/quo2/components/inputs/address_input/view.cljs b/src/quo/components/inputs/address_input/view.cljs similarity index 96% rename from src/quo2/components/inputs/address_input/view.cljs rename to src/quo/components/inputs/address_input/view.cljs index 9cba376125..1607c27c30 100644 --- a/src/quo2/components/inputs/address_input/view.cljs +++ b/src/quo/components/inputs/address_input/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.inputs.address-input.view +(ns quo.components.inputs.address-input.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.icon :as icon] - [quo2.components.inputs.address-input.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.buttons.button.view :as button] + [quo.components.icon :as icon] + [quo.components.inputs.address-input.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.clipboard :as clipboard] [react-native.core :as rn] [react-native.platform :as platform] diff --git a/src/quo2/components/inputs/input/component_spec.cljs b/src/quo/components/inputs/input/component_spec.cljs similarity index 96% rename from src/quo2/components/inputs/input/component_spec.cljs rename to src/quo/components/inputs/input/component_spec.cljs index aa177bd4df..502e4d05ee 100644 --- a/src/quo2/components/inputs/input/component_spec.cljs +++ b/src/quo/components/inputs/input/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.inputs.input.component-spec +(ns quo.components.inputs.input.component-spec (:require - [quo2.components.inputs.input.view :as input] + [quo.components.inputs.input.view :as input] [test-helpers.component :as h])) (h/describe "Input" diff --git a/src/quo2/components/inputs/input/style.cljs b/src/quo/components/inputs/input/style.cljs similarity index 97% rename from src/quo2/components/inputs/input/style.cljs rename to src/quo/components/inputs/input/style.cljs index 19849a2204..5f6acece04 100644 --- a/src/quo2/components/inputs/input/style.cljs +++ b/src/quo/components/inputs/input/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.inputs.input.style +(ns quo.components.inputs.input.style (:require - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors])) + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors])) (defn variants-colors [blur? theme] diff --git a/src/quo2/components/inputs/input/view.cljs b/src/quo/components/inputs/input/view.cljs similarity index 97% rename from src/quo2/components/inputs/input/view.cljs rename to src/quo/components/inputs/input/view.cljs index 845ab32f55..b6e5bc69d7 100644 --- a/src/quo2/components/inputs/input/view.cljs +++ b/src/quo/components/inputs/input/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.inputs.input.view +(ns quo.components.inputs.input.view (:require [oops.core :as oops] - [quo2.components.icon :as icon] - [quo2.components.inputs.input.style :as style] - [quo2.components.markdown.text :as text] - [quo2.theme :as quo.theme] + [quo.components.icon :as icon] + [quo.components.inputs.input.style :as style] + [quo.components.markdown.text :as text] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/inputs/locked_input/component_spec.cljs b/src/quo/components/inputs/locked_input/component_spec.cljs similarity index 85% rename from src/quo2/components/inputs/locked_input/component_spec.cljs rename to src/quo/components/inputs/locked_input/component_spec.cljs index 9228f1894f..4dca11b183 100644 --- a/src/quo2/components/inputs/locked_input/component_spec.cljs +++ b/src/quo/components/inputs/locked_input/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.inputs.locked-input.component-spec +(ns quo.components.inputs.locked-input.component-spec (:require - [quo2.components.inputs.locked-input.view :as locked-input] + [quo.components.inputs.locked-input.view :as locked-input] [test-helpers.component :as h])) (h/describe "Locked Input" diff --git a/src/quo2/components/inputs/locked_input/style.cljs b/src/quo/components/inputs/locked_input/style.cljs similarity index 85% rename from src/quo2/components/inputs/locked_input/style.cljs rename to src/quo/components/inputs/locked_input/style.cljs index a1ce83e89f..5ce78bfabd 100644 --- a/src/quo2/components/inputs/locked_input/style.cljs +++ b/src/quo/components/inputs/locked_input/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.inputs.locked-input.style +(ns quo.components.inputs.locked-input.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn info-box-container [theme] diff --git a/src/quo2/components/inputs/locked_input/view.cljs b/src/quo/components/inputs/locked_input/view.cljs similarity index 81% rename from src/quo2/components/inputs/locked_input/view.cljs rename to src/quo/components/inputs/locked_input/view.cljs index 09c0590388..9141017775 100644 --- a/src/quo2/components/inputs/locked_input/view.cljs +++ b/src/quo/components/inputs/locked_input/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.inputs.locked-input.view +(ns quo.components.inputs.locked-input.view (:require - [quo2.components.icon :as icons] - [quo2.components.inputs.locked-input.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.inputs.locked-input.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- info-box diff --git a/src/quo2/components/inputs/profile_input/component_spec.cljs b/src/quo/components/inputs/profile_input/component_spec.cljs similarity index 76% rename from src/quo2/components/inputs/profile_input/component_spec.cljs rename to src/quo/components/inputs/profile_input/component_spec.cljs index 4232def53d..1411a52e88 100644 --- a/src/quo2/components/inputs/profile_input/component_spec.cljs +++ b/src/quo/components/inputs/profile_input/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.inputs.profile-input.component-spec +(ns quo.components.inputs.profile-input.component-spec (:require - [quo2.components.inputs.profile-input.view :as profile-input] + [quo.components.inputs.profile-input.view :as profile-input] [test-helpers.component :as h])) (h/describe "Profile Input" diff --git a/src/quo2/components/inputs/profile_input/style.cljs b/src/quo/components/inputs/profile_input/style.cljs similarity index 86% rename from src/quo2/components/inputs/profile_input/style.cljs rename to src/quo/components/inputs/profile_input/style.cljs index 7312ba3a82..2f5c3c12b8 100644 --- a/src/quo2/components/inputs/profile_input/style.cljs +++ b/src/quo/components/inputs/profile_input/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.inputs.profile-input.style +(ns quo.components.inputs.profile-input.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [customization-color] diff --git a/src/quo2/components/inputs/profile_input/view.cljs b/src/quo/components/inputs/profile_input/view.cljs similarity index 86% rename from src/quo2/components/inputs/profile_input/view.cljs rename to src/quo/components/inputs/profile_input/view.cljs index d9c9923b5d..c2224057c3 100644 --- a/src/quo2/components/inputs/profile_input/view.cljs +++ b/src/quo/components/inputs/profile_input/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.inputs.profile-input.view +(ns quo.components.inputs.profile-input.view (:require - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.buttons.button.view :as buttons] - [quo2.components.inputs.profile-input.style :as style] - [quo2.components.inputs.title-input.view :as title-input] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.buttons.button.view :as buttons] + [quo.components.inputs.profile-input.style :as style] + [quo.components.inputs.title-input.view :as title-input] [react-native.core :as rn] [react-native.hole-view :as hole-view])) diff --git a/src/quo2/components/inputs/recovery_phrase/component_spec.cljs b/src/quo/components/inputs/recovery_phrase/component_spec.cljs similarity index 96% rename from src/quo2/components/inputs/recovery_phrase/component_spec.cljs rename to src/quo/components/inputs/recovery_phrase/component_spec.cljs index 8bba3dbbc5..813aca2d4d 100644 --- a/src/quo2/components/inputs/recovery_phrase/component_spec.cljs +++ b/src/quo/components/inputs/recovery_phrase/component_spec.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.inputs.recovery-phrase.component-spec +(ns quo.components.inputs.recovery-phrase.component-spec (:require [clojure.string :as string] [oops.core :as oops] - [quo2.components.inputs.recovery-phrase.view :as recovery-phrase] + [quo.components.inputs.recovery-phrase.view :as recovery-phrase] [test-helpers.component :as h])) (h/describe "Recovery phrase input" diff --git a/src/quo2/components/inputs/recovery_phrase/style.cljs b/src/quo/components/inputs/recovery_phrase/style.cljs similarity index 90% rename from src/quo2/components/inputs/recovery_phrase/style.cljs rename to src/quo/components/inputs/recovery_phrase/style.cljs index 2ef4ff2a44..8dc20d230d 100644 --- a/src/quo2/components/inputs/recovery_phrase/style.cljs +++ b/src/quo/components/inputs/recovery_phrase/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.inputs.recovery-phrase.style +(ns quo.components.inputs.recovery-phrase.style (:require - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors])) + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors])) (def container {:min-height 40 diff --git a/src/quo2/components/inputs/recovery_phrase/view.cljs b/src/quo/components/inputs/recovery_phrase/view.cljs similarity index 96% rename from src/quo2/components/inputs/recovery_phrase/view.cljs rename to src/quo/components/inputs/recovery_phrase/view.cljs index 0c319ac937..73d6218ffe 100644 --- a/src/quo2/components/inputs/recovery_phrase/view.cljs +++ b/src/quo/components/inputs/recovery_phrase/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.inputs.recovery-phrase.view +(ns quo.components.inputs.recovery-phrase.view (:require [clojure.string :as string] - [quo2.components.inputs.recovery-phrase.style :as style] - [quo2.theme :as quo.theme] + [quo.components.inputs.recovery-phrase.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/inputs/search_input/style.cljs b/src/quo/components/inputs/search_input/style.cljs similarity index 93% rename from src/quo2/components/inputs/search_input/style.cljs rename to src/quo/components/inputs/search_input/style.cljs index 54b84c919b..3cbcd541d3 100644 --- a/src/quo2/components/inputs/search_input/style.cljs +++ b/src/quo/components/inputs/search_input/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.inputs.search-input.style +(ns quo.components.inputs.search-input.style (:require - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors])) + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors])) (defn placeholder-color [state blur? override-theme] diff --git a/src/quo2/components/inputs/search_input/view.cljs b/src/quo/components/inputs/search_input/view.cljs similarity index 95% rename from src/quo2/components/inputs/search_input/view.cljs rename to src/quo/components/inputs/search_input/view.cljs index 92f9f6eee9..dad28f5369 100644 --- a/src/quo2/components/inputs/search_input/view.cljs +++ b/src/quo/components/inputs/search_input/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.inputs.search-input.view +(ns quo.components.inputs.search-input.view (:require [oops.core :as oops] - [quo2.components.icon :as icon] - [quo2.components.inputs.search-input.style :as style] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icon] + [quo.components.inputs.search-input.style :as style] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/inputs/title_input/component_spec.cljs b/src/quo/components/inputs/title_input/component_spec.cljs similarity index 91% rename from src/quo2/components/inputs/title_input/component_spec.cljs rename to src/quo/components/inputs/title_input/component_spec.cljs index 9a3c9e1ac8..16e0f3cac5 100644 --- a/src/quo2/components/inputs/title_input/component_spec.cljs +++ b/src/quo/components/inputs/title_input/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.inputs.title-input.component-spec +(ns quo.components.inputs.title-input.component-spec (:require - [quo2.components.inputs.title-input.view :as title-input] + [quo.components.inputs.title-input.view :as title-input] [test-helpers.component :as h])) (h/describe "input -> title-input component" diff --git a/src/quo2/components/inputs/title_input/style.cljs b/src/quo/components/inputs/title_input/style.cljs similarity index 94% rename from src/quo2/components/inputs/title_input/style.cljs rename to src/quo/components/inputs/title_input/style.cljs index 3a54965722..f596faf6bc 100644 --- a/src/quo2/components/inputs/title_input/style.cljs +++ b/src/quo/components/inputs/title_input/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.inputs.title-input.style +(ns quo.components.inputs.title-input.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform])) (defn get-focused-placeholder-color diff --git a/src/quo2/components/inputs/title_input/view.cljs b/src/quo/components/inputs/title_input/view.cljs similarity index 92% rename from src/quo2/components/inputs/title_input/view.cljs rename to src/quo/components/inputs/title_input/view.cljs index 1cefe5caba..e490694bdf 100644 --- a/src/quo2/components/inputs/title_input/view.cljs +++ b/src/quo/components/inputs/title_input/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.inputs.title-input.view +(ns quo.components.inputs.title-input.view (:require - [quo2.components.icon :as icon] - [quo2.components.inputs.title-input.style :as style] - [quo2.components.markdown.text :as text] - [quo2.theme :as quo.theme] + [quo.components.icon :as icon] + [quo.components.inputs.title-input.style :as style] + [quo.components.markdown.text :as text] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/keycard/component_spec.cljs b/src/quo/components/keycard/component_spec.cljs similarity index 83% rename from src/quo2/components/keycard/component_spec.cljs rename to src/quo/components/keycard/component_spec.cljs index 2bbd26c800..5b50dc5adf 100644 --- a/src/quo2/components/keycard/component_spec.cljs +++ b/src/quo/components/keycard/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.keycard.component-spec +(ns quo.components.keycard.component-spec (:require - [quo2.components.keycard.view :as keycard] + [quo.components.keycard.view :as keycard] [test-helpers.component :as h])) (h/describe "keycard component" diff --git a/src/quo2/components/keycard/style.cljs b/src/quo/components/keycard/style.cljs similarity index 94% rename from src/quo2/components/keycard/style.cljs rename to src/quo/components/keycard/style.cljs index 09e7789304..3b8e6c41c7 100644 --- a/src/quo2/components/keycard/style.cljs +++ b/src/quo/components/keycard/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.keycard.style +(ns quo.components.keycard.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def keycard-height 210) (def keycard-chip-height 28) diff --git a/src/quo2/components/keycard/view.cljs b/src/quo/components/keycard/view.cljs similarity index 85% rename from src/quo2/components/keycard/view.cljs rename to src/quo/components/keycard/view.cljs index 1a8d2fc272..f5a35ad60f 100644 --- a/src/quo2/components/keycard/view.cljs +++ b/src/quo/components/keycard/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.keycard.view +(ns quo.components.keycard.view (:require - [quo2.components.keycard.style :as style] - [quo2.components.tags.tag :as tag] - [quo2.foundations.colors :as colors] - [quo2.foundations.resources :as resources] - [quo2.theme :as quo.theme] + [quo.components.keycard.style :as style] + [quo.components.tags.tag :as tag] + [quo.foundations.colors :as colors] + [quo.foundations.resources :as resources] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/links/link_preview/component_spec.cljs b/src/quo/components/links/link_preview/component_spec.cljs similarity index 94% rename from src/quo2/components/links/link_preview/component_spec.cljs rename to src/quo/components/links/link_preview/component_spec.cljs index 7ab0be045b..6d5b125352 100644 --- a/src/quo2/components/links/link_preview/component_spec.cljs +++ b/src/quo/components/links/link_preview/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.links.link-preview.component-spec +(ns quo.components.links.link-preview.component-spec (:require - [quo2.components.links.link-preview.view :as view] + [quo.components.links.link-preview.view :as view] [test-helpers.component :as h])) (def props diff --git a/src/quo2/components/links/link_preview/style.cljs b/src/quo/components/links/link_preview/style.cljs similarity index 92% rename from src/quo2/components/links/link_preview/style.cljs rename to src/quo/components/links/link_preview/style.cljs index 36d6b4b11b..a5d476e732 100644 --- a/src/quo2/components/links/link_preview/style.cljs +++ b/src/quo/components/links/link_preview/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.links.link-preview.style +(ns quo.components.links.link-preview.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [preview-enabled?] diff --git a/src/quo2/components/links/link_preview/view.cljs b/src/quo/components/links/link_preview/view.cljs similarity index 91% rename from src/quo2/components/links/link_preview/view.cljs rename to src/quo/components/links/link_preview/view.cljs index 0f96d7c472..a3993f0285 100644 --- a/src/quo2/components/links/link_preview/view.cljs +++ b/src/quo/components/links/link_preview/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.links.link-preview.view +(ns quo.components.links.link-preview.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.links.link-preview.style :as style] - [quo2.components.markdown.text :as text] + [quo.components.buttons.button.view :as button] + [quo.components.links.link-preview.style :as style] + [quo.components.markdown.text :as text] [react-native.core :as rn])) (defn- button-disabled diff --git a/src/quo2/components/links/url_preview/component_spec.cljs b/src/quo/components/links/url_preview/component_spec.cljs similarity index 91% rename from src/quo2/components/links/url_preview/component_spec.cljs rename to src/quo/components/links/url_preview/component_spec.cljs index 3936e46ed8..6eeeb4c6f5 100644 --- a/src/quo2/components/links/url_preview/component_spec.cljs +++ b/src/quo/components/links/url_preview/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.links.url-preview.component-spec +(ns quo.components.links.url-preview.component-spec (:require - [quo2.components.links.url-preview.view :as view] + [quo.components.links.url-preview.view :as view] [test-helpers.component :as h])) (h/describe "Links - URL Preview" diff --git a/src/quo2/components/links/url_preview/style.cljs b/src/quo/components/links/url_preview/style.cljs similarity index 93% rename from src/quo2/components/links/url_preview/style.cljs rename to src/quo/components/links/url_preview/style.cljs index cdf1ee4243..454774bb66 100644 --- a/src/quo2/components/links/url_preview/style.cljs +++ b/src/quo/components/links/url_preview/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.links.url-preview.style +(ns quo.components.links.url-preview.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def horizontal-padding 12) diff --git a/src/quo2/components/links/url_preview/view.cljs b/src/quo/components/links/url_preview/view.cljs similarity index 89% rename from src/quo2/components/links/url_preview/view.cljs rename to src/quo/components/links/url_preview/view.cljs index 3341d110b5..70b4640713 100644 --- a/src/quo2/components/links/url_preview/view.cljs +++ b/src/quo/components/links/url_preview/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.links.url-preview.view +(ns quo.components.links.url-preview.view (:require - [quo2.components.icon :as icon] - [quo2.components.links.url-preview.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icon] + [quo.components.links.url-preview.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] [react-native.core :as rn])) (defn- logo-comp diff --git a/src/quo2/components/links/url_preview_list/component_spec.cljs b/src/quo/components/links/url_preview_list/component_spec.cljs similarity index 93% rename from src/quo2/components/links/url_preview_list/component_spec.cljs rename to src/quo/components/links/url_preview_list/component_spec.cljs index 0bb3176114..dc378d1086 100644 --- a/src/quo2/components/links/url_preview_list/component_spec.cljs +++ b/src/quo/components/links/url_preview_list/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.links.url-preview-list.component-spec +(ns quo.components.links.url-preview-list.component-spec (:require [oops.core :as oops] - [quo2.components.links.url-preview-list.view :as view] + [quo.components.links.url-preview-list.view :as view] [test-helpers.component :as h])) (def previews diff --git a/src/quo2/components/links/url_preview_list/style.cljs b/src/quo/components/links/url_preview_list/style.cljs similarity index 72% rename from src/quo2/components/links/url_preview_list/style.cljs rename to src/quo/components/links/url_preview_list/style.cljs index a99036f904..f4c00e8e9c 100644 --- a/src/quo2/components/links/url_preview_list/style.cljs +++ b/src/quo/components/links/url_preview_list/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.links.url-preview-list.style) +(ns quo.components.links.url-preview-list.style) (def url-preview-gap 12) diff --git a/src/quo2/components/links/url_preview_list/view.cljs b/src/quo/components/links/url_preview_list/view.cljs similarity index 95% rename from src/quo2/components/links/url_preview_list/view.cljs rename to src/quo/components/links/url_preview_list/view.cljs index 615488b287..1978d0fe97 100644 --- a/src/quo2/components/links/url_preview_list/view.cljs +++ b/src/quo/components/links/url_preview_list/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.links.url-preview-list.view +(ns quo.components.links.url-preview-list.view (:require - [quo2.components.links.url-preview-list.style :as style] - [quo2.components.links.url-preview.view :as url-preview] + [quo.components.links.url-preview-list.style :as style] + [quo.components.links.url-preview.view :as url-preview] [react-native.core :as rn] [react-native.gesture :as gesture])) diff --git a/src/quo2/components/list_items/account/component_spec.cljs b/src/quo/components/list_items/account/component_spec.cljs similarity index 96% rename from src/quo2/components/list_items/account/component_spec.cljs rename to src/quo/components/list_items/account/component_spec.cljs index 84c24bd228..68479e12b3 100644 --- a/src/quo2/components/list_items/account/component_spec.cljs +++ b/src/quo/components/list_items/account/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.list-items.account.component-spec +(ns quo.components.list-items.account.component-spec (:require - [quo2.components.list-items.account.view :as account] - [quo2.foundations.colors :as colors] + [quo.components.list-items.account.view :as account] + [quo.foundations.colors :as colors] [test-helpers.component :as h])) (h/describe "List items: account" diff --git a/src/quo2/components/list_items/account/style.cljs b/src/quo/components/list_items/account/style.cljs similarity index 97% rename from src/quo2/components/list_items/account/style.cljs rename to src/quo/components/list_items/account/style.cljs index f185f17db5..a1eebb04ef 100644 --- a/src/quo2/components/list_items/account/style.cljs +++ b/src/quo/components/list_items/account/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.account.style +(ns quo.components.list-items.account.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn- background-color [{:keys [state blur? customization-color]}] diff --git a/src/quo2/components/list_items/account/view.cljs b/src/quo/components/list_items/account/view.cljs similarity index 94% rename from src/quo2/components/list_items/account/view.cljs rename to src/quo/components/list_items/account/view.cljs index 31a5b6e63a..431a2a996c 100644 --- a/src/quo2/components/list_items/account/view.cljs +++ b/src/quo/components/list_items/account/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.list-items.account.view +(ns quo.components.list-items.account.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.icon :as icon] - [quo2.components.list-items.account.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.icon :as icon] + [quo.components.list-items.account.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/list_items/account_list_card/component_spec.cljs b/src/quo/components/list_items/account_list_card/component_spec.cljs similarity index 81% rename from src/quo2/components/list_items/account_list_card/component_spec.cljs rename to src/quo/components/list_items/account_list_card/component_spec.cljs index 2310f0cb3a..7c6a3f882a 100644 --- a/src/quo2/components/list_items/account_list_card/component_spec.cljs +++ b/src/quo/components/list_items/account_list_card/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.account-list-card.component-spec +(ns quo.components.list-items.account-list-card.component-spec (:require - [quo2.components.list-items.account-list-card.view :as account-list-card] + [quo.components.list-items.account-list-card.view :as account-list-card] [test-helpers.component :as h])) (def account-props diff --git a/src/quo2/components/list_items/account_list_card/style.cljs b/src/quo/components/list_items/account_list_card/style.cljs similarity index 90% rename from src/quo2/components/list_items/account_list_card/style.cljs rename to src/quo/components/list_items/account_list_card/style.cljs index 0f0a02de0e..829d4e2111 100644 --- a/src/quo2/components/list_items/account_list_card/style.cljs +++ b/src/quo/components/list_items/account_list_card/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.account-list-card.style +(ns quo.components.list-items.account-list-card.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [{:keys [state blur? theme]}] diff --git a/src/quo2/components/list_items/account_list_card/view.cljs b/src/quo/components/list_items/account_list_card/view.cljs similarity index 83% rename from src/quo2/components/list_items/account_list_card/view.cljs rename to src/quo/components/list_items/account_list_card/view.cljs index fa3e837248..1299f58c71 100644 --- a/src/quo2/components/list_items/account_list_card/view.cljs +++ b/src/quo/components/list_items/account_list_card/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.list-items.account-list-card.view +(ns quo.components.list-items.account-list-card.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.icon :as icon] - [quo2.components.list-items.account-list-card.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.icon :as icon] + [quo.components.list-items.account-list-card.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/list_items/address/component_spec.cljs b/src/quo/components/list_items/address/component_spec.cljs similarity index 92% rename from src/quo2/components/list_items/address/component_spec.cljs rename to src/quo/components/list_items/address/component_spec.cljs index 10f470226a..d9070f528f 100644 --- a/src/quo2/components/list_items/address/component_spec.cljs +++ b/src/quo/components/list_items/address/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.list-items.address.component-spec +(ns quo.components.list-items.address.component-spec (:require - [quo2.components.list-items.address.view :as address] - [quo2.foundations.colors :as colors] + [quo.components.list-items.address.view :as address] + [quo.foundations.colors :as colors] [test-helpers.component :as h])) (h/describe "List items: address" diff --git a/src/quo2/components/list_items/address/style.cljs b/src/quo/components/list_items/address/style.cljs similarity index 91% rename from src/quo2/components/list_items/address/style.cljs rename to src/quo/components/list_items/address/style.cljs index e59c00d5a5..4d255e796c 100644 --- a/src/quo2/components/list_items/address/style.cljs +++ b/src/quo/components/list_items/address/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.address.style +(ns quo.components.list-items.address.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn- background-color [state customization-color blur?] diff --git a/src/quo2/components/list_items/address/view.cljs b/src/quo/components/list_items/address/view.cljs similarity index 88% rename from src/quo2/components/list_items/address/view.cljs rename to src/quo/components/list_items/address/view.cljs index 0186c98b66..249537710f 100644 --- a/src/quo2/components/list_items/address/view.cljs +++ b/src/quo/components/list_items/address/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.list-items.address.view +(ns quo.components.list-items.address.view (:require [clojure.string :as string] - [quo2.components.avatars.wallet-user-avatar :as wallet-user-avatar] - [quo2.components.list-items.address.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.wallet-user-avatar :as wallet-user-avatar] + [quo.components.list-items.address.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/list_items/channel/component_spec.cljs b/src/quo/components/list_items/channel/component_spec.cljs similarity index 92% rename from src/quo2/components/list_items/channel/component_spec.cljs rename to src/quo/components/list_items/channel/component_spec.cljs index 8295ab12db..4dc36210ea 100644 --- a/src/quo2/components/list_items/channel/component_spec.cljs +++ b/src/quo/components/list_items/channel/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.channel.component-spec +(ns quo.components.list-items.channel.component-spec (:require - [quo2.components.list-items.channel.view :as channel] + [quo.components.list-items.channel.view :as channel] [test-helpers.component :as h])) (h/describe "list-items/channel Component" diff --git a/src/quo2/components/list_items/channel/style.cljs b/src/quo/components/list_items/channel/style.cljs similarity index 95% rename from src/quo2/components/list_items/channel/style.cljs rename to src/quo/components/list_items/channel/style.cljs index 684fa0fcd9..ca12aa7c0f 100644 --- a/src/quo2/components/list_items/channel/style.cljs +++ b/src/quo/components/list_items/channel/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.channel.style +(ns quo.components.list-items.channel.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn- get-label-color [notification theme] diff --git a/src/quo2/components/list_items/channel/view.cljs b/src/quo/components/list_items/channel/view.cljs similarity index 84% rename from src/quo2/components/list_items/channel/view.cljs rename to src/quo/components/list_items/channel/view.cljs index 84f68f4780..b9e6f8fad9 100644 --- a/src/quo2/components/list_items/channel/view.cljs +++ b/src/quo/components/list_items/channel/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.list-items.channel.view +(ns quo.components.list-items.channel.view (:require - [quo2.components.avatars.channel-avatar.view :as channel-avatar] - [quo2.components.counter.counter.view :as counter] - [quo2.components.icon :as quo2.icons] - [quo2.components.list-items.channel.style :as style] - [quo2.components.markdown.text :as quo.text] - [quo2.theme :as theme] + [quo.components.avatars.channel-avatar.view :as channel-avatar] + [quo.components.counter.counter.view :as counter] + [quo.components.icon :as quo.icons] + [quo.components.list-items.channel.style :as style] + [quo.components.markdown.text :as quo.text] + [quo.theme :as theme] [react-native.core :as rn] [reagent.core :as reagent])) @@ -50,13 +50,13 @@ :size :paragraph-1} (str "# " name)] (when-not locked? (condp = notification - :mute [quo2.icons/icon :i/muted + :mute [quo.icons/icon :i/muted {:color (style/mute-notification-icon-color theme)}] :mention [counter/view {:customization-color customization-color :container-style (style/counter mentions-count)} mentions-count] - :notification [quo2.icons/icon :i/notification + :notification [quo.icons/icon :i/notification {:color (style/mute-notification-icon-color theme) :accessibility-label :unviewed-messages-public}] nil))]))) diff --git a/src/quo2/components/list_items/community/component_spec.cljs b/src/quo/components/list_items/community/component_spec.cljs similarity index 95% rename from src/quo2/components/list_items/community/component_spec.cljs rename to src/quo/components/list_items/community/component_spec.cljs index a084872c83..2f33596926 100644 --- a/src/quo2/components/list_items/community/component_spec.cljs +++ b/src/quo/components/list_items/community/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.community.component-spec +(ns quo.components.list-items.community.component-spec (:require - [quo2.components.list-items.community.view :as component] + [quo.components.list-items.community.view :as component] [test-helpers.component :as h])) (h/describe "Community list" diff --git a/src/quo2/components/list_items/community/style.cljs b/src/quo/components/list_items/community/style.cljs similarity index 94% rename from src/quo2/components/list_items/community/style.cljs rename to src/quo/components/list_items/community/style.cljs index 628f7cc9e6..b7c8cec236 100644 --- a/src/quo2/components/list_items/community/style.cljs +++ b/src/quo/components/list_items/community/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.list-items.community.style +(ns quo.components.list-items.community.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.shadows :as shadows])) + [quo.foundations.colors :as colors] + [quo.foundations.shadows :as shadows])) (def logo {:border-radius 50 diff --git a/src/quo2/components/list_items/community/view.cljs b/src/quo/components/list_items/community/view.cljs similarity index 93% rename from src/quo2/components/list_items/community/view.cljs rename to src/quo/components/list_items/community/view.cljs index 5b64530a3f..10b5518f11 100644 --- a/src/quo2/components/list_items/community/view.cljs +++ b/src/quo/components/list_items/community/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.list-items.community.view +(ns quo.components.list-items.community.view (:require - [quo2.components.community.community-view :as community-view] - [quo2.components.counter.counter.view :as counter] - [quo2.components.icon :as icons] - [quo2.components.list-items.community.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.community.community-view :as community-view] + [quo.components.counter.counter.view :as counter] + [quo.components.icon :as icons] + [quo.components.list-items.community.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/list_items/dapp/component_spec.cljs b/src/quo/components/list_items/dapp/component_spec.cljs similarity index 87% rename from src/quo2/components/list_items/dapp/component_spec.cljs rename to src/quo/components/list_items/dapp/component_spec.cljs index 04949a9997..a2452be929 100644 --- a/src/quo2/components/list_items/dapp/component_spec.cljs +++ b/src/quo/components/list_items/dapp/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.dapp.component-spec +(ns quo.components.list-items.dapp.component-spec (:require - [quo2.components.list-items.dapp.view :as dapp] + [quo.components.list-items.dapp.view :as dapp] [test-helpers.component :as h])) (def props diff --git a/src/quo2/components/list_items/dapp/style.cljs b/src/quo/components/list_items/dapp/style.cljs similarity index 94% rename from src/quo2/components/list_items/dapp/style.cljs rename to src/quo/components/list_items/dapp/style.cljs index 6bc978cbd8..d7ab20afd6 100644 --- a/src/quo2/components/list_items/dapp/style.cljs +++ b/src/quo/components/list_items/dapp/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.dapp.style +(ns quo.components.list-items.dapp.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn get-background-color [{:keys [pressed? state blur? customization-color theme]}] diff --git a/src/quo2/components/list_items/dapp/view.cljs b/src/quo/components/list_items/dapp/view.cljs similarity index 85% rename from src/quo2/components/list_items/dapp/view.cljs rename to src/quo/components/list_items/dapp/view.cljs index e41b39bca8..98545b7639 100644 --- a/src/quo2/components/list_items/dapp/view.cljs +++ b/src/quo/components/list_items/dapp/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.list-items.dapp.view +(ns quo.components.list-items.dapp.view (:require - [quo2.components.icon :as icons] - [quo2.components.list-items.dapp.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.list-items.dapp.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.fast-image :as fast-image] [reagent.core :as reagent])) diff --git a/src/quo2/components/list_items/menu_item.cljs b/src/quo/components/list_items/menu_item.cljs similarity index 92% rename from src/quo2/components/list_items/menu_item.cljs rename to src/quo/components/list_items/menu_item.cljs index 2118ba0d4f..4ab2a366ed 100644 --- a/src/quo2/components/list_items/menu_item.cljs +++ b/src/quo/components/list_items/menu_item.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.list-items.menu-item +(ns quo.components.list-items.menu-item (:require - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors :refer [theme-colors]] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors :refer [theme-colors]] [react-native.core :as rn])) (defn themes diff --git a/src/quo2/components/list_items/preview_list/properties.cljs b/src/quo/components/list_items/preview_list/properties.cljs similarity index 96% rename from src/quo2/components/list_items/preview_list/properties.cljs rename to src/quo/components/list_items/preview_list/properties.cljs index 21945efe88..1502b3936b 100644 --- a/src/quo2/components/list_items/preview_list/properties.cljs +++ b/src/quo/components/list_items/preview_list/properties.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.list-items.preview-list.properties) +(ns quo.components.list-items.preview-list.properties) (def ^:private types-for-squared-border #{:accounts :collectibles}) diff --git a/src/quo2/components/list_items/preview_list/view.cljs b/src/quo/components/list_items/preview_list/view.cljs similarity index 91% rename from src/quo2/components/list_items/preview_list/view.cljs rename to src/quo/components/list_items/preview_list/view.cljs index 2cd144ca23..4b5f2bab74 100644 --- a/src/quo2/components/list_items/preview_list/view.cljs +++ b/src/quo/components/list_items/preview_list/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.list-items.preview-list.view +(ns quo.components.list-items.preview-list.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.list-items.preview-list.properties :as properties] - [quo2.components.tags.number-tag.view :as number-tag] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.list-items.preview-list.properties :as properties] + [quo.components.tags.number-tag.view :as number-tag] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.fast-image :as fast-image] [react-native.hole-view :as hole-view])) diff --git a/src/quo2/components/list_items/saved_address/component_spec.cljs b/src/quo/components/list_items/saved_address/component_spec.cljs similarity index 93% rename from src/quo2/components/list_items/saved_address/component_spec.cljs rename to src/quo/components/list_items/saved_address/component_spec.cljs index 5a66cb7527..f8f031d0c9 100644 --- a/src/quo2/components/list_items/saved_address/component_spec.cljs +++ b/src/quo/components/list_items/saved_address/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.list-items.saved-address.component-spec +(ns quo.components.list-items.saved-address.component-spec (:require - [quo2.components.list-items.saved-address.view :as saved-address] - [quo2.foundations.colors :as colors] + [quo.components.list-items.saved-address.view :as saved-address] + [quo.foundations.colors :as colors] [test-helpers.component :as h])) (h/describe "List items: saved address" diff --git a/src/quo2/components/list_items/saved_address/style.cljs b/src/quo/components/list_items/saved_address/style.cljs similarity index 92% rename from src/quo2/components/list_items/saved_address/style.cljs rename to src/quo/components/list_items/saved_address/style.cljs index ed931969d7..2bc0364976 100644 --- a/src/quo2/components/list_items/saved_address/style.cljs +++ b/src/quo/components/list_items/saved_address/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.saved-address.style +(ns quo.components.list-items.saved-address.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn- background-color [{:keys [state blur? customization-color]}] diff --git a/src/quo2/components/list_items/saved_address/view.cljs b/src/quo/components/list_items/saved_address/view.cljs similarity index 89% rename from src/quo2/components/list_items/saved_address/view.cljs rename to src/quo/components/list_items/saved_address/view.cljs index ed39b1d0af..8a7beadab3 100644 --- a/src/quo2/components/list_items/saved_address/view.cljs +++ b/src/quo/components/list_items/saved_address/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.list-items.saved-address.view +(ns quo.components.list-items.saved-address.view (:require [clojure.string :as string] - [quo2.components.avatars.wallet-user-avatar :as wallet-user-avatar] - [quo2.components.icon :as icon] - [quo2.components.list-items.saved-address.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.wallet-user-avatar :as wallet-user-avatar] + [quo.components.icon :as icon] + [quo.components.list-items.saved-address.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/list_items/saved_contact_address/component_spec.cljs b/src/quo/components/list_items/saved_contact_address/component_spec.cljs similarity index 92% rename from src/quo2/components/list_items/saved_contact_address/component_spec.cljs rename to src/quo/components/list_items/saved_contact_address/component_spec.cljs index 163be69061..4185a3ff8a 100644 --- a/src/quo2/components/list_items/saved_contact_address/component_spec.cljs +++ b/src/quo/components/list_items/saved_contact_address/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.list-items.saved-contact-address.component-spec +(ns quo.components.list-items.saved-contact-address.component-spec (:require - [quo2.components.list-items.saved-contact-address.view :as saved-contact-address] - [quo2.foundations.colors :as colors] + [quo.components.list-items.saved-contact-address.view :as saved-contact-address] + [quo.foundations.colors :as colors] [test-helpers.component :as h])) (def account diff --git a/src/quo2/components/list_items/saved_contact_address/style.cljs b/src/quo/components/list_items/saved_contact_address/style.cljs similarity index 93% rename from src/quo2/components/list_items/saved_contact_address/style.cljs rename to src/quo/components/list_items/saved_contact_address/style.cljs index e176257640..29a544ac12 100644 --- a/src/quo2/components/list_items/saved_contact_address/style.cljs +++ b/src/quo/components/list_items/saved_contact_address/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.saved-contact-address.style +(ns quo.components.list-items.saved-contact-address.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn- background-color [{:keys [state customization-color]}] diff --git a/src/quo2/components/list_items/saved_contact_address/view.cljs b/src/quo/components/list_items/saved_contact_address/view.cljs similarity index 89% rename from src/quo2/components/list_items/saved_contact_address/view.cljs rename to src/quo/components/list_items/saved_contact_address/view.cljs index dd2c53a307..29c86c73c5 100644 --- a/src/quo2/components/list_items/saved_contact_address/view.cljs +++ b/src/quo/components/list_items/saved_contact_address/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.list-items.saved-contact-address.view +(ns quo.components.list-items.saved-contact-address.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.icon :as icon] - [quo2.components.list-items.saved-contact-address.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.icon :as icon] + [quo.components.list-items.saved-contact-address.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] [utils.i18n :as i18n])) diff --git a/src/quo2/components/list_items/token_value/component_spec.cljs b/src/quo/components/list_items/token_value/component_spec.cljs similarity index 91% rename from src/quo2/components/list_items/token_value/component_spec.cljs rename to src/quo/components/list_items/token_value/component_spec.cljs index 309e7c31e3..f2e0e62378 100644 --- a/src/quo2/components/list_items/token_value/component_spec.cljs +++ b/src/quo/components/list_items/token_value/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.token-value.component-spec +(ns quo.components.list-items.token-value.component-spec (:require - [quo2.components.list-items.token-value.view :as token-value] + [quo.components.list-items.token-value.view :as token-value] [test-helpers.component :as h])) (h/describe "List Items: Token Value" diff --git a/src/quo2/components/list_items/token_value/style.cljs b/src/quo/components/list_items/token_value/style.cljs similarity index 92% rename from src/quo2/components/list_items/token_value/style.cljs rename to src/quo/components/list_items/token_value/style.cljs index f10afc3d08..2590984911 100644 --- a/src/quo2/components/list_items/token_value/style.cljs +++ b/src/quo/components/list_items/token_value/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.list-items.token-value.style +(ns quo.components.list-items.token-value.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [color bg-opacity theme] diff --git a/src/quo2/components/list_items/token_value/view.cljs b/src/quo/components/list_items/token_value/view.cljs similarity index 89% rename from src/quo2/components/list_items/token_value/view.cljs rename to src/quo/components/list_items/token_value/view.cljs index ceb99a3129..12b0c0fdb8 100644 --- a/src/quo2/components/list_items/token_value/view.cljs +++ b/src/quo/components/list_items/token_value/view.cljs @@ -1,13 +1,13 @@ -(ns quo2.components.list-items.token-value.view +(ns quo.components.list-items.token-value.view (:require [clojure.string :as string] - [quo2.components.icon :as icon] - [quo2.components.list-items.token-value.style :as style] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.foundations.common :as common] - [quo2.foundations.resources :as resources] - [quo2.theme :as quo.theme] + [quo.components.icon :as icon] + [quo.components.list-items.token-value.style :as style] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.foundations.common :as common] + [quo.foundations.resources :as resources] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/list_items/user_list.cljs b/src/quo/components/list_items/user_list.cljs similarity index 84% rename from src/quo2/components/list_items/user_list.cljs rename to src/quo/components/list_items/user_list.cljs index c8456651d0..494fd42af6 100644 --- a/src/quo2/components/list_items/user_list.cljs +++ b/src/quo/components/list_items/user_list.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.list-items.user-list +(ns quo.components.list-items.user-list (:require - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.messages.author.view :as author] - [quo2.components.selectors.selectors.view :as selectors] - [quo2.foundations.colors :as colors] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.messages.author.view :as author] + [quo.components.selectors.selectors.view :as selectors] + [quo.foundations.colors :as colors] [react-native.core :as rn])) (def container-style diff --git a/src/quo2/components/loaders/skeleton.cljs b/src/quo/components/loaders/skeleton.cljs similarity index 95% rename from src/quo2/components/loaders/skeleton.cljs rename to src/quo/components/loaders/skeleton.cljs index cea09dd928..81d523469c 100644 --- a/src/quo2/components/loaders/skeleton.cljs +++ b/src/quo/components/loaders/skeleton.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.loaders.skeleton +(ns quo.components.loaders.skeleton (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.masked-view :as masked-view] [react-native.reanimated :as reanimated] @@ -23,7 +23,7 @@ ;; Standlone message skeleton (defn- f-message-skeleton - {:deprecated "quo2.components.loaders.skeleton-list.view should be used instead"} + {:deprecated "quo.components.loaders.skeleton-list.view should be used instead"} [{:keys [theme]}] (let [color (colors/theme-colors colors/neutral-5 colors/neutral-70 theme) diff --git a/src/quo2/components/loaders/skeleton_list/component_spec.cljs b/src/quo/components/loaders/skeleton_list/component_spec.cljs similarity index 85% rename from src/quo2/components/loaders/skeleton_list/component_spec.cljs rename to src/quo/components/loaders/skeleton_list/component_spec.cljs index e8b6ad18a9..63555dca77 100644 --- a/src/quo2/components/loaders/skeleton_list/component_spec.cljs +++ b/src/quo/components/loaders/skeleton_list/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.loaders.skeleton-list.component-spec +(ns quo.components.loaders.skeleton-list.component-spec (:require - [quo2.components.loaders.skeleton-list.view :as skeleton-list] - [quo2.foundations.colors :as colors] + [quo.components.loaders.skeleton-list.view :as skeleton-list] + [quo.foundations.colors :as colors] [test-helpers.component :as h])) (defn test-skeleton diff --git a/src/quo2/components/loaders/skeleton_list/constants.cljs b/src/quo/components/loaders/skeleton_list/constants.cljs similarity index 98% rename from src/quo2/components/loaders/skeleton_list/constants.cljs rename to src/quo/components/loaders/skeleton_list/constants.cljs index 80fce618fe..246d00cc64 100644 --- a/src/quo2/components/loaders/skeleton_list/constants.cljs +++ b/src/quo/components/loaders/skeleton_list/constants.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.loaders.skeleton-list.constants) +(ns quo.components.loaders.skeleton-list.constants) (def ^:const layout-dimensions {:messages {:height 56 diff --git a/src/quo2/components/loaders/skeleton_list/style.cljs b/src/quo/components/loaders/skeleton_list/style.cljs similarity index 86% rename from src/quo2/components/loaders/skeleton_list/style.cljs rename to src/quo/components/loaders/skeleton_list/style.cljs index d91e83d3a4..6a094de9b1 100644 --- a/src/quo2/components/loaders/skeleton_list/style.cljs +++ b/src/quo/components/loaders/skeleton_list/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.loaders.skeleton-list.style +(ns quo.components.loaders.skeleton-list.style (:require - [quo2.components.loaders.skeleton-list.constants :as constants])) + [quo.components.loaders.skeleton-list.constants :as constants])) (defn container [content] diff --git a/src/quo2/components/loaders/skeleton_list/view.cljs b/src/quo/components/loaders/skeleton_list/view.cljs similarity index 93% rename from src/quo2/components/loaders/skeleton_list/view.cljs rename to src/quo/components/loaders/skeleton_list/view.cljs index c37b60478f..ea460204f9 100644 --- a/src/quo2/components/loaders/skeleton_list/view.cljs +++ b/src/quo/components/loaders/skeleton_list/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.loaders.skeleton-list.view +(ns quo.components.loaders.skeleton-list.view (:require - [quo2.components.loaders.skeleton-list.constants :as constants] - [quo2.components.loaders.skeleton-list.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.loaders.skeleton-list.constants :as constants] + [quo.components.loaders.skeleton-list.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn] [react-native.masked-view :as masked-view] [react-native.reanimated :as reanimated] diff --git a/src/quo2/components/markdown/list/component_spec.cljs b/src/quo/components/markdown/list/component_spec.cljs similarity index 93% rename from src/quo2/components/markdown/list/component_spec.cljs rename to src/quo/components/markdown/list/component_spec.cljs index cb104ddf22..33e2d45943 100644 --- a/src/quo2/components/markdown/list/component_spec.cljs +++ b/src/quo/components/markdown/list/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.markdown.list.component-spec +(ns quo.components.markdown.list.component-spec (:require - [quo2.components.markdown.list.view :as list] + [quo.components.markdown.list.view :as list] [test-helpers.component :as h])) (h/describe "tests for markdown/list component" diff --git a/src/quo2/components/markdown/list/style.cljs b/src/quo/components/markdown/list/style.cljs similarity index 86% rename from src/quo2/components/markdown/list/style.cljs rename to src/quo/components/markdown/list/style.cljs index dcdf6c5071..3293e06d2f 100644 --- a/src/quo2/components/markdown/list/style.cljs +++ b/src/quo/components/markdown/list/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.markdown.list.style) +(ns quo.components.markdown.list.style) (defn container [container-style] diff --git a/src/quo2/components/markdown/list/view.cljs b/src/quo/components/markdown/list/view.cljs similarity index 86% rename from src/quo2/components/markdown/list/view.cljs rename to src/quo/components/markdown/list/view.cljs index 9dcf76f86f..85ac931023 100644 --- a/src/quo2/components/markdown/list/view.cljs +++ b/src/quo/components/markdown/list/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.markdown.list.view +(ns quo.components.markdown.list.view (:require - [quo2.components.counter.step.view :as step] - [quo2.components.icon :as icon] - [quo2.components.markdown.list.style :as style] - [quo2.components.markdown.text :as text] - [quo2.components.tags.context-tag.view :as context-tag] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.counter.step.view :as step] + [quo.components.icon :as icon] + [quo.components.markdown.list.style :as style] + [quo.components.markdown.text :as text] + [quo.components.tags.context-tag.view :as context-tag] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn])) (defn get-colors diff --git a/src/quo2/components/markdown/text.cljs b/src/quo/components/markdown/text.cljs similarity index 90% rename from src/quo2/components/markdown/text.cljs rename to src/quo/components/markdown/text.cljs index 6be6e95a1d..21b5b42277 100644 --- a/src/quo2/components/markdown/text.cljs +++ b/src/quo/components/markdown/text.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.markdown.text +(ns quo.components.markdown.text (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.typography :as typography] - [quo2.theme :as quo.theme] + [quo.foundations.colors :as colors] + [quo.foundations.typography :as typography] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/markdown/text_component_spec.cljs b/src/quo/components/markdown/text_component_spec.cljs similarity index 78% rename from src/quo2/components/markdown/text_component_spec.cljs rename to src/quo/components/markdown/text_component_spec.cljs index ac48d877db..79dfeee65d 100644 --- a/src/quo2/components/markdown/text_component_spec.cljs +++ b/src/quo/components/markdown/text_component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.markdown.text-component-spec +(ns quo.components.markdown.text-component-spec (:require ["@testing-library/react-native" :as rtl] - [quo2.components.markdown.text :as text] + [quo.components.markdown.text :as text] [reagent.core :as reagent])) (defn render-text diff --git a/src/quo2/components/messages/author/style.cljs b/src/quo/components/messages/author/style.cljs similarity index 89% rename from src/quo2/components/messages/author/style.cljs rename to src/quo/components/messages/author/style.cljs index b8fd38b2d8..ee2903f0a6 100644 --- a/src/quo2/components/messages/author/style.cljs +++ b/src/quo/components/messages/author/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.messages.author.style +(ns quo.components.messages.author.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container {:flex-wrap :wrap diff --git a/src/quo2/components/messages/author/view.cljs b/src/quo/components/messages/author/view.cljs similarity index 91% rename from src/quo2/components/messages/author/view.cljs rename to src/quo/components/messages/author/view.cljs index e057543b3b..df85355820 100644 --- a/src/quo2/components/messages/author/view.cljs +++ b/src/quo/components/messages/author/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.messages.author.view +(ns quo.components.messages.author.view (:require [clojure.string :as string] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.messages.author.style :as style] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.messages.author.style :as style] + [quo.foundations.colors :as colors] [react-native.core :as rn])) (def middle-dot "·") diff --git a/src/quo2/components/messages/gap.cljs b/src/quo/components/messages/gap.cljs similarity index 96% rename from src/quo2/components/messages/gap.cljs rename to src/quo/components/messages/gap.cljs index 192143dc83..6c407f256b 100644 --- a/src/quo2/components/messages/gap.cljs +++ b/src/quo/components/messages/gap.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.messages.gap +(ns quo.components.messages.gap (:require [oops.core :refer [oget]] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/messages/system_message/style.cljs b/src/quo/components/messages/system_message/style.cljs similarity index 96% rename from src/quo2/components/messages/system_message/style.cljs rename to src/quo/components/messages/system_message/style.cljs index 5379c702da..a2f12bc712 100644 --- a/src/quo2/components/messages/system_message/style.cljs +++ b/src/quo/components/messages/system_message/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.messages.system-message.style +(ns quo.components.messages.system-message.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn text-color [theme] diff --git a/src/quo2/components/messages/system_message/view.cljs b/src/quo/components/messages/system_message/view.cljs similarity index 95% rename from src/quo2/components/messages/system_message/view.cljs rename to src/quo/components/messages/system_message/view.cljs index bd7b0b6dd2..b84d9a1a8f 100644 --- a/src/quo2/components/messages/system_message/view.cljs +++ b/src/quo/components/messages/system_message/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.messages.system-message.view +(ns quo.components.messages.system-message.view (:require [clojure.string :as string] - [quo2.components.avatars.icon-avatar :as icon-avatar] - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.markdown.text :as text] - [quo2.components.messages.system-message.style :as style] - [quo2.theme :as quo.theme] + [quo.components.avatars.icon-avatar :as icon-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.markdown.text :as text] + [quo.components.messages.system-message.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.reanimated :as reanimated] [utils.i18n :as i18n])) diff --git a/src/quo2/components/navigation/bottom_nav_tab/styles.cljs b/src/quo/components/navigation/bottom_nav_tab/styles.cljs similarity index 78% rename from src/quo2/components/navigation/bottom_nav_tab/styles.cljs rename to src/quo/components/navigation/bottom_nav_tab/styles.cljs index 0f069fa154..776c694dd0 100644 --- a/src/quo2/components/navigation/bottom_nav_tab/styles.cljs +++ b/src/quo/components/navigation/bottom_nav_tab/styles.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.navigation.bottom-nav-tab.styles +(ns quo.components.navigation.bottom-nav-tab.styles (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn notification-dot [customization-color] diff --git a/src/quo2/components/navigation/bottom_nav_tab/view.cljs b/src/quo/components/navigation/bottom_nav_tab/view.cljs similarity index 93% rename from src/quo2/components/navigation/bottom_nav_tab/view.cljs rename to src/quo/components/navigation/bottom_nav_tab/view.cljs index 821f97c03e..df1f7e5461 100644 --- a/src/quo2/components/navigation/bottom_nav_tab/view.cljs +++ b/src/quo/components/navigation/bottom_nav_tab/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.navigation.bottom-nav-tab.view +(ns quo.components.navigation.bottom-nav-tab.view (:require - [quo2.components.counter.counter.view :as counter] - [quo2.components.icons.icons :as icons] - [quo2.components.navigation.bottom-nav-tab.styles :as styles] - [quo2.foundations.colors :as colors] + [quo.components.counter.counter.view :as counter] + [quo.components.icons.icons :as icons] + [quo.components.navigation.bottom-nav-tab.styles :as styles] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.hole-view :as hole-view] [react-native.platform :as platform] diff --git a/src/quo2/components/navigation/floating_shell_button/style.cljs b/src/quo/components/navigation/floating_shell_button/style.cljs similarity index 89% rename from src/quo2/components/navigation/floating_shell_button/style.cljs rename to src/quo/components/navigation/floating_shell_button/style.cljs index 85523b6c15..a940a04e10 100644 --- a/src/quo2/components/navigation/floating_shell_button/style.cljs +++ b/src/quo/components/navigation/floating_shell_button/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.navigation.floating-shell-button.style +(ns quo.components.navigation.floating-shell-button.style (:require [react-native.reanimated :as reanimated])) diff --git a/src/quo2/components/navigation/floating_shell_button/view.cljs b/src/quo/components/navigation/floating_shell_button/view.cljs similarity index 89% rename from src/quo2/components/navigation/floating_shell_button/view.cljs rename to src/quo/components/navigation/floating_shell_button/view.cljs index c938f47a65..e59a49956f 100644 --- a/src/quo2/components/navigation/floating_shell_button/view.cljs +++ b/src/quo/components/navigation/floating_shell_button/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.navigation.floating-shell-button.view +(ns quo.components.navigation.floating-shell-button.view (:require - [quo2.components.buttons.dynamic-button.view :as dynamic-button] - [quo2.components.navigation.floating-shell-button.style :as style] + [quo.components.buttons.dynamic-button.view :as dynamic-button] + [quo.components.navigation.floating-shell-button.style :as style] [react-native.core :as rn] [react-native.reanimated :as reanimated])) diff --git a/src/quo2/components/navigation/page_nav/style.cljs b/src/quo/components/navigation/page_nav/style.cljs similarity index 96% rename from src/quo2/components/navigation/page_nav/style.cljs rename to src/quo/components/navigation/page_nav/style.cljs index 547d31e7b1..9be23ab028 100644 --- a/src/quo2/components/navigation/page_nav/style.cljs +++ b/src/quo/components/navigation/page_nav/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.navigation.page-nav.style +(ns quo.components.navigation.page-nav.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [margin-top] diff --git a/src/quo2/components/navigation/page_nav/view.cljs b/src/quo/components/navigation/page_nav/view.cljs similarity index 94% rename from src/quo2/components/navigation/page_nav/view.cljs rename to src/quo/components/navigation/page_nav/view.cljs index 215c5611cd..caaf1c3e78 100644 --- a/src/quo2/components/navigation/page_nav/view.cljs +++ b/src/quo/components/navigation/page_nav/view.cljs @@ -1,15 +1,15 @@ -(ns quo2.components.navigation.page-nav.view +(ns quo.components.navigation.page-nav.view (:require - [quo2.components.avatars.group-avatar.view :as group-avatar] - [quo2.components.buttons.button.properties :as button-properties] - [quo2.components.buttons.button.view :as button] - [quo2.components.dropdowns.dropdown.properties :as dropdown-properties] - [quo2.components.dropdowns.dropdown.view :as dropdown] - [quo2.components.dropdowns.network-dropdown.view :as network-dropdown] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.navigation.page-nav.style :as style] - [quo2.theme :as theme] + [quo.components.avatars.group-avatar.view :as group-avatar] + [quo.components.buttons.button.properties :as button-properties] + [quo.components.buttons.button.view :as button] + [quo.components.dropdowns.dropdown.properties :as dropdown-properties] + [quo.components.dropdowns.dropdown.view :as dropdown] + [quo.components.dropdowns.network-dropdown.view :as network-dropdown] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.navigation.page-nav.style :as style] + [quo.theme :as theme] [react-native.core :as rn])) (def ^:private button-type diff --git a/src/quo2/components/navigation/top_nav/component_spec.cljs b/src/quo/components/navigation/top_nav/component_spec.cljs similarity index 92% rename from src/quo2/components/navigation/top_nav/component_spec.cljs rename to src/quo/components/navigation/top_nav/component_spec.cljs index b4d18b24aa..e7204213a8 100644 --- a/src/quo2/components/navigation/top_nav/component_spec.cljs +++ b/src/quo/components/navigation/top_nav/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.navigation.top-nav.component-spec +(ns quo.components.navigation.top-nav.component-spec (:require - [quo2.components.navigation.top-nav.view :as top-nav] + [quo.components.navigation.top-nav.view :as top-nav] [test-helpers.component :as h])) (h/describe "Top Nav component" diff --git a/src/quo2/components/navigation/top_nav/style.cljs b/src/quo/components/navigation/top_nav/style.cljs similarity index 94% rename from src/quo2/components/navigation/top_nav/style.cljs rename to src/quo/components/navigation/top_nav/style.cljs index 061717ccc0..afecb61a36 100644 --- a/src/quo2/components/navigation/top_nav/style.cljs +++ b/src/quo/components/navigation/top_nav/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.navigation.top-nav.style) +(ns quo.components.navigation.top-nav.style) (defn unread-indicator [unread-count max-value] diff --git a/src/quo2/components/navigation/top_nav/view.cljs b/src/quo/components/navigation/top_nav/view.cljs similarity index 94% rename from src/quo2/components/navigation/top_nav/view.cljs rename to src/quo/components/navigation/top_nav/view.cljs index ae6b4437b0..342980f2c5 100644 --- a/src/quo2/components/navigation/top_nav/view.cljs +++ b/src/quo/components/navigation/top_nav/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.navigation.top-nav.view +(ns quo.components.navigation.top-nav.view (:require - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.buttons.button.view :as button] - [quo2.components.common.notification-dot.view :as notification-dot] - [quo2.components.counter.counter.view :as counter] - [quo2.components.navigation.top-nav.style :as style] - [quo2.theme :as quo.theme] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.buttons.button.view :as button] + [quo.components.common.notification-dot.view :as notification-dot] + [quo.components.counter.counter.view :as counter] + [quo.components.navigation.top-nav.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.hole-view :as hole-view])) diff --git a/src/quo2/components/notifications/activity_log/style.cljs b/src/quo/components/notifications/activity_log/style.cljs similarity index 94% rename from src/quo2/components/notifications/activity_log/style.cljs rename to src/quo/components/notifications/activity_log/style.cljs index ab0e58e94c..d87896b3b4 100644 --- a/src/quo2/components/notifications/activity_log/style.cljs +++ b/src/quo/components/notifications/activity_log/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.notifications.activity-log.style +(ns quo.components.notifications.activity-log.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container {:flex-direction :row diff --git a/src/quo2/components/notifications/activity_log/view.cljs b/src/quo/components/notifications/activity_log/view.cljs similarity index 93% rename from src/quo2/components/notifications/activity_log/view.cljs rename to src/quo/components/notifications/activity_log/view.cljs index aeb76a144b..6d047c2722 100644 --- a/src/quo2/components/notifications/activity_log/view.cljs +++ b/src/quo/components/notifications/activity_log/view.cljs @@ -1,13 +1,13 @@ -(ns quo2.components.notifications.activity-log.view +(ns quo.components.notifications.activity-log.view (:require [clojure.string :as string] - [quo2.components.buttons.button.view :as button] - [quo2.components.icon :as icon] - [quo2.components.inputs.input.view :as input] - [quo2.components.markdown.text :as text] - [quo2.components.notifications.activity-log.style :as style] - [quo2.components.tags.status-tags :as status-tags] - [quo2.foundations.colors :as colors] + [quo.components.buttons.button.view :as button] + [quo.components.icon :as icon] + [quo.components.inputs.input.view :as input] + [quo.components.markdown.text :as text] + [quo.components.notifications.activity-log.style :as style] + [quo.components.tags.status-tags :as status-tags] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [utils.i18n :as i18n])) diff --git a/src/quo2/components/notifications/activity_logs_photos/style.cljs b/src/quo/components/notifications/activity_logs_photos/style.cljs similarity index 80% rename from src/quo2/components/notifications/activity_logs_photos/style.cljs rename to src/quo/components/notifications/activity_logs_photos/style.cljs index 07fb439267..e0c9912977 100644 --- a/src/quo2/components/notifications/activity_logs_photos/style.cljs +++ b/src/quo/components/notifications/activity_logs_photos/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.notifications.activity-logs-photos.style) +(ns quo.components.notifications.activity-logs-photos.style) (def text {:margin-bottom 8}) diff --git a/src/quo2/components/notifications/activity_logs_photos/view.cljs b/src/quo/components/notifications/activity_logs_photos/view.cljs similarity index 77% rename from src/quo2/components/notifications/activity_logs_photos/view.cljs rename to src/quo/components/notifications/activity_logs_photos/view.cljs index 24d6911ce5..d5a08194bb 100644 --- a/src/quo2/components/notifications/activity_logs_photos/view.cljs +++ b/src/quo/components/notifications/activity_logs_photos/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.notifications.activity-logs-photos.view +(ns quo.components.notifications.activity-logs-photos.view (:require [clojure.string :as string] - [quo2.components.markdown.text :as text] - [quo2.components.notifications.activity-logs-photos.style :as style] + [quo.components.markdown.text :as text] + [quo.components.notifications.activity-logs-photos.style :as style] [react-native.core :as rn])) (defn view diff --git a/src/quo2/components/notifications/count_down_circle.cljs b/src/quo/components/notifications/count_down_circle.cljs similarity index 97% rename from src/quo2/components/notifications/count_down_circle.cljs rename to src/quo/components/notifications/count_down_circle.cljs index fa86664ca5..51ec1d08f8 100644 --- a/src/quo2/components/notifications/count_down_circle.cljs +++ b/src/quo/components/notifications/count_down_circle.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.notifications.count-down-circle +(ns quo.components.notifications.count-down-circle (:require [goog.string :as gstring] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.svg :as svg] [reagent.core :as reagent])) diff --git a/src/quo2/components/notifications/notification/component_spec.cljs b/src/quo/components/notifications/notification/component_spec.cljs similarity index 90% rename from src/quo2/components/notifications/notification/component_spec.cljs rename to src/quo/components/notifications/notification/component_spec.cljs index 3020a2cf06..841b65e512 100644 --- a/src/quo2/components/notifications/notification/component_spec.cljs +++ b/src/quo/components/notifications/notification/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.notifications.notification.component-spec +(ns quo.components.notifications.notification.component-spec (:require - [quo2.components.markdown.text :as text] - [quo2.components.notifications.notification.view :as notification] + [quo.components.markdown.text :as text] + [quo.components.notifications.notification.view :as notification] [test-helpers.component :as h])) (h/describe "notification" diff --git a/src/quo2/components/notifications/notification/style.cljs b/src/quo/components/notifications/notification/style.cljs similarity index 86% rename from src/quo2/components/notifications/notification/style.cljs rename to src/quo/components/notifications/notification/style.cljs index 5a4630c182..e75c79c702 100644 --- a/src/quo2/components/notifications/notification/style.cljs +++ b/src/quo/components/notifications/notification/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.notifications.notification.style +(ns quo.components.notifications.notification.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.shadows :as shadows])) + [quo.foundations.colors :as colors] + [quo.foundations.shadows :as shadows])) (def box-container {:margin-horizontal 8 diff --git a/src/quo2/components/notifications/notification/view.cljs b/src/quo/components/notifications/notification/view.cljs similarity index 92% rename from src/quo2/components/notifications/notification/view.cljs rename to src/quo/components/notifications/notification/view.cljs index 3636aba297..d6626a9ccc 100644 --- a/src/quo2/components/notifications/notification/view.cljs +++ b/src/quo/components/notifications/notification/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.notifications.notification.view +(ns quo.components.notifications.notification.view (:require - [quo2.components.markdown.text :as text] - [quo2.components.notifications.notification.style :as style] + [quo.components.markdown.text :as text] + [quo.components.notifications.notification.style :as style] [react-native.blur :as blur] [react-native.core :as rn])) diff --git a/src/quo2/components/notifications/toast/style.cljs b/src/quo/components/notifications/toast/style.cljs similarity index 91% rename from src/quo2/components/notifications/toast/style.cljs rename to src/quo/components/notifications/toast/style.cljs index 0dec4ee9cc..30fd1021ea 100644 --- a/src/quo2/components/notifications/toast/style.cljs +++ b/src/quo/components/notifications/toast/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.notifications.toast.style +(ns quo.components.notifications.toast.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.shadows :as shadows])) + [quo.foundations.colors :as colors] + [quo.foundations.shadows :as shadows])) (defn box-container [theme] diff --git a/src/quo2/components/notifications/toast/view.cljs b/src/quo/components/notifications/toast/view.cljs similarity index 89% rename from src/quo2/components/notifications/toast/view.cljs rename to src/quo/components/notifications/toast/view.cljs index d0f96e25af..f1043510ab 100644 --- a/src/quo2/components/notifications/toast/view.cljs +++ b/src/quo/components/notifications/toast/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.notifications.toast.view +(ns quo.components.notifications.toast.view (:require - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.components.notifications.count-down-circle :as count-down-circle] - [quo2.components.notifications.toast.style :as style] - [quo2.theme :as quo.theme] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.components.notifications.count-down-circle :as count-down-circle] + [quo.components.notifications.toast.style :as style] + [quo.theme :as quo.theme] [react-native.blur :as blur] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/numbered_keyboard/keyboard_key/component_spec.cljs b/src/quo/components/numbered_keyboard/keyboard_key/component_spec.cljs similarity index 92% rename from src/quo2/components/numbered_keyboard/keyboard_key/component_spec.cljs rename to src/quo/components/numbered_keyboard/keyboard_key/component_spec.cljs index 7689eead58..df8bc0a3c1 100644 --- a/src/quo2/components/numbered_keyboard/keyboard_key/component_spec.cljs +++ b/src/quo/components/numbered_keyboard/keyboard_key/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.numbered-keyboard.keyboard-key.component-spec +(ns quo.components.numbered-keyboard.keyboard-key.component-spec (:require - [quo2.components.numbered-keyboard.keyboard-key.view :as component] + [quo.components.numbered-keyboard.keyboard-key.view :as component] [test-helpers.component :as h])) (h/describe "Keyboard Key" diff --git a/src/quo2/components/numbered_keyboard/keyboard_key/style.cljs b/src/quo/components/numbered_keyboard/keyboard_key/style.cljs similarity index 88% rename from src/quo2/components/numbered_keyboard/keyboard_key/style.cljs rename to src/quo/components/numbered_keyboard/keyboard_key/style.cljs index 16331fa4bc..ebdc1c1257 100644 --- a/src/quo2/components/numbered_keyboard/keyboard_key/style.cljs +++ b/src/quo/components/numbered_keyboard/keyboard_key/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.numbered-keyboard.keyboard-key.style +(ns quo.components.numbered-keyboard.keyboard-key.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn get-label-color [disabled? theme blur?] diff --git a/src/quo2/components/numbered_keyboard/keyboard_key/view.cljs b/src/quo/components/numbered_keyboard/keyboard_key/view.cljs similarity index 87% rename from src/quo2/components/numbered_keyboard/keyboard_key/view.cljs rename to src/quo/components/numbered_keyboard/keyboard_key/view.cljs index b676c49693..e4bfbe37c6 100644 --- a/src/quo2/components/numbered_keyboard/keyboard_key/view.cljs +++ b/src/quo/components/numbered_keyboard/keyboard_key/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.numbered-keyboard.keyboard-key.view +(ns quo.components.numbered-keyboard.keyboard-key.view (:require - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.numbered-keyboard.keyboard-key.style :as style] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.numbered-keyboard.keyboard-key.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/numbered_keyboard/numbered_keyboard/style.cljs b/src/quo/components/numbered_keyboard/numbered_keyboard/style.cljs similarity index 78% rename from src/quo2/components/numbered_keyboard/numbered_keyboard/style.cljs rename to src/quo/components/numbered_keyboard/numbered_keyboard/style.cljs index f833bd6fab..f16a37eb53 100644 --- a/src/quo2/components/numbered_keyboard/numbered_keyboard/style.cljs +++ b/src/quo/components/numbered_keyboard/numbered_keyboard/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.numbered-keyboard.numbered-keyboard.style) +(ns quo.components.numbered-keyboard.numbered-keyboard.style) (def container {:flex 1 diff --git a/src/quo2/components/numbered_keyboard/numbered_keyboard/view.cljs b/src/quo/components/numbered_keyboard/numbered_keyboard/view.cljs similarity index 88% rename from src/quo2/components/numbered_keyboard/numbered_keyboard/view.cljs rename to src/quo/components/numbered_keyboard/numbered_keyboard/view.cljs index 7581aa4173..3f85c38f31 100644 --- a/src/quo2/components/numbered_keyboard/numbered_keyboard/view.cljs +++ b/src/quo/components/numbered_keyboard/numbered_keyboard/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.numbered-keyboard.numbered-keyboard.view +(ns quo.components.numbered-keyboard.numbered-keyboard.view (:require - [quo2.components.numbered-keyboard.keyboard-key.view :as keyboard-key] - [quo2.components.numbered-keyboard.numbered-keyboard.style :as style] - [quo2.theme :as quo.theme] + [quo.components.numbered-keyboard.keyboard-key.view :as keyboard-key] + [quo.components.numbered-keyboard.numbered-keyboard.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn keyboard-item diff --git a/src/quo2/components/onboarding/small_option_card/component_spec.cljs b/src/quo/components/onboarding/small_option_card/component_spec.cljs similarity index 93% rename from src/quo2/components/onboarding/small_option_card/component_spec.cljs rename to src/quo/components/onboarding/small_option_card/component_spec.cljs index 6bba8c290d..3f27a38b34 100644 --- a/src/quo2/components/onboarding/small_option_card/component_spec.cljs +++ b/src/quo/components/onboarding/small_option_card/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.onboarding.small-option-card.component-spec +(ns quo.components.onboarding.small-option-card.component-spec (:require - [quo2.components.onboarding.small-option-card.view :as small-option-card] + [quo.components.onboarding.small-option-card.view :as small-option-card] [test-helpers.component :as h])) (defn- testing-small-option-card diff --git a/src/quo2/components/onboarding/small_option_card/style.cljs b/src/quo/components/onboarding/small_option_card/style.cljs similarity index 91% rename from src/quo2/components/onboarding/small_option_card/style.cljs rename to src/quo/components/onboarding/small_option_card/style.cljs index 0ecd2f0224..6c7a228bbf 100644 --- a/src/quo2/components/onboarding/small_option_card/style.cljs +++ b/src/quo/components/onboarding/small_option_card/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.onboarding.small-option-card.style +(ns quo.components.onboarding.small-option-card.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def main-variant-height 335) (def icon-variant-height 56) diff --git a/src/quo2/components/onboarding/small_option_card/view.cljs b/src/quo/components/onboarding/small_option_card/view.cljs similarity index 91% rename from src/quo2/components/onboarding/small_option_card/view.cljs rename to src/quo/components/onboarding/small_option_card/view.cljs index a55320bac9..8b0096d383 100644 --- a/src/quo2/components/onboarding/small_option_card/view.cljs +++ b/src/quo/components/onboarding/small_option_card/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.onboarding.small-option-card.view +(ns quo.components.onboarding.small-option-card.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.markdown.text :as text] - [quo2.components.onboarding.small-option-card.style :as style] - [quo2.foundations.colors :as colors] + [quo.components.buttons.button.view :as button] + [quo.components.markdown.text :as text] + [quo.components.onboarding.small-option-card.style :as style] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.fast-image :as fast-image])) diff --git a/src/quo2/components/password/tips/component_spec.cljs b/src/quo/components/password/tips/component_spec.cljs similarity index 87% rename from src/quo2/components/password/tips/component_spec.cljs rename to src/quo/components/password/tips/component_spec.cljs index 87b905d55c..bfe52c2d00 100644 --- a/src/quo2/components/password/tips/component_spec.cljs +++ b/src/quo/components/password/tips/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.password.tips.component-spec +(ns quo.components.password.tips.component-spec (:require - [quo2.components.password.tips.view :as quo] + [quo.components.password.tips.view :as quo] [test-helpers.component :as h])) (h/describe "password tips component" diff --git a/src/quo2/components/password/tips/style.cljs b/src/quo/components/password/tips/style.cljs similarity index 80% rename from src/quo2/components/password/tips/style.cljs rename to src/quo/components/password/tips/style.cljs index 2a5844f4a4..d66953499c 100644 --- a/src/quo2/components/password/tips/style.cljs +++ b/src/quo/components/password/tips/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.password.tips.style +(ns quo.components.password.tips.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container {:align-self :flex-start}) diff --git a/src/quo2/components/password/tips/view.cljs b/src/quo/components/password/tips/view.cljs similarity index 79% rename from src/quo2/components/password/tips/view.cljs rename to src/quo/components/password/tips/view.cljs index fc4f48a556..296f71c8cb 100644 --- a/src/quo2/components/password/tips/view.cljs +++ b/src/quo/components/password/tips/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.password.tips.view +(ns quo.components.password.tips.view (:require - [quo2.components.markdown.text :as text] - [quo2.components.password.tips.style :as style] + [quo.components.markdown.text :as text] + [quo.components.password.tips.style :as style] [react-native.core :as rn])) (defn view diff --git a/src/quo2/components/profile/collectible/style.cljs b/src/quo/components/profile/collectible/style.cljs similarity index 93% rename from src/quo2/components/profile/collectible/style.cljs rename to src/quo/components/profile/collectible/style.cljs index 0487f038cc..c49f89ba76 100644 --- a/src/quo2/components/profile/collectible/style.cljs +++ b/src/quo/components/profile/collectible/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.profile.collectible.style +(ns quo.components.profile.collectible.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def tile-style-by-size {:xl {:width 160 diff --git a/src/quo2/components/profile/collectible/view.cljs b/src/quo/components/profile/collectible/view.cljs similarity index 94% rename from src/quo2/components/profile/collectible/view.cljs rename to src/quo/components/profile/collectible/view.cljs index 969b574ae8..b3bae35073 100644 --- a/src/quo2/components/profile/collectible/view.cljs +++ b/src/quo/components/profile/collectible/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.profile.collectible.view +(ns quo.components.profile.collectible.view (:require - [quo2.components.markdown.text :as text] - [quo2.components.profile.collectible.style :as style] + [quo.components.markdown.text :as text] + [quo.components.profile.collectible.style :as style] [react-native.core :as rn])) (defn remaining-tiles diff --git a/src/quo2/components/profile/profile_card/style.cljs b/src/quo/components/profile/profile_card/style.cljs similarity index 92% rename from src/quo2/components/profile/profile_card/style.cljs rename to src/quo/components/profile/profile_card/style.cljs index c5528db704..f73f73836a 100644 --- a/src/quo2/components/profile/profile_card/style.cljs +++ b/src/quo/components/profile/profile_card/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.profile.profile-card.style +(ns quo.components.profile.profile-card.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn card-container [{:keys [customization-color padding-bottom border-bottom-radius]}] diff --git a/src/quo2/components/profile/profile_card/view.cljs b/src/quo/components/profile/profile_card/view.cljs similarity index 91% rename from src/quo2/components/profile/profile_card/view.cljs rename to src/quo/components/profile/profile_card/view.cljs index cd759face6..24627abb70 100644 --- a/src/quo2/components/profile/profile_card/view.cljs +++ b/src/quo/components/profile/profile_card/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.profile.profile-card.view +(ns quo.components.profile.profile-card.view (:require - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.buttons.button.view :as button] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.components.profile.profile-card.style :as style] - [quo2.components.tags.tag :as tag] - [quo2.foundations.colors :as colors] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.buttons.button.view :as button] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.components.profile.profile-card.style :as style] + [quo.components.tags.tag :as tag] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.hole-view :as hole-view] [utils.i18n :as i18n])) diff --git a/src/quo2/components/profile/select_profile/component_spec.cljs b/src/quo/components/profile/select_profile/component_spec.cljs similarity index 80% rename from src/quo2/components/profile/select_profile/component_spec.cljs rename to src/quo/components/profile/select_profile/component_spec.cljs index 3d32175a72..5751a709a2 100644 --- a/src/quo2/components/profile/select_profile/component_spec.cljs +++ b/src/quo/components/profile/select_profile/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.profile.select-profile.component-spec +(ns quo.components.profile.select-profile.component-spec (:require - [quo2.components.profile.select-profile.view :as select-profile] + [quo.components.profile.select-profile.view :as select-profile] [test-helpers.component :as h])) (h/describe "select-profile component" diff --git a/src/quo2/components/profile/select_profile/style.cljs b/src/quo/components/profile/select_profile/style.cljs similarity index 90% rename from src/quo2/components/profile/select_profile/style.cljs rename to src/quo/components/profile/select_profile/style.cljs index 3684af2f43..957a74623e 100644 --- a/src/quo2/components/profile/select_profile/style.cljs +++ b/src/quo/components/profile/select_profile/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.profile.select-profile.style +(ns quo.components.profile.select-profile.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [customization-color selected?] diff --git a/src/quo2/components/profile/select_profile/view.cljs b/src/quo/components/profile/select_profile/view.cljs similarity index 88% rename from src/quo2/components/profile/select_profile/view.cljs rename to src/quo/components/profile/select_profile/view.cljs index 84cc5e7111..dbdacd46c9 100644 --- a/src/quo2/components/profile/select_profile/view.cljs +++ b/src/quo/components/profile/select_profile/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.profile.select-profile.view +(ns quo.components.profile.select-profile.view (:require - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.markdown.text :as text] - [quo2.components.profile.select-profile.style :as style] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.markdown.text :as text] + [quo.components.profile.select-profile.style :as style] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/profile/showcase_nav/component_spec.cljs b/src/quo/components/profile/showcase_nav/component_spec.cljs similarity index 91% rename from src/quo2/components/profile/showcase_nav/component_spec.cljs rename to src/quo/components/profile/showcase_nav/component_spec.cljs index 0e314ce387..d4015be52c 100644 --- a/src/quo2/components/profile/showcase_nav/component_spec.cljs +++ b/src/quo/components/profile/showcase_nav/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.profile.showcase-nav.component-spec +(ns quo.components.profile.showcase-nav.component-spec (:require - [quo2.components.profile.showcase-nav.view :as view] + [quo.components.profile.showcase-nav.view :as view] [reagent.core :as reagent] [test-helpers.component :as h])) diff --git a/src/quo2/components/profile/showcase_nav/style.cljs b/src/quo/components/profile/showcase_nav/style.cljs similarity index 80% rename from src/quo2/components/profile/showcase_nav/style.cljs rename to src/quo/components/profile/showcase_nav/style.cljs index 5b6e13a84d..8d6c163219 100644 --- a/src/quo2/components/profile/showcase_nav/style.cljs +++ b/src/quo/components/profile/showcase_nav/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.profile.showcase-nav.style +(ns quo.components.profile.showcase-nav.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def height 56) diff --git a/src/quo2/components/profile/showcase_nav/view.cljs b/src/quo/components/profile/showcase_nav/view.cljs similarity index 88% rename from src/quo2/components/profile/showcase_nav/view.cljs rename to src/quo/components/profile/showcase_nav/view.cljs index 2f2b301215..7396489460 100644 --- a/src/quo2/components/profile/showcase_nav/view.cljs +++ b/src/quo/components/profile/showcase_nav/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.profile.showcase-nav.view +(ns quo.components.profile.showcase-nav.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.profile.showcase-nav.style :as style] - [quo2.theme :as quo.theme] + [quo.components.buttons.button.view :as button] + [quo.components.profile.showcase-nav.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- render-button diff --git a/src/quo2/components/record_audio/record_audio/buttons/delete_button.cljs b/src/quo/components/record_audio/record_audio/buttons/delete_button.cljs similarity index 94% rename from src/quo2/components/record_audio/record_audio/buttons/delete_button.cljs rename to src/quo/components/record_audio/record_audio/buttons/delete_button.cljs index ec6f55b614..99b1d20f97 100644 --- a/src/quo2/components/record_audio/record_audio/buttons/delete_button.cljs +++ b/src/quo/components/record_audio/record_audio/buttons/delete_button.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.record-audio.record-audio.buttons.delete-button +(ns quo.components.record-audio.record-audio.buttons.delete-button (:require - [quo2.components.icon :as icons] - [quo2.components.record-audio.record-audio.helpers :as helpers] - [quo2.components.record-audio.record-audio.style :as style] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icons] + [quo.components.record-audio.record-audio.helpers :as helpers] + [quo.components.record-audio.record-audio.style :as style] + [quo.foundations.colors :as colors] [react-native.core :refer [use-effect]] [react-native.reanimated :as reanimated])) diff --git a/src/quo2/components/record_audio/record_audio/buttons/lock_button.cljs b/src/quo/components/record_audio/record_audio/buttons/lock_button.cljs similarity index 93% rename from src/quo2/components/record_audio/record_audio/buttons/lock_button.cljs rename to src/quo/components/record_audio/record_audio/buttons/lock_button.cljs index ef2796f697..01a87e2f26 100644 --- a/src/quo2/components/record_audio/record_audio/buttons/lock_button.cljs +++ b/src/quo/components/record_audio/record_audio/buttons/lock_button.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.record-audio.record-audio.buttons.lock-button +(ns quo.components.record-audio.record-audio.buttons.lock-button (:require - [quo2.components.icon :as icons] - [quo2.components.record-audio.record-audio.helpers :as helpers] - [quo2.components.record-audio.record-audio.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.record-audio.record-audio.helpers :as helpers] + [quo.components.record-audio.record-audio.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :refer [use-effect]] [react-native.reanimated :as reanimated])) diff --git a/src/quo2/components/record_audio/record_audio/buttons/record_button.cljs b/src/quo/components/record_audio/record_audio/buttons/record_button.cljs similarity index 75% rename from src/quo2/components/record_audio/record_audio/buttons/record_button.cljs rename to src/quo/components/record_audio/record_audio/buttons/record_button.cljs index b73f16f0eb..213efb32e2 100644 --- a/src/quo2/components/record_audio/record_audio/buttons/record_button.cljs +++ b/src/quo/components/record_audio/record_audio/buttons/record_button.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.record-audio.record-audio.buttons.record-button +(ns quo.components.record-audio.record-audio.buttons.record-button (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.record-audio.record-audio.helpers :as helpers] - [quo2.components.record-audio.record-audio.style :as style] + [quo.components.buttons.button.view :as button] + [quo.components.record-audio.record-audio.helpers :as helpers] + [quo.components.record-audio.record-audio.style :as style] [react-native.core :as rn :refer [use-effect]] [react-native.reanimated :as reanimated])) diff --git a/src/quo2/components/record_audio/record_audio/buttons/record_button_big.cljs b/src/quo/components/record_audio/record_audio/buttons/record_button_big.cljs similarity index 97% rename from src/quo2/components/record_audio/record_audio/buttons/record_button_big.cljs rename to src/quo/components/record_audio/record_audio/buttons/record_button_big.cljs index de45b7113b..0d348c7bfb 100644 --- a/src/quo2/components/record_audio/record_audio/buttons/record_button_big.cljs +++ b/src/quo/components/record_audio/record_audio/buttons/record_button_big.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.record-audio.record-audio.buttons.record-button-big +(ns quo.components.record-audio.record-audio.buttons.record-button-big (:require [cljs-bean.core :as bean] - [quo2.components.icon :as icons] - [quo2.components.record-audio.record-audio.helpers :as helpers] - [quo2.components.record-audio.record-audio.style :as style] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icons] + [quo.components.record-audio.record-audio.helpers :as helpers] + [quo.components.record-audio.record-audio.style :as style] + [quo.foundations.colors :as colors] [react-native.audio-toolkit :as audio] [react-native.core :as rn :refer [use-effect]] [react-native.reanimated :as reanimated] diff --git a/src/quo2/components/record_audio/record_audio/buttons/send_button.cljs b/src/quo/components/record_audio/record_audio/buttons/send_button.cljs similarity index 94% rename from src/quo2/components/record_audio/record_audio/buttons/send_button.cljs rename to src/quo/components/record_audio/record_audio/buttons/send_button.cljs index f8b3cbac41..6ccf4322fa 100644 --- a/src/quo2/components/record_audio/record_audio/buttons/send_button.cljs +++ b/src/quo/components/record_audio/record_audio/buttons/send_button.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.record-audio.record-audio.buttons.send-button +(ns quo.components.record-audio.record-audio.buttons.send-button (:require - [quo2.components.icon :as icons] - [quo2.components.record-audio.record-audio.helpers :as helpers] - [quo2.components.record-audio.record-audio.style :as style] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icons] + [quo.components.record-audio.record-audio.helpers :as helpers] + [quo.components.record-audio.record-audio.style :as style] + [quo.foundations.colors :as colors] [react-native.core :refer [use-effect]] [react-native.reanimated :as reanimated])) diff --git a/src/quo2/components/record_audio/record_audio/component_spec.cljs b/src/quo/components/record_audio/record_audio/component_spec.cljs similarity index 98% rename from src/quo2/components/record_audio/record_audio/component_spec.cljs rename to src/quo/components/record_audio/record_audio/component_spec.cljs index aa302627b9..77e04f235e 100644 --- a/src/quo2/components/record_audio/record_audio/component_spec.cljs +++ b/src/quo/components/record_audio/record_audio/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.record-audio.record-audio.component-spec +(ns quo.components.record-audio.record-audio.component-spec (:require - [quo2.components.record-audio.record-audio.view :as record-audio] + [quo.components.record-audio.record-audio.view :as record-audio] [react-native.audio-toolkit :as audio] [reagent.core :as reagent] [test-helpers.component :as h] diff --git a/src/quo2/components/record_audio/record_audio/helpers.cljs b/src/quo/components/record_audio/record_audio/helpers.cljs similarity index 94% rename from src/quo2/components/record_audio/record_audio/helpers.cljs rename to src/quo/components/record_audio/record_audio/helpers.cljs index c630c3ce94..7d58672d94 100644 --- a/src/quo2/components/record_audio/record_audio/helpers.cljs +++ b/src/quo/components/record_audio/record_audio/helpers.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.record-audio.record-audio.helpers +(ns quo.components.record-audio.record-audio.helpers (:require [react-native.reanimated :as reanimated])) diff --git a/src/quo2/components/record_audio/record_audio/style.cljs b/src/quo/components/record_audio/record_audio/style.cljs similarity index 98% rename from src/quo2/components/record_audio/record_audio/style.cljs rename to src/quo/components/record_audio/record_audio/style.cljs index 2a99e17e9f..65a70d2d94 100644 --- a/src/quo2/components/record_audio/record_audio/style.cljs +++ b/src/quo/components/record_audio/record_audio/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.record-audio.record-audio.style +(ns quo.components.record-audio.record-audio.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) (defn animated-circle diff --git a/src/quo2/components/record_audio/record_audio/view.cljs b/src/quo/components/record_audio/record_audio/view.cljs similarity index 97% rename from src/quo2/components/record_audio/record_audio/view.cljs rename to src/quo/components/record_audio/record_audio/view.cljs index fa1dd2f0d0..e7cff3b571 100644 --- a/src/quo2/components/record_audio/record_audio/view.cljs +++ b/src/quo/components/record_audio/record_audio/view.cljs @@ -1,19 +1,19 @@ -(ns quo2.components.record-audio.record-audio.view +(ns quo.components.record-audio.record-audio.view (:require [clojure.string :as string] [goog.string :as gstring] [oops.core :as oops] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.record-audio.record-audio.buttons.delete-button :as delete-button] - [quo2.components.record-audio.record-audio.buttons.lock-button :as lock-button] - [quo2.components.record-audio.record-audio.buttons.record-button :as record-button] - [quo2.components.record-audio.record-audio.buttons.record-button-big :as record-button-big] - [quo2.components.record-audio.record-audio.buttons.send-button :as send-button] - [quo2.components.record-audio.record-audio.style :as style] - [quo2.components.record-audio.soundtrack.view :as soundtrack] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.record-audio.record-audio.buttons.delete-button :as delete-button] + [quo.components.record-audio.record-audio.buttons.lock-button :as lock-button] + [quo.components.record-audio.record-audio.buttons.record-button :as record-button] + [quo.components.record-audio.record-audio.buttons.record-button-big :as record-button-big] + [quo.components.record-audio.record-audio.buttons.send-button :as send-button] + [quo.components.record-audio.record-audio.style :as style] + [quo.components.record-audio.soundtrack.view :as soundtrack] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.audio-toolkit :as audio] [react-native.core :as rn :refer [use-effect]] [react-native.platform :as platform] diff --git a/src/quo2/components/record_audio/soundtrack/component_spec.cljs b/src/quo/components/record_audio/soundtrack/component_spec.cljs similarity index 96% rename from src/quo2/components/record_audio/soundtrack/component_spec.cljs rename to src/quo/components/record_audio/soundtrack/component_spec.cljs index 5e1b759d3e..1ccb1145f0 100644 --- a/src/quo2/components/record_audio/soundtrack/component_spec.cljs +++ b/src/quo/components/record_audio/soundtrack/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.record-audio.soundtrack.component-spec +(ns quo.components.record-audio.soundtrack.component-spec (:require - [quo2.components.record-audio.soundtrack.view :as soundtrack] + [quo.components.record-audio.soundtrack.view :as soundtrack] [react-native.audio-toolkit :as audio] [reagent.core :as reagent] [test-helpers.component :as h])) diff --git a/src/quo2/components/record_audio/soundtrack/style.cljs b/src/quo/components/record_audio/soundtrack/style.cljs similarity index 91% rename from src/quo2/components/record_audio/soundtrack/style.cljs rename to src/quo/components/record_audio/soundtrack/style.cljs index 178b295942..65b740a604 100644 --- a/src/quo2/components/record_audio/soundtrack/style.cljs +++ b/src/quo/components/record_audio/soundtrack/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.record-audio.soundtrack.style +(ns quo.components.record-audio.soundtrack.style (:require [react-native.platform :as platform])) diff --git a/src/quo2/components/record_audio/soundtrack/view.cljs b/src/quo/components/record_audio/soundtrack/view.cljs similarity index 91% rename from src/quo2/components/record_audio/soundtrack/view.cljs rename to src/quo/components/record_audio/soundtrack/view.cljs index 41114fe084..ba8eb7c725 100644 --- a/src/quo2/components/record_audio/soundtrack/view.cljs +++ b/src/quo/components/record_audio/soundtrack/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.record-audio.soundtrack.view +(ns quo.components.record-audio.soundtrack.view (:require - [quo2.components.record-audio.soundtrack.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.record-audio.soundtrack.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.audio-toolkit :as audio] [react-native.platform :as platform] [react-native.slider :as slider] diff --git a/src/quo2/components/selectors/disclaimer/component_spec.cljs b/src/quo/components/selectors/disclaimer/component_spec.cljs similarity index 90% rename from src/quo2/components/selectors/disclaimer/component_spec.cljs rename to src/quo/components/selectors/disclaimer/component_spec.cljs index 8b50d22598..25b8b54503 100644 --- a/src/quo2/components/selectors/disclaimer/component_spec.cljs +++ b/src/quo/components/selectors/disclaimer/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.selectors.disclaimer.component-spec +(ns quo.components.selectors.disclaimer.component-spec (:require - [quo2.components.selectors.disclaimer.view :as disclaimer] + [quo.components.selectors.disclaimer.view :as disclaimer] [test-helpers.component :as h])) (h/describe "Disclaimer tests" diff --git a/src/quo2/components/selectors/disclaimer/style.cljs b/src/quo/components/selectors/disclaimer/style.cljs similarity index 85% rename from src/quo2/components/selectors/disclaimer/style.cljs rename to src/quo/components/selectors/disclaimer/style.cljs index 2610f159fb..03471bdc6a 100644 --- a/src/quo2/components/selectors/disclaimer/style.cljs +++ b/src/quo/components/selectors/disclaimer/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.selectors.disclaimer.style +(ns quo.components.selectors.disclaimer.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [blur?] diff --git a/src/quo2/components/selectors/disclaimer/view.cljs b/src/quo/components/selectors/disclaimer/view.cljs similarity index 73% rename from src/quo2/components/selectors/disclaimer/view.cljs rename to src/quo/components/selectors/disclaimer/view.cljs index 7d65a0abf4..b2f03c3153 100644 --- a/src/quo2/components/selectors/disclaimer/view.cljs +++ b/src/quo/components/selectors/disclaimer/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.selectors.disclaimer.view +(ns quo.components.selectors.disclaimer.view (:require - [quo2.components.markdown.text :as text] - [quo2.components.selectors.disclaimer.style :as style] - [quo2.components.selectors.selectors.view :as selectors] + [quo.components.markdown.text :as text] + [quo.components.selectors.disclaimer.style :as style] + [quo.components.selectors.selectors.view :as selectors] [react-native.core :as rn])) (defn view diff --git a/src/quo2/components/selectors/filter/component_spec.cljs b/src/quo/components/selectors/filter/component_spec.cljs similarity index 84% rename from src/quo2/components/selectors/filter/component_spec.cljs rename to src/quo/components/selectors/filter/component_spec.cljs index 7898eef082..88babcdb46 100644 --- a/src/quo2/components/selectors/filter/component_spec.cljs +++ b/src/quo/components/selectors/filter/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.selectors.filter.component-spec +(ns quo.components.selectors.filter.component-spec (:require - [quo2.components.selectors.filter.view :as quo] + [quo.components.selectors.filter.view :as quo] [test-helpers.component :as h])) (h/describe "selector filter component" diff --git a/src/quo2/components/selectors/filter/style.cljs b/src/quo/components/selectors/filter/style.cljs similarity index 94% rename from src/quo2/components/selectors/filter/style.cljs rename to src/quo/components/selectors/filter/style.cljs index 41647b2a3f..94d7abb9c8 100644 --- a/src/quo2/components/selectors/filter/style.cljs +++ b/src/quo/components/selectors/filter/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.selectors.filter.style +(ns quo.components.selectors.filter.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container-default {:width 32 diff --git a/src/quo2/components/selectors/filter/view.cljs b/src/quo/components/selectors/filter/view.cljs similarity index 83% rename from src/quo2/components/selectors/filter/view.cljs rename to src/quo/components/selectors/filter/view.cljs index e0d4ad048b..a3c1374af5 100644 --- a/src/quo2/components/selectors/filter/view.cljs +++ b/src/quo/components/selectors/filter/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.selectors.filter.view +(ns quo.components.selectors.filter.view (:require - [quo2.components.icon :as icon] - [quo2.components.selectors.filter.style :as style] - [quo2.theme :as quo.theme] + [quo.components.icon :as icon] + [quo.components.selectors.filter.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/selectors/react/style.cljs b/src/quo/components/selectors/react/style.cljs similarity index 83% rename from src/quo2/components/selectors/react/style.cljs rename to src/quo/components/selectors/react/style.cljs index b500e48dba..11ce12c23b 100644 --- a/src/quo2/components/selectors/react/style.cljs +++ b/src/quo/components/selectors/react/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.selectors.react.style) +(ns quo.components.selectors.react.style) (def container {:flex-direction :row diff --git a/src/quo2/components/selectors/react/view.cljs b/src/quo/components/selectors/react/view.cljs similarity index 86% rename from src/quo2/components/selectors/react/view.cljs rename to src/quo/components/selectors/react/view.cljs index 028eca321b..3393383548 100644 --- a/src/quo2/components/selectors/react/view.cljs +++ b/src/quo/components/selectors/react/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.selectors.react.view +(ns quo.components.selectors.react.view (:require - [quo2.components.selectors.react-selector.view :as react-selector] - [quo2.components.selectors.react.style :as style] + [quo.components.selectors.react-selector.view :as react-selector] + [quo.components.selectors.react.style :as style] [react-native.core :as rn])) (defn view diff --git a/src/quo2/components/selectors/react_selector/style.cljs b/src/quo/components/selectors/react_selector/style.cljs similarity index 95% rename from src/quo2/components/selectors/react_selector/style.cljs rename to src/quo/components/selectors/react_selector/style.cljs index 7d16b9f452..56f3c9ea6e 100644 --- a/src/quo2/components/selectors/react_selector/style.cljs +++ b/src/quo/components/selectors/react_selector/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.selectors.react-selector.style +(ns quo.components.selectors.react-selector.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn add-reaction [pinned? theme] diff --git a/src/quo2/components/selectors/react_selector/view.cljs b/src/quo/components/selectors/react_selector/view.cljs similarity index 82% rename from src/quo2/components/selectors/react_selector/view.cljs rename to src/quo/components/selectors/react_selector/view.cljs index d88dc473dc..fcb8f9cfb9 100644 --- a/src/quo2/components/selectors/react_selector/view.cljs +++ b/src/quo/components/selectors/react_selector/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.selectors.react-selector.view +(ns quo.components.selectors.react-selector.view (:require - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.selectors.react-selector.style :as style] - [quo2.components.selectors.reaction-resource :as reaction.resource] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.selectors.react-selector.style :as style] + [quo.components.selectors.reaction-resource :as reaction.resource] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/selectors/reaction_resource.clj b/src/quo/components/selectors/reaction_resource.clj similarity index 94% rename from src/quo2/components/selectors/reaction_resource.clj rename to src/quo/components/selectors/reaction_resource.clj index 5fcabafd9f..e4356f6a73 100644 --- a/src/quo2/components/selectors/reaction_resource.clj +++ b/src/quo/components/selectors/reaction_resource.clj @@ -1,4 +1,4 @@ -(ns quo2.components.selectors.reaction-resource +(ns quo.components.selectors.reaction-resource (:require [clojure.java.io :as io] [clojure.string :as string])) diff --git a/src/quo2/components/selectors/reaction_resource.cljs b/src/quo/components/selectors/reaction_resource.cljs similarity index 66% rename from src/quo2/components/selectors/reaction_resource.cljs rename to src/quo/components/selectors/reaction_resource.cljs index 8f05bb90e1..b439e44771 100644 --- a/src/quo2/components/selectors/reaction_resource.cljs +++ b/src/quo/components/selectors/reaction_resource.cljs @@ -1,5 +1,5 @@ -(ns quo2.components.selectors.reaction-resource - (:require-macros [quo2.components.selectors.reaction-resource :refer [resolve-all-reactions]])) +(ns quo.components.selectors.reaction-resource + (:require-macros [quo.components.selectors.reaction-resource :refer [resolve-all-reactions]])) (def ^:private reactions (resolve-all-reactions)) diff --git a/src/quo2/components/selectors/reactions_selector/component_spec.cljs b/src/quo/components/selectors/reactions_selector/component_spec.cljs similarity index 87% rename from src/quo2/components/selectors/reactions_selector/component_spec.cljs rename to src/quo/components/selectors/reactions_selector/component_spec.cljs index b996552d01..59970ba71b 100644 --- a/src/quo2/components/selectors/reactions_selector/component_spec.cljs +++ b/src/quo/components/selectors/reactions_selector/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.selectors.reactions-selector.component-spec +(ns quo.components.selectors.reactions-selector.component-spec (:require - [quo2.components.selectors.reactions-selector.view :as view] + [quo.components.selectors.reactions-selector.view :as view] [test-helpers.component :as h])) (h/describe "Selectors > Reactions" diff --git a/src/quo2/components/selectors/reactions_selector/style.cljs b/src/quo/components/selectors/reactions_selector/style.cljs similarity index 76% rename from src/quo2/components/selectors/reactions_selector/style.cljs rename to src/quo/components/selectors/reactions_selector/style.cljs index c4784aa7e7..0afb785740 100644 --- a/src/quo2/components/selectors/reactions_selector/style.cljs +++ b/src/quo/components/selectors/reactions_selector/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.selectors.reactions-selector.style +(ns quo.components.selectors.reactions-selector.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [pressed?] diff --git a/src/quo2/components/selectors/reactions_selector/view.cljs b/src/quo/components/selectors/reactions_selector/view.cljs similarity index 80% rename from src/quo2/components/selectors/reactions_selector/view.cljs rename to src/quo/components/selectors/reactions_selector/view.cljs index 8b46f30a96..b711ccf0c7 100644 --- a/src/quo2/components/selectors/reactions_selector/view.cljs +++ b/src/quo/components/selectors/reactions_selector/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.selectors.reactions-selector.view +(ns quo.components.selectors.reactions-selector.view (:require - [quo2.components.selectors.reaction-resource :as reactions.resource] - [quo2.components.selectors.reactions-selector.style :as style] + [quo.components.selectors.reaction-resource :as reactions.resource] + [quo.components.selectors.reactions-selector.style :as style] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/selectors/selectors/component_spec.cljs b/src/quo/components/selectors/selectors/component_spec.cljs similarity index 94% rename from src/quo2/components/selectors/selectors/component_spec.cljs rename to src/quo/components/selectors/selectors/component_spec.cljs index 12c343b16d..241a9ddbdb 100644 --- a/src/quo2/components/selectors/selectors/component_spec.cljs +++ b/src/quo/components/selectors/selectors/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.selectors.selectors.component-spec +(ns quo.components.selectors.selectors.component-spec (:require - [quo2.components.selectors.selectors.view :as selectors] + [quo.components.selectors.selectors.view :as selectors] [reagent.core :as reagent] [test-helpers.component :as h])) diff --git a/src/quo2/components/selectors/selectors/style.cljs b/src/quo/components/selectors/selectors/style.cljs similarity index 98% rename from src/quo2/components/selectors/selectors/style.cljs rename to src/quo/components/selectors/selectors/style.cljs index e28d684198..a5efec4e6b 100644 --- a/src/quo2/components/selectors/selectors/style.cljs +++ b/src/quo/components/selectors/selectors/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.selectors.selectors.style +(ns quo.components.selectors.selectors.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn- toggle-background-color [customization-color theme] diff --git a/src/quo2/components/selectors/selectors/view.cljs b/src/quo/components/selectors/selectors/view.cljs similarity index 94% rename from src/quo2/components/selectors/selectors/view.cljs rename to src/quo/components/selectors/selectors/view.cljs index 06baf73ede..b9d09c7281 100644 --- a/src/quo2/components/selectors/selectors/view.cljs +++ b/src/quo/components/selectors/selectors/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.selectors.selectors.view +(ns quo.components.selectors.selectors.view (:require - [quo2.components.icon :as icons] - [quo2.components.selectors.selectors.style :as style] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.selectors.selectors.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/settings/accounts/style.cljs b/src/quo/components/settings/accounts/style.cljs similarity index 95% rename from src/quo2/components/settings/accounts/style.cljs rename to src/quo/components/settings/accounts/style.cljs index a57cc5fd3f..f19d16d09a 100644 --- a/src/quo2/components/settings/accounts/style.cljs +++ b/src/quo/components/settings/accounts/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.settings.accounts.style +(ns quo.components.settings.accounts.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def card {:position :relative diff --git a/src/quo2/components/settings/accounts/view.cljs b/src/quo/components/settings/accounts/view.cljs similarity index 82% rename from src/quo2/components/settings/accounts/view.cljs rename to src/quo/components/settings/accounts/view.cljs index 51028e576b..2638be7b90 100644 --- a/src/quo2/components/settings/accounts/view.cljs +++ b/src/quo/components/settings/accounts/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.settings.accounts.view +(ns quo.components.settings.accounts.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.buttons.button.view :as button] - [quo2.components.markdown.text :as text] - [quo2.components.settings.accounts.style :as style] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.buttons.button.view :as button] + [quo.components.markdown.text :as text] + [quo.components.settings.accounts.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn card-background diff --git a/src/quo2/components/settings/category/component_spec.cljs b/src/quo/components/settings/category/component_spec.cljs similarity index 94% rename from src/quo2/components/settings/category/component_spec.cljs rename to src/quo/components/settings/category/component_spec.cljs index f3536f8253..bba6d0416f 100644 --- a/src/quo2/components/settings/category/component_spec.cljs +++ b/src/quo/components/settings/category/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.settings.category.component-spec +(ns quo.components.settings.category.component-spec (:require - [quo2.components.settings.category.view :as category] + [quo.components.settings.category.view :as category] [test-helpers.component :as h])) (h/describe "Settings Category tests" diff --git a/src/quo2/components/settings/category/reorder/view.cljs b/src/quo/components/settings/category/reorder/view.cljs similarity index 77% rename from src/quo2/components/settings/category/reorder/view.cljs rename to src/quo/components/settings/category/reorder/view.cljs index d12ef870b8..2b2a3db7a9 100644 --- a/src/quo2/components/settings/category/reorder/view.cljs +++ b/src/quo/components/settings/category/reorder/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.settings.category.reorder.view +(ns quo.components.settings.category.reorder.view (:require - [quo2.components.markdown.text :as text] - [quo2.components.settings.category.style :as style] - [quo2.components.settings.reorder-item.types :as types] - [quo2.components.settings.reorder-item.view :as reorder-item] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.markdown.text :as text] + [quo.components.settings.category.style :as style] + [quo.components.settings.reorder-item.types :as types] + [quo.components.settings.reorder-item.view :as reorder-item] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.draggable-flatlist :as draggable-flatlist] [reagent.core :as reagent])) diff --git a/src/quo2/components/settings/category/settings/view.cljs b/src/quo/components/settings/category/settings/view.cljs similarity index 66% rename from src/quo2/components/settings/category/settings/view.cljs rename to src/quo/components/settings/category/settings/view.cljs index 2197717985..762ca7ed08 100644 --- a/src/quo2/components/settings/category/settings/view.cljs +++ b/src/quo/components/settings/category/settings/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.settings.category.settings.view +(ns quo.components.settings.category.settings.view (:require - [quo2.components.markdown.text :as text] - [quo2.components.settings.category.style :as style] - [quo2.components.settings.settings-item.view :as settings-item] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.markdown.text :as text] + [quo.components.settings.category.style :as style] + [quo.components.settings.settings-item.view :as settings-item] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- category-internal diff --git a/src/quo2/components/settings/category/style.cljs b/src/quo/components/settings/category/style.cljs similarity index 93% rename from src/quo2/components/settings/category/style.cljs rename to src/quo/components/settings/category/style.cljs index 6a69cd71b0..a6d16d6697 100644 --- a/src/quo2/components/settings/category/style.cljs +++ b/src/quo/components/settings/category/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.settings.category.style +(ns quo.components.settings.category.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container {:left 0 diff --git a/src/quo/components/settings/category/view.cljs b/src/quo/components/settings/category/view.cljs new file mode 100644 index 0000000000..6fd33ca3fd --- /dev/null +++ b/src/quo/components/settings/category/view.cljs @@ -0,0 +1,10 @@ +(ns quo.components.settings.category.view + (:require + [quo.components.settings.category.reorder.view :as reorder] + [quo.components.settings.category.settings.view :as settings])) + +(defn category + [{:keys [list-type] :as props}] + (if (= list-type :settings) + [settings/settings-category props] + [reorder/reorder-category props])) diff --git a/src/quo2/components/settings/data_item/component_spec.cljs b/src/quo/components/settings/data_item/component_spec.cljs similarity index 98% rename from src/quo2/components/settings/data_item/component_spec.cljs rename to src/quo/components/settings/data_item/component_spec.cljs index 6deb8b249b..98f6d89f36 100644 --- a/src/quo2/components/settings/data_item/component_spec.cljs +++ b/src/quo/components/settings/data_item/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.settings.data-item.component-spec +(ns quo.components.settings.data-item.component-spec (:require - [quo2.core :as quo] + [quo.core :as quo] [test-helpers.component :as h])) (h/describe diff --git a/src/quo2/components/settings/data_item/style.cljs b/src/quo/components/settings/data_item/style.cljs similarity index 95% rename from src/quo2/components/settings/data_item/style.cljs rename to src/quo/components/settings/data_item/style.cljs index 40816f327f..a78c2261cc 100644 --- a/src/quo2/components/settings/data_item/style.cljs +++ b/src/quo/components/settings/data_item/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.settings.data-item.style +(ns quo.components.settings.data-item.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [size card? blur? theme] diff --git a/src/quo2/components/settings/data_item/view.cljs b/src/quo/components/settings/data_item/view.cljs similarity index 89% rename from src/quo2/components/settings/data_item/view.cljs rename to src/quo/components/settings/data_item/view.cljs index 7e13bdcbed..b549d29ab9 100644 --- a/src/quo2/components/settings/data_item/view.cljs +++ b/src/quo/components/settings/data_item/view.cljs @@ -1,14 +1,14 @@ -(ns quo2.components.settings.data-item.view +(ns quo.components.settings.data-item.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.common.not-implemented.view :as not-implemented] - [quo2.components.icon :as icons] - [quo2.components.list-items.preview-list.view :as preview-list] - [quo2.components.markdown.text :as text] - [quo2.components.settings.data-item.style :as style] - [quo2.foundations.colors :as colors] - [quo2.foundations.resources :as quo.resources] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.common.not-implemented.view :as not-implemented] + [quo.components.icon :as icons] + [quo.components.list-items.preview-list.view :as preview-list] + [quo.components.markdown.text :as text] + [quo.components.settings.data-item.style :as style] + [quo.foundations.colors :as colors] + [quo.foundations.resources :as quo.resources] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/settings/privacy_option/style.cljs b/src/quo/components/settings/privacy_option/style.cljs similarity index 96% rename from src/quo2/components/settings/privacy_option/style.cljs rename to src/quo/components/settings/privacy_option/style.cljs index 79fdb4930c..21a1c9892a 100644 --- a/src/quo2/components/settings/privacy_option/style.cljs +++ b/src/quo/components/settings/privacy_option/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.settings.privacy-option.style +(ns quo.components.settings.privacy-option.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def bullet-container {:width 20 diff --git a/src/quo2/components/settings/privacy_option/view.cljs b/src/quo/components/settings/privacy_option/view.cljs similarity index 86% rename from src/quo2/components/settings/privacy_option/view.cljs rename to src/quo/components/settings/privacy_option/view.cljs index 5ff5328cb3..f09d90e9e3 100644 --- a/src/quo2/components/settings/privacy_option/view.cljs +++ b/src/quo/components/settings/privacy_option/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.settings.privacy-option.view +(ns quo.components.settings.privacy-option.view (:require - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.selectors.selectors.view :as selectors] - [quo2.components.settings.privacy-option.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.selectors.selectors.view :as selectors] + [quo.components.settings.privacy-option.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- bullet diff --git a/src/quo2/components/settings/reorder_item/component_spec.cljs b/src/quo/components/settings/reorder_item/component_spec.cljs similarity index 85% rename from src/quo2/components/settings/reorder_item/component_spec.cljs rename to src/quo/components/settings/reorder_item/component_spec.cljs index 0a113d7d52..be852aaf92 100644 --- a/src/quo2/components/settings/reorder_item/component_spec.cljs +++ b/src/quo/components/settings/reorder_item/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.settings.reorder-item.component-spec +(ns quo.components.settings.reorder-item.component-spec (:require - [quo2.components.settings.reorder-item.types :as types] - [quo2.core :as quo] + [quo.components.settings.reorder-item.types :as types] + [quo.core :as quo] [test-helpers.component :as h])) (h/describe diff --git a/src/quo2/components/settings/reorder_item/items/item.cljs b/src/quo/components/settings/reorder_item/items/item.cljs similarity index 83% rename from src/quo2/components/settings/reorder_item/items/item.cljs rename to src/quo/components/settings/reorder_item/items/item.cljs index 00f6ba4190..674b7dbb7c 100644 --- a/src/quo2/components/settings/reorder_item/items/item.cljs +++ b/src/quo/components/settings/reorder_item/items/item.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.settings.reorder-item.items.item +(ns quo.components.settings.reorder-item.items.item (:require - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.components.settings.reorder-item.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.components.settings.reorder-item.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.fast-image :as fast-image])) diff --git a/src/quo2/components/settings/reorder_item/items/item_placeholder.cljs b/src/quo/components/settings/reorder_item/items/item_placeholder.cljs similarity index 65% rename from src/quo2/components/settings/reorder_item/items/item_placeholder.cljs rename to src/quo/components/settings/reorder_item/items/item_placeholder.cljs index 690359e5cd..b2266381a6 100644 --- a/src/quo2/components/settings/reorder_item/items/item_placeholder.cljs +++ b/src/quo/components/settings/reorder_item/items/item_placeholder.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.settings.reorder-item.items.item-placeholder +(ns quo.components.settings.reorder-item.items.item-placeholder (:require - [quo2.components.markdown.text :as text] - [quo2.components.settings.reorder-item.style :as style] + [quo.components.markdown.text :as text] + [quo.components.settings.reorder-item.style :as style] [react-native.core :as rn])) (defn view diff --git a/src/quo/components/settings/reorder_item/items/item_skeleton.cljs b/src/quo/components/settings/reorder_item/items/item_skeleton.cljs new file mode 100644 index 0000000000..372495a4c7 --- /dev/null +++ b/src/quo/components/settings/reorder_item/items/item_skeleton.cljs @@ -0,0 +1,9 @@ +(ns quo.components.settings.reorder-item.items.item-skeleton + (:require + [quo.components.settings.reorder-item.style :as style] + [react-native.core :as rn])) + +(defn view + [] + [rn/view + {:style (style/skeleton-container)}]) diff --git a/src/quo2/components/settings/reorder_item/items/item_tabs.cljs b/src/quo/components/settings/reorder_item/items/item_tabs.cljs similarity index 75% rename from src/quo2/components/settings/reorder_item/items/item_tabs.cljs rename to src/quo/components/settings/reorder_item/items/item_tabs.cljs index 0794bff692..451a00e4fc 100644 --- a/src/quo2/components/settings/reorder_item/items/item_tabs.cljs +++ b/src/quo/components/settings/reorder_item/items/item_tabs.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.settings.reorder-item.items.item-tabs +(ns quo.components.settings.reorder-item.items.item-tabs (:require - [quo2.components.icon :as quo2-icons] - [quo2.components.markdown.text :as text] - [quo2.components.settings.reorder-item.style :as style] - [quo2.components.tabs.segmented-tab :as quo2] + [quo.components.icon :as quo-icons] + [quo.components.markdown.text :as text] + [quo.components.settings.reorder-item.style :as style] + [quo.components.tabs.segmented-tab :as quo] [react-native.core :as rn])) (defn render-tab-item @@ -13,7 +13,7 @@ {:source (:image item) :style style/tab-item-image}] (item :icon) [rn/view {:style style/tab-item-image} - (quo2-icons/icon (:icon item) (style/tab-icon))])] + (quo-icons/icon (:icon item) (style/tab-icon))])] [rn/view {:style style/tab-item-container} tab-image @@ -30,7 +30,7 @@ [{:keys [data default-active on-change] :or {default-active 1 on-change (constantly nil)}}] - [quo2/segmented-control + [quo/segmented-control {:default-active default-active :size 32 :blur? false diff --git a/src/quo2/components/settings/reorder_item/style.cljs b/src/quo/components/settings/reorder_item/style.cljs similarity index 97% rename from src/quo2/components/settings/reorder_item/style.cljs rename to src/quo/components/settings/reorder_item/style.cljs index 463ad51650..dbec6597e1 100644 --- a/src/quo2/components/settings/reorder_item/style.cljs +++ b/src/quo/components/settings/reorder_item/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.settings.reorder-item.style +(ns quo.components.settings.reorder-item.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn item-container [blur?] diff --git a/src/quo2/components/settings/reorder_item/types.cljs b/src/quo/components/settings/reorder_item/types.cljs similarity index 65% rename from src/quo2/components/settings/reorder_item/types.cljs rename to src/quo/components/settings/reorder_item/types.cljs index 4563557981..6ded05c34a 100644 --- a/src/quo2/components/settings/reorder_item/types.cljs +++ b/src/quo/components/settings/reorder_item/types.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.settings.reorder-item.types) +(ns quo.components.settings.reorder-item.types) (def ^:const item 0) (def ^:const placeholder 1) diff --git a/src/quo/components/settings/reorder_item/view.cljs b/src/quo/components/settings/reorder_item/view.cljs new file mode 100644 index 0000000000..be941bd428 --- /dev/null +++ b/src/quo/components/settings/reorder_item/view.cljs @@ -0,0 +1,16 @@ +(ns quo.components.settings.reorder-item.view + (:require + [quo.components.settings.reorder-item.items.item :as item] + [quo.components.settings.reorder-item.items.item-placeholder :as placeholder] + [quo.components.settings.reorder-item.items.item-skeleton :as skeleton] + [quo.components.settings.reorder-item.items.item-tabs :as tab] + [quo.components.settings.reorder-item.types :as types])) + +(defn reorder-item + [item type {:keys [blur? drag]}] + (condp = type + types/item [item/view item blur? drag] + types/placeholder [placeholder/view item] + types/skeleton [skeleton/view] + types/tab [tab/view item] + nil)) diff --git a/src/quo2/components/settings/section_label/view.cljs b/src/quo/components/settings/section_label/view.cljs similarity index 86% rename from src/quo2/components/settings/section_label/view.cljs rename to src/quo/components/settings/section_label/view.cljs index cdcec71b16..b4d69f9df2 100644 --- a/src/quo2/components/settings/section_label/view.cljs +++ b/src/quo/components/settings/section_label/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.settings.section-label.view +(ns quo.components.settings.section-label.view (:require - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme])) + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme])) (defn- get-text-color [theme blur?] diff --git a/src/quo2/components/settings/settings_item/component_spec.cljs b/src/quo/components/settings/settings_item/component_spec.cljs similarity index 94% rename from src/quo2/components/settings/settings_item/component_spec.cljs rename to src/quo/components/settings/settings_item/component_spec.cljs index e3a571d9d9..af30d88962 100644 --- a/src/quo2/components/settings/settings_item/component_spec.cljs +++ b/src/quo/components/settings/settings_item/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.settings.settings-item.component-spec +(ns quo.components.settings.settings-item.component-spec (:require - [quo2.components.settings.settings-item.view :as settings-item] + [quo.components.settings.settings-item.view :as settings-item] [test-helpers.component :as h])) (def props diff --git a/src/quo2/components/settings/settings_item/style.cljs b/src/quo/components/settings/settings_item/style.cljs similarity index 94% rename from src/quo2/components/settings/settings_item/style.cljs rename to src/quo/components/settings/settings_item/style.cljs index 01a1caa681..9452254af8 100644 --- a/src/quo2/components/settings/settings_item/style.cljs +++ b/src/quo/components/settings/settings_item/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.settings.settings-item.style +(ns quo.components.settings.settings-item.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [{:keys [container-style]}] diff --git a/src/quo2/components/settings/settings_item/view.cljs b/src/quo/components/settings/settings_item/view.cljs similarity index 84% rename from src/quo2/components/settings/settings_item/view.cljs rename to src/quo/components/settings/settings_item/view.cljs index 290ff5c485..c622991bec 100644 --- a/src/quo2/components/settings/settings_item/view.cljs +++ b/src/quo/components/settings/settings_item/view.cljs @@ -1,16 +1,16 @@ -(ns quo2.components.settings.settings-item.view +(ns quo.components.settings.settings-item.view (:require - [quo2.components.avatars.icon-avatar :as icon-avatar] - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.buttons.button.view :as button] - [quo2.components.icon :as icon] - [quo2.components.list-items.preview-list.view :as preview-list] - [quo2.components.markdown.text :as text] - [quo2.components.selectors.selectors.view :as selectors] - [quo2.components.settings.settings-item.style :as style] - [quo2.components.tags.context-tag.view :as context-tag] - [quo2.components.tags.status-tags :as status-tags] - [quo2.theme :as quo.theme] + [quo.components.avatars.icon-avatar :as icon-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.buttons.button.view :as button] + [quo.components.icon :as icon] + [quo.components.list-items.preview-list.view :as preview-list] + [quo.components.markdown.text :as text] + [quo.components.selectors.selectors.view :as selectors] + [quo.components.settings.settings-item.style :as style] + [quo.components.tags.context-tag.view :as context-tag] + [quo.components.tags.status-tags :as status-tags] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/share/qr_code/style.cljs b/src/quo/components/share/qr_code/style.cljs similarity index 91% rename from src/quo2/components/share/qr_code/style.cljs rename to src/quo/components/share/qr_code/style.cljs index 69d5e1f953..ab72ad46af 100644 --- a/src/quo2/components/share/qr_code/style.cljs +++ b/src/quo/components/share/qr_code/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.share.qr-code.style +(ns quo.components.share.qr-code.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [size] diff --git a/src/quo2/components/share/qr_code/view.cljs b/src/quo/components/share/qr_code/view.cljs similarity index 85% rename from src/quo2/components/share/qr_code/view.cljs rename to src/quo/components/share/qr_code/view.cljs index af03e5714c..44ca003ac1 100644 --- a/src/quo2/components/share/qr_code/view.cljs +++ b/src/quo/components/share/qr_code/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.share.qr-code.view +(ns quo.components.share.qr-code.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.avatars.channel-avatar.view :as channel-avatar] - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.avatars.wallet-user-avatar :as wallet-avatar] - [quo2.components.share.qr-code.style :as style] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.avatars.channel-avatar.view :as channel-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.avatars.wallet-user-avatar :as wallet-avatar] + [quo.components.share.qr-code.style :as style] [react-native.core :as rn] [react-native.fast-image :as fast-image])) diff --git a/src/quo2/components/share/share_qr_code/component_spec.cljs b/src/quo/components/share/share_qr_code/component_spec.cljs similarity index 89% rename from src/quo2/components/share/share_qr_code/component_spec.cljs rename to src/quo/components/share/share_qr_code/component_spec.cljs index f793689b67..308dcb4309 100644 --- a/src/quo2/components/share/share_qr_code/component_spec.cljs +++ b/src/quo/components/share/share_qr_code/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.share.share-qr-code.component-spec +(ns quo.components.share.share-qr-code.component-spec (:require - [quo2.components.share.share-qr-code.view :as share-qr-code] + [quo.components.share.share-qr-code.view :as share-qr-code] [test-helpers.component :as h])) (h/describe "Share QR Code component" diff --git a/src/quo2/components/share/share_qr_code/style.cljs b/src/quo/components/share/share_qr_code/style.cljs similarity index 91% rename from src/quo2/components/share/share_qr_code/style.cljs rename to src/quo/components/share/share_qr_code/style.cljs index faa1180ac2..b92d30c9dc 100644 --- a/src/quo2/components/share/share_qr_code/style.cljs +++ b/src/quo/components/share/share_qr_code/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.share.share-qr-code.style +(ns quo.components.share.share-qr-code.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def qr-code-container {:padding-top 12 diff --git a/src/quo2/components/share/share_qr_code/view.cljs b/src/quo/components/share/share_qr_code/view.cljs similarity index 82% rename from src/quo2/components/share/share_qr_code/view.cljs rename to src/quo/components/share/share_qr_code/view.cljs index 24cef0f768..d8681b9b7c 100644 --- a/src/quo2/components/share/share_qr_code/view.cljs +++ b/src/quo/components/share/share_qr_code/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.share.share-qr-code.view +(ns quo.components.share.share-qr-code.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.markdown.text :as text] - [quo2.components.share.qr-code.view :as qr-code] - [quo2.components.share.share-qr-code.style :as style] - [quo2.foundations.colors :as colors] + [quo.components.buttons.button.view :as button] + [quo.components.markdown.text :as text] + [quo.components.share.qr-code.view :as qr-code] + [quo.components.share.share-qr-code.style :as style] + [quo.foundations.colors :as colors] [react-native.blur :as blur] [react-native.core :as rn])) diff --git a/src/quo2/components/switchers/base_card/component_spec.cljs b/src/quo/components/switchers/base_card/component_spec.cljs similarity index 79% rename from src/quo2/components/switchers/base_card/component_spec.cljs rename to src/quo/components/switchers/base_card/component_spec.cljs index e91e32df02..64567d19e4 100644 --- a/src/quo2/components/switchers/base_card/component_spec.cljs +++ b/src/quo/components/switchers/base_card/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.switchers.base-card.component-spec +(ns quo.components.switchers.base-card.component-spec (:require - [quo2.components.switchers.base-card.view :as base-card] - [quo2.foundations.colors :as colors] + [quo.components.switchers.base-card.view :as base-card] + [quo.foundations.colors :as colors] [test-helpers.component :as h])) (h/describe "Switcher: Base card" diff --git a/src/quo2/components/switchers/base_card/style.cljs b/src/quo/components/switchers/base_card/style.cljs similarity index 84% rename from src/quo2/components/switchers/base_card/style.cljs rename to src/quo/components/switchers/base_card/style.cljs index 446ff52e7b..d179faf52e 100644 --- a/src/quo2/components/switchers/base_card/style.cljs +++ b/src/quo/components/switchers/base_card/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.switchers.base-card.style +(ns quo.components.switchers.base-card.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn base-container [customization-color] diff --git a/src/quo2/components/switchers/base_card/view.cljs b/src/quo/components/switchers/base_card/view.cljs similarity index 86% rename from src/quo2/components/switchers/base_card/view.cljs rename to src/quo/components/switchers/base_card/view.cljs index 6ead0100ba..504390f43a 100644 --- a/src/quo2/components/switchers/base_card/view.cljs +++ b/src/quo/components/switchers/base_card/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.switchers.base-card.view +(ns quo.components.switchers.base-card.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.switchers.base-card.style :as style] + [quo.components.buttons.button.view :as button] + [quo.components.switchers.base-card.style :as style] [react-native.core :as rn])) (defn base-card diff --git a/src/quo2/components/switchers/card_content/style.cljs b/src/quo/components/switchers/card_content/style.cljs similarity index 84% rename from src/quo2/components/switchers/card_content/style.cljs rename to src/quo/components/switchers/card_content/style.cljs index d1fb4bf39f..647fde3341 100644 --- a/src/quo2/components/switchers/card_content/style.cljs +++ b/src/quo/components/switchers/card_content/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.switchers.card-content.style +(ns quo.components.switchers.card-content.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn content-container [status] diff --git a/src/quo2/components/switchers/card_content/view.cljs b/src/quo/components/switchers/card_content/view.cljs similarity index 83% rename from src/quo2/components/switchers/card_content/view.cljs rename to src/quo/components/switchers/card_content/view.cljs index 2bacc7c429..67a9f35735 100644 --- a/src/quo2/components/switchers/card_content/view.cljs +++ b/src/quo/components/switchers/card_content/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.switchers.card-content.view +(ns quo.components.switchers.card-content.view (:require - [quo2.components.code.snippet-preview.view :as snippet-preview] - [quo2.components.common.notification-dot.view :as notification-dot] - [quo2.components.counter.counter.view :as counter] - [quo2.components.list-items.preview-list.view :as preview-list] - [quo2.components.markdown.text :as text] - [quo2.components.switchers.card-content.style :as style] - [quo2.components.tags.context-tag.view :as tag] + [quo.components.code.snippet-preview.view :as snippet-preview] + [quo.components.common.notification-dot.view :as notification-dot] + [quo.components.counter.counter.view :as counter] + [quo.components.list-items.preview-list.view :as preview-list] + [quo.components.markdown.text :as text] + [quo.components.switchers.card-content.style :as style] + [quo.components.tags.context-tag.view :as tag] [react-native.core :as rn] [react-native.fast-image :as fast-image] [utils.i18n :as i18n])) diff --git a/src/quo/components/switchers/card_main_info/style.cljs b/src/quo/components/switchers/card_main_info/style.cljs new file mode 100644 index 0000000000..2730cc6d6e --- /dev/null +++ b/src/quo/components/switchers/card_main_info/style.cljs @@ -0,0 +1,6 @@ +(ns quo.components.switchers.card-main-info.style + (:require + [quo.foundations.colors :as colors])) + +(def subtitle + {:color colors/neutral-40}) diff --git a/src/quo2/components/switchers/card_main_info/view.cljs b/src/quo/components/switchers/card_main_info/view.cljs similarity index 74% rename from src/quo2/components/switchers/card_main_info/view.cljs rename to src/quo/components/switchers/card_main_info/view.cljs index 1fbfe37408..595893d1dd 100644 --- a/src/quo2/components/switchers/card_main_info/view.cljs +++ b/src/quo/components/switchers/card_main_info/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.switchers.card-main-info.view +(ns quo.components.switchers.card-main-info.view (:require - [quo2.components.markdown.text :as text] - [quo2.components.switchers.card-main-info.style :as style] + [quo.components.markdown.text :as text] + [quo.components.switchers.card-main-info.style :as style] [react-native.core :as rn])) (defn view diff --git a/src/quo2/components/switchers/group_messaging_card/component_spec.cljs b/src/quo/components/switchers/group_messaging_card/component_spec.cljs similarity index 95% rename from src/quo2/components/switchers/group_messaging_card/component_spec.cljs rename to src/quo/components/switchers/group_messaging_card/component_spec.cljs index 30d0d46e46..64d6050abf 100644 --- a/src/quo2/components/switchers/group_messaging_card/component_spec.cljs +++ b/src/quo/components/switchers/group_messaging_card/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.switchers.group-messaging-card.component-spec +(ns quo.components.switchers.group-messaging-card.component-spec (:require - [quo2.components.switchers.group-messaging-card.view :as group-messaging-card] - [quo2.components.switchers.utils :as utils] + [quo.components.switchers.group-messaging-card.view :as group-messaging-card] + [quo.components.switchers.utils :as utils] [test-helpers.component :as h])) (def photos-list diff --git a/src/quo2/components/switchers/group_messaging_card/style.cljs b/src/quo/components/switchers/group_messaging_card/style.cljs similarity index 76% rename from src/quo2/components/switchers/group_messaging_card/style.cljs rename to src/quo/components/switchers/group_messaging_card/style.cljs index fec3c2b86d..9274b89e8d 100644 --- a/src/quo2/components/switchers/group_messaging_card/style.cljs +++ b/src/quo/components/switchers/group_messaging_card/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.switchers.group-messaging-card.style +(ns quo.components.switchers.group-messaging-card.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def avatar-container {:left 10 diff --git a/src/quo2/components/switchers/group_messaging_card/view.cljs b/src/quo/components/switchers/group_messaging_card/view.cljs similarity index 69% rename from src/quo2/components/switchers/group_messaging_card/view.cljs rename to src/quo/components/switchers/group_messaging_card/view.cljs index 291921febc..317130b676 100644 --- a/src/quo2/components/switchers/group_messaging_card/view.cljs +++ b/src/quo/components/switchers/group_messaging_card/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.switchers.group-messaging-card.view +(ns quo.components.switchers.group-messaging-card.view (:require - [quo2.components.avatars.group-avatar.view :as group-avatar] - [quo2.components.switchers.base-card.view :as base-card] - [quo2.components.switchers.card-content.view :as card-content] - [quo2.components.switchers.card-main-info.view :as card-main-info] - [quo2.components.switchers.group-messaging-card.style :as style] - [quo2.components.switchers.utils :as utils] + [quo.components.avatars.group-avatar.view :as group-avatar] + [quo.components.switchers.base-card.view :as base-card] + [quo.components.switchers.card-content.view :as card-content] + [quo.components.switchers.card-main-info.view :as card-main-info] + [quo.components.switchers.group-messaging-card.style :as style] + [quo.components.switchers.utils :as utils] [react-native.core :as rn])) (defn view diff --git a/src/quo2/components/switchers/utils.cljs b/src/quo/components/switchers/utils.cljs similarity index 93% rename from src/quo2/components/switchers/utils.cljs rename to src/quo/components/switchers/utils.cljs index 75e1e495af..f073a71753 100644 --- a/src/quo2/components/switchers/utils.cljs +++ b/src/quo/components/switchers/utils.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.switchers.utils +(ns quo.components.switchers.utils (:require [utils.i18n :as i18n])) diff --git a/src/quo2/components/tabs/account_selector.cljs b/src/quo/components/tabs/account_selector.cljs similarity index 90% rename from src/quo2/components/tabs/account_selector.cljs rename to src/quo/components/tabs/account_selector.cljs index 419252e6ae..e5f5ca2aa0 100644 --- a/src/quo2/components/tabs/account_selector.cljs +++ b/src/quo/components/tabs/account_selector.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.tabs.account-selector +(ns quo.components.tabs.account-selector (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.markdown.text :as quo2] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.markdown.text :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn])) (def themes @@ -52,7 +52,7 @@ label-text-color (get-color-by-type (if transparent? :transparent :default) :label-text)] [rn/view {:style style} (when show-label? - [quo2/text + [quo/text {:weight :medium :size :paragraph-2 :style {:color label-text-color @@ -61,7 +61,7 @@ [rn/view {:style (account-container-row background-color)} [rn/view {:style account-avatar-container} [account-avatar/view {:emoji account-emoji :size 32}]] - [quo2/text + [quo/text {:weight :medium :size :paragraph-1 :style {:color account-text-color}} diff --git a/src/quo2/components/tabs/segmented_tab.cljs b/src/quo/components/tabs/segmented_tab.cljs similarity index 92% rename from src/quo2/components/tabs/segmented_tab.cljs rename to src/quo/components/tabs/segmented_tab.cljs index a9cc7484dd..ec8563fac3 100644 --- a/src/quo2/components/tabs/segmented_tab.cljs +++ b/src/quo/components/tabs/segmented_tab.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.tabs.segmented-tab +(ns quo.components.tabs.segmented-tab (:require - [quo2.components.tabs.tab.view :as tab] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.tabs.tab.view :as tab] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/tabs/tab/style.cljs b/src/quo/components/tabs/tab/style.cljs similarity index 98% rename from src/quo2/components/tabs/tab/style.cljs rename to src/quo/components/tabs/tab/style.cljs index 52717a013d..b735648bff 100644 --- a/src/quo2/components/tabs/tab/style.cljs +++ b/src/quo/components/tabs/tab/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.tabs.tab.style +(ns quo.components.tabs.tab.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def tab-background-opacity 0.3) diff --git a/src/quo2/components/tabs/tab/view.cljs b/src/quo/components/tabs/tab/view.cljs similarity index 93% rename from src/quo2/components/tabs/tab/view.cljs rename to src/quo/components/tabs/tab/view.cljs index 384ced02a7..dbd9185a59 100644 --- a/src/quo2/components/tabs/tab/view.cljs +++ b/src/quo/components/tabs/tab/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.tabs.tab.view +(ns quo.components.tabs.tab.view (:require - [quo2.components.common.notification-dot.view :as notification-dot] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.tabs.tab.style :as style] - [quo2.theme :as quo.theme] + [quo.components.common.notification-dot.view :as notification-dot] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.tabs.tab.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.svg :as svg])) diff --git a/src/quo2/components/tabs/tabs/style.cljs b/src/quo/components/tabs/tabs/style.cljs similarity index 89% rename from src/quo2/components/tabs/tabs/style.cljs rename to src/quo/components/tabs/tabs/style.cljs index fab5616919..3cb767c2c8 100644 --- a/src/quo2/components/tabs/tabs/style.cljs +++ b/src/quo/components/tabs/tabs/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.tabs.tabs.style +(ns quo.components.tabs.tabs.style (:require [utils.number])) diff --git a/src/quo2/components/tabs/tabs/view.cljs b/src/quo/components/tabs/tabs/view.cljs similarity index 97% rename from src/quo2/components/tabs/tabs/view.cljs rename to src/quo/components/tabs/tabs/view.cljs index 75003193c6..aeebe9b381 100644 --- a/src/quo2/components/tabs/tabs/view.cljs +++ b/src/quo/components/tabs/tabs/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.tabs.tabs.view +(ns quo.components.tabs.tabs.view (:require [oops.core :refer [oget]] - [quo2.components.tabs.tab.view :as tab] - [quo2.components.tabs.tabs.style :as style] + [quo.components.tabs.tab.view :as tab] + [quo.components.tabs.tabs.style :as style] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.linear-gradient :as linear-gradient] @@ -101,7 +101,7 @@ (defn view " Common options (for scrollable and non-scrollable tabs): - - `blur?` Boolean passed down to `quo2.components.tabs.tab/tab`. + - `blur?` Boolean passed down to `quo.components.tabs.tab/tab`. - `data` Vector of tab items. - `on-change` Callback called after a tab is selected. - `size` 32/24 diff --git a/src/quo2/components/tags/base_tag.cljs b/src/quo/components/tags/base_tag.cljs similarity index 97% rename from src/quo2/components/tags/base_tag.cljs rename to src/quo/components/tags/base_tag.cljs index 0c57d87692..70a0e9ac4c 100644 --- a/src/quo2/components/tags/base_tag.cljs +++ b/src/quo/components/tags/base_tag.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.tags.base-tag +(ns quo.components.tags.base-tag (:require [react-native.core :as rn])) diff --git a/src/quo2/components/tags/context_tag/style.cljs b/src/quo/components/tags/context_tag/style.cljs similarity index 97% rename from src/quo2/components/tags/context_tag/style.cljs rename to src/quo/components/tags/context_tag/style.cljs index 7cf651cfb0..9abc907937 100644 --- a/src/quo2/components/tags/context_tag/style.cljs +++ b/src/quo/components/tags/context_tag/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.tags.context-tag.style +(ns quo.components.tags.context-tag.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn context-tag-icon-color [theme blur?] diff --git a/src/quo2/components/tags/context_tag/view.cljs b/src/quo/components/tags/context_tag/view.cljs similarity index 92% rename from src/quo2/components/tags/context_tag/view.cljs rename to src/quo/components/tags/context_tag/view.cljs index 8775356966..568b67560d 100644 --- a/src/quo2/components/tags/context_tag/view.cljs +++ b/src/quo/components/tags/context_tag/view.cljs @@ -1,14 +1,14 @@ -(ns quo2.components.tags.context-tag.view +(ns quo.components.tags.context-tag.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.avatars.group-avatar.view :as group-avatar] - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.icon :as icons] - [quo2.components.list-items.preview-list.view :as preview-list] - [quo2.components.markdown.text :as text] - [quo2.components.tags.context-tag.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.avatars.group-avatar.view :as group-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.icon :as icons] + [quo.components.list-items.preview-list.view :as preview-list] + [quo.components.markdown.text :as text] + [quo.components.tags.context-tag.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- tag-skeleton diff --git a/src/quo2/components/tags/network_tags/component_spec.cljs b/src/quo/components/tags/network_tags/component_spec.cljs similarity index 86% rename from src/quo2/components/tags/network_tags/component_spec.cljs rename to src/quo/components/tags/network_tags/component_spec.cljs index 7b06cb916e..7c1aa2ee47 100644 --- a/src/quo2/components/tags/network_tags/component_spec.cljs +++ b/src/quo/components/tags/network_tags/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.tags.network-tags.component-spec +(ns quo.components.tags.network-tags.component-spec (:require - [quo2.components.tags.network-tags.view :as network-tags] + [quo.components.tags.network-tags.view :as network-tags] [test-helpers.component :as h])) (h/describe "network-tags component" diff --git a/src/quo2/components/tags/network_tags/style.cljs b/src/quo/components/tags/network_tags/style.cljs similarity index 94% rename from src/quo2/components/tags/network_tags/style.cljs rename to src/quo/components/tags/network_tags/style.cljs index cd3350cdf6..09acc1f682 100644 --- a/src/quo2/components/tags/network_tags/style.cljs +++ b/src/quo/components/tags/network_tags/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.tags.network-tags.style +(ns quo.components.tags.network-tags.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [{:keys [status theme blur?]}] diff --git a/src/quo2/components/tags/network_tags/view.cljs b/src/quo/components/tags/network_tags/view.cljs similarity index 71% rename from src/quo2/components/tags/network_tags/view.cljs rename to src/quo/components/tags/network_tags/view.cljs index 8136d5087f..f30093bde0 100644 --- a/src/quo2/components/tags/network_tags/view.cljs +++ b/src/quo/components/tags/network_tags/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.tags.network-tags.view +(ns quo.components.tags.network-tags.view (:require - [quo2.components.list-items.preview-list.view :as preview-list] - [quo2.components.markdown.text :as text] - [quo2.components.tags.network-tags.style :as style] - [quo2.theme :as quo.theme] + [quo.components.list-items.preview-list.view :as preview-list] + [quo.components.markdown.text :as text] + [quo.components.tags.network-tags.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/tags/number_tag/component_spec.cljs b/src/quo/components/tags/number_tag/component_spec.cljs similarity index 83% rename from src/quo2/components/tags/number_tag/component_spec.cljs rename to src/quo/components/tags/number_tag/component_spec.cljs index 2bca966711..f13589b707 100644 --- a/src/quo2/components/tags/number_tag/component_spec.cljs +++ b/src/quo/components/tags/number_tag/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.tags.number-tag.component-spec +(ns quo.components.tags.number-tag.component-spec (:require - [quo2.components.tags.number-tag.view :as number-tag] + [quo.components.tags.number-tag.view :as number-tag] [test-helpers.component :as h])) (h/describe diff --git a/src/quo2/components/tags/number_tag/style.cljs b/src/quo/components/tags/number_tag/style.cljs similarity index 96% rename from src/quo2/components/tags/number_tag/style.cljs rename to src/quo/components/tags/number_tag/style.cljs index 73de061869..9c1fc83e84 100644 --- a/src/quo2/components/tags/number_tag/style.cljs +++ b/src/quo/components/tags/number_tag/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.tags.number-tag.style +(ns quo.components.tags.number-tag.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def sizes {:size-32 {:size 32 diff --git a/src/quo2/components/tags/number_tag/view.cljs b/src/quo/components/tags/number_tag/view.cljs similarity index 77% rename from src/quo2/components/tags/number_tag/view.cljs rename to src/quo/components/tags/number_tag/view.cljs index 4b4707cb1a..dc82d416ae 100644 --- a/src/quo2/components/tags/number_tag/view.cljs +++ b/src/quo/components/tags/number_tag/view.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.tags.number-tag.view +(ns quo.components.tags.number-tag.view (:require - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.tags.number-tag.style :as style] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.tags.number-tag.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn view-internal diff --git a/src/quo2/components/tags/permission_tag.cljs b/src/quo/components/tags/permission_tag.cljs similarity index 96% rename from src/quo2/components/tags/permission_tag.cljs rename to src/quo/components/tags/permission_tag.cljs index 5f90c9d162..12a00f79a8 100644 --- a/src/quo2/components/tags/permission_tag.cljs +++ b/src/quo/components/tags/permission_tag.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.tags.permission-tag +(ns quo.components.tags.permission-tag (:require - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.tags.base-tag :as base-tag] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.tags.base-tag :as base-tag] + [quo.foundations.colors :as colors] [react-native.core :as rn])) (defn outer-resource-container diff --git a/src/quo2/components/tags/status_tags.cljs b/src/quo/components/tags/status_tags.cljs similarity index 95% rename from src/quo2/components/tags/status_tags.cljs rename to src/quo/components/tags/status_tags.cljs index 2271030fe0..b438fdec58 100644 --- a/src/quo2/components/tags/status_tags.cljs +++ b/src/quo/components/tags/status_tags.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.tags.status-tags +(ns quo.components.tags.status-tags (:require - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn])) (def default-container-style diff --git a/src/quo2/components/tags/status_tags_component_spec.cljs b/src/quo/components/tags/status_tags_component_spec.cljs similarity index 89% rename from src/quo2/components/tags/status_tags_component_spec.cljs rename to src/quo/components/tags/status_tags_component_spec.cljs index 1f9fd31dc2..ed2455c86f 100644 --- a/src/quo2/components/tags/status_tags_component_spec.cljs +++ b/src/quo/components/tags/status_tags_component_spec.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.tags.status-tags-component-spec +(ns quo.components.tags.status-tags-component-spec (:require - [quo2.components.tags.status-tags :as quo2] + [quo.components.tags.status-tags :as quo] [test-helpers.component :as h])) (defn render-status-tag [opts] - (h/render [quo2/status-tag opts])) + (h/render [quo/status-tag opts])) (h/describe "status tag component" (h/test "renders status tag with positive type" diff --git a/src/quo2/components/tags/tag.cljs b/src/quo/components/tags/tag.cljs similarity index 94% rename from src/quo2/components/tags/tag.cljs rename to src/quo/components/tags/tag.cljs index d48400f62c..9ecf5559d1 100644 --- a/src/quo2/components/tags/tag.cljs +++ b/src/quo/components/tags/tag.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.tags.tag +(ns quo.components.tags.tag (:require - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.tags.base-tag :as base-tag] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.tags.base-tag :as base-tag] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn])) (def themes diff --git a/src/quo2/components/tags/tags.cljs b/src/quo/components/tags/tags.cljs similarity index 99% rename from src/quo2/components/tags/tags.cljs rename to src/quo/components/tags/tags.cljs index 95972cb727..6fb37f47ae 100644 --- a/src/quo2/components/tags/tags.cljs +++ b/src/quo/components/tags/tags.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.tags.tags +(ns quo.components.tags.tags (:require [oops.core :refer [oget]] - [quo2.components.tags.tag :as tag] + [quo.components.tags.tag :as tag] [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient] [react-native.masked-view :as masked-view] diff --git a/src/quo2/components/tags/tiny_tag/component_spec.cljs b/src/quo/components/tags/tiny_tag/component_spec.cljs similarity index 81% rename from src/quo2/components/tags/tiny_tag/component_spec.cljs rename to src/quo/components/tags/tiny_tag/component_spec.cljs index a8560bb9f8..0fe5021a63 100644 --- a/src/quo2/components/tags/tiny_tag/component_spec.cljs +++ b/src/quo/components/tags/tiny_tag/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.tags.tiny-tag.component-spec +(ns quo.components.tags.tiny-tag.component-spec (:require - [quo2.components.tags.tiny-tag.view :as tiny-tag] + [quo.components.tags.tiny-tag.view :as tiny-tag] [test-helpers.component :as h])) (h/describe "Tiny tag component test" diff --git a/src/quo2/components/tags/tiny_tag/style.cljs b/src/quo/components/tags/tiny_tag/style.cljs similarity index 90% rename from src/quo2/components/tags/tiny_tag/style.cljs rename to src/quo/components/tags/tiny_tag/style.cljs index 1a304d6d75..ba25310546 100644 --- a/src/quo2/components/tags/tiny_tag/style.cljs +++ b/src/quo/components/tags/tiny_tag/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.tags.tiny-tag.style +(ns quo.components.tags.tiny-tag.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn get-border-color [blur? theme] diff --git a/src/quo2/components/tags/tiny_tag/view.cljs b/src/quo/components/tags/tiny_tag/view.cljs similarity index 67% rename from src/quo2/components/tags/tiny_tag/view.cljs rename to src/quo/components/tags/tiny_tag/view.cljs index a174d27ad8..5de5cdd90e 100644 --- a/src/quo2/components/tags/tiny_tag/view.cljs +++ b/src/quo/components/tags/tiny_tag/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.tags.tiny-tag.view +(ns quo.components.tags.tiny-tag.view (:require - [quo2.components.markdown.text :as text] - [quo2.components.tags.tiny-tag.style :as style] - [quo2.theme :as quo.theme] + [quo.components.markdown.text :as text] + [quo.components.tags.tiny-tag.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/tags/token_tag.cljs b/src/quo/components/tags/token_tag.cljs similarity index 94% rename from src/quo2/components/tags/token_tag.cljs rename to src/quo/components/tags/token_tag.cljs index 25f829bdd8..3c9e183553 100644 --- a/src/quo2/components/tags/token_tag.cljs +++ b/src/quo/components/tags/token_tag.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.tags.token-tag +(ns quo.components.tags.token-tag (:require - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn])) (def themes diff --git a/src/quo2/components/text_combinations/style.cljs b/src/quo/components/text_combinations/style.cljs similarity index 79% rename from src/quo2/components/text_combinations/style.cljs rename to src/quo/components/text_combinations/style.cljs index 63f618a074..dc06fb28f4 100644 --- a/src/quo2/components/text_combinations/style.cljs +++ b/src/quo/components/text_combinations/style.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.text-combinations.style) +(ns quo.components.text-combinations.style) (def title-container {:flex-direction :row diff --git a/src/quo2/components/text_combinations/view.cljs b/src/quo/components/text_combinations/view.cljs similarity index 87% rename from src/quo2/components/text_combinations/view.cljs rename to src/quo/components/text_combinations/view.cljs index fc7d7bbcbc..6c17cf40ea 100644 --- a/src/quo2/components/text_combinations/view.cljs +++ b/src/quo/components/text_combinations/view.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.text-combinations.view +(ns quo.components.text-combinations.view (:require - [quo2.components.markdown.text :as text] - [quo2.components.text-combinations.style :as style] - [quo2.theme :as theme] + [quo.components.markdown.text :as text] + [quo.components.text-combinations.style :as style] + [quo.theme :as theme] [react-native.core :as rn])) (defn icon diff --git a/src/quo2/components/wallet/account_card/component_spec.cljs b/src/quo/components/wallet/account_card/component_spec.cljs similarity index 94% rename from src/quo2/components/wallet/account_card/component_spec.cljs rename to src/quo/components/wallet/account_card/component_spec.cljs index 58c0b0e3be..9894f05086 100644 --- a/src/quo2/components/wallet/account_card/component_spec.cljs +++ b/src/quo/components/wallet/account_card/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.account-card.component-spec +(ns quo.components.wallet.account-card.component-spec (:require - [quo2.components.wallet.account-card.view :as account-card] + [quo.components.wallet.account-card.view :as account-card] [test-helpers.component :as h])) (def username "Alisher account") diff --git a/src/quo2/components/wallet/account_card/style.cljs b/src/quo/components/wallet/account_card/style.cljs similarity index 97% rename from src/quo2/components/wallet/account_card/style.cljs rename to src/quo/components/wallet/account_card/style.cljs index 90c0d6ac6e..bfe62b5c62 100644 --- a/src/quo2/components/wallet/account_card/style.cljs +++ b/src/quo/components/wallet/account_card/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.account-card.style +(ns quo.components.wallet.account-card.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn text-color [watch-only? theme] diff --git a/src/quo2/components/wallet/account_card/view.cljs b/src/quo/components/wallet/account_card/view.cljs similarity index 94% rename from src/quo2/components/wallet/account_card/view.cljs rename to src/quo/components/wallet/account_card/view.cljs index 6797e28e59..620a69bb5b 100644 --- a/src/quo2/components/wallet/account_card/view.cljs +++ b/src/quo/components/wallet/account_card/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.wallet.account-card.view +(ns quo.components.wallet.account-card.view (:require - [quo2.components.buttons.button.view :as button] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.components.wallet.account-card.style :as style] - [quo2.foundations.colors :as colors] - [quo2.foundations.customization-colors :as customization-colors] - [quo2.theme :as quo.theme] + [quo.components.buttons.button.view :as button] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.components.wallet.account-card.style :as style] + [quo.foundations.colors :as colors] + [quo.foundations.customization-colors :as customization-colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/wallet/account_origin/component_spec.cljs b/src/quo/components/wallet/account_origin/component_spec.cljs similarity index 98% rename from src/quo2/components/wallet/account_origin/component_spec.cljs rename to src/quo/components/wallet/account_origin/component_spec.cljs index a160a5258b..24918fb63e 100644 --- a/src/quo2/components/wallet/account_origin/component_spec.cljs +++ b/src/quo/components/wallet/account_origin/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.account-origin.component-spec +(ns quo.components.wallet.account-origin.component-spec (:require - [quo2.core :as quo] + [quo.core :as quo] [test-helpers.component :as h])) (h/describe "account origin tests" diff --git a/src/quo2/components/wallet/account_origin/style.cljs b/src/quo/components/wallet/account_origin/style.cljs similarity index 92% rename from src/quo2/components/wallet/account_origin/style.cljs rename to src/quo/components/wallet/account_origin/style.cljs index d9134c73db..28cda4ce94 100644 --- a/src/quo2/components/wallet/account_origin/style.cljs +++ b/src/quo/components/wallet/account_origin/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.account-origin.style +(ns quo.components.wallet.account-origin.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [theme] diff --git a/src/quo2/components/wallet/account_origin/view.cljs b/src/quo/components/wallet/account_origin/view.cljs similarity index 92% rename from src/quo2/components/wallet/account_origin/view.cljs rename to src/quo/components/wallet/account_origin/view.cljs index 3c92fff3e5..7ffda8f49c 100644 --- a/src/quo2/components/wallet/account_origin/view.cljs +++ b/src/quo/components/wallet/account_origin/view.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.wallet.account-origin.view +(ns quo.components.wallet.account-origin.view (:require - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.wallet.account-origin.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.wallet.account-origin.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/wallet/account_overview/component_spec.cljs b/src/quo/components/wallet/account_overview/component_spec.cljs similarity index 94% rename from src/quo2/components/wallet/account_overview/component_spec.cljs rename to src/quo/components/wallet/account_overview/component_spec.cljs index 6af94800c5..dcb36aa242 100644 --- a/src/quo2/components/wallet/account_overview/component_spec.cljs +++ b/src/quo/components/wallet/account_overview/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.account-overview.component-spec +(ns quo.components.wallet.account-overview.component-spec (:require - [quo2.components.wallet.account-overview.view :as account-overview] + [quo.components.wallet.account-overview.view :as account-overview] [test-helpers.component :as h])) (h/describe "Account overview test" diff --git a/src/quo2/components/wallet/account_overview/style.cljs b/src/quo/components/wallet/account_overview/style.cljs similarity index 96% rename from src/quo2/components/wallet/account_overview/style.cljs rename to src/quo/components/wallet/account_overview/style.cljs index 52fcefabe0..3ce692085d 100644 --- a/src/quo2/components/wallet/account_overview/style.cljs +++ b/src/quo/components/wallet/account_overview/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.account-overview.style +(ns quo.components.wallet.account-overview.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def account-overview-wrapper {:padding-top 24 diff --git a/src/quo2/components/wallet/account_overview/view.cljs b/src/quo/components/wallet/account_overview/view.cljs similarity index 95% rename from src/quo2/components/wallet/account_overview/view.cljs rename to src/quo/components/wallet/account_overview/view.cljs index 1b94d3a4bf..671ae59b43 100644 --- a/src/quo2/components/wallet/account_overview/view.cljs +++ b/src/quo/components/wallet/account_overview/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.wallet.account-overview.view +(ns quo.components.wallet.account-overview.view (:require - [quo2.components.icon :as icons] - [quo2.components.markdown.text :as text] - [quo2.components.wallet.account-overview.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.icon :as icons] + [quo.components.markdown.text :as text] + [quo.components.wallet.account-overview.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/wallet/keypair/component_spec.cljs b/src/quo/components/wallet/keypair/component_spec.cljs similarity index 95% rename from src/quo2/components/wallet/keypair/component_spec.cljs rename to src/quo/components/wallet/keypair/component_spec.cljs index cf032a75eb..5e0b9c4878 100644 --- a/src/quo2/components/wallet/keypair/component_spec.cljs +++ b/src/quo/components/wallet/keypair/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.keypair.component-spec +(ns quo.components.wallet.keypair.component-spec (:require - [quo2.components.wallet.keypair.view :as keypair] + [quo.components.wallet.keypair.view :as keypair] [test-helpers.component :as h])) (def accounts diff --git a/src/quo2/components/wallet/keypair/style.cljs b/src/quo/components/wallet/keypair/style.cljs similarity index 91% rename from src/quo2/components/wallet/keypair/style.cljs rename to src/quo/components/wallet/keypair/style.cljs index d60dd9ec3e..eca4b33409 100644 --- a/src/quo2/components/wallet/keypair/style.cljs +++ b/src/quo/components/wallet/keypair/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.keypair.style +(ns quo.components.wallet.keypair.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [{:keys [blur? customization-color theme selected?]}] diff --git a/src/quo2/components/wallet/keypair/view.cljs b/src/quo/components/wallet/keypair/view.cljs similarity index 86% rename from src/quo2/components/wallet/keypair/view.cljs rename to src/quo/components/wallet/keypair/view.cljs index f6c3b3a090..b4f2a325d4 100644 --- a/src/quo2/components/wallet/keypair/view.cljs +++ b/src/quo/components/wallet/keypair/view.cljs @@ -1,15 +1,15 @@ -(ns quo2.components.wallet.keypair.view +(ns quo.components.wallet.keypair.view (:require [clojure.string :as string] - [quo2.components.avatars.icon-avatar :as icon-avatar] - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.icon :as icon] - [quo2.components.list-items.account-list-card.view :as account-list-card] - [quo2.components.markdown.text :as text] - [quo2.components.selectors.selectors.view :as selectors] - [quo2.components.wallet.keypair.style :as style] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.components.avatars.icon-avatar :as icon-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.icon :as icon] + [quo.components.list-items.account-list-card.view :as account-list-card] + [quo.components.markdown.text :as text] + [quo.components.selectors.selectors.view :as selectors] + [quo.components.wallet.keypair.style :as style] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] [utils.i18n :as i18n])) diff --git a/src/quo2/components/wallet/network_amount/component_spec.cljs b/src/quo/components/wallet/network_amount/component_spec.cljs similarity index 67% rename from src/quo2/components/wallet/network_amount/component_spec.cljs rename to src/quo/components/wallet/network_amount/component_spec.cljs index f7f2b51d90..29ec800ef8 100644 --- a/src/quo2/components/wallet/network_amount/component_spec.cljs +++ b/src/quo/components/wallet/network_amount/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.network-amount.component-spec +(ns quo.components.wallet.network-amount.component-spec (:require - [quo2.components.wallet.network-amount.view :as network-amount] + [quo.components.wallet.network-amount.view :as network-amount] [test-helpers.component :as h])) (h/describe "Wallet: Network Amount" diff --git a/src/quo2/components/wallet/network_amount/style.cljs b/src/quo/components/wallet/network_amount/style.cljs similarity index 77% rename from src/quo2/components/wallet/network_amount/style.cljs rename to src/quo/components/wallet/network_amount/style.cljs index 50f099a2d6..f8bd84f73a 100644 --- a/src/quo2/components/wallet/network_amount/style.cljs +++ b/src/quo/components/wallet/network_amount/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.network-amount.style +(ns quo.components.wallet.network-amount.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container {:flex-direction :row diff --git a/src/quo2/components/wallet/network_amount/view.cljs b/src/quo/components/wallet/network_amount/view.cljs similarity index 68% rename from src/quo2/components/wallet/network_amount/view.cljs rename to src/quo/components/wallet/network_amount/view.cljs index 6df5a09760..3d5086926a 100644 --- a/src/quo2/components/wallet/network_amount/view.cljs +++ b/src/quo/components/wallet/network_amount/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.wallet.network-amount.view +(ns quo.components.wallet.network-amount.view (:require [clojure.string :as string] - [quo2.components.markdown.text :as text] - [quo2.components.wallet.network-amount.style :as style] - [quo2.foundations.resources :as resources] - [quo2.theme :as quo.theme] + [quo.components.markdown.text :as text] + [quo.components.wallet.network-amount.style :as style] + [quo.foundations.resources :as resources] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/wallet/network_bridge/component_spec.cljs b/src/quo/components/wallet/network_bridge/component_spec.cljs similarity index 90% rename from src/quo2/components/wallet/network_bridge/component_spec.cljs rename to src/quo/components/wallet/network_bridge/component_spec.cljs index ce7af9102f..723bd5101f 100644 --- a/src/quo2/components/wallet/network_bridge/component_spec.cljs +++ b/src/quo/components/wallet/network_bridge/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.network-bridge.component-spec +(ns quo.components.wallet.network-bridge.component-spec (:require - [quo2.components.wallet.network-bridge.view :as network-bridge] + [quo.components.wallet.network-bridge.view :as network-bridge] [test-helpers.component :as h])) (h/describe "Wallet: Network Bridge" diff --git a/src/quo2/components/wallet/network_bridge/style.cljs b/src/quo/components/wallet/network_bridge/style.cljs similarity index 90% rename from src/quo2/components/wallet/network_bridge/style.cljs rename to src/quo/components/wallet/network_bridge/style.cljs index a589f281c2..477a2c4e9e 100644 --- a/src/quo2/components/wallet/network_bridge/style.cljs +++ b/src/quo/components/wallet/network_bridge/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.network-bridge.style +(ns quo.components.wallet.network-bridge.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [network state theme] diff --git a/src/quo2/components/wallet/network_bridge/view.cljs b/src/quo/components/wallet/network_bridge/view.cljs similarity index 85% rename from src/quo2/components/wallet/network_bridge/view.cljs rename to src/quo/components/wallet/network_bridge/view.cljs index 0e5551fac9..e2ad37ca82 100644 --- a/src/quo2/components/wallet/network_bridge/view.cljs +++ b/src/quo/components/wallet/network_bridge/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.wallet.network-bridge.view +(ns quo.components.wallet.network-bridge.view (:require [clojure.string :as string] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.components.wallet.network-bridge.style :as style] - [quo2.foundations.colors :as colors] - [quo2.foundations.resources :as resources] - [quo2.theme :as quo.theme] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.components.wallet.network-bridge.style :as style] + [quo.foundations.colors :as colors] + [quo.foundations.resources :as resources] + [quo.theme :as quo.theme] [react-native.core :as rn])) diff --git a/src/quo2/components/wallet/network_link/view.cljs b/src/quo/components/wallet/network_link/view.cljs similarity index 96% rename from src/quo2/components/wallet/network_link/view.cljs rename to src/quo/components/wallet/network_link/view.cljs index a082d806e5..2b86328be3 100644 --- a/src/quo2/components/wallet/network_link/view.cljs +++ b/src/quo/components/wallet/network_link/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.wallet.network-link.view +(ns quo.components.wallet.network-link.view (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.svg :as svg])) (defn link-linear diff --git a/src/quo2/components/wallet/progress_bar/component_spec.cljs b/src/quo/components/wallet/progress_bar/component_spec.cljs similarity index 96% rename from src/quo2/components/wallet/progress_bar/component_spec.cljs rename to src/quo/components/wallet/progress_bar/component_spec.cljs index d34c642bcc..39d48caf6a 100644 --- a/src/quo2/components/wallet/progress_bar/component_spec.cljs +++ b/src/quo/components/wallet/progress_bar/component_spec.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.wallet.progress-bar.component-spec +(ns quo.components.wallet.progress-bar.component-spec (:require - [quo2.components.wallet.progress-bar.view :as progress-bar] - [quo2.foundations.colors :as colors] + [quo.components.wallet.progress-bar.view :as progress-bar] + [quo.foundations.colors :as colors] [test-helpers.component :as h])) (h/describe "Progress bar" diff --git a/src/quo2/components/wallet/progress_bar/style.cljs b/src/quo/components/wallet/progress_bar/style.cljs similarity index 94% rename from src/quo2/components/wallet/progress_bar/style.cljs rename to src/quo/components/wallet/progress_bar/style.cljs index 1e069da917..71b1aa2796 100644 --- a/src/quo2/components/wallet/progress_bar/style.cljs +++ b/src/quo/components/wallet/progress_bar/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.progress-bar.style +(ns quo.components.wallet.progress-bar.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn- border-and-background-color [customization-color] diff --git a/src/quo2/components/wallet/progress_bar/view.cljs b/src/quo/components/wallet/progress_bar/view.cljs similarity index 63% rename from src/quo2/components/wallet/progress_bar/view.cljs rename to src/quo/components/wallet/progress_bar/view.cljs index 4cb1adc8e4..98cf8e599d 100644 --- a/src/quo2/components/wallet/progress_bar/view.cljs +++ b/src/quo/components/wallet/progress_bar/view.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.wallet.progress-bar.view +(ns quo.components.wallet.progress-bar.view (:require - [quo2.components.wallet.progress-bar.style :as style] - [quo2.theme :as quo.theme] + [quo.components.wallet.progress-bar.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- view-internal diff --git a/src/quo2/components/wallet/summary_info/component_spec.cljs b/src/quo/components/wallet/summary_info/component_spec.cljs similarity index 95% rename from src/quo2/components/wallet/summary_info/component_spec.cljs rename to src/quo/components/wallet/summary_info/component_spec.cljs index 6b8293bba5..70899f5e91 100644 --- a/src/quo2/components/wallet/summary_info/component_spec.cljs +++ b/src/quo/components/wallet/summary_info/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.summary-info.component-spec +(ns quo.components.wallet.summary-info.component-spec (:require - [quo2.components.wallet.summary-info.view :as summary-info] + [quo.components.wallet.summary-info.view :as summary-info] [test-helpers.component :as h])) (def status-account-props diff --git a/src/quo2/components/wallet/summary_info/style.cljs b/src/quo/components/wallet/summary_info/style.cljs similarity index 92% rename from src/quo2/components/wallet/summary_info/style.cljs rename to src/quo/components/wallet/summary_info/style.cljs index 22c495a896..204f0be21c 100644 --- a/src/quo2/components/wallet/summary_info/style.cljs +++ b/src/quo/components/wallet/summary_info/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.summary-info.style +(ns quo.components.wallet.summary-info.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [networks? theme] diff --git a/src/quo2/components/wallet/summary_info/view.cljs b/src/quo/components/wallet/summary_info/view.cljs similarity index 85% rename from src/quo2/components/wallet/summary_info/view.cljs rename to src/quo/components/wallet/summary_info/view.cljs index b602d719c3..94a3ff9752 100644 --- a/src/quo2/components/wallet/summary_info/view.cljs +++ b/src/quo/components/wallet/summary_info/view.cljs @@ -1,12 +1,12 @@ -(ns quo2.components.wallet.summary-info.view +(ns quo.components.wallet.summary-info.view (:require - [quo2.components.avatars.account-avatar.view :as account-avatar] - [quo2.components.avatars.user-avatar.view :as user-avatar] - [quo2.components.markdown.text :as text] - [quo2.components.wallet.summary-info.style :as style] - [quo2.foundations.colors :as colors] - [quo2.foundations.resources :as resources] - [quo2.theme :as quo.theme] + [quo.components.avatars.account-avatar.view :as account-avatar] + [quo.components.avatars.user-avatar.view :as user-avatar] + [quo.components.markdown.text :as text] + [quo.components.wallet.summary-info.style :as style] + [quo.foundations.colors :as colors] + [quo.foundations.resources :as resources] + [quo.theme :as quo.theme] [react-native.core :as rn])) (defn- network-amount diff --git a/src/quo2/components/wallet/token_input/component_spec.cljs b/src/quo/components/wallet/token_input/component_spec.cljs similarity index 80% rename from src/quo2/components/wallet/token_input/component_spec.cljs rename to src/quo/components/wallet/token_input/component_spec.cljs index dad276b0e6..6e76ce46c2 100644 --- a/src/quo2/components/wallet/token_input/component_spec.cljs +++ b/src/quo/components/wallet/token_input/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.token-input.component-spec +(ns quo.components.wallet.token-input.component-spec (:require - [quo2.components.wallet.token-input.view :as token-input] + [quo.components.wallet.token-input.view :as token-input] [test-helpers.component :as h])) (h/describe "Wallet: Token Input" diff --git a/src/quo2/components/wallet/token_input/style.cljs b/src/quo/components/wallet/token_input/style.cljs similarity index 88% rename from src/quo2/components/wallet/token_input/style.cljs rename to src/quo/components/wallet/token_input/style.cljs index 193266b17f..ab261689f4 100644 --- a/src/quo2/components/wallet/token_input/style.cljs +++ b/src/quo/components/wallet/token_input/style.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.wallet.token-input.style +(ns quo.components.wallet.token-input.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.typography :as typography] + [quo.foundations.colors :as colors] + [quo.foundations.typography :as typography] [react-native.platform :as platform])) (defn main-container diff --git a/src/quo2/components/wallet/token_input/view.cljs b/src/quo/components/wallet/token_input/view.cljs similarity index 84% rename from src/quo2/components/wallet/token_input/view.cljs rename to src/quo/components/wallet/token_input/view.cljs index c75c4a7edc..c15156fa0c 100644 --- a/src/quo2/components/wallet/token_input/view.cljs +++ b/src/quo/components/wallet/token_input/view.cljs @@ -1,15 +1,15 @@ -(ns quo2.components.wallet.token-input.view +(ns quo.components.wallet.token-input.view (:require [clojure.string :as string] - [quo2.components.buttons.button.view :as button] - [quo2.components.dividers.divider-line.view :as divider-line] - [quo2.components.markdown.text :as text] - [quo2.components.tags.network-tags.view :as network-tag] - [quo2.components.wallet.token-input.style :as style] - [quo2.foundations.colors :as colors] - [quo2.foundations.common :as common] - [quo2.foundations.resources :as resources] - [quo2.theme :as quo.theme] + [quo.components.buttons.button.view :as button] + [quo.components.dividers.divider-line.view :as divider-line] + [quo.components.markdown.text :as text] + [quo.components.tags.network-tags.view :as network-tag] + [quo.components.wallet.token-input.style :as style] + [quo.foundations.colors :as colors] + [quo.foundations.common :as common] + [quo.foundations.resources :as resources] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent])) diff --git a/src/quo2/components/wallet/transaction_summary/component_spec.cljs b/src/quo/components/wallet/transaction_summary/component_spec.cljs similarity index 86% rename from src/quo2/components/wallet/transaction_summary/component_spec.cljs rename to src/quo/components/wallet/transaction_summary/component_spec.cljs index bd45b449b2..99d60c4050 100644 --- a/src/quo2/components/wallet/transaction_summary/component_spec.cljs +++ b/src/quo/components/wallet/transaction_summary/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.transaction-summary.component-spec +(ns quo.components.wallet.transaction-summary.component-spec (:require - [quo2.components.wallet.transaction-summary.view :as transaction-summary] + [quo.components.wallet.transaction-summary.view :as transaction-summary] [test-helpers.component :as h])) (h/describe "Transaction summary" diff --git a/src/quo2/components/wallet/transaction_summary/style.cljs b/src/quo/components/wallet/transaction_summary/style.cljs similarity index 94% rename from src/quo2/components/wallet/transaction_summary/style.cljs rename to src/quo/components/wallet/transaction_summary/style.cljs index ba0b85cfff..a08f276508 100644 --- a/src/quo2/components/wallet/transaction_summary/style.cljs +++ b/src/quo/components/wallet/transaction_summary/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.transaction-summary.style +(ns quo.components.wallet.transaction-summary.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [theme] diff --git a/src/quo2/components/wallet/transaction_summary/view.cljs b/src/quo/components/wallet/transaction_summary/view.cljs similarity index 93% rename from src/quo2/components/wallet/transaction_summary/view.cljs rename to src/quo/components/wallet/transaction_summary/view.cljs index 249ae5550d..6f4387dbf8 100644 --- a/src/quo2/components/wallet/transaction_summary/view.cljs +++ b/src/quo/components/wallet/transaction_summary/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.wallet.transaction-summary.view +(ns quo.components.wallet.transaction-summary.view (:require - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.components.tags.context-tag.view :as context-tag] - [quo2.components.wallet.transaction-summary.style :as style] - [quo2.theme :as quo.theme] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.components.tags.context-tag.view :as context-tag] + [quo.components.wallet.transaction-summary.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo2/components/wallet/wallet_activity/component_spec.cljs b/src/quo/components/wallet/wallet_activity/component_spec.cljs similarity index 79% rename from src/quo2/components/wallet/wallet_activity/component_spec.cljs rename to src/quo/components/wallet/wallet_activity/component_spec.cljs index 09b3b99847..e5df26a8c9 100644 --- a/src/quo2/components/wallet/wallet_activity/component_spec.cljs +++ b/src/quo/components/wallet/wallet_activity/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.wallet-activity.component-spec +(ns quo.components.wallet.wallet-activity.component-spec (:require - [quo2.components.wallet.wallet-activity.view :as wallet-activity] + [quo.components.wallet.wallet-activity.view :as wallet-activity] [test-helpers.component :as h])) (h/describe "Wallet activity" diff --git a/src/quo2/components/wallet/wallet_activity/style.cljs b/src/quo/components/wallet/wallet_activity/style.cljs similarity index 95% rename from src/quo2/components/wallet/wallet_activity/style.cljs rename to src/quo/components/wallet/wallet_activity/style.cljs index ac53f44cb9..688f16f87f 100644 --- a/src/quo2/components/wallet/wallet_activity/style.cljs +++ b/src/quo/components/wallet/wallet_activity/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.wallet-activity.style +(ns quo.components.wallet.wallet-activity.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn wallet-activity-container [{:keys [pressed? diff --git a/src/quo2/components/wallet/wallet_activity/view.cljs b/src/quo/components/wallet/wallet_activity/view.cljs similarity index 94% rename from src/quo2/components/wallet/wallet_activity/view.cljs rename to src/quo/components/wallet/wallet_activity/view.cljs index a7a0b9f016..a63fbc49c6 100644 --- a/src/quo2/components/wallet/wallet_activity/view.cljs +++ b/src/quo/components/wallet/wallet_activity/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.wallet.wallet-activity.view +(ns quo.components.wallet.wallet-activity.view (:require - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.components.tags.context-tag.view :as context-tag] - [quo2.components.wallet.wallet-activity.style :as style] - [quo2.theme :as quo.theme] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.components.tags.context-tag.view :as context-tag] + [quo.components.wallet.wallet-activity.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.hole-view :as hole-view] [reagent.core :as reagent] diff --git a/src/quo2/components/wallet/wallet_overview/component_spec.cljs b/src/quo/components/wallet/wallet_overview/component_spec.cljs similarity index 73% rename from src/quo2/components/wallet/wallet_overview/component_spec.cljs rename to src/quo/components/wallet/wallet_overview/component_spec.cljs index b544a35191..60f26b9b73 100644 --- a/src/quo2/components/wallet/wallet_overview/component_spec.cljs +++ b/src/quo/components/wallet/wallet_overview/component_spec.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.wallet-overview.component-spec +(ns quo.components.wallet.wallet-overview.component-spec (:require - [quo2.components.wallet.wallet-overview.view :as wallet-overview] + [quo.components.wallet.wallet-overview.view :as wallet-overview] [test-helpers.component :as h])) (h/describe diff --git a/src/quo2/components/wallet/wallet_overview/style.cljs b/src/quo/components/wallet/wallet_overview/style.cljs similarity index 93% rename from src/quo2/components/wallet/wallet_overview/style.cljs rename to src/quo/components/wallet/wallet_overview/style.cljs index bb3baf2b53..d5a022364b 100644 --- a/src/quo2/components/wallet/wallet_overview/style.cljs +++ b/src/quo/components/wallet/wallet_overview/style.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.wallet.wallet-overview.style +(ns quo.components.wallet.wallet-overview.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container-info {:padding-horizontal 20 diff --git a/src/quo2/components/wallet/wallet_overview/view.cljs b/src/quo/components/wallet/wallet_overview/view.cljs similarity index 92% rename from src/quo2/components/wallet/wallet_overview/view.cljs rename to src/quo/components/wallet/wallet_overview/view.cljs index fc851e43f7..ce62fcc98c 100644 --- a/src/quo2/components/wallet/wallet_overview/view.cljs +++ b/src/quo/components/wallet/wallet_overview/view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.wallet.wallet-overview.view +(ns quo.components.wallet.wallet-overview.view (:require - [quo2.components.dropdowns.network-dropdown.view :as network-dropdown] - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.components.wallet.wallet-overview.style :as style] - [quo2.theme :as quo.theme] + [quo.components.dropdowns.network-dropdown.view :as network-dropdown] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.components.wallet.wallet-overview.style :as style] + [quo.theme :as quo.theme] [react-native.core :as rn] [utils.i18n :as i18n])) diff --git a/src/quo/core.cljs b/src/quo/core.cljs new file mode 100644 index 0000000000..13d17bc5c3 --- /dev/null +++ b/src/quo/core.cljs @@ -0,0 +1,381 @@ +(ns quo.core + (:refer-clojure :exclude [filter]) + (:require + quo.components.avatars.account-avatar.view + quo.components.avatars.channel-avatar.view + quo.components.avatars.collection-avatar.view + quo.components.avatars.group-avatar.view + quo.components.avatars.icon-avatar + quo.components.avatars.user-avatar.view + quo.components.avatars.wallet-user-avatar + quo.components.banners.banner.view + quo.components.browser.browser-input.view + quo.components.buttons.button.view + quo.components.buttons.composer-button.view + quo.components.buttons.dynamic-button.view + quo.components.buttons.predictive-keyboard.view + quo.components.buttons.slide-button.view + quo.components.buttons.wallet-button.view + quo.components.buttons.wallet-ctas.view + quo.components.calendar.calendar-day.view + quo.components.calendar.calendar-year.view + quo.components.calendar.calendar.view + quo.components.code.snippet-preview.view + quo.components.code.snippet.view + quo.components.colors.color-picker.view + quo.components.colors.color.view + quo.components.common.notification-dot.view + quo.components.common.separator.view + quo.components.community.banner.view + quo.components.community.channel-actions + quo.components.community.community-card-view + quo.components.community.community-list-view + quo.components.community.community-view + quo.components.community.icon + quo.components.community.token-gating + quo.components.counter.counter.view + quo.components.counter.step.view + quo.components.dividers.date + quo.components.dividers.divider-label.view + quo.components.dividers.divider-line.view + quo.components.dividers.new-messages + quo.components.dividers.strength-divider.view + quo.components.drawers.action-drawers.view + quo.components.drawers.bottom-actions.view + quo.components.drawers.documentation-drawers.view + quo.components.drawers.drawer-buttons.view + quo.components.drawers.drawer-top.view + quo.components.drawers.permission-context.view + quo.components.dropdowns.dropdown.view + quo.components.dropdowns.network-dropdown.view + quo.components.empty-state.empty-state.view + quo.components.gradient.gradient-cover.view + [quo.components.graph.interactive-graph.view :as interactive-graph] + quo.components.graph.wallet-graph.view + quo.components.header + quo.components.icon + quo.components.info.info-message + quo.components.info.information-box.view + quo.components.inputs.address-input.view + quo.components.inputs.input.view + quo.components.inputs.locked-input.view + quo.components.inputs.profile-input.view + quo.components.inputs.recovery-phrase.view + quo.components.inputs.search-input.view + quo.components.inputs.title-input.view + quo.components.keycard.view + quo.components.links.link-preview.view + quo.components.links.url-preview-list.view + quo.components.links.url-preview.view + quo.components.list-items.account-list-card.view + quo.components.list-items.account.view + quo.components.list-items.address.view + quo.components.list-items.channel.view + quo.components.list-items.community.view + quo.components.list-items.dapp.view + quo.components.list-items.menu-item + quo.components.list-items.preview-list.view + quo.components.list-items.saved-address.view + quo.components.list-items.saved-contact-address.view + quo.components.list-items.token-value.view + quo.components.list-items.user-list + quo.components.loaders.skeleton-list.view + quo.components.markdown.list.view + quo.components.markdown.text + quo.components.messages.author.view + quo.components.messages.gap + quo.components.messages.system-message.view + quo.components.navigation.bottom-nav-tab.view + quo.components.navigation.floating-shell-button.view + quo.components.navigation.page-nav.view + quo.components.navigation.top-nav.view + quo.components.notifications.activity-log.view + quo.components.notifications.activity-logs-photos.view + quo.components.notifications.count-down-circle + quo.components.notifications.notification.view + quo.components.notifications.toast.view + quo.components.numbered-keyboard.keyboard-key.view + quo.components.numbered-keyboard.numbered-keyboard.view + quo.components.onboarding.small-option-card.view + quo.components.password.tips.view + quo.components.profile.collectible.view + quo.components.profile.profile-card.view + quo.components.profile.select-profile.view + quo.components.profile.showcase-nav.view + quo.components.record-audio.record-audio.view + quo.components.record-audio.soundtrack.view + quo.components.selectors.disclaimer.view + quo.components.selectors.filter.view + quo.components.selectors.react-selector.view + quo.components.selectors.react.view + quo.components.selectors.reactions-selector.view + quo.components.selectors.selectors.view + quo.components.settings.accounts.view + quo.components.settings.category.view + quo.components.settings.category.view + quo.components.settings.data-item.view + quo.components.settings.privacy-option.view + quo.components.settings.reorder-item.view + quo.components.settings.section-label.view + quo.components.settings.settings-item.view + quo.components.share.qr-code.view + quo.components.share.share-qr-code.view + quo.components.switchers.group-messaging-card.view + quo.components.tabs.account-selector + quo.components.tabs.segmented-tab + quo.components.tabs.tabs.view + quo.components.tags.context-tag.view + quo.components.tags.network-tags.view + quo.components.tags.number-tag.view + quo.components.tags.permission-tag + quo.components.tags.status-tags + quo.components.tags.tag + quo.components.tags.tags + quo.components.tags.tiny-tag.view + quo.components.tags.token-tag + quo.components.text-combinations.view + quo.components.wallet.account-card.view + quo.components.wallet.account-origin.view + quo.components.wallet.account-overview.view + quo.components.wallet.keypair.view + quo.components.wallet.network-amount.view + quo.components.wallet.network-bridge.view + quo.components.wallet.network-link.view + quo.components.wallet.progress-bar.view + quo.components.wallet.summary-info.view + quo.components.wallet.token-input.view + quo.components.wallet.transaction-summary.view + quo.components.wallet.wallet-activity.view + quo.components.wallet.wallet-overview.view)) + +(def separator quo.components.common.separator.view/separator) + +;;;; Avatar +(def account-avatar quo.components.avatars.account-avatar.view/view) +(def channel-avatar quo.components.avatars.channel-avatar.view/view) +(def collection-avatar quo.components.avatars.collection-avatar.view/view) +(def group-avatar quo.components.avatars.group-avatar.view/view) +(def icon-avatar quo.components.avatars.icon-avatar/icon-avatar) +(def user-avatar quo.components.avatars.user-avatar.view/user-avatar) +(def wallet-user-avatar quo.components.avatars.wallet-user-avatar/wallet-user-avatar) + +;;;; Banner +(def banner quo.components.banners.banner.view/view) + +;;;; Buttons +(def button quo.components.buttons.button.view/button) +(def composer-button quo.components.buttons.composer-button.view/view) +(def dynamic-button quo.components.buttons.dynamic-button.view/view) +(def predictive-keyboard quo.components.buttons.predictive-keyboard.view/view) +(def slide-button quo.components.buttons.slide-button.view/view) +(def wallet-button quo.components.buttons.wallet-button.view/view) +(def wallet-ctas quo.components.buttons.wallet-ctas.view/view) + +;;;; Browser +(def browser-input quo.components.browser.browser-input.view/view) + +;;;; Calendar +(def calendar quo.components.calendar.calendar.view/view) +(def calendar-day quo.components.calendar.calendar-day.view/view) +(def calendar-year quo.components.calendar.calendar-year.view/view) + +;;;; Code +(def snippet quo.components.code.snippet.view/view) +(def snippet-preview quo.components.code.snippet-preview.view/view) + +;;;; Cards +(def small-option-card quo.components.onboarding.small-option-card.view/small-option-card) +(def keycard quo.components.keycard.view/keycard) + +;;;; Colors +(def color-picker quo.components.colors.color-picker.view/view) +(def color quo.components.colors.color.view/view) + +;;;; Community +(def community-card-view-item quo.components.community.community-card-view/view) +(def communities-membership-list-item + quo.components.community.community-list-view/communities-membership-list-item) +(def community-stats-column quo.components.community.community-view/community-stats-column) +(def community-stats quo.components.community.community-view/community-stats) +(def community-tags quo.components.community.community-view/community-tags) +(def community-title quo.components.community.community-view/community-title) +(def permission-tag-container quo.components.community.community-view/permission-tag-container) +(def discover-card quo.components.community.banner.view/view) +(def community-icon quo.components.community.icon/community-icon) +(def token-requirement-list quo.components.community.token-gating/token-requirement-list) +(def channel-actions quo.components.community.channel-actions/channel-actions) + +;;;; Counter +(def counter quo.components.counter.counter.view/view) +(def step quo.components.counter.step.view/view) + +;;;; Dividers +(def divider-label quo.components.dividers.divider-label.view/view) +(def divider-line quo.components.dividers.divider-line.view/view) +(def new-messages quo.components.dividers.new-messages/view) +(def divider-date quo.components.dividers.date/date) +(def strength-divider quo.components.dividers.strength-divider.view/view) + +;;;; Drawers +(def action-drawer quo.components.drawers.action-drawers.view/action-drawer) +(def documentation-drawers quo.components.drawers.documentation-drawers.view/view) +(def drawer-buttons quo.components.drawers.drawer-buttons.view/view) +(def drawer-top quo.components.drawers.drawer-top.view/view) +(def permission-context quo.components.drawers.permission-context.view/view) +(def bottom-actions quo.components.drawers.bottom-actions.view/view) + +;;;; Dropdowns +(def dropdown quo.components.dropdowns.dropdown.view/view) +(def network-dropdown quo.components.dropdowns.network-dropdown.view/view) + +;;;; Empty State +(def empty-state quo.components.empty-state.empty-state.view/empty-state) + +;;;; Graph +(def interactive-graph quo.components.graph.interactive-graph.view/view) +(def wallet-graph quo.components.graph.wallet-graph.view/view) + +;;;; Header +(def header quo.components.header/header) + +;;;; Gradient +(def gradient-cover quo.components.gradient.gradient-cover.view/view) + +;;;; Icon +(def icon quo.components.icon/icon) + +;;;; Info +(def info-message quo.components.info.info-message/info-message) +(def information-box quo.components.info.information-box.view/view) + +;;;; Inputs +(def input quo.components.inputs.input.view/input) +(def address-input quo.components.inputs.address-input.view/address-input) +(def locked-input quo.components.inputs.locked-input.view/locked-input) +(def profile-input quo.components.inputs.profile-input.view/profile-input) +(def recovery-phrase-input quo.components.inputs.recovery-phrase.view/recovery-phrase-input) +(def search-input quo.components.inputs.search-input.view/search-input) +(def title-input quo.components.inputs.title-input.view/view) + +;;;; Numbered Keyboard +(def keyboard-key quo.components.numbered-keyboard.keyboard-key.view/view) +(def numbered-keyboard quo.components.numbered-keyboard.numbered-keyboard.view/view) + +;;;; Links +(def link-preview quo.components.links.link-preview.view/view) +(def url-preview quo.components.links.url-preview.view/view) +(def url-preview-list quo.components.links.url-preview-list.view/view) + +;;;; List items +(def account-item quo.components.list-items.account.view/view) +(def account-list-card quo.components.list-items.account-list-card.view/view) +(def address quo.components.list-items.address.view/view) +(def channel quo.components.list-items.channel.view/view) +(def dapp quo.components.list-items.dapp.view/view) +(def menu-item quo.components.list-items.menu-item/menu-item) +(def preview-list quo.components.list-items.preview-list.view/view) +(def user-list quo.components.list-items.user-list/user-list) +(def community-list-item quo.components.list-items.community.view/view) +(def saved-address quo.components.list-items.saved-address.view/view) +(def saved-contact-address quo.components.list-items.saved-contact-address.view/view) +(def token-value quo.components.list-items.token-value.view/view) + +;;;; Loaders +(def skeleton-list quo.components.loaders.skeleton-list.view/view) + +;;;; Navigation +(def bottom-nav-tab quo.components.navigation.bottom-nav-tab.view/view) +(def floating-shell-button quo.components.navigation.floating-shell-button.view/view) +(def page-nav quo.components.navigation.page-nav.view/page-nav) +(def top-nav quo.components.navigation.top-nav.view/view) + +;;;; Markdown +(def markdown-list quo.components.markdown.list.view/view) +(def text quo.components.markdown.text/text) + +;;;; Messages +(def gap quo.components.messages.gap/gap) +(def system-message quo.components.messages.system-message.view/system-message) + +;;;; Notifications +(def activity-log quo.components.notifications.activity-log.view/view) +(def activity-logs-photos quo.components.notifications.activity-logs-photos.view/view) +(def notification-dot quo.components.common.notification-dot.view/view) +(def count-down-circle quo.components.notifications.count-down-circle/circle-timer) +(def notification quo.components.notifications.notification.view/notification) +(def toast quo.components.notifications.toast.view/toast) + +;;;; Password +(def tips quo.components.password.tips.view/view) + +;;;; Profile +(def collectible quo.components.profile.collectible.view/collectible) +(def profile-card quo.components.profile.profile-card.view/profile-card) +(def select-profile quo.components.profile.select-profile.view/view) +(def showcase-nav quo.components.profile.showcase-nav.view/view) + +;;;; Record Audio +(def record-audio quo.components.record-audio.record-audio.view/record-audio) +(def soundtrack quo.components.record-audio.soundtrack.view/f-soundtrack) + +;;;; Selectors +(def author quo.components.messages.author.view/author) +(def disclaimer quo.components.selectors.disclaimer.view/view) +(def filter quo.components.selectors.filter.view/view) +(def reactions-selector quo.components.selectors.reactions-selector.view/view) +(def react quo.components.selectors.react.view/view) +(def react-selector quo.components.selectors.react-selector.view/view) +(def checkbox quo.components.selectors.selectors.view/checkbox) +(def toggle quo.components.selectors.selectors.view/toggle) +(def radio quo.components.selectors.selectors.view/radio) +(def checkbox-prefill quo.components.selectors.selectors.view/checkbox-prefill) + +;;;; Settings +(def account quo.components.settings.accounts.view/account) +(def category quo.components.settings.category.view/category) +(def data-item quo.components.settings.data-item.view/view) +(def privacy-option quo.components.settings.privacy-option.view/view) +(def reorder-item quo.components.settings.reorder-item.view/reorder-item) +(def section-label quo.components.settings.section-label.view/view) +(def settings-item quo.components.settings.settings-item.view/view) + +;;;; Share +(def qr-code quo.components.share.qr-code.view/view) +(def share-qr-code quo.components.share.share-qr-code.view/view) + +;;;; SWITCHER +(def group-messaging-card quo.components.switchers.group-messaging-card.view/view) + +;;;; Tabs +(def tabs quo.components.tabs.tabs.view/view) +(def segmented-control quo.components.tabs.segmented-tab/segmented-control) +(def account-selector quo.components.tabs.account-selector/account-selector) + +;;;; Tags +(def context-tag quo.components.tags.context-tag.view/view) +(def network-tags quo.components.tags.network-tags.view/view) +(def number-tag quo.components.tags.number-tag.view/view) +(def permission-tag quo.components.tags.permission-tag/tag) +(def status-tag quo.components.tags.status-tags/status-tag) +(def tag quo.components.tags.tag/tag) +(def tags quo.components.tags.tags/tags) +(def tiny-tag quo.components.tags.tiny-tag.view/view) +(def token-tag quo.components.tags.token-tag/tag) + +;;;; Text combinations +(def text-combinations quo.components.text-combinations.view/view) + +;;;; Wallet +(def account-card quo.components.wallet.account-card.view/view) +(def account-origin quo.components.wallet.account-origin.view/view) +(def account-overview quo.components.wallet.account-overview.view/view) +(def keypair quo.components.wallet.keypair.view/view) +(def network-amount quo.components.wallet.network-amount.view/view) +(def network-bridge quo.components.wallet.network-bridge.view/view) +(def progress-bar quo.components.wallet.progress-bar.view/view) +(def summary-info quo.components.wallet.summary-info.view/view) +(def network-link quo.components.wallet.network-link.view/view) +(def token-input quo.components.wallet.token-input.view/view) +(def wallet-overview quo.components.wallet.wallet-overview.view/view) +(def wallet-activity quo.components.wallet.wallet-activity.view/view) +(def transaction-summary quo.components.wallet.transaction-summary.view/view) diff --git a/src/quo/core_spec.cljs b/src/quo/core_spec.cljs new file mode 100644 index 0000000000..55f113815e --- /dev/null +++ b/src/quo/core_spec.cljs @@ -0,0 +1,86 @@ +(ns quo.core-spec + (:require + [quo.components.avatars.account-avatar.component-spec] + [quo.components.avatars.user-avatar.component-spec] + [quo.components.banners.banner.component-spec] + [quo.components.browser.browser-input.component-spec] + [quo.components.buttons.button.component-spec] + [quo.components.buttons.composer-button.component-spec] + [quo.components.buttons.predictive-keyboard.component-spec] + [quo.components.buttons.slide-button.component-spec] + [quo.components.buttons.wallet-button.component-spec] + [quo.components.buttons.wallet-ctas.component-spec] + [quo.components.calendar.calendar-day.component-spec] + [quo.components.calendar.calendar-year.component-spec] + [quo.components.calendar.calendar.component-spec] + [quo.components.calendar.calendar.month-picker.component-spec] + [quo.components.colors.color-picker.component-spec] + [quo.components.counter.counter.component-spec] + [quo.components.counter.step.component-spec] + [quo.components.dividers.divider-label.component-spec] + [quo.components.dividers.strength-divider.component-spec] + [quo.components.drawers.action-drawers.component-spec] + [quo.components.drawers.bottom-actions.component-spec] + [quo.components.drawers.documentation-drawers.component-spec] + [quo.components.drawers.drawer-buttons.component-spec] + [quo.components.drawers.drawer-top.component-spec] + [quo.components.drawers.permission-context.component-spec] + [quo.components.dropdowns.dropdown.component-spec] + [quo.components.dropdowns.network-dropdown.component-spec] + [quo.components.gradient.gradient-cover.component-spec] + [quo.components.graph.wallet-graph.component-spec] + [quo.components.inputs.address-input.component-spec] + [quo.components.inputs.input.component-spec] + [quo.components.inputs.locked-input.component-spec] + [quo.components.inputs.locked-input.component-spec] + [quo.components.inputs.profile-input.component-spec] + [quo.components.inputs.recovery-phrase.component-spec] + [quo.components.inputs.title-input.component-spec] + [quo.components.keycard.component-spec] + [quo.components.links.link-preview.component-spec] + [quo.components.links.url-preview-list.component-spec] + [quo.components.links.url-preview.component-spec] + [quo.components.list-items.account.component-spec] + [quo.components.list-items.channel.component-spec] + [quo.components.list-items.community.component-spec] + [quo.components.list-items.dapp.component-spec] + [quo.components.list-items.saved-address.component-spec] + [quo.components.list-items.saved-contact-address.component-spec] + [quo.components.list-items.token-value.component-spec] + [quo.components.loaders.skeleton-list.component-spec] + [quo.components.markdown.list.component-spec] + [quo.components.markdown.text-component-spec] + [quo.components.navigation.top-nav.component-spec] + [quo.components.notifications.notification.component-spec] + [quo.components.numbered-keyboard.keyboard-key.component-spec] + [quo.components.onboarding.small-option-card.component-spec] + [quo.components.password.tips.component-spec] + [quo.components.profile.select-profile.component-spec] + [quo.components.profile.showcase-nav.component-spec] + [quo.components.record-audio.record-audio.component-spec] + [quo.components.record-audio.soundtrack.component-spec] + [quo.components.selectors.disclaimer.component-spec] + [quo.components.selectors.filter.component-spec] + [quo.components.selectors.reactions-selector.component-spec] + [quo.components.selectors.selectors.component-spec] + [quo.components.settings.category.component-spec] + [quo.components.settings.data-item.component-spec] + [quo.components.settings.reorder-item.component-spec] + [quo.components.settings.settings-item.component-spec] + [quo.components.share.share-qr-code.component-spec] + [quo.components.switchers.base-card.component-spec] + [quo.components.switchers.group-messaging-card.component-spec] + [quo.components.tags.network-tags.component-spec] + [quo.components.tags.status-tags-component-spec] + [quo.components.wallet.account-card.component-spec] + [quo.components.wallet.account-origin.component-spec] + [quo.components.wallet.account-overview.component-spec] + [quo.components.wallet.keypair.component-spec] + [quo.components.wallet.network-amount.component-spec] + [quo.components.wallet.network-bridge.component-spec] + [quo.components.wallet.progress-bar.component-spec] + [quo.components.wallet.summary-info.component-spec] + [quo.components.wallet.token-input.component-spec] + [quo.components.wallet.transaction-summary.component-spec] + [quo.components.wallet.wallet-activity.component-spec] + [quo.components.wallet.wallet-overview.component-spec])) diff --git a/src/quo2/foundations/colors.cljs b/src/quo/foundations/colors.cljs similarity index 99% rename from src/quo2/foundations/colors.cljs rename to src/quo/foundations/colors.cljs index 0519613cb5..c61b179757 100644 --- a/src/quo2/foundations/colors.cljs +++ b/src/quo/foundations/colors.cljs @@ -1,7 +1,7 @@ -(ns quo2.foundations.colors +(ns quo.foundations.colors (:require [clojure.string :as string] - [quo2.theme :as theme] + [quo.theme :as theme] [react-native.platform :as platform])) (defn alpha diff --git a/src/quo2/foundations/colors_test.cljs b/src/quo/foundations/colors_test.cljs similarity index 95% rename from src/quo2/foundations/colors_test.cljs rename to src/quo/foundations/colors_test.cljs index 64d11152ac..98df06a1ef 100644 --- a/src/quo2/foundations/colors_test.cljs +++ b/src/quo/foundations/colors_test.cljs @@ -1,7 +1,7 @@ -(ns quo2.foundations.colors-test +(ns quo.foundations.colors-test (:require [cljs.test :refer-macros [deftest testing is]] - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (deftest resolve-color-test (testing "community color - resolves a hex string and ignores theme" diff --git a/src/quo2/foundations/common.cljs b/src/quo/foundations/common.cljs similarity index 80% rename from src/quo2/foundations/common.cljs rename to src/quo/foundations/common.cljs index 9dc511d242..7900999904 100644 --- a/src/quo2/foundations/common.cljs +++ b/src/quo/foundations/common.cljs @@ -1,4 +1,4 @@ -(ns quo2.foundations.common) +(ns quo.foundations.common) (def currency-label {:eur "€" diff --git a/src/quo2/foundations/customization_colors.cljs b/src/quo/foundations/customization_colors.cljs similarity index 88% rename from src/quo2/foundations/customization_colors.cljs rename to src/quo/foundations/customization_colors.cljs index 1ec481f72c..cb6c822a94 100644 --- a/src/quo2/foundations/customization_colors.cljs +++ b/src/quo/foundations/customization_colors.cljs @@ -1,6 +1,6 @@ -(ns quo2.foundations.customization-colors +(ns quo.foundations.customization-colors (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.core :as rn])) (defn get-overlay-color diff --git a/src/quo2/foundations/resources.cljs b/src/quo/foundations/resources.cljs similarity index 98% rename from src/quo2/foundations/resources.cljs rename to src/quo/foundations/resources.cljs index 56e0671cb6..df4b5bfa39 100644 --- a/src/quo2/foundations/resources.cljs +++ b/src/quo/foundations/resources.cljs @@ -1,4 +1,4 @@ -(ns quo2.foundations.resources) +(ns quo.foundations.resources) (def ui {:keycard-logo (js/require "../resources/images/ui2/keycard-logo.png") diff --git a/src/quo2/foundations/shadows.cljs b/src/quo/foundations/shadows.cljs similarity index 97% rename from src/quo2/foundations/shadows.cljs rename to src/quo/foundations/shadows.cljs index 39deb75de7..93a104efa0 100644 --- a/src/quo2/foundations/shadows.cljs +++ b/src/quo/foundations/shadows.cljs @@ -1,8 +1,8 @@ -(ns quo2.foundations.shadows +(ns quo.foundations.shadows (:refer-clojure :exclude [get]) (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.platform :as platform])) (def ^:private shadows diff --git a/src/quo2/foundations/typography.cljs b/src/quo/foundations/typography.cljs similarity index 97% rename from src/quo2/foundations/typography.cljs rename to src/quo/foundations/typography.cljs index a251560afb..e6b54dc906 100644 --- a/src/quo2/foundations/typography.cljs +++ b/src/quo/foundations/typography.cljs @@ -1,4 +1,4 @@ -(ns quo2.foundations.typography) +(ns quo.foundations.typography) (defn- tracking-fn "Check inter dynamic metric https://rsms.me/inter/dynmetrics/" diff --git a/src/quo2/theme.cljs b/src/quo/theme.cljs similarity index 89% rename from src/quo2/theme.cljs rename to src/quo/theme.cljs index 6dbc90f0af..c92091d6b7 100644 --- a/src/quo2/theme.cljs +++ b/src/quo/theme.cljs @@ -1,4 +1,4 @@ -(ns quo2.theme +(ns quo.theme (:require ["react" :as react] [react-native.core :as rn] @@ -29,7 +29,7 @@ (if (= theme :light) light-value dark-value)))) (defn provider - "Wrap `children` in a React Provider using `quo2.theme/theme-context` as the + "Wrap `children` in a React Provider using `quo.theme/theme-context` as the context. `options`: Clojure map. Currently we only use the `:theme` key. In the future @@ -55,7 +55,7 @@ (defn with-theme "Create a functional component that assoc `:theme` into the first arg of - `component`. The theme value is taken from the nearest `quo2.theme/provider`." + `component`. The theme value is taken from the nearest `quo.theme/provider`." [component] (fn [& args] (into [:f> f-with-theme component] args))) diff --git a/src/quo2/__visual_tests__/__image_snapshots__/ios/iPhone 11 Pro/button-e-2-e-js-default-renders-button-page-should-match-image-render-button.png b/src/quo2/__visual_tests__/__image_snapshots__/ios/iPhone 11 Pro/button-e-2-e-js-default-renders-button-page-should-match-image-render-button.png deleted file mode 100644 index 4d70e2e50b1a573b71f8feaab7896d1ca0910167..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145933 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 z 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�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 new Promise((resolve) => setTimeout(() => resolve(), duration)); - -const SUPER_SECRET_PASSWORD = 'password'; - -const loginToHomePage = async () => { - if (device.getPlatform() === 'ios') { - await device.setStatusBar({ - time: '12:34', - dataNetwork: 'wifi', - wifiBars: '3', - batteryState: 'charging', - batteryLevel: '100', - }); - } - await device.reloadReactNative(); - await element(by.id('terms-of-service')).tap(); - await waitToNavigate(400); - await element(by.id('get-started')).tap(); - await waitToNavigate(300); - await element(by.id('generate-keys')).tap(); - await waitToNavigate(200); - await element(by.text('Next')).tap(); - await waitToNavigate(700); - await element(by.text('Next')).tap(); - await waitToNavigate(700); - await element(by.id('password-placeholder')).typeText(SUPER_SECRET_PASSWORD); - await element(by.id('confirm-password-placeholder')).typeText(SUPER_SECRET_PASSWORD); - await element(by.text('Next')).tap(); - await waitToNavigate(200); - await element(by.id('browser-stack')).tap(); - await waitToNavigate(400); - await element(by.text('Quo2.0 Preview')).tap(); - await waitToNavigate(400); -}; - -describe('Default Renders', () => { - beforeAll(async () => loginToHomePage()); - beforeEach(async () => {}); - afterEach(async () => { - await element(by.id('back-button')).tap(); - await waitToNavigate(200); - }); - - it(`button page should match image render`, async () => { - await element(by.id(`quo2-:button`)).tap(); - await waitToNavigate(200); - const res = await jestExpect(`button`).toMatchImageSnapshot(); - }); -}); diff --git a/src/quo2/components/common/separator/view.cljs b/src/quo2/components/common/separator/view.cljs deleted file mode 100644 index a36c2dc82e..0000000000 --- a/src/quo2/components/common/separator/view.cljs +++ /dev/null @@ -1,16 +0,0 @@ -(ns quo2.components.common.separator.view - (:require - [quo2.foundations.colors :as quo2.colors] - [react-native.core :as rn])) - -(defn separator - [{:keys [style]}] - [rn/view - {:style - (merge - style - {:background-color (quo2.colors/theme-colors - quo2.colors/neutral-10 - quo2.colors/neutral-80) - :align-self :stretch - :height 1})}]) diff --git a/src/quo2/components/settings/category/view.cljs b/src/quo2/components/settings/category/view.cljs deleted file mode 100644 index e40d38aa73..0000000000 --- a/src/quo2/components/settings/category/view.cljs +++ /dev/null @@ -1,10 +0,0 @@ -(ns quo2.components.settings.category.view - (:require - [quo2.components.settings.category.reorder.view :as reorder] - [quo2.components.settings.category.settings.view :as settings])) - -(defn category - [{:keys [list-type] :as props}] - (if (= list-type :settings) - [settings/settings-category props] - [reorder/reorder-category props])) diff --git a/src/quo2/components/settings/reorder_item/items/item_skeleton.cljs b/src/quo2/components/settings/reorder_item/items/item_skeleton.cljs deleted file mode 100644 index e00ad377aa..0000000000 --- a/src/quo2/components/settings/reorder_item/items/item_skeleton.cljs +++ /dev/null @@ -1,9 +0,0 @@ -(ns quo2.components.settings.reorder-item.items.item-skeleton - (:require - [quo2.components.settings.reorder-item.style :as style] - [react-native.core :as rn])) - -(defn view - [] - [rn/view - {:style (style/skeleton-container)}]) diff --git a/src/quo2/components/settings/reorder_item/view.cljs b/src/quo2/components/settings/reorder_item/view.cljs deleted file mode 100644 index 4dfcb146ac..0000000000 --- a/src/quo2/components/settings/reorder_item/view.cljs +++ /dev/null @@ -1,16 +0,0 @@ -(ns quo2.components.settings.reorder-item.view - (:require - [quo2.components.settings.reorder-item.items.item :as item] - [quo2.components.settings.reorder-item.items.item-placeholder :as placeholder] - [quo2.components.settings.reorder-item.items.item-skeleton :as skeleton] - [quo2.components.settings.reorder-item.items.item-tabs :as tab] - [quo2.components.settings.reorder-item.types :as types])) - -(defn reorder-item - [item type {:keys [blur? drag]}] - (condp = type - types/item [item/view item blur? drag] - types/placeholder [placeholder/view item] - types/skeleton [skeleton/view] - types/tab [tab/view item] - nil)) diff --git a/src/quo2/components/switchers/card_main_info/style.cljs b/src/quo2/components/switchers/card_main_info/style.cljs deleted file mode 100644 index 17f3edaa3c..0000000000 --- a/src/quo2/components/switchers/card_main_info/style.cljs +++ /dev/null @@ -1,6 +0,0 @@ -(ns quo2.components.switchers.card-main-info.style - (:require - [quo2.foundations.colors :as colors])) - -(def subtitle - {:color colors/neutral-40}) diff --git a/src/quo2/core.cljs b/src/quo2/core.cljs deleted file mode 100644 index e9096ba367..0000000000 --- a/src/quo2/core.cljs +++ /dev/null @@ -1,381 +0,0 @@ -(ns quo2.core - (:refer-clojure :exclude [filter]) - (:require - quo2.components.avatars.account-avatar.view - quo2.components.avatars.channel-avatar.view - quo2.components.avatars.collection-avatar.view - quo2.components.avatars.group-avatar.view - quo2.components.avatars.icon-avatar - quo2.components.avatars.user-avatar.view - quo2.components.avatars.wallet-user-avatar - quo2.components.banners.banner.view - quo2.components.browser.browser-input.view - quo2.components.buttons.button.view - quo2.components.buttons.composer-button.view - quo2.components.buttons.dynamic-button.view - quo2.components.buttons.predictive-keyboard.view - quo2.components.buttons.slide-button.view - quo2.components.buttons.wallet-button.view - quo2.components.buttons.wallet-ctas.view - quo2.components.calendar.calendar-day.view - quo2.components.calendar.calendar-year.view - quo2.components.calendar.calendar.view - quo2.components.code.snippet-preview.view - quo2.components.code.snippet.view - quo2.components.colors.color-picker.view - quo2.components.colors.color.view - quo2.components.common.notification-dot.view - quo2.components.common.separator.view - quo2.components.community.banner.view - quo2.components.community.channel-actions - quo2.components.community.community-card-view - quo2.components.community.community-list-view - quo2.components.community.community-view - quo2.components.community.icon - quo2.components.community.token-gating - quo2.components.counter.counter.view - quo2.components.counter.step.view - quo2.components.dividers.date - quo2.components.dividers.divider-label.view - quo2.components.dividers.divider-line.view - quo2.components.dividers.new-messages - quo2.components.dividers.strength-divider.view - quo2.components.drawers.action-drawers.view - quo2.components.drawers.bottom-actions.view - quo2.components.drawers.documentation-drawers.view - quo2.components.drawers.drawer-buttons.view - quo2.components.drawers.drawer-top.view - quo2.components.drawers.permission-context.view - quo2.components.dropdowns.dropdown.view - quo2.components.dropdowns.network-dropdown.view - quo2.components.empty-state.empty-state.view - quo2.components.gradient.gradient-cover.view - [quo2.components.graph.interactive-graph.view :as interactive-graph] - quo2.components.graph.wallet-graph.view - quo2.components.header - quo2.components.icon - quo2.components.info.info-message - quo2.components.info.information-box.view - quo2.components.inputs.address-input.view - quo2.components.inputs.input.view - quo2.components.inputs.locked-input.view - quo2.components.inputs.profile-input.view - quo2.components.inputs.recovery-phrase.view - quo2.components.inputs.search-input.view - quo2.components.inputs.title-input.view - quo2.components.keycard.view - quo2.components.links.link-preview.view - quo2.components.links.url-preview-list.view - quo2.components.links.url-preview.view - quo2.components.list-items.account-list-card.view - quo2.components.list-items.account.view - quo2.components.list-items.address.view - quo2.components.list-items.channel.view - quo2.components.list-items.community.view - quo2.components.list-items.dapp.view - quo2.components.list-items.menu-item - quo2.components.list-items.preview-list.view - quo2.components.list-items.saved-address.view - quo2.components.list-items.saved-contact-address.view - quo2.components.list-items.token-value.view - quo2.components.list-items.user-list - quo2.components.loaders.skeleton-list.view - quo2.components.markdown.list.view - quo2.components.markdown.text - quo2.components.messages.author.view - quo2.components.messages.gap - quo2.components.messages.system-message.view - quo2.components.navigation.bottom-nav-tab.view - quo2.components.navigation.floating-shell-button.view - quo2.components.navigation.page-nav.view - quo2.components.navigation.top-nav.view - quo2.components.notifications.activity-log.view - quo2.components.notifications.activity-logs-photos.view - quo2.components.notifications.count-down-circle - quo2.components.notifications.notification.view - quo2.components.notifications.toast.view - quo2.components.numbered-keyboard.keyboard-key.view - quo2.components.numbered-keyboard.numbered-keyboard.view - quo2.components.onboarding.small-option-card.view - quo2.components.password.tips.view - quo2.components.profile.collectible.view - quo2.components.profile.profile-card.view - quo2.components.profile.select-profile.view - quo2.components.profile.showcase-nav.view - quo2.components.record-audio.record-audio.view - quo2.components.record-audio.soundtrack.view - quo2.components.selectors.disclaimer.view - quo2.components.selectors.filter.view - quo2.components.selectors.react-selector.view - quo2.components.selectors.react.view - quo2.components.selectors.reactions-selector.view - quo2.components.selectors.selectors.view - quo2.components.settings.accounts.view - quo2.components.settings.category.view - quo2.components.settings.category.view - quo2.components.settings.data-item.view - quo2.components.settings.privacy-option.view - quo2.components.settings.reorder-item.view - quo2.components.settings.section-label.view - quo2.components.settings.settings-item.view - quo2.components.share.qr-code.view - quo2.components.share.share-qr-code.view - quo2.components.switchers.group-messaging-card.view - quo2.components.tabs.account-selector - quo2.components.tabs.segmented-tab - quo2.components.tabs.tabs.view - quo2.components.tags.context-tag.view - quo2.components.tags.network-tags.view - quo2.components.tags.number-tag.view - quo2.components.tags.permission-tag - quo2.components.tags.status-tags - quo2.components.tags.tag - quo2.components.tags.tags - quo2.components.tags.tiny-tag.view - quo2.components.tags.token-tag - quo2.components.text-combinations.view - quo2.components.wallet.account-card.view - quo2.components.wallet.account-origin.view - quo2.components.wallet.account-overview.view - quo2.components.wallet.keypair.view - quo2.components.wallet.network-amount.view - quo2.components.wallet.network-bridge.view - quo2.components.wallet.network-link.view - quo2.components.wallet.progress-bar.view - quo2.components.wallet.summary-info.view - quo2.components.wallet.token-input.view - quo2.components.wallet.transaction-summary.view - quo2.components.wallet.wallet-activity.view - quo2.components.wallet.wallet-overview.view)) - -(def separator quo2.components.common.separator.view/separator) - -;;;; Avatar -(def account-avatar quo2.components.avatars.account-avatar.view/view) -(def channel-avatar quo2.components.avatars.channel-avatar.view/view) -(def collection-avatar quo2.components.avatars.collection-avatar.view/view) -(def group-avatar quo2.components.avatars.group-avatar.view/view) -(def icon-avatar quo2.components.avatars.icon-avatar/icon-avatar) -(def user-avatar quo2.components.avatars.user-avatar.view/user-avatar) -(def wallet-user-avatar quo2.components.avatars.wallet-user-avatar/wallet-user-avatar) - -;;;; Banner -(def banner quo2.components.banners.banner.view/view) - -;;;; Buttons -(def button quo2.components.buttons.button.view/button) -(def composer-button quo2.components.buttons.composer-button.view/view) -(def dynamic-button quo2.components.buttons.dynamic-button.view/view) -(def predictive-keyboard quo2.components.buttons.predictive-keyboard.view/view) -(def slide-button quo2.components.buttons.slide-button.view/view) -(def wallet-button quo2.components.buttons.wallet-button.view/view) -(def wallet-ctas quo2.components.buttons.wallet-ctas.view/view) - -;;;; Browser -(def browser-input quo2.components.browser.browser-input.view/view) - -;;;; Calendar -(def calendar quo2.components.calendar.calendar.view/view) -(def calendar-day quo2.components.calendar.calendar-day.view/view) -(def calendar-year quo2.components.calendar.calendar-year.view/view) - -;;;; Code -(def snippet quo2.components.code.snippet.view/view) -(def snippet-preview quo2.components.code.snippet-preview.view/view) - -;;;; Cards -(def small-option-card quo2.components.onboarding.small-option-card.view/small-option-card) -(def keycard quo2.components.keycard.view/keycard) - -;;;; Colors -(def color-picker quo2.components.colors.color-picker.view/view) -(def color quo2.components.colors.color.view/view) - -;;;; Community -(def community-card-view-item quo2.components.community.community-card-view/view) -(def communities-membership-list-item - quo2.components.community.community-list-view/communities-membership-list-item) -(def community-stats-column quo2.components.community.community-view/community-stats-column) -(def community-stats quo2.components.community.community-view/community-stats) -(def community-tags quo2.components.community.community-view/community-tags) -(def community-title quo2.components.community.community-view/community-title) -(def permission-tag-container quo2.components.community.community-view/permission-tag-container) -(def discover-card quo2.components.community.banner.view/view) -(def community-icon quo2.components.community.icon/community-icon) -(def token-requirement-list quo2.components.community.token-gating/token-requirement-list) -(def channel-actions quo2.components.community.channel-actions/channel-actions) - -;;;; Counter -(def counter quo2.components.counter.counter.view/view) -(def step quo2.components.counter.step.view/view) - -;;;; Dividers -(def divider-label quo2.components.dividers.divider-label.view/view) -(def divider-line quo2.components.dividers.divider-line.view/view) -(def new-messages quo2.components.dividers.new-messages/view) -(def divider-date quo2.components.dividers.date/date) -(def strength-divider quo2.components.dividers.strength-divider.view/view) - -;;;; Drawers -(def action-drawer quo2.components.drawers.action-drawers.view/action-drawer) -(def documentation-drawers quo2.components.drawers.documentation-drawers.view/view) -(def drawer-buttons quo2.components.drawers.drawer-buttons.view/view) -(def drawer-top quo2.components.drawers.drawer-top.view/view) -(def permission-context quo2.components.drawers.permission-context.view/view) -(def bottom-actions quo2.components.drawers.bottom-actions.view/view) - -;;;; Dropdowns -(def dropdown quo2.components.dropdowns.dropdown.view/view) -(def network-dropdown quo2.components.dropdowns.network-dropdown.view/view) - -;;;; Empty State -(def empty-state quo2.components.empty-state.empty-state.view/empty-state) - -;;;; Graph -(def interactive-graph quo2.components.graph.interactive-graph.view/view) -(def wallet-graph quo2.components.graph.wallet-graph.view/view) - -;;;; Header -(def header quo2.components.header/header) - -;;;; Gradient -(def gradient-cover quo2.components.gradient.gradient-cover.view/view) - -;;;; Icon -(def icon quo2.components.icon/icon) - -;;;; Info -(def info-message quo2.components.info.info-message/info-message) -(def information-box quo2.components.info.information-box.view/view) - -;;;; Inputs -(def input quo2.components.inputs.input.view/input) -(def address-input quo2.components.inputs.address-input.view/address-input) -(def locked-input quo2.components.inputs.locked-input.view/locked-input) -(def profile-input quo2.components.inputs.profile-input.view/profile-input) -(def recovery-phrase-input quo2.components.inputs.recovery-phrase.view/recovery-phrase-input) -(def search-input quo2.components.inputs.search-input.view/search-input) -(def title-input quo2.components.inputs.title-input.view/view) - -;;;; Numbered Keyboard -(def keyboard-key quo2.components.numbered-keyboard.keyboard-key.view/view) -(def numbered-keyboard quo2.components.numbered-keyboard.numbered-keyboard.view/view) - -;;;; Links -(def link-preview quo2.components.links.link-preview.view/view) -(def url-preview quo2.components.links.url-preview.view/view) -(def url-preview-list quo2.components.links.url-preview-list.view/view) - -;;;; List items -(def account-item quo2.components.list-items.account.view/view) -(def account-list-card quo2.components.list-items.account-list-card.view/view) -(def address quo2.components.list-items.address.view/view) -(def channel quo2.components.list-items.channel.view/view) -(def dapp quo2.components.list-items.dapp.view/view) -(def menu-item quo2.components.list-items.menu-item/menu-item) -(def preview-list quo2.components.list-items.preview-list.view/view) -(def user-list quo2.components.list-items.user-list/user-list) -(def community-list-item quo2.components.list-items.community.view/view) -(def saved-address quo2.components.list-items.saved-address.view/view) -(def saved-contact-address quo2.components.list-items.saved-contact-address.view/view) -(def token-value quo2.components.list-items.token-value.view/view) - -;;;; Loaders -(def skeleton-list quo2.components.loaders.skeleton-list.view/view) - -;;;; Navigation -(def bottom-nav-tab quo2.components.navigation.bottom-nav-tab.view/view) -(def floating-shell-button quo2.components.navigation.floating-shell-button.view/view) -(def page-nav quo2.components.navigation.page-nav.view/page-nav) -(def top-nav quo2.components.navigation.top-nav.view/view) - -;;;; Markdown -(def markdown-list quo2.components.markdown.list.view/view) -(def text quo2.components.markdown.text/text) - -;;;; Messages -(def gap quo2.components.messages.gap/gap) -(def system-message quo2.components.messages.system-message.view/system-message) - -;;;; Notifications -(def activity-log quo2.components.notifications.activity-log.view/view) -(def activity-logs-photos quo2.components.notifications.activity-logs-photos.view/view) -(def notification-dot quo2.components.common.notification-dot.view/view) -(def count-down-circle quo2.components.notifications.count-down-circle/circle-timer) -(def notification quo2.components.notifications.notification.view/notification) -(def toast quo2.components.notifications.toast.view/toast) - -;;;; Password -(def tips quo2.components.password.tips.view/view) - -;;;; Profile -(def collectible quo2.components.profile.collectible.view/collectible) -(def profile-card quo2.components.profile.profile-card.view/profile-card) -(def select-profile quo2.components.profile.select-profile.view/view) -(def showcase-nav quo2.components.profile.showcase-nav.view/view) - -;;;; Record Audio -(def record-audio quo2.components.record-audio.record-audio.view/record-audio) -(def soundtrack quo2.components.record-audio.soundtrack.view/f-soundtrack) - -;;;; Selectors -(def author quo2.components.messages.author.view/author) -(def disclaimer quo2.components.selectors.disclaimer.view/view) -(def filter quo2.components.selectors.filter.view/view) -(def reactions-selector quo2.components.selectors.reactions-selector.view/view) -(def react quo2.components.selectors.react.view/view) -(def react-selector quo2.components.selectors.react-selector.view/view) -(def checkbox quo2.components.selectors.selectors.view/checkbox) -(def toggle quo2.components.selectors.selectors.view/toggle) -(def radio quo2.components.selectors.selectors.view/radio) -(def checkbox-prefill quo2.components.selectors.selectors.view/checkbox-prefill) - -;;;; Settings -(def account quo2.components.settings.accounts.view/account) -(def category quo2.components.settings.category.view/category) -(def data-item quo2.components.settings.data-item.view/view) -(def privacy-option quo2.components.settings.privacy-option.view/view) -(def reorder-item quo2.components.settings.reorder-item.view/reorder-item) -(def section-label quo2.components.settings.section-label.view/view) -(def settings-item quo2.components.settings.settings-item.view/view) - -;;;; Share -(def qr-code quo2.components.share.qr-code.view/view) -(def share-qr-code quo2.components.share.share-qr-code.view/view) - -;;;; SWITCHER -(def group-messaging-card quo2.components.switchers.group-messaging-card.view/view) - -;;;; Tabs -(def tabs quo2.components.tabs.tabs.view/view) -(def segmented-control quo2.components.tabs.segmented-tab/segmented-control) -(def account-selector quo2.components.tabs.account-selector/account-selector) - -;;;; Tags -(def context-tag quo2.components.tags.context-tag.view/view) -(def network-tags quo2.components.tags.network-tags.view/view) -(def number-tag quo2.components.tags.number-tag.view/view) -(def permission-tag quo2.components.tags.permission-tag/tag) -(def status-tag quo2.components.tags.status-tags/status-tag) -(def tag quo2.components.tags.tag/tag) -(def tags quo2.components.tags.tags/tags) -(def tiny-tag quo2.components.tags.tiny-tag.view/view) -(def token-tag quo2.components.tags.token-tag/tag) - -;;;; Text combinations -(def text-combinations quo2.components.text-combinations.view/view) - -;;;; Wallet -(def account-card quo2.components.wallet.account-card.view/view) -(def account-origin quo2.components.wallet.account-origin.view/view) -(def account-overview quo2.components.wallet.account-overview.view/view) -(def keypair quo2.components.wallet.keypair.view/view) -(def network-amount quo2.components.wallet.network-amount.view/view) -(def network-bridge quo2.components.wallet.network-bridge.view/view) -(def progress-bar quo2.components.wallet.progress-bar.view/view) -(def summary-info quo2.components.wallet.summary-info.view/view) -(def network-link quo2.components.wallet.network-link.view/view) -(def token-input quo2.components.wallet.token-input.view/view) -(def wallet-overview quo2.components.wallet.wallet-overview.view/view) -(def wallet-activity quo2.components.wallet.wallet-activity.view/view) -(def transaction-summary quo2.components.wallet.transaction-summary.view/view) diff --git a/src/quo2/core_spec.cljs b/src/quo2/core_spec.cljs deleted file mode 100644 index ab95865bd3..0000000000 --- a/src/quo2/core_spec.cljs +++ /dev/null @@ -1,86 +0,0 @@ -(ns quo2.core-spec - (:require - [quo2.components.avatars.account-avatar.component-spec] - [quo2.components.avatars.user-avatar.component-spec] - [quo2.components.banners.banner.component-spec] - [quo2.components.browser.browser-input.component-spec] - [quo2.components.buttons.button.component-spec] - [quo2.components.buttons.composer-button.component-spec] - [quo2.components.buttons.predictive-keyboard.component-spec] - [quo2.components.buttons.slide-button.component-spec] - [quo2.components.buttons.wallet-button.component-spec] - [quo2.components.buttons.wallet-ctas.component-spec] - [quo2.components.calendar.calendar-day.component-spec] - [quo2.components.calendar.calendar-year.component-spec] - [quo2.components.calendar.calendar.component-spec] - [quo2.components.calendar.calendar.month-picker.component-spec] - [quo2.components.colors.color-picker.component-spec] - [quo2.components.counter.counter.component-spec] - [quo2.components.counter.step.component-spec] - [quo2.components.dividers.divider-label.component-spec] - [quo2.components.dividers.strength-divider.component-spec] - [quo2.components.drawers.action-drawers.component-spec] - [quo2.components.drawers.bottom-actions.component-spec] - [quo2.components.drawers.documentation-drawers.component-spec] - [quo2.components.drawers.drawer-buttons.component-spec] - [quo2.components.drawers.drawer-top.component-spec] - [quo2.components.drawers.permission-context.component-spec] - [quo2.components.dropdowns.dropdown.component-spec] - [quo2.components.dropdowns.network-dropdown.component-spec] - [quo2.components.gradient.gradient-cover.component-spec] - [quo2.components.graph.wallet-graph.component-spec] - [quo2.components.inputs.address-input.component-spec] - [quo2.components.inputs.input.component-spec] - [quo2.components.inputs.locked-input.component-spec] - [quo2.components.inputs.locked-input.component-spec] - [quo2.components.inputs.profile-input.component-spec] - [quo2.components.inputs.recovery-phrase.component-spec] - [quo2.components.inputs.title-input.component-spec] - [quo2.components.keycard.component-spec] - [quo2.components.links.link-preview.component-spec] - [quo2.components.links.url-preview-list.component-spec] - [quo2.components.links.url-preview.component-spec] - [quo2.components.list-items.account.component-spec] - [quo2.components.list-items.channel.component-spec] - [quo2.components.list-items.community.component-spec] - [quo2.components.list-items.dapp.component-spec] - [quo2.components.list-items.saved-address.component-spec] - [quo2.components.list-items.saved-contact-address.component-spec] - [quo2.components.list-items.token-value.component-spec] - [quo2.components.loaders.skeleton-list.component-spec] - [quo2.components.markdown.list.component-spec] - [quo2.components.markdown.text-component-spec] - [quo2.components.navigation.top-nav.component-spec] - [quo2.components.notifications.notification.component-spec] - [quo2.components.numbered-keyboard.keyboard-key.component-spec] - [quo2.components.onboarding.small-option-card.component-spec] - [quo2.components.password.tips.component-spec] - [quo2.components.profile.select-profile.component-spec] - [quo2.components.profile.showcase-nav.component-spec] - [quo2.components.record-audio.record-audio.component-spec] - [quo2.components.record-audio.soundtrack.component-spec] - [quo2.components.selectors.disclaimer.component-spec] - [quo2.components.selectors.filter.component-spec] - [quo2.components.selectors.reactions-selector.component-spec] - [quo2.components.selectors.selectors.component-spec] - [quo2.components.settings.category.component-spec] - [quo2.components.settings.data-item.component-spec] - [quo2.components.settings.reorder-item.component-spec] - [quo2.components.settings.settings-item.component-spec] - [quo2.components.share.share-qr-code.component-spec] - [quo2.components.switchers.base-card.component-spec] - [quo2.components.switchers.group-messaging-card.component-spec] - [quo2.components.tags.network-tags.component-spec] - [quo2.components.tags.status-tags-component-spec] - [quo2.components.wallet.account-card.component-spec] - [quo2.components.wallet.account-origin.component-spec] - [quo2.components.wallet.account-overview.component-spec] - [quo2.components.wallet.keypair.component-spec] - [quo2.components.wallet.network-amount.component-spec] - [quo2.components.wallet.network-bridge.component-spec] - [quo2.components.wallet.progress-bar.component-spec] - [quo2.components.wallet.summary-info.component-spec] - [quo2.components.wallet.token-input.component-spec] - [quo2.components.wallet.transaction-summary.component-spec] - [quo2.components.wallet.wallet-activity.component-spec] - [quo2.components.wallet.wallet-overview.component-spec])) diff --git a/src/status_im/bottom_sheet/sheets.cljs b/src/status_im/bottom_sheet/sheets.cljs index 19722af98e..f5273b1a1c 100644 --- a/src/status_im/bottom_sheet/sheets.cljs +++ b/src/status_im/bottom_sheet/sheets.cljs @@ -1,6 +1,6 @@ (ns status-im.bottom-sheet.sheets (:require - [quo2.theme :as theme] + [quo.theme :as theme] [react-native.core :as rn] [status-im.bottom-sheet.view :as bottom-sheet] [status-im.ui.screens.about-app.views :as about-app] diff --git a/src/status_im/bottom_sheet/styles.cljs b/src/status_im/bottom_sheet/styles.cljs index 25b909befa..726b3eb236 100644 --- a/src/status_im/bottom_sheet/styles.cljs +++ b/src/status_im/bottom_sheet/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.bottom-sheet.styles (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def border-radius 20) diff --git a/src/status_im/communities/core.cljs b/src/status_im/communities/core.cljs index a5c95678f7..0cfea20763 100644 --- a/src/status_im/communities/core.cljs +++ b/src/status_im/communities/core.cljs @@ -3,7 +3,7 @@ [clojure.set :as set] [clojure.string :as string] [clojure.walk :as walk] - [quo2.foundations.colors :as quo2.colors] + [quo.foundations.colors :as quo.colors] [re-frame.core :as re-frame] [status-im.bottom-sheet.events :as bottom-sheet] [status-im.ui.components.colors :as colors] @@ -921,9 +921,9 @@ {:db (assoc-in db [:communities community-id :muted-till] muted-till) :dispatch [:toasts/upsert {:icon :correct - :icon-color (quo2.colors/theme-colors - quo2.colors/success-60 - quo2.colors/success-50) + :icon-color (quo.colors/theme-colors + quo.colors/success-60 + quo.colors/success-50) :text (if muted? (when (some? muted-till) (time-string :t/muted-until (format-mute-till muted-till))) diff --git a/src/status_im/multiaccounts/core.cljs b/src/status_im/multiaccounts/core.cljs index dbf300ce87..fccbfe451b 100644 --- a/src/status_im/multiaccounts/core.cljs +++ b/src/status_im/multiaccounts/core.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [native-module.core :as native-module] - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [re-frame.core :as re-frame] [react-native.platform :as platform] [status-im.bottom-sheet.events :as bottom-sheet] diff --git a/src/status_im/signals/core.cljs b/src/status_im/signals/core.cljs index 7a663adfdf..b9a919ae77 100644 --- a/src/status_im/signals/core.cljs +++ b/src/status_im/signals/core.cljs @@ -1,6 +1,6 @@ (ns status-im.signals.core (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [status-im.chat.models.message :as models.message] [status-im.ethereum.subscriptions :as ethereum.subscriptions] [status-im.mailserver.core :as mailserver] diff --git a/src/status_im/ui/components/chat_icon/screen.cljs b/src/status_im/ui/components/chat_icon/screen.cljs index 9771d9a582..ac9cada3b3 100644 --- a/src/status_im/ui/components/chat_icon/screen.cljs +++ b/src/status_im/ui/components/chat_icon/screen.cljs @@ -1,9 +1,9 @@ (ns status-im.ui.components.chat-icon.screen (:require [clojure.string :as string] - [quo2.components.avatars.user-avatar.style :as user-avatar.style] - [quo2.core :as quo] - [quo2.theme :as theme] + [quo.components.avatars.user-avatar.style :as user-avatar.style] + [quo.core :as quo] + [quo.theme :as theme] [re-frame.core :as re-frame.core] [react-native.core :as rn] [status-im.ethereum.ens :as ens] diff --git a/src/status_im/ui/components/topbar.cljs b/src/status_im/ui/components/topbar.cljs index 4f2a3950fa..78b042337e 100644 --- a/src/status_im/ui/components/topbar.cljs +++ b/src/status_im/ui/components/topbar.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.components.topbar (:require - [quo2.foundations.colors :as quo2.colors] + [quo.foundations.colors :as quo.colors] [re-frame.core :as re-frame] [react-native.safe-area :as safe-area] [status-im.ui.components.core :as quo])) @@ -45,5 +45,5 @@ (when (seq right-accessories) {:right-accessories right-accessories}) (when new-ui? - {:background (quo2.colors/theme-colors quo2.colors/neutral-5 - quo2.colors/neutral-95)}))])) + {:background (quo.colors/theme-colors quo.colors/neutral-5 + quo.colors/neutral-95)}))])) diff --git a/src/status_im/ui/screens/chat/message/gap.cljs b/src/status_im/ui/screens/chat/message/gap.cljs index aae7e15b54..53bbcfda5f 100644 --- a/src/status_im/ui/screens/chat/message/gap.cljs +++ b/src/status_im/ui/screens/chat/message/gap.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.chat.message.gap (:require-macros [status-im.utils.views :as views]) (:require - [quo2.core :as quo2] + [quo.core :as quo] [re-frame.core :as re-frame] [status-im.ui.components.react :as react] [status-im.ui.screens.chat.styles.input.gap :as style] @@ -25,7 +25,7 @@ :style {:height (if in-progress? window-height 48)}} [react/view {:style style/label-container} (if in-progress? - [quo2/skeleton-list + [quo/skeleton-list {:parent-height window-height :animated true :content :messages}] diff --git a/src/status_im/ui/screens/chat/message/legacy_view.cljs b/src/status_im/ui/screens/chat/message/legacy_view.cljs index fbb6795dfd..a3e1208344 100644 --- a/src/status_im/ui/screens/chat/message/legacy_view.cljs +++ b/src/status_im/ui/screens/chat/message/legacy_view.cljs @@ -1,8 +1,8 @@ (ns status-im.ui.screens.chat.message.legacy-view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.foundations.typography :as typography] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.foundations.typography :as typography] [react-native.core :as rn] [status-im.react-native.resources :as resources] [status-im.ui.components.colors :as quo.colors] diff --git a/src/status_im/ui/screens/chat/styles/message/message.cljs b/src/status_im/ui/screens/chat/styles/message/message.cljs index 8364245d60..bbd3eb8d6c 100644 --- a/src/status_im/ui/screens/chat/styles/message/message.cljs +++ b/src/status_im/ui/screens/chat/styles/message/message.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.chat.styles.message.message (:require - [quo2.foundations.colors :as quo2.colors] - [quo2.foundations.typography :as typography] + [quo.foundations.colors :as quo.colors] + [quo.foundations.typography :as typography] [status-im.ui.components.colors :as colors] [status-im.ui.components.react :as react] [status-im2.constants :as constants])) @@ -191,7 +191,7 @@ (defn message-default-style [] {:font-family "Inter-Regular" - :color (quo2.colors/theme-colors quo2.colors/neutral-100 quo2.colors/white) + :color (quo.colors/theme-colors quo.colors/neutral-100 quo.colors/white) :font-size 15 :line-height 21.75 :letter-spacing -0.135}) @@ -279,7 +279,7 @@ (update (default-text-style) :style assoc - :color (quo2.colors/theme-colors quo2.colors/neutral-40 quo2.colors/neutral-50) + :color (quo.colors/theme-colors quo.colors/neutral-40 quo.colors/neutral-50) :font-size 13 :line-height 18.2 :letter-spacing (typography/tracking 13)))) diff --git a/src/status_im/ui/screens/home/views/inner_item.cljs b/src/status_im/ui/screens/home/views/inner_item.cljs index 92ee046b43..8809ccc930 100644 --- a/src/status_im/ui/screens/home/views/inner_item.cljs +++ b/src/status_im/ui/screens/home/views/inner_item.cljs @@ -1,8 +1,8 @@ (ns status-im.ui.screens.home.views.inner-item (:require [clojure.string :as string] - [quo2.components.markdown.text :as quo2.text] - [quo2.foundations.colors :as quo2.colors] + [quo.components.markdown.text :as quo.text] + [quo.foundations.colors :as quo.colors] [re-frame.core :as re-frame] [status-im.ui.components.badge :as badge] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] @@ -187,7 +187,7 @@ (defn chat-item-title [chat-id muted group-chat chat-name edit?] - [quo2.text/text + [quo.text/text {:weight :semi-bold :color (when muted :secondary) :accessibility-label :chat-name-text @@ -242,7 +242,7 @@ :right 8 :bottom 2 :border-radius 16 - :background-color quo2.colors/primary-50-opa-5}]) + :background-color quo.colors/primary-50-opa-5}]) [chat-icon.screen/emoji-chat-icon-view chat-id group-chat chat-name emoji {:container (assoc chat-icon.styles/container-chat-list :top 12 @@ -260,13 +260,13 @@ [unviewed-indicator home-item]]) [react/view {:position :absolute :left 72 :top 32 :right 80} (if public? - [quo2.text/text + [quo.text/text {:color :secondary :number-of-lines 1 :ellipsize-mode :middle :weight :medium - :style {:color (quo2.colors/theme-colors quo2.colors/neutral-50 - quo2.colors/neutral-40)}} + :style {:color (quo.colors/theme-colors quo.colors/neutral-50 + quo.colors/neutral-40)}} (i18n/label :t/public)] (if group-chat [react/view @@ -281,15 +281,15 @@ :container-style {:width 16 :height 16 :margin-right 4}}] - [quo2.text/text + [quo.text/text {:weight :medium - :style {:color (quo2.colors/theme-colors quo2.colors/neutral-50 quo2.colors/neutral-40)}} + :style {:color (quo.colors/theme-colors quo.colors/neutral-50 quo.colors/neutral-40)}} (i18n/label :t/members-count {:count (count group-members-public-keys)})]] - [quo2.text/text + [quo.text/text {:monospace true :weight :medium - :style {:color (quo2.colors/theme-colors quo2.colors/neutral-50 - quo2.colors/neutral-40)} + :style {:color (quo.colors/theme-colors quo.colors/neutral-50 + quo.colors/neutral-40)} :number-of-lines 1 :ellipsize-mode :middle} (utils.utils/get-shortened-address chat-id)]))]]])) diff --git a/src/status_im/ui/screens/profile/contact/views.cljs b/src/status_im/ui/screens/profile/contact/views.cljs index 3d6b6214f8..8da516f9ad 100644 --- a/src/status_im/ui/screens/profile/contact/views.cljs +++ b/src/status_im/ui/screens/profile/contact/views.cljs @@ -1,8 +1,8 @@ (ns status-im.ui.screens.profile.contact.views (:require [clojure.string :as string] - [quo2.components.avatars.user-avatar.style :as user-avatar.style] - [quo2.theme :as theme] + [quo.components.avatars.user-avatar.style :as user-avatar.style] + [quo.theme :as theme] [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.multiaccounts.core :as multiaccounts] diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index c1bc007049..d1e69d131b 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.profile.user.views (:require - [quo2.components.avatars.user-avatar.style :as user-avatar.style] - [quo2.theme :as theme] + [quo.components.avatars.user-avatar.style :as user-avatar.style] + [quo.theme :as theme] [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.ethereum.stateofus :as stateofus] @@ -127,10 +127,10 @@ (when config/quo-preview-enabled? [list.item/list-item {:icon :main-icons/appearance - :title "Quo2.0 Preview" + :title "Quo Preview" :accessibility-label :appearance-settings-button :chevron true - :on-press #(re-frame/dispatch [:navigate-to :quo2-preview])}]) + :on-press #(re-frame/dispatch [:navigate-to :quo-preview])}]) [list.item/list-item {:icon :main-icons/appearance :title (i18n/label :t/appearance) diff --git a/src/status_im/ui/screens/profile/visibility_status/styles.cljs b/src/status_im/ui/screens/profile/visibility_status/styles.cljs index a4a183c7e3..b40d78855d 100644 --- a/src/status_im/ui/screens/profile/visibility_status/styles.cljs +++ b/src/status_im/ui/screens/profile/visibility_status/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.profile.visibility-status.styles (:require - [quo2.foundations.colors :as quo2.colors] + [quo.foundations.colors :as quo.colors] [status-im.ui.components.colors :as colors])) (defn visibility-status-button-container @@ -24,7 +24,7 @@ :height size :border-radius (/ size 2) :border-width 3.5 - :border-color (quo2.colors/theme-colors quo2.colors/white quo2.colors/neutral-90)} + :border-color (quo.colors/theme-colors quo.colors/white quo.colors/neutral-90)} {:background-color color :width size :height size diff --git a/src/status_im/ui/screens/profile/visibility_status/utils.cljs b/src/status_im/ui/screens/profile/visibility_status/utils.cljs index da0cccd949..37ada7836b 100644 --- a/src/status_im/ui/screens/profile/visibility_status/utils.cljs +++ b/src/status_im/ui/screens/profile/visibility_status/utils.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.profile.visibility-status.utils (:require - [quo2.foundations.colors :as quo2.colors] + [quo.foundations.colors :as quo.colors] [status-im.ui.components.colors :as colors] [status-im.ui.screens.profile.visibility-status.styles :as styles] [status-im2.constants :as constants] @@ -24,7 +24,7 @@ {:color colors/red :title (i18n/label :t/error)} constants/visibility-status-automatic - {:color quo2.colors/success-50 + {:color quo.colors/success-50 :title (i18n/label :t/status-automatic) :subtitle (i18n/label :t/status-automatic-subtitle)} constants/visibility-status-dnd @@ -32,7 +32,7 @@ :title (i18n/label :t/status-dnd) :subtitle (i18n/label :t/status-dnd-subtitle)} constants/visibility-status-always-online - {:color quo2.colors/success-50 + {:color quo.colors/success-50 :title (i18n/label :t/status-always-online)} constants/visibility-status-inactive {:color colors/color-inactive @@ -79,7 +79,7 @@ (defn icon-dot-accessibility-label [dot-color] - (if (= dot-color quo2.colors/success-50) + (if (= dot-color quo.colors/success-50) :online-profile-photo-dot :offline-profile-photo-dot)) diff --git a/src/status_im/ui/screens/screens.cljs b/src/status_im/ui/screens/screens.cljs index d791c7a863..57a208eb4e 100644 --- a/src/status_im/ui/screens/screens.cljs +++ b/src/status_im/ui/screens/screens.cljs @@ -144,7 +144,7 @@ {:name :wallet :on-focus [:wallet/tab-opened] ;;TODO wallet redesign - ;;:options {:statusBar {:backgroundColor quo2.colors/neutral-5}} + ;;:options {:statusBar {:backgroundColor quo.colors/neutral-5}} :component wallet.accounts/accounts-overview-old} {:name :wallet-account ;;TODO dynamic titleaccounts-overview diff --git a/src/status_im/ui/screens/wallet/account/views.cljs b/src/status_im/ui/screens/wallet/account/views.cljs index 79db62740c..4a2c01a2c9 100644 --- a/src/status_im/ui/screens/wallet/account/views.cljs +++ b/src/status_im/ui/screens/wallet/account/views.cljs @@ -1,13 +1,13 @@ (ns status-im.ui.screens.wallet.account.views (:require - [quo2.components.markdown.text :as quo2.text] - [quo2.core :as quo2] - [quo2.foundations.colors :as quo2.colors] + [quo.components.markdown.text :as quo.text] + [quo.core :as quo] + [quo.foundations.colors :as quo.colors] [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.ui.components.animation :as animation] [status-im.ui.components.colors :as colors] - [status-im.ui.components.core :as quo] + [status-im.ui.components.core :as components.core] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] [status-im.ui.components.spacing :as spacing] @@ -53,7 +53,7 @@ portfolio-value]) [react/text {:style {:font-size 32 :color colors/white-transparent-persist :font-weight "600"}} (str " " (:code currency))]] - [quo/text + [components.core/text {:number-of-lines 1 :ellipsize-mode :middle :monospace true @@ -123,7 +123,7 @@ (let [tab @selected-tab] [react/view {:flex 1} [react/view {:padding-horizontal 20 :padding-bottom 20} - [quo2/tabs + [quo/tabs {:size 24 :on-change #(reset! selected-tab %) :default-active :tokens @@ -279,7 +279,7 @@ ;fetching-error (rf/sub [:wallet/fetching-error])] [react/view {:flex 1 - :background-color (quo2.colors/theme-colors quo2.colors/white quo2.colors/neutral-90) + :background-color (quo.colors/theme-colors quo.colors/white quo.colors/neutral-90) :border-top-left-radius 20 :border-top-right-radius 20 :elevation 4 @@ -288,18 +288,18 @@ :shadow-color (:shadow-01 @colors/theme) :shadow-offset {:width 0 :height 4}} [react/view {:padding 20} - [quo2.text/text {:size :heading-2 :weight :semi-bold} (str portfolio-value " " (:code currency))]] + [quo.text/text {:size :heading-2 :weight :semi-bold} (str portfolio-value " " (:code currency))]] [react/view [react/scroll-view {:horizontal true :margin-bottom 32 :showsHorizontalScrollIndicator false} [react/view {:width 20}] - [quo2/button {:size 56 :width button-width :above :i/placeholder} "Buy"] + [quo/button {:size 56 :width button-width :above :i/placeholder} "Buy"] [react/view {:width 12}] - [quo2/button {:size 56 :width button-width :type :secondary :above :i/placeholder} "Send"] + [quo/button {:size 56 :width button-width :type :secondary :above :i/placeholder} "Send"] [react/view {:width 12}] - [quo2/button {:size 56 :width button-width :type :secondary :above :i/placeholder} + [quo/button {:size 56 :width button-width :type :secondary :above :i/placeholder} "Receive"] [react/view {:width 12}] - [quo2/button {:size 56 :width button-width :type :secondary :above :i/placeholder} "Swap"] + [quo/button {:size 56 :width button-width :type :secondary :above :i/placeholder} "Swap"] [react/view {:width 20}]]] [assets-and-collections-new selected-account]])) diff --git a/src/status_im/ui/screens/wallet/accounts/common.cljs b/src/status_im/ui/screens/wallet/accounts/common.cljs index 90f72a314e..fb33dfaa79 100644 --- a/src/status_im/ui/screens/wallet/accounts/common.cljs +++ b/src/status_im/ui/screens/wallet/accounts/common.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.wallet.accounts.common (:require - [quo2.components.markdown.text :as quo2.text] - [quo2.foundations.colors :as quo2.colors] + [quo.components.markdown.text :as quo.text] + [quo.foundations.colors :as quo.colors] [re-frame.core :as re-frame] [react-native.core :as rn] [reagent.core :as reagent] @@ -66,14 +66,14 @@ [chat-icon/custom-icon-view-list (:name token) color])] [rn/view {:position :absolute :left 52 :top 8 :right 12} [rn/view {:flex-direction :row :justify-content :space-between :align-items :center} - [quo2.text/text {:weight :semi-bold :style {:height 22}} + [quo.text/text {:weight :semi-bold :style {:height 22}} name] - [quo2.text/text {:size :paragraph-2 :weight :medium} + [quo.text/text {:size :paragraph-2 :weight :medium} (str (if value value "...") " " currency)]] - [quo2.text/text + [quo.text/text {:size :paragraph-2 :weight :medium - :style {:color (quo2.colors/theme-colors quo2.colors/neutral-50 quo2.colors/neutral-40)}} + :style {:color (quo.colors/theme-colors quo.colors/neutral-50 quo.colors/neutral-40)}} (str (if amount (wallet.utils/format-amount amount decimals) "...") diff --git a/src/status_im/ui/screens/wallet/accounts/views.cljs b/src/status_im/ui/screens/wallet/accounts/views.cljs index d6faf52314..151d185f9c 100644 --- a/src/status_im/ui/screens/wallet/accounts/views.cljs +++ b/src/status_im/ui/screens/wallet/accounts/views.cljs @@ -1,8 +1,8 @@ (ns status-im.ui.screens.wallet.accounts.views (:require - [quo2.components.markdown.text :as quo2.text] - [quo2.core :as quo2] - [quo2.foundations.colors :as quo2.colors] + [quo.components.markdown.text :as quo.text] + [quo.core :as quo] + [quo.foundations.colors :as quo.colors] [re-frame.core :as re-frame] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] @@ -10,7 +10,7 @@ [status-im.keycard.login :as keycard.login] [status-im.qr-scanner.core :as qr-scanner] [status-im.ui.components.colors :as colors] - [status-im.ui.components.core :as quo] + [status-im.ui.components.core :as components.core] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] [status-im.ui.screens.wallet.account.views :as account.views] @@ -32,7 +32,7 @@ [react/view {:style (styles/card color card-width)} [react/view {:flex-direction :row :align-items :center :justify-content :space-between} [react/text {:style styles/card-name} name] - [quo/text styles/card-address + [components.core/text styles/card-address address]] [react/view {:flex-direction :row :align-items :center :justify-content :space-between} [react/view {:style {:flex-direction :row}} @@ -84,7 +84,7 @@ [] (views/letsubs [account [:multiaccount/default-account]] [react/view styles/send-button-container - [quo/button + [components.core/button {:accessibility-label :send-transaction-button :type :scale :on-press #(re-frame/dispatch [:wallet/prepare-transaction-from-wallet account])} @@ -185,12 +185,12 @@ :animation animation}) :pointer-events :none} [reanimated/view {:style {:justify-content :center}} - [quo/text + [components.core/text {:animated? true :weight :semi-bold :style (styles/value-text {:minimized minimized})} portfolio-value - [quo/text + [components.core/text {:animated? true :size :inherit :weight :inherit @@ -198,7 +198,7 @@ (str " " (:code currency))]]]] (when-not minimized [reanimated/view - [quo/text {:color :secondary} + [components.core/text {:color :secondary} (i18n/label :t/wallet-total-value)]])])) (views/defview total-value @@ -206,8 +206,8 @@ (views/letsubs [currency [:wallet/currency] portfolio-value [:portfolio-value]] [react/view {:padding-vertical 12} - [quo2.text/text (i18n/label :t/wallet-total-value)] - [quo2.text/text {:size :heading-1 :weight :semi-bold} + [quo.text/text (i18n/label :t/wallet-total-value)] + [quo.text/text {:size :heading-1 :weight :semi-bold} (str portfolio-value " " (:code currency))] [react/scroll-view {:horizontal true}]])) @@ -226,11 +226,11 @@ :margin-top 12 :margin-bottom 20} [react/view {:flex-direction :row} - [quo2/tabs + [quo/tabs {:default-active (:address (first visible-accounts)) :on-change #(reset! selected-account-atom %) :data accounts-data}] - [quo2/button + [quo/button {:type :grey :size 32 :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old @@ -246,11 +246,11 @@ [react/view {:style {:flex 1 :padding-top (safe-area/get-top) - :background-color (quo2.colors/theme-colors quo2.colors/neutral-5 - quo2.colors/neutral-95)}} + :background-color (quo.colors/theme-colors quo.colors/neutral-5 + quo.colors/neutral-95)}} [react/view {:padding-horizontal 20} [react/view {:flex-direction :row :height 56 :align-items :center :justify-content :flex-end} - [quo2/button + [quo/button {:icon true :size 32 :type :grey @@ -260,7 +260,7 @@ {:handler :wallet.send/qr-scanner-result}])} :i/placeholder] [react/view {:width 12}] - [quo2/button + [quo/button {:icon true :size 32 :type :grey @@ -278,7 +278,7 @@ mainnet? @(re-frame/subscribe [:mainnet?])] [react/view {:style {:flex 1}} - [quo/animated-header + [components.core/animated-header {:extended-header total-value-old :refresh-control common/refresh-control :refreshing-sub (re-frame/subscribe [:wallet/refreshing-history?]) diff --git a/src/status_im/ui/screens/wallet/send/views.cljs b/src/status_im/ui/screens/wallet/send/views.cljs index 4a6d573b12..7e77b180f6 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-macros [status-im.utils.views :refer [defview letsubs] :as views]) (:require - [quo2.core :as quo2] + [quo.core :as quo] [re-frame.core :as re-frame] [status-im.commands.core :as commands] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.bottom-panel.views :as bottom-panel] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.colors :as colors] - [status-im.ui.components.core :as quo] + [status-im.ui.components.core :as components.core] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.keyboard-avoid-presentation :as kb-presentation] [status-im.ui.components.list.item :as list.item] @@ -82,7 +82,7 @@ (if from-chat? [list.item/list-item {:title (multiaccounts/displayed-name contact) - :subtitle [quo/text + :subtitle [components.core/text {:monospace true :color :secondary} (utils/get-shortened-checksum-address (:address contact))] @@ -90,7 +90,7 @@ [list.item/list-item (merge {:title (if-not contact (i18n/label :t/wallet-choose-recipient) - [quo/text + [components.core/text {:size :large :monospace true} (utils/get-shortened-checksum-address @@ -139,7 +139,7 @@ :padding-horizontal 24 :align-items :center :margin-vertical 16}] - [quo/list-header + [components.core/list-header (i18n/label :t/from-capitalized)] [react/view {:flex-direction :row :flex 1 :align-items :center} [react/view {:flex 1} @@ -147,12 +147,12 @@ [toolbar/toolbar {:left [react/view {:padding-horizontal 8} - [quo/button + [components.core/button {:type :secondary :on-press #(re-frame/dispatch [:set :commands/select-account nil])} (i18n/label :t/cancel)]] :right - [quo/button + [components.core/button {:accessibility-label :select-account-bottom-sheet :disabled (nil? from) :on-press #(re-frame/dispatch @@ -205,7 +205,7 @@ :font-size 12}])] [fiat-value amount-text token prices wallet-currency] [components/separator] - [quo/list-header + [components.core/list-header (i18n/label :t/to-capitalized)] [react/view {:flex-direction :row :flex 1 :align-items :center} [react/view {:flex 1} @@ -213,7 +213,7 @@ [toolbar/toolbar {:show-border? true :right - [quo/button + [components.core/button {:type :secondary :after :main-icon/next :accessibility-label :request-transaction-bottom-sheet @@ -237,7 +237,7 @@ (let [to-norm (address/normalized-hex (if (string? to) to (:address to)))] [kb-presentation/keyboard-avoiding-view {:style {:flex 1}} [:<> - [quo2/page-nav + [quo/page-nav {:type :title :text-align :left :title (i18n/label :t/send-transaction) @@ -280,11 +280,11 @@ (when-not (or request? from-chat?) [set-max token]) [components/separator] - [quo/list-header (i18n/label :t/from-capitalized)] + [components.core/list-header (i18n/label :t/from-capitalized)] [react/view {:flex-direction :row :flex 1 :align-items :center} [react/view {:flex 1} [render-account from token :wallet.send/set-field]]] - [quo/list-header + [components.core/list-header (i18n/label :t/to-capitalized)] [react/view {:flex-direction :row :flex 1 :align-items :center} [react/view {:flex 1} diff --git a/src/status_im2/common/bottom_sheet/style.cljs b/src/status_im2/common/bottom_sheet/style.cljs index 1476be9735..03eb255b7f 100644 --- a/src/status_im2/common/bottom_sheet/style.cljs +++ b/src/status_im2/common/bottom_sheet/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.common.bottom-sheet.style (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.platform :as platform])) (defn handle diff --git a/src/status_im2/common/bottom_sheet/view.cljs b/src/status_im2/common/bottom_sheet/view.cljs index d3531a5f06..368afe4071 100644 --- a/src/status_im2/common/bottom_sheet/view.cljs +++ b/src/status_im2/common/bottom_sheet/view.cljs @@ -1,9 +1,9 @@ (ns status-im2.common.bottom-sheet.view (:require [oops.core :as oops] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.blur :as blur] [react-native.core :as rn] [react-native.gesture :as gesture] diff --git a/src/status_im2/common/bottom_sheet_screen/style.cljs b/src/status_im2/common/bottom_sheet_screen/style.cljs index 56b2ce5335..3510ec8fc7 100644 --- a/src/status_im2/common/bottom_sheet_screen/style.cljs +++ b/src/status_im2/common/bottom_sheet_screen/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.common.bottom-sheet-screen.style (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.reanimated :as reanimated])) (defn background diff --git a/src/status_im2/common/bottom_sheet_screen/view.cljs b/src/status_im2/common/bottom_sheet_screen/view.cljs index b5e689e5d2..e7f1706141 100644 --- a/src/status_im2/common/bottom_sheet_screen/view.cljs +++ b/src/status_im2/common/bottom_sheet_screen/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.common.bottom-sheet-screen.view (:require [oops.core :as oops] - [quo2.theme :as theme] + [quo.theme :as theme] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.hooks :as hooks] diff --git a/src/status_im2/common/confirmation_drawer/style.cljs b/src/status_im2/common/confirmation_drawer/style.cljs index 2657f5e5fe..91a6895253 100644 --- a/src/status_im2/common/confirmation_drawer/style.cljs +++ b/src/status_im2/common/confirmation_drawer/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.confirmation-drawer.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn context-container [] diff --git a/src/status_im2/common/confirmation_drawer/view.cljs b/src/status_im2/common/confirmation_drawer/view.cljs index 8266d0bce7..f58826d79f 100644 --- a/src/status_im2/common/confirmation_drawer/view.cljs +++ b/src/status_im2/common/confirmation_drawer/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.confirmation-drawer.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.confirmation-drawer.style :as style] diff --git a/src/status_im2/common/contact_list/view.cljs b/src/status_im2/common/contact_list/view.cljs index 1b9a2d0637..614ca6c8cd 100644 --- a/src/status_im2/common/contact_list/view.cljs +++ b/src/status_im2/common/contact_list/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.contact-list.view (:require - [quo2.core :as quo])) + [quo.core :as quo])) (defn contacts-section-header [{:keys [title]}] diff --git a/src/status_im2/common/contact_list_item/view.cljs b/src/status_im2/common/contact_list_item/view.cljs index b693f37b84..1e087c56dd 100644 --- a/src/status_im2/common/contact_list_item/view.cljs +++ b/src/status_im2/common/contact_list_item/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.contact-list-item.view (:require - [quo2.core :as quo] + [quo.core :as quo] [utils.address :as address] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/device_permissions.cljs b/src/status_im2/common/device_permissions.cljs index 0c326a08a6..bf1143dd46 100644 --- a/src/status_im2/common/device_permissions.cljs +++ b/src/status_im2/common/device_permissions.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.device-permissions (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/home/actions/view.cljs b/src/status_im2/common/home/actions/view.cljs index 47a7fdb698..10fd92e0b5 100644 --- a/src/status_im2/common/home/actions/view.cljs +++ b/src/status_im2/common/home/actions/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.common.home.actions.view (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [status-im2.common.confirmation-drawer.view :as confirmation-drawer] [status-im2.common.mute-drawer.view :as mute-drawer] [status-im2.common.muting.helpers :refer [format-mute-till]] diff --git a/src/status_im2/common/home/banner/view.cljs b/src/status_im2/common/home/banner/view.cljs index ec6a0fafa6..976ffe92d0 100644 --- a/src/status_im2/common/home/banner/view.cljs +++ b/src/status_im2/common/home/banner/view.cljs @@ -1,9 +1,9 @@ (ns status-im2.common.home.banner.view (:require [oops.core :as oops] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.blur :as blur] [react-native.core :as rn] [react-native.platform :as platform] diff --git a/src/status_im2/common/home/empty_state/view.cljs b/src/status_im2/common/home/empty_state/view.cljs index 308f620dbf..ba026fd6d3 100644 --- a/src/status_im2/common/home/empty_state/view.cljs +++ b/src/status_im2/common/home/empty_state/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.home.empty-state.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.common.home.empty-state.style :as style] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/home/title_column/view.cljs b/src/status_im2/common/home/title_column/view.cljs index 6d40ca5627..ace75e76b7 100644 --- a/src/status_im2/common/home/title_column/view.cljs +++ b/src/status_im2/common/home/title_column/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.home.title-column.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.common.home.title-column.style :as style] [status-im2.common.plus-button.view :as plus-button])) diff --git a/src/status_im2/common/home/top_nav/view.cljs b/src/status_im2/common/home/top_nav/view.cljs index 5615d0fb2f..4dd3ad9d0f 100644 --- a/src/status_im2/common/home/top_nav/view.cljs +++ b/src/status_im2/common/home/top_nav/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.home.top-nav.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im.multiaccounts.core :as multiaccounts] [status-im2.common.home.top-nav.style :as style] diff --git a/src/status_im2/common/mute_drawer/style.cljs b/src/status_im2/common/mute_drawer/style.cljs index 115834d30a..1b5af913c7 100644 --- a/src/status_im2/common/mute_drawer/style.cljs +++ b/src/status_im2/common/mute_drawer/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.mute-drawer.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn header-text [] diff --git a/src/status_im2/common/mute_drawer/view.cljs b/src/status_im2/common/mute_drawer/view.cljs index d6cda38f21..7c52643a39 100644 --- a/src/status_im2/common/mute_drawer/view.cljs +++ b/src/status_im2/common/mute_drawer/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.mute-drawer.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.common.mute-drawer.style :as style] [status-im2.constants :as constants] diff --git a/src/status_im2/common/password_authentication/view.cljs b/src/status_im2/common/password_authentication/view.cljs index cdc70d44cc..c7fee1e82c 100644 --- a/src/status_im2/common/password_authentication/view.cljs +++ b/src/status_im2/common/password_authentication/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.common.password-authentication.view (:require [native-module.core :as native-module] - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im.multiaccounts.core :as multiaccounts] diff --git a/src/status_im2/common/plus_button/view.cljs b/src/status_im2/common/plus_button/view.cljs index 0427eb80e7..dc3dda5830 100644 --- a/src/status_im2/common/plus_button/view.cljs +++ b/src/status_im2/common/plus_button/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.plus-button.view (:require - [quo2.core :as quo])) + [quo.core :as quo])) (defn plus-button [{:keys [on-press accessibility-label customization-color]}] diff --git a/src/status_im2/common/qr_codes/view.cljs b/src/status_im2/common/qr_codes/view.cljs index 41d784c3c4..ef4f0f55d2 100644 --- a/src/status_im2/common/qr_codes/view.cljs +++ b/src/status_im2/common/qr_codes/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.qr-codes.view (:require - [quo2.core :as quo] + [quo.core :as quo] [utils.image-server :as image-server] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/scroll_page/style.cljs b/src/status_im2/common/scroll_page/style.cljs index 9661eb63d2..4daccd8311 100644 --- a/src/status_im2/common/scroll_page/style.cljs +++ b/src/status_im2/common/scroll_page/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.scroll-page.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/common/scroll_page/view.cljs b/src/status_im2/common/scroll_page/view.cljs index dc4b86f511..5dfd20f8d6 100644 --- a/src/status_im2/common/scroll_page/view.cljs +++ b/src/status_im2/common/scroll_page/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.common.scroll-page.view (:require [oops.core :as oops] - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.reanimated :as reanimated] [reagent.core :as reagent] diff --git a/src/status_im2/common/standard_authentication/enter_password/view.cljs b/src/status_im2/common/standard_authentication/enter_password/view.cljs index 870aef902a..5754ae912e 100644 --- a/src/status_im2/common/standard_authentication/enter_password/view.cljs +++ b/src/status_im2/common/standard_authentication/enter_password/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.standard-authentication.enter-password.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im.multiaccounts.core :as multiaccounts] [status-im2.common.standard-authentication.enter-password.style :as style] diff --git a/src/status_im2/common/standard_authentication/forgot_password_doc/view.cljs b/src/status_im2/common/standard_authentication/forgot_password_doc/view.cljs index ae89149484..e472c7cdb3 100644 --- a/src/status_im2/common/standard_authentication/forgot_password_doc/view.cljs +++ b/src/status_im2/common/standard_authentication/forgot_password_doc/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.standard-authentication.forgot-password-doc.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.common.standard-authentication.forgot-password-doc.style :as style] [utils.i18n :as i18n])) diff --git a/src/status_im2/common/standard_authentication/password_input/view.cljs b/src/status_im2/common/standard_authentication/password_input/view.cljs index 10e11d1e63..5f0760eefa 100644 --- a/src/status_im2/common/standard_authentication/password_input/view.cljs +++ b/src/status_im2/common/standard_authentication/password_input/view.cljs @@ -1,9 +1,9 @@ (ns status-im2.common.standard-authentication.password-input.view (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [status-im2.common.standard-authentication.forgot-password-doc.view :as forgot-password-doc] [status-im2.common.standard-authentication.password-input.style :as style] diff --git a/src/status_im2/common/standard_authentication/standard_auth/view.cljs b/src/status_im2/common/standard_authentication/standard_auth/view.cljs index a05cb35af3..07f17d258f 100644 --- a/src/status_im2/common/standard_authentication/standard_auth/view.cljs +++ b/src/status_im2/common/standard_authentication/standard_auth/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.common.standard-authentication.standard-auth.view (:require - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.touch-id :as biometric] [reagent.core :as reagent] diff --git a/src/status_im2/common/theme/core.cljs b/src/status_im2/common/theme/core.cljs index fdf7c26e1a..f2fd505cfc 100644 --- a/src/status_im2/common/theme/core.cljs +++ b/src/status_im2/common/theme/core.cljs @@ -1,7 +1,7 @@ (ns status-im2.common.theme.core (:require [oops.core :refer [oget]] - [quo2.theme :as quo2] + [quo.theme :as quo] [react-native.core :as rn] [react-native.platform :as platform] [status-im.ui.components.colors :as legacy-colors] @@ -32,7 +32,7 @@ (defn set-theme [value] - (quo2/set-theme value) + (quo/set-theme value) (reset! legacy-colors/theme (case value :dark legacy-colors/dark-theme legacy-colors/light-theme)) diff --git a/src/status_im2/common/toasts/view.cljs b/src/status_im2/common/toasts/view.cljs index c462ba964a..28106c7420 100644 --- a/src/status_im2/common/toasts/view.cljs +++ b/src/status_im2/common/toasts/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.common.toasts.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.background-timer :as background-timer] [react-native.core :as rn] [react-native.gesture :as gesture] diff --git a/src/status_im2/contexts/add_new_contact/style.cljs b/src/status_im2/contexts/add_new_contact/style.cljs index ae867c7c90..c7677c3f7a 100644 --- a/src/status_im2/contexts/add_new_contact/style.cljs +++ b/src/status_im2/contexts/add_new_contact/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.add-new-contact.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.typography :as typography] + [quo.foundations.colors :as colors] + [quo.foundations.typography :as typography] [react-native.platform :as platform] [react-native.safe-area :as safe-area])) diff --git a/src/status_im2/contexts/add_new_contact/views.cljs b/src/status_im2/contexts/add_new_contact/views.cljs index 6fb03dd934..86f6c91810 100644 --- a/src/status_im2/contexts/add_new_contact/views.cljs +++ b/src/status_im2/contexts/add_new_contact/views.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.add-new-contact.views (:require [clojure.string :as string] - [quo2.core :as quo] + [quo.core :as quo] [react-native.clipboard :as clipboard] [react-native.core :as rn] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/chat/actions/view.cljs b/src/status_im2/contexts/chat/actions/view.cljs index d721a641b0..7a57534385 100644 --- a/src/status_im2/contexts/chat/actions/view.cljs +++ b/src/status_im2/contexts/chat/actions/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.actions.view (:require - [quo2.core :as quo] + [quo.core :as quo] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/camera/style.cljs b/src/status_im2/contexts/chat/camera/style.cljs index f9a28d6ff1..4da4270a1e 100644 --- a/src/status_im2/contexts/chat/camera/style.cljs +++ b/src/status_im2/contexts/chat/camera/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.camera.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/chat/camera/view.cljs b/src/status_im2/contexts/chat/camera/view.cljs index 4f3bcf4f4d..284f7930d4 100644 --- a/src/status_im2/contexts/chat/camera/view.cljs +++ b/src/status_im2/contexts/chat/camera/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.camera.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.camera-kit :as camera-kit] [react-native.core :as rn] [react-native.fast-image :as fast-image] diff --git a/src/status_im2/contexts/chat/composer/actions/view.cljs b/src/status_im2/contexts/chat/composer/actions/view.cljs index 431c3c4d9f..b7d9b864f4 100644 --- a/src/status_im2/contexts/chat/composer/actions/view.cljs +++ b/src/status_im2/contexts/chat/composer/actions/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.composer.actions.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.permissions :as permissions] [react-native.platform :as platform] diff --git a/src/status_im2/contexts/chat/composer/constants.cljs b/src/status_im2/contexts/chat/composer/constants.cljs index 1395dc1726..ef24109dfc 100644 --- a/src/status_im2/contexts/chat/composer/constants.cljs +++ b/src/status_im2/contexts/chat/composer/constants.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.composer.constants (:require - [quo2.foundations.typography :as typography] + [quo.foundations.typography :as typography] [react-native.platform :as platform])) (def ^:const bar-container-height 20) diff --git a/src/status_im2/contexts/chat/composer/edit/view.cljs b/src/status_im2/contexts/chat/composer/edit/view.cljs index f756f5559f..9cfe5f4d5c 100644 --- a/src/status_im2/contexts/chat/composer/edit/view.cljs +++ b/src/status_im2/contexts/chat/composer/edit/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.composer.edit.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.reanimated :as reanimated] [status-im2.contexts.chat.composer.constants :as constants] diff --git a/src/status_im2/contexts/chat/composer/gradients/style.cljs b/src/status_im2/contexts/chat/composer/gradients/style.cljs index 5babfac3aa..5163246bd6 100644 --- a/src/status_im2/contexts/chat/composer/gradients/style.cljs +++ b/src/status_im2/contexts/chat/composer/gradients/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.composer.gradients.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] [status-im2.contexts.chat.composer.constants :as constants])) diff --git a/src/status_im2/contexts/chat/composer/images/style.cljs b/src/status_im2/contexts/chat/composer/images/style.cljs index e2749d6fdc..1ee9987da0 100644 --- a/src/status_im2/contexts/chat/composer/images/style.cljs +++ b/src/status_im2/contexts/chat/composer/images/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.composer.images.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def image-container {:padding-top 12 @@ -17,8 +17,8 @@ :top 5 :right 9 :justify-content :center - :align-items :center - }) + :align-items :center}) + (def remove-photo-inner-container {:width 14 diff --git a/src/status_im2/contexts/chat/composer/images/view.cljs b/src/status_im2/contexts/chat/composer/images/view.cljs index 6bb622cb55..bba5725308 100644 --- a/src/status_im2/contexts/chat/composer/images/view.cljs +++ b/src/status_im2/contexts/chat/composer/images/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.chat.composer.images.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.reanimated :as reanimated] diff --git a/src/status_im2/contexts/chat/composer/link_preview/view.cljs b/src/status_im2/contexts/chat/composer/link_preview/view.cljs index 43f6ecc141..db9c7d0fed 100644 --- a/src/status_im2/contexts/chat/composer/link_preview/view.cljs +++ b/src/status_im2/contexts/chat/composer/link_preview/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.composer.link-preview.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.reanimated :as reanimated] [status-im2.contexts.chat.composer.constants :as constants] diff --git a/src/status_im2/contexts/chat/composer/mentions/style.cljs b/src/status_im2/contexts/chat/composer/mentions/style.cljs index cecda5d780..4a56a669d9 100644 --- a/src/status_im2/contexts/chat/composer/mentions/style.cljs +++ b/src/status_im2/contexts/chat/composer/mentions/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.composer.mentions.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated] [status-im2.contexts.chat.composer.constants :as constants])) diff --git a/src/status_im2/contexts/chat/composer/reply/view.cljs b/src/status_im2/contexts/chat/composer/reply/view.cljs index 77b8fbf7c0..b400e22521 100644 --- a/src/status_im2/contexts/chat/composer/reply/view.cljs +++ b/src/status_im2/contexts/chat/composer/reply/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.chat.composer.reply.view (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient] [react-native.reanimated :as reanimated] diff --git a/src/status_im2/contexts/chat/composer/style.cljs b/src/status_im2/contexts/chat/composer/style.cljs index a841ffda78..e61a593e4a 100644 --- a/src/status_im2/contexts/chat/composer/style.cljs +++ b/src/status_im2/contexts/chat/composer/style.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.chat.composer.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.typography :as typography] - [quo2.theme :as quo.theme] + [quo.foundations.colors :as colors] + [quo.foundations.typography :as typography] + [quo.theme :as quo.theme] [react-native.platform :as platform] [react-native.reanimated :as reanimated] [status-im2.contexts.chat.composer.constants :as constants])) diff --git a/src/status_im2/contexts/chat/composer/sub_view.cljs b/src/status_im2/contexts/chat/composer/sub_view.cljs index 496834233f..b2fe44df3f 100644 --- a/src/status_im2/contexts/chat/composer/sub_view.cljs +++ b/src/status_im2/contexts/chat/composer/sub_view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.composer.sub-view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.blur :as blur] [react-native.core :as rn] [react-native.reanimated :as reanimated] diff --git a/src/status_im2/contexts/chat/composer/view.cljs b/src/status_im2/contexts/chat/composer/view.cljs index 87f1105c42..7272a42aeb 100644 --- a/src/status_im2/contexts/chat/composer/view.cljs +++ b/src/status_im2/contexts/chat/composer/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.composer.view (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.hooks :as hooks] diff --git a/src/status_im2/contexts/chat/events.cljs b/src/status_im2/contexts/chat/events.cljs index be8eab3516..c54fb68971 100644 --- a/src/status_im2/contexts/chat/events.cljs +++ b/src/status_im2/contexts/chat/events.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.events (:require [clojure.set :as set] - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [re-frame.core :as re-frame] [react-native.async-storage :as async-storage] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/chat/group_details/style.cljs b/src/status_im2/contexts/chat/group_details/style.cljs index 6eeddea22d..c3d595b82f 100644 --- a/src/status_im2/contexts/chat/group_details/style.cljs +++ b/src/status_im2/contexts/chat/group_details/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.group-details.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn actions-view [] diff --git a/src/status_im2/contexts/chat/group_details/view.cljs b/src/status_im2/contexts/chat/group_details/view.cljs index 89487154c5..8d7a1fef4d 100644 --- a/src/status_im2/contexts/chat/group_details/view.cljs +++ b/src/status_im2/contexts/chat/group_details/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.group-details.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.contact-list-item.view :as contact-list-item] diff --git a/src/status_im2/contexts/chat/home/chat_list_item/style.cljs b/src/status_im2/contexts/chat/home/chat_list_item/style.cljs index 31452d66dd..355e7e9253 100644 --- a/src/status_im2/contexts/chat/home/chat_list_item/style.cljs +++ b/src/status_im2/contexts/chat/home/chat_list_item/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.home.chat-list-item.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn container [] @@ -23,8 +23,8 @@ :justify-content :center :align-items :center}) -;; TODO: duplicate of `quo2.components.common.unread-grey-dot.style` -;; Replace it when this component is defined as part of `quo2.components` +;; TODO: duplicate of `quo.components.common.unread-grey-dot.style` +;; Replace it when this component is defined as part of `quo.components` (defn grey-dot [] {:width 8 diff --git a/src/status_im2/contexts/chat/home/chat_list_item/view.cljs b/src/status_im2/contexts/chat/home/chat_list_item/view.cljs index 2cda19427a..d4e74b8335 100644 --- a/src/status_im2/contexts/chat/home/chat_list_item/view.cljs +++ b/src/status_im2/contexts/chat/home/chat_list_item/view.cljs @@ -1,9 +1,9 @@ (ns status-im2.contexts.chat.home.chat-list-item.view (:require [clojure.string :as string] - [quo2.components.icon :as icons] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icons] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [status-im2.common.home.actions.view :as actions] [status-im2.constants :as constants] @@ -202,7 +202,7 @@ :accessibility-label :new-message-counter} unviewed-mentions-count] - ;; TODO: use the grey-dot component when chat-list-item is moved to quo2.components + ;; TODO: use the grey-dot component when chat-list-item is moved to quo.components (and group-chat unread-messages?) [rn/view {:style (style/grey-dot) diff --git a/src/status_im2/contexts/chat/home/contact_request/style.cljs b/src/status_im2/contexts/chat/home/contact_request/style.cljs index 3a6e9f9973..bc417a43fc 100644 --- a/src/status_im2/contexts/chat/home/contact_request/style.cljs +++ b/src/status_im2/contexts/chat/home/contact_request/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.home.contact-request.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def contact-requests {:flex-direction :row diff --git a/src/status_im2/contexts/chat/home/contact_request/view.cljs b/src/status_im2/contexts/chat/home/contact_request/view.cljs index fe0d9bf3ec..ce8101b49d 100644 --- a/src/status_im2/contexts/chat/home/contact_request/view.cljs +++ b/src/status_im2/contexts/chat/home/contact_request/view.cljs @@ -1,9 +1,9 @@ (ns status-im2.contexts.chat.home.contact-request.view (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [status-im2.contexts.chat.home.contact-request.style :as style] [status-im2.contexts.shell.activity-center.notification-types :as notification-types] diff --git a/src/status_im2/contexts/chat/home/view.cljs b/src/status_im2/contexts/chat/home/view.cljs index 08563d8e89..ffcb22366b 100644 --- a/src/status_im2/contexts/chat/home/view.cljs +++ b/src/status_im2/contexts/chat/home/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.home.view (:require [oops.core :as oops] - [quo2.theme :as quo.theme] + [quo.theme :as quo.theme] [re-frame.core :as re-frame] [react-native.core :as rn] [react-native.reanimated :as reanimated] diff --git a/src/status_im2/contexts/chat/lightbox/bottom_view.cljs b/src/status_im2/contexts/chat/lightbox/bottom_view.cljs index 6c6ac56f1b..c9f49f2f08 100644 --- a/src/status_im2/contexts/chat/lightbox/bottom_view.cljs +++ b/src/status_im2/contexts/chat/lightbox/bottom_view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.lightbox.bottom-view (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.platform :as platform] [react-native.reanimated :as reanimated] diff --git a/src/status_im2/contexts/chat/lightbox/style.cljs b/src/status_im2/contexts/chat/lightbox/style.cljs index 2410c44d4e..a44d43d503 100644 --- a/src/status_im2/contexts/chat/lightbox/style.cljs +++ b/src/status_im2/contexts/chat/lightbox/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.lightbox.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated] [status-im2.contexts.chat.lightbox.constants :as c])) diff --git a/src/status_im2/contexts/chat/lightbox/text_sheet/style.cljs b/src/status_im2/contexts/chat/lightbox/text_sheet/style.cljs index 3db845ed4a..17f7c7126c 100644 --- a/src/status_im2/contexts/chat/lightbox/text_sheet/style.cljs +++ b/src/status_im2/contexts/chat/lightbox/text_sheet/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.lightbox.text-sheet.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] [status-im2.contexts.chat.lightbox.constants :as constants])) diff --git a/src/status_im2/contexts/chat/lightbox/text_sheet/view.cljs b/src/status_im2/contexts/chat/lightbox/text_sheet/view.cljs index 60dcb4aa19..c7662a0926 100644 --- a/src/status_im2/contexts/chat/lightbox/text_sheet/view.cljs +++ b/src/status_im2/contexts/chat/lightbox/text_sheet/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.lightbox.text-sheet.view (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.linear-gradient :as linear-gradient] diff --git a/src/status_im2/contexts/chat/lightbox/top_view.cljs b/src/status_im2/contexts/chat/lightbox/top_view.cljs index dab9a8dd3b..ad1fe54b52 100644 --- a/src/status_im2/contexts/chat/lightbox/top_view.cljs +++ b/src/status_im2/contexts/chat/lightbox/top_view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.lightbox.top-view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.orientation :as orientation] [react-native.platform :as platform] diff --git a/src/status_im2/contexts/chat/lightbox/utils.cljs b/src/status_im2/contexts/chat/lightbox/utils.cljs index 34927165b7..4ed12a9e22 100644 --- a/src/status_im2/contexts/chat/lightbox/utils.cljs +++ b/src/status_im2/contexts/chat/lightbox/utils.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [oops.core :as oops] - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.orientation :as orientation] diff --git a/src/status_im2/contexts/chat/lightbox/view.cljs b/src/status_im2/contexts/chat/lightbox/view.cljs index e01c5b695e..49c69ad81b 100644 --- a/src/status_im2/contexts/chat/lightbox/view.cljs +++ b/src/status_im2/contexts/chat/lightbox/view.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [oops.core :as oops] - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.orientation :as orientation] diff --git a/src/status_im2/contexts/chat/menus/pinned_messages/style.cljs b/src/status_im2/contexts/chat/menus/pinned_messages/style.cljs index 92167d0c45..906540d3f0 100644 --- a/src/status_im2/contexts/chat/menus/pinned_messages/style.cljs +++ b/src/status_im2/contexts/chat/menus/pinned_messages/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.menus.pinned-messages.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn heading [community?] diff --git a/src/status_im2/contexts/chat/menus/pinned_messages/view.cljs b/src/status_im2/contexts/chat/menus/pinned_messages/view.cljs index 07bc20bad6..a0084eb454 100644 --- a/src/status_im2/contexts/chat/menus/pinned_messages/view.cljs +++ b/src/status_im2/contexts/chat/menus/pinned_messages/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.menus.pinned-messages.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.fast-image :as fast-image] [react-native.gesture :as gesture] diff --git a/src/status_im2/contexts/chat/messages/avatar/view.cljs b/src/status_im2/contexts/chat/messages/avatar/view.cljs index 057570d5a5..0941feee48 100644 --- a/src/status_im2/contexts/chat/messages/avatar/view.cljs +++ b/src/status_im2/contexts/chat/messages/avatar/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.avatar.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs index 43d2c5106b..7fbdde5072 100644 --- a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs +++ b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.contact-requests.bottom-drawer (:require - [quo2.components.drawers.permission-context.view :as permission-context] - [quo2.core :as quo] + [quo.components.drawers.permission-context.view :as permission-context] + [quo.core :as quo] [react-native.core :as rn] [status-im2.config :as config] [status-im2.constants :as constants] diff --git a/src/status_im2/contexts/chat/messages/content/album/style.cljs b/src/status_im2/contexts/chat/messages/content/album/style.cljs index 9760d5fb3b..a67bfe8e79 100644 --- a/src/status_im2/contexts/chat/messages/content/album/style.cljs +++ b/src/status_im2/contexts/chat/messages/content/album/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.content.album.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [status-im2.constants :as constants])) (def max-album-height 292) diff --git a/src/status_im2/contexts/chat/messages/content/album/view.cljs b/src/status_im2/contexts/chat/messages/content/album/view.cljs index 79bf850889..772ebee91a 100644 --- a/src/status_im2/contexts/chat/messages/content/album/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/album/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.content.album.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.fast-image :as fast-image] [status-im2.constants :as constants] diff --git a/src/status_im2/contexts/chat/messages/content/audio/style.cljs b/src/status_im2/contexts/chat/messages/content/audio/style.cljs index 26d873a609..ab33555f2c 100644 --- a/src/status_im2/contexts/chat/messages/content/audio/style.cljs +++ b/src/status_im2/contexts/chat/messages/content/audio/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.content.audio.style (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as theme])) + [quo.foundations.colors :as colors] + [quo.theme :as theme])) (defn container [] diff --git a/src/status_im2/contexts/chat/messages/content/audio/view.cljs b/src/status_im2/contexts/chat/messages/content/audio/view.cljs index f11b7a1866..fe08e99eeb 100644 --- a/src/status_im2/contexts/chat/messages/content/audio/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/audio/view.cljs @@ -2,8 +2,8 @@ (:require ["react-native-blob-util" :default ReactNativeBlobUtil] [goog.string :as gstring] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.audio-toolkit :as audio] [react-native.core :as rn] [react-native.platform :as platform] diff --git a/src/status_im2/contexts/chat/messages/content/deleted/view.cljs b/src/status_im2/contexts/chat/messages/content/deleted/view.cljs index 33d1b22656..2d75c835ea 100644 --- a/src/status_im2/contexts/chat/messages/content/deleted/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/deleted/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.content.deleted.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [utils.datetime :as datetime] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs b/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs index b9e15b2f02..04a6df7916 100644 --- a/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.content.link-preview.view (:require - [quo2.core :as quo] + [quo.core :as quo] [utils.re-frame :as rf])) (defn nearly-square? diff --git a/src/status_im2/contexts/chat/messages/content/pin/style.cljs b/src/status_im2/contexts/chat/messages/content/pin/style.cljs index 94ce3a873b..9fa0fd9390 100644 --- a/src/status_im2/contexts/chat/messages/content/pin/style.cljs +++ b/src/status_im2/contexts/chat/messages/content/pin/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.content.pin.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def system-message-default-size 34) (def system-message-margin-right 8) diff --git a/src/status_im2/contexts/chat/messages/content/pin/view.cljs b/src/status_im2/contexts/chat/messages/content/pin/view.cljs index 7985034549..07f4ae2368 100644 --- a/src/status_im2/contexts/chat/messages/content/pin/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/pin/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.content.pin.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [status-im2.contexts.chat.composer.reply.view :as reply] [status-im2.contexts.chat.messages.content.pin.style :as style] diff --git a/src/status_im2/contexts/chat/messages/content/reactions/view.cljs b/src/status_im2/contexts/chat/messages/content/reactions/view.cljs index cbe71a8a6a..b733356d14 100644 --- a/src/status_im2/contexts/chat/messages/content/reactions/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/reactions/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.content.reactions.view (:require - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [status-im2.constants :as constants] [status-im2.contexts.chat.messages.drawers.view :as drawers] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/content/status/style.cljs b/src/status_im2/contexts/chat/messages/content/status/style.cljs index 6ba261c6f1..ba7d654b52 100644 --- a/src/status_im2/contexts/chat/messages/content/status/style.cljs +++ b/src/status_im2/contexts/chat/messages/content/status/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.content.status.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def status-container {:flex-direction :row diff --git a/src/status_im2/contexts/chat/messages/content/status/view.cljs b/src/status_im2/contexts/chat/messages/content/status/view.cljs index f8e278a65f..5aa05e88d8 100644 --- a/src/status_im2/contexts/chat/messages/content/status/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/status/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.content.status.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [status-im2.contexts.chat.messages.content.status.style :as style] [utils.i18n :as i18n])) diff --git a/src/status_im2/contexts/chat/messages/content/style.cljs b/src/status_im2/contexts/chat/messages/content/style.cljs index 14460a5e83..14dd21f859 100644 --- a/src/status_im2/contexts/chat/messages/content/style.cljs +++ b/src/status_im2/contexts/chat/messages/content/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.content.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn message-container ([] diff --git a/src/status_im2/contexts/chat/messages/content/text/style.cljs b/src/status_im2/contexts/chat/messages/content/text/style.cljs index 0a0153d409..82bd476192 100644 --- a/src/status_im2/contexts/chat/messages/content/text/style.cljs +++ b/src/status_im2/contexts/chat/messages/content/text/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.content.text.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform])) (def block diff --git a/src/status_im2/contexts/chat/messages/content/text/view.cljs b/src/status_im2/contexts/chat/messages/content/text/view.cljs index 751372edd7..b5d38387ea 100644 --- a/src/status_im2/contexts/chat/messages/content/text/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/text/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.content.text.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.platform :as platform] [status-im2.contexts.chat.messages.content.link-preview.view :as link-preview] diff --git a/src/status_im2/contexts/chat/messages/content/view.cljs b/src/status_im2/contexts/chat/messages/content/view.cljs index 26ac7d41f3..0cc98c0b8c 100644 --- a/src/status_im2/contexts/chat/messages/content/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.chat.messages.content.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.platform :as platform] diff --git a/src/status_im2/contexts/chat/messages/delete_message/events.cljs b/src/status_im2/contexts/chat/messages/delete_message/events.cljs index 6365a76adf..0b9146318f 100644 --- a/src/status_im2/contexts/chat/messages/delete_message/events.cljs +++ b/src/status_im2/contexts/chat/messages/delete_message/events.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.delete-message.events (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [status-im2.contexts.chat.messages.list.events :as message-list] [taoensso.timbre :as log] [utils.datetime :as datetime] diff --git a/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs b/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs index d27e23d4de..5855745433 100644 --- a/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs +++ b/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.delete-message-for-me.events (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [status-im2.contexts.chat.messages.list.events :as message-list] [taoensso.timbre :as log] [utils.datetime :as datetime] diff --git a/src/status_im2/contexts/chat/messages/drawers/style.cljs b/src/status_im2/contexts/chat/messages/drawers/style.cljs index b490ba6ad7..f31cf572fa 100644 --- a/src/status_im2/contexts/chat/messages/drawers/style.cljs +++ b/src/status_im2/contexts/chat/messages/drawers/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.drawers.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def tab {:flex-direction :row diff --git a/src/status_im2/contexts/chat/messages/drawers/view.cljs b/src/status_im2/contexts/chat/messages/drawers/view.cljs index d3c21940a6..12a58d1d35 100644 --- a/src/status_im2/contexts/chat/messages/drawers/view.cljs +++ b/src/status_im2/contexts/chat/messages/drawers/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.drawers.view (:require - [quo2.components.selectors.reaction-resource :as reactions.resource] - [quo2.core :as quo] + [quo.components.selectors.reaction-resource :as reactions.resource] + [quo.core :as quo] [react-native.core :as rn] [react-native.gesture :as gesture] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/chat/messages/link_preview/style.cljs b/src/status_im2/contexts/chat/messages/link_preview/style.cljs index 4927a6a78f..bd0b258b83 100644 --- a/src/status_im2/contexts/chat/messages/link_preview/style.cljs +++ b/src/status_im2/contexts/chat/messages/link_preview/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.link-preview.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.typography :as typography] + [quo.foundations.colors :as colors] + [quo.foundations.typography :as typography] [status-im.ui.components.react :as react])) (def screen-width diff --git a/src/status_im2/contexts/chat/messages/link_preview/view.cljs b/src/status_im2/contexts/chat/messages/link_preview/view.cljs index 88c96c5d2d..9f061cd6ad 100644 --- a/src/status_im2/contexts/chat/messages/link_preview/view.cljs +++ b/src/status_im2/contexts/chat/messages/link_preview/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.link-preview.view (:require [clojure.string :as string] - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.fast-image :as fast-image] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/chat/messages/list/style.cljs b/src/status_im2/contexts/chat/messages/list/style.cljs index 5944424761..51f1030db1 100644 --- a/src/status_im2/contexts/chat/messages/list/style.cljs +++ b/src/status_im2/contexts/chat/messages/list/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.list.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] [status-im2.config :as config])) diff --git a/src/status_im2/contexts/chat/messages/list/view.cljs b/src/status_im2/contexts/chat/messages/list/view.cljs index 031d32188a..1572599060 100644 --- a/src/status_im2/contexts/chat/messages/list/view.cljs +++ b/src/status_im2/contexts/chat/messages/list/view.cljs @@ -1,9 +1,9 @@ (ns status-im2.contexts.chat.messages.list.view (:require [oops.core :as oops] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.background-timer :as background-timer] [react-native.core :as rn] [react-native.hooks :as hooks] diff --git a/src/status_im2/contexts/chat/messages/navigation/style.cljs b/src/status_im2/contexts/chat/messages/navigation/style.cljs index 9f3716eec8..c5a3e26919 100644 --- a/src/status_im2/contexts/chat/messages/navigation/style.cljs +++ b/src/status_im2/contexts/chat/messages/navigation/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.navigation.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) (defonce ^:const navigation-bar-height 100) diff --git a/src/status_im2/contexts/chat/messages/navigation/view.cljs b/src/status_im2/contexts/chat/messages/navigation/view.cljs index 3a18cb17f2..b36ef8a61e 100644 --- a/src/status_im2/contexts/chat/messages/navigation/view.cljs +++ b/src/status_im2/contexts/chat/messages/navigation/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.chat.messages.navigation.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [re-frame.db] [react-native.blur :as blur] [react-native.core :as rn] diff --git a/src/status_im2/contexts/chat/messages/pin/banner/style.cljs b/src/status_im2/contexts/chat/messages/pin/banner/style.cljs index 9661877e4e..65d3f49c61 100644 --- a/src/status_im2/contexts/chat/messages/pin/banner/style.cljs +++ b/src/status_im2/contexts/chat/messages/pin/banner/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.pin.banner.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/chat/messages/pin/banner/view.cljs b/src/status_im2/contexts/chat/messages/pin/banner/view.cljs index c5cdbd7dbd..2280bf0a99 100644 --- a/src/status_im2/contexts/chat/messages/pin/banner/view.cljs +++ b/src/status_im2/contexts/chat/messages/pin/banner/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.pin.banner.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.blur :as blur] [react-native.core :as rn] [react-native.reanimated :as reanimated] diff --git a/src/status_im2/contexts/chat/messages/pin/events.cljs b/src/status_im2/contexts/chat/messages/pin/events.cljs index 1a7fb6943c..e8f33f457b 100644 --- a/src/status_im2/contexts/chat/messages/pin/events.cljs +++ b/src/status_im2/contexts/chat/messages/pin/events.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.pin.events (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [re-frame.core :as re-frame] [status-im.data-store.messages :as data-store.messages] [status-im.data-store.pin-messages :as data-store.pin-messages] diff --git a/src/status_im2/contexts/chat/new_chat/view.cljs b/src/status_im2/contexts/chat/new_chat/view.cljs index 75a6c36683..b5d7c76082 100644 --- a/src/status_im2/contexts/chat/new_chat/view.cljs +++ b/src/status_im2/contexts/chat/new_chat/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.chat.new-chat.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [re-frame.core :as re-frame] [react-native.core :as rn] [react-native.gesture :as gesture] diff --git a/src/status_im2/contexts/chat/photo_selector/album_selector/style.cljs b/src/status_im2/contexts/chat/photo_selector/album_selector/style.cljs index 4a9fdc3837..dafb2aab97 100644 --- a/src/status_im2/contexts/chat/photo_selector/album_selector/style.cljs +++ b/src/status_im2/contexts/chat/photo_selector/album_selector/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.photo-selector.album-selector.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) (defn selector-container diff --git a/src/status_im2/contexts/chat/photo_selector/album_selector/view.cljs b/src/status_im2/contexts/chat/photo_selector/album_selector/view.cljs index e79521c62d..5da3f25ea4 100644 --- a/src/status_im2/contexts/chat/photo_selector/album_selector/view.cljs +++ b/src/status_im2/contexts/chat/photo_selector/album_selector/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.photo-selector.album-selector.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.reanimated :as reanimated] diff --git a/src/status_im2/contexts/chat/photo_selector/style.cljs b/src/status_im2/contexts/chat/photo_selector/style.cljs index 9674ffc799..e555e2dd61 100644 --- a/src/status_im2/contexts/chat/photo_selector/style.cljs +++ b/src/status_im2/contexts/chat/photo_selector/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.photo-selector.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform])) (defn gradient-container diff --git a/src/status_im2/contexts/chat/photo_selector/view.cljs b/src/status_im2/contexts/chat/photo_selector/view.cljs index c4889f92b5..5710a5b3ea 100644 --- a/src/status_im2/contexts/chat/photo_selector/view.cljs +++ b/src/status_im2/contexts/chat/photo_selector/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.photo-selector.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.linear-gradient :as linear-gradient] diff --git a/src/status_im2/contexts/communities/actions/chat/view.cljs b/src/status_im2/contexts/communities/actions/chat/view.cljs index a4051d904c..0dc75d4170 100644 --- a/src/status_im2/contexts/communities/actions/chat/view.cljs +++ b/src/status_im2/contexts/communities/actions/chat/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.actions.chat.view (:require - [quo2.core :as quo] + [quo.core :as quo] [status-im2.common.mute-drawer.view :as mute-drawer] [status-im2.common.muting.helpers :refer [format-mute-till]] [status-im2.common.not-implemented :as not-implemented] diff --git a/src/status_im2/contexts/communities/actions/community_options/view.cljs b/src/status_im2/contexts/communities/actions/community_options/view.cljs index e5b3e4fa3a..37398a9425 100644 --- a/src/status_im2/contexts/communities/actions/community_options/view.cljs +++ b/src/status_im2/contexts/communities/actions/community_options/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.actions.community-options.view (:require - [quo2.core :as quo] + [quo.core :as quo] [status-im2.common.mute-drawer.view :as mute-options] [status-im2.common.muting.helpers :refer [format-mute-till]] [status-im2.constants :as constants] diff --git a/src/status_im2/contexts/communities/actions/community_rules_list/view.cljs b/src/status_im2/contexts/communities/actions/community_rules_list/view.cljs index 39b4c2f285..c549dff224 100644 --- a/src/status_im2/contexts/communities/actions/community_rules_list/view.cljs +++ b/src/status_im2/contexts/communities/actions/community_rules_list/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.actions.community-rules-list.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.communities.actions.community-rules-list.style :as style])) diff --git a/src/status_im2/contexts/communities/actions/generic_menu/view.cljs b/src/status_im2/contexts/communities/actions/generic_menu/view.cljs index 0402b704dd..54a620e39e 100644 --- a/src/status_im2/contexts/communities/actions/generic_menu/view.cljs +++ b/src/status_im2/contexts/communities/actions/generic_menu/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.actions.generic-menu.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.communities.actions.generic-menu.style :as style] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/actions/home_plus/view.cljs b/src/status_im2/contexts/communities/actions/home_plus/view.cljs index dec2593e17..64b313f489 100644 --- a/src/status_im2/contexts/communities/actions/home_plus/view.cljs +++ b/src/status_im2/contexts/communities/actions/home_plus/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.actions.home-plus.view (:require - [quo2.core :as quo] + [quo.core :as quo] [status-im2.config :as config] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/actions/leave/view.cljs b/src/status_im2/contexts/communities/actions/leave/view.cljs index e31f086e92..866ee319a0 100644 --- a/src/status_im2/contexts/communities/actions/leave/view.cljs +++ b/src/status_im2/contexts/communities/actions/leave/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.actions.leave.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.communities.actions.generic-menu.view :as generic-menu] [status-im2.contexts.communities.actions.leave.style :as style] diff --git a/src/status_im2/contexts/communities/actions/request_to_join/style.cljs b/src/status_im2/contexts/communities/actions/request_to_join/style.cljs index f9ce3fb168..c819cb7a0b 100644 --- a/src/status_im2/contexts/communities/actions/request_to_join/style.cljs +++ b/src/status_im2/contexts/communities/actions/request_to_join/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.actions.request-to-join.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def page-container {:margin-horizontal 20 diff --git a/src/status_im2/contexts/communities/actions/request_to_join/view.cljs b/src/status_im2/contexts/communities/actions/request_to_join/view.cljs index c3d635ae2a..b91c37e5d1 100644 --- a/src/status_im2/contexts/communities/actions/request_to_join/view.cljs +++ b/src/status_im2/contexts/communities/actions/request_to_join/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.actions.request-to-join.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.gesture :as gesture] [status-im2.common.password-authentication.view :as password-authentication] diff --git a/src/status_im2/contexts/communities/actions/token_gating/view.cljs b/src/status_im2/contexts/communities/actions/token_gating/view.cljs index 2d56cdfb55..2f0cfdc960 100644 --- a/src/status_im2/contexts/communities/actions/token_gating/view.cljs +++ b/src/status_im2/contexts/communities/actions/token_gating/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.actions.token-gating.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/discover/view.cljs b/src/status_im2/contexts/communities/discover/view.cljs index 4b8f01e622..e7acb6c877 100644 --- a/src/status_im2/contexts/communities/discover/view.cljs +++ b/src/status_im2/contexts/communities/discover/view.cljs @@ -1,9 +1,9 @@ (ns status-im2.contexts.communities.discover.view (:require [oops.core :as oops] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] [status-im.ui.components.react :as react] diff --git a/src/status_im2/contexts/communities/home/style.cljs b/src/status_im2/contexts/communities/home/style.cljs index 42b7d51452..2f4fe485b3 100644 --- a/src/status_im2/contexts/communities/home/style.cljs +++ b/src/status_im2/contexts/communities/home/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.home.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area])) diff --git a/src/status_im2/contexts/communities/home/view.cljs b/src/status_im2/contexts/communities/home/view.cljs index debe9b3de0..c679fac856 100644 --- a/src/status_im2/contexts/communities/home/view.cljs +++ b/src/status_im2/contexts/communities/home/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.communities.home.view (:require [oops.core :as oops] - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.reanimated :as reanimated] [status-im2.common.home.banner.view :as common.banner] diff --git a/src/status_im2/contexts/communities/overview/style.cljs b/src/status_im2/contexts/communities/overview/style.cljs index 38436bf528..b50237c7a5 100644 --- a/src/status_im2/contexts/communities/overview/style.cljs +++ b/src/status_im2/contexts/communities/overview/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.communities.overview.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def screen-horizontal-padding 20) diff --git a/src/status_im2/contexts/communities/overview/view.cljs b/src/status_im2/contexts/communities/overview/view.cljs index 25cd334ef2..1510f033e6 100644 --- a/src/status_im2/contexts/communities/overview/view.cljs +++ b/src/status_im2/contexts/communities/overview/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.communities.overview.view (:require [oops.core :as oops] - [quo2.core :as quo] + [quo.core :as quo] [react-native.blur :as blur] [react-native.core :as rn] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/contacts/drawers/nickname_drawer/style.cljs b/src/status_im2/contexts/contacts/drawers/nickname_drawer/style.cljs index 0853b4d054..f15ac23633 100644 --- a/src/status_im2/contexts/contacts/drawers/nickname_drawer/style.cljs +++ b/src/status_im2/contexts/contacts/drawers/nickname_drawer/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.contacts.drawers.nickname-drawer.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform])) (defn context-container diff --git a/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs b/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs index 6500aec32e..02e2b65d58 100644 --- a/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs +++ b/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs @@ -1,9 +1,9 @@ (ns status-im2.contexts.contacts.drawers.nickname-drawer.view (:require [clojure.string :as string] - [quo2.components.icon :as icons] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icons] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/emoji_picker/style.cljs b/src/status_im2/contexts/emoji_picker/style.cljs index f1427909c2..5f56af38e2 100644 --- a/src/status_im2/contexts/emoji_picker/style.cljs +++ b/src/status_im2/contexts/emoji_picker/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.emoji-picker.style (:require - [quo2.components.profile.showcase-nav.style :as showcase-nav.style] - [quo2.foundations.colors :as colors] + [quo.components.profile.showcase-nav.style :as showcase-nav.style] + [quo.foundations.colors :as colors] [react-native.safe-area :as safe-area] [status-im2.contexts.emoji-picker.constants :as constants])) diff --git a/src/status_im2/contexts/emoji_picker/view.cljs b/src/status_im2/contexts/emoji_picker/view.cljs index a7e77ad40e..104a5a3596 100644 --- a/src/status_im2/contexts/emoji_picker/view.cljs +++ b/src/status_im2/contexts/emoji_picker/view.cljs @@ -2,9 +2,9 @@ (:require [clojure.string :as string] [oops.core :as oops] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.blur :as blur] [react-native.core :as rn] [react-native.gesture :as gesture] diff --git a/src/status_im2/contexts/onboarding/common/background/style.cljs b/src/status_im2/contexts/onboarding/common/background/style.cljs index 706a3e58cd..6e0a16bf14 100644 --- a/src/status_im2/contexts/onboarding/common/background/style.cljs +++ b/src/status_im2/contexts/onboarding/common/background/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.common.background.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def background-container {:background-color colors/neutral-95 diff --git a/src/status_im2/contexts/onboarding/common/carousel/style.cljs b/src/status_im2/contexts/onboarding/common/carousel/style.cljs index 39c742c5b1..2d3120ac15 100644 --- a/src/status_im2/contexts/onboarding/common/carousel/style.cljs +++ b/src/status_im2/contexts/onboarding/common/carousel/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.common.carousel.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) (defn header-container diff --git a/src/status_im2/contexts/onboarding/common/carousel/view.cljs b/src/status_im2/contexts/onboarding/common/carousel/view.cljs index 6a5588c71b..e476b30305 100644 --- a/src/status_im2/contexts/onboarding/common/carousel/view.cljs +++ b/src/status_im2/contexts/onboarding/common/carousel/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.common.carousel.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.navigation :as navigation] diff --git a/src/status_im2/contexts/onboarding/common/overlay/style.cljs b/src/status_im2/contexts/onboarding/common/overlay/style.cljs index 8dc3b54339..2ea7940bab 100644 --- a/src/status_im2/contexts/onboarding/common/overlay/style.cljs +++ b/src/status_im2/contexts/onboarding/common/overlay/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.common.overlay.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) (defn blur-container diff --git a/src/status_im2/contexts/onboarding/create_password/style.cljs b/src/status_im2/contexts/onboarding/create_password/style.cljs index 2d08365c1a..1c4c87b5ec 100644 --- a/src/status_im2/contexts/onboarding/create_password/style.cljs +++ b/src/status_im2/contexts/onboarding/create_password/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.create-password.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def flex-fill {:flex 1}) diff --git a/src/status_im2/contexts/onboarding/create_password/view.cljs b/src/status_im2/contexts/onboarding/create_password/view.cljs index 91ff25e1ac..820d33c164 100644 --- a/src/status_im2/contexts/onboarding/create_password/view.cljs +++ b/src/status_im2/contexts/onboarding/create_password/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.onboarding.create-password.view (:require [oops.core :refer [ocall]] - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/onboarding/create_profile/style.cljs b/src/status_im2/contexts/onboarding/create_profile/style.cljs index c1f325f87e..d59a6f435e 100644 --- a/src/status_im2/contexts/onboarding/create_profile/style.cljs +++ b/src/status_im2/contexts/onboarding/create_profile/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.create-profile.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform])) (def continue-button diff --git a/src/status_im2/contexts/onboarding/create_profile/view.cljs b/src/status_im2/contexts/onboarding/create_profile/view.cljs index 6f3a7250ba..1f52a0cd85 100644 --- a/src/status_im2/contexts/onboarding/create_profile/view.cljs +++ b/src/status_im2/contexts/onboarding/create_profile/view.cljs @@ -2,8 +2,8 @@ (:require [clojure.string :as string] [oops.core :as oops] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.blur :as blur] [react-native.core :as rn] [react-native.hooks :as hooks] diff --git a/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs b/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs index d6c4fba9af..4fb145c1b6 100644 --- a/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs +++ b/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.enable-biometrics.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.safe-area :as safe-area] [status-im2.common.biometric.events :as biometric] diff --git a/src/status_im2/contexts/onboarding/enable_notifications/style.cljs b/src/status_im2/contexts/onboarding/enable_notifications/style.cljs index ceed448cca..ff5ffe2fc3 100644 --- a/src/status_im2/contexts/onboarding/enable_notifications/style.cljs +++ b/src/status_im2/contexts/onboarding/enable_notifications/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.enable-notifications.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def default-margin 20) diff --git a/src/status_im2/contexts/onboarding/enable_notifications/view.cljs b/src/status_im2/contexts/onboarding/enable_notifications/view.cljs index 7406990049..9c516c1d3a 100644 --- a/src/status_im2/contexts/onboarding/enable_notifications/view.cljs +++ b/src/status_im2/contexts/onboarding/enable_notifications/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.enable-notifications.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.platform :as platform] [react-native.safe-area :as safe-area] diff --git a/src/status_im2/contexts/onboarding/enter_seed_phrase/view.cljs b/src/status_im2/contexts/onboarding/enter_seed_phrase/view.cljs index 157232898c..a0c413ccf8 100644 --- a/src/status_im2/contexts/onboarding/enter_seed_phrase/view.cljs +++ b/src/status_im2/contexts/onboarding/enter_seed_phrase/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.onboarding.enter-seed-phrase.view (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/onboarding/generating_keys/view.cljs b/src/status_im2/contexts/onboarding/generating_keys/view.cljs index 1c3406236c..a4e63a4b45 100644 --- a/src/status_im2/contexts/onboarding/generating_keys/view.cljs +++ b/src/status_im2/contexts/onboarding/generating_keys/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.generating-keys.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] diff --git a/src/status_im2/contexts/onboarding/identifiers/profile_card/style.cljs b/src/status_im2/contexts/onboarding/identifiers/profile_card/style.cljs index a8ce8aa44c..a6567739ab 100644 --- a/src/status_im2/contexts/onboarding/identifiers/profile_card/style.cljs +++ b/src/status_im2/contexts/onboarding/identifiers/profile_card/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.onboarding.identifiers.profile-card.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.typography :as typography] + [quo.foundations.colors :as colors] + [quo.foundations.typography :as typography] [react-native.reanimated :as reanimated])) (def card-view diff --git a/src/status_im2/contexts/onboarding/identifiers/profile_card/view.cljs b/src/status_im2/contexts/onboarding/identifiers/profile_card/view.cljs index ed331e6dea..a7d84f810d 100644 --- a/src/status_im2/contexts/onboarding/identifiers/profile_card/view.cljs +++ b/src/status_im2/contexts/onboarding/identifiers/profile_card/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.onboarding.identifiers.profile-card.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.masked-view :as masked-view] [react-native.reanimated :as reanimated] diff --git a/src/status_im2/contexts/onboarding/identifiers/view.cljs b/src/status_im2/contexts/onboarding/identifiers/view.cljs index 6f2351835f..04bb760acd 100644 --- a/src/status_im2/contexts/onboarding/identifiers/view.cljs +++ b/src/status_im2/contexts/onboarding/identifiers/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.onboarding.identifiers.view (:require [clojure.string :as string] - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.onboarding.common.carousel.animation :as carousel.animation] [status-im2.contexts.onboarding.common.carousel.view :as carousel] diff --git a/src/status_im2/contexts/onboarding/intro/style.cljs b/src/status_im2/contexts/onboarding/intro/style.cljs index 1907630743..0be9a68e90 100644 --- a/src/status_im2/contexts/onboarding/intro/style.cljs +++ b/src/status_im2/contexts/onboarding/intro/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.intro.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def page-container {:flex 1 diff --git a/src/status_im2/contexts/onboarding/intro/view.cljs b/src/status_im2/contexts/onboarding/intro/view.cljs index 874a366827..212061d9d0 100644 --- a/src/status_im2/contexts/onboarding/intro/view.cljs +++ b/src/status_im2/contexts/onboarding/intro/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.intro.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.constants :as constants] [status-im2.contexts.onboarding.common.background.view :as background] diff --git a/src/status_im2/contexts/onboarding/new_to_status/style.cljs b/src/status_im2/contexts/onboarding/new_to_status/style.cljs index e7672a1721..1d3e635bf9 100644 --- a/src/status_im2/contexts/onboarding/new_to_status/style.cljs +++ b/src/status_im2/contexts/onboarding/new_to_status/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.new-to-status.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def content-container {:position :absolute diff --git a/src/status_im2/contexts/onboarding/new_to_status/view.cljs b/src/status_im2/contexts/onboarding/new_to_status/view.cljs index 85b65757e0..1d4817751c 100644 --- a/src/status_im2/contexts/onboarding/new_to_status/view.cljs +++ b/src/status_im2/contexts/onboarding/new_to_status/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.new-to-status.view (:require - [quo2.core :as quo] + [quo.core :as quo] re-frame.db [react-native.core :as rn] [react-native.safe-area :as safe-area] @@ -108,5 +108,5 @@ :shell? true}])} (when config/quo-preview-enabled? {:icon-name :i/reveal-whitelist - :on-press #(rf/dispatch [:navigate-to :quo2-preview])})]}] + :on-press #(rf/dispatch [:navigate-to :quo-preview])})]}] [sign-in-options]])) diff --git a/src/status_im2/contexts/onboarding/select_photo/method_menu/view.cljs b/src/status_im2/contexts/onboarding/select_photo/method_menu/view.cljs index 0ead0c4205..4ba66ddf1e 100644 --- a/src/status_im2/contexts/onboarding/select_photo/method_menu/view.cljs +++ b/src/status_im2/contexts/onboarding/select_photo/method_menu/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.onboarding.select-photo.method-menu.view (:require ["react-native-image-crop-picker" :default image-picker] - [quo2.core :as quo] + [quo.core :as quo] [status-im.multiaccounts.core] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/onboarding/sign_in/style.cljs b/src/status_im2/contexts/onboarding/sign_in/style.cljs index 04291f3c69..190cfa82e4 100644 --- a/src/status_im2/contexts/onboarding/sign_in/style.cljs +++ b/src/status_im2/contexts/onboarding/sign_in/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.sign-in.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def screen-padding 20) diff --git a/src/status_im2/contexts/onboarding/syncing/progress/style.cljs b/src/status_im2/contexts/onboarding/syncing/progress/style.cljs index 6991a13948..3ba197982b 100644 --- a/src/status_im2/contexts/onboarding/syncing/progress/style.cljs +++ b/src/status_im2/contexts/onboarding/syncing/progress/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.syncing.progress.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn page-container [in-onboarding?] diff --git a/src/status_im2/contexts/onboarding/syncing/progress/view.cljs b/src/status_im2/contexts/onboarding/syncing/progress/view.cljs index af149f91f0..e8f08dcb69 100644 --- a/src/status_im2/contexts/onboarding/syncing/progress/view.cljs +++ b/src/status_im2/contexts/onboarding/syncing/progress/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.syncing.progress.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.onboarding.common.background.view :as background] [status-im2.contexts.onboarding.syncing.progress.style :as style] diff --git a/src/status_im2/contexts/onboarding/syncing/results/style.cljs b/src/status_im2/contexts/onboarding/syncing/results/style.cljs index ac49c90409..5ffd147fbc 100644 --- a/src/status_im2/contexts/onboarding/syncing/results/style.cljs +++ b/src/status_im2/contexts/onboarding/syncing/results/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.syncing.results.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) (defn page-container diff --git a/src/status_im2/contexts/onboarding/syncing/results/view.cljs b/src/status_im2/contexts/onboarding/syncing/results/view.cljs index 083bfd0f6b..c518820cf3 100644 --- a/src/status_im2/contexts/onboarding/syncing/results/view.cljs +++ b/src/status_im2/contexts/onboarding/syncing/results/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.onboarding.syncing.results.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] diff --git a/src/status_im2/contexts/onboarding/welcome/style.cljs b/src/status_im2/contexts/onboarding/welcome/style.cljs index 7c91f3f45b..6322115d49 100644 --- a/src/status_im2/contexts/onboarding/welcome/style.cljs +++ b/src/status_im2/contexts/onboarding/welcome/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.welcome.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def default-margin 20) diff --git a/src/status_im2/contexts/onboarding/welcome/view.cljs b/src/status_im2/contexts/onboarding/welcome/view.cljs index 8d27e1c657..4cedeeb265 100644 --- a/src/status_im2/contexts/onboarding/welcome/view.cljs +++ b/src/status_im2/contexts/onboarding/welcome/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.onboarding.welcome.view (:require - [quo2.core :as quo] + [quo.core :as quo] [re-frame.core :as re-frame] [react-native.core :as rn] [react-native.safe-area :as safe-area] diff --git a/src/status_im2/contexts/profile/profiles/style.cljs b/src/status_im2/contexts/profile/profiles/style.cljs index 0c6cb65462..d58845148e 100644 --- a/src/status_im2/contexts/profile/profiles/style.cljs +++ b/src/status_im2/contexts/profile/profiles/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.profile.profiles.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) ;; Profiles Section diff --git a/src/status_im2/contexts/profile/profiles/view.cljs b/src/status_im2/contexts/profile/profiles/view.cljs index c044c065bc..8b9b44177f 100644 --- a/src/status_im2/contexts/profile/profiles/view.cljs +++ b/src/status_im2/contexts/profile/profiles/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.profile.profiles.view (:require [native-module.core :as native-module] - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] @@ -183,9 +183,9 @@ :type :grey :background :blur :icon-only? true - :on-press #(rf/dispatch [:navigate-to :quo2-preview]) + :on-press #(rf/dispatch [:navigate-to :quo-preview]) :disabled? processing - :accessibility-label :quo2-preview + :accessibility-label :quo-preview :container-style {:margin-right 12}} :i/reveal-whitelist]) [quo/button diff --git a/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs b/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs index ec134f6655..8601e0cf9f 100644 --- a/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs +++ b/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.quo-preview.animated-header-list.animated-header-list (:require - [quo2.components.animated-header-flatlist.view :as animated-header-list] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.components.animated-header-flatlist.view :as animated-header-list] + [quo.core :as quo] + [quo.foundations.colors :as colors] [re-frame.core :as rf] [react-native.core :as rn] [react-native.fast-image :as fast-image] diff --git a/src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs index e58f34a998..2ce2814cf6 100644 --- a/src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.avatars.account-avatar (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] [utils.re-frame :as rf])) @@ -36,8 +36,8 @@ :descriptor descriptor :component-container-style {:align-items :center :justify-content :center}} - [quo/account-avatar @state - ] + [quo/account-avatar @state] + [quo/button {:type :grey :container-style {:margin-top 30} diff --git a/src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs index a9904186a3..5ea7cad83e 100644 --- a/src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.avatars.channel-avatar (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/avatars/collection_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/collection_avatar.cljs index dde6859ee4..aa3d5052e4 100644 --- a/src/status_im2/contexts/quo_preview/avatars/collection_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/collection_avatar.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.avatars.collection-avatar (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs index c10acab2ed..514c3d863a 100644 --- a/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.avatars.group-avatar (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs index 331ef68713..c2ecdd30a4 100644 --- a/src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.avatars.icon-avatar (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs index f5de9e9112..5997038ae1 100644 --- a/src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.avatars.user-avatar (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs index 6159cb21e6..deb8f1e3c6 100644 --- a/src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.avatars.wallet-user-avatar (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/banners/banner.cljs b/src/status_im2/contexts/quo_preview/banners/banner.cljs index aac24f4fb5..b2bb94235e 100644 --- a/src/status_im2/contexts/quo_preview/banners/banner.cljs +++ b/src/status_im2/contexts/quo_preview/banners/banner.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.banners.banner (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/browser/browser_input.cljs b/src/status_im2/contexts/quo_preview/browser/browser_input.cljs index 78ec8040c9..fd786ffc13 100644 --- a/src/status_im2/contexts/quo_preview/browser/browser_input.cljs +++ b/src/status_im2/contexts/quo_preview/browser/browser_input.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.browser.browser-input (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/buttons/button.cljs b/src/status_im2/contexts/quo_preview/buttons/button.cljs index d391bebac6..da176125ae 100644 --- a/src/status_im2/contexts/quo_preview/buttons/button.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/button.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.buttons.button (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/buttons/composer_button.cljs b/src/status_im2/contexts/quo_preview/buttons/composer_button.cljs index cfd3a3e267..1695e6ff3f 100644 --- a/src/status_im2/contexts/quo_preview/buttons/composer_button.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/composer_button.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.buttons.composer-button (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs b/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs index 58a6194b0e..4755a32f23 100644 --- a/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.buttons.dynamic-button (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] [utils.i18n :as i18n])) diff --git a/src/status_im2/contexts/quo_preview/buttons/predictive_keyboard.cljs b/src/status_im2/contexts/quo_preview/buttons/predictive_keyboard.cljs index 9123335746..e836dc520e 100644 --- a/src/status_im2/contexts/quo_preview/buttons/predictive_keyboard.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/predictive_keyboard.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.buttons.predictive-keyboard (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/buttons/slide_button.cljs b/src/status_im2/contexts/quo_preview/buttons/slide_button.cljs index 90c7ceaacb..265784f3b3 100644 --- a/src/status_im2/contexts/quo_preview/buttons/slide_button.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/slide_button.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.buttons.slide-button (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/buttons/wallet_button.cljs b/src/status_im2/contexts/quo_preview/buttons/wallet_button.cljs index 3f1d4bf3a2..adef68e714 100644 --- a/src/status_im2/contexts/quo_preview/buttons/wallet_button.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/wallet_button.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.buttons.wallet-button (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/buttons/wallet_ctas.cljs b/src/status_im2/contexts/quo_preview/buttons/wallet_ctas.cljs index cb4cc1c695..9680288722 100644 --- a/src/status_im2/contexts/quo_preview/buttons/wallet_ctas.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/wallet_ctas.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.buttons.wallet-ctas (:require - [quo2.core :as quo] + [quo.core :as quo] [status-im2.contexts.quo-preview.preview :as preview])) (defn view diff --git a/src/status_im2/contexts/quo_preview/calendar/calendar.cljs b/src/status_im2/contexts/quo_preview/calendar/calendar.cljs index 9842a4e7e6..eef42d8c96 100644 --- a/src/status_im2/contexts/quo_preview/calendar/calendar.cljs +++ b/src/status_im2/contexts/quo_preview/calendar/calendar.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.calendar.calendar (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] [utils.datetime :as datetime])) diff --git a/src/status_im2/contexts/quo_preview/calendar/calendar_day.cljs b/src/status_im2/contexts/quo_preview/calendar/calendar_day.cljs index 61c2234de7..55189dcef2 100644 --- a/src/status_im2/contexts/quo_preview/calendar/calendar_day.cljs +++ b/src/status_im2/contexts/quo_preview/calendar/calendar_day.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.calendar.calendar-day (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/calendar/calendar_year.cljs b/src/status_im2/contexts/quo_preview/calendar/calendar_year.cljs index 036270d81f..a05a8f468d 100644 --- a/src/status_im2/contexts/quo_preview/calendar/calendar_year.cljs +++ b/src/status_im2/contexts/quo_preview/calendar/calendar_year.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.calendar.calendar-year (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/code/snippet.cljs b/src/status_im2/contexts/quo_preview/code/snippet.cljs index b57d315b82..f71dc7bd61 100644 --- a/src/status_im2/contexts/quo_preview/code/snippet.cljs +++ b/src/status_im2/contexts/quo_preview/code/snippet.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.code.snippet (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/code/snippet_preview.cljs b/src/status_im2/contexts/quo_preview/code/snippet_preview.cljs index c94a9457bf..5983b40da8 100644 --- a/src/status_im2/contexts/quo_preview/code/snippet_preview.cljs +++ b/src/status_im2/contexts/quo_preview/code/snippet_preview.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.code.snippet-preview (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/colors/color.cljs b/src/status_im2/contexts/quo_preview/colors/color.cljs index 9b37d858be..257775c556 100644 --- a/src/status_im2/contexts/quo_preview/colors/color.cljs +++ b/src/status_im2/contexts/quo_preview/colors/color.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.colors.color (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/colors/color_picker.cljs b/src/status_im2/contexts/quo_preview/colors/color_picker.cljs index 1f2c1eea98..3077ead499 100644 --- a/src/status_im2/contexts/quo_preview/colors/color_picker.cljs +++ b/src/status_im2/contexts/quo_preview/colors/color_picker.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.colors.color-picker (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/common.cljs b/src/status_im2/contexts/quo_preview/common.cljs index 74fcb1e04d..0ea3615d13 100644 --- a/src/status_im2/contexts/quo_preview/common.cljs +++ b/src/status_im2/contexts/quo_preview/common.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.common (:require - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [utils.re-frame :as rf])) @@ -13,12 +13,12 @@ light? (= theme :light)] [quo/page-nav {:type :title - :title "Quo2 components preview" + :title "quo components preview" :text-align :left :icon-name :i/close :right-side [{:icon-name (if light? :i/dark :i/light) :on-press #(if light? (quo.theme/set-theme :dark) (quo.theme/set-theme :light))}] - :on-press #(if (or logged-in? (not= (rf/sub [:view-id]) :quo2-preview)) + :on-press #(if (or logged-in? (not= (rf/sub [:view-id]) :quo-preview)) (rf/dispatch [:navigate-back]) (do (quo.theme/set-theme :dark) diff --git a/src/status_im2/contexts/quo_preview/community/channel_actions.cljs b/src/status_im2/contexts/quo_preview/community/channel_actions.cljs index 323d250fd8..eb7d1dfbbe 100644 --- a/src/status_im2/contexts/quo_preview/community/channel_actions.cljs +++ b/src/status_im2/contexts/quo_preview/community/channel_actions.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.community.channel-actions (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/community/community_card_view.cljs b/src/status_im2/contexts/quo_preview/community/community_card_view.cljs index 8393ec84f1..e4b6df37e7 100644 --- a/src/status_im2/contexts/quo_preview/community/community_card_view.cljs +++ b/src/status_im2/contexts/quo_preview/community/community_card_view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.community.community-card-view (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview] diff --git a/src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs b/src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs index ded54b8349..a73e362d02 100644 --- a/src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs +++ b/src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.community.community-membership-list-view (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.community.data :as data] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/community/discover_card.cljs b/src/status_im2/contexts/quo_preview/community/discover_card.cljs index 735bbe7dcc..0125729c17 100644 --- a/src/status_im2/contexts/quo_preview/community/discover_card.cljs +++ b/src/status_im2/contexts/quo_preview/community/discover_card.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.community.discover-card (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/community/token_gating.cljs b/src/status_im2/contexts/quo_preview/community/token_gating.cljs index 2a0af1e4b3..f150b3e696 100644 --- a/src/status_im2/contexts/quo_preview/community/token_gating.cljs +++ b/src/status_im2/contexts/quo_preview/community/token_gating.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.community.token-gating (:require - [quo2.core :as quo] - [quo2.foundations.resources :as resources] + [quo.core :as quo] + [quo.foundations.resources :as resources] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/counter/counter.cljs b/src/status_im2/contexts/quo_preview/counter/counter.cljs index 8a470a1920..5f74fd7727 100644 --- a/src/status_im2/contexts/quo_preview/counter/counter.cljs +++ b/src/status_im2/contexts/quo_preview/counter/counter.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.counter.counter (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/counter/step.cljs b/src/status_im2/contexts/quo_preview/counter/step.cljs index 721eff362d..d4a89920bc 100644 --- a/src/status_im2/contexts/quo_preview/counter/step.cljs +++ b/src/status_im2/contexts/quo_preview/counter/step.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.counter.step (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/dividers/date.cljs b/src/status_im2/contexts/quo_preview/dividers/date.cljs index 08b9b68112..b0a7b7d175 100644 --- a/src/status_im2/contexts/quo_preview/dividers/date.cljs +++ b/src/status_im2/contexts/quo_preview/dividers/date.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.dividers.date (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/dividers/divider_label.cljs b/src/status_im2/contexts/quo_preview/dividers/divider_label.cljs index 3926e3a3ce..a230c0272c 100644 --- a/src/status_im2/contexts/quo_preview/dividers/divider_label.cljs +++ b/src/status_im2/contexts/quo_preview/dividers/divider_label.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.dividers.divider-label (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/dividers/divider_line.cljs b/src/status_im2/contexts/quo_preview/dividers/divider_line.cljs index 3937623067..ba53999276 100644 --- a/src/status_im2/contexts/quo_preview/dividers/divider_line.cljs +++ b/src/status_im2/contexts/quo_preview/dividers/divider_line.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.dividers.divider-line (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs b/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs index 6addfffc26..cc9525db8d 100644 --- a/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs +++ b/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.dividers.new-messages (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/dividers/strength_divider.cljs b/src/status_im2/contexts/quo_preview/dividers/strength_divider.cljs index 79b0243841..ad4253cf60 100644 --- a/src/status_im2/contexts/quo_preview/dividers/strength_divider.cljs +++ b/src/status_im2/contexts/quo_preview/dividers/strength_divider.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.dividers.strength-divider (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs b/src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs index 0946492cfa..b17b341c0f 100644 --- a/src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs +++ b/src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.drawers.action-drawers (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] diff --git a/src/status_im2/contexts/quo_preview/drawers/bottom_actions.cljs b/src/status_im2/contexts/quo_preview/drawers/bottom_actions.cljs index 4a6ca9f926..bbd2fffe57 100644 --- a/src/status_im2/contexts/quo_preview/drawers/bottom_actions.cljs +++ b/src/status_im2/contexts/quo_preview/drawers/bottom_actions.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.drawers.bottom-actions (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/drawers/documentation_drawers.cljs b/src/status_im2/contexts/quo_preview/drawers/documentation_drawers.cljs index 6026521943..bcfe566ba2 100644 --- a/src/status_im2/contexts/quo_preview/drawers/documentation_drawers.cljs +++ b/src/status_im2/contexts/quo_preview/drawers/documentation_drawers.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.drawers.documentation-drawers (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] diff --git a/src/status_im2/contexts/quo_preview/drawers/drawer_buttons.cljs b/src/status_im2/contexts/quo_preview/drawers/drawer_buttons.cljs index 85f0bf16ae..2c356b7d98 100644 --- a/src/status_im2/contexts/quo_preview/drawers/drawer_buttons.cljs +++ b/src/status_im2/contexts/quo_preview/drawers/drawer_buttons.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.drawers.drawer-buttons (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/drawers/drawer_top.cljs b/src/status_im2/contexts/quo_preview/drawers/drawer_top.cljs index 1c6d8b223e..15488fae71 100644 --- a/src/status_im2/contexts/quo_preview/drawers/drawer_top.cljs +++ b/src/status_im2/contexts/quo_preview/drawers/drawer_top.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.drawers.drawer-top (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im.multiaccounts.core :as multiaccounts] diff --git a/src/status_im2/contexts/quo_preview/drawers/permission_drawers.cljs b/src/status_im2/contexts/quo_preview/drawers/permission_drawers.cljs index bbd4b6f646..c1b26f489d 100644 --- a/src/status_im2/contexts/quo_preview/drawers/permission_drawers.cljs +++ b/src/status_im2/contexts/quo_preview/drawers/permission_drawers.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.quo-preview.drawers.permission-drawers (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.foundations.resources :as quo.resources] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [status-im2.common.resources :as resources])) diff --git a/src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs b/src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs index 4b3b201a0b..658da2bc16 100644 --- a/src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs +++ b/src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.dropdowns.dropdown (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/dropdowns/network_dropdown.cljs b/src/status_im2/contexts/quo_preview/dropdowns/network_dropdown.cljs index e664e0a1f3..39e782acb0 100644 --- a/src/status_im2/contexts/quo_preview/dropdowns/network_dropdown.cljs +++ b/src/status_im2/contexts/quo_preview/dropdowns/network_dropdown.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.dropdowns.network-dropdown (:require - [quo2.core :as quo] - [quo2.foundations.resources :as quo.resources] + [quo.core :as quo] + [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/empty_state/empty_state.cljs b/src/status_im2/contexts/quo_preview/empty_state/empty_state.cljs index c0cd1b9d3e..9d56a1df10 100644 --- a/src/status_im2/contexts/quo_preview/empty_state/empty_state.cljs +++ b/src/status_im2/contexts/quo_preview/empty_state/empty_state.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.empty-state.empty-state (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/foundations/shadows.cljs b/src/status_im2/contexts/quo_preview/foundations/shadows.cljs index ee0affeade..0d4c2965c2 100644 --- a/src/status_im2/contexts/quo_preview/foundations/shadows.cljs +++ b/src/status_im2/contexts/quo_preview/foundations/shadows.cljs @@ -1,9 +1,9 @@ (ns status-im2.contexts.quo-preview.foundations.shadows (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.foundations.shadows :as shadows] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.foundations.shadows :as shadows] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/gradient/gradient_cover.cljs b/src/status_im2/contexts/quo_preview/gradient/gradient_cover.cljs index dbd361ecf8..9de137d4fb 100644 --- a/src/status_im2/contexts/quo_preview/gradient/gradient_cover.cljs +++ b/src/status_im2/contexts/quo_preview/gradient/gradient_cover.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.gradient.gradient-cover (:require - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [react-native.blur :as blur] [react-native.core :as rn] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/quo_preview/graph/interactive_graph.cljs b/src/status_im2/contexts/quo_preview/graph/interactive_graph.cljs index 45df6bf6a2..9142a982f5 100644 --- a/src/status_im2/contexts/quo_preview/graph/interactive_graph.cljs +++ b/src/status_im2/contexts/quo_preview/graph/interactive_graph.cljs @@ -1,9 +1,9 @@ (ns status-im2.contexts.quo-preview.graph.interactive-graph (:require [goog.string :as gstring] - [quo2.components.graph.utils :as utils] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.components.graph.utils :as utils] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/graph/wallet_graph.cljs b/src/status_im2/contexts/quo_preview/graph/wallet_graph.cljs index de1a73da34..c4b8b42f3f 100644 --- a/src/status_im2/contexts/quo_preview/graph/wallet_graph.cljs +++ b/src/status_im2/contexts/quo_preview/graph/wallet_graph.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.graph.wallet-graph (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/info/info_message.cljs b/src/status_im2/contexts/quo_preview/info/info_message.cljs index 56a4e02abd..33eaa0c3c5 100644 --- a/src/status_im2/contexts/quo_preview/info/info_message.cljs +++ b/src/status_im2/contexts/quo_preview/info/info_message.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.info.info-message (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/info/information_box.cljs b/src/status_im2/contexts/quo_preview/info/information_box.cljs index deedb7b1f8..8a3907260c 100644 --- a/src/status_im2/contexts/quo_preview/info/information_box.cljs +++ b/src/status_im2/contexts/quo_preview/info/information_box.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.info.information-box (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/inputs/address_input.cljs b/src/status_im2/contexts/quo_preview/inputs/address_input.cljs index 5d525ff6a0..f16d23c32f 100644 --- a/src/status_im2/contexts/quo_preview/inputs/address_input.cljs +++ b/src/status_im2/contexts/quo_preview/inputs/address_input.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.inputs.address-input (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.constants :as constants] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/inputs/input.cljs b/src/status_im2/contexts/quo_preview/inputs/input.cljs index c4611a75a5..594d41a022 100644 --- a/src/status_im2/contexts/quo_preview/inputs/input.cljs +++ b/src/status_im2/contexts/quo_preview/inputs/input.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.inputs.input (:require [clojure.string :as string] - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/inputs/locked_input.cljs b/src/status_im2/contexts/quo_preview/inputs/locked_input.cljs index 5691bcd384..756acd4082 100644 --- a/src/status_im2/contexts/quo_preview/inputs/locked_input.cljs +++ b/src/status_im2/contexts/quo_preview/inputs/locked_input.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.inputs.locked-input (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/inputs/profile_input.cljs b/src/status_im2/contexts/quo_preview/inputs/profile_input.cljs index e3cce5783a..9d29cafd8e 100644 --- a/src/status_im2/contexts/quo_preview/inputs/profile_input.cljs +++ b/src/status_im2/contexts/quo_preview/inputs/profile_input.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.inputs.profile-input (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/inputs/recovery_phrase_input.cljs b/src/status_im2/contexts/quo_preview/inputs/recovery_phrase_input.cljs index 0499ca8926..c589df8670 100644 --- a/src/status_im2/contexts/quo_preview/inputs/recovery_phrase_input.cljs +++ b/src/status_im2/contexts/quo_preview/inputs/recovery_phrase_input.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.inputs.recovery-phrase-input (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/inputs/search_input.cljs b/src/status_im2/contexts/quo_preview/inputs/search_input.cljs index a3b582cecb..2f44f50d96 100644 --- a/src/status_im2/contexts/quo_preview/inputs/search_input.cljs +++ b/src/status_im2/contexts/quo_preview/inputs/search_input.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.inputs.search-input (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/inputs/title_input.cljs b/src/status_im2/contexts/quo_preview/inputs/title_input.cljs index 1e44ab7c9a..4f69a53af0 100644 --- a/src/status_im2/contexts/quo_preview/inputs/title_input.cljs +++ b/src/status_im2/contexts/quo_preview/inputs/title_input.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.inputs.title-input (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/keycard/keycard.cljs b/src/status_im2/contexts/quo_preview/keycard/keycard.cljs index 9773cae820..21cd243331 100644 --- a/src/status_im2/contexts/quo_preview/keycard/keycard.cljs +++ b/src/status_im2/contexts/quo_preview/keycard/keycard.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.keycard.keycard (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/links/link_preview.cljs b/src/status_im2/contexts/quo_preview/links/link_preview.cljs index 9776b16b32..a570364536 100644 --- a/src/status_im2/contexts/quo_preview/links/link_preview.cljs +++ b/src/status_im2/contexts/quo_preview/links/link_preview.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.links.link-preview (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/links/url_preview.cljs b/src/status_im2/contexts/quo_preview/links/url_preview.cljs index 27833f9a32..222b45044f 100644 --- a/src/status_im2/contexts/quo_preview/links/url_preview.cljs +++ b/src/status_im2/contexts/quo_preview/links/url_preview.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.links.url-preview (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/links/url_preview_list.cljs b/src/status_im2/contexts/quo_preview/links/url_preview_list.cljs index 4e00554ce5..e926f16a4c 100644 --- a/src/status_im2/contexts/quo_preview/links/url_preview_list.cljs +++ b/src/status_im2/contexts/quo_preview/links/url_preview_list.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.links.url-preview-list (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/list_items/account.cljs b/src/status_im2/contexts/quo_preview/list_items/account.cljs index a84c9d1d6e..37001f9c25 100644 --- a/src/status_im2/contexts/quo_preview/list_items/account.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/account.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.list-items.account (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/list_items/account_list_card.cljs b/src/status_im2/contexts/quo_preview/list_items/account_list_card.cljs index b2f95db9b0..c1ae038c89 100644 --- a/src/status_im2/contexts/quo_preview/list_items/account_list_card.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/account_list_card.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.list-items.account-list-card (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/list_items/address.cljs b/src/status_im2/contexts/quo_preview/list_items/address.cljs index b0a854287e..462cfe59c4 100644 --- a/src/status_im2/contexts/quo_preview/list_items/address.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/address.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.list-items.address (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/list_items/channel.cljs b/src/status_im2/contexts/quo_preview/list_items/channel.cljs index bff9ecb035..624daf64d4 100644 --- a/src/status_im2/contexts/quo_preview/list_items/channel.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/channel.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.list-items.channel (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/list_items/community_list.cljs b/src/status_im2/contexts/quo_preview/list_items/community_list.cljs index 0440e83c0a..a518853373 100644 --- a/src/status_im2/contexts/quo_preview/list_items/community_list.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/community_list.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.list-items.community-list (:require - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.community.data :as data] diff --git a/src/status_im2/contexts/quo_preview/list_items/dapp.cljs b/src/status_im2/contexts/quo_preview/list_items/dapp.cljs index a96112c6ec..0942202d88 100644 --- a/src/status_im2/contexts/quo_preview/list_items/dapp.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/dapp.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.list-items.dapp (:require - [quo2.core :as quo] - [quo2.foundations.resources :as resources] + [quo.core :as quo] + [quo.foundations.resources :as resources] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs b/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs index 49e6ba1841..111ebd43a6 100644 --- a/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.list-items.preview-lists (:require - [quo2.core :as quo] - [quo2.foundations.resources :as quo.resources] + [quo.core :as quo] + [quo.foundations.resources :as quo.resources] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/list_items/saved_address.cljs b/src/status_im2/contexts/quo_preview/list_items/saved_address.cljs index 0af8e1d52c..ef9a3d1c31 100644 --- a/src/status_im2/contexts/quo_preview/list_items/saved_address.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/saved_address.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.list-items.saved-address (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/list_items/saved_contact_address.cljs b/src/status_im2/contexts/quo_preview/list_items/saved_contact_address.cljs index bee2d50052..3c349aa83f 100644 --- a/src/status_im2/contexts/quo_preview/list_items/saved_contact_address.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/saved_contact_address.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.list-items.saved-contact-address (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/list_items/token_value.cljs b/src/status_im2/contexts/quo_preview/list_items/token_value.cljs index 08317b9290..c2ad035052 100644 --- a/src/status_im2/contexts/quo_preview/list_items/token_value.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/token_value.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.list-items.token-value (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/list_items/user_list.cljs b/src/status_im2/contexts/quo_preview/list_items/user_list.cljs index e85e5a8ac7..3a9395361b 100644 --- a/src/status_im2/contexts/quo_preview/list_items/user_list.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/user_list.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.list-items.user-list (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview] diff --git a/src/status_im2/contexts/quo_preview/loaders/skeleton_list.cljs b/src/status_im2/contexts/quo_preview/loaders/skeleton_list.cljs index 641b9f6e12..bd9e15da49 100644 --- a/src/status_im2/contexts/quo_preview/loaders/skeleton_list.cljs +++ b/src/status_im2/contexts/quo_preview/loaders/skeleton_list.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.loaders.skeleton-list (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/main.cljs b/src/status_im2/contexts/quo_preview/main.cljs index c4b9ee3360..829788a698 100644 --- a/src/status_im2/contexts/quo_preview/main.cljs +++ b/src/status_im2/contexts/quo_preview/main.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.main (:refer-clojure :exclude [filter]) (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.animated-header-list.animated-header-list @@ -490,7 +490,7 @@ {:visible false}))))) (def main-screens - [{:name :quo2-preview + [{:name :quo-preview :options {:topBar {:visible false} :insets {:top? true}} :component main-screen}]) diff --git a/src/status_im2/contexts/quo_preview/markdown/list.cljs b/src/status_im2/contexts/quo_preview/markdown/list.cljs index bfaeb7a006..d75689247f 100644 --- a/src/status_im2/contexts/quo_preview/markdown/list.cljs +++ b/src/status_im2/contexts/quo_preview/markdown/list.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.markdown.list (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/markdown/text.cljs b/src/status_im2/contexts/quo_preview/markdown/text.cljs index 3cf2db6d03..642f8cdd2b 100644 --- a/src/status_im2/contexts/quo_preview/markdown/text.cljs +++ b/src/status_im2/contexts/quo_preview/markdown/text.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.markdown.text (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/messages/author.cljs b/src/status_im2/contexts/quo_preview/messages/author.cljs index 29719f9ace..02dadcb5dc 100644 --- a/src/status_im2/contexts/quo_preview/messages/author.cljs +++ b/src/status_im2/contexts/quo_preview/messages/author.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.messages.author (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/messages/gap.cljs b/src/status_im2/contexts/quo_preview/messages/gap.cljs index 18bffd0852..e2f4201573 100644 --- a/src/status_im2/contexts/quo_preview/messages/gap.cljs +++ b/src/status_im2/contexts/quo_preview/messages/gap.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.messages.gap (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] [utils.i18n :as i18n])) diff --git a/src/status_im2/contexts/quo_preview/messages/system_message.cljs b/src/status_im2/contexts/quo_preview/messages/system_message.cljs index 0b0ab451b5..49c8bdc2e8 100644 --- a/src/status_im2/contexts/quo_preview/messages/system_message.cljs +++ b/src/status_im2/contexts/quo_preview/messages/system_message.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.messages.system-message (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs b/src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs index a07dd8f032..e3d7a7aedb 100644 --- a/src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.navigation.bottom-nav-tab (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs b/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs index 25c8d6fd18..38defce135 100644 --- a/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.navigation.floating-shell-button (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] [utils.i18n :as i18n])) diff --git a/src/status_im2/contexts/quo_preview/navigation/page_nav.cljs b/src/status_im2/contexts/quo_preview/navigation/page_nav.cljs index a13983c4da..35c941528b 100644 --- a/src/status_im2/contexts/quo_preview/navigation/page_nav.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/page_nav.cljs @@ -1,9 +1,9 @@ (ns status-im2.contexts.quo-preview.navigation.page-nav (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.foundations.resources :as quo.resources] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs b/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs index afb6402507..0e0afc7f00 100644 --- a/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.navigation.top-nav (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs b/src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs index 274646df9e..aacf8b440d 100644 --- a/src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs +++ b/src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.quo-preview.notifications.activity-logs (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] diff --git a/src/status_im2/contexts/quo_preview/notifications/activity_logs_photos.cljs b/src/status_im2/contexts/quo_preview/notifications/activity_logs_photos.cljs index d4ab56ac63..8a39d0547a 100644 --- a/src/status_im2/contexts/quo_preview/notifications/activity_logs_photos.cljs +++ b/src/status_im2/contexts/quo_preview/notifications/activity_logs_photos.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.notifications.activity-logs-photos (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/notifications/notification.cljs b/src/status_im2/contexts/quo_preview/notifications/notification.cljs index 8416ad9e58..234f7fb0b2 100644 --- a/src/status_im2/contexts/quo_preview/notifications/notification.cljs +++ b/src/status_im2/contexts/quo_preview/notifications/notification.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.notifications.notification (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.quo-preview.code.snippet :as snippet-preview] [status-im2.contexts.quo-preview.preview :as preview] diff --git a/src/status_im2/contexts/quo_preview/notifications/toast.cljs b/src/status_im2/contexts/quo_preview/notifications/toast.cljs index 165c5d61d1..4b8ba0c161 100644 --- a/src/status_im2/contexts/quo_preview/notifications/toast.cljs +++ b/src/status_im2/contexts/quo_preview/notifications/toast.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.notifications.toast (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs b/src/status_im2/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs index 1fb05f056b..14b223923d 100644 --- a/src/status_im2/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs +++ b/src/status_im2/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.numbered-keyboard.keyboard-key (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs b/src/status_im2/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs index f30dc7541f..5157c5482d 100644 --- a/src/status_im2/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs +++ b/src/status_im2/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.numbered-keyboard.numbered-keyboard (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/onboarding/small_option_card.cljs b/src/status_im2/contexts/quo_preview/onboarding/small_option_card.cljs index b14a7917e7..86a6a1faf7 100644 --- a/src/status_im2/contexts/quo_preview/onboarding/small_option_card.cljs +++ b/src/status_im2/contexts/quo_preview/onboarding/small_option_card.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.onboarding.small-option-card (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/password/tips.cljs b/src/status_im2/contexts/quo_preview/password/tips.cljs index f04eb3238e..eb58c658de 100644 --- a/src/status_im2/contexts/quo_preview/password/tips.cljs +++ b/src/status_im2/contexts/quo_preview/password/tips.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.password.tips (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/preview.cljs b/src/status_im2/contexts/quo_preview/preview.cljs index e86eedbb38..59f6770536 100644 --- a/src/status_im2/contexts/quo_preview/preview.cljs +++ b/src/status_im2/contexts/quo_preview/preview.cljs @@ -2,9 +2,9 @@ (:require [camel-snake-kebab.core :as camel-snake-kebab] [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.blur :as blur] [react-native.core :as rn] [react-native.safe-area :as safe-area] @@ -317,7 +317,7 @@ blur-container-style blur-view-props blur-height show-blur-background?] :or {blur-height 200}} & children] - (let [theme (quo2.theme/use-theme-value)] + (let [theme (quo.theme/use-theme-value)] (rn/use-effect (fn [] (when blur-dark-only? (if blur? diff --git a/src/status_im2/contexts/quo_preview/profile/collectible.cljs b/src/status_im2/contexts/quo_preview/profile/collectible.cljs index 847f33be7c..57e76bd085 100644 --- a/src/status_im2/contexts/quo_preview/profile/collectible.cljs +++ b/src/status_im2/contexts/quo_preview/profile/collectible.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.profile.collectible (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/profile/profile_card.cljs b/src/status_im2/contexts/quo_preview/profile/profile_card.cljs index 1d129903f0..ac8fb4daec 100644 --- a/src/status_im2/contexts/quo_preview/profile/profile_card.cljs +++ b/src/status_im2/contexts/quo_preview/profile/profile_card.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.profile.profile-card (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/profile/select_profile.cljs b/src/status_im2/contexts/quo_preview/profile/select_profile.cljs index 498433f581..054061f418 100644 --- a/src/status_im2/contexts/quo_preview/profile/select_profile.cljs +++ b/src/status_im2/contexts/quo_preview/profile/select_profile.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.profile.select-profile (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/profile/showcase_nav.cljs b/src/status_im2/contexts/quo_preview/profile/showcase_nav.cljs index 68e925955f..a9439925bf 100644 --- a/src/status_im2/contexts/quo_preview/profile/showcase_nav.cljs +++ b/src/status_im2/contexts/quo_preview/profile/showcase_nav.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.profile.showcase-nav (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/record_audio/record_audio.cljs b/src/status_im2/contexts/quo_preview/record_audio/record_audio.cljs index 033f670a62..ce63ab8dd4 100644 --- a/src/status_im2/contexts/quo_preview/record_audio/record_audio.cljs +++ b/src/status_im2/contexts/quo_preview/record_audio/record_audio.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.record-audio.record-audio (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.permissions :as permissions] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs b/src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs index da278f9968..107a90c434 100644 --- a/src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs +++ b/src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.selectors.disclaimer (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/selectors/filter.cljs b/src/status_im2/contexts/quo_preview/selectors/filter.cljs index b0bd38e8a7..a4117716f7 100644 --- a/src/status_im2/contexts/quo_preview/selectors/filter.cljs +++ b/src/status_im2/contexts/quo_preview/selectors/filter.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.selectors.filter (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/selectors/react.cljs b/src/status_im2/contexts/quo_preview/selectors/react.cljs index 831e6f81b3..1bf7e01f47 100644 --- a/src/status_im2/contexts/quo_preview/selectors/react.cljs +++ b/src/status_im2/contexts/quo_preview/selectors/react.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.quo-preview.selectors.react (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.constants :as constants] diff --git a/src/status_im2/contexts/quo_preview/selectors/react_selector.cljs b/src/status_im2/contexts/quo_preview/selectors/react_selector.cljs index b6b890e912..02ebdb4eb6 100644 --- a/src/status_im2/contexts/quo_preview/selectors/react_selector.cljs +++ b/src/status_im2/contexts/quo_preview/selectors/react_selector.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.quo-preview.selectors.react-selector (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.constants :as constants] diff --git a/src/status_im2/contexts/quo_preview/selectors/reactions_selector.cljs b/src/status_im2/contexts/quo_preview/selectors/reactions_selector.cljs index 500b13da47..a95f15d3df 100644 --- a/src/status_im2/contexts/quo_preview/selectors/reactions_selector.cljs +++ b/src/status_im2/contexts/quo_preview/selectors/reactions_selector.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.selectors.reactions-selector (:require [clojure.string :as string] - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as r] [status-im2.constants :as constants] diff --git a/src/status_im2/contexts/quo_preview/selectors/selectors.cljs b/src/status_im2/contexts/quo_preview/selectors/selectors.cljs index 16224d9585..2cbbf11a43 100644 --- a/src/status_im2/contexts/quo_preview/selectors/selectors.cljs +++ b/src/status_im2/contexts/quo_preview/selectors/selectors.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.selectors.selectors (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/settings/accounts.cljs b/src/status_im2/contexts/quo_preview/settings/accounts.cljs index c734ad8267..c0d7d9eca8 100644 --- a/src/status_im2/contexts/quo_preview/settings/accounts.cljs +++ b/src/status_im2/contexts/quo_preview/settings/accounts.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.settings.accounts (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/settings/category.cljs b/src/status_im2/contexts/quo_preview/settings/category.cljs index 1a0bc71674..c93e4969d2 100644 --- a/src/status_im2/contexts/quo_preview/settings/category.cljs +++ b/src/status_im2/contexts/quo_preview/settings/category.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.settings.category (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/settings/data_item.cljs b/src/status_im2/contexts/quo_preview/settings/data_item.cljs index 911b6bf817..696b3517a9 100644 --- a/src/status_im2/contexts/quo_preview/settings/data_item.cljs +++ b/src/status_im2/contexts/quo_preview/settings/data_item.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.settings.data-item (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/settings/privacy_option.cljs b/src/status_im2/contexts/quo_preview/settings/privacy_option.cljs index 0a965b220c..7776e99693 100644 --- a/src/status_im2/contexts/quo_preview/settings/privacy_option.cljs +++ b/src/status_im2/contexts/quo_preview/settings/privacy_option.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.settings.privacy-option (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/settings/reorder_item.cljs b/src/status_im2/contexts/quo_preview/settings/reorder_item.cljs index 3306ffcb01..70444570be 100644 --- a/src/status_im2/contexts/quo_preview/settings/reorder_item.cljs +++ b/src/status_im2/contexts/quo_preview/settings/reorder_item.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.quo-preview.settings.reorder-item (:require - [quo2.components.settings.reorder-item.types :as types] - [quo2.core :as quo] - [quo2.foundations.resources :as quo2.resources] + [quo.components.settings.reorder-item.types :as types] + [quo.core :as quo] + [quo.foundations.resources :as quo.resources] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) @@ -22,7 +22,7 @@ :title "Status"}} {:id 3 :type types/item - :data {:image (quo2.resources/get-token :eth) + :data {:image (quo.resources/get-token :eth) :image-size 21 :right-icon :i/world :title "Ethereum"}} diff --git a/src/status_im2/contexts/quo_preview/settings/section_label.cljs b/src/status_im2/contexts/quo_preview/settings/section_label.cljs index 6de9a804bc..d07675395a 100644 --- a/src/status_im2/contexts/quo_preview/settings/section_label.cljs +++ b/src/status_im2/contexts/quo_preview/settings/section_label.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.settings.section-label (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/settings/settings_item.cljs b/src/status_im2/contexts/quo_preview/settings/settings_item.cljs index 8efd005dd4..fe711d2239 100644 --- a/src/status_im2/contexts/quo_preview/settings/settings_item.cljs +++ b/src/status_im2/contexts/quo_preview/settings/settings_item.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.settings.settings-item (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/share/qr_code.cljs b/src/status_im2/contexts/quo_preview/share/qr_code.cljs index 7d3cbd33b9..cc50eb848b 100644 --- a/src/status_im2/contexts/quo_preview/share/qr_code.cljs +++ b/src/status_im2/contexts/quo_preview/share/qr_code.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.share.qr-code (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/share/share_qr_code.cljs b/src/status_im2/contexts/quo_preview/share/share_qr_code.cljs index 9b86002622..c438438036 100644 --- a/src/status_im2/contexts/quo_preview/share/share_qr_code.cljs +++ b/src/status_im2/contexts/quo_preview/share/share_qr_code.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.share.share-qr-code (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] [utils.image-server :as image-server] diff --git a/src/status_im2/contexts/quo_preview/style.cljs b/src/status_im2/contexts/quo_preview/style.cljs index 151b1ff1b1..6f20d5a832 100644 --- a/src/status_im2/contexts/quo_preview/style.cljs +++ b/src/status_im2/contexts/quo_preview/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.typography :as typography])) + [quo.foundations.colors :as colors] + [quo.foundations.typography :as typography])) ;;;; Form fields diff --git a/src/status_im2/contexts/quo_preview/switcher/group_messaging_card.cljs b/src/status_im2/contexts/quo_preview/switcher/group_messaging_card.cljs index f56ec3c12c..7f204290ff 100644 --- a/src/status_im2/contexts/quo_preview/switcher/group_messaging_card.cljs +++ b/src/status_im2/contexts/quo_preview/switcher/group_messaging_card.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.switcher.group-messaging-card (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs b/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs index c86207a9d9..d322cc47df 100644 --- a/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs +++ b/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.switcher.switcher-cards (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/tabs/account_selector.cljs b/src/status_im2/contexts/quo_preview/tabs/account_selector.cljs index 7b30f9b8d9..25a51247ab 100644 --- a/src/status_im2/contexts/quo_preview/tabs/account_selector.cljs +++ b/src/status_im2/contexts/quo_preview/tabs/account_selector.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.tabs.account-selector (:require - [quo2.components.tabs.account-selector :as quo2] + [quo.components.tabs.account-selector :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) @@ -62,4 +62,4 @@ [rn/view {:padding-vertical 60 :align-items :center} - [quo2/account-selector @state]]]]))) + [quo/account-selector @state]]]]))) diff --git a/src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs b/src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs index d096e8a84f..c8d7000767 100644 --- a/src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs +++ b/src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.tabs.segmented-tab (:require - [quo2.components.tabs.segmented-tab :as quo2] - [quo2.theme :as theme] + [quo.components.tabs.segmented-tab :as quo] + [quo.theme :as theme] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) @@ -33,7 +33,7 @@ :style {:width "100%"} :blur-view-props {:blur-type (theme/get-theme)}} [:<> - [quo2/segmented-control + [quo/segmented-control (merge @state {:default-active 1 :data [{:id 1 :label "Tab 1"} @@ -42,7 +42,7 @@ {:id 4 :label "Tab 4"}] :on-change #(println "Active tab" %)})] [rn/view {:style {:padding-top 24}} - [quo2/segmented-control + [quo/segmented-control (merge @state {:default-active 1 :data [{:id 1 :label "Tab 1"} diff --git a/src/status_im2/contexts/quo_preview/tabs/tabs.cljs b/src/status_im2/contexts/quo_preview/tabs/tabs.cljs index 45e4de120c..83588735cf 100644 --- a/src/status_im2/contexts/quo_preview/tabs/tabs.cljs +++ b/src/status_im2/contexts/quo_preview/tabs/tabs.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.tabs.tabs (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/tags/context_tags.cljs b/src/status_im2/contexts/quo_preview/tags/context_tags.cljs index f704ea0435..364db4ab6c 100644 --- a/src/status_im2/contexts/quo_preview/tags/context_tags.cljs +++ b/src/status_im2/contexts/quo_preview/tags/context_tags.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.tags.context-tags (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/tags/network_tags.cljs b/src/status_im2/contexts/quo_preview/tags/network_tags.cljs index 07c3f484d8..a337bae810 100644 --- a/src/status_im2/contexts/quo_preview/tags/network_tags.cljs +++ b/src/status_im2/contexts/quo_preview/tags/network_tags.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.tags.network-tags (:require - [quo2.core :as quo] - [quo2.foundations.resources :as resources] + [quo.core :as quo] + [quo.foundations.resources :as resources] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/tags/number_tag.cljs b/src/status_im2/contexts/quo_preview/tags/number_tag.cljs index bc279eca88..d37793a6d2 100644 --- a/src/status_im2/contexts/quo_preview/tags/number_tag.cljs +++ b/src/status_im2/contexts/quo_preview/tags/number_tag.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.tags.number-tag (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/tags/permission_tag.cljs b/src/status_im2/contexts/quo_preview/tags/permission_tag.cljs index 4b7d5806a6..f28f97ce39 100644 --- a/src/status_im2/contexts/quo_preview/tags/permission_tag.cljs +++ b/src/status_im2/contexts/quo_preview/tags/permission_tag.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.tags.permission-tag (:require - [quo2.components.tags.permission-tag :as permission-tag] - [quo2.foundations.colors :as colors] + [quo.components.tags.permission-tag :as permission-tag] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/tags/status_tags.cljs b/src/status_im2/contexts/quo_preview/tags/status_tags.cljs index 0db36dff26..f3e747be1d 100644 --- a/src/status_im2/contexts/quo_preview/tags/status_tags.cljs +++ b/src/status_im2/contexts/quo_preview/tags/status_tags.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.tags.status-tags (:require - [quo2.components.tags.status-tags :as quo2] - [quo2.foundations.colors :as colors] + [quo.components.tags.status-tags :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] @@ -55,4 +55,4 @@ {:show-blur-background? (:blur? @state) :blur-view-props {:blur-type :dark :overlay-color colors/neutral-80-opa-80} - :style {:align-self :center}} [quo2/status-tag props]]]])))) + :style {:align-self :center}} [quo/status-tag props]]]])))) diff --git a/src/status_im2/contexts/quo_preview/tags/tag.cljs b/src/status_im2/contexts/quo_preview/tags/tag.cljs index 7b50fa5dde..e0611012a8 100644 --- a/src/status_im2/contexts/quo_preview/tags/tag.cljs +++ b/src/status_im2/contexts/quo_preview/tags/tag.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.tags.tag (:require - [quo2.components.tags.tag :as tag] - [quo2.foundations.colors :as colors] + [quo.components.tags.tag :as tag] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im.ui.components.react :as react] diff --git a/src/status_im2/contexts/quo_preview/tags/tags.cljs b/src/status_im2/contexts/quo_preview/tags/tags.cljs index a3c7ba85a1..f710de7beb 100644 --- a/src/status_im2/contexts/quo_preview/tags/tags.cljs +++ b/src/status_im2/contexts/quo_preview/tags/tags.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.tags.tags (:require - [quo2.components.tags.tags :as tags] - [quo2.foundations.colors :as colors] + [quo.components.tags.tags :as tags] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im.ui.components.react :as react] diff --git a/src/status_im2/contexts/quo_preview/tags/tiny_tag.cljs b/src/status_im2/contexts/quo_preview/tags/tiny_tag.cljs index 4ef7788940..c3fab21264 100644 --- a/src/status_im2/contexts/quo_preview/tags/tiny_tag.cljs +++ b/src/status_im2/contexts/quo_preview/tags/tiny_tag.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.tags.tiny-tag (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/tags/token_tag.cljs b/src/status_im2/contexts/quo_preview/tags/token_tag.cljs index e55b06cae6..62daaf7970 100644 --- a/src/status_im2/contexts/quo_preview/tags/token_tag.cljs +++ b/src/status_im2/contexts/quo_preview/tags/token_tag.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.tags.token-tag (:require - [quo2.components.tags.token-tag :as quo2] - [quo2.foundations.resources :as resources] + [quo.components.tags.token-tag :as quo] + [quo.foundations.resources :as resources] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) @@ -55,6 +55,6 @@ [rn/view {:padding-vertical 60 :align-items :center} - [quo2/token-tag + [quo/token-tag (merge @state {:token-img-src (if (= (get-in @state [:token]) "ETH") eth-token snt-token)})]]]]))) diff --git a/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs b/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs index 74d4b40a0f..ef997dcc80 100644 --- a/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs +++ b/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.text-combinations.preview (:require - [quo2.components.text-combinations.view :as quo2] + [quo.components.text-combinations.view :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] @@ -45,5 +45,5 @@ [rn/view {:padding-vertical 60 :align-items :center} - [quo2/view + [quo/view (state->text-combinations-props @state)]]]]))) diff --git a/src/status_im2/contexts/quo_preview/wallet/account_card.cljs b/src/status_im2/contexts/quo_preview/wallet/account_card.cljs index 612f3956c5..b5d0d28cb9 100644 --- a/src/status_im2/contexts/quo_preview/wallet/account_card.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/account_card.cljs @@ -1,9 +1,9 @@ (ns status-im2.contexts.quo-preview.wallet.account-card (:require - [quo2.components.icon :as icon] - [quo2.components.markdown.text :as text] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.components.icon :as icon] + [quo.components.markdown.text :as text] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview] diff --git a/src/status_im2/contexts/quo_preview/wallet/account_origin.cljs b/src/status_im2/contexts/quo_preview/wallet/account_origin.cljs index e111136b3f..725db6f29c 100644 --- a/src/status_im2/contexts/quo_preview/wallet/account_origin.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/account_origin.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.wallet.account-origin (:require - [quo2.core :as quo] + [quo.core :as quo] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/wallet/account_overview.cljs b/src/status_im2/contexts/quo_preview/wallet/account_overview.cljs index c9ca371756..b39407da47 100644 --- a/src/status_im2/contexts/quo_preview/wallet/account_overview.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/account_overview.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.wallet.account-overview (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/wallet/keypair.cljs b/src/status_im2/contexts/quo_preview/wallet/keypair.cljs index 64983fce8d..be71e89621 100644 --- a/src/status_im2/contexts/quo_preview/wallet/keypair.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/keypair.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.wallet.keypair (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs b/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs index d45402f206..f5da35bb52 100644 --- a/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.wallet.network-amount (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/wallet/network_bridge.cljs b/src/status_im2/contexts/quo_preview/wallet/network_bridge.cljs index f9d15f72be..5bb31d388a 100644 --- a/src/status_im2/contexts/quo_preview/wallet/network_bridge.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/network_bridge.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.wallet.network-bridge (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/wallet/network_link.cljs b/src/status_im2/contexts/quo_preview/wallet/network_link.cljs index a6f2b66a1a..8871993bac 100644 --- a/src/status_im2/contexts/quo_preview/wallet/network_link.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/network_link.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.wallet.network-link (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/wallet/progress_bar.cljs b/src/status_im2/contexts/quo_preview/wallet/progress_bar.cljs index ecddf05b5e..02729649e0 100644 --- a/src/status_im2/contexts/quo_preview/wallet/progress_bar.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/progress_bar.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.wallet.progress-bar (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/wallet/summary_info.cljs b/src/status_im2/contexts/quo_preview/wallet/summary_info.cljs index 27349ba99b..914ca2d4a5 100644 --- a/src/status_im2/contexts/quo_preview/wallet/summary_info.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/summary_info.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.wallet.summary-info (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/wallet/token_input.cljs b/src/status_im2/contexts/quo_preview/wallet/token_input.cljs index 3c1dc9ba89..799aaeaf3c 100644 --- a/src/status_im2/contexts/quo_preview/wallet/token_input.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/token_input.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.wallet.token-input (:require - [quo2.core :as quo] - [quo2.foundations.resources :as resources] + [quo.core :as quo] + [quo.foundations.resources :as resources] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/wallet/transaction_summary.cljs b/src/status_im2/contexts/quo_preview/wallet/transaction_summary.cljs index 6c2a06d593..b7e3804c19 100644 --- a/src/status_im2/contexts/quo_preview/wallet/transaction_summary.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/transaction_summary.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.wallet.transaction-summary (:require - [quo2.core :as quo] - [quo2.foundations.resources :as quo.resources] + [quo.core :as quo] + [quo.foundations.resources :as quo.resources] [reagent.core :as reagent] [status-im2.common.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/wallet/wallet_activity.cljs b/src/status_im2/contexts/quo_preview/wallet/wallet_activity.cljs index dca401bd0b..0fb4e20f34 100644 --- a/src/status_im2/contexts/quo_preview/wallet/wallet_activity.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/wallet_activity.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.wallet.wallet-activity (:require - [quo2.core :as quo] - [quo2.foundations.resources :as quo.resources] + [quo.core :as quo] + [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.common.resources :as resources] diff --git a/src/status_im2/contexts/quo_preview/wallet/wallet_overview.cljs b/src/status_im2/contexts/quo_preview/wallet/wallet_overview.cljs index 841b8cbc54..330b929b5a 100644 --- a/src/status_im2/contexts/quo_preview/wallet/wallet_overview.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/wallet_overview.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.quo-preview.wallet.wallet-overview (:require - [quo2.core :as quo] - [quo2.foundations.resources :as quo.resources] + [quo.core :as quo] + [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [reagent.core :as reagent] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/shell/activity_center/drawer/view.cljs b/src/status_im2/contexts/shell/activity_center/drawer/view.cljs index 8409825449..0f2491ea5f 100644 --- a/src/status_im2/contexts/shell/activity_center/drawer/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/drawer/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.shell.activity-center.drawer.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/events.cljs b/src/status_im2/contexts/shell/activity_center/events.cljs index 38547237ef..ab1db10fb2 100644 --- a/src/status_im2/contexts/shell/activity_center/events.cljs +++ b/src/status_im2/contexts/shell/activity_center/events.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.events (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [re-frame.core :as re-frame] [status-im.data-store.activities :as activities] [status-im.data-store.chats :as data-store.chats] diff --git a/src/status_im2/contexts/shell/activity_center/header/view.cljs b/src/status_im2/contexts/shell/activity_center/header/view.cljs index 902ecae862..27f11735c3 100644 --- a/src/status_im2/contexts/shell/activity_center/header/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/header/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.header.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.shell.activity-center.drawer.view :as drawer] [status-im2.contexts.shell.activity-center.style :as style] diff --git a/src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs index 20359b8cc1..5d99143ed1 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.notification.admin.view (:require - [quo2.core :as quo] + [quo.core :as quo] [status-im2.constants :as constants] [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] [status-im2.contexts.shell.activity-center.notification.common.view :as common] diff --git a/src/status_im2/contexts/shell/activity_center/notification/common/style.cljs b/src/status_im2/contexts/shell/activity_center/notification/common/style.cljs index b2425ee177..a16075b536 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/common/style.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/common/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.notification.common.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def swipe-action-width 80) (def swipe-button-border-radius 16) diff --git a/src/status_im2/contexts/shell/activity_center/notification/common/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/common/view.cljs index 050044a0d0..2b54d30f24 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/common/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/common/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.shell.activity-center.notification.common.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.gesture :as gesture] [status-im.multiaccounts.core :as multiaccounts] diff --git a/src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs index 88da98d28b..c09c027b13 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.notification.community-kicked.view (:require - [quo2.core :as quo] + [quo.core :as quo] [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] [status-im2.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] diff --git a/src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs index b580a72beb..db17dd0560 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.notification.community-request.view (:require - [quo2.core :as quo] + [quo.core :as quo] [status-im2.constants :as constants] [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] [status-im2.contexts.shell.activity-center.notification.common.view :as common] diff --git a/src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs index fa7c4d40b7..b833080fb2 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.notification.contact-requests.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.gesture :as gesture] [status-im2.constants :as constants] [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] diff --git a/src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs index f459771b62..8a518a72e5 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.shell.activity-center.notification.contact-verification.view (:require [clojure.string :as string] - [quo2.core :as quo] + [quo.core :as quo] [status-im2.constants :as constants] [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] [status-im2.contexts.shell.activity-center.notification.common.view :as common] diff --git a/src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs index d8c2ed1de8..cb127cbbee 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.notification.membership.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.gesture :as gesture] [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] [status-im2.contexts.shell.activity-center.notification.common.view :as common] diff --git a/src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs b/src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs index 8c623e17cd..e257691276 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.notification.mentions.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def tag {:background-color colors/white-opa-10}) diff --git a/src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs index 2b4fb90f57..bbc3b16f96 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.shell.activity-center.notification.mentions.view (:require [clojure.string :as string] - [quo2.core :as quo] + [quo.core :as quo] [react-native.gesture :as gesture] [status-im2.contexts.shell.activity-center.notification.common.view :as common] [status-im2.contexts.shell.activity-center.notification.mentions.style :as style] diff --git a/src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs b/src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs index df223edf29..74c8404ce4 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.notification.reply.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def tag {:background-color colors/white-opa-10}) diff --git a/src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs index 632ba2f582..9db039d2d3 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.shell.activity-center.notification.reply.view (:require [clojure.string :as string] - [quo2.core :as quo] + [quo.core :as quo] [react-native.gesture :as gesture] [status-im.ui.screens.chat.message.legacy-view :as old-message] [status-im2.common.not-implemented :as not-implemented] diff --git a/src/status_im2/contexts/shell/activity_center/style.cljs b/src/status_im2/contexts/shell/activity_center/style.cljs index 9e4e5d1fd1..c13d5977c3 100644 --- a/src/status_im2/contexts/shell/activity_center/style.cljs +++ b/src/status_im2/contexts/shell/activity_center/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def screen-padding 20) diff --git a/src/status_im2/contexts/shell/activity_center/tabs/empty_tab/view.cljs b/src/status_im2/contexts/shell/activity_center/tabs/empty_tab/view.cljs index a56eeac1c2..edf074f554 100644 --- a/src/status_im2/contexts/shell/activity_center/tabs/empty_tab/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/tabs/empty_tab/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.activity-center.tabs.empty-tab.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.common.resources :as resources] [status-im2.contexts.shell.activity-center.notification-types :as types] diff --git a/src/status_im2/contexts/shell/activity_center/tabs/view.cljs b/src/status_im2/contexts/shell/activity_center/tabs/view.cljs index 79dedaa94a..3ce6c5692b 100644 --- a/src/status_im2/contexts/shell/activity_center/tabs/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/tabs/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.shell.activity-center.tabs.view (:require [clojure.set :as set] - [quo2.core :as quo] + [quo.core :as quo] [status-im2.contexts.shell.activity-center.notification-types :as types] [status-im2.contexts.shell.activity-center.style :as style] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs index 391c3104cf..e387cb06bf 100644 --- a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.components.bottom-tabs.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated] [status-im2.contexts.shell.jump-to.utils :as utils])) diff --git a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs index 4fd9b53cc8..bd70ca3e02 100644 --- a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.shell.jump-to.components.bottom-tabs.view (:require - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.platform :as platform] diff --git a/src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs b/src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs index d4467279fe..8e429c72ef 100644 --- a/src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.components.floating-screens.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] [status-im2.contexts.shell.jump-to.constants :as shell.constants])) diff --git a/src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs b/src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs index a087996a62..5e0902ad75 100644 --- a/src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.components.floating-screens.view (:require - [quo2.theme :as quo.theme] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.reanimated :as reanimated] [status-im2.contexts.chat.messages.view :as chat] diff --git a/src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs b/src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs index d84da0b51d..9f3df13b90 100644 --- a/src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.components.home-stack.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] [status-im2.contexts.shell.jump-to.utils :as utils])) diff --git a/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs b/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs index 8f7e781284..59f0c6f244 100644 --- a/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.components.home-stack.view (:require - [quo2.theme :as quo.theme] + [quo.theme :as quo.theme] [react-native.reanimated :as reanimated] [status-im.ui.screens.browser.stack :as browser.stack] [status-im.ui.screens.wallet.accounts.views :as wallet.accounts] diff --git a/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs b/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs index ef7bf0bb30..69d6b3ee86 100644 --- a/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.components.jump-to-screen.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [status-im2.contexts.shell.jump-to.utils :as utils])) ;;;; Placeholder diff --git a/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs b/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs index 17eeb4a8fe..8a7e141744 100644 --- a/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.shell.jump-to.components.jump-to-screen.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.blur :as blur] [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient] diff --git a/src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs b/src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs index 1b97aee5d2..7509612d78 100644 --- a/src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.components.switcher-cards.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def colors-map {:secondary-container-bg-color colors/neutral-95 diff --git a/src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs b/src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs index 686b529c5a..92ca0724e8 100644 --- a/src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.shell.jump-to.components.switcher-cards.view (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.fast-image :as fast-image] [status-im2.config :as config] diff --git a/src/status_im2/contexts/shell/jump_to/shared_values.cljs b/src/status_im2/contexts/shell/jump_to/shared_values.cljs index 6493624e5c..84d49a102a 100644 --- a/src/status_im2/contexts/shell/jump_to/shared_values.cljs +++ b/src/status_im2/contexts/shell/jump_to/shared_values.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.shared-values (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] [status-im2.contexts.shell.jump-to.constants :as shell.constants] diff --git a/src/status_im2/contexts/shell/jump_to/utils.cljs b/src/status_im2/contexts/shell/jump_to/utils.cljs index 6c5f49e9d2..0d6d42a160 100644 --- a/src/status_im2/contexts/shell/jump_to/utils.cljs +++ b/src/status_im2/contexts/shell/jump_to/utils.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.utils (:require - [quo2.theme :as quo.theme] + [quo.theme :as quo.theme] [react-native.async-storage :as async-storage] [react-native.core :as rn] [react-native.platform :as platform] diff --git a/src/status_im2/contexts/shell/jump_to/view.cljs b/src/status_im2/contexts/shell/jump_to/view.cljs index c07ac64319..61e6c63177 100644 --- a/src/status_im2/contexts/shell/jump_to/view.cljs +++ b/src/status_im2/contexts/shell/jump_to/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.jump-to.view (:require - [quo2.core :as quo] + [quo.core :as quo] re-frame.db [react-native.core :as rn] [status-im2.config :as config] diff --git a/src/status_im2/contexts/shell/share/events.cljs b/src/status_im2/contexts/shell/share/events.cljs index 2f3e749d2b..32e4251cac 100644 --- a/src/status_im2/contexts/shell/share/events.cljs +++ b/src/status_im2/contexts/shell/share/events.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.share.events (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [status-im2.common.toasts.events :as toasts] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/share/style.cljs b/src/status_im2/contexts/shell/share/style.cljs index 3df41ed750..20a3500997 100644 --- a/src/status_im2/contexts/shell/share/style.cljs +++ b/src/status_im2/contexts/shell/share/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.share.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform])) (def screen-padding 20) diff --git a/src/status_im2/contexts/shell/share/view.cljs b/src/status_im2/contexts/shell/share/view.cljs index bf066df227..f75bef6de6 100644 --- a/src/status_im2/contexts/shell/share/view.cljs +++ b/src/status_im2/contexts/shell/share/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.shell.share.view (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.blur :as blur] [react-native.core :as rn] [react-native.navigation :as navigation] diff --git a/src/status_im2/contexts/syncing/device/style.cljs b/src/status_im2/contexts/syncing/device/style.cljs index 173d806dba..ffab94b025 100644 --- a/src/status_im2/contexts/syncing/device/style.cljs +++ b/src/status_im2/contexts/syncing/device/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.syncing.device.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def device-container {:border-color colors/white-opa-5 diff --git a/src/status_im2/contexts/syncing/device/view.cljs b/src/status_im2/contexts/syncing/device/view.cljs index 1ac2c74e93..c92025fdf1 100644 --- a/src/status_im2/contexts/syncing/device/view.cljs +++ b/src/status_im2/contexts/syncing/device/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.syncing.device.view (:require - [quo2.core :as quo] + [quo.core :as quo] [status-im2.contexts.syncing.device.style :as style] [utils.i18n :as i18n])) diff --git a/src/status_im2/contexts/syncing/enter_sync_code/style.cljs b/src/status_im2/contexts/syncing/enter_sync_code/style.cljs index da34b5a7ef..32960ef30f 100644 --- a/src/status_im2/contexts/syncing/enter_sync_code/style.cljs +++ b/src/status_im2/contexts/syncing/enter_sync_code/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.syncing.enter-sync-code.style (:require - [quo2.foundations.colors :as colors] - [quo2.foundations.typography :as typography])) + [quo.foundations.colors :as colors] + [quo.foundations.typography :as typography])) (def container-text-input {:flex-direction :row diff --git a/src/status_im2/contexts/syncing/enter_sync_code/view.cljs b/src/status_im2/contexts/syncing/enter_sync_code/view.cljs index 1a251d57e8..5bceb9c32e 100644 --- a/src/status_im2/contexts/syncing/enter_sync_code/view.cljs +++ b/src/status_im2/contexts/syncing/enter_sync_code/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.syncing.enter-sync-code.view (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.clipboard :as clipboard] [react-native.core :as rn] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/syncing/scan_sync_code/style.cljs b/src/status_im2/contexts/syncing/scan_sync_code/style.cljs index 096b48389c..348e68bbe3 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/style.cljs +++ b/src/status_im2/contexts/syncing/scan_sync_code/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.syncing.scan-sync-code.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) (def screen-padding 20) diff --git a/src/status_im2/contexts/syncing/scan_sync_code/view.cljs b/src/status_im2/contexts/syncing/scan_sync_code/view.cljs index 089abc66fc..7bcb05b445 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/view.cljs +++ b/src/status_im2/contexts/syncing/scan_sync_code/view.cljs @@ -2,8 +2,8 @@ (:require [clojure.string :as string] [oops.core :as oops] - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.blur :as blur] [react-native.camera-kit :as camera-kit] [react-native.core :as rn] diff --git a/src/status_im2/contexts/syncing/scan_sync_code_page/style.cljs b/src/status_im2/contexts/syncing/scan_sync_code_page/style.cljs index fd250651c5..3cbaf21e74 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code_page/style.cljs +++ b/src/status_im2/contexts/syncing/scan_sync_code_page/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.syncing.scan-sync-code-page.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def background {:position :absolute diff --git a/src/status_im2/contexts/syncing/setup_syncing/style.cljs b/src/status_im2/contexts/syncing/setup_syncing/style.cljs index 4906efe584..c2dd66ad4d 100644 --- a/src/status_im2/contexts/syncing/setup_syncing/style.cljs +++ b/src/status_im2/contexts/syncing/setup_syncing/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.syncing.setup-syncing.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container-main {:background-color colors/neutral-95 diff --git a/src/status_im2/contexts/syncing/setup_syncing/view.cljs b/src/status_im2/contexts/syncing/setup_syncing/view.cljs index 64545ac2ea..64853e4c5f 100644 --- a/src/status_im2/contexts/syncing/setup_syncing/view.cljs +++ b/src/status_im2/contexts/syncing/setup_syncing/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.syncing.setup-syncing.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.clipboard :as clipboard] [react-native.core :as rn] [react-native.hooks :as hooks] diff --git a/src/status_im2/contexts/syncing/syncing_devices_list/style.cljs b/src/status_im2/contexts/syncing/syncing_devices_list/style.cljs index ac334e513e..ff5a2ae2dc 100644 --- a/src/status_im2/contexts/syncing/syncing_devices_list/style.cljs +++ b/src/status_im2/contexts/syncing/syncing_devices_list/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.syncing.syncing-devices-list.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def container-main {:background-color colors/neutral-95 diff --git a/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs b/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs index cdeb428f86..67da3c186e 100644 --- a/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs +++ b/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.syncing.syncing-devices-list.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [status-im2.contexts.syncing.device.view :as device] [status-im2.contexts.syncing.syncing-devices-list.style :as style] diff --git a/src/status_im2/contexts/syncing/syncing_instructions/style.cljs b/src/status_im2/contexts/syncing/syncing_instructions/style.cljs index 84789faedf..cc887ea827 100644 --- a/src/status_im2/contexts/syncing/syncing_instructions/style.cljs +++ b/src/status_im2/contexts/syncing/syncing_instructions/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.syncing.syncing-instructions.style (:require - [quo2.foundations.colors :as colors] + [quo.foundations.colors :as colors] [react-native.platform :as platform])) (def container-outer diff --git a/src/status_im2/contexts/syncing/syncing_instructions/view.cljs b/src/status_im2/contexts/syncing/syncing_instructions/view.cljs index 109d8839e0..fdf15145cc 100644 --- a/src/status_im2/contexts/syncing/syncing_instructions/view.cljs +++ b/src/status_im2/contexts/syncing/syncing_instructions/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.syncing.syncing-instructions.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.gesture :as gesture] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/wallet/account/tabs/about/view.cljs b/src/status_im2/contexts/wallet/account/tabs/about/view.cljs index 3253120fee..961142a45e 100644 --- a/src/status_im2/contexts/wallet/account/tabs/about/view.cljs +++ b/src/status_im2/contexts/wallet/account/tabs/about/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.wallet.account.tabs.about.view (:require - [quo2.core :as quo] - [quo2.foundations.colors :as colors] + [quo.core :as quo] + [quo.foundations.colors :as colors] [react-native.core :as rn] [status-im2.contexts.wallet.account.tabs.about.style :as style] [status-im2.contexts.wallet.common.temp :as temp] diff --git a/src/status_im2/contexts/wallet/account/tabs/dapps/style.cljs b/src/status_im2/contexts/wallet/account/tabs/dapps/style.cljs index a1ef8f7e33..416ee92f8f 100644 --- a/src/status_im2/contexts/wallet/account/tabs/dapps/style.cljs +++ b/src/status_im2/contexts/wallet/account/tabs/dapps/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.account.tabs.dapps.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (def dapps-container {:padding-horizontal 20 diff --git a/src/status_im2/contexts/wallet/account/tabs/dapps/view.cljs b/src/status_im2/contexts/wallet/account/tabs/dapps/view.cljs index c88fd0e2bd..f33c427dff 100644 --- a/src/status_im2/contexts/wallet/account/tabs/dapps/view.cljs +++ b/src/status_im2/contexts/wallet/account/tabs/dapps/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.wallet.account.tabs.dapps.view (:require - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [react-native.core :as rn] [status-im2.contexts.wallet.account.tabs.dapps.style :as style] [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab] diff --git a/src/status_im2/contexts/wallet/account/tabs/view.cljs b/src/status_im2/contexts/wallet/account/tabs/view.cljs index 01392a5e96..c96460911c 100644 --- a/src/status_im2/contexts/wallet/account/tabs/view.cljs +++ b/src/status_im2/contexts/wallet/account/tabs/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.account.tabs.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.wallet.account.tabs.about.view :as about] [status-im2.contexts.wallet.account.tabs.dapps.view :as dapps] diff --git a/src/status_im2/contexts/wallet/account/view.cljs b/src/status_im2/contexts/wallet/account/view.cljs index ac0385f544..deacd21333 100644 --- a/src/status_im2/contexts/wallet/account/view.cljs +++ b/src/status_im2/contexts/wallet/account/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.wallet.account.view (:require - [quo2.core :as quo] - [quo2.foundations.resources :as quo.resources] + [quo.core :as quo] + [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/wallet/address_watch/view.cljs b/src/status_im2/contexts/wallet/address_watch/view.cljs index 40cfe7ade3..787dd7194a 100644 --- a/src/status_im2/contexts/wallet/address_watch/view.cljs +++ b/src/status_im2/contexts/wallet/address_watch/view.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.wallet.address-watch.view (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [react-native.clipboard :as clipboard] [react-native.core :as rn] [react-native.safe-area :as safe-area] diff --git a/src/status_im2/contexts/wallet/collectible/view.cljs b/src/status_im2/contexts/wallet/collectible/view.cljs index 0b51ab56c9..f9162c7265 100644 --- a/src/status_im2/contexts/wallet/collectible/view.cljs +++ b/src/status_im2/contexts/wallet/collectible/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.collectible.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.common.scroll-page.view :as scroll-page] [status-im2.contexts.wallet.collectible.style :as style] diff --git a/src/status_im2/contexts/wallet/common/activity_tab/view.cljs b/src/status_im2/contexts/wallet/common/activity_tab/view.cljs index adfe0efb5b..13f83a0d78 100644 --- a/src/status_im2/contexts/wallet/common/activity_tab/view.cljs +++ b/src/status_im2/contexts/wallet/common/activity_tab/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.common.activity-tab.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab] [status-im2.contexts.wallet.common.temp :as temp] diff --git a/src/status_im2/contexts/wallet/common/collectibles_tab/view.cljs b/src/status_im2/contexts/wallet/common/collectibles_tab/view.cljs index d3ca68c2ac..1b8560dd3e 100644 --- a/src/status_im2/contexts/wallet/common/collectibles_tab/view.cljs +++ b/src/status_im2/contexts/wallet/common/collectibles_tab/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.common.collectibles-tab.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab] [status-im2.contexts.wallet.common.temp :as temp] diff --git a/src/status_im2/contexts/wallet/common/empty_tab/view.cljs b/src/status_im2/contexts/wallet/common/empty_tab/view.cljs index dac5634225..041dcb6887 100644 --- a/src/status_im2/contexts/wallet/common/empty_tab/view.cljs +++ b/src/status_im2/contexts/wallet/common/empty_tab/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.common.empty-tab.view (:require - [quo2.core :as quo] + [quo.core :as quo] [status-im2.contexts.wallet.common.empty-tab.style :as style])) (defn view diff --git a/src/status_im2/contexts/wallet/common/temp.cljs b/src/status_im2/contexts/wallet/common/temp.cljs index 4d6766800d..0eca7d2392 100644 --- a/src/status_im2/contexts/wallet/common/temp.cljs +++ b/src/status_im2/contexts/wallet/common/temp.cljs @@ -1,8 +1,8 @@ (ns status-im2.contexts.wallet.common.temp (:require [clojure.string :as string] - [quo2.core :as quo] - [quo2.foundations.resources :as quo.resources] + [quo.core :as quo] + [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [status-im2.common.resources :as status.resources] [status-im2.constants :as constants] diff --git a/src/status_im2/contexts/wallet/create_account/style.cljs b/src/status_im2/contexts/wallet/create_account/style.cljs index 82037aa96f..b7185bcf95 100644 --- a/src/status_im2/contexts/wallet/create_account/style.cljs +++ b/src/status_im2/contexts/wallet/create_account/style.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.create-account.style (:require - [quo2.foundations.colors :as colors])) + [quo.foundations.colors :as colors])) (defn gradient-cover-container [top] diff --git a/src/status_im2/contexts/wallet/create_account/view.cljs b/src/status_im2/contexts/wallet/create_account/view.cljs index ee1a4b1628..ff2cd7d111 100644 --- a/src/status_im2/contexts/wallet/create_account/view.cljs +++ b/src/status_im2/contexts/wallet/create_account/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.wallet.create-account.view (:require - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/wallet/home/view.cljs b/src/status_im2/contexts/wallet/home/view.cljs index 43d204810b..c373a6489a 100644 --- a/src/status_im2/contexts/wallet/home/view.cljs +++ b/src/status_im2/contexts/wallet/home/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.home.view (:require - [quo2.core :as quo] + [quo.core :as quo] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/wallet/saved_address/view.cljs b/src/status_im2/contexts/wallet/saved_address/view.cljs index bdd646af4c..e430de4f36 100644 --- a/src/status_im2/contexts/wallet/saved_address/view.cljs +++ b/src/status_im2/contexts/wallet/saved_address/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.saved-address.view (:require - [quo2.core :as quo] + [quo.core :as quo] [re-frame.core :as rf] [react-native.core :as rn])) diff --git a/src/status_im2/contexts/wallet/saved_addresses/view.cljs b/src/status_im2/contexts/wallet/saved_addresses/view.cljs index 4b311f299d..15cdbe1573 100644 --- a/src/status_im2/contexts/wallet/saved_addresses/view.cljs +++ b/src/status_im2/contexts/wallet/saved_addresses/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.wallet.saved-addresses.view (:require - [quo2.core :as quo] + [quo.core :as quo] [re-frame.core :as rf] [react-native.core :as rn])) diff --git a/src/status_im2/contexts/wallet/send/select_address/view.cljs b/src/status_im2/contexts/wallet/send/select_address/view.cljs index dbe1bf7dd1..a0fe9a86ca 100644 --- a/src/status_im2/contexts/wallet/send/select_address/view.cljs +++ b/src/status_im2/contexts/wallet/send/select_address/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.wallet.send.select-address.view (:require - [quo2.core :as quo] - [quo2.theme :as quo.theme] + [quo.core :as quo] + [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] diff --git a/src/status_im2/core.cljs b/src/status_im2/core.cljs index f764268255..ad4bfc26fd 100644 --- a/src/status_im2/core.cljs +++ b/src/status_im2/core.cljs @@ -13,21 +13,21 @@ [react-native.reanimated :as reanimated] [react-native.shake :as react-native-shake] [reagent.impl.batching :as batching] + status-im.events + status-im.subs.root [status-im.utils.universal-links.core :as utils.universal-links] [status-im2.common.log :as log] [status-im2.config :as config] [status-im2.contexts.push-notifications.events :as notifications] [status-im2.contexts.shell.jump-to.state :as shell.state] [status-im2.contexts.shell.jump-to.utils :as shell.utils] + status-im2.events + status-im2.navigation.core [status-im2.setup.dev :as dev] [status-im2.setup.global-error :as global-error] [status-im2.setup.interceptors :as interceptors] - [utils.i18n :as i18n] - status-im.events - status-im.subs.root - status-im2.events - status-im2.navigation.core - status-im2.subs.root)) + status-im2.subs.root + [utils.i18n :as i18n])) ;;;; re-frame RN setup (set! interop/next-tick js/setTimeout) diff --git a/src/status_im2/navigation/options.cljs b/src/status_im2/navigation/options.cljs index 57463fe587..4785b5cb52 100644 --- a/src/status_im2/navigation/options.cljs +++ b/src/status_im2/navigation/options.cljs @@ -1,7 +1,7 @@ (ns status-im2.navigation.options (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [react-native.platform :as platform])) (defn default-options diff --git a/src/status_im2/navigation/roots.cljs b/src/status_im2/navigation/roots.cljs index 17845921c5..a399555804 100644 --- a/src/status_im2/navigation/roots.cljs +++ b/src/status_im2/navigation/roots.cljs @@ -1,7 +1,7 @@ (ns status-im2.navigation.roots (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as quo.theme] + [quo.foundations.colors :as colors] + [quo.theme :as quo.theme] [status-im2.constants :as constants] [status-im2.navigation.options :as options] [status-im2.navigation.view :as views])) diff --git a/src/status_im2/navigation/view.cljs b/src/status_im2/navigation/view.cljs index b6ad02110b..515f93c669 100644 --- a/src/status_im2/navigation/view.cljs +++ b/src/status_im2/navigation/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.navigation.view (:require - [quo2.foundations.colors :as colors] - [quo2.theme :as theme] + [quo.foundations.colors :as colors] + [quo.theme :as theme] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] diff --git a/src/status_im2/subs/contact.cljs b/src/status_im2/subs/contact.cljs index b8d6b9cedd..d019210c9f 100644 --- a/src/status_im2/subs/contact.cljs +++ b/src/status_im2/subs/contact.cljs @@ -1,7 +1,7 @@ (ns status-im2.subs.contact (:require [clojure.string :as string] - [quo2.theme :as theme] + [quo.theme :as theme] [re-frame.core :as re-frame] [status-im.contact.db :as contact.db] [status-im.multiaccounts.core :as multiaccounts] diff --git a/src/status_im2/subs/profile.cljs b/src/status_im2/subs/profile.cljs index 2b148a37b8..85b3274377 100644 --- a/src/status_im2/subs/profile.cljs +++ b/src/status_im2/subs/profile.cljs @@ -2,7 +2,7 @@ (:require [cljs.spec.alpha :as spec] [clojure.string :as string] - [quo2.theme :as theme] + [quo.theme :as theme] [re-frame.core :as re-frame] [status-im.fleet.core :as fleet] [status-im.multiaccounts.db :as multiaccounts.db] diff --git a/src/test_helpers/component.cljs b/src/test_helpers/component.cljs index 435f386db7..220ce2b312 100644 --- a/src/test_helpers/component.cljs +++ b/src/test_helpers/component.cljs @@ -4,7 +4,7 @@ (:require ["@testing-library/react-native" :as rtl] [camel-snake-kebab.core :as camel-snake-kebab] - [quo2.theme :as quo.theme] + [quo.theme :as quo.theme] [reagent.core :as reagent] [utils.i18n :as i18n]))