From 33aa595877452d2f09cf6e05dc01d464549b9d0c Mon Sep 17 00:00:00 2001 From: Jamie Caprani Date: Wed, 7 Sep 2022 19:09:06 +0100 Subject: [PATCH] chore: restructure quo2 components (#13948) --- .../{avatar => avatars}/avatar_themes.cljs | 2 +- .../{ => avatars}/group_avatar.cljs | 2 +- .../components/{ => avatars}/icon_avatar.cljs | 4 +- .../components/{ => avatars}/user_avatar.cljs | 4 +- .../{ => avatars}/wallet_user_avatar.cljs | 4 +- src/quo2/components/{ => buttons}/button.cljs | 4 +- .../community_card_view.cljs | 4 +- .../community_list_view.cljs | 6 +-- .../community_view.cljs | 8 ++-- .../components/{ => counter}/counter.cljs | 4 +- src/quo2/components/header.cljs | 4 +- .../components/{ => info}/info_message.cljs | 4 +- .../{ => info}/information_box.cljs | 6 +-- src/quo2/components/{ => markdown}/text.cljs | 2 +- .../{messages_gap.cljs => messages/gap.cljs} | 4 +- .../{ => notifications}/activity_logs.cljs | 8 ++-- .../{reacts.cljs => reactions/react.cljs} | 4 +- .../segmented_tab.cljs} | 4 +- src/quo2/components/{ => tabs}/tab.cljs | 4 +- src/quo2/components/{ => tabs}/tabs.cljs | 4 +- src/quo2/components/{ => tags}/base_tag.cljs | 2 +- .../components/{ => tags}/context_tags.cljs | 6 +-- .../components/{ => tags}/filter_tag.cljs | 6 +-- .../components/{ => tags}/filter_tags.cljs | 4 +- .../components/{ => tags}/permission_tag.cljs | 6 +-- .../components/{ => tags}/status_tags.cljs | 4 +- src/quo2/components/{ => tags}/tag.cljs | 4 +- src/quo2/components/{ => tags}/token_tag.cljs | 4 +- .../{ => wallet}/token_overview.cljs | 4 +- .../screens/{ => avatars}/group_avatar.cljs | 4 +- .../screens/{ => avatars}/icon_avatar.cljs | 4 +- .../screens/{ => avatars}/user_avatar.cljs | 4 +- .../{ => avatars}/wallet_user_avatar.cljs | 4 +- src/quo2/screens/{ => buttons}/button.cljs | 4 +- .../{ => community}/community_card_view.cljs | 6 +-- src/quo2/screens/{ => counter}/counter.cljs | 4 +- src/quo2/screens/{ => info}/info_message.cljs | 4 +- .../screens/{ => info}/information_box.cljs | 4 +- src/quo2/screens/main.cljs | 46 +++++++++---------- src/quo2/screens/{ => markdown}/text.cljs | 4 +- .../{messages_gap.cljs => messages/gap.cljs} | 4 +- .../{ => notifications}/activity_logs.cljs | 6 +-- .../{reacts.cljs => reactions/react.cljs} | 6 +-- .../segmented_tab.cljs} | 4 +- src/quo2/screens/{ => tabs}/tabs.cljs | 4 +- src/quo2/screens/{ => tags}/context_tags.cljs | 4 +- src/quo2/screens/{ => tags}/filter_tags.cljs | 4 +- .../screens/{ => tags}/permission_tag.cljs | 4 +- src/quo2/screens/{ => tags}/status_tags.cljs | 4 +- src/quo2/screens/{ => tags}/token_tag.cljs | 4 +- .../screens/{ => wallet}/token_overview.cljs | 4 +- .../switcher/cards/messaging_card.cljs | 4 +- src/status_im/ui/components/plus_button.cljs | 2 +- src/status_im/ui/components/topnav.cljs | 2 +- .../ui/screens/chat/components/edit.cljs | 4 +- .../ui/screens/chat/components/input.cljs | 2 +- .../ui/screens/chat/components/reply.cljs | 4 +- .../ui/screens/chat/message/datemark.cljs | 2 +- src/status_im/ui/screens/chat/views.cljs | 2 +- .../communities_list_redesign.cljs | 16 +++---- .../community_membership_status.cljs | 4 +- .../screens/communities/sort_communities.cljs | 2 +- src/status_im/ui/screens/home/views.cljs | 6 +-- .../ui/screens/home/views/inner_item.cljs | 2 +- .../ui/screens/wallet/account/views.cljs | 6 +-- .../ui/screens/wallet/accounts/common.cljs | 2 +- .../ui/screens/wallet/accounts/views.cljs | 6 +-- 67 files changed, 164 insertions(+), 164 deletions(-) rename src/quo2/components/{avatar => avatars}/avatar_themes.cljs (98%) rename src/quo2/components/{ => avatars}/group_avatar.cljs (95%) rename src/quo2/components/{ => avatars}/icon_avatar.cljs (90%) rename src/quo2/components/{ => avatars}/user_avatar.cljs (98%) rename src/quo2/components/{ => avatars}/wallet_user_avatar.cljs (97%) rename src/quo2/components/{ => buttons}/button.cljs (99%) rename src/quo2/components/{communities => community}/community_card_view.cljs (93%) rename src/quo2/components/{communities => community}/community_list_view.cljs (95%) rename src/quo2/components/{communities => community}/community_view.cljs (92%) rename src/quo2/components/{ => counter}/counter.cljs (95%) rename src/quo2/components/{ => info}/info_message.cljs (94%) rename src/quo2/components/{ => info}/information_box.cljs (96%) rename src/quo2/components/{ => markdown}/text.cljs (97%) rename src/quo2/components/{messages_gap.cljs => messages/gap.cljs} (98%) rename src/quo2/components/{ => notifications}/activity_logs.cljs (92%) rename src/quo2/components/{reacts.cljs => reactions/react.cljs} (96%) rename src/quo2/components/{segmented_control.cljs => tabs/segmented_tab.cljs} (94%) rename src/quo2/components/{ => tabs}/tab.cljs (96%) rename src/quo2/components/{ => tabs}/tabs.cljs (86%) rename src/quo2/components/{ => tags}/base_tag.cljs (97%) rename src/quo2/components/{ => tags}/context_tags.cljs (91%) rename src/quo2/components/{ => tags}/filter_tag.cljs (96%) rename src/quo2/components/{ => tags}/filter_tags.cljs (91%) rename src/quo2/components/{ => tags}/permission_tag.cljs (96%) rename src/quo2/components/{ => tags}/status_tags.cljs (97%) rename src/quo2/components/{ => tags}/tag.cljs (93%) rename src/quo2/components/{ => tags}/token_tag.cljs (95%) rename src/quo2/components/{ => wallet}/token_overview.cljs (98%) rename src/quo2/screens/{ => avatars}/group_avatar.cljs (94%) rename src/quo2/screens/{ => avatars}/icon_avatar.cljs (94%) rename src/quo2/screens/{ => avatars}/user_avatar.cljs (93%) rename src/quo2/screens/{ => avatars}/wallet_user_avatar.cljs (94%) rename src/quo2/screens/{ => buttons}/button.cljs (95%) rename src/quo2/screens/{ => community}/community_card_view.cljs (92%) rename src/quo2/screens/{ => counter}/counter.cljs (94%) rename src/quo2/screens/{ => info}/info_message.cljs (95%) rename src/quo2/screens/{ => info}/information_box.cljs (95%) rename src/quo2/screens/{ => markdown}/text.cljs (93%) rename src/quo2/screens/{messages_gap.cljs => messages/gap.cljs} (92%) rename src/quo2/screens/{ => notifications}/activity_logs.cljs (94%) rename src/quo2/screens/{reacts.cljs => reactions/react.cljs} (93%) rename src/quo2/screens/{segmented.cljs => tabs/segmented_tab.cljs} (92%) rename src/quo2/screens/{ => tabs}/tabs.cljs (91%) rename src/quo2/screens/{ => tags}/context_tags.cljs (98%) rename src/quo2/screens/{ => tags}/filter_tags.cljs (96%) rename src/quo2/screens/{ => tags}/permission_tag.cljs (98%) rename src/quo2/screens/{ => tags}/status_tags.cljs (94%) rename src/quo2/screens/{ => tags}/token_tag.cljs (95%) rename src/quo2/screens/{ => wallet}/token_overview.cljs (95%) diff --git a/src/quo2/components/avatar/avatar_themes.cljs b/src/quo2/components/avatars/avatar_themes.cljs similarity index 98% rename from src/quo2/components/avatar/avatar_themes.cljs rename to src/quo2/components/avatars/avatar_themes.cljs index e92b57a0fc..947be58582 100644 --- a/src/quo2/components/avatar/avatar_themes.cljs +++ b/src/quo2/components/avatars/avatar_themes.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.avatar.avatar-themes +(ns quo2.components.avatars.avatar-themes (:require [quo2.foundations.colors :as colors])) (def themes {:light {:primary {:icon-color colors/primary-50 diff --git a/src/quo2/components/group_avatar.cljs b/src/quo2/components/avatars/group_avatar.cljs similarity index 95% rename from src/quo2/components/group_avatar.cljs rename to src/quo2/components/avatars/group_avatar.cljs index 5ab226ee6e..eb543c1c10 100644 --- a/src/quo2/components/group_avatar.cljs +++ b/src/quo2/components/avatars/group_avatar.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.group-avatar +(ns quo2.components.avatars.group-avatar (:require [quo2.foundations.colors :as colors] [quo.theme :as quo.theme] [quo2.components.icon :as icon] diff --git a/src/quo2/components/icon_avatar.cljs b/src/quo2/components/avatars/icon_avatar.cljs similarity index 90% rename from src/quo2/components/icon_avatar.cljs rename to src/quo2/components/avatars/icon_avatar.cljs index ead9d298e9..a46304a6d7 100644 --- a/src/quo2/components/icon_avatar.cljs +++ b/src/quo2/components/avatars/icon_avatar.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.icon-avatar +(ns quo2.components.avatars.icon-avatar (:require [quo.react-native :as rn] [quo.theme :as theme] - [quo2.components.avatar.avatar-themes :refer [themes]] + [quo2.components.avatars.avatar-themes :refer [themes]] [status-im.ui.components.icons.icons :as icons])) (def sizes diff --git a/src/quo2/components/user_avatar.cljs b/src/quo2/components/avatars/user_avatar.cljs similarity index 98% rename from src/quo2/components/user_avatar.cljs rename to src/quo2/components/avatars/user_avatar.cljs index fbe7973ca2..9d76bbbcf1 100644 --- a/src/quo2/components/user_avatar.cljs +++ b/src/quo2/components/avatars/user_avatar.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.user-avatar +(ns quo2.components.avatars.user-avatar (:require [quo.react-native :as rn] - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [quo2.foundations.colors :as colors] [quo2.components.icon :as icons] [clojure.string :refer [upper-case split blank?]] diff --git a/src/quo2/components/wallet_user_avatar.cljs b/src/quo2/components/avatars/wallet_user_avatar.cljs similarity index 97% rename from src/quo2/components/wallet_user_avatar.cljs rename to src/quo2/components/avatars/wallet_user_avatar.cljs index f4f2362d80..21cbe12639 100644 --- a/src/quo2/components/wallet_user_avatar.cljs +++ b/src/quo2/components/avatars/wallet_user_avatar.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.wallet-user-avatar +(ns quo2.components.avatars.wallet-user-avatar (:require [quo.react-native :as rn] [quo2.foundations.colors :as colors] - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [clojure.string :as clojure-string])) (def themes {:light {:primary {:text-color colors/primary-50 diff --git a/src/quo2/components/button.cljs b/src/quo2/components/buttons/button.cljs similarity index 99% rename from src/quo2/components/button.cljs rename to src/quo2/components/buttons/button.cljs index b5dddbe06e..ea7a435d5e 100644 --- a/src/quo2/components/button.cljs +++ b/src/quo2/components/buttons/button.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.button +(ns quo2.components.buttons.button (:require [quo.react-native :as rn] [quo2.foundations.colors :as colors] - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [quo.theme :as theme] [reagent.core :as reagent] [quo2.components.icon :as quo2.icons])) diff --git a/src/quo2/components/communities/community_card_view.cljs b/src/quo2/components/community/community_card_view.cljs similarity index 93% rename from src/quo2/components/communities/community_card_view.cljs rename to src/quo2/components/community/community_card_view.cljs index e2f3b60a9d..77f071187a 100644 --- a/src/quo2/components/communities/community_card_view.cljs +++ b/src/quo2/components/community/community_card_view.cljs @@ -1,6 +1,6 @@ -(ns quo2.components.communities.community-card-view +(ns quo2.components.community.community-card-view (:require - [quo2.components.communities.community-view :as community-view] + [quo2.components.community.community-view :as community-view] [status-im.communities.core :as communities] [status-im.utils.handlers :refer [>evt evt]] diff --git a/src/quo2/components/communities/community_view.cljs b/src/quo2/components/community/community_view.cljs similarity index 92% rename from src/quo2/components/communities/community_view.cljs rename to src/quo2/components/community/community_view.cljs index 93e9e6445d..1adc29475b 100644 --- a/src/quo2/components/communities/community_view.cljs +++ b/src/quo2/components/community/community_view.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.communities.community-view +(ns quo2.components.community.community-view (:require - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [quo2.components.icon :as icons] [quo2.foundations.colors :as colors] - [quo2.components.permission-tag :as permission] - [quo2.components.filter-tag :as filter-tag] + [quo2.components.tags.permission-tag :as permission] + [quo2.components.tags.filter-tag :as filter-tag] [status-im.ui.components.react :as react] [status-im.utils.money :as money] [status-im.i18n.i18n :as i18n] diff --git a/src/quo2/components/counter.cljs b/src/quo2/components/counter/counter.cljs similarity index 95% rename from src/quo2/components/counter.cljs rename to src/quo2/components/counter/counter.cljs index 786029d955..b5200278d8 100644 --- a/src/quo2/components/counter.cljs +++ b/src/quo2/components/counter/counter.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.counter +(ns quo2.components.counter.counter (:require [quo.theme :as theme] [quo.react-native :as rn] - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [quo2.foundations.colors :as colors])) (def themes diff --git a/src/quo2/components/header.cljs b/src/quo2/components/header.cljs index e86c566f62..9f7e2a3104 100644 --- a/src/quo2/components/header.cljs +++ b/src/quo2/components/header.cljs @@ -1,8 +1,8 @@ (ns quo2.components.header (:require [oops.core :refer [oget]] [quo.animated :as animated] - [quo2.components.button :as button] - [quo2.components.text :as text] + [quo2.components.buttons.button :as button] + [quo2.components.markdown.text :as text] [quo2.foundations.colors :as colors] [quo.design-system.spacing :as spacing] [quo.react-native :as rn] diff --git a/src/quo2/components/info_message.cljs b/src/quo2/components/info/info_message.cljs similarity index 94% rename from src/quo2/components/info_message.cljs rename to src/quo2/components/info/info_message.cljs index 07a02f9608..a534ca8405 100644 --- a/src/quo2/components/info_message.cljs +++ b/src/quo2/components/info/info_message.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.info-message +(ns quo2.components.info.info-message (:require [quo.theme :as theme] [quo.react-native :as rn] - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [quo2.foundations.colors :as colors] [quo2.components.icon :as quo2.icons])) diff --git a/src/quo2/components/information_box.cljs b/src/quo2/components/info/information_box.cljs similarity index 96% rename from src/quo2/components/information_box.cljs rename to src/quo2/components/info/information_box.cljs index e08ce06a01..e71a04ed7f 100644 --- a/src/quo2/components/information_box.cljs +++ b/src/quo2/components/info/information_box.cljs @@ -1,11 +1,11 @@ -(ns quo2.components.information-box +(ns quo2.components.info.information-box (:require [quo.theme :as theme] [quo.react-native :as rn] [clojure.string :as string] [quo2.foundations.colors :as colors] [quo2.components.icon :as quo2.icons] - [quo2.components.button :as quo2.button] - [quo2.components.info-message :as info-message])) + [quo2.components.buttons.button :as quo2.button] + [quo2.components.info.info-message :as info-message])) (def themes {:light {:default {:bg colors/white diff --git a/src/quo2/components/text.cljs b/src/quo2/components/markdown/text.cljs similarity index 97% rename from src/quo2/components/text.cljs rename to src/quo2/components/markdown/text.cljs index 26edec109d..d8a5162231 100644 --- a/src/quo2/components/text.cljs +++ b/src/quo2/components/markdown/text.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.text +(ns quo2.components.markdown.text (:require [quo.react-native :as rn] [reagent.core :as reagent] [quo.theme :as theme] diff --git a/src/quo2/components/messages_gap.cljs b/src/quo2/components/messages/gap.cljs similarity index 98% rename from src/quo2/components/messages_gap.cljs rename to src/quo2/components/messages/gap.cljs index 03b5d77d5f..4e1c6b05bd 100644 --- a/src/quo2/components/messages_gap.cljs +++ b/src/quo2/components/messages/gap.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.messages-gap +(ns quo2.components.messages.gap (:require [oops.core :refer [oget]] [quo.react-native :as rn] [quo.theme :as theme] [quo2.components.icon :as icon] - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [quo2.foundations.colors :as colors] [reagent.core :as reagent] [status-im.i18n.i18n :as i18n] diff --git a/src/quo2/components/activity_logs.cljs b/src/quo2/components/notifications/activity_logs.cljs similarity index 92% rename from src/quo2/components/activity_logs.cljs rename to src/quo2/components/notifications/activity_logs.cljs index 1a39388e68..93003fb26c 100644 --- a/src/quo2/components/activity_logs.cljs +++ b/src/quo2/components/notifications/activity_logs.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.activity-logs +(ns quo2.components.notifications.activity-logs (:require [quo.react-native :as rn] [quo2.foundations.colors :as colors] - [quo2.components.status-tags :as status-tags] - [quo2.components.button :as quo2.button] - [quo2.components.text :as text] + [quo2.components.tags.status-tags :as status-tags] + [quo2.components.buttons.button :as quo2.button] + [quo2.components.markdown.text :as text] [quo2.components.icon :as quo2.icons])) (defn activity-logs [_] diff --git a/src/quo2/components/reacts.cljs b/src/quo2/components/reactions/react.cljs similarity index 96% rename from src/quo2/components/reacts.cljs rename to src/quo2/components/reactions/react.cljs index 0ee6031ce9..239c83f464 100644 --- a/src/quo2/components/reacts.cljs +++ b/src/quo2/components/reactions/react.cljs @@ -1,5 +1,5 @@ -(ns quo2.components.reacts - (:require [quo2.components.text :as quo2-text] +(ns quo2.components.reactions.react + (:require [quo2.components.markdown.text :as quo2-text] [quo.react-native :as rn] [quo.theme :as theme] [quo2.foundations.colors :as colors] diff --git a/src/quo2/components/segmented_control.cljs b/src/quo2/components/tabs/segmented_tab.cljs similarity index 94% rename from src/quo2/components/segmented_control.cljs rename to src/quo2/components/tabs/segmented_tab.cljs index 5ceffdd017..3206983f6f 100644 --- a/src/quo2/components/segmented_control.cljs +++ b/src/quo2/components/tabs/segmented_tab.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.segmented-control +(ns quo2.components.tabs.segmented-tab (:require [reagent.core :as reagent] [quo.react-native :as rn] - [quo2.components.tab :as tab] + [quo2.components.tabs.tab :as tab] [quo2.foundations.colors :as colors] [quo.theme :as theme])) diff --git a/src/quo2/components/tab.cljs b/src/quo2/components/tabs/tab.cljs similarity index 96% rename from src/quo2/components/tab.cljs rename to src/quo2/components/tabs/tab.cljs index 8026c9d0b1..eae86a7dab 100644 --- a/src/quo2/components/tab.cljs +++ b/src/quo2/components/tabs/tab.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.tab +(ns quo2.components.tabs.tab (:require [quo2.foundations.colors :as colors] [quo.react-native :as rn] [quo.theme :as theme] [status-im.ui.components.icons.icons :as icons] - [quo2.components.text :as text])) + [quo2.components.markdown.text :as text])) (def themes {:light {:default {:background-color colors/neutral-20 :icon-color colors/neutral-50 diff --git a/src/quo2/components/tabs.cljs b/src/quo2/components/tabs/tabs.cljs similarity index 86% rename from src/quo2/components/tabs.cljs rename to src/quo2/components/tabs/tabs.cljs index e9eae85286..8131793ef4 100644 --- a/src/quo2/components/tabs.cljs +++ b/src/quo2/components/tabs/tabs.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.tabs +(ns quo2.components.tabs.tabs (:require [reagent.core :as reagent] [quo.react-native :as rn] - [quo2.components.tab :as tab])) + [quo2.components.tabs.tab :as tab])) (defn tabs [{:keys [default-active on-change]}] (let [active-tab-id (reagent/atom default-active)] diff --git a/src/quo2/components/base_tag.cljs b/src/quo2/components/tags/base_tag.cljs similarity index 97% rename from src/quo2/components/base_tag.cljs rename to src/quo2/components/tags/base_tag.cljs index 30fac8c33d..6937f218f3 100644 --- a/src/quo2/components/base_tag.cljs +++ b/src/quo2/components/tags/base_tag.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.base-tag +(ns quo2.components.tags.base-tag (:require [quo.react-native :as rn])) diff --git a/src/quo2/components/context_tags.cljs b/src/quo2/components/tags/context_tags.cljs similarity index 91% rename from src/quo2/components/context_tags.cljs rename to src/quo2/components/tags/context_tags.cljs index e73cefeb40..059dbd70a2 100644 --- a/src/quo2/components/context_tags.cljs +++ b/src/quo2/components/tags/context_tags.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.context-tags +(ns quo2.components.tags.context-tags (:require [quo2.foundations.colors :as colors] [quo.theme :as quo.theme] - [quo2.components.text :as text] - [quo2.components.group-avatar :as group-avatar] + [quo2.components.markdown.text :as text] + [quo2.components.avatars.group-avatar :as group-avatar] [quo.react-native :as rn])) (defn padding-left-for-type [type] diff --git a/src/quo2/components/filter_tag.cljs b/src/quo2/components/tags/filter_tag.cljs similarity index 96% rename from src/quo2/components/filter_tag.cljs rename to src/quo2/components/tags/filter_tag.cljs index 1cc7c674e1..1d6e197881 100644 --- a/src/quo2/components/filter_tag.cljs +++ b/src/quo2/components/tags/filter_tag.cljs @@ -1,10 +1,10 @@ -(ns quo2.components.filter-tag +(ns quo2.components.tags.filter-tag (:require [quo2.foundations.colors :as colors] [quo.theme :as theme] [quo.react-native :as rn] [quo2.components.icon :as icons] - [quo2.components.text :as text] - [quo2.components.base-tag :as base-tag])) + [quo2.components.markdown.text :as text] + [quo2.components.tags.base-tag :as base-tag])) (def themes {:light {:default {:border-color colors/neutral-20 :blurred-border-color colors/neutral-80-opa-5 diff --git a/src/quo2/components/filter_tags.cljs b/src/quo2/components/tags/filter_tags.cljs similarity index 91% rename from src/quo2/components/filter_tags.cljs rename to src/quo2/components/tags/filter_tags.cljs index 3cac6a6f90..8f886f0c85 100644 --- a/src/quo2/components/filter_tags.cljs +++ b/src/quo2/components/tags/filter_tags.cljs @@ -1,7 +1,7 @@ -(ns quo2.components.filter-tags +(ns quo2.components.tags.filter-tags (:require [reagent.core :as reagent] [quo.react-native :as rn] - [quo2.components.filter-tag :as tag])) + [quo2.components.tags.filter-tag :as tag])) (defn tags [{:keys [default-active on-change]}] (let [active-tab-id (reagent/atom default-active)] diff --git a/src/quo2/components/permission_tag.cljs b/src/quo2/components/tags/permission_tag.cljs similarity index 96% rename from src/quo2/components/permission_tag.cljs rename to src/quo2/components/tags/permission_tag.cljs index d02a5796a6..ade2ab145a 100644 --- a/src/quo2/components/permission_tag.cljs +++ b/src/quo2/components/tags/permission_tag.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.permission-tag +(ns quo2.components.tags.permission-tag (:require [status-im.ui.components.react :as react] - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [quo2.foundations.colors :as colors] [quo2.components.icon :as icons] - [quo2.components.base-tag :as base-tag] + [quo2.components.tags.base-tag :as base-tag] [status-im.i18n.i18n :as i18n])) (defn outer-resource-container [size background-color] diff --git a/src/quo2/components/status_tags.cljs b/src/quo2/components/tags/status_tags.cljs similarity index 97% rename from src/quo2/components/status_tags.cljs rename to src/quo2/components/tags/status_tags.cljs index 8b9ef7212d..f5d22f1b8f 100644 --- a/src/quo2/components/status_tags.cljs +++ b/src/quo2/components/tags/status_tags.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.status-tags +(ns quo2.components.tags.status-tags (:require [status-im.i18n.i18n :as i18n] [quo2.foundations.colors :as colors] [quo.theme :as quo.theme] [quo2.components.icon :as icon] - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [quo.react-native :as rn])) (def default-container-style diff --git a/src/quo2/components/tag.cljs b/src/quo2/components/tags/tag.cljs similarity index 93% rename from src/quo2/components/tag.cljs rename to src/quo2/components/tags/tag.cljs index 3abb26359e..d59c54cd36 100644 --- a/src/quo2/components/tag.cljs +++ b/src/quo2/components/tags/tag.cljs @@ -1,8 +1,8 @@ -(ns quo2.components.tag +(ns quo2.components.tags.tag (:require [quo.react-native :as rn] [quo2.foundations.colors :as colors] [quo.theme :as theme] - [quo2.components.text :as text])) + [quo2.components.markdown.text :as text])) (def themes {:light {:background-color colors/neutral-20} :dark {:background-color colors/neutral-80}}) diff --git a/src/quo2/components/token_tag.cljs b/src/quo2/components/tags/token_tag.cljs similarity index 95% rename from src/quo2/components/token_tag.cljs rename to src/quo2/components/tags/token_tag.cljs index 18c72862e6..f148570538 100644 --- a/src/quo2/components/token_tag.cljs +++ b/src/quo2/components/tags/token_tag.cljs @@ -1,9 +1,9 @@ -(ns quo2.components.token-tag +(ns quo2.components.tags.token-tag (:require [quo2.foundations.colors :as colors] [quo.react-native :as rn] [quo.theme :as theme] [status-im.ui.components.icons.icons :as icons] - [quo2.components.tag :as tag])) + [quo2.components.tags.tag :as tag])) (defn get-value-from-size [size big-option small-option] (if (= size :big) big-option small-option)) diff --git a/src/quo2/components/token_overview.cljs b/src/quo2/components/wallet/token_overview.cljs similarity index 98% rename from src/quo2/components/token_overview.cljs rename to src/quo2/components/wallet/token_overview.cljs index 2b17c99a5b..95938a718e 100644 --- a/src/quo2/components/token_overview.cljs +++ b/src/quo2/components/wallet/token_overview.cljs @@ -1,4 +1,4 @@ -(ns quo2.components.token-overview +(ns quo2.components.wallet.token-overview (:require [quo2.foundations.colors :as colors] [status-im.i18n.i18n :as i18n] @@ -6,7 +6,7 @@ [clojure.string :as string] [status-im.utils.currency :as currencies] [status-im.ui.components.icons.icons :as icons] - [quo2.components.text :as text])) + [quo2.components.markdown.text :as text])) (def container-style {:display :flex :width "100%" :padding-left 20 :padding-right 20 :padding-top 12 :padding-bottom 12}) diff --git a/src/quo2/screens/group_avatar.cljs b/src/quo2/screens/avatars/group_avatar.cljs similarity index 94% rename from src/quo2/screens/group_avatar.cljs rename to src/quo2/screens/avatars/group_avatar.cljs index 61ff4b96d4..06a013c297 100644 --- a/src/quo2/screens/group_avatar.cljs +++ b/src/quo2/screens/avatars/group_avatar.cljs @@ -1,9 +1,9 @@ -(ns quo2.screens.group-avatar +(ns quo2.screens.avatars.group-avatar (:require [reagent.core :as reagent] [quo.react-native :as rn] [quo.previews.preview :as preview] [quo2.foundations.colors :as colors] - [quo2.components.group-avatar :as quo2])) + [quo2.components.avatars.group-avatar :as quo2])) (def descriptor [{:label "Size" :key :size diff --git a/src/quo2/screens/icon_avatar.cljs b/src/quo2/screens/avatars/icon_avatar.cljs similarity index 94% rename from src/quo2/screens/icon_avatar.cljs rename to src/quo2/screens/avatars/icon_avatar.cljs index 3b718be104..503afc888e 100644 --- a/src/quo2/screens/icon_avatar.cljs +++ b/src/quo2/screens/avatars/icon_avatar.cljs @@ -1,9 +1,9 @@ -(ns quo2.screens.icon-avatar +(ns quo2.screens.avatars.icon-avatar (:require [reagent.core :as reagent] [quo.react-native :as rn] [quo.previews.preview :as preview] [quo.design-system.colors :as colors] - [quo2.components.icon-avatar :as quo2])) + [quo2.components.avatars.icon-avatar :as quo2])) (def descriptor [{:label "Size" :key :size diff --git a/src/quo2/screens/user_avatar.cljs b/src/quo2/screens/avatars/user_avatar.cljs similarity index 93% rename from src/quo2/screens/user_avatar.cljs rename to src/quo2/screens/avatars/user_avatar.cljs index a417084cca..2fc2f32d1b 100644 --- a/src/quo2/screens/user_avatar.cljs +++ b/src/quo2/screens/avatars/user_avatar.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.user-avatar +(ns quo2.screens.avatars.user-avatar (:require [quo.react-native :as rn] [quo.design-system.colors :as colors] [quo.previews.preview :as preview] - [quo2.components.user-avatar :as quo2] + [quo2.components.avatars.user-avatar :as quo2] [reagent.core :as reagent])) (def descriptor [{:label "Size:" diff --git a/src/quo2/screens/wallet_user_avatar.cljs b/src/quo2/screens/avatars/wallet_user_avatar.cljs similarity index 94% rename from src/quo2/screens/wallet_user_avatar.cljs rename to src/quo2/screens/avatars/wallet_user_avatar.cljs index e5b4375629..07e0f60d4b 100644 --- a/src/quo2/screens/wallet_user_avatar.cljs +++ b/src/quo2/screens/avatars/wallet_user_avatar.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.wallet-user-avatar +(ns quo2.screens.avatars.wallet-user-avatar (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] - [quo2.components.wallet-user-avatar :as quo2] + [quo2.components.avatars.wallet-user-avatar :as quo2] [quo.design-system.colors :as colors])) (def descriptor [{:label "First name" diff --git a/src/quo2/screens/button.cljs b/src/quo2/screens/buttons/button.cljs similarity index 95% rename from src/quo2/screens/button.cljs rename to src/quo2/screens/buttons/button.cljs index 140d888d1f..e48c8072e9 100644 --- a/src/quo2/screens/button.cljs +++ b/src/quo2/screens/buttons/button.cljs @@ -1,9 +1,9 @@ -(ns quo2.screens.button +(ns quo2.screens.buttons.button (:require [reagent.core :as reagent] [quo.react-native :as rn] [quo.previews.preview :as preview] [quo.design-system.colors :as colors] - [quo2.components.button :as quo2])) + [quo2.components.buttons.button :as quo2])) (def descriptor [{:label "Type:" :key :type diff --git a/src/quo2/screens/community_card_view.cljs b/src/quo2/screens/community/community_card_view.cljs similarity index 92% rename from src/quo2/screens/community_card_view.cljs rename to src/quo2/screens/community/community_card_view.cljs index f2dd6910c5..95e19bade3 100644 --- a/src/quo2/screens/community_card_view.cljs +++ b/src/quo2/screens/community/community_card_view.cljs @@ -1,12 +1,12 @@ -(ns quo2.screens.community-card-view +(ns quo2.screens.community.community-card-view (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] [status-im.constants :as constants] [quo.design-system.colors :as quo.colors] [quo2.foundations.colors :as colors] - [quo2.components.communities.community-list-view :as community-list-view] - [quo2.components.communities.community-card-view :as community-card-view] + [quo2.components.community.community-list-view :as community-list-view] + [quo2.components.community.community-card-view :as community-card-view] [status-im.i18n.i18n :as i18n] [status-im.react-native.resources :as resources])) diff --git a/src/quo2/screens/counter.cljs b/src/quo2/screens/counter/counter.cljs similarity index 94% rename from src/quo2/screens/counter.cljs rename to src/quo2/screens/counter/counter.cljs index ecd0bd800c..532ab35701 100644 --- a/src/quo2/screens/counter.cljs +++ b/src/quo2/screens/counter/counter.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.counter +(ns quo2.screens.counter.counter (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] - [quo2.components.counter :as quo2] + [quo2.components.counter.counter :as quo2] [quo.design-system.colors :as colors])) (def descriptor [{:label "Type:" diff --git a/src/quo2/screens/info_message.cljs b/src/quo2/screens/info/info_message.cljs similarity index 95% rename from src/quo2/screens/info_message.cljs rename to src/quo2/screens/info/info_message.cljs index 859a425d1d..8a548aee83 100644 --- a/src/quo2/screens/info_message.cljs +++ b/src/quo2/screens/info/info_message.cljs @@ -1,9 +1,9 @@ -(ns quo2.screens.info-message +(ns quo2.screens.info.info-message (:require [quo.react-native :as rn] [reagent.core :as reagent] [quo.previews.preview :as preview] [quo2.foundations.colors :as colors] - [quo2.components.info-message :as quo2])) + [quo2.components.info.info-message :as quo2])) (def descriptor [{:label "Type:" :key :type diff --git a/src/quo2/screens/information_box.cljs b/src/quo2/screens/info/information_box.cljs similarity index 95% rename from src/quo2/screens/information_box.cljs rename to src/quo2/screens/info/information_box.cljs index 371ee25c4a..414a2ef112 100644 --- a/src/quo2/screens/information_box.cljs +++ b/src/quo2/screens/info/information_box.cljs @@ -1,9 +1,9 @@ -(ns quo2.screens.information-box +(ns quo2.screens.info.information-box (:require [quo.react-native :as rn] [reagent.core :as reagent] [quo.previews.preview :as preview] [quo2.foundations.colors :as colors] - [quo2.components.information-box :as quo2])) + [quo2.components.info.information-box :as quo2])) (def descriptor [{:label "Type:" :key :type diff --git a/src/quo2/screens/main.cljs b/src/quo2/screens/main.cljs index 0c2967efb6..d7e12684a8 100644 --- a/src/quo2/screens/main.cljs +++ b/src/quo2/screens/main.cljs @@ -4,27 +4,27 @@ [quo.design-system.colors :as colors] [quo.react-native :as rn] [quo.theme :as theme] - [quo2.screens.activity-logs :as activity-logs] - [quo2.screens.button :as button] - [quo2.screens.community-card-view :as community-card] - [quo2.screens.context-tags :as context-tags] - [quo2.screens.counter :as counter] - [quo2.screens.filter-tags :as filter-tags] - [quo2.screens.group-avatar :as group-avatar] - [quo2.screens.icon-avatar :as icon-avatar] - [quo2.screens.info-message :as info-message] - [quo2.screens.information-box :as information-box] - [quo2.screens.messages-gap :as messages-gap] - [quo2.screens.permission-tag :as permission-tag] - [quo2.screens.segmented :as segmented] - [quo2.screens.status-tags :as status-tags] - [quo2.screens.tabs :as tabs] - [quo2.screens.text :as text] - [quo2.screens.token-overview :as token-overview] - [quo2.screens.token-tag :as token-tag] - [quo2.screens.wallet-user-avatar :as wallet-user-avatar] - [quo2.screens.user-avatar :as user-avatar] - [quo2.screens.reacts :as reacts] + [quo2.screens.avatars.icon-avatar :as icon-avatar] + [quo2.screens.avatars.group-avatar :as group-avatar] + [quo2.screens.avatars.user-avatar :as user-avatar] + [quo2.screens.avatars.wallet-user-avatar :as wallet-user-avatar] + [quo2.screens.buttons.button :as button] + [quo2.screens.counter.counter :as counter] + [quo2.screens.community.community-card-view :as community-card] + [quo2.screens.info.info-message :as info-message] + [quo2.screens.info.information-box :as information-box] + [quo2.screens.markdown.text :as text] + [quo2.screens.messages.gap :as messages-gap] + [quo2.screens.notifications.activity-logs :as activity-logs] + [quo2.screens.reactions.react :as react] + [quo2.screens.tabs.segmented-tab :as segmented] + [quo2.screens.tabs.tabs :as tabs] + [quo2.screens.tags.context-tags :as context-tags] + [quo2.screens.tags.filter-tags :as filter-tags] + [quo2.screens.tags.permission-tag :as permission-tag] + [quo2.screens.tags.status-tags :as status-tags] + [quo2.screens.tags.token-tag :as token-tag] + [quo2.screens.wallet.token-overview :as token-overview] [re-frame.core :as re-frame])) (def screens [{:name :quo2-texts @@ -36,9 +36,9 @@ {:name :quo2-user-avatar :insets {:top false} :component user-avatar/preview-user-avatar} - {:name :quo2-reacts + {:name :quo2-react :insets {:top false} - :component reacts/preview-reacts} + :component react/preview-react} {:name :quo2-button :insets {:top false} :component button/preview-button} diff --git a/src/quo2/screens/text.cljs b/src/quo2/screens/markdown/text.cljs similarity index 93% rename from src/quo2/screens/text.cljs rename to src/quo2/screens/markdown/text.cljs index 268648cf07..b4a5dfebf7 100644 --- a/src/quo2/screens/text.cljs +++ b/src/quo2/screens/markdown/text.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.text +(ns quo2.screens.markdown.text (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] - [quo2.components.text :as quo2] + [quo2.components.markdown.text :as quo2] [quo.design-system.colors :as colors])) (def descriptor [{:label "Size:" diff --git a/src/quo2/screens/messages_gap.cljs b/src/quo2/screens/messages/gap.cljs similarity index 92% rename from src/quo2/screens/messages_gap.cljs rename to src/quo2/screens/messages/gap.cljs index 9f87c7ad38..8b2ddde1e0 100644 --- a/src/quo2/screens/messages_gap.cljs +++ b/src/quo2/screens/messages/gap.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.messages-gap +(ns quo2.screens.messages.gap (:require [quo.previews.preview :as preview] [quo.react-native :as rn] - [quo2.components.messages-gap :as quo2] + [quo2.components.messages.gap :as quo2] [reagent.core :as reagent])) (def descriptor [{:label "Timestamp Far" diff --git a/src/quo2/screens/activity_logs.cljs b/src/quo2/screens/notifications/activity_logs.cljs similarity index 94% rename from src/quo2/screens/activity_logs.cljs rename to src/quo2/screens/notifications/activity_logs.cljs index 35f57d5490..db7366e530 100644 --- a/src/quo2/screens/activity_logs.cljs +++ b/src/quo2/screens/notifications/activity_logs.cljs @@ -1,10 +1,10 @@ -(ns quo2.screens.activity-logs +(ns quo2.screens.notifications.activity-logs (:require [reagent.core :as reagent] [quo.react-native :as rn] [quo.previews.preview :as preview] [quo2.foundations.colors :as colors] - [quo2.screens.status-tags :as status-tags] - [quo2.components.activity-logs :as activity-logs])) + [quo2.screens.tags.status-tags :as status-tags] + [quo2.components.notifications.activity-logs :as activity-logs])) (def descriptor [{:label "Unread:" :key :unread diff --git a/src/quo2/screens/reacts.cljs b/src/quo2/screens/reactions/react.cljs similarity index 93% rename from src/quo2/screens/reacts.cljs rename to src/quo2/screens/reactions/react.cljs index dd89f55d88..a0d88ef90b 100644 --- a/src/quo2/screens/reacts.cljs +++ b/src/quo2/screens/reactions/react.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.reacts +(ns quo2.screens.reactions.react (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] - [quo2.components.reacts :as quo2] + [quo2.components.reactions.react :as quo2] [quo.design-system.colors :as colors])) (def descriptor [{:label "Count" @@ -36,7 +36,7 @@ [quo2/render-react @state] [quo2/open-reactions-menu @state]]]))) -(defn preview-reacts [] +(defn preview-react [] [rn/view {:background-color (:ui-background @colors/theme) :flex 1} [rn/flat-list {:flex 1 diff --git a/src/quo2/screens/segmented.cljs b/src/quo2/screens/tabs/segmented_tab.cljs similarity index 92% rename from src/quo2/screens/segmented.cljs rename to src/quo2/screens/tabs/segmented_tab.cljs index cd541ea146..a751e369bd 100644 --- a/src/quo2/screens/segmented.cljs +++ b/src/quo2/screens/tabs/segmented_tab.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.segmented +(ns quo2.screens.tabs.segmented-tab (:require [quo.react-native :as rn] [quo.design-system.colors :as colors] [quo.previews.preview :as preview] - [quo2.components.segmented-control :as quo2] + [quo2.components.tabs.segmented-tab :as quo2] [reagent.core :as reagent])) (def descriptor [{:label "Size:" diff --git a/src/quo2/screens/tabs.cljs b/src/quo2/screens/tabs/tabs.cljs similarity index 91% rename from src/quo2/screens/tabs.cljs rename to src/quo2/screens/tabs/tabs.cljs index 7bdbe3fb14..a4f63b142d 100644 --- a/src/quo2/screens/tabs.cljs +++ b/src/quo2/screens/tabs/tabs.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.tabs +(ns quo2.screens.tabs.tabs (:require [quo.react-native :as rn] [quo.design-system.colors :as colors] [quo.previews.preview :as preview] - [quo2.components.tabs :as quo2] + [quo2.components.tabs.tabs :as quo2] [reagent.core :as reagent])) (def descriptor [{:label "Size:" diff --git a/src/quo2/screens/context_tags.cljs b/src/quo2/screens/tags/context_tags.cljs similarity index 98% rename from src/quo2/screens/context_tags.cljs rename to src/quo2/screens/tags/context_tags.cljs index 430337937e..2fa80ff029 100644 --- a/src/quo2/screens/context_tags.cljs +++ b/src/quo2/screens/tags/context_tags.cljs @@ -1,10 +1,10 @@ -(ns quo2.screens.context-tags +(ns quo2.screens.tags.context-tags (:require [reagent.core :as reagent] [status-im.multiaccounts.core :as multiaccounts] [quo.react-native :as rn] [quo.previews.preview :as preview] [quo2.foundations.colors :as colors] - [quo2.components.context-tags :as quo2])) + [quo2.components.tags.context-tags :as quo2])) (def group-avatar-default-params {:size :small diff --git a/src/quo2/screens/filter_tags.cljs b/src/quo2/screens/tags/filter_tags.cljs similarity index 96% rename from src/quo2/screens/filter_tags.cljs rename to src/quo2/screens/tags/filter_tags.cljs index 7330b69b81..eea2a5c68f 100644 --- a/src/quo2/screens/filter_tags.cljs +++ b/src/quo2/screens/tags/filter_tags.cljs @@ -1,9 +1,9 @@ -(ns quo2.screens.filter-tags +(ns quo2.screens.tags.filter-tags (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [status-im.ui.components.react :as react] [quo2.foundations.colors :as colors] - [quo2.components.filter-tags :as quo2.tags] + [quo2.components.tags.filter-tags :as quo2.tags] [status-im.react-native.resources :as resources] [reagent.core :as reagent])) diff --git a/src/quo2/screens/permission_tag.cljs b/src/quo2/screens/tags/permission_tag.cljs similarity index 98% rename from src/quo2/screens/permission_tag.cljs rename to src/quo2/screens/tags/permission_tag.cljs index 1f5aa20311..a76dea9867 100644 --- a/src/quo2/screens/permission_tag.cljs +++ b/src/quo2/screens/tags/permission_tag.cljs @@ -1,7 +1,7 @@ -(ns quo2.screens.permission-tag +(ns quo2.screens.tags.permission-tag (:require [quo.react-native :as rn] [quo.previews.preview :as preview] - [quo2.components.permission-tag :as permission-tag] + [quo2.components.tags.permission-tag :as permission-tag] [quo2.foundations.colors :as colors] [status-im.react-native.resources :as resources] [reagent.core :as reagent])) diff --git a/src/quo2/screens/status_tags.cljs b/src/quo2/screens/tags/status_tags.cljs similarity index 94% rename from src/quo2/screens/status_tags.cljs rename to src/quo2/screens/tags/status_tags.cljs index 1c87b3d1df..a624d2ea74 100644 --- a/src/quo2/screens/status_tags.cljs +++ b/src/quo2/screens/tags/status_tags.cljs @@ -1,9 +1,9 @@ -(ns quo2.screens.status-tags +(ns quo2.screens.tags.status-tags (:require [reagent.core :as reagent] [quo.react-native :as rn] [quo.previews.preview :as preview] [quo2.foundations.colors :as colors] - [quo2.components.status-tags :as quo2])) + [quo2.components.tags.status-tags :as quo2])) (def status-tags-options {:label "Status" diff --git a/src/quo2/screens/token_tag.cljs b/src/quo2/screens/tags/token_tag.cljs similarity index 95% rename from src/quo2/screens/token_tag.cljs rename to src/quo2/screens/tags/token_tag.cljs index c0d9d15501..c87ee49013 100644 --- a/src/quo2/screens/token_tag.cljs +++ b/src/quo2/screens/tags/token_tag.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.token-tag +(ns quo2.screens.tags.token-tag (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] - [quo2.components.token-tag :as quo2] + [quo2.components.tags.token-tag :as quo2] [quo.design-system.colors :as colors])) (def descriptor [{:label "Size:" diff --git a/src/quo2/screens/token_overview.cljs b/src/quo2/screens/wallet/token_overview.cljs similarity index 95% rename from src/quo2/screens/token_overview.cljs rename to src/quo2/screens/wallet/token_overview.cljs index 470608f486..2cb8d38518 100644 --- a/src/quo2/screens/token_overview.cljs +++ b/src/quo2/screens/wallet/token_overview.cljs @@ -1,8 +1,8 @@ -(ns quo2.screens.token-overview +(ns quo2.screens.wallet.token-overview (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] - [quo2.components.token-overview :as quo2] + [quo2.components.wallet.token-overview :as quo2] [quo.design-system.colors :as colors])) (def descriptor [{:label "Token:" diff --git a/src/status_im/switcher/cards/messaging_card.cljs b/src/status_im/switcher/cards/messaging_card.cljs index f6de9be2f3..2d476edf7a 100644 --- a/src/status_im/switcher/cards/messaging_card.cljs +++ b/src/status_im/switcher/cards/messaging_card.cljs @@ -1,8 +1,8 @@ (ns status-im.switcher.cards.messaging-card (:require [quo.react-native :as rn] - [quo2.components.text :as text] + [quo2.components.markdown.text :as text] [status-im.constants :as constants] - [quo2.components.button :as button] + [quo2.components.buttons.button :as button] [status-im.utils.handlers :refer [>evt ^js (quo.react/current-ref text-input-ref) .focus)) diff --git a/src/status_im/ui/screens/chat/components/input.cljs b/src/status_im/ui/screens/chat/components/input.cljs index 2a23f90c90..310b761a9f 100644 --- a/src/status_im/ui/screens/chat/components/input.cljs +++ b/src/status_im/ui/screens/chat/components/input.cljs @@ -21,7 +21,7 @@ [status-im.ui.screens.chat.photos :as photos] [reagent.core :as reagent] [clojure.string :as string] - [quo2.components.button :as quo2.button] + [quo2.components.buttons.button :as quo2.button] [quo2.reanimated :as reanimated] [quo2.gesture :as gesture] [quo.components.safe-area :as safe-area])) diff --git a/src/status_im/ui/screens/chat/components/reply.cljs b/src/status_im/ui/screens/chat/components/reply.cljs index 3f8d1873b8..8342a98516 100644 --- a/src/status_im/ui/screens/chat/components/reply.cljs +++ b/src/status_im/ui/screens/chat/components/reply.cljs @@ -11,8 +11,8 @@ [re-frame.core :as re-frame] [clojure.string :as string] [quo2.foundations.colors :as quo2.colors :refer [theme-colors]] - [quo2.components.button :as quo2.button] - [quo2.components.text :as quo2.text] + [quo2.components.buttons.button :as quo2.button] + [quo2.components.markdown.text :as quo2.text] [status-im.ui.screens.chat.photos :as photos] [status-im.constants :as constants])) diff --git a/src/status_im/ui/screens/chat/message/datemark.cljs b/src/status_im/ui/screens/chat/message/datemark.cljs index ca13a92888..8db3f0587e 100644 --- a/src/status_im/ui/screens/chat/message/datemark.cljs +++ b/src/status_im/ui/screens/chat/message/datemark.cljs @@ -2,7 +2,7 @@ (:require [status-im.ui.components.react :as react] [clojure.string :as string] [status-im.ui.screens.chat.styles.message.datemark :as style] - [quo2.components.text :as quo2.text] + [quo2.components.markdown.text :as quo2.text] [quo2.foundations.colors :as quo2.colors])) (defn chat-datemark [value] diff --git a/src/status_im/ui/screens/chat/views.cljs b/src/status_im/ui/screens/chat/views.cljs index 6488d430be..43132b60cb 100644 --- a/src/status_im/ui/screens/chat/views.cljs +++ b/src/status_im/ui/screens/chat/views.cljs @@ -42,7 +42,7 @@ [status-im.react-native.resources :as resources] [status-im.ui.components.topbar :as topbar] [quo2.foundations.colors :as quo2.colors] - [quo2.components.button :as quo2.button])) + [quo2.components.buttons.button :as quo2.button])) (defn invitation-requests [chat-id admins] (let [current-pk @(re-frame/subscribe [:multiaccount/public-key]) diff --git a/src/status_im/ui/screens/communities/communities_list_redesign.cljs b/src/status_im/ui/screens/communities/communities_list_redesign.cljs index 4f28c408db..bf754016df 100644 --- a/src/status_im/ui/screens/communities/communities_list_redesign.cljs +++ b/src/status_im/ui/screens/communities/communities_list_redesign.cljs @@ -5,14 +5,14 @@ [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] [quo2.components.separator :as separator] - [quo2.components.text :as quo2.text] - [quo2.components.button :as quo2.button] - [quo2.components.counter :as quo2.counter] - [quo2.components.filter-tags :as filter-tags] - [quo2.components.filter-tag :as filter-tag] + [quo2.components.markdown.text :as quo2.text] + [quo2.components.buttons.button :as quo2.button] + [quo2.components.counter.counter :as quo2.counter] + [quo2.components.tags.filter-tags :as filter-tags] + [quo2.components.tags.filter-tag :as filter-tag] [quo2.foundations.colors :as quo2.colors] [quo.components.safe-area :as safe-area] - [quo2.components.tabs :as quo2.tabs] + [quo2.components.tabs.tabs :as quo2.tabs] [status-im.ui.screens.chat.photos :as photos] [status-im.react-native.resources :as resources] [status-im.multiaccounts.core :as multiaccounts] @@ -20,8 +20,8 @@ [status-im.ui.components.plus-button :as plus-button] [status-im.utils.handlers :refer [