RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

style: rename .components to .composables 

Compose convention is to say composables; previous name is a holdover from React

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2025-04-17 00:58:20 +02:00
parent c88391e5f0
commit 5f70da854e
119 changed files with 238 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/chat/revolt/activities/InviteActivity.kt
View File

@ -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

2
app/src/main/java/chat/revolt/activities/MainActivity.kt
View File

@ -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

12
app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/chat/DateDivider.kt → app/src/main/java/chat/revolt/composables/chat/DateDivider.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.chat
package chat.revolt.composables.chat
import android.icu.text.DateFormat
import android.text.format.DateUtils

2
app/src/main/java/chat/revolt/components/chat/DisconnectedNotice.kt → app/src/main/java/chat/revolt/composables/chat/DisconnectedNotice.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.chat
package chat.revolt.composables.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable

8
app/src/main/java/chat/revolt/components/chat/Embed.kt → app/src/main/java/chat/revolt/composables/chat/Embed.kt
View File

@ -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

4
app/src/main/java/chat/revolt/components/chat/InReplyTo.kt → app/src/main/java/chat/revolt/composables/chat/InReplyTo.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/chat/InlineBadge.kt → app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt
View File

@ -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

6
app/src/main/java/chat/revolt/components/chat/MemberListItem.kt → app/src/main/java/chat/revolt/composables/chat/MemberListItem.kt
View File

@ -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

12
app/src/main/java/chat/revolt/components/chat/Message.kt → app/src/main/java/chat/revolt/composables/chat/Message.kt
View File

@ -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

6
app/src/main/java/chat/revolt/components/chat/MessageAttachment.kt → app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt
View File

@ -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) {

8
app/src/main/java/chat/revolt/components/chat/MessageField.kt → app/src/main/java/chat/revolt/composables/chat/MessageField.kt
View File

@ -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

4
app/src/main/java/chat/revolt/components/chat/Reaction.kt → app/src/main/java/chat/revolt/composables/chat/Reaction.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/chat/RoleChip.kt → app/src/main/java/chat/revolt/composables/chat/RoleChip.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/chat/RoleListEntry.kt → app/src/main/java/chat/revolt/composables/chat/RoleListEntry.kt
View File

@ -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

4
app/src/main/java/chat/revolt/components/chat/SystemMessage.kt → app/src/main/java/chat/revolt/composables/chat/SystemMessage.kt
View File

@ -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"),

2
app/src/main/java/chat/revolt/components/chat/TimeRift.kt → app/src/main/java/chat/revolt/composables/chat/TimeRift.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/chat/UserBadgeList.kt → app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/chat/specialembeds/AppleMusicEmbed.kt → app/src/main/java/chat/revolt/composables/chat/specialembeds/AppleMusicEmbed.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.chat.specialembeds
package chat.revolt.composables.chat.specialembeds
import android.annotation.SuppressLint
import android.net.Uri

2
app/src/main/java/chat/revolt/components/chat/specialembeds/SpecialEmbedSwitch.kt → app/src/main/java/chat/revolt/composables/chat/specialembeds/SpecialEmbedSwitch.kt
View File

@ -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

6
app/src/main/java/chat/revolt/components/chat/specialembeds/YouTubeEmbed.kt → app/src/main/java/chat/revolt/composables/chat/specialembeds/YouTubeEmbed.kt
View File

@ -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")

6
app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt → app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/CollapsibleCard.kt → app/src/main/java/chat/revolt/composables/generic/CollapsibleCard.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.generic
package chat.revolt.composables.generic
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.clickable

2
app/src/main/java/chat/revolt/components/generic/DobPicker.kt → app/src/main/java/chat/revolt/composables/generic/DobPicker.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/FormTextField.kt → app/src/main/java/chat/revolt/composables/generic/FormTextField.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/GradientStopEditor.kt → app/src/main/java/chat/revolt/composables/generic/GradientStopEditor.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.generic
package chat.revolt.composables.generic
import android.annotation.SuppressLint
import androidx.compose.foundation.Canvas

2
app/src/main/java/chat/revolt/components/generic/HealthAlert.kt → app/src/main/java/chat/revolt/composables/generic/HealthAlert.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.generic
package chat.revolt.composables.generic
import androidx.browser.customtabs.CustomTabColorSchemeParams
import androidx.browser.customtabs.CustomTabsIntent

2
app/src/main/java/chat/revolt/components/generic/IconPlaceholder.kt → app/src/main/java/chat/revolt/composables/generic/IconPlaceholder.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/InlineMediaPicker.kt → app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.generic
package chat.revolt.composables.generic
import android.net.Uri
import androidx.activity.compose.rememberLauncherForActivityResult

2
app/src/main/java/chat/revolt/components/generic/ListHeader.kt → app/src/main/java/chat/revolt/composables/generic/ListHeader.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/NonIdealState.kt → app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/PrimaryTabs.kt → app/src/main/java/chat/revolt/composables/generic/PrimaryTabs.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/RadioItem.kt → app/src/main/java/chat/revolt/composables/generic/RadioItem.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/RemoteImage.kt → app/src/main/java/chat/revolt/composables/generic/RemoteImage.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.generic
package chat.revolt.composables.generic
import android.util.DisplayMetrics
import androidx.compose.foundation.layout.height

2
app/src/main/java/chat/revolt/components/generic/SheetButton.kt → app/src/main/java/chat/revolt/composables/generic/SheetButton.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/SheetHeaderPadding.kt → app/src/main/java/chat/revolt/composables/generic/SheetHeaderPadding.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/generic/UserAvatar.kt → app/src/main/java/chat/revolt/composables/generic/UserAvatar.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.generic
package chat.revolt.composables.generic
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background

2
app/src/main/java/chat/revolt/components/generic/Weblink.kt → app/src/main/java/chat/revolt/composables/generic/Weblink.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.generic
package chat.revolt.composables.generic
import android.net.Uri
import androidx.browser.customtabs.CustomTabsIntent

2
app/src/main/java/chat/revolt/components/markdown/MarkdownCodeBlock.kt → app/src/main/java/chat/revolt/composables/markdown/MarkdownCodeBlock.kt
View File

@ -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

6
app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt → app/src/main/java/chat/revolt/composables/markdown/MarkdownText.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/markdown/MarkdownTree.kt → app/src/main/java/chat/revolt/composables/markdown/MarkdownTree.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/markdown/RichMarkdown.kt → app/src/main/java/chat/revolt/composables/markdown/RichMarkdown.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/media/AudioPlayer.kt → app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.media
package chat.revolt.composables.media
import android.content.ContentValues
import android.content.Intent

2
app/src/main/java/chat/revolt/components/media/MediaPickerGateway.kt → app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.media
package chat.revolt.composables.media
import androidx.compose.foundation.background
import androidx.compose.foundation.border

4
app/src/main/java/chat/revolt/components/profile/UserCard.kt → app/src/main/java/chat/revolt/composables/profile/UserCard.kt
View File

@ -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

4
app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt → app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/screens/chat/ChannelHeader.kt → app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/screens/chat/ChannelIcon.kt → app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt
View File

@ -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

8
app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt → app/src/main/java/chat/revolt/composables/screens/chat/ChannelSheetHeader.kt
View File

@ -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

10
app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt → app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt
View File

@ -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 {

4
app/src/main/java/chat/revolt/components/screens/chat/TypingIndicator.kt → app/src/main/java/chat/revolt/composables/screens/chat/TypingIndicator.kt
View File

@ -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<String>, amount: Int = 3, serverId: String?) {

4
app/src/main/java/chat/revolt/components/screens/chat/atoms/RegularMessage.kt → app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt
View File

@ -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

14
app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt → app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/screens/services/DiscoverView.kt → app/src/main/java/chat/revolt/composables/screens/services/DiscoverView.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.screens.services
package chat.revolt.composables.screens.services
import android.annotation.SuppressLint
import android.content.Intent

2
app/src/main/java/chat/revolt/components/screens/settings/AttributionItem.kt → app/src/main/java/chat/revolt/composables/screens/settings/AttributionItem.kt
View File

@ -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

6
app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt → app/src/main/java/chat/revolt/composables/screens/settings/ServerOverview.kt
View File

@ -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) {

2
app/src/main/java/chat/revolt/components/screens/settings/UserButtons.kt → app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt
View File

@ -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

8
app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt → app/src/main/java/chat/revolt/composables/screens/settings/UserOverview.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/screens/settings/appearance/ColourChip.kt → app/src/main/java/chat/revolt/composables/screens/settings/appearance/ColourChip.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/screens/settings/appearance/CornerRadiusPicker.kt → app/src/main/java/chat/revolt/composables/screens/settings/appearance/CornerRadiusPicker.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/screens/splash/DisconnectedScreen.kt → app/src/main/java/chat/revolt/composables/screens/splash/DisconnectedScreen.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/screens/voice/VoiceChannelOverlay.kt → app/src/main/java/chat/revolt/composables/screens/voice/VoiceChannelOverlay.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.screens.voice
package chat.revolt.composables.screens.voice
import android.content.Context
import android.util.DisplayMetrics

2
app/src/main/java/chat/revolt/components/settings/SettingsHintBanner.kt → app/src/main/java/chat/revolt/composables/settings/SettingsHintBanner.kt
View File

@ -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

6
app/src/main/java/chat/revolt/components/settings/profile/StatusPicker.kt → app/src/main/java/chat/revolt/composables/settings/profile/StatusPicker.kt
View File

@ -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) {

2
app/src/main/java/chat/revolt/components/settings/sessions/SessionItem.kt → app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/sheets/SheetTile.kt → app/src/main/java/chat/revolt/composables/sheets/SheetTile.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.sheets
package chat.revolt.composables.sheets
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable

2
app/src/main/java/chat/revolt/components/skeletons/MessageSkeleton.kt → app/src/main/java/chat/revolt/composables/skeletons/MessageSkeleton.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/skeletons/SkeletonGlobals.kt → app/src/main/java/chat/revolt/composables/skeletons/SkeletonGlobals.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.skeletons
package chat.revolt.composables.skeletons
import androidx.compose.material3.LocalContentColor
import androidx.compose.runtime.Composable

2
app/src/main/java/chat/revolt/components/skeletons/UserOverviewSkeleton.kt → app/src/main/java/chat/revolt/composables/skeletons/UserOverviewSkeleton.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/utils/ConditionalConsumptionPointerInput.kt → app/src/main/java/chat/revolt/composables/utils/ConditionalConsumptionPointerInput.kt
View File

@ -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

2
app/src/main/java/chat/revolt/components/utils/SizeMeasured.kt → app/src/main/java/chat/revolt/composables/utils/SizeMeasured.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.utils
package chat.revolt.composables.utils
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier

2
app/src/main/java/chat/revolt/components/vectorassets/SwipeToReplySpark.kt → app/src/main/java/chat/revolt/composables/vectorassets/SwipeToReplySpark.kt
View File

@ -1,4 +1,4 @@
package chat.revolt.components.vectorassets
package chat.revolt.composables.vectorassets
import androidx.compose.foundation.Image
import androidx.compose.material3.MaterialTheme

2
app/src/main/java/chat/revolt/internals/Autocomplete.kt
View File

@ -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()

8
app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt
View File

@ -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

2
app/src/main/java/chat/revolt/screens/DefaultDestinationScreen.kt
View File

@ -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

3
app/src/main/java/chat/revolt/screens/about/AboutScreen.kt
View File

@ -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

2
app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt
View File

@ -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

6
app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
View File

@ -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

4
app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt
View File

@ -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 {

4
app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt
View File

@ -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 {

4
app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt
View File

@ -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 {

4
app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt
View File

@ -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

6
app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt
View File

@ -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

51
app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
View File

@ -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 {

4
app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt
View File

@ -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

2
app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt
View File

@ -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

2
app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt
View File

@ -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

2
app/src/main/java/chat/revolt/screens/labs/ui/sandbox/GradientEditorSandbox.kt
View File

@ -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

4
app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt
View File

@ -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)

4
app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
View File

@ -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

4
app/src/main/java/chat/revolt/screens/login/MfaScreen.kt
View File

@ -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

4
app/src/main/java/chat/revolt/screens/login2/InitScreen.kt
View File

@ -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

2
app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt
View File

@ -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

2
app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt
View File

@ -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

2
app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt
View File

@ -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

2
app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt
View File

@ -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

6
app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
View File

@ -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

4
app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt
View File

@ -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() {

4
app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt
View File

@ -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

6
app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt
View File

@ -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() {

Some files were not shown because too many files have changed in this diff Show More