From 5f70da854e29b0a6dff6e84dfb8143a6a457e4e7 Mon Sep 17 00:00:00 2001 From: Infi Date: Thu, 17 Apr 2025 00:58:20 +0200 Subject: [PATCH] style: rename .components to .composables Compose convention is to say composables; previous name is a holdover from React Signed-off-by: Infi --- .../chat/revolt/activities/InviteActivity.kt | 4 +- .../chat/revolt/activities/MainActivity.kt | 2 +- .../revolt/activities/ShareTargetActivity.kt | 12 ++--- .../chat/DateDivider.kt | 2 +- .../chat/DisconnectedNotice.kt | 2 +- .../{components => composables}/chat/Embed.kt | 8 +-- .../chat/InReplyTo.kt | 4 +- .../chat/InlineBadge.kt | 2 +- .../chat/MemberListItem.kt | 6 +-- .../chat/Message.kt | 12 ++--- .../chat/MessageAttachment.kt | 6 +-- .../chat/MessageField.kt | 8 +-- .../chat/Reaction.kt | 4 +- .../chat/RoleChip.kt | 2 +- .../chat/RoleListEntry.kt | 2 +- .../chat/SystemMessage.kt | 4 +- .../chat/TimeRift.kt | 2 +- .../chat/UserBadgeList.kt | 2 +- .../chat/specialembeds/AppleMusicEmbed.kt | 2 +- .../chat/specialembeds/SpecialEmbedSwitch.kt | 2 +- .../chat/specialembeds/YouTubeEmbed.kt | 6 +-- .../emoji/EmojiPicker.kt | 6 +-- .../generic/CollapsibleCard.kt | 2 +- .../generic/DobPicker.kt | 2 +- .../generic/FormTextField.kt | 2 +- .../generic/GradientStopEditor.kt | 2 +- .../generic/HealthAlert.kt | 2 +- .../generic/IconPlaceholder.kt | 2 +- .../generic/InlineMediaPicker.kt | 2 +- .../generic/ListHeader.kt | 2 +- .../generic/NonIdealState.kt | 2 +- .../generic/PrimaryTabs.kt | 2 +- .../generic/RadioItem.kt | 2 +- .../generic/RemoteImage.kt | 2 +- .../generic/SheetButton.kt | 2 +- .../generic/SheetHeaderPadding.kt | 2 +- .../generic/UserAvatar.kt | 2 +- .../generic/Weblink.kt | 2 +- .../markdown/MarkdownCodeBlock.kt | 2 +- .../markdown/MarkdownText.kt | 6 +-- .../markdown/MarkdownTree.kt | 2 +- .../markdown/RichMarkdown.kt | 2 +- .../media/AudioPlayer.kt | 2 +- .../media/MediaPickerGateway.kt | 2 +- .../profile/UserCard.kt | 4 +- .../screens/chat/AttachmentManager.kt | 4 +- .../screens/chat/ChannelHeader.kt | 2 +- .../screens/chat/ChannelIcon.kt | 2 +- .../screens/chat/ChannelSheetHeader.kt | 8 +-- .../screens/chat/ReplyManager.kt | 10 ++-- .../screens/chat/TypingIndicator.kt | 4 +- .../screens/chat/atoms/RegularMessage.kt | 4 +- .../screens/chat/drawer/ChannelSideDrawer.kt | 14 ++--- .../screens/services/DiscoverView.kt | 2 +- .../screens/settings/AttributionItem.kt | 2 +- .../screens/settings/ServerOverview.kt | 6 +-- .../screens/settings/UserButtons.kt | 2 +- .../screens/settings/UserOverview.kt | 8 +-- .../screens/settings/appearance/ColourChip.kt | 2 +- .../settings/appearance/CornerRadiusPicker.kt | 2 +- .../screens/splash/DisconnectedScreen.kt | 2 +- .../screens/voice/VoiceChannelOverlay.kt | 2 +- .../settings/SettingsHintBanner.kt | 2 +- .../settings/profile/StatusPicker.kt | 6 +-- .../settings/sessions/SessionItem.kt | 2 +- .../sheets/SheetTile.kt | 2 +- .../skeletons/MessageSkeleton.kt | 2 +- .../skeletons/SkeletonGlobals.kt | 2 +- .../skeletons/UserOverviewSkeleton.kt | 2 +- .../ConditionalConsumptionPointerInput.kt | 2 +- .../utils/SizeMeasured.kt | 2 +- .../vectorassets/SwipeToReplySpark.kt | 2 +- .../chat/revolt/internals/Autocomplete.kt | 2 +- .../chat/revolt/markdown/jbm/JBMRenderer.kt | 8 +-- .../screens/DefaultDestinationScreen.kt | 2 +- .../chat/revolt/screens/about/AboutScreen.kt | 3 +- .../revolt/screens/about/AttributionScreen.kt | 2 +- .../revolt/screens/chat/ChatRouterScreen.kt | 6 +-- .../dialogs/safety/ReportMessageDialog.kt | 4 +- .../chat/dialogs/safety/ReportServerDialog.kt | 4 +- .../chat/dialogs/safety/ReportUserDialog.kt | 4 +- .../screens/chat/views/FriendsScreen.kt | 4 +- .../screens/chat/views/OverviewScreen.kt | 6 +-- .../chat/views/channel/ChannelScreen.kt | 51 +++++++------------ .../views/channel/ChannelScreenAgeGate.kt | 4 +- .../screens/create/CreateGroupScreen.kt | 2 +- .../labs/ui/mockups/CallScreenMockup.kt | 2 +- .../labs/ui/sandbox/GradientEditorSandbox.kt | 2 +- .../screens/login/LoginGreetingScreen.kt | 4 +- .../chat/revolt/screens/login/LoginScreen.kt | 4 +- .../chat/revolt/screens/login/MfaScreen.kt | 4 +- .../chat/revolt/screens/login2/InitScreen.kt | 4 +- .../screens/main/ConversationsScreen.kt | 2 +- .../screens/register/OnboardingScreen.kt | 2 +- .../screens/register/RegisterDetailsScreen.kt | 2 +- .../revolt/screens/services/DiscoverScreen.kt | 2 +- .../settings/AppearanceSettingsScreen.kt | 6 +-- .../screens/settings/ChatSettingsScreen.kt | 4 +- .../screens/settings/ProfileSettngsScreen.kt | 4 +- .../screens/settings/SessionSettngsScreen.kt | 6 +-- .../revolt/screens/settings/SettingsScreen.kt | 2 +- .../channel/ChannelSettingsOverview.kt | 4 +- .../chat/revolt/settings/dsl/SettingsPage.kt | 4 +- .../java/chat/revolt/sheets/AddServerSheet.kt | 6 +-- .../chat/revolt/sheets/ChannelContextSheet.kt | 2 +- .../chat/revolt/sheets/ChannelInfoSheet.kt | 4 +- .../java/chat/revolt/sheets/EmoteInfoSheet.kt | 4 +- .../chat/revolt/sheets/JBMDebuggerSheet.kt | 2 +- .../java/chat/revolt/sheets/LinkInfoSheet.kt | 2 +- .../chat/revolt/sheets/MemberContextSheet.kt | 2 +- .../chat/revolt/sheets/MemberListSheet.kt | 10 ++-- .../chat/revolt/sheets/MessageContextSheet.kt | 4 +- .../java/chat/revolt/sheets/ReactSheet.kt | 2 +- .../chat/revolt/sheets/ReactionInfoSheet.kt | 4 +- .../chat/revolt/sheets/ServerContextSheet.kt | 6 +-- .../java/chat/revolt/sheets/StatusSheet.kt | 10 ++-- .../java/chat/revolt/sheets/UserCardSheet.kt | 2 +- .../java/chat/revolt/sheets/UserInfoSheet.kt | 18 +++---- .../sheets/spark/SwipeToReplySparkSheet.kt | 2 +- 119 files changed, 238 insertions(+), 254 deletions(-) rename app/src/main/java/chat/revolt/{components => composables}/chat/DateDivider.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/chat/DisconnectedNotice.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/chat/Embed.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/chat/InReplyTo.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/chat/InlineBadge.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/chat/MemberListItem.kt (94%) rename app/src/main/java/chat/revolt/{components => composables}/chat/Message.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/chat/MessageAttachment.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/chat/MessageField.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/chat/Reaction.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/chat/RoleChip.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/chat/RoleListEntry.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/chat/SystemMessage.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/chat/TimeRift.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/chat/UserBadgeList.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/chat/specialembeds/AppleMusicEmbed.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/chat/specialembeds/SpecialEmbedSwitch.kt (92%) rename app/src/main/java/chat/revolt/{components => composables}/chat/specialembeds/YouTubeEmbed.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/emoji/EmojiPicker.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/generic/CollapsibleCard.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/generic/DobPicker.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/generic/FormTextField.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/generic/GradientStopEditor.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/generic/HealthAlert.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/generic/IconPlaceholder.kt (95%) rename app/src/main/java/chat/revolt/{components => composables}/generic/InlineMediaPicker.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/generic/ListHeader.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/generic/NonIdealState.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/generic/PrimaryTabs.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/generic/RadioItem.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/generic/RemoteImage.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/generic/SheetButton.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/generic/SheetHeaderPadding.kt (93%) rename app/src/main/java/chat/revolt/{components => composables}/generic/UserAvatar.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/generic/Weblink.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/markdown/MarkdownCodeBlock.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/markdown/MarkdownText.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/markdown/MarkdownTree.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/markdown/RichMarkdown.kt (93%) rename app/src/main/java/chat/revolt/{components => composables}/media/AudioPlayer.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/media/MediaPickerGateway.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/profile/UserCard.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/screens/chat/AttachmentManager.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/screens/chat/ChannelHeader.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/screens/chat/ChannelIcon.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/screens/chat/ChannelSheetHeader.kt (95%) rename app/src/main/java/chat/revolt/{components => composables}/screens/chat/ReplyManager.kt (95%) rename app/src/main/java/chat/revolt/{components => composables}/screens/chat/TypingIndicator.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/screens/chat/atoms/RegularMessage.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/screens/chat/drawer/ChannelSideDrawer.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/screens/services/DiscoverView.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/screens/settings/AttributionItem.kt (93%) rename app/src/main/java/chat/revolt/{components => composables}/screens/settings/ServerOverview.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/screens/settings/UserButtons.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/screens/settings/UserOverview.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/screens/settings/appearance/ColourChip.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/screens/settings/appearance/CornerRadiusPicker.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/screens/splash/DisconnectedScreen.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/screens/voice/VoiceChannelOverlay.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/settings/SettingsHintBanner.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/settings/profile/StatusPicker.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/settings/sessions/SessionItem.kt (97%) rename app/src/main/java/chat/revolt/{components => composables}/sheets/SheetTile.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/skeletons/MessageSkeleton.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/skeletons/SkeletonGlobals.kt (75%) rename app/src/main/java/chat/revolt/{components => composables}/skeletons/UserOverviewSkeleton.kt (98%) rename app/src/main/java/chat/revolt/{components => composables}/utils/ConditionalConsumptionPointerInput.kt (99%) rename app/src/main/java/chat/revolt/{components => composables}/utils/SizeMeasured.kt (96%) rename app/src/main/java/chat/revolt/{components => composables}/vectorassets/SwipeToReplySpark.kt (99%) diff --git a/app/src/main/java/chat/revolt/activities/InviteActivity.kt b/app/src/main/java/chat/revolt/activities/InviteActivity.kt index a336b90c..0615a3a2 100644 --- a/app/src/main/java/chat/revolt/activities/InviteActivity.kt +++ b/app/src/main/java/chat/revolt/activities/InviteActivity.kt @@ -57,8 +57,8 @@ import chat.revolt.api.schemas.InviteJoined import chat.revolt.api.schemas.RsResult import chat.revolt.api.settings.LoadedSettings import chat.revolt.api.settings.SyncedSettings -import chat.revolt.components.generic.IconPlaceholder -import chat.revolt.components.generic.RemoteImage +import chat.revolt.composables.generic.IconPlaceholder +import chat.revolt.composables.generic.RemoteImage import chat.revolt.ui.theme.RevoltTheme import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi import com.bumptech.glide.integration.compose.GlideImage diff --git a/app/src/main/java/chat/revolt/activities/MainActivity.kt b/app/src/main/java/chat/revolt/activities/MainActivity.kt index 9913fd7c..5e5254d2 100644 --- a/app/src/main/java/chat/revolt/activities/MainActivity.kt +++ b/app/src/main/java/chat/revolt/activities/MainActivity.kt @@ -60,7 +60,7 @@ import chat.revolt.api.schemas.HealthNotice import chat.revolt.api.settings.Experiments import chat.revolt.api.settings.LoadedSettings import chat.revolt.api.settings.SyncedSettings -import chat.revolt.components.generic.HealthAlert +import chat.revolt.composables.generic.HealthAlert import chat.revolt.material.EasingTokens import chat.revolt.ndk.NativeLibraries import chat.revolt.persistence.KVStorage diff --git a/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt b/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt index de7fde83..9b673543 100644 --- a/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt +++ b/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt @@ -60,12 +60,12 @@ import chat.revolt.api.routes.microservices.autumn.uploadToAutumn import chat.revolt.api.schemas.ChannelType import chat.revolt.api.settings.LoadedSettings import chat.revolt.api.settings.SyncedSettings -import chat.revolt.components.chat.MessageField -import chat.revolt.components.emoji.EmojiPicker -import chat.revolt.components.screens.chat.AttachmentManager -import chat.revolt.components.screens.chat.drawer.ChannelItem -import chat.revolt.components.screens.chat.drawer.ChannelItemIconType -import chat.revolt.components.screens.chat.drawer.DMOrGroupItem +import chat.revolt.composables.chat.MessageField +import chat.revolt.composables.emoji.EmojiPicker +import chat.revolt.composables.screens.chat.AttachmentManager +import chat.revolt.composables.screens.chat.drawer.ChannelItem +import chat.revolt.composables.screens.chat.drawer.ChannelItemIconType +import chat.revolt.composables.screens.chat.drawer.DMOrGroupItem import chat.revolt.persistence.KVStorage import chat.revolt.screens.chat.views.channel.ChannelScreenActivePane import chat.revolt.ui.theme.RevoltTheme diff --git a/app/src/main/java/chat/revolt/components/chat/DateDivider.kt b/app/src/main/java/chat/revolt/composables/chat/DateDivider.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/chat/DateDivider.kt rename to app/src/main/java/chat/revolt/composables/chat/DateDivider.kt index 90936709..6aca1028 100644 --- a/app/src/main/java/chat/revolt/components/chat/DateDivider.kt +++ b/app/src/main/java/chat/revolt/composables/chat/DateDivider.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import android.icu.text.DateFormat import android.text.format.DateUtils diff --git a/app/src/main/java/chat/revolt/components/chat/DisconnectedNotice.kt b/app/src/main/java/chat/revolt/composables/chat/DisconnectedNotice.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/chat/DisconnectedNotice.kt rename to app/src/main/java/chat/revolt/composables/chat/DisconnectedNotice.kt index 1d70be47..05fc735e 100644 --- a/app/src/main/java/chat/revolt/components/chat/DisconnectedNotice.kt +++ b/app/src/main/java/chat/revolt/composables/chat/DisconnectedNotice.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/app/src/main/java/chat/revolt/components/chat/Embed.kt b/app/src/main/java/chat/revolt/composables/chat/Embed.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/chat/Embed.kt rename to app/src/main/java/chat/revolt/composables/chat/Embed.kt index 0e7d612a..b1464475 100644 --- a/app/src/main/java/chat/revolt/components/chat/Embed.kt +++ b/app/src/main/java/chat/revolt/composables/chat/Embed.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -27,9 +27,9 @@ import chat.revolt.api.internals.BrushCompat import chat.revolt.api.internals.solidColor import chat.revolt.api.routes.microservices.january.asJanuaryProxyUrl import chat.revolt.api.schemas.Embed -import chat.revolt.components.chat.specialembeds.SpecialEmbedSwitch -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.markdown.RichMarkdown +import chat.revolt.composables.chat.specialembeds.SpecialEmbedSwitch +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.markdown.RichMarkdown import chat.revolt.api.schemas.Embed as EmbedSchema @Composable diff --git a/app/src/main/java/chat/revolt/components/chat/InReplyTo.kt b/app/src/main/java/chat/revolt/composables/chat/InReplyTo.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/chat/InReplyTo.kt rename to app/src/main/java/chat/revolt/composables/chat/InReplyTo.kt index 60c54a5f..a4197ff9 100644 --- a/app/src/main/java/chat/revolt/components/chat/InReplyTo.kt +++ b/app/src/main/java/chat/revolt/composables/chat/InReplyTo.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import android.util.Log import androidx.compose.foundation.clickable @@ -32,7 +32,7 @@ import chat.revolt.api.internals.solidColor import chat.revolt.api.routes.channel.fetchSingleMessage import chat.revolt.api.schemas.User import chat.revolt.api.settings.Experiments -import chat.revolt.components.generic.UserAvatar +import chat.revolt.composables.generic.UserAvatar import chat.revolt.markdown.jbm.JBM import chat.revolt.markdown.jbm.JBMRenderer import chat.revolt.markdown.jbm.LocalJBMarkdownTreeState diff --git a/app/src/main/java/chat/revolt/components/chat/InlineBadge.kt b/app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/chat/InlineBadge.kt rename to app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt index e7b6d91f..9c92ca36 100644 --- a/app/src/main/java/chat/revolt/components/chat/InlineBadge.kt +++ b/app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding diff --git a/app/src/main/java/chat/revolt/components/chat/MemberListItem.kt b/app/src/main/java/chat/revolt/composables/chat/MemberListItem.kt similarity index 94% rename from app/src/main/java/chat/revolt/components/chat/MemberListItem.kt rename to app/src/main/java/chat/revolt/composables/chat/MemberListItem.kt index 6389c593..521409e9 100644 --- a/app/src/main/java/chat/revolt/components/chat/MemberListItem.kt +++ b/app/src/main/java/chat/revolt/composables/chat/MemberListItem.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.material3.ListItem import androidx.compose.material3.LocalContentColor @@ -14,8 +14,8 @@ import chat.revolt.api.internals.Roles import chat.revolt.api.internals.solidColor import chat.revolt.api.schemas.Member import chat.revolt.api.schemas.User -import chat.revolt.components.generic.UserAvatar -import chat.revolt.components.generic.presenceFromStatus +import chat.revolt.composables.generic.UserAvatar +import chat.revolt.composables.generic.presenceFromStatus import chat.revolt.internals.extensions.TransparentListItemColours @Composable diff --git a/app/src/main/java/chat/revolt/components/chat/Message.kt b/app/src/main/java/chat/revolt/composables/chat/Message.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/chat/Message.kt rename to app/src/main/java/chat/revolt/composables/chat/Message.kt index d366abc9..67f3ecc4 100644 --- a/app/src/main/java/chat/revolt/components/chat/Message.kt +++ b/app/src/main/java/chat/revolt/composables/chat/Message.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import android.content.Intent import android.icu.text.DateFormat @@ -73,11 +73,11 @@ import chat.revolt.api.settings.LoadedSettings import chat.revolt.api.settings.MessageReplyStyle import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.generic.UserAvatar -import chat.revolt.components.generic.UserAvatarWidthPlaceholder -import chat.revolt.components.markdown.LocalMarkdownTreeConfig -import chat.revolt.components.markdown.RichMarkdown +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.generic.UserAvatar +import chat.revolt.composables.generic.UserAvatarWidthPlaceholder +import chat.revolt.composables.markdown.LocalMarkdownTreeConfig +import chat.revolt.composables.markdown.RichMarkdown import chat.revolt.internals.text.Gigamoji import chat.revolt.markdown.jbm.JBM import chat.revolt.markdown.jbm.JBMRenderer diff --git a/app/src/main/java/chat/revolt/components/chat/MessageAttachment.kt b/app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/chat/MessageAttachment.kt rename to app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt index 6f7fb626..328495b1 100644 --- a/app/src/main/java/chat/revolt/components/chat/MessageAttachment.kt +++ b/app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import android.text.format.Formatter import androidx.compose.foundation.background @@ -32,8 +32,8 @@ import androidx.compose.ui.unit.dp import chat.revolt.R import chat.revolt.api.REVOLT_FILES import chat.revolt.api.schemas.AutumnResource -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.media.AudioPlayer +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.media.AudioPlayer @Composable fun FileAttachment(attachment: AutumnResource) { diff --git a/app/src/main/java/chat/revolt/components/chat/MessageField.kt b/app/src/main/java/chat/revolt/composables/chat/MessageField.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/chat/MessageField.kt rename to app/src/main/java/chat/revolt/composables/chat/MessageField.kt index a7b2a39c..9d0f157d 100644 --- a/app/src/main/java/chat/revolt/components/chat/MessageField.kt +++ b/app/src/main/java/chat/revolt/composables/chat/MessageField.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import android.net.Uri import androidx.compose.animation.AnimatedVisibility @@ -87,9 +87,9 @@ import chat.revolt.activities.RevoltTweenInt import chat.revolt.api.REVOLT_FILES import chat.revolt.api.schemas.ChannelType import chat.revolt.api.schemas.Member -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.generic.UserAvatar -import chat.revolt.components.screens.chat.ChannelIcon +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.generic.UserAvatar +import chat.revolt.composables.screens.chat.ChannelIcon import chat.revolt.internals.Autocomplete import kotlinx.coroutines.launch import logcat.logcat diff --git a/app/src/main/java/chat/revolt/components/chat/Reaction.kt b/app/src/main/java/chat/revolt/composables/chat/Reaction.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/chat/Reaction.kt rename to app/src/main/java/chat/revolt/composables/chat/Reaction.kt index bf5354ec..52fff161 100644 --- a/app/src/main/java/chat/revolt/components/chat/Reaction.kt +++ b/app/src/main/java/chat/revolt/composables/chat/Reaction.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.animation.AnimatedContent import androidx.compose.animation.animateColorAsState @@ -31,7 +31,7 @@ import androidx.compose.ui.unit.sp import chat.revolt.api.REVOLT_FILES import chat.revolt.api.RevoltAPI import chat.revolt.api.internals.isUlid -import chat.revolt.components.generic.RemoteImage +import chat.revolt.composables.generic.RemoteImage @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/java/chat/revolt/components/chat/RoleChip.kt b/app/src/main/java/chat/revolt/composables/chat/RoleChip.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/chat/RoleChip.kt rename to app/src/main/java/chat/revolt/composables/chat/RoleChip.kt index a0eae541..09a67abb 100644 --- a/app/src/main/java/chat/revolt/components/chat/RoleChip.kt +++ b/app/src/main/java/chat/revolt/composables/chat/RoleChip.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/components/chat/RoleListEntry.kt b/app/src/main/java/chat/revolt/composables/chat/RoleListEntry.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/chat/RoleListEntry.kt rename to app/src/main/java/chat/revolt/composables/chat/RoleListEntry.kt index 9da94508..cfad0022 100644 --- a/app/src/main/java/chat/revolt/components/chat/RoleListEntry.kt +++ b/app/src/main/java/chat/revolt/composables/chat/RoleListEntry.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/components/chat/SystemMessage.kt b/app/src/main/java/chat/revolt/composables/chat/SystemMessage.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/chat/SystemMessage.kt rename to app/src/main/java/chat/revolt/composables/chat/SystemMessage.kt index c1dc33b2..e743ea39 100644 --- a/app/src/main/java/chat/revolt/components/chat/SystemMessage.kt +++ b/app/src/main/java/chat/revolt/composables/chat/SystemMessage.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -28,7 +28,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import chat.revolt.R import chat.revolt.api.schemas.Message -import chat.revolt.components.markdown.RichMarkdown +import chat.revolt.composables.markdown.RichMarkdown enum class SystemMessageType(val type: String) { CHANNEL_OWNERSHIP_CHANGED("channel_ownership_changed"), diff --git a/app/src/main/java/chat/revolt/components/chat/TimeRift.kt b/app/src/main/java/chat/revolt/composables/chat/TimeRift.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/chat/TimeRift.kt rename to app/src/main/java/chat/revolt/composables/chat/TimeRift.kt index ebf0abc0..efebc12f 100644 --- a/app/src/main/java/chat/revolt/components/chat/TimeRift.kt +++ b/app/src/main/java/chat/revolt/composables/chat/TimeRift.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/chat/revolt/components/chat/UserBadgeList.kt b/app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/chat/UserBadgeList.kt rename to app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt index 3010fcf4..0b12f0ef 100644 --- a/app/src/main/java/chat/revolt/components/chat/UserBadgeList.kt +++ b/app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat +package chat.revolt.composables.chat import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/chat/revolt/components/chat/specialembeds/AppleMusicEmbed.kt b/app/src/main/java/chat/revolt/composables/chat/specialembeds/AppleMusicEmbed.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/chat/specialembeds/AppleMusicEmbed.kt rename to app/src/main/java/chat/revolt/composables/chat/specialembeds/AppleMusicEmbed.kt index 9b013d97..586fc8eb 100644 --- a/app/src/main/java/chat/revolt/components/chat/specialembeds/AppleMusicEmbed.kt +++ b/app/src/main/java/chat/revolt/composables/chat/specialembeds/AppleMusicEmbed.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat.specialembeds +package chat.revolt.composables.chat.specialembeds import android.annotation.SuppressLint import android.net.Uri diff --git a/app/src/main/java/chat/revolt/components/chat/specialembeds/SpecialEmbedSwitch.kt b/app/src/main/java/chat/revolt/composables/chat/specialembeds/SpecialEmbedSwitch.kt similarity index 92% rename from app/src/main/java/chat/revolt/components/chat/specialembeds/SpecialEmbedSwitch.kt rename to app/src/main/java/chat/revolt/composables/chat/specialembeds/SpecialEmbedSwitch.kt index 6ba57915..73990010 100644 --- a/app/src/main/java/chat/revolt/components/chat/specialembeds/SpecialEmbedSwitch.kt +++ b/app/src/main/java/chat/revolt/composables/chat/specialembeds/SpecialEmbedSwitch.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat.specialembeds +package chat.revolt.composables.chat.specialembeds import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/app/src/main/java/chat/revolt/components/chat/specialembeds/YouTubeEmbed.kt b/app/src/main/java/chat/revolt/composables/chat/specialembeds/YouTubeEmbed.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/chat/specialembeds/YouTubeEmbed.kt rename to app/src/main/java/chat/revolt/composables/chat/specialembeds/YouTubeEmbed.kt index 878c0df2..25e71ac5 100644 --- a/app/src/main/java/chat/revolt/components/chat/specialembeds/YouTubeEmbed.kt +++ b/app/src/main/java/chat/revolt/composables/chat/specialembeds/YouTubeEmbed.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.chat.specialembeds +package chat.revolt.composables.chat.specialembeds import android.annotation.SuppressLint import android.webkit.WebView @@ -23,8 +23,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.viewinterop.AndroidView import chat.revolt.R import chat.revolt.api.schemas.Special -import chat.revolt.components.chat.VideoPlayButton -import chat.revolt.components.generic.RemoteImage +import chat.revolt.composables.chat.VideoPlayButton +import chat.revolt.composables.generic.RemoteImage import org.intellij.lang.annotations.Language @Language("HTML") diff --git a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt b/app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt rename to app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt index 3f64a6d6..8dd565d5 100644 --- a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt +++ b/app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.emoji +package chat.revolt.composables.emoji import android.util.TypedValue import android.view.HapticFeedbackConstants @@ -68,8 +68,8 @@ import chat.revolt.activities.RevoltTweenFloat import chat.revolt.api.REVOLT_FILES import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.generic.IconPlaceholder -import chat.revolt.components.generic.RemoteImage +import chat.revolt.composables.generic.IconPlaceholder +import chat.revolt.composables.generic.RemoteImage import chat.revolt.internals.Category import chat.revolt.internals.EmojiImpl import chat.revolt.internals.EmojiPickerItem diff --git a/app/src/main/java/chat/revolt/components/generic/CollapsibleCard.kt b/app/src/main/java/chat/revolt/composables/generic/CollapsibleCard.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/generic/CollapsibleCard.kt rename to app/src/main/java/chat/revolt/composables/generic/CollapsibleCard.kt index 445615cb..f80c966c 100644 --- a/app/src/main/java/chat/revolt/components/generic/CollapsibleCard.kt +++ b/app/src/main/java/chat/revolt/composables/generic/CollapsibleCard.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.clickable diff --git a/app/src/main/java/chat/revolt/components/generic/DobPicker.kt b/app/src/main/java/chat/revolt/composables/generic/DobPicker.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/generic/DobPicker.kt rename to app/src/main/java/chat/revolt/composables/generic/DobPicker.kt index c1669700..7c1bbfa7 100644 --- a/app/src/main/java/chat/revolt/components/generic/DobPicker.kt +++ b/app/src/main/java/chat/revolt/composables/generic/DobPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/chat/revolt/components/generic/FormTextField.kt b/app/src/main/java/chat/revolt/composables/generic/FormTextField.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/generic/FormTextField.kt rename to app/src/main/java/chat/revolt/composables/generic/FormTextField.kt index 993ed542..19d1f520 100644 --- a/app/src/main/java/chat/revolt/components/generic/FormTextField.kt +++ b/app/src/main/java/chat/revolt/composables/generic/FormTextField.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.Text diff --git a/app/src/main/java/chat/revolt/components/generic/GradientStopEditor.kt b/app/src/main/java/chat/revolt/composables/generic/GradientStopEditor.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/generic/GradientStopEditor.kt rename to app/src/main/java/chat/revolt/composables/generic/GradientStopEditor.kt index f3ab159c..12c82dd8 100644 --- a/app/src/main/java/chat/revolt/components/generic/GradientStopEditor.kt +++ b/app/src/main/java/chat/revolt/composables/generic/GradientStopEditor.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import android.annotation.SuppressLint import androidx.compose.foundation.Canvas diff --git a/app/src/main/java/chat/revolt/components/generic/HealthAlert.kt b/app/src/main/java/chat/revolt/composables/generic/HealthAlert.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/generic/HealthAlert.kt rename to app/src/main/java/chat/revolt/composables/generic/HealthAlert.kt index 3df371b7..dfce1dc9 100644 --- a/app/src/main/java/chat/revolt/components/generic/HealthAlert.kt +++ b/app/src/main/java/chat/revolt/composables/generic/HealthAlert.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent diff --git a/app/src/main/java/chat/revolt/components/generic/IconPlaceholder.kt b/app/src/main/java/chat/revolt/composables/generic/IconPlaceholder.kt similarity index 95% rename from app/src/main/java/chat/revolt/components/generic/IconPlaceholder.kt rename to app/src/main/java/chat/revolt/composables/generic/IconPlaceholder.kt index f345ebce..5cd2c417 100644 --- a/app/src/main/java/chat/revolt/components/generic/IconPlaceholder.kt +++ b/app/src/main/java/chat/revolt/composables/generic/IconPlaceholder.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/components/generic/InlineMediaPicker.kt b/app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/generic/InlineMediaPicker.kt rename to app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt index b622e113..86bc47dd 100644 --- a/app/src/main/java/chat/revolt/components/generic/InlineMediaPicker.kt +++ b/app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import android.net.Uri import androidx.activity.compose.rememberLauncherForActivityResult diff --git a/app/src/main/java/chat/revolt/components/generic/ListHeader.kt b/app/src/main/java/chat/revolt/composables/generic/ListHeader.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/generic/ListHeader.kt rename to app/src/main/java/chat/revolt/composables/generic/ListHeader.kt index a9069702..952b89b8 100644 --- a/app/src/main/java/chat/revolt/components/generic/ListHeader.kt +++ b/app/src/main/java/chat/revolt/composables/generic/ListHeader.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/components/generic/NonIdealState.kt b/app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/generic/NonIdealState.kt rename to app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt index 9da431de..7e51bc23 100644 --- a/app/src/main/java/chat/revolt/components/generic/NonIdealState.kt +++ b/app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/chat/revolt/components/generic/PrimaryTabs.kt b/app/src/main/java/chat/revolt/composables/generic/PrimaryTabs.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/generic/PrimaryTabs.kt rename to app/src/main/java/chat/revolt/composables/generic/PrimaryTabs.kt index 068dcd50..6fb1e17e 100644 --- a/app/src/main/java/chat/revolt/components/generic/PrimaryTabs.kt +++ b/app/src/main/java/chat/revolt/composables/generic/PrimaryTabs.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.ExperimentalMaterial3Api diff --git a/app/src/main/java/chat/revolt/components/generic/RadioItem.kt b/app/src/main/java/chat/revolt/composables/generic/RadioItem.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/generic/RadioItem.kt rename to app/src/main/java/chat/revolt/composables/generic/RadioItem.kt index 7571bfa0..67f9490e 100644 --- a/app/src/main/java/chat/revolt/components/generic/RadioItem.kt +++ b/app/src/main/java/chat/revolt/composables/generic/RadioItem.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.selection.selectable diff --git a/app/src/main/java/chat/revolt/components/generic/RemoteImage.kt b/app/src/main/java/chat/revolt/composables/generic/RemoteImage.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/generic/RemoteImage.kt rename to app/src/main/java/chat/revolt/composables/generic/RemoteImage.kt index 0829699d..46889f09 100644 --- a/app/src/main/java/chat/revolt/components/generic/RemoteImage.kt +++ b/app/src/main/java/chat/revolt/composables/generic/RemoteImage.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import android.util.DisplayMetrics import androidx.compose.foundation.layout.height diff --git a/app/src/main/java/chat/revolt/components/generic/SheetButton.kt b/app/src/main/java/chat/revolt/composables/generic/SheetButton.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/generic/SheetButton.kt rename to app/src/main/java/chat/revolt/composables/generic/SheetButton.kt index b177a4b5..87d997d2 100644 --- a/app/src/main/java/chat/revolt/components/generic/SheetButton.kt +++ b/app/src/main/java/chat/revolt/composables/generic/SheetButton.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/components/generic/SheetHeaderPadding.kt b/app/src/main/java/chat/revolt/composables/generic/SheetHeaderPadding.kt similarity index 93% rename from app/src/main/java/chat/revolt/components/generic/SheetHeaderPadding.kt rename to app/src/main/java/chat/revolt/composables/generic/SheetHeaderPadding.kt index 7bbb83b8..8ec94e42 100644 --- a/app/src/main/java/chat/revolt/components/generic/SheetHeaderPadding.kt +++ b/app/src/main/java/chat/revolt/composables/generic/SheetHeaderPadding.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope diff --git a/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt b/app/src/main/java/chat/revolt/composables/generic/UserAvatar.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/generic/UserAvatar.kt rename to app/src/main/java/chat/revolt/composables/generic/UserAvatar.kt index a76fe1a5..22f0a58a 100644 --- a/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt +++ b/app/src/main/java/chat/revolt/composables/generic/UserAvatar.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background diff --git a/app/src/main/java/chat/revolt/components/generic/Weblink.kt b/app/src/main/java/chat/revolt/composables/generic/Weblink.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/generic/Weblink.kt rename to app/src/main/java/chat/revolt/composables/generic/Weblink.kt index 4b0bfab2..dc0b1476 100644 --- a/app/src/main/java/chat/revolt/components/generic/Weblink.kt +++ b/app/src/main/java/chat/revolt/composables/generic/Weblink.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.generic +package chat.revolt.composables.generic import android.net.Uri import androidx.browser.customtabs.CustomTabsIntent diff --git a/app/src/main/java/chat/revolt/components/markdown/MarkdownCodeBlock.kt b/app/src/main/java/chat/revolt/composables/markdown/MarkdownCodeBlock.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/markdown/MarkdownCodeBlock.kt rename to app/src/main/java/chat/revolt/composables/markdown/MarkdownCodeBlock.kt index 55a0fb74..97a48abf 100644 --- a/app/src/main/java/chat/revolt/components/markdown/MarkdownCodeBlock.kt +++ b/app/src/main/java/chat/revolt/composables/markdown/MarkdownCodeBlock.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.markdown +package chat.revolt.composables.markdown import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt b/app/src/main/java/chat/revolt/composables/markdown/MarkdownText.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt rename to app/src/main/java/chat/revolt/composables/markdown/MarkdownText.kt index 9d556260..7978ce9f 100644 --- a/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt +++ b/app/src/main/java/chat/revolt/composables/markdown/MarkdownText.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.markdown +package chat.revolt.composables.markdown import android.content.Intent import android.widget.Toast @@ -41,8 +41,8 @@ import chat.revolt.api.routes.custom.fetchEmoji import chat.revolt.api.schemas.isInviteUri import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.utils.detectTapGesturesConditionalConsume +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.utils.detectTapGesturesConditionalConsume import chat.revolt.internals.resolveTimestamp import chat.revolt.ndk.AstNode import chat.revolt.ui.theme.FragmentMono diff --git a/app/src/main/java/chat/revolt/components/markdown/MarkdownTree.kt b/app/src/main/java/chat/revolt/composables/markdown/MarkdownTree.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/markdown/MarkdownTree.kt rename to app/src/main/java/chat/revolt/composables/markdown/MarkdownTree.kt index f02d4cdc..4a17ceb7 100644 --- a/app/src/main/java/chat/revolt/components/markdown/MarkdownTree.kt +++ b/app/src/main/java/chat/revolt/composables/markdown/MarkdownTree.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.markdown +package chat.revolt.composables.markdown import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/components/markdown/RichMarkdown.kt b/app/src/main/java/chat/revolt/composables/markdown/RichMarkdown.kt similarity index 93% rename from app/src/main/java/chat/revolt/components/markdown/RichMarkdown.kt rename to app/src/main/java/chat/revolt/composables/markdown/RichMarkdown.kt index a897510d..f09a8eca 100644 --- a/app/src/main/java/chat/revolt/components/markdown/RichMarkdown.kt +++ b/app/src/main/java/chat/revolt/composables/markdown/RichMarkdown.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.markdown +package chat.revolt.composables.markdown import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/revolt/components/media/AudioPlayer.kt b/app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/media/AudioPlayer.kt rename to app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt index 5de6482e..76047b2f 100644 --- a/app/src/main/java/chat/revolt/components/media/AudioPlayer.kt +++ b/app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.media +package chat.revolt.composables.media import android.content.ContentValues import android.content.Intent diff --git a/app/src/main/java/chat/revolt/components/media/MediaPickerGateway.kt b/app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/media/MediaPickerGateway.kt rename to app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt index 3911bfd7..57c729c4 100644 --- a/app/src/main/java/chat/revolt/components/media/MediaPickerGateway.kt +++ b/app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.media +package chat.revolt.composables.media import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/app/src/main/java/chat/revolt/components/profile/UserCard.kt b/app/src/main/java/chat/revolt/composables/profile/UserCard.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/profile/UserCard.kt rename to app/src/main/java/chat/revolt/composables/profile/UserCard.kt index fae8a8b0..710345c9 100644 --- a/app/src/main/java/chat/revolt/components/profile/UserCard.kt +++ b/app/src/main/java/chat/revolt/composables/profile/UserCard.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.profile +package chat.revolt.composables.profile import android.graphics.Bitmap import android.icu.text.DateFormat @@ -56,7 +56,7 @@ import chat.revolt.api.internals.ResourceLocations import chat.revolt.api.internals.ULID import chat.revolt.api.internals.UserQR import chat.revolt.api.schemas.User -import chat.revolt.components.generic.UserAvatar +import chat.revolt.composables.generic.UserAvatar import chat.revolt.ui.theme.FragmentMono import com.bumptech.glide.Glide import com.google.zxing.BarcodeFormat diff --git a/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt b/app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt rename to app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt index b546e2b5..e5017d94 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.chat +package chat.revolt.composables.screens.chat import android.text.format.Formatter import androidx.compose.animation.AnimatedVisibility @@ -47,7 +47,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import chat.revolt.R import chat.revolt.api.routes.microservices.autumn.FileArgs -import chat.revolt.components.generic.RemoteImage +import chat.revolt.composables.generic.RemoteImage import kotlinx.coroutines.launch import java.io.File diff --git a/app/src/main/java/chat/revolt/components/screens/chat/ChannelHeader.kt b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/screens/chat/ChannelHeader.kt rename to app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt index 24f0e9eb..0f33cd7a 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/ChannelHeader.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.chat +package chat.revolt.composables.screens.chat import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row diff --git a/app/src/main/java/chat/revolt/components/screens/chat/ChannelIcon.kt b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/screens/chat/ChannelIcon.kt rename to app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt index dd7e13a9..c244f7cb 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/ChannelIcon.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.chat +package chat.revolt.composables.screens.chat import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AccountBox diff --git a/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelSheetHeader.kt similarity index 95% rename from app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt rename to app/src/main/java/chat/revolt/composables/screens/chat/ChannelSheetHeader.kt index df8b49ca..8a5fe7a6 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelSheetHeader.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.chat +package chat.revolt.composables.screens.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -30,9 +30,9 @@ import chat.revolt.api.REVOLT_FILES import chat.revolt.api.schemas.AutumnResource import chat.revolt.api.schemas.ChannelType import chat.revolt.api.schemas.User -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.generic.UserAvatar -import chat.revolt.components.markdown.MarkdownTree +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.generic.UserAvatar +import chat.revolt.composables.markdown.MarkdownTree import chat.revolt.ndk.AstNode import chat.revolt.ndk.Stendal diff --git a/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt b/app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt similarity index 95% rename from app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt rename to app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt index 181a58a9..43271c29 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.chat +package chat.revolt.composables.screens.chat import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -31,10 +31,10 @@ import chat.revolt.api.RevoltAPI import chat.revolt.api.internals.ULID import chat.revolt.api.routes.channel.SendMessageReply import chat.revolt.api.schemas.Message -import chat.revolt.components.chat.authorAvatarUrl -import chat.revolt.components.chat.authorColour -import chat.revolt.components.chat.authorName -import chat.revolt.components.generic.UserAvatar +import chat.revolt.composables.chat.authorAvatarUrl +import chat.revolt.composables.chat.authorColour +import chat.revolt.composables.chat.authorName +import chat.revolt.composables.generic.UserAvatar @Composable fun replyContentText(message: Message): String { diff --git a/app/src/main/java/chat/revolt/components/screens/chat/TypingIndicator.kt b/app/src/main/java/chat/revolt/composables/screens/chat/TypingIndicator.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/screens/chat/TypingIndicator.kt rename to app/src/main/java/chat/revolt/composables/screens/chat/TypingIndicator.kt index a4366d31..9af1c0c3 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/TypingIndicator.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/TypingIndicator.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.chat +package chat.revolt.composables.screens.chat import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -26,7 +26,7 @@ import chat.revolt.activities.RevoltTweenInt import chat.revolt.api.REVOLT_FILES import chat.revolt.api.RevoltAPI import chat.revolt.api.schemas.User -import chat.revolt.components.generic.UserAvatar +import chat.revolt.composables.generic.UserAvatar @Composable fun StackedUserAvatars(users: List, amount: Int = 3, serverId: String?) { diff --git a/app/src/main/java/chat/revolt/components/screens/chat/atoms/RegularMessage.kt b/app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/screens/chat/atoms/RegularMessage.kt rename to app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt index ccefeb46..882b7ce1 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/atoms/RegularMessage.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.chat.atoms +package chat.revolt.composables.screens.chat.atoms import android.annotation.SuppressLint import androidx.compose.animation.AnimatedContent @@ -49,7 +49,7 @@ import chat.revolt.api.settings.LoadedSettings import chat.revolt.api.settings.MessageReplyStyle import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.chat.Message +import chat.revolt.composables.chat.Message import chat.revolt.internals.extensions.supportSwipeReply import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt b/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt rename to app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt index 24af6a25..75442216 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.chat.drawer +package chat.revolt.composables.screens.chat.drawer import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.Spring @@ -89,12 +89,12 @@ import chat.revolt.api.schemas.User import chat.revolt.api.schemas.has import chat.revolt.api.settings.NotificationSettingsProvider import chat.revolt.api.settings.SyncedSettings -import chat.revolt.components.generic.GroupIcon -import chat.revolt.components.generic.IconPlaceholder -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.generic.UserAvatar -import chat.revolt.components.generic.presenceFromStatus -import chat.revolt.components.screens.chat.ChannelIcon +import chat.revolt.composables.generic.GroupIcon +import chat.revolt.composables.generic.IconPlaceholder +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.generic.UserAvatar +import chat.revolt.composables.generic.presenceFromStatus +import chat.revolt.composables.screens.chat.ChannelIcon import chat.revolt.screens.chat.ChatRouterDestination import chat.revolt.sheets.ChannelContextSheet import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/components/screens/services/DiscoverView.kt b/app/src/main/java/chat/revolt/composables/screens/services/DiscoverView.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/screens/services/DiscoverView.kt rename to app/src/main/java/chat/revolt/composables/screens/services/DiscoverView.kt index 99b493ec..056a524c 100644 --- a/app/src/main/java/chat/revolt/components/screens/services/DiscoverView.kt +++ b/app/src/main/java/chat/revolt/composables/screens/services/DiscoverView.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.services +package chat.revolt.composables.screens.services import android.annotation.SuppressLint import android.content.Intent diff --git a/app/src/main/java/chat/revolt/components/screens/settings/AttributionItem.kt b/app/src/main/java/chat/revolt/composables/screens/settings/AttributionItem.kt similarity index 93% rename from app/src/main/java/chat/revolt/components/screens/settings/AttributionItem.kt rename to app/src/main/java/chat/revolt/composables/screens/settings/AttributionItem.kt index 2a34d4a7..12482e38 100644 --- a/app/src/main/java/chat/revolt/components/screens/settings/AttributionItem.kt +++ b/app/src/main/java/chat/revolt/composables/screens/settings/AttributionItem.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.settings +package chat.revolt.composables.screens.settings import androidx.compose.foundation.clickable import androidx.compose.material3.ListItem diff --git a/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt b/app/src/main/java/chat/revolt/composables/screens/settings/ServerOverview.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt rename to app/src/main/java/chat/revolt/composables/screens/settings/ServerOverview.kt index 9ec6fa59..1ca0ff57 100644 --- a/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt +++ b/app/src/main/java/chat/revolt/composables/screens/settings/ServerOverview.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.settings +package chat.revolt.composables.screens.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -31,8 +31,8 @@ import chat.revolt.api.REVOLT_FILES import chat.revolt.api.schemas.Server import chat.revolt.api.schemas.ServerFlags import chat.revolt.api.schemas.has -import chat.revolt.components.generic.IconPlaceholder -import chat.revolt.components.generic.RemoteImage +import chat.revolt.composables.generic.IconPlaceholder +import chat.revolt.composables.generic.RemoteImage @Composable fun ServerOverview(server: Server) { diff --git a/app/src/main/java/chat/revolt/components/screens/settings/UserButtons.kt b/app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/screens/settings/UserButtons.kt rename to app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt index 26774bda..ebeb13e0 100644 --- a/app/src/main/java/chat/revolt/components/screens/settings/UserButtons.kt +++ b/app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.settings +package chat.revolt.composables.screens.settings import android.widget.Toast import androidx.compose.animation.animateContentSize diff --git a/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt b/app/src/main/java/chat/revolt/composables/screens/settings/UserOverview.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt rename to app/src/main/java/chat/revolt/composables/screens/settings/UserOverview.kt index f2046920..12d34fc8 100644 --- a/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt +++ b/app/src/main/java/chat/revolt/composables/screens/settings/UserOverview.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.settings +package chat.revolt.composables.screens.settings import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -40,9 +40,9 @@ import chat.revolt.api.routes.user.fetchUserProfile import chat.revolt.api.schemas.AutumnResource import chat.revolt.api.schemas.Profile import chat.revolt.api.schemas.User -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.generic.UserAvatar -import chat.revolt.components.generic.presenceFromStatus +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.generic.UserAvatar +import chat.revolt.composables.generic.presenceFromStatus import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking diff --git a/app/src/main/java/chat/revolt/components/screens/settings/appearance/ColourChip.kt b/app/src/main/java/chat/revolt/composables/screens/settings/appearance/ColourChip.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/screens/settings/appearance/ColourChip.kt rename to app/src/main/java/chat/revolt/composables/screens/settings/appearance/ColourChip.kt index 33ca844c..60bfc210 100644 --- a/app/src/main/java/chat/revolt/components/screens/settings/appearance/ColourChip.kt +++ b/app/src/main/java/chat/revolt/composables/screens/settings/appearance/ColourChip.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.settings.appearance +package chat.revolt.composables.screens.settings.appearance import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/app/src/main/java/chat/revolt/components/screens/settings/appearance/CornerRadiusPicker.kt b/app/src/main/java/chat/revolt/composables/screens/settings/appearance/CornerRadiusPicker.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/screens/settings/appearance/CornerRadiusPicker.kt rename to app/src/main/java/chat/revolt/composables/screens/settings/appearance/CornerRadiusPicker.kt index be84e224..50c7340f 100644 --- a/app/src/main/java/chat/revolt/components/screens/settings/appearance/CornerRadiusPicker.kt +++ b/app/src/main/java/chat/revolt/composables/screens/settings/appearance/CornerRadiusPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.settings.appearance +package chat.revolt.composables.screens.settings.appearance import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/app/src/main/java/chat/revolt/components/screens/splash/DisconnectedScreen.kt b/app/src/main/java/chat/revolt/composables/screens/splash/DisconnectedScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/screens/splash/DisconnectedScreen.kt rename to app/src/main/java/chat/revolt/composables/screens/splash/DisconnectedScreen.kt index 60dd1501..05710bad 100644 --- a/app/src/main/java/chat/revolt/components/screens/splash/DisconnectedScreen.kt +++ b/app/src/main/java/chat/revolt/composables/screens/splash/DisconnectedScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.splash +package chat.revolt.composables.screens.splash import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/chat/revolt/components/screens/voice/VoiceChannelOverlay.kt b/app/src/main/java/chat/revolt/composables/screens/voice/VoiceChannelOverlay.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/screens/voice/VoiceChannelOverlay.kt rename to app/src/main/java/chat/revolt/composables/screens/voice/VoiceChannelOverlay.kt index d326d44b..0720ab77 100644 --- a/app/src/main/java/chat/revolt/components/screens/voice/VoiceChannelOverlay.kt +++ b/app/src/main/java/chat/revolt/composables/screens/voice/VoiceChannelOverlay.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.screens.voice +package chat.revolt.composables.screens.voice import android.content.Context import android.util.DisplayMetrics diff --git a/app/src/main/java/chat/revolt/components/settings/SettingsHintBanner.kt b/app/src/main/java/chat/revolt/composables/settings/SettingsHintBanner.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/settings/SettingsHintBanner.kt rename to app/src/main/java/chat/revolt/composables/settings/SettingsHintBanner.kt index 21a4adb3..ab5e13ce 100644 --- a/app/src/main/java/chat/revolt/components/settings/SettingsHintBanner.kt +++ b/app/src/main/java/chat/revolt/composables/settings/SettingsHintBanner.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.settings +package chat.revolt.composables.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/chat/revolt/components/settings/profile/StatusPicker.kt b/app/src/main/java/chat/revolt/composables/settings/profile/StatusPicker.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/settings/profile/StatusPicker.kt rename to app/src/main/java/chat/revolt/composables/settings/profile/StatusPicker.kt index 028ed997..a9e602e8 100644 --- a/app/src/main/java/chat/revolt/components/settings/profile/StatusPicker.kt +++ b/app/src/main/java/chat/revolt/composables/settings/profile/StatusPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.settings.profile +package chat.revolt.composables.settings.profile import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -19,8 +19,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import chat.revolt.R -import chat.revolt.components.generic.Presence -import chat.revolt.components.generic.presenceColour +import chat.revolt.composables.generic.Presence +import chat.revolt.composables.generic.presenceColour fun Presence.stringResource(): Int { return when (this) { diff --git a/app/src/main/java/chat/revolt/components/settings/sessions/SessionItem.kt b/app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt similarity index 97% rename from app/src/main/java/chat/revolt/components/settings/sessions/SessionItem.kt rename to app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt index 5f39393f..3403c7cc 100644 --- a/app/src/main/java/chat/revolt/components/settings/sessions/SessionItem.kt +++ b/app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.settings.sessions +package chat.revolt.composables.settings.sessions import android.text.format.DateUtils import androidx.compose.material3.IconButton diff --git a/app/src/main/java/chat/revolt/components/sheets/SheetTile.kt b/app/src/main/java/chat/revolt/composables/sheets/SheetTile.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/sheets/SheetTile.kt rename to app/src/main/java/chat/revolt/composables/sheets/SheetTile.kt index e3ae59db..4336576f 100644 --- a/app/src/main/java/chat/revolt/components/sheets/SheetTile.kt +++ b/app/src/main/java/chat/revolt/composables/sheets/SheetTile.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.sheets +package chat.revolt.composables.sheets import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/app/src/main/java/chat/revolt/components/skeletons/MessageSkeleton.kt b/app/src/main/java/chat/revolt/composables/skeletons/MessageSkeleton.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/skeletons/MessageSkeleton.kt rename to app/src/main/java/chat/revolt/composables/skeletons/MessageSkeleton.kt index ab0c3941..a6a2274a 100644 --- a/app/src/main/java/chat/revolt/components/skeletons/MessageSkeleton.kt +++ b/app/src/main/java/chat/revolt/composables/skeletons/MessageSkeleton.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.skeletons +package chat.revolt.composables.skeletons import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/components/skeletons/SkeletonGlobals.kt b/app/src/main/java/chat/revolt/composables/skeletons/SkeletonGlobals.kt similarity index 75% rename from app/src/main/java/chat/revolt/components/skeletons/SkeletonGlobals.kt rename to app/src/main/java/chat/revolt/composables/skeletons/SkeletonGlobals.kt index dee83238..e7967cc2 100644 --- a/app/src/main/java/chat/revolt/components/skeletons/SkeletonGlobals.kt +++ b/app/src/main/java/chat/revolt/composables/skeletons/SkeletonGlobals.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.skeletons +package chat.revolt.composables.skeletons import androidx.compose.material3.LocalContentColor import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/revolt/components/skeletons/UserOverviewSkeleton.kt b/app/src/main/java/chat/revolt/composables/skeletons/UserOverviewSkeleton.kt similarity index 98% rename from app/src/main/java/chat/revolt/components/skeletons/UserOverviewSkeleton.kt rename to app/src/main/java/chat/revolt/composables/skeletons/UserOverviewSkeleton.kt index 7ee58367..55c70cdf 100644 --- a/app/src/main/java/chat/revolt/components/skeletons/UserOverviewSkeleton.kt +++ b/app/src/main/java/chat/revolt/composables/skeletons/UserOverviewSkeleton.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.skeletons +package chat.revolt.composables.skeletons import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/components/utils/ConditionalConsumptionPointerInput.kt b/app/src/main/java/chat/revolt/composables/utils/ConditionalConsumptionPointerInput.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/utils/ConditionalConsumptionPointerInput.kt rename to app/src/main/java/chat/revolt/composables/utils/ConditionalConsumptionPointerInput.kt index 0378d7ed..f16e5957 100644 --- a/app/src/main/java/chat/revolt/components/utils/ConditionalConsumptionPointerInput.kt +++ b/app/src/main/java/chat/revolt/composables/utils/ConditionalConsumptionPointerInput.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.utils +package chat.revolt.composables.utils import androidx.compose.foundation.gestures.GestureCancellationException import androidx.compose.foundation.gestures.PressGestureScope diff --git a/app/src/main/java/chat/revolt/components/utils/SizeMeasured.kt b/app/src/main/java/chat/revolt/composables/utils/SizeMeasured.kt similarity index 96% rename from app/src/main/java/chat/revolt/components/utils/SizeMeasured.kt rename to app/src/main/java/chat/revolt/composables/utils/SizeMeasured.kt index 796737fd..3e0c389d 100644 --- a/app/src/main/java/chat/revolt/components/utils/SizeMeasured.kt +++ b/app/src/main/java/chat/revolt/composables/utils/SizeMeasured.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.utils +package chat.revolt.composables.utils import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/app/src/main/java/chat/revolt/components/vectorassets/SwipeToReplySpark.kt b/app/src/main/java/chat/revolt/composables/vectorassets/SwipeToReplySpark.kt similarity index 99% rename from app/src/main/java/chat/revolt/components/vectorassets/SwipeToReplySpark.kt rename to app/src/main/java/chat/revolt/composables/vectorassets/SwipeToReplySpark.kt index 3ee70e54..1dfdc51c 100644 --- a/app/src/main/java/chat/revolt/components/vectorassets/SwipeToReplySpark.kt +++ b/app/src/main/java/chat/revolt/composables/vectorassets/SwipeToReplySpark.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.vectorassets +package chat.revolt.composables.vectorassets import androidx.compose.foundation.Image import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/chat/revolt/internals/Autocomplete.kt b/app/src/main/java/chat/revolt/internals/Autocomplete.kt index 50795894..0205ae29 100644 --- a/app/src/main/java/chat/revolt/internals/Autocomplete.kt +++ b/app/src/main/java/chat/revolt/internals/Autocomplete.kt @@ -2,7 +2,7 @@ package chat.revolt.internals import chat.revolt.api.RevoltAPI import chat.revolt.api.schemas.ChannelType -import chat.revolt.components.chat.AutocompleteSuggestion +import chat.revolt.composables.chat.AutocompleteSuggestion object Autocomplete { private val emojiImpl = EmojiImpl() diff --git a/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt b/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt index 87c169b9..eab610e8 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt +++ b/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt @@ -78,10 +78,10 @@ import chat.revolt.api.schemas.isInviteUri import chat.revolt.api.settings.LoadedSettings import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.generic.UserAvatar -import chat.revolt.components.markdown.Annotations -import chat.revolt.components.utils.detectTapGesturesConditionalConsume +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.generic.UserAvatar +import chat.revolt.composables.markdown.Annotations +import chat.revolt.composables.utils.detectTapGesturesConditionalConsume import chat.revolt.ui.theme.FragmentMono import chat.revolt.ui.theme.isThemeDark import dev.snipme.highlights.Highlights diff --git a/app/src/main/java/chat/revolt/screens/DefaultDestinationScreen.kt b/app/src/main/java/chat/revolt/screens/DefaultDestinationScreen.kt index 16c2b0d0..e86af7f2 100644 --- a/app/src/main/java/chat/revolt/screens/DefaultDestinationScreen.kt +++ b/app/src/main/java/chat/revolt/screens/DefaultDestinationScreen.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.navigation.NavController import chat.revolt.RevoltApplication import chat.revolt.api.internals.getComponentActivity -import chat.revolt.components.screens.splash.DisconnectedScreen +import chat.revolt.composables.screens.splash.DisconnectedScreen import com.google.android.material.color.DynamicColors @Composable diff --git a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt index 17df33fe..fe55987e 100644 --- a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt +++ b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt @@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ElevatedButton import androidx.compose.material3.ExperimentalMaterial3Api @@ -58,7 +57,7 @@ import chat.revolt.api.REVOLT_BASE import chat.revolt.api.RevoltJson import chat.revolt.api.routes.misc.Root import chat.revolt.api.routes.misc.getRootRoute -import chat.revolt.components.generic.PrimaryTabs +import chat.revolt.composables.generic.PrimaryTabs import chat.revolt.internals.Platform import kotlinx.coroutines.launch import kotlinx.serialization.encodeToString diff --git a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt index 37167ffa..c89f0c1d 100644 --- a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt +++ b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt @@ -41,7 +41,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.navigation.NavController import chat.revolt.R -import chat.revolt.components.screens.settings.AttributionItem +import chat.revolt.composables.screens.settings.AttributionItem import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray diff --git a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt index 3e4146af..2ab590a7 100644 --- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt @@ -68,9 +68,9 @@ import chat.revolt.api.realtime.RealtimeSocket import chat.revolt.api.routes.push.subscribePush import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.chat.DisconnectedNotice -import chat.revolt.components.screens.chat.drawer.ChannelSideDrawer -import chat.revolt.components.screens.voice.VoiceChannelOverlay +import chat.revolt.composables.chat.DisconnectedNotice +import chat.revolt.composables.screens.chat.drawer.ChannelSideDrawer +import chat.revolt.composables.screens.voice.VoiceChannelOverlay import chat.revolt.dialogs.NotificationRationaleDialog import chat.revolt.internals.Changelogs import chat.revolt.internals.extensions.zero diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt index c859d33f..58390f6a 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt +++ b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt @@ -44,8 +44,8 @@ import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.safety.putMessageReport import chat.revolt.api.routes.user.blockUser import chat.revolt.api.schemas.ContentReportReason -import chat.revolt.components.chat.Message -import chat.revolt.components.generic.FormTextField +import chat.revolt.composables.chat.Message +import chat.revolt.composables.generic.FormTextField import kotlinx.coroutines.launch enum class MessageReportFlowState { diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt index 5d1af59c..f9f982a0 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt +++ b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt @@ -35,8 +35,8 @@ import chat.revolt.R import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.safety.putServerReport import chat.revolt.api.schemas.ContentReportReason -import chat.revolt.components.generic.FormTextField -import chat.revolt.components.screens.settings.ServerOverview +import chat.revolt.composables.generic.FormTextField +import chat.revolt.composables.screens.settings.ServerOverview import kotlinx.coroutines.launch enum class ServerReportFlowState { diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt index f4a9eac0..9fddd36c 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt +++ b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt @@ -37,8 +37,8 @@ import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.safety.putUserReport import chat.revolt.api.routes.user.blockUser import chat.revolt.api.schemas.UserReportReason -import chat.revolt.components.generic.FormTextField -import chat.revolt.components.screens.settings.UserOverview +import chat.revolt.composables.generic.FormTextField +import chat.revolt.composables.screens.settings.UserOverview import kotlinx.coroutines.launch enum class UserReportFlowState { diff --git a/app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt index 86320068..e8dd5163 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt @@ -34,8 +34,8 @@ import chat.revolt.api.internals.FriendRequests import chat.revolt.api.routes.user.unfriendUser import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.chat.MemberListItem -import chat.revolt.components.generic.CountableListHeader +import chat.revolt.composables.chat.MemberListItem +import chat.revolt.composables.generic.CountableListHeader import chat.revolt.internals.extensions.zero import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt index 32f03af8..0fc9f896 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt @@ -58,9 +58,9 @@ import chat.revolt.R import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.user.fetchSelf import chat.revolt.api.schemas.User -import chat.revolt.components.generic.NonIdealState -import chat.revolt.components.screens.settings.UserOverview -import chat.revolt.components.skeletons.UserOverviewSkeleton +import chat.revolt.composables.generic.NonIdealState +import chat.revolt.composables.screens.settings.UserOverview +import chat.revolt.composables.skeletons.UserOverviewSkeleton import chat.revolt.internals.extensions.zero import chat.revolt.sheets.UserCardSheet import io.sentry.Sentry diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt index 003e0ec6..592d2fea 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt @@ -17,9 +17,7 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.Crossfade -import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.animateDpAsState -import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.animateIntAsState import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut @@ -30,7 +28,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.PaddingValues @@ -46,10 +43,8 @@ import androidx.compose.foundation.layout.imeAnimationTarget import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.navigationBarsPadding -import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.requiredHeight -import androidx.compose.foundation.layout.requiredHeightIn import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBars import androidx.compose.foundation.lazy.LazyColumn @@ -88,8 +83,6 @@ import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableFloatStateOf -import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -99,9 +92,6 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import androidx.compose.ui.hapticfeedback.HapticFeedbackType -import androidx.compose.ui.input.pointer.PointerInputChange -import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity @@ -118,7 +108,6 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.em -import androidx.compose.ui.unit.min import androidx.compose.ui.unit.sp import androidx.documentfile.provider.DocumentFile import androidx.hilt.navigation.compose.hiltViewModel @@ -135,30 +124,27 @@ import chat.revolt.api.routes.channel.react import chat.revolt.api.routes.microservices.autumn.FileArgs import chat.revolt.api.schemas.ChannelType import chat.revolt.api.schemas.Message -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.api.settings.MessageReplyStyle import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.chat.DateDivider -import chat.revolt.components.chat.Message -import chat.revolt.components.chat.MessageField -import chat.revolt.components.chat.SystemMessage -import chat.revolt.components.emoji.EmojiPicker -import chat.revolt.components.generic.GroupIcon -import chat.revolt.components.generic.PresenceBadge -import chat.revolt.components.generic.UserAvatar -import chat.revolt.components.generic.UserAvatarWidthPlaceholder -import chat.revolt.components.generic.presenceFromStatus -import chat.revolt.components.media.MediaPickerGateway -import chat.revolt.components.screens.chat.AttachmentManager -import chat.revolt.components.screens.chat.ChannelIcon -import chat.revolt.components.screens.chat.ReplyManager -import chat.revolt.components.screens.chat.TypingIndicator -import chat.revolt.components.screens.chat.atoms.RegularMessage -import chat.revolt.components.skeletons.MessageSkeleton -import chat.revolt.components.skeletons.MessageSkeletonVariant +import chat.revolt.composables.chat.DateDivider +import chat.revolt.composables.chat.Message +import chat.revolt.composables.chat.MessageField +import chat.revolt.composables.chat.SystemMessage +import chat.revolt.composables.emoji.EmojiPicker +import chat.revolt.composables.generic.GroupIcon +import chat.revolt.composables.generic.PresenceBadge +import chat.revolt.composables.generic.UserAvatar +import chat.revolt.composables.generic.UserAvatarWidthPlaceholder +import chat.revolt.composables.generic.presenceFromStatus +import chat.revolt.composables.media.MediaPickerGateway +import chat.revolt.composables.screens.chat.AttachmentManager +import chat.revolt.composables.screens.chat.ChannelIcon +import chat.revolt.composables.screens.chat.ReplyManager +import chat.revolt.composables.screens.chat.TypingIndicator +import chat.revolt.composables.screens.chat.atoms.RegularMessage +import chat.revolt.composables.skeletons.MessageSkeleton +import chat.revolt.composables.skeletons.MessageSkeletonVariant import chat.revolt.internals.extensions.rememberChannelPermissions -import chat.revolt.internals.extensions.supportSwipeReply import chat.revolt.internals.extensions.zero import chat.revolt.sheets.ChannelInfoSheet import chat.revolt.sheets.MessageContextSheet @@ -170,7 +156,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.launch import kotlinx.datetime.Instant import java.io.File -import kotlin.math.abs import kotlin.math.max sealed class ChannelScreenItem { diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt index f7e59f4e..3ffb6a91 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt +++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt @@ -30,8 +30,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import chat.revolt.R -import chat.revolt.components.generic.DobPicker -import chat.revolt.components.generic.DobRegion +import chat.revolt.composables.generic.DobPicker +import chat.revolt.composables.generic.DobRegion import kotlinx.datetime.Clock import kotlinx.datetime.LocalDateTime import kotlinx.datetime.TimeZone diff --git a/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt b/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt index d4d30845..79694c67 100644 --- a/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt +++ b/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt @@ -46,7 +46,7 @@ import chat.revolt.api.internals.FriendRequests import chat.revolt.api.routes.channel.createGroupDM import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.chat.MemberListItem +import chat.revolt.composables.chat.MemberListItem import kotlinx.coroutines.launch const val MAX_PEOPLE_IN_GROUP = 50 diff --git a/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt b/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt index f7200842..ae95c189 100644 --- a/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt +++ b/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt @@ -45,7 +45,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import chat.revolt.R import chat.revolt.api.schemas.ChannelType -import chat.revolt.components.screens.chat.ChannelIcon +import chat.revolt.composables.screens.chat.ChannelIcon import chat.revolt.screens.labs.LabsFeature @LabsFeature diff --git a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/GradientEditorSandbox.kt b/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/GradientEditorSandbox.kt index af014f73..d2287b37 100644 --- a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/GradientEditorSandbox.kt +++ b/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/GradientEditorSandbox.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import chat.revolt.components.generic.GradientStopEditor +import chat.revolt.composables.generic.GradientStopEditor import chat.revolt.settings.dsl.SettingsPage @Composable diff --git a/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt b/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt index c2114499..40433867 100644 --- a/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt +++ b/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt @@ -45,8 +45,8 @@ import androidx.navigation.NavController import chat.revolt.BuildConfig import chat.revolt.R import chat.revolt.api.REVOLT_MARKETING -import chat.revolt.components.generic.AnyLink -import chat.revolt.components.generic.Weblink +import chat.revolt.composables.generic.AnyLink +import chat.revolt.composables.generic.Weblink import com.chuckerteam.chucker.api.Chucker @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt index 3c15cf1a..18cac322 100644 --- a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt +++ b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt @@ -54,8 +54,8 @@ import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.account.EmailPasswordAssessment import chat.revolt.api.routes.account.negotiateAuthentication import chat.revolt.api.routes.onboard.needsOnboarding -import chat.revolt.components.generic.AnyLink -import chat.revolt.components.generic.FormTextField +import chat.revolt.composables.generic.AnyLink +import chat.revolt.composables.generic.FormTextField import chat.revolt.persistence.KVStorage import chat.revolt.ui.theme.FragmentMono import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt b/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt index 6c1f3386..effa1085 100644 --- a/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt +++ b/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt @@ -42,8 +42,8 @@ import chat.revolt.api.routes.account.MfaResponseRecoveryCode import chat.revolt.api.routes.account.MfaResponseTotpCode import chat.revolt.api.routes.account.authenticateWithMfaRecoveryCode import chat.revolt.api.routes.account.authenticateWithMfaTotpCode -import chat.revolt.components.generic.CollapsibleCard -import chat.revolt.components.generic.FormTextField +import chat.revolt.composables.generic.CollapsibleCard +import chat.revolt.composables.generic.FormTextField import chat.revolt.persistence.KVStorage import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/screens/login2/InitScreen.kt b/app/src/main/java/chat/revolt/screens/login2/InitScreen.kt index 8287ab2e..99f3fd94 100644 --- a/app/src/main/java/chat/revolt/screens/login2/InitScreen.kt +++ b/app/src/main/java/chat/revolt/screens/login2/InitScreen.kt @@ -35,8 +35,8 @@ import chat.revolt.BuildConfig import chat.revolt.R import chat.revolt.api.REVOLT_MARKETING import chat.revolt.api.settings.LoadedSettings -import chat.revolt.components.generic.AnyLink -import chat.revolt.components.generic.Weblink +import chat.revolt.composables.generic.AnyLink +import chat.revolt.composables.generic.Weblink import chat.revolt.ui.theme.Theme import com.chuckerteam.chucker.api.Chucker diff --git a/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt b/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt index 9d778767..bebe1e88 100644 --- a/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt @@ -34,7 +34,7 @@ import chat.revolt.api.RevoltAPI import chat.revolt.api.schemas.ChannelType import chat.revolt.api.schemas.User import chat.revolt.api.settings.LoadedSettings -import chat.revolt.components.generic.UserAvatar +import chat.revolt.composables.generic.UserAvatar import chat.revolt.internals.extensions.zero // Note - this is not a traditional screen per se, as it is a part of the main screen diff --git a/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt b/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt index b703dee4..43fb5552 100644 --- a/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt +++ b/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt @@ -27,7 +27,7 @@ import androidx.navigation.NavController import chat.revolt.R import chat.revolt.api.routes.onboard.OnboardingCompletionBody import chat.revolt.api.routes.onboard.completeOnboarding -import chat.revolt.components.generic.FormTextField +import chat.revolt.composables.generic.FormTextField import chat.revolt.persistence.KVStorage import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt b/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt index 73cbb9d3..1355f9c2 100644 --- a/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt @@ -42,7 +42,7 @@ import chat.revolt.RevoltApplication import chat.revolt.api.routes.account.RegistrationBody import chat.revolt.api.routes.account.register import chat.revolt.api.routes.misc.getRootRoute -import chat.revolt.components.generic.FormTextField +import chat.revolt.composables.generic.FormTextField import com.hcaptcha.sdk.HCaptcha import com.hcaptcha.sdk.HCaptchaConfig import com.hcaptcha.sdk.HCaptchaSize diff --git a/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt b/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt index 3e53351f..5aa88c56 100644 --- a/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt +++ b/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.navigation.NavController import chat.revolt.R -import chat.revolt.components.screens.services.DiscoverView +import chat.revolt.composables.screens.services.DiscoverView @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt index b23d9a51..98c46e82 100644 --- a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt @@ -65,9 +65,9 @@ import chat.revolt.api.RevoltCbor import chat.revolt.api.RevoltJson import chat.revolt.api.settings.LoadedSettings import chat.revolt.api.settings.SyncedSettings -import chat.revolt.components.generic.ListHeader -import chat.revolt.components.screens.settings.appearance.ColourChip -import chat.revolt.components.screens.settings.appearance.CornerRadiusPicker +import chat.revolt.composables.generic.ListHeader +import chat.revolt.composables.screens.settings.appearance.ColourChip +import chat.revolt.composables.screens.settings.appearance.CornerRadiusPicker import chat.revolt.sheets.ColourPickerSheet import chat.revolt.ui.theme.OverridableColourScheme import chat.revolt.ui.theme.Theme diff --git a/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt index fcbc2106..83b0ff8c 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt @@ -41,8 +41,8 @@ import chat.revolt.api.settings.LoadedSettings import chat.revolt.api.settings.MessageReplyStyle import chat.revolt.api.settings.SpecialEmbedSettings import chat.revolt.api.settings.SyncedSettings -import chat.revolt.components.generic.ListHeader -import chat.revolt.components.generic.RadioItem +import chat.revolt.composables.generic.ListHeader +import chat.revolt.composables.generic.RadioItem import kotlinx.coroutines.launch class ChatSettingsScreenViewModel : ViewModel() { diff --git a/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt index 304506e8..a9cd9142 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt @@ -54,8 +54,8 @@ import chat.revolt.api.routes.microservices.autumn.uploadToAutumn import chat.revolt.api.routes.user.fetchUserProfile import chat.revolt.api.routes.user.patchSelf import chat.revolt.api.schemas.Profile -import chat.revolt.components.generic.InlineMediaPicker -import chat.revolt.components.screens.settings.RawUserOverview +import chat.revolt.composables.generic.InlineMediaPicker +import chat.revolt.composables.screens.settings.RawUserOverview import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import io.ktor.http.ContentType diff --git a/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt index 733c5d75..495968e6 100644 --- a/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt @@ -53,9 +53,9 @@ import chat.revolt.api.routes.auth.fetchAllSessions import chat.revolt.api.routes.auth.logoutAllSessions import chat.revolt.api.routes.auth.logoutSessionById import chat.revolt.api.schemas.Session -import chat.revolt.components.generic.ListHeader -import chat.revolt.components.markdown.RichMarkdown -import chat.revolt.components.settings.sessions.SessionItem +import chat.revolt.composables.generic.ListHeader +import chat.revolt.composables.markdown.RichMarkdown +import chat.revolt.composables.settings.sessions.SessionItem import kotlinx.coroutines.launch class SessionSettingsScreenViewModel : ViewModel() { diff --git a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt index b0cb1f30..3307d1ee 100644 --- a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt @@ -45,7 +45,7 @@ import chat.revolt.activities.InviteActivity import chat.revolt.api.RevoltAPI import chat.revolt.api.settings.FeatureFlags import chat.revolt.api.settings.LoadedSettings -import chat.revolt.components.generic.ListHeader +import chat.revolt.composables.generic.ListHeader import chat.revolt.persistence.KVStorage import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.runBlocking diff --git a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt index b3c3ce16..f2687998 100644 --- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt +++ b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt @@ -60,8 +60,8 @@ import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.channel.patchChannel import chat.revolt.api.routes.microservices.autumn.uploadToAutumn import chat.revolt.api.schemas.Channel -import chat.revolt.components.generic.InlineMediaPicker -import chat.revolt.components.generic.ListHeader +import chat.revolt.composables.generic.InlineMediaPicker +import chat.revolt.composables.generic.ListHeader import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import io.ktor.http.ContentType diff --git a/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt b/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt index 334d58e4..c8ee0e12 100644 --- a/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt +++ b/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt @@ -28,8 +28,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController import chat.revolt.R -import chat.revolt.components.generic.ListHeader -import chat.revolt.components.generic.RadioItem +import chat.revolt.composables.generic.ListHeader +import chat.revolt.composables.generic.RadioItem import kotlinx.coroutines.launch import kotlin.enums.EnumEntries diff --git a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt b/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt index dc3d888b..08ad1bae 100644 --- a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt @@ -29,9 +29,9 @@ import androidx.core.net.toUri import chat.revolt.R import chat.revolt.activities.InviteActivity import chat.revolt.api.REVOLT_APP -import chat.revolt.components.generic.FormTextField -import chat.revolt.components.generic.SheetButton -import chat.revolt.components.generic.SheetHeaderPadding +import chat.revolt.composables.generic.FormTextField +import chat.revolt.composables.generic.SheetButton +import chat.revolt.composables.generic.SheetHeaderPadding @Composable fun AddServerSheet() { diff --git a/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt b/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt index 55322637..bb1d1c43 100644 --- a/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp import chat.revolt.R import chat.revolt.api.RevoltAPI -import chat.revolt.components.generic.SheetButton +import chat.revolt.composables.generic.SheetButton import chat.revolt.internals.Platform import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt index a4f278f2..ed00919d 100644 --- a/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt @@ -38,8 +38,8 @@ import chat.revolt.api.internals.has import chat.revolt.api.schemas.ChannelType import chat.revolt.callbacks.Action import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.generic.SheetButton -import chat.revolt.components.screens.chat.ChannelSheetHeader +import chat.revolt.composables.generic.SheetButton +import chat.revolt.composables.screens.chat.ChannelSheetHeader import chat.revolt.internals.extensions.rememberChannelPermissions import chat.revolt.screens.chat.dialogs.InviteDialog import kotlinx.coroutines.delay diff --git a/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt index d84a750f..1574ee9a 100644 --- a/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt @@ -36,8 +36,8 @@ import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.custom.fetchEmoji import chat.revolt.api.schemas.Emoji import chat.revolt.api.schemas.Server -import chat.revolt.components.generic.RemoteImage -import chat.revolt.components.generic.SheetButton +import chat.revolt.composables.generic.RemoteImage +import chat.revolt.composables.generic.SheetButton import chat.revolt.internals.Platform import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/sheets/JBMDebuggerSheet.kt b/app/src/main/java/chat/revolt/sheets/JBMDebuggerSheet.kt index ddf64a5f..6faa88f5 100644 --- a/app/src/main/java/chat/revolt/sheets/JBMDebuggerSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/JBMDebuggerSheet.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.dp -import chat.revolt.components.generic.SheetHeaderPadding +import chat.revolt.composables.generic.SheetHeaderPadding import chat.revolt.markdown.jbm.JBM import chat.revolt.markdown.jbm.JBMApi import org.intellij.markdown.ast.ASTNode diff --git a/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt index 86262901..b59481d2 100644 --- a/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp import chat.revolt.R -import chat.revolt.components.generic.SheetButton +import chat.revolt.composables.generic.SheetButton import chat.revolt.internals.Platform import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt b/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt index 6dc151ef..c4a2b022 100644 --- a/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.text.style.TextOverflow import chat.revolt.R import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.channel.removeMember -import chat.revolt.components.generic.SheetButton +import chat.revolt.composables.generic.SheetButton import chat.revolt.internals.Platform import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt b/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt index e71d1e77..03a2d296 100644 --- a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt @@ -41,11 +41,11 @@ import chat.revolt.api.routes.channel.fetchGroupParticipants import chat.revolt.api.routes.server.fetchMembers import chat.revolt.api.schemas.Member import chat.revolt.api.schemas.User -import chat.revolt.components.chat.MemberListItem -import chat.revolt.components.generic.CountableListHeader -import chat.revolt.components.generic.Presence -import chat.revolt.components.generic.SheetHeaderPadding -import chat.revolt.components.generic.presenceFromStatus +import chat.revolt.composables.chat.MemberListItem +import chat.revolt.composables.generic.CountableListHeader +import chat.revolt.composables.generic.Presence +import chat.revolt.composables.generic.SheetHeaderPadding +import chat.revolt.composables.generic.presenceFromStatus import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt b/app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt index 7cf11a3f..832e3b9e 100644 --- a/app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt @@ -47,8 +47,8 @@ import chat.revolt.api.routes.channel.deleteMessage import chat.revolt.api.routes.channel.react import chat.revolt.api.settings.Experiments import chat.revolt.callbacks.UiCallbacks -import chat.revolt.components.chat.Message -import chat.revolt.components.generic.SheetButton +import chat.revolt.composables.chat.Message +import chat.revolt.composables.generic.SheetButton import chat.revolt.internals.Platform import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/sheets/ReactSheet.kt b/app/src/main/java/chat/revolt/sheets/ReactSheet.kt index 013229a9..88f2f576 100644 --- a/app/src/main/java/chat/revolt/sheets/ReactSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/ReactSheet.kt @@ -2,7 +2,7 @@ package chat.revolt.sheets import androidx.compose.runtime.Composable import chat.revolt.api.RevoltAPI -import chat.revolt.components.emoji.EmojiPicker +import chat.revolt.composables.emoji.EmojiPicker @Composable fun ReactSheet(messageId: String, onSelect: (String?) -> Unit) { diff --git a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt index 972aef11..017f1361 100644 --- a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt @@ -51,8 +51,8 @@ import chat.revolt.api.routes.user.fetchUser import chat.revolt.api.schemas.Emoji import chat.revolt.api.schemas.User import chat.revolt.api.settings.LoadedSettings -import chat.revolt.components.chat.MemberListItem -import chat.revolt.components.generic.RemoteImage +import chat.revolt.composables.chat.MemberListItem +import chat.revolt.composables.generic.RemoteImage import chat.revolt.internals.text.MessageProcessor import chat.revolt.persistence.KVStorage import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt b/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt index 7aa8a66e..cb66e007 100644 --- a/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt @@ -34,9 +34,9 @@ import androidx.compose.ui.unit.dp import chat.revolt.R import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.server.leaveOrDeleteServer -import chat.revolt.components.generic.SheetButton -import chat.revolt.components.markdown.RichMarkdown -import chat.revolt.components.screens.settings.ServerOverview +import chat.revolt.composables.generic.SheetButton +import chat.revolt.composables.markdown.RichMarkdown +import chat.revolt.composables.screens.settings.ServerOverview import chat.revolt.internals.Platform import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/sheets/StatusSheet.kt b/app/src/main/java/chat/revolt/sheets/StatusSheet.kt index 9416fed9..9a8c21ce 100644 --- a/app/src/main/java/chat/revolt/sheets/StatusSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/StatusSheet.kt @@ -40,11 +40,11 @@ import chat.revolt.R import chat.revolt.api.RevoltAPI import chat.revolt.api.routes.user.patchSelf import chat.revolt.api.schemas.User -import chat.revolt.components.generic.SheetButton -import chat.revolt.components.generic.asApiName -import chat.revolt.components.generic.presenceFromStatus -import chat.revolt.components.screens.settings.UserOverview -import chat.revolt.components.settings.profile.StatusPicker +import chat.revolt.composables.generic.SheetButton +import chat.revolt.composables.generic.asApiName +import chat.revolt.composables.generic.presenceFromStatus +import chat.revolt.composables.screens.settings.UserOverview +import chat.revolt.composables.settings.profile.StatusPicker import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/revolt/sheets/UserCardSheet.kt b/app/src/main/java/chat/revolt/sheets/UserCardSheet.kt index 8c041491..c1d5301a 100644 --- a/app/src/main/java/chat/revolt/sheets/UserCardSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/UserCardSheet.kt @@ -40,7 +40,7 @@ import chat.revolt.BuildConfig import chat.revolt.R import chat.revolt.api.RevoltAPI import chat.revolt.api.schemas.User -import chat.revolt.components.profile.UserCard +import chat.revolt.composables.profile.UserCard import chat.revolt.internals.Platform import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt index 753329e7..ddc86376 100644 --- a/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt @@ -46,15 +46,15 @@ import chat.revolt.api.internals.solidColor import chat.revolt.api.routes.user.fetchUserProfile import chat.revolt.api.schemas.Profile import chat.revolt.api.settings.FeatureFlags -import chat.revolt.components.chat.RoleListEntry -import chat.revolt.components.chat.UserBadgeList -import chat.revolt.components.chat.UserBadgeRow -import chat.revolt.components.generic.NonIdealState -import chat.revolt.components.generic.UserAvatar -import chat.revolt.components.markdown.RichMarkdown -import chat.revolt.components.screens.settings.RawUserOverview -import chat.revolt.components.screens.settings.UserButtons -import chat.revolt.components.sheets.SheetTile +import chat.revolt.composables.chat.RoleListEntry +import chat.revolt.composables.chat.UserBadgeList +import chat.revolt.composables.chat.UserBadgeRow +import chat.revolt.composables.generic.NonIdealState +import chat.revolt.composables.generic.UserAvatar +import chat.revolt.composables.markdown.RichMarkdown +import chat.revolt.composables.screens.settings.RawUserOverview +import chat.revolt.composables.screens.settings.UserButtons +import chat.revolt.composables.sheets.SheetTile import kotlinx.datetime.Instant @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/revolt/sheets/spark/SwipeToReplySparkSheet.kt b/app/src/main/java/chat/revolt/sheets/spark/SwipeToReplySparkSheet.kt index b526ce21..3e9ca780 100644 --- a/app/src/main/java/chat/revolt/sheets/spark/SwipeToReplySparkSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/spark/SwipeToReplySparkSheet.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import chat.revolt.R -import chat.revolt.components.vectorassets.SwipeToReplySpark +import chat.revolt.composables.vectorassets.SwipeToReplySpark @Composable fun SwipeToReplySparkSheet(