diff --git a/README.md b/README.md index 7dd0e77a..0f9a792c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ API. | Module | Package | Description | |--------|---------------|----------------------| -| `:app` | `chat.revolt` | The main app module. | +| `:app` | `chat.peptide` | The main app module. | The API library is part of the `app` module, and is not intended to be used as a standalone library, as it makes liberal use of Android-specific APIs for reactivity. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 42bd9393..43090c1b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -153,7 +153,7 @@ android { androidResources { generateLocaleConfig = true } - namespace = "chat.revolt" + namespace = "chat.peptide" externalNativeBuild { cmake { path(file("src/main/cpp/CMakeLists.txt")) @@ -337,7 +337,7 @@ aboutLibraries { sqldelight { databases { create("Database") { - packageName.set("chat.revolt.persistence") + packageName.set("chat.peptide.persistence") } } } \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 217b004e..472788cc 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -109,4 +109,4 @@ public ; } --keep class chat.revolt.ndk.AstNode { *; } \ No newline at end of file +-keep class chat.peptide.ndk.AstNode { *; } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2b273b0d..c8e713f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -90,7 +90,7 @@ - + diff --git a/app/src/main/assets/README_APP_LINKS.md b/app/src/main/assets/README_APP_LINKS.md index e73a9197..0cfb5d39 100644 --- a/app/src/main/assets/README_APP_LINKS.md +++ b/app/src/main/assets/README_APP_LINKS.md @@ -32,7 +32,7 @@ Open the `assetlinks.json` file in this directory and replace the placeholder wi "relation": ["delegate_permission/common.handle_all_urls"], "target": { "namespace": "android_app", - "package_name": "chat.revolt", + "package_name": "chat.peptide", "sha256_cert_fingerprints": [ "YOUR_SHA256_FINGERPRINT_HERE" ] @@ -56,7 +56,7 @@ Make sure the file is accessible via HTTPS and returns with Content-Type: applic Use the Android Debug Bridge (ADB) to test your App Links: ```bash -adb shell am start -a android.intent.action.VIEW -d "https://revolt.chat/channels/CHANNEL_ID" chat.revolt +adb shell am start -a android.intent.action.VIEW -d "https://revolt.chat/channels/CHANNEL_ID" chat.peptide ``` ## Troubleshooting diff --git a/app/src/main/cpp/stendal/stendal.cpp b/app/src/main/cpp/stendal/stendal.cpp index 8d033221..2e27c8c0 100644 --- a/app/src/main/cpp/stendal/stendal.cpp +++ b/app/src/main/cpp/stendal/stendal.cpp @@ -32,7 +32,7 @@ namespace Stendal { constructArrayListMethod = env->GetMethodID(localArrayListClass, "", "(I)V"); addArrayListMethod = env->GetMethodID(localArrayListClass, "add", "(Ljava/lang/Object;)Z"); - jclass localAstNodeClass = env->FindClass("chat/revolt/ndk/AstNode"); + jclass localAstNodeClass = env->FindClass("chat/peptide/ndk/AstNode"); astNodeClass = (jclass) env->NewGlobalRef(localAstNodeClass); astNodeConstructor = env->GetMethodID(localAstNodeClass, "", STENDAL_ASTNODE_CONSTRUCTOR_SIGNATURE); @@ -141,12 +141,12 @@ namespace Stendal { extern "C" JNIEXPORT void JNICALL -Java_chat_revolt_ndk_Stendal_init(JNIEnv *env, [[maybe_unused]] jobject thiz) { +Java_chat_peptide_ndk_Stendal_init(JNIEnv *env, [[maybe_unused]] jobject thiz) { Stendal::init(env); } extern "C" JNIEXPORT jobject JNICALL -Java_chat_revolt_ndk_Stendal_render(JNIEnv *env, [[maybe_unused]] jobject thiz, jstring input) { +Java_chat_peptide_ndk_Stendal_render(JNIEnv *env, [[maybe_unused]] jobject thiz, jstring input) { const char *inputStr = env->GetStringUTFChars(input, nullptr); cmark_node *doc = cmark_parse_document(inputStr, strlen(inputStr), CMARK_OPT_DEFAULT | CMARK_OPT_HARDBREAKS | diff --git a/app/src/main/java/chat/revolt/RevoltApplication.kt b/app/src/main/java/chat/peptide/RevoltApplication.kt similarity index 89% rename from app/src/main/java/chat/revolt/RevoltApplication.kt rename to app/src/main/java/chat/peptide/RevoltApplication.kt index 0e7b1254..2479e01d 100644 --- a/app/src/main/java/chat/revolt/RevoltApplication.kt +++ b/app/src/main/java/chat/peptide/RevoltApplication.kt @@ -1,8 +1,8 @@ -package chat.revolt +package chat.peptide import android.app.Application -import chat.revolt.api.RevoltHttp -import chat.revolt.persistence.KVStorage +import chat.peptide.api.RevoltHttp +import chat.peptide.persistence.KVStorage import com.google.android.material.color.DynamicColors import dagger.hilt.android.HiltAndroidApp import logcat.AndroidLogcatLogger diff --git a/app/src/main/java/chat/revolt/activities/DeepLinkActivity.kt b/app/src/main/java/chat/peptide/activities/DeepLinkActivity.kt similarity index 98% rename from app/src/main/java/chat/revolt/activities/DeepLinkActivity.kt rename to app/src/main/java/chat/peptide/activities/DeepLinkActivity.kt index 99e27f01..22dc239d 100644 --- a/app/src/main/java/chat/revolt/activities/DeepLinkActivity.kt +++ b/app/src/main/java/chat/peptide/activities/DeepLinkActivity.kt @@ -1,4 +1,4 @@ -package chat.revolt.activities +package chat.peptide.activities import android.content.Intent import android.net.Uri @@ -6,8 +6,8 @@ import android.os.Bundle import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope -import chat.revolt.persistence.KVStorage -import chat.revolt.utils.DeepLinkUtils +import chat.peptide.persistence.KVStorage +import chat.peptide.utils.DeepLinkUtils import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/chat/revolt/activities/InviteActivity.kt b/app/src/main/java/chat/peptide/activities/InviteActivity.kt similarity index 95% rename from app/src/main/java/chat/revolt/activities/InviteActivity.kt rename to app/src/main/java/chat/peptide/activities/InviteActivity.kt index 05be1435..01d3012c 100644 --- a/app/src/main/java/chat/revolt/activities/InviteActivity.kt +++ b/app/src/main/java/chat/peptide/activities/InviteActivity.kt @@ -1,4 +1,4 @@ -package chat.revolt.activities +package chat.peptide.activities import android.os.Bundle import androidx.activity.ComponentActivity @@ -46,19 +46,19 @@ import androidx.core.view.WindowCompat import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltError -import chat.revolt.api.routes.invites.fetchInviteByCode -import chat.revolt.api.routes.invites.joinInviteByCode -import chat.revolt.api.schemas.Invite -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.composables.generic.IconPlaceholder -import chat.revolt.composables.generic.RemoteImage -import chat.revolt.ui.theme.RevoltTheme +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltError +import chat.peptide.api.routes.invites.fetchInviteByCode +import chat.peptide.api.routes.invites.joinInviteByCode +import chat.peptide.api.schemas.Invite +import chat.peptide.api.schemas.InviteJoined +import chat.peptide.api.schemas.RsResult +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.api.settings.SyncedSettings +import chat.peptide.composables.generic.IconPlaceholder +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.ui.theme.RevoltTheme import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi import com.bumptech.glide.integration.compose.GlideImage import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/activities/MainActivity.kt b/app/src/main/java/chat/peptide/activities/MainActivity.kt similarity index 92% rename from app/src/main/java/chat/revolt/activities/MainActivity.kt rename to app/src/main/java/chat/peptide/activities/MainActivity.kt index c8215eca..eeedf7a2 100644 --- a/app/src/main/java/chat/revolt/activities/MainActivity.kt +++ b/app/src/main/java/chat/peptide/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package chat.revolt.activities +package chat.peptide.activities import android.annotation.SuppressLint import android.content.Context @@ -73,62 +73,62 @@ import androidx.lifecycle.viewModelScope import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import chat.revolt.BuildConfig -import chat.revolt.R -import chat.revolt.RevoltApplication -import chat.revolt.api.ApplicationPlatform -import chat.revolt.api.HitRateLimitException -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltAPI.setPlatform -import chat.revolt.api.RevoltHttp -import chat.revolt.api.UrlsStorageKeys -import chat.revolt.api.api -import chat.revolt.api.routes.microservices.geo.queryGeo -import chat.revolt.api.routes.microservices.health.healthCheck -import chat.revolt.api.routes.onboard.needsOnboarding -import chat.revolt.api.schemas.HealthNotice -import chat.revolt.api.settings.Experiments -import chat.revolt.api.settings.GeoStateProvider -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.api.settings.SyncedSettings -import chat.revolt.composables.generic.HealthAlert -import chat.revolt.composables.voice.VoicePermissionSwitch -import chat.revolt.composables.voice.VoiceSheet -import chat.revolt.material.EasingTokens -import chat.revolt.ndk.NativeLibraries -import chat.revolt.persistence.KVStorage -import chat.revolt.screens.DefaultDestinationScreen -import chat.revolt.screens.about.AboutScreen -import chat.revolt.screens.about.AttributionScreen -import chat.revolt.screens.chat.ChatRouterScreen -import chat.revolt.screens.chat.views.channel.ChannelScreen -import chat.revolt.screens.chooseplatform.ChoosePlatformScreen -import chat.revolt.screens.create.CreateGroupScreen -import chat.revolt.screens.labs.LabsRootScreen -import chat.revolt.screens.login.LoginGreetingScreen -import chat.revolt.screens.login.LoginScreen -import chat.revolt.screens.login.MfaScreen -import chat.revolt.screens.login2.InitScreen -import chat.revolt.screens.main.MainScreen -import chat.revolt.screens.register.OnboardingScreen -import chat.revolt.screens.register.RegisterDetailsScreen -import chat.revolt.screens.register.RegisterGreetingScreen -import chat.revolt.screens.register.RegisterVerifyScreen -import chat.revolt.screens.services.DiscoverScreen -import chat.revolt.screens.settings.AppearanceSettingsScreen -import chat.revolt.screens.settings.ChangelogsSettingsScreen -import chat.revolt.screens.settings.ChatSettingsScreen -import chat.revolt.screens.settings.DebugSettingsScreen -import chat.revolt.screens.settings.ExperimentsSettingsScreen -import chat.revolt.screens.settings.LanguagePickerSettingsScreen -import chat.revolt.screens.settings.ProfileSettingsScreen -import chat.revolt.screens.settings.SessionSettingsScreen -import chat.revolt.screens.settings.SettingsScreen -import chat.revolt.screens.settings.channel.ChannelSettingsHome -import chat.revolt.screens.settings.channel.ChannelSettingsOverview -import chat.revolt.screens.settings.channel.ChannelSettingsPermissions -import chat.revolt.ui.theme.RevoltTheme -import chat.revolt.utils.DeepLinkHandler +import chat.peptide.BuildConfig +import chat.peptide.R +import chat.peptide.RevoltApplication +import chat.peptide.api.ApplicationPlatform +import chat.peptide.api.HitRateLimitException +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltAPI.setPlatform +import chat.peptide.api.RevoltHttp +import chat.peptide.api.UrlsStorageKeys +import chat.peptide.api.api +import chat.peptide.api.routes.microservices.geo.queryGeo +import chat.peptide.api.routes.microservices.health.healthCheck +import chat.peptide.api.routes.onboard.needsOnboarding +import chat.peptide.api.schemas.HealthNotice +import chat.peptide.api.settings.Experiments +import chat.peptide.api.settings.GeoStateProvider +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.api.settings.SyncedSettings +import chat.peptide.composables.generic.HealthAlert +import chat.peptide.composables.voice.VoicePermissionSwitch +import chat.peptide.composables.voice.VoiceSheet +import chat.peptide.material.EasingTokens +import chat.peptide.ndk.NativeLibraries +import chat.peptide.persistence.KVStorage +import chat.peptide.screens.DefaultDestinationScreen +import chat.peptide.screens.about.AboutScreen +import chat.peptide.screens.about.AttributionScreen +import chat.peptide.screens.chat.ChatRouterScreen +import chat.peptide.screens.chat.views.channel.ChannelScreen +import chat.peptide.screens.chooseplatform.ChoosePlatformScreen +import chat.peptide.screens.create.CreateGroupScreen +import chat.peptide.screens.labs.LabsRootScreen +import chat.peptide.screens.login.LoginGreetingScreen +import chat.peptide.screens.login.LoginScreen +import chat.peptide.screens.login.MfaScreen +import chat.peptide.screens.login2.InitScreen +import chat.peptide.screens.main.MainScreen +import chat.peptide.screens.register.OnboardingScreen +import chat.peptide.screens.register.RegisterDetailsScreen +import chat.peptide.screens.register.RegisterGreetingScreen +import chat.peptide.screens.register.RegisterVerifyScreen +import chat.peptide.screens.services.DiscoverScreen +import chat.peptide.screens.settings.AppearanceSettingsScreen +import chat.peptide.screens.settings.ChangelogsSettingsScreen +import chat.peptide.screens.settings.ChatSettingsScreen +import chat.peptide.screens.settings.DebugSettingsScreen +import chat.peptide.screens.settings.ExperimentsSettingsScreen +import chat.peptide.screens.settings.LanguagePickerSettingsScreen +import chat.peptide.screens.settings.ProfileSettingsScreen +import chat.peptide.screens.settings.SessionSettingsScreen +import chat.peptide.screens.settings.SettingsScreen +import chat.peptide.screens.settings.channel.ChannelSettingsHome +import chat.peptide.screens.settings.channel.ChannelSettingsOverview +import chat.peptide.screens.settings.channel.ChannelSettingsPermissions +import chat.peptide.ui.theme.RevoltTheme +import chat.peptide.utils.DeepLinkHandler import com.google.android.material.color.DynamicColors import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt b/app/src/main/java/chat/peptide/activities/ShareTargetActivity.kt similarity index 94% rename from app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt rename to app/src/main/java/chat/peptide/activities/ShareTargetActivity.kt index e7d6e611..ee3584af 100644 --- a/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt +++ b/app/src/main/java/chat/peptide/activities/ShareTargetActivity.kt @@ -1,4 +1,4 @@ -package chat.revolt.activities +package chat.peptide.activities import android.content.Intent import android.net.Uri @@ -50,25 +50,25 @@ import androidx.documentfile.provider.DocumentFile import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.ChannelUtils -import chat.revolt.api.routes.channel.sendMessage -import chat.revolt.api.routes.microservices.autumn.FileArgs -import chat.revolt.api.routes.microservices.autumn.MAX_ATTACHMENTS_PER_MESSAGE -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.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 +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.ChannelUtils +import chat.peptide.api.routes.channel.sendMessage +import chat.peptide.api.routes.microservices.autumn.FileArgs +import chat.peptide.api.routes.microservices.autumn.MAX_ATTACHMENTS_PER_MESSAGE +import chat.peptide.api.routes.microservices.autumn.uploadToAutumn +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.api.settings.SyncedSettings +import chat.peptide.composables.chat.MessageField +import chat.peptide.composables.emoji.EmojiPicker +import chat.peptide.composables.screens.chat.AttachmentManager +import chat.peptide.composables.screens.chat.drawer.ChannelItem +import chat.peptide.composables.screens.chat.drawer.ChannelItemIconType +import chat.peptide.composables.screens.chat.drawer.DMOrGroupItem +import chat.peptide.persistence.KVStorage +import chat.peptide.screens.chat.views.channel.ChannelScreenActivePane +import chat.peptide.ui.theme.RevoltTheme import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel import io.ktor.http.ContentType diff --git a/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt b/app/src/main/java/chat/peptide/activities/media/ImageViewActivity.kt similarity index 96% rename from app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt rename to app/src/main/java/chat/peptide/activities/media/ImageViewActivity.kt index c339271b..ec6fd913 100644 --- a/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt +++ b/app/src/main/java/chat/peptide/activities/media/ImageViewActivity.kt @@ -1,4 +1,4 @@ -package chat.revolt.activities.media +package chat.peptide.activities.media import android.content.ContentValues import android.content.Intent @@ -40,14 +40,14 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.core.view.WindowCompat -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltHttp -import chat.revolt.api.schemas.AutumnResource -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.api.settings.SyncedSettings -import chat.revolt.providers.getAttachmentContentUri -import chat.revolt.ui.theme.RevoltTheme +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltHttp +import chat.peptide.api.schemas.AutumnResource +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.api.settings.SyncedSettings +import chat.peptide.providers.getAttachmentContentUri +import chat.peptide.ui.theme.RevoltTheme import io.ktor.client.request.get import io.ktor.client.statement.readBytes import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt b/app/src/main/java/chat/peptide/activities/media/VideoViewActivity.kt similarity index 96% rename from app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt rename to app/src/main/java/chat/peptide/activities/media/VideoViewActivity.kt index d4ca85cd..c1ce0f27 100644 --- a/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt +++ b/app/src/main/java/chat/peptide/activities/media/VideoViewActivity.kt @@ -1,4 +1,4 @@ -package chat.revolt.activities.media +package chat.peptide.activities.media import android.content.ContentValues import android.content.Intent @@ -18,12 +18,12 @@ import androidx.fragment.app.FragmentActivity import androidx.lifecycle.lifecycleScope import androidx.media3.common.MediaItem import androidx.media3.exoplayer.ExoPlayer -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltHttp -import chat.revolt.api.schemas.AutumnResource -import chat.revolt.databinding.ActivityVideoplayerBinding -import chat.revolt.providers.getAttachmentContentUri +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltHttp +import chat.peptide.api.schemas.AutumnResource +import chat.peptide.databinding.ActivityVideoplayerBinding +import chat.peptide.providers.getAttachmentContentUri import com.google.android.material.color.MaterialColors import com.google.android.material.snackbar.Snackbar import io.ktor.client.request.get diff --git a/app/src/main/java/chat/revolt/api/RevoltAPI.kt b/app/src/main/java/chat/peptide/api/RevoltAPI.kt similarity index 94% rename from app/src/main/java/chat/revolt/api/RevoltAPI.kt rename to app/src/main/java/chat/peptide/api/RevoltAPI.kt index 1108362b..0ef75263 100644 --- a/app/src/main/java/chat/revolt/api/RevoltAPI.kt +++ b/app/src/main/java/chat/peptide/api/RevoltAPI.kt @@ -1,26 +1,26 @@ -package chat.revolt.api +package chat.peptide.api import android.os.Handler import android.os.Looper import android.util.Log import androidx.compose.runtime.mutableStateMapOf -import chat.revolt.BuildConfig -import chat.revolt.RevoltApplication -import chat.revolt.api.RevoltAPI.initialize -import chat.revolt.api.internals.Members -import chat.revolt.api.realtime.DisconnectionState -import chat.revolt.api.realtime.RealtimeSocket -import chat.revolt.api.routes.user.fetchSelf -import chat.revolt.api.schemas.AutumnResource -import chat.revolt.api.schemas.ChannelType -import chat.revolt.api.schemas.Emoji -import chat.revolt.api.schemas.Message -import chat.revolt.api.schemas.Server -import chat.revolt.api.schemas.User -import chat.revolt.api.unreads.Unreads -import chat.revolt.getKVStorage -import chat.revolt.persistence.Database -import chat.revolt.persistence.SqlStorage +import chat.peptide.BuildConfig +import chat.peptide.RevoltApplication +import chat.peptide.api.RevoltAPI.initialize +import chat.peptide.api.internals.Members +import chat.peptide.api.realtime.DisconnectionState +import chat.peptide.api.realtime.RealtimeSocket +import chat.peptide.api.routes.user.fetchSelf +import chat.peptide.api.schemas.AutumnResource +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.schemas.Emoji +import chat.peptide.api.schemas.Message +import chat.peptide.api.schemas.Server +import chat.peptide.api.schemas.User +import chat.peptide.api.unreads.Unreads +import chat.peptide.getKVStorage +import chat.peptide.persistence.Database +import chat.peptide.persistence.SqlStorage import com.chuckerteam.chucker.api.ChuckerCollector import com.chuckerteam.chucker.api.ChuckerInterceptor import com.chuckerteam.chucker.api.RetentionManager @@ -52,7 +52,7 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.cbor.Cbor import kotlinx.serialization.json.Json import java.net.SocketException -import chat.revolt.api.schemas.Channel as ChannelSchema +import chat.peptide.api.schemas.Channel as ChannelSchema /** * Enum representing available platforms in the application. diff --git a/app/src/main/java/chat/revolt/api/internals/BrushCompat.kt b/app/src/main/java/chat/peptide/api/internals/BrushCompat.kt similarity index 99% rename from app/src/main/java/chat/revolt/api/internals/BrushCompat.kt rename to app/src/main/java/chat/peptide/api/internals/BrushCompat.kt index 81944a4b..69e02d47 100644 --- a/app/src/main/java/chat/revolt/api/internals/BrushCompat.kt +++ b/app/src/main/java/chat/peptide/api/internals/BrushCompat.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals import android.util.Log import androidx.compose.material3.LocalContentColor @@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.Brush.Companion.linearGradient import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor import androidx.core.graphics.toColorInt -import chat.revolt.api.internals.colour.CSSColours +import chat.peptide.api.internals.colour.CSSColours fun Brush.Companion.solidColor(colour: Color) = SolidColor(colour) diff --git a/app/src/main/java/chat/revolt/api/internals/ChannelUtils.kt b/app/src/main/java/chat/peptide/api/internals/ChannelUtils.kt similarity index 83% rename from app/src/main/java/chat/revolt/api/internals/ChannelUtils.kt rename to app/src/main/java/chat/peptide/api/internals/ChannelUtils.kt index 0e59cacc..cd092842 100644 --- a/app/src/main/java/chat/revolt/api/internals/ChannelUtils.kt +++ b/app/src/main/java/chat/peptide/api/internals/ChannelUtils.kt @@ -1,13 +1,13 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.Channel -import chat.revolt.api.schemas.Server -import chat.revolt.api.schemas.User +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.Server +import chat.peptide.api.schemas.User sealed class CategorisedChannelList { - data class Channel(val channel: chat.revolt.api.schemas.Channel) : CategorisedChannelList() - data class Category(val category: chat.revolt.api.schemas.Category) : CategorisedChannelList() + data class Channel(val channel: chat.peptide.api.schemas.Channel) : CategorisedChannelList() + data class Category(val category: chat.peptide.api.schemas.Category) : CategorisedChannelList() } object ChannelUtils { diff --git a/app/src/main/java/chat/revolt/api/internals/DirectMessages.kt b/app/src/main/java/chat/peptide/api/internals/DirectMessages.kt similarity index 82% rename from app/src/main/java/chat/revolt/api/internals/DirectMessages.kt rename to app/src/main/java/chat/peptide/api/internals/DirectMessages.kt index a0d3009a..fd063096 100644 --- a/app/src/main/java/chat/revolt/api/internals/DirectMessages.kt +++ b/app/src/main/java/chat/peptide/api/internals/DirectMessages.kt @@ -1,9 +1,9 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.SpecialUsers.PLATFORM_MODERATION_USER -import chat.revolt.api.schemas.Channel -import chat.revolt.api.schemas.ChannelType +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.SpecialUsers.PLATFORM_MODERATION_USER +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.ChannelType object DirectMessages { fun unreadDMs(): List { diff --git a/app/src/main/java/chat/revolt/api/internals/Extensions.kt b/app/src/main/java/chat/peptide/api/internals/Extensions.kt similarity index 93% rename from app/src/main/java/chat/revolt/api/internals/Extensions.kt rename to app/src/main/java/chat/peptide/api/internals/Extensions.kt index d2034fb5..8a2ba9a4 100644 --- a/app/src/main/java/chat/revolt/api/internals/Extensions.kt +++ b/app/src/main/java/chat/peptide/api/internals/Extensions.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals import android.content.Context import android.content.ContextWrapper diff --git a/app/src/main/java/chat/revolt/api/internals/FriendRequests.kt b/app/src/main/java/chat/peptide/api/internals/FriendRequests.kt similarity index 89% rename from app/src/main/java/chat/revolt/api/internals/FriendRequests.kt rename to app/src/main/java/chat/peptide/api/internals/FriendRequests.kt index dadad4b3..8195a264 100644 --- a/app/src/main/java/chat/revolt/api/internals/FriendRequests.kt +++ b/app/src/main/java/chat/peptide/api/internals/FriendRequests.kt @@ -1,7 +1,7 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.User +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.User object FriendRequests { fun getIncoming(): List { diff --git a/app/src/main/java/chat/revolt/api/internals/Members.kt b/app/src/main/java/chat/peptide/api/internals/Members.kt similarity index 94% rename from app/src/main/java/chat/revolt/api/internals/Members.kt rename to app/src/main/java/chat/peptide/api/internals/Members.kt index 35903094..a1204a91 100644 --- a/app/src/main/java/chat/revolt/api/internals/Members.kt +++ b/app/src/main/java/chat/peptide/api/internals/Members.kt @@ -1,6 +1,6 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals -import chat.revolt.api.schemas.Member +import chat.peptide.api.schemas.Member class Members { // memberCache (mapping of serverId to userId to member) diff --git a/app/src/main/java/chat/revolt/api/internals/MessageFlag.kt b/app/src/main/java/chat/peptide/api/internals/MessageFlag.kt similarity index 96% rename from app/src/main/java/chat/revolt/api/internals/MessageFlag.kt rename to app/src/main/java/chat/peptide/api/internals/MessageFlag.kt index d4f04445..71c93440 100644 --- a/app/src/main/java/chat/revolt/api/internals/MessageFlag.kt +++ b/app/src/main/java/chat/peptide/api/internals/MessageFlag.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals /** * Flags for messages that can be set to modify their behavior. diff --git a/app/src/main/java/chat/revolt/api/internals/Permissions.kt b/app/src/main/java/chat/peptide/api/internals/Permissions.kt similarity index 98% rename from app/src/main/java/chat/revolt/api/internals/Permissions.kt rename to app/src/main/java/chat/peptide/api/internals/Permissions.kt index 20ff4d08..704318d7 100644 --- a/app/src/main/java/chat/revolt/api/internals/Permissions.kt +++ b/app/src/main/java/chat/peptide/api/internals/Permissions.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals enum class PermissionBit(val value: Long) { // * Generic permissions diff --git a/app/src/main/java/chat/revolt/api/internals/ResourceLocations.kt b/app/src/main/java/chat/peptide/api/internals/ResourceLocations.kt similarity index 68% rename from app/src/main/java/chat/revolt/api/internals/ResourceLocations.kt rename to app/src/main/java/chat/peptide/api/internals/ResourceLocations.kt index 69dbf3f4..18f270b1 100644 --- a/app/src/main/java/chat/revolt/api/internals/ResourceLocations.kt +++ b/app/src/main/java/chat/peptide/api/internals/ResourceLocations.kt @@ -1,8 +1,8 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals -import chat.revolt.api.RevoltAPI -import chat.revolt.api.api -import chat.revolt.api.schemas.User +import chat.peptide.api.RevoltAPI +import chat.peptide.api.api +import chat.peptide.api.schemas.User object ResourceLocations { fun userAvatarUrl(user: User?): String { diff --git a/app/src/main/java/chat/revolt/api/internals/Roles.kt b/app/src/main/java/chat/peptide/api/internals/Roles.kt similarity index 92% rename from app/src/main/java/chat/revolt/api/internals/Roles.kt rename to app/src/main/java/chat/peptide/api/internals/Roles.kt index 4c9e5f2e..481c5b8d 100644 --- a/app/src/main/java/chat/revolt/api/internals/Roles.kt +++ b/app/src/main/java/chat/peptide/api/internals/Roles.kt @@ -1,13 +1,13 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.Channel -import chat.revolt.api.schemas.ChannelType -import chat.revolt.api.schemas.Member -import chat.revolt.api.schemas.PermissionDescription -import chat.revolt.api.schemas.Role -import chat.revolt.api.schemas.Server -import chat.revolt.api.schemas.User +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.schemas.Member +import chat.peptide.api.schemas.PermissionDescription +import chat.peptide.api.schemas.Role +import chat.peptide.api.schemas.Server +import chat.peptide.api.schemas.User import kotlinx.datetime.Clock object Roles { diff --git a/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt b/app/src/main/java/chat/peptide/api/internals/SpecialUsers.kt similarity index 98% rename from app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt rename to app/src/main/java/chat/peptide/api/internals/SpecialUsers.kt index 5ca9eb88..add1eb78 100644 --- a/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt +++ b/app/src/main/java/chat/peptide/api/internals/SpecialUsers.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals import android.content.Context import android.graphics.RuntimeShader diff --git a/app/src/main/java/chat/revolt/api/internals/TextViewCompat.kt b/app/src/main/java/chat/peptide/api/internals/TextViewCompat.kt similarity index 98% rename from app/src/main/java/chat/revolt/api/internals/TextViewCompat.kt rename to app/src/main/java/chat/peptide/api/internals/TextViewCompat.kt index 988f196a..f5265132 100644 --- a/app/src/main/java/chat/revolt/api/internals/TextViewCompat.kt +++ b/app/src/main/java/chat/peptide/api/internals/TextViewCompat.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals import android.graphics.LinearGradient import android.graphics.Shader @@ -6,7 +6,7 @@ import android.util.Log import android.widget.TextView import androidx.compose.ui.graphics.toArgb import androidx.core.graphics.toColorInt -import chat.revolt.api.internals.colour.CSSColours +import chat.peptide.api.internals.colour.CSSColours import com.google.android.material.color.MaterialColors import com.google.android.material.elevation.SurfaceColors diff --git a/app/src/main/java/chat/revolt/api/internals/ThemeCompat.kt b/app/src/main/java/chat/peptide/api/internals/ThemeCompat.kt similarity index 99% rename from app/src/main/java/chat/revolt/api/internals/ThemeCompat.kt rename to app/src/main/java/chat/peptide/api/internals/ThemeCompat.kt index 06107cff..482c3283 100644 --- a/app/src/main/java/chat/revolt/api/internals/ThemeCompat.kt +++ b/app/src/main/java/chat/peptide/api/internals/ThemeCompat.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/revolt/api/internals/ULID.kt b/app/src/main/java/chat/peptide/api/internals/ULID.kt similarity index 99% rename from app/src/main/java/chat/revolt/api/internals/ULID.kt rename to app/src/main/java/chat/peptide/api/internals/ULID.kt index af6bd303..42fed50d 100644 --- a/app/src/main/java/chat/revolt/api/internals/ULID.kt +++ b/app/src/main/java/chat/peptide/api/internals/ULID.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals import kotlin.experimental.and import kotlin.random.Random diff --git a/app/src/main/java/chat/revolt/api/internals/UserQR.kt b/app/src/main/java/chat/peptide/api/internals/UserQR.kt similarity index 94% rename from app/src/main/java/chat/revolt/api/internals/UserQR.kt rename to app/src/main/java/chat/peptide/api/internals/UserQR.kt index 9c3e21ce..a46f00ca 100644 --- a/app/src/main/java/chat/revolt/api/internals/UserQR.kt +++ b/app/src/main/java/chat/peptide/api/internals/UserQR.kt @@ -1,8 +1,8 @@ -package chat.revolt.api.internals +package chat.peptide.api.internals import androidx.core.net.toUri -import chat.revolt.api.RevoltCbor -import chat.revolt.api.schemas.User +import chat.peptide.api.RevoltCbor +import chat.peptide.api.schemas.User import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlin.io.encoding.Base64 diff --git a/app/src/main/java/chat/revolt/api/internals/colour/CSSColours.kt b/app/src/main/java/chat/peptide/api/internals/colour/CSSColours.kt similarity index 99% rename from app/src/main/java/chat/revolt/api/internals/colour/CSSColours.kt rename to app/src/main/java/chat/peptide/api/internals/colour/CSSColours.kt index 67d3748c..bb18b47d 100644 --- a/app/src/main/java/chat/revolt/api/internals/colour/CSSColours.kt +++ b/app/src/main/java/chat/peptide/api/internals/colour/CSSColours.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.internals.colour +package chat.peptide.api.internals.colour import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/chat/revolt/api/realtime/RealtimeSocket.kt b/app/src/main/java/chat/peptide/api/realtime/RealtimeSocket.kt similarity index 93% rename from app/src/main/java/chat/revolt/api/realtime/RealtimeSocket.kt rename to app/src/main/java/chat/peptide/api/realtime/RealtimeSocket.kt index 096643e1..3fff546d 100644 --- a/app/src/main/java/chat/revolt/api/realtime/RealtimeSocket.kt +++ b/app/src/main/java/chat/peptide/api/realtime/RealtimeSocket.kt @@ -1,48 +1,48 @@ -package chat.revolt.api.realtime +package chat.peptide.api.realtime import android.util.Log import androidx.compose.runtime.mutableStateOf -import chat.revolt.RevoltApplication -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.realtime.frames.receivable.AnyFrame -import chat.revolt.api.realtime.frames.receivable.BulkFrame -import chat.revolt.api.realtime.frames.receivable.ChannelAckFrame -import chat.revolt.api.realtime.frames.receivable.ChannelDeleteFrame -import chat.revolt.api.realtime.frames.receivable.ChannelStartTypingFrame -import chat.revolt.api.realtime.frames.receivable.ChannelStopTypingFrame -import chat.revolt.api.realtime.frames.receivable.ChannelUpdateFrame -import chat.revolt.api.realtime.frames.receivable.MessageAppendFrame -import chat.revolt.api.realtime.frames.receivable.MessageDeleteFrame -import chat.revolt.api.realtime.frames.receivable.MessageFrame -import chat.revolt.api.realtime.frames.receivable.MessageReactFrame -import chat.revolt.api.realtime.frames.receivable.MessageUpdateFrame -import chat.revolt.api.realtime.frames.receivable.PongFrame -import chat.revolt.api.realtime.frames.receivable.ReadyFrame -import chat.revolt.api.realtime.frames.receivable.ServerCreateFrame -import chat.revolt.api.realtime.frames.receivable.ServerDeleteFrame -import chat.revolt.api.realtime.frames.receivable.ServerMemberJoinFrame -import chat.revolt.api.realtime.frames.receivable.ServerMemberLeaveFrame -import chat.revolt.api.realtime.frames.receivable.ServerMemberUpdateFrame -import chat.revolt.api.realtime.frames.receivable.ServerRoleDeleteFrame -import chat.revolt.api.realtime.frames.receivable.ServerRoleUpdateFrame -import chat.revolt.api.realtime.frames.receivable.ServerUpdateFrame -import chat.revolt.api.realtime.frames.receivable.UserRelationshipFrame -import chat.revolt.api.realtime.frames.receivable.UserUpdateFrame -import chat.revolt.api.realtime.frames.sendable.AuthorizationFrame -import chat.revolt.api.realtime.frames.sendable.BeginTypingFrame -import chat.revolt.api.realtime.frames.sendable.EndTypingFrame -import chat.revolt.api.realtime.frames.sendable.PingFrame -import chat.revolt.api.routes.server.fetchMember -import chat.revolt.api.schemas.Channel -import chat.revolt.api.schemas.ChannelType -import chat.revolt.api.schemas.Role -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.api.settings.SyncedSettings -import chat.revolt.c2dm.ChannelRegistrator -import chat.revolt.persistence.Database -import chat.revolt.persistence.SqlStorage +import chat.peptide.RevoltApplication +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.realtime.frames.receivable.AnyFrame +import chat.peptide.api.realtime.frames.receivable.BulkFrame +import chat.peptide.api.realtime.frames.receivable.ChannelAckFrame +import chat.peptide.api.realtime.frames.receivable.ChannelDeleteFrame +import chat.peptide.api.realtime.frames.receivable.ChannelStartTypingFrame +import chat.peptide.api.realtime.frames.receivable.ChannelStopTypingFrame +import chat.peptide.api.realtime.frames.receivable.ChannelUpdateFrame +import chat.peptide.api.realtime.frames.receivable.MessageAppendFrame +import chat.peptide.api.realtime.frames.receivable.MessageDeleteFrame +import chat.peptide.api.realtime.frames.receivable.MessageFrame +import chat.peptide.api.realtime.frames.receivable.MessageReactFrame +import chat.peptide.api.realtime.frames.receivable.MessageUpdateFrame +import chat.peptide.api.realtime.frames.receivable.PongFrame +import chat.peptide.api.realtime.frames.receivable.ReadyFrame +import chat.peptide.api.realtime.frames.receivable.ServerCreateFrame +import chat.peptide.api.realtime.frames.receivable.ServerDeleteFrame +import chat.peptide.api.realtime.frames.receivable.ServerMemberJoinFrame +import chat.peptide.api.realtime.frames.receivable.ServerMemberLeaveFrame +import chat.peptide.api.realtime.frames.receivable.ServerMemberUpdateFrame +import chat.peptide.api.realtime.frames.receivable.ServerRoleDeleteFrame +import chat.peptide.api.realtime.frames.receivable.ServerRoleUpdateFrame +import chat.peptide.api.realtime.frames.receivable.ServerUpdateFrame +import chat.peptide.api.realtime.frames.receivable.UserRelationshipFrame +import chat.peptide.api.realtime.frames.receivable.UserUpdateFrame +import chat.peptide.api.realtime.frames.sendable.AuthorizationFrame +import chat.peptide.api.realtime.frames.sendable.BeginTypingFrame +import chat.peptide.api.realtime.frames.sendable.EndTypingFrame +import chat.peptide.api.realtime.frames.sendable.PingFrame +import chat.peptide.api.routes.server.fetchMember +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.schemas.Role +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.api.settings.SyncedSettings +import chat.peptide.c2dm.ChannelRegistrator +import chat.peptide.persistence.Database +import chat.peptide.persistence.SqlStorage import io.ktor.client.plugins.websocket.ws import io.ktor.websocket.CloseReason import io.ktor.websocket.Frame diff --git a/app/src/main/java/chat/revolt/api/realtime/frames/receivable/ReceivableFrames.kt b/app/src/main/java/chat/peptide/api/realtime/frames/receivable/ReceivableFrames.kt similarity index 91% rename from app/src/main/java/chat/revolt/api/realtime/frames/receivable/ReceivableFrames.kt rename to app/src/main/java/chat/peptide/api/realtime/frames/receivable/ReceivableFrames.kt index a6d7dbdc..1a878889 100644 --- a/app/src/main/java/chat/revolt/api/realtime/frames/receivable/ReceivableFrames.kt +++ b/app/src/main/java/chat/peptide/api/realtime/frames/receivable/ReceivableFrames.kt @@ -1,15 +1,15 @@ -package chat.revolt.api.realtime.frames.receivable +package chat.peptide.api.realtime.frames.receivable -import chat.revolt.api.schemas.Channel -import chat.revolt.api.schemas.ChannelVoiceState -import chat.revolt.api.schemas.Embed -import chat.revolt.api.schemas.Emoji -import chat.revolt.api.schemas.Member -import chat.revolt.api.schemas.Message -import chat.revolt.api.schemas.Role -import chat.revolt.api.schemas.Server -import chat.revolt.api.schemas.ServerUserChoice -import chat.revolt.api.schemas.User +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.ChannelVoiceState +import chat.peptide.api.schemas.Embed +import chat.peptide.api.schemas.Emoji +import chat.peptide.api.schemas.Member +import chat.peptide.api.schemas.Message +import chat.peptide.api.schemas.Role +import chat.peptide.api.schemas.Server +import chat.peptide.api.schemas.ServerUserChoice +import chat.peptide.api.schemas.User import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonObject diff --git a/app/src/main/java/chat/revolt/api/realtime/frames/sendable/SendableFrames.kt b/app/src/main/java/chat/peptide/api/realtime/frames/sendable/SendableFrames.kt similarity index 88% rename from app/src/main/java/chat/revolt/api/realtime/frames/sendable/SendableFrames.kt rename to app/src/main/java/chat/peptide/api/realtime/frames/sendable/SendableFrames.kt index 527f01ca..72be1e90 100644 --- a/app/src/main/java/chat/revolt/api/realtime/frames/sendable/SendableFrames.kt +++ b/app/src/main/java/chat/peptide/api/realtime/frames/sendable/SendableFrames.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.realtime.frames.sendable +package chat.peptide.api.realtime.frames.sendable import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/revolt/api/routes/account/Login.kt b/app/src/main/java/chat/peptide/api/routes/account/Login.kt similarity index 96% rename from app/src/main/java/chat/revolt/api/routes/account/Login.kt rename to app/src/main/java/chat/peptide/api/routes/account/Login.kt index 2b391482..33383f28 100644 --- a/app/src/main/java/chat/revolt/api/routes/account/Login.kt +++ b/app/src/main/java/chat/peptide/api/routes/account/Login.kt @@ -1,11 +1,11 @@ -package chat.revolt.api.routes.account +package chat.peptide.api.routes.account import android.os.Build import android.util.Log -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api import io.ktor.client.request.post import io.ktor.client.request.setBody import io.ktor.client.statement.HttpResponse diff --git a/app/src/main/java/chat/revolt/api/routes/account/Register.kt b/app/src/main/java/chat/peptide/api/routes/account/Register.kt similarity index 81% rename from app/src/main/java/chat/revolt/api/routes/account/Register.kt rename to app/src/main/java/chat/peptide/api/routes/account/Register.kt index 57bd3056..62ec9785 100644 --- a/app/src/main/java/chat/revolt/api/routes/account/Register.kt +++ b/app/src/main/java/chat/peptide/api/routes/account/Register.kt @@ -1,10 +1,10 @@ -package chat.revolt.api.routes.account +package chat.peptide.api.routes.account -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.schemas.RsResult -import chat.revolt.api.api +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.schemas.RsResult +import chat.peptide.api.api import io.ktor.client.request.post import io.ktor.client.request.setBody import io.ktor.client.statement.bodyAsText diff --git a/app/src/main/java/chat/revolt/api/routes/auth/Sessions.kt b/app/src/main/java/chat/peptide/api/routes/auth/Sessions.kt similarity index 80% rename from app/src/main/java/chat/revolt/api/routes/auth/Sessions.kt rename to app/src/main/java/chat/peptide/api/routes/auth/Sessions.kt index 6da806ee..6bc62645 100644 --- a/app/src/main/java/chat/revolt/api/routes/auth/Sessions.kt +++ b/app/src/main/java/chat/peptide/api/routes/auth/Sessions.kt @@ -1,9 +1,9 @@ -package chat.revolt.api.routes.auth +package chat.peptide.api.routes.auth -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.schemas.Session +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.schemas.Session import io.ktor.client.request.delete import io.ktor.client.request.get import io.ktor.client.request.parameter diff --git a/app/src/main/java/chat/revolt/api/routes/channel/Channel.kt b/app/src/main/java/chat/peptide/api/routes/channel/Channel.kt similarity index 94% rename from app/src/main/java/chat/revolt/api/routes/channel/Channel.kt rename to app/src/main/java/chat/peptide/api/routes/channel/Channel.kt index 73d495df..9b55aafa 100644 --- a/app/src/main/java/chat/revolt/api/routes/channel/Channel.kt +++ b/app/src/main/java/chat/peptide/api/routes/channel/Channel.kt @@ -1,15 +1,15 @@ -package chat.revolt.api.routes.channel +package chat.peptide.api.routes.channel -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.internals.ULID -import chat.revolt.api.schemas.Channel -import chat.revolt.api.schemas.Message -import chat.revolt.api.schemas.MessagesInChannel -import chat.revolt.api.schemas.User +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.internals.ULID +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.Message +import chat.peptide.api.schemas.MessagesInChannel +import chat.peptide.api.schemas.User import io.ktor.client.request.delete import io.ktor.client.request.get import io.ktor.client.request.header diff --git a/app/src/main/java/chat/revolt/api/routes/channel/GroupDM.kt b/app/src/main/java/chat/peptide/api/routes/channel/GroupDM.kt similarity index 85% rename from app/src/main/java/chat/revolt/api/routes/channel/GroupDM.kt rename to app/src/main/java/chat/peptide/api/routes/channel/GroupDM.kt index f4770553..07b135d5 100644 --- a/app/src/main/java/chat/revolt/api/routes/channel/GroupDM.kt +++ b/app/src/main/java/chat/peptide/api/routes/channel/GroupDM.kt @@ -1,11 +1,11 @@ -package chat.revolt.api.routes.channel +package chat.peptide.api.routes.channel -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.schemas.Channel -import chat.revolt.screens.create.MAX_ADDABLE_PEOPLE_IN_GROUP +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.schemas.Channel +import chat.peptide.screens.create.MAX_ADDABLE_PEOPLE_IN_GROUP import io.ktor.client.request.delete import io.ktor.client.request.post import io.ktor.client.request.put diff --git a/app/src/main/java/chat/revolt/api/routes/channel/Message.kt b/app/src/main/java/chat/peptide/api/routes/channel/Message.kt similarity index 79% rename from app/src/main/java/chat/revolt/api/routes/channel/Message.kt rename to app/src/main/java/chat/peptide/api/routes/channel/Message.kt index 3dcb2e97..b6639fee 100644 --- a/app/src/main/java/chat/revolt/api/routes/channel/Message.kt +++ b/app/src/main/java/chat/peptide/api/routes/channel/Message.kt @@ -1,7 +1,7 @@ -package chat.revolt.api.routes.channel +package chat.peptide.api.routes.channel -import chat.revolt.api.RevoltHttp -import chat.revolt.api.api +import chat.peptide.api.RevoltHttp +import chat.peptide.api.api import io.ktor.client.request.delete import io.ktor.client.request.put diff --git a/app/src/main/java/chat/revolt/api/routes/custom/Emoji.kt b/app/src/main/java/chat/peptide/api/routes/custom/Emoji.kt similarity index 62% rename from app/src/main/java/chat/revolt/api/routes/custom/Emoji.kt rename to app/src/main/java/chat/peptide/api/routes/custom/Emoji.kt index 2e9060c3..31c27e23 100644 --- a/app/src/main/java/chat/revolt/api/routes/custom/Emoji.kt +++ b/app/src/main/java/chat/peptide/api/routes/custom/Emoji.kt @@ -1,9 +1,9 @@ -package chat.revolt.api.routes.custom +package chat.peptide.api.routes.custom -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.schemas.Emoji +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.schemas.Emoji import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText diff --git a/app/src/main/java/chat/revolt/api/routes/googlesheets/GoogleSheetsService.kt b/app/src/main/java/chat/peptide/api/routes/googlesheets/GoogleSheetsService.kt similarity index 97% rename from app/src/main/java/chat/revolt/api/routes/googlesheets/GoogleSheetsService.kt rename to app/src/main/java/chat/peptide/api/routes/googlesheets/GoogleSheetsService.kt index 4c2082ac..dc01fbf0 100644 --- a/app/src/main/java/chat/revolt/api/routes/googlesheets/GoogleSheetsService.kt +++ b/app/src/main/java/chat/peptide/api/routes/googlesheets/GoogleSheetsService.kt @@ -1,7 +1,7 @@ -package chat.revolt.api.routes.googlesheets +package chat.peptide.api.routes.googlesheets -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/chat/revolt/api/routes/googlesheets/ServerDataRepository.kt b/app/src/main/java/chat/peptide/api/routes/googlesheets/ServerDataRepository.kt similarity index 96% rename from app/src/main/java/chat/revolt/api/routes/googlesheets/ServerDataRepository.kt rename to app/src/main/java/chat/peptide/api/routes/googlesheets/ServerDataRepository.kt index 7d474c26..fc5c9b21 100644 --- a/app/src/main/java/chat/revolt/api/routes/googlesheets/ServerDataRepository.kt +++ b/app/src/main/java/chat/peptide/api/routes/googlesheets/ServerDataRepository.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.routes.googlesheets +package chat.peptide.api.routes.googlesheets import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/chat/revolt/api/routes/invites/Invites.kt b/app/src/main/java/chat/peptide/api/routes/invites/Invites.kt similarity index 79% rename from app/src/main/java/chat/revolt/api/routes/invites/Invites.kt rename to app/src/main/java/chat/peptide/api/routes/invites/Invites.kt index 46db268d..720ade77 100644 --- a/app/src/main/java/chat/revolt/api/routes/invites/Invites.kt +++ b/app/src/main/java/chat/peptide/api/routes/invites/Invites.kt @@ -1,12 +1,12 @@ -package chat.revolt.api.routes.invites +package chat.peptide.api.routes.invites -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.schemas.Invite -import chat.revolt.api.schemas.InviteJoined -import chat.revolt.api.schemas.RsResult +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.schemas.Invite +import chat.peptide.api.schemas.InviteJoined +import chat.peptide.api.schemas.RsResult import io.ktor.client.request.get import io.ktor.client.request.post import io.ktor.client.statement.bodyAsText diff --git a/app/src/main/java/chat/revolt/api/routes/microservices/autumn/Autumn.kt b/app/src/main/java/chat/peptide/api/routes/microservices/autumn/Autumn.kt similarity index 88% rename from app/src/main/java/chat/revolt/api/routes/microservices/autumn/Autumn.kt rename to app/src/main/java/chat/peptide/api/routes/microservices/autumn/Autumn.kt index 0159c07b..4f39c959 100644 --- a/app/src/main/java/chat/revolt/api/routes/microservices/autumn/Autumn.kt +++ b/app/src/main/java/chat/peptide/api/routes/microservices/autumn/Autumn.kt @@ -1,11 +1,11 @@ -package chat.revolt.api.routes.microservices.autumn +package chat.peptide.api.routes.microservices.autumn -import chat.revolt.api.HitRateLimitException -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.schemas.AutumnError -import chat.revolt.api.schemas.AutumnId +import chat.peptide.api.HitRateLimitException +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.schemas.AutumnError +import chat.peptide.api.schemas.AutumnId import io.ktor.client.plugins.onUpload import io.ktor.client.request.forms.MultiPartFormDataContent import io.ktor.client.request.forms.formData diff --git a/app/src/main/java/chat/revolt/api/routes/microservices/geo/Geo.kt b/app/src/main/java/chat/peptide/api/routes/microservices/geo/Geo.kt similarity index 82% rename from app/src/main/java/chat/revolt/api/routes/microservices/geo/Geo.kt rename to app/src/main/java/chat/peptide/api/routes/microservices/geo/Geo.kt index a54ea4b4..249f410b 100644 --- a/app/src/main/java/chat/revolt/api/routes/microservices/geo/Geo.kt +++ b/app/src/main/java/chat/peptide/api/routes/microservices/geo/Geo.kt @@ -1,9 +1,9 @@ -package chat.revolt.api.routes.microservices.geo +package chat.peptide.api.routes.microservices.geo -import chat.revolt.api.HitRateLimitException -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.buildUserAgent +import chat.peptide.api.HitRateLimitException +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.buildUserAgent import io.ktor.client.request.get import io.ktor.client.request.header import io.ktor.client.statement.bodyAsText diff --git a/app/src/main/java/chat/revolt/api/routes/microservices/health/Health.kt b/app/src/main/java/chat/peptide/api/routes/microservices/health/Health.kt similarity index 62% rename from app/src/main/java/chat/revolt/api/routes/microservices/health/Health.kt rename to app/src/main/java/chat/peptide/api/routes/microservices/health/Health.kt index 5fb2dab5..337fc1d1 100644 --- a/app/src/main/java/chat/revolt/api/routes/microservices/health/Health.kt +++ b/app/src/main/java/chat/peptide/api/routes/microservices/health/Health.kt @@ -1,8 +1,8 @@ -package chat.revolt.api.routes.microservices.health +package chat.peptide.api.routes.microservices.health -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.schemas.HealthNotice +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.schemas.HealthNotice import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText diff --git a/app/src/main/java/chat/revolt/api/routes/microservices/january/January.kt b/app/src/main/java/chat/peptide/api/routes/microservices/january/January.kt similarity index 65% rename from app/src/main/java/chat/revolt/api/routes/microservices/january/January.kt rename to app/src/main/java/chat/peptide/api/routes/microservices/january/January.kt index 1280269a..8c7dcf63 100644 --- a/app/src/main/java/chat/revolt/api/routes/microservices/january/January.kt +++ b/app/src/main/java/chat/peptide/api/routes/microservices/january/January.kt @@ -1,6 +1,6 @@ -package chat.revolt.api.routes.microservices.january +package chat.peptide.api.routes.microservices.january -import chat.revolt.api.RevoltAPI +import chat.peptide.api.RevoltAPI import java.net.URLEncoder fun asJanuaryProxyUrl(url: String): String { diff --git a/app/src/main/java/chat/revolt/api/routes/misc/Root.kt b/app/src/main/java/chat/peptide/api/routes/misc/Root.kt similarity index 92% rename from app/src/main/java/chat/revolt/api/routes/misc/Root.kt rename to app/src/main/java/chat/peptide/api/routes/misc/Root.kt index dfc22cd3..f3839c41 100644 --- a/app/src/main/java/chat/revolt/api/routes/misc/Root.kt +++ b/app/src/main/java/chat/peptide/api/routes/misc/Root.kt @@ -1,7 +1,7 @@ -package chat.revolt.api.routes.misc +package chat.peptide.api.routes.misc -import chat.revolt.api.RevoltHttp -import chat.revolt.api.api +import chat.peptide.api.RevoltHttp +import chat.peptide.api.api import io.ktor.client.call.body import io.ktor.client.request.get import kotlinx.serialization.SerialName diff --git a/app/src/main/java/chat/revolt/api/routes/onboard/Onboarding.kt b/app/src/main/java/chat/peptide/api/routes/onboard/Onboarding.kt similarity index 87% rename from app/src/main/java/chat/revolt/api/routes/onboard/Onboarding.kt rename to app/src/main/java/chat/peptide/api/routes/onboard/Onboarding.kt index 9126648b..8e2273a7 100644 --- a/app/src/main/java/chat/revolt/api/routes/onboard/Onboarding.kt +++ b/app/src/main/java/chat/peptide/api/routes/onboard/Onboarding.kt @@ -1,12 +1,12 @@ -package chat.revolt.api.routes.onboard +package chat.peptide.api.routes.onboard -import chat.revolt.api.RateLimitResponse -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.schemas.RsResult +import chat.peptide.api.RateLimitResponse +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.schemas.RsResult import io.ktor.client.request.get import io.ktor.client.request.header import io.ktor.client.request.post diff --git a/app/src/main/java/chat/revolt/api/routes/push/Push.kt b/app/src/main/java/chat/peptide/api/routes/push/Push.kt similarity index 77% rename from app/src/main/java/chat/revolt/api/routes/push/Push.kt rename to app/src/main/java/chat/peptide/api/routes/push/Push.kt index 0e9dc263..b6ac2660 100644 --- a/app/src/main/java/chat/revolt/api/routes/push/Push.kt +++ b/app/src/main/java/chat/peptide/api/routes/push/Push.kt @@ -1,8 +1,8 @@ -package chat.revolt.api.routes.push +package chat.peptide.api.routes.push -import chat.revolt.api.RevoltHttp -import chat.revolt.api.routes.account.WebPushData -import chat.revolt.api.api +import chat.peptide.api.RevoltHttp +import chat.peptide.api.routes.account.WebPushData +import chat.peptide.api.api import io.ktor.client.request.post import io.ktor.client.request.setBody import io.ktor.http.ContentType diff --git a/app/src/main/java/chat/revolt/api/routes/safety/Reporting.kt b/app/src/main/java/chat/peptide/api/routes/safety/Reporting.kt similarity index 82% rename from app/src/main/java/chat/revolt/api/routes/safety/Reporting.kt rename to app/src/main/java/chat/peptide/api/routes/safety/Reporting.kt index e471a048..2dc4a5c5 100644 --- a/app/src/main/java/chat/revolt/api/routes/safety/Reporting.kt +++ b/app/src/main/java/chat/peptide/api/routes/safety/Reporting.kt @@ -1,17 +1,17 @@ -package chat.revolt.api.routes.safety +package chat.peptide.api.routes.safety -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.schemas.ContentReportReason -import chat.revolt.api.schemas.FullMessageReport -import chat.revolt.api.schemas.FullServerReport -import chat.revolt.api.schemas.FullUserReport -import chat.revolt.api.schemas.MessageReport -import chat.revolt.api.schemas.ServerReport -import chat.revolt.api.schemas.UserReport -import chat.revolt.api.schemas.UserReportReason -import chat.revolt.api.api +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.schemas.ContentReportReason +import chat.peptide.api.schemas.FullMessageReport +import chat.peptide.api.schemas.FullServerReport +import chat.peptide.api.schemas.FullUserReport +import chat.peptide.api.schemas.MessageReport +import chat.peptide.api.schemas.ServerReport +import chat.peptide.api.schemas.UserReport +import chat.peptide.api.schemas.UserReportReason +import chat.peptide.api.api import io.ktor.client.request.post import io.ktor.client.request.setBody import io.ktor.client.statement.bodyAsText diff --git a/app/src/main/java/chat/revolt/api/routes/server/Server.kt b/app/src/main/java/chat/peptide/api/routes/server/Server.kt similarity index 90% rename from app/src/main/java/chat/revolt/api/routes/server/Server.kt rename to app/src/main/java/chat/peptide/api/routes/server/Server.kt index 5428400c..e886aca5 100644 --- a/app/src/main/java/chat/revolt/api/routes/server/Server.kt +++ b/app/src/main/java/chat/peptide/api/routes/server/Server.kt @@ -1,13 +1,13 @@ -package chat.revolt.api.routes.server +package chat.peptide.api.routes.server -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.schemas.Member -import chat.revolt.api.schemas.ServerWithChannelObjects -import chat.revolt.api.schemas.User +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.schemas.Member +import chat.peptide.api.schemas.ServerWithChannelObjects +import chat.peptide.api.schemas.User import io.ktor.client.request.delete import io.ktor.client.request.get import io.ktor.client.request.parameter diff --git a/app/src/main/java/chat/revolt/api/routes/sync/SettingsSync.kt b/app/src/main/java/chat/peptide/api/routes/sync/SettingsSync.kt similarity index 92% rename from app/src/main/java/chat/revolt/api/routes/sync/SettingsSync.kt rename to app/src/main/java/chat/peptide/api/routes/sync/SettingsSync.kt index 3f1a7709..4ff3b634 100644 --- a/app/src/main/java/chat/revolt/api/routes/sync/SettingsSync.kt +++ b/app/src/main/java/chat/peptide/api/routes/sync/SettingsSync.kt @@ -1,9 +1,9 @@ -package chat.revolt.api.routes.sync +package chat.peptide.api.routes.sync -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api import io.ktor.client.request.parameter import io.ktor.client.request.post import io.ktor.client.request.setBody diff --git a/app/src/main/java/chat/revolt/api/routes/sync/UnreadSync.kt b/app/src/main/java/chat/peptide/api/routes/sync/UnreadSync.kt similarity index 67% rename from app/src/main/java/chat/revolt/api/routes/sync/UnreadSync.kt rename to app/src/main/java/chat/peptide/api/routes/sync/UnreadSync.kt index d38dadbf..bdbab7c5 100644 --- a/app/src/main/java/chat/revolt/api/routes/sync/UnreadSync.kt +++ b/app/src/main/java/chat/peptide/api/routes/sync/UnreadSync.kt @@ -1,9 +1,9 @@ -package chat.revolt.api.routes.sync +package chat.peptide.api.routes.sync -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.schemas.ChannelUnreadResponse +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.schemas.ChannelUnreadResponse import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText import kotlinx.serialization.builtins.ListSerializer diff --git a/app/src/main/java/chat/revolt/api/routes/user/DirectMessaging.kt b/app/src/main/java/chat/peptide/api/routes/user/DirectMessaging.kt similarity index 71% rename from app/src/main/java/chat/revolt/api/routes/user/DirectMessaging.kt rename to app/src/main/java/chat/peptide/api/routes/user/DirectMessaging.kt index c41ccecd..3a31ee2a 100644 --- a/app/src/main/java/chat/revolt/api/routes/user/DirectMessaging.kt +++ b/app/src/main/java/chat/peptide/api/routes/user/DirectMessaging.kt @@ -1,10 +1,10 @@ -package chat.revolt.api.routes.user +package chat.peptide.api.routes.user -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.schemas.Channel +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.schemas.Channel import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText import kotlinx.serialization.SerializationException diff --git a/app/src/main/java/chat/revolt/api/routes/user/Relationships.kt b/app/src/main/java/chat/peptide/api/routes/user/Relationships.kt similarity index 92% rename from app/src/main/java/chat/revolt/api/routes/user/Relationships.kt rename to app/src/main/java/chat/peptide/api/routes/user/Relationships.kt index f9db7e98..3c1061c1 100644 --- a/app/src/main/java/chat/revolt/api/routes/user/Relationships.kt +++ b/app/src/main/java/chat/peptide/api/routes/user/Relationships.kt @@ -1,9 +1,9 @@ -package chat.revolt.api.routes.user +package chat.peptide.api.routes.user -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api import io.ktor.client.request.delete import io.ktor.client.request.post import io.ktor.client.request.put diff --git a/app/src/main/java/chat/revolt/api/routes/user/User.kt b/app/src/main/java/chat/peptide/api/routes/user/User.kt similarity index 92% rename from app/src/main/java/chat/revolt/api/routes/user/User.kt rename to app/src/main/java/chat/peptide/api/routes/user/User.kt index 7dc8750a..d2075ac6 100644 --- a/app/src/main/java/chat/revolt/api/routes/user/User.kt +++ b/app/src/main/java/chat/peptide/api/routes/user/User.kt @@ -1,13 +1,13 @@ -package chat.revolt.api.routes.user +package chat.peptide.api.routes.user -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api -import chat.revolt.api.schemas.Profile -import chat.revolt.api.schemas.Status -import chat.revolt.api.schemas.User +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api +import chat.peptide.api.schemas.Profile +import chat.peptide.api.schemas.Status +import chat.peptide.api.schemas.User import io.ktor.client.request.get import io.ktor.client.request.patch import io.ktor.client.request.setBody diff --git a/app/src/main/java/chat/revolt/api/routes/voice/Voice.kt b/app/src/main/java/chat/peptide/api/routes/voice/Voice.kt similarity index 84% rename from app/src/main/java/chat/revolt/api/routes/voice/Voice.kt rename to app/src/main/java/chat/peptide/api/routes/voice/Voice.kt index 9f9e5fdb..7f21b2b0 100644 --- a/app/src/main/java/chat/revolt/api/routes/voice/Voice.kt +++ b/app/src/main/java/chat/peptide/api/routes/voice/Voice.kt @@ -1,9 +1,9 @@ -package chat.revolt.api.routes.voice +package chat.peptide.api.routes.voice -import chat.revolt.api.RevoltError -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.api.api +import chat.peptide.api.RevoltError +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.api.api import io.ktor.client.request.post import io.ktor.client.request.setBody import io.ktor.client.statement.bodyAsText diff --git a/app/src/main/java/chat/revolt/api/schemas/Auth.kt b/app/src/main/java/chat/peptide/api/schemas/Auth.kt similarity index 79% rename from app/src/main/java/chat/revolt/api/schemas/Auth.kt rename to app/src/main/java/chat/peptide/api/schemas/Auth.kt index 7772359d..e3bbe5c2 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Auth.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Auth.kt @@ -1,6 +1,6 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas -import chat.revolt.api.RevoltAPI +import chat.peptide.api.RevoltAPI import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/revolt/api/schemas/Channel.kt b/app/src/main/java/chat/peptide/api/schemas/Channel.kt similarity index 98% rename from app/src/main/java/chat/revolt/api/schemas/Channel.kt rename to app/src/main/java/chat/peptide/api/schemas/Channel.kt index 552b7989..f4a84a0c 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Channel.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Channel.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas import kotlinx.datetime.Instant import kotlinx.serialization.KSerializer @@ -111,7 +111,7 @@ enum class ChannelType(val value: String) { override val descriptor: SerialDescriptor get() { return PrimitiveSerialDescriptor( - "chat.revolt.api.schemas.ChannelType", + "chat.peptide.api.schemas.ChannelType", PrimitiveKind.STRING ) } diff --git a/app/src/main/java/chat/revolt/api/schemas/Generic.kt b/app/src/main/java/chat/peptide/api/schemas/Generic.kt similarity index 96% rename from app/src/main/java/chat/revolt/api/schemas/Generic.kt rename to app/src/main/java/chat/peptide/api/schemas/Generic.kt index 6ce8d2ac..43a593da 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Generic.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Generic.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/chat/revolt/api/schemas/Health.kt b/app/src/main/java/chat/peptide/api/schemas/Health.kt similarity index 93% rename from app/src/main/java/chat/revolt/api/schemas/Health.kt rename to app/src/main/java/chat/peptide/api/schemas/Health.kt index 70980109..7d580d5e 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Health.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Health.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/revolt/api/schemas/Invites.kt b/app/src/main/java/chat/peptide/api/schemas/Invites.kt similarity index 95% rename from app/src/main/java/chat/revolt/api/schemas/Invites.kt rename to app/src/main/java/chat/peptide/api/schemas/Invites.kt index bf841fbd..6950995a 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Invites.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Invites.kt @@ -1,8 +1,8 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas import android.net.Uri import androidx.core.net.toUri -import chat.revolt.api.RevoltAPI +import chat.peptide.api.RevoltAPI import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/revolt/api/schemas/Messages.kt b/app/src/main/java/chat/peptide/api/schemas/Messages.kt similarity index 96% rename from app/src/main/java/chat/revolt/api/schemas/Messages.kt rename to app/src/main/java/chat/peptide/api/schemas/Messages.kt index a311ce6d..f8f04d06 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Messages.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Messages.kt @@ -1,6 +1,6 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas -import chat.revolt.api.RevoltAPI +import chat.peptide.api.RevoltAPI import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -24,7 +24,7 @@ data class Message( val interactions: InteractionsDescription? = null, val pinned: Boolean? = null, /** - * See [chat.revolt.api.internals.MessageFlag] + * See [chat.peptide.api.internals.MessageFlag] */ val flags: Int? = null, val type: String? = null, // this is _only_ used for websocket events! diff --git a/app/src/main/java/chat/revolt/api/schemas/Safety.kt b/app/src/main/java/chat/peptide/api/schemas/Safety.kt similarity index 96% rename from app/src/main/java/chat/revolt/api/schemas/Safety.kt rename to app/src/main/java/chat/peptide/api/schemas/Safety.kt index fc407390..00c52b03 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Safety.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Safety.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -29,7 +29,7 @@ enum class ContentReportReason(val value: String) { override val descriptor: SerialDescriptor get() { return PrimitiveSerialDescriptor( - "chat.revolt.api.schemas.ContentReportReason", + "chat.peptide.api.schemas.ContentReportReason", PrimitiveKind.STRING ) } @@ -73,7 +73,7 @@ enum class UserReportReason(val value: String) { override val descriptor: SerialDescriptor get() { return PrimitiveSerialDescriptor( - "chat.revolt.api.schemas.UserReportReason", + "chat.peptide.api.schemas.UserReportReason", PrimitiveKind.STRING ) } diff --git a/app/src/main/java/chat/revolt/api/schemas/Server.kt b/app/src/main/java/chat/peptide/api/schemas/Server.kt similarity index 99% rename from app/src/main/java/chat/revolt/api/schemas/Server.kt rename to app/src/main/java/chat/peptide/api/schemas/Server.kt index 4b637e9c..a12fd284 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Server.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Server.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/revolt/api/schemas/Settings.kt b/app/src/main/java/chat/peptide/api/schemas/Settings.kt similarity index 96% rename from app/src/main/java/chat/revolt/api/schemas/Settings.kt rename to app/src/main/java/chat/peptide/api/schemas/Settings.kt index 2577a6c0..b1ec4be5 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Settings.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Settings.kt @@ -1,6 +1,6 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas -import chat.revolt.ui.theme.OverridableColourScheme +import chat.peptide.ui.theme.OverridableColourScheme import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonElement diff --git a/app/src/main/java/chat/revolt/api/schemas/User.kt b/app/src/main/java/chat/peptide/api/schemas/User.kt similarity index 99% rename from app/src/main/java/chat/revolt/api/schemas/User.kt rename to app/src/main/java/chat/peptide/api/schemas/User.kt index 848f4759..2f06589d 100644 --- a/app/src/main/java/chat/revolt/api/schemas/User.kt +++ b/app/src/main/java/chat/peptide/api/schemas/User.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/chat/revolt/api/schemas/Util.kt b/app/src/main/java/chat/peptide/api/schemas/Util.kt similarity index 97% rename from app/src/main/java/chat/revolt/api/schemas/Util.kt rename to app/src/main/java/chat/peptide/api/schemas/Util.kt index c6d94165..1f110531 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Util.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Util.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas // Result class similar to Rust std::result::Result data class RsResult(val value: V?, val error: E?) { diff --git a/app/src/main/java/chat/revolt/api/schemas/Voice.kt b/app/src/main/java/chat/peptide/api/schemas/Voice.kt similarity index 93% rename from app/src/main/java/chat/revolt/api/schemas/Voice.kt rename to app/src/main/java/chat/peptide/api/schemas/Voice.kt index ba643d4d..722d5159 100644 --- a/app/src/main/java/chat/revolt/api/schemas/Voice.kt +++ b/app/src/main/java/chat/peptide/api/schemas/Voice.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.schemas +package chat.peptide.api.schemas import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/revolt/api/settings/Experiments.kt b/app/src/main/java/chat/peptide/api/settings/Experiments.kt similarity index 92% rename from app/src/main/java/chat/revolt/api/settings/Experiments.kt rename to app/src/main/java/chat/peptide/api/settings/Experiments.kt index 818d997e..d8210700 100644 --- a/app/src/main/java/chat/revolt/api/settings/Experiments.kt +++ b/app/src/main/java/chat/peptide/api/settings/Experiments.kt @@ -1,11 +1,11 @@ -package chat.revolt.api.settings +package chat.peptide.api.settings import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import chat.revolt.BuildConfig -import chat.revolt.RevoltApplication -import chat.revolt.persistence.KVStorage +import chat.peptide.BuildConfig +import chat.peptide.RevoltApplication +import chat.peptide.persistence.KVStorage class ExperimentInstance(default: Boolean) { private var _isEnabled by mutableStateOf(default) diff --git a/app/src/main/java/chat/revolt/api/settings/FeatureFlags.kt b/app/src/main/java/chat/peptide/api/settings/FeatureFlags.kt similarity index 96% rename from app/src/main/java/chat/revolt/api/settings/FeatureFlags.kt rename to app/src/main/java/chat/peptide/api/settings/FeatureFlags.kt index f7dee8c9..95d2480b 100644 --- a/app/src/main/java/chat/revolt/api/settings/FeatureFlags.kt +++ b/app/src/main/java/chat/peptide/api/settings/FeatureFlags.kt @@ -1,10 +1,10 @@ -package chat.revolt.api.settings +package chat.peptide.api.settings import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.SpecialUsers +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.SpecialUsers annotation class FeatureFlag(val name: String) annotation class Treatment(val description: String) diff --git a/app/src/main/java/chat/revolt/api/settings/GeoStateProvider.kt b/app/src/main/java/chat/peptide/api/settings/GeoStateProvider.kt similarity index 84% rename from app/src/main/java/chat/revolt/api/settings/GeoStateProvider.kt rename to app/src/main/java/chat/peptide/api/settings/GeoStateProvider.kt index 47f50b35..a84ab72a 100644 --- a/app/src/main/java/chat/revolt/api/settings/GeoStateProvider.kt +++ b/app/src/main/java/chat/peptide/api/settings/GeoStateProvider.kt @@ -1,9 +1,9 @@ -package chat.revolt.api.settings +package chat.peptide.api.settings import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import chat.revolt.api.routes.microservices.geo.GeoResponse +import chat.peptide.api.routes.microservices.geo.GeoResponse object GeoStateProvider { var geoState by mutableStateOf(null) diff --git a/app/src/main/java/chat/revolt/api/settings/LoadedSettings.kt b/app/src/main/java/chat/peptide/api/settings/LoadedSettings.kt similarity index 88% rename from app/src/main/java/chat/revolt/api/settings/LoadedSettings.kt rename to app/src/main/java/chat/peptide/api/settings/LoadedSettings.kt index ea322c00..33e5caab 100644 --- a/app/src/main/java/chat/revolt/api/settings/LoadedSettings.kt +++ b/app/src/main/java/chat/peptide/api/settings/LoadedSettings.kt @@ -1,12 +1,12 @@ -package chat.revolt.api.settings +package chat.peptide.api.settings import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import chat.revolt.api.schemas.AndroidSpecificSettingsSpecialEmbedSettings -import chat.revolt.ui.theme.Theme -import chat.revolt.ui.theme.getDefaultTheme +import chat.peptide.api.schemas.AndroidSpecificSettingsSpecialEmbedSettings +import chat.peptide.ui.theme.Theme +import chat.peptide.ui.theme.getDefaultTheme enum class MessageReplyStyle { None, diff --git a/app/src/main/java/chat/revolt/api/settings/NotificationSettingsProvider.kt b/app/src/main/java/chat/peptide/api/settings/NotificationSettingsProvider.kt similarity index 91% rename from app/src/main/java/chat/revolt/api/settings/NotificationSettingsProvider.kt rename to app/src/main/java/chat/peptide/api/settings/NotificationSettingsProvider.kt index 899b3913..b6e340a4 100644 --- a/app/src/main/java/chat/revolt/api/settings/NotificationSettingsProvider.kt +++ b/app/src/main/java/chat/peptide/api/settings/NotificationSettingsProvider.kt @@ -1,4 +1,4 @@ -package chat.revolt.api.settings +package chat.peptide.api.settings object NotificationSettingsProvider { fun isChannelMuted(channelId: String, serverId: String?): Boolean { diff --git a/app/src/main/java/chat/revolt/api/settings/SyncedSettings.kt b/app/src/main/java/chat/peptide/api/settings/SyncedSettings.kt similarity index 92% rename from app/src/main/java/chat/revolt/api/settings/SyncedSettings.kt rename to app/src/main/java/chat/peptide/api/settings/SyncedSettings.kt index 3bbe4b53..4d466e25 100644 --- a/app/src/main/java/chat/revolt/api/settings/SyncedSettings.kt +++ b/app/src/main/java/chat/peptide/api/settings/SyncedSettings.kt @@ -1,14 +1,14 @@ -package chat.revolt.api.settings +package chat.peptide.api.settings import androidx.compose.runtime.mutableStateOf -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltJson -import chat.revolt.api.routes.sync.getKeys -import chat.revolt.api.routes.sync.setKey -import chat.revolt.api.schemas.AndroidSpecificSettings -import chat.revolt.api.schemas.NotificationSettings -import chat.revolt.api.schemas.OrderingSettings -import chat.revolt.api.schemas._NotificationSettingsToParse +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltJson +import chat.peptide.api.routes.sync.getKeys +import chat.peptide.api.routes.sync.setKey +import chat.peptide.api.schemas.AndroidSpecificSettings +import chat.peptide.api.schemas.NotificationSettings +import chat.peptide.api.schemas.OrderingSettings +import chat.peptide.api.schemas._NotificationSettingsToParse import kotlinx.serialization.json.JsonPrimitive import kotlinx.serialization.json.jsonPrimitive import logcat.LogPriority diff --git a/app/src/main/java/chat/revolt/api/unreads/Unreads.kt b/app/src/main/java/chat/peptide/api/unreads/Unreads.kt similarity index 88% rename from app/src/main/java/chat/revolt/api/unreads/Unreads.kt rename to app/src/main/java/chat/peptide/api/unreads/Unreads.kt index 4be01c41..a3251e24 100644 --- a/app/src/main/java/chat/revolt/api/unreads/Unreads.kt +++ b/app/src/main/java/chat/peptide/api/unreads/Unreads.kt @@ -1,16 +1,16 @@ -package chat.revolt.api.unreads +package chat.peptide.api.unreads import android.util.Log import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.ULID -import chat.revolt.api.routes.channel.ackChannel -import chat.revolt.api.routes.server.ackServer -import chat.revolt.api.routes.sync.syncUnreads -import chat.revolt.api.schemas.ChannelType -import chat.revolt.api.schemas.ChannelUnread -import chat.revolt.api.settings.NotificationSettingsProvider +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.ULID +import chat.peptide.api.routes.channel.ackChannel +import chat.peptide.api.routes.server.ackServer +import chat.peptide.api.routes.sync.syncUnreads +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.schemas.ChannelUnread +import chat.peptide.api.settings.NotificationSettingsProvider class Unreads { private val hasLoaded = mutableStateOf(false) diff --git a/app/src/main/java/chat/revolt/c2dm/ChannelRegistrator.kt b/app/src/main/java/chat/peptide/c2dm/ChannelRegistrator.kt similarity index 89% rename from app/src/main/java/chat/revolt/c2dm/ChannelRegistrator.kt rename to app/src/main/java/chat/peptide/c2dm/ChannelRegistrator.kt index e3751546..8e880c70 100644 --- a/app/src/main/java/chat/revolt/c2dm/ChannelRegistrator.kt +++ b/app/src/main/java/chat/peptide/c2dm/ChannelRegistrator.kt @@ -1,11 +1,11 @@ -package chat.revolt.c2dm +package chat.peptide.c2dm import android.app.NotificationChannel import android.app.NotificationChannelGroup import android.app.NotificationManager import android.content.Context import androidx.core.content.ContextCompat.getSystemService -import chat.revolt.R +import chat.peptide.R // TODO // * Add the remaining groups. @@ -15,10 +15,10 @@ import chat.revolt.R class ChannelRegistrator(val context: Context) { companion object { - const val CHANNEL_ID_GROUP_CONVERSATIONS = "chat.revolt.c2dm.conversations" + const val CHANNEL_ID_GROUP_CONVERSATIONS = "chat.peptide.c2dm.conversations" - const val CHANNEL_ID_GROUP_SOCIAL = "chat.revolt.c2dm.social" - const val CHANNEL_ID_GROUP_SOCIAL_FRIENDREQUESTS = "chat.revolt.c2dm.social.friendrequests" + const val CHANNEL_ID_GROUP_SOCIAL = "chat.peptide.c2dm.social" + const val CHANNEL_ID_GROUP_SOCIAL_FRIENDREQUESTS = "chat.peptide.c2dm.social.friendrequests" } private val notificationManager = diff --git a/app/src/main/java/chat/revolt/c2dm/HandlerService.kt b/app/src/main/java/chat/peptide/c2dm/HandlerService.kt similarity index 91% rename from app/src/main/java/chat/revolt/c2dm/HandlerService.kt rename to app/src/main/java/chat/peptide/c2dm/HandlerService.kt index ff21cb7a..719c24f3 100644 --- a/app/src/main/java/chat/revolt/c2dm/HandlerService.kt +++ b/app/src/main/java/chat/peptide/c2dm/HandlerService.kt @@ -1,4 +1,4 @@ -package chat.revolt.c2dm +package chat.peptide.c2dm import android.app.PendingIntent import android.content.Intent @@ -10,17 +10,17 @@ import androidx.core.app.NotificationManagerCompat import androidx.core.app.Person import androidx.core.app.RemoteInput import androidx.core.graphics.drawable.IconCompat -import chat.revolt.R -import chat.revolt.activities.MainActivity -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltJson -import chat.revolt.api.internals.ULID -import chat.revolt.api.routes.push.subscribePush -import chat.revolt.api.schemas.Message -import chat.revolt.api.schemas.User -import chat.revolt.c2dm.ChannelRegistrator.Companion.CHANNEL_ID_GROUP_SOCIAL_FRIENDREQUESTS -import chat.revolt.persistence.Database -import chat.revolt.persistence.SqlStorage +import chat.peptide.R +import chat.peptide.activities.MainActivity +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltJson +import chat.peptide.api.internals.ULID +import chat.peptide.api.routes.push.subscribePush +import chat.peptide.api.schemas.Message +import chat.peptide.api.schemas.User +import chat.peptide.c2dm.ChannelRegistrator.Companion.CHANNEL_ID_GROUP_SOCIAL_FRIENDREQUESTS +import chat.peptide.persistence.Database +import chat.peptide.persistence.SqlStorage import com.bumptech.glide.Glide import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage diff --git a/app/src/main/java/chat/revolt/callbacks/ActionChannel.kt b/app/src/main/java/chat/peptide/callbacks/ActionChannel.kt similarity index 90% rename from app/src/main/java/chat/revolt/callbacks/ActionChannel.kt rename to app/src/main/java/chat/peptide/callbacks/ActionChannel.kt index c8f0d630..bce8cff7 100644 --- a/app/src/main/java/chat/revolt/callbacks/ActionChannel.kt +++ b/app/src/main/java/chat/peptide/callbacks/ActionChannel.kt @@ -1,6 +1,6 @@ -package chat.revolt.callbacks +package chat.peptide.callbacks -import chat.revolt.screens.chat.ChatRouterDestination +import chat.peptide.screens.chat.ChatRouterDestination import kotlinx.coroutines.channels.Channel sealed class Action { diff --git a/app/src/main/java/chat/revolt/callbacks/UiCallbacks.kt b/app/src/main/java/chat/peptide/callbacks/UiCallbacks.kt similarity index 96% rename from app/src/main/java/chat/revolt/callbacks/UiCallbacks.kt rename to app/src/main/java/chat/peptide/callbacks/UiCallbacks.kt index 725d9b13..519f2a16 100644 --- a/app/src/main/java/chat/revolt/callbacks/UiCallbacks.kt +++ b/app/src/main/java/chat/peptide/callbacks/UiCallbacks.kt @@ -1,4 +1,4 @@ -package chat.revolt.callbacks +package chat.peptide.callbacks import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/app/src/main/java/chat/revolt/composables/chat/DateDivider.kt b/app/src/main/java/chat/peptide/composables/chat/DateDivider.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/chat/DateDivider.kt rename to app/src/main/java/chat/peptide/composables/chat/DateDivider.kt index 6aca1028..400186c0 100644 --- a/app/src/main/java/chat/revolt/composables/chat/DateDivider.kt +++ b/app/src/main/java/chat/peptide/composables/chat/DateDivider.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import android.icu.text.DateFormat import android.text.format.DateUtils diff --git a/app/src/main/java/chat/revolt/composables/chat/DisconnectedNotice.kt b/app/src/main/java/chat/peptide/composables/chat/DisconnectedNotice.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/chat/DisconnectedNotice.kt rename to app/src/main/java/chat/peptide/composables/chat/DisconnectedNotice.kt index 05fc735e..cdfd058c 100644 --- a/app/src/main/java/chat/revolt/composables/chat/DisconnectedNotice.kt +++ b/app/src/main/java/chat/peptide/composables/chat/DisconnectedNotice.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -28,10 +28,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.api.realtime.DisconnectionState -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.ui.theme.Theme +import chat.peptide.R +import chat.peptide.api.realtime.DisconnectionState +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.ui.theme.Theme private val NON_MATERIAL_COLOURS = mapOf( DisconnectionState.Disconnected to (Color(0xff4E0C0C) to Color(0xffff1744)), diff --git a/app/src/main/java/chat/revolt/composables/chat/Embed.kt b/app/src/main/java/chat/peptide/composables/chat/Embed.kt similarity index 91% rename from app/src/main/java/chat/revolt/composables/chat/Embed.kt rename to app/src/main/java/chat/peptide/composables/chat/Embed.kt index b1464475..08103352 100644 --- a/app/src/main/java/chat/revolt/composables/chat/Embed.kt +++ b/app/src/main/java/chat/peptide/composables/chat/Embed.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -23,14 +23,14 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -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.composables.chat.specialembeds.SpecialEmbedSwitch -import chat.revolt.composables.generic.RemoteImage -import chat.revolt.composables.markdown.RichMarkdown -import chat.revolt.api.schemas.Embed as EmbedSchema +import chat.peptide.api.internals.BrushCompat +import chat.peptide.api.internals.solidColor +import chat.peptide.api.routes.microservices.january.asJanuaryProxyUrl +import chat.peptide.api.schemas.Embed +import chat.peptide.composables.chat.specialembeds.SpecialEmbedSwitch +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.markdown.RichMarkdown +import chat.peptide.api.schemas.Embed as EmbedSchema @Composable fun RegularEmbed( diff --git a/app/src/main/java/chat/revolt/composables/chat/InReplyTo.kt b/app/src/main/java/chat/peptide/composables/chat/InReplyTo.kt similarity index 93% rename from app/src/main/java/chat/revolt/composables/chat/InReplyTo.kt rename to app/src/main/java/chat/peptide/composables/chat/InReplyTo.kt index a4197ff9..8637f755 100644 --- a/app/src/main/java/chat/revolt/composables/chat/InReplyTo.kt +++ b/app/src/main/java/chat/peptide/composables/chat/InReplyTo.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import android.util.Log import androidx.compose.foundation.clickable @@ -26,16 +26,16 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -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.composables.generic.UserAvatar -import chat.revolt.markdown.jbm.JBM -import chat.revolt.markdown.jbm.JBMRenderer -import chat.revolt.markdown.jbm.LocalJBMarkdownTreeState +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.solidColor +import chat.peptide.api.routes.channel.fetchSingleMessage +import chat.peptide.api.schemas.User +import chat.peptide.api.settings.Experiments +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.markdown.jbm.JBM +import chat.peptide.markdown.jbm.JBMRenderer +import chat.peptide.markdown.jbm.LocalJBMarkdownTreeState import java.util.concurrent.CancellationException @OptIn(JBM::class) diff --git a/app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt b/app/src/main/java/chat/peptide/composables/chat/InlineBadge.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt rename to app/src/main/java/chat/peptide/composables/chat/InlineBadge.kt index a5f9bfc5..1a92e2a7 100644 --- a/app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt +++ b/app/src/main/java/chat/peptide/composables/chat/InlineBadge.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding @@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import chat.revolt.R +import chat.peptide.R enum class InlineBadge { Bot, diff --git a/app/src/main/java/chat/revolt/composables/chat/MemberListItem.kt b/app/src/main/java/chat/peptide/composables/chat/MemberListItem.kt similarity index 83% rename from app/src/main/java/chat/revolt/composables/chat/MemberListItem.kt rename to app/src/main/java/chat/peptide/composables/chat/MemberListItem.kt index 775ed1dc..4a06654d 100644 --- a/app/src/main/java/chat/revolt/composables/chat/MemberListItem.kt +++ b/app/src/main/java/chat/peptide/composables/chat/MemberListItem.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.material3.ListItem import androidx.compose.material3.LocalContentColor @@ -8,15 +8,15 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Brush import androidx.compose.ui.text.style.TextOverflow -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.BrushCompat -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.composables.generic.UserAvatar -import chat.revolt.composables.generic.presenceFromStatus -import chat.revolt.internals.extensions.TransparentListItemColours +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.BrushCompat +import chat.peptide.api.internals.Roles +import chat.peptide.api.internals.solidColor +import chat.peptide.api.schemas.Member +import chat.peptide.api.schemas.User +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.composables.generic.presenceFromStatus +import chat.peptide.internals.extensions.TransparentListItemColours @Composable fun MemberListItem( diff --git a/app/src/main/java/chat/revolt/composables/chat/Message.kt b/app/src/main/java/chat/peptide/composables/chat/Message.kt similarity index 89% rename from app/src/main/java/chat/revolt/composables/chat/Message.kt rename to app/src/main/java/chat/peptide/composables/chat/Message.kt index 50fba1c1..30f32ba4 100644 --- a/app/src/main/java/chat/revolt/composables/chat/Message.kt +++ b/app/src/main/java/chat/peptide/composables/chat/Message.kt @@ -1,10 +1,11 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import android.annotation.SuppressLint import android.content.Intent import android.icu.text.DateFormat import android.net.Uri import android.text.format.DateUtils +import android.util.Log import android.widget.Toast import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -59,40 +60,41 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.activities.media.ImageViewActivity -import chat.revolt.activities.media.VideoViewActivity -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.BrushCompat -import chat.revolt.api.internals.MessageFlag -import chat.revolt.api.internals.Roles -import chat.revolt.api.internals.SpecialUsers -import chat.revolt.api.internals.ULID -import chat.revolt.api.internals.has -import chat.revolt.api.internals.solidColor -import chat.revolt.api.routes.channel.react -import chat.revolt.api.routes.channel.unreact -import chat.revolt.api.routes.microservices.january.asJanuaryProxyUrl -import chat.revolt.api.schemas.AutumnResource -import chat.revolt.api.schemas.User -import chat.revolt.api.settings.Experiments -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.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.internals.text.MessageProcessor -import chat.revolt.markdown.jbm.JBM -import chat.revolt.markdown.jbm.JBMRenderer -import chat.revolt.markdown.jbm.LocalJBMarkdownTreeState -import chat.revolt.persistence.KVStorage +import chat.peptide.R +import chat.peptide.activities.media.ImageViewActivity +import chat.peptide.activities.media.VideoViewActivity +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.BrushCompat +import chat.peptide.api.internals.MessageFlag +import chat.peptide.api.internals.Roles +import chat.peptide.api.internals.SpecialUsers +import chat.peptide.api.internals.ULID +import chat.peptide.api.internals.has +import chat.peptide.api.internals.solidColor +import chat.peptide.api.routes.channel.react +import chat.peptide.api.routes.channel.unreact +import chat.peptide.api.routes.microservices.january.asJanuaryProxyUrl +import chat.peptide.api.schemas.AutumnResource +import chat.peptide.api.schemas.User +import chat.peptide.api.settings.Experiments +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.api.settings.MessageReplyStyle +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.utils.InternalLinkHandler +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.composables.generic.UserAvatarWidthPlaceholder +import chat.peptide.composables.markdown.LocalMarkdownTreeConfig +import chat.peptide.composables.markdown.RichMarkdown +import chat.peptide.internals.text.Gigamoji +import chat.peptide.internals.text.MessageProcessor +import chat.peptide.markdown.jbm.JBM +import chat.peptide.markdown.jbm.JBMRenderer +import chat.peptide.markdown.jbm.LocalJBMarkdownTreeState +import chat.peptide.persistence.KVStorage import kotlinx.coroutines.launch -import chat.revolt.api.schemas.Message as MessageSchema +import chat.peptide.api.schemas.Message as MessageSchema @Composable fun authorColour(message: MessageSchema): Brush { @@ -145,14 +147,44 @@ fun authorAvatarUrl(message: MessageSchema): String? { } fun viewUrlInBrowser(ctx: android.content.Context, url: String) { - val customTab = CustomTabsIntent - .Builder() - .build() - customTab.launchUrl(ctx, Uri.parse(url)) + Log.d("Message", "viewUrlInBrowser called with url: $url") + + // Check if this is an internal link that should be handled by the app + if (InternalLinkHandler.isInternalLink(url)) { + Log.d("Message", "URL is an internal link, attempting to handle internally") + + // Try to handle the link internally + val handled = InternalLinkHandler.handleInternalLink(ctx, url, true) + + Log.d("Message", "Internal link handled: $handled") + + if (handled) { + // Link was handled internally + Log.d("Message", "Link was handled internally, returning") + return + } else { + Log.d("Message", "Failed to handle link internally, falling back to browser") + } + } else { + Log.d("Message", "URL is not an internal link, opening in browser") + } + + // If not an internal link or couldn't be handled internally, open in browser + try { + Log.d("Message", "Opening URL in browser") + val customTab = CustomTabsIntent + .Builder() + .build() + customTab.launchUrl(ctx, Uri.parse(url)) + Log.d("Message", "URL opened in browser successfully") + } catch (e: Exception) { + Log.e("Message", "Error opening URL in browser", e) + } } fun viewAttachmentInBrowser(ctx: android.content.Context, attachment: AutumnResource) { - val url = "${RevoltAPI.getCurrentFilesUrl()}/attachments/${attachment.id}/${attachment.filename}" + val url = + "${RevoltAPI.getCurrentFilesUrl()}/attachments/${attachment.id}/${attachment.filename}" viewUrlInBrowser(ctx, url) } @@ -186,6 +218,7 @@ fun formatLongAsTime(time: Long): String { @OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class, JBM::class) @Composable fun Message( + modifier: Modifier = Modifier, message: MessageSchema, onMessageContextMenu: () -> Unit = {}, onAvatarClick: () -> Unit = {}, @@ -195,7 +228,6 @@ fun Message( onAddReaction: () -> Unit = {}, fromWebhook: Boolean = false, webhookName: String? = null, - modifier: Modifier = Modifier ) { val author = RevoltAPI.userCache[message.author] ?: return CircularProgressIndicator() val context = LocalContext.current @@ -516,9 +548,12 @@ fun Message( } Spacer(modifier = Modifier.height(8.dp)) - Embed(embed = embed, onLinkClick = { - viewUrlInBrowser(context, it) - }) + Embed( + embed = embed, + onLinkClick = { + viewUrlInBrowser(context, it) + } + ) Spacer(modifier = Modifier.height(8.dp)) } diff --git a/app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt b/app/src/main/java/chat/peptide/composables/chat/MessageAttachment.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt rename to app/src/main/java/chat/peptide/composables/chat/MessageAttachment.kt index f737cb1e..15aa406d 100644 --- a/app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt +++ b/app/src/main/java/chat/peptide/composables/chat/MessageAttachment.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import android.annotation.SuppressLint import android.text.format.Formatter @@ -32,11 +32,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.AutumnResource -import chat.revolt.composables.generic.RemoteImage -import chat.revolt.composables.media.AudioPlayer +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.AutumnResource +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.media.AudioPlayer import dev.chrisbanes.haze.hazeEffect import dev.chrisbanes.haze.hazeSource import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi diff --git a/app/src/main/java/chat/revolt/composables/chat/MessageField.kt b/app/src/main/java/chat/peptide/composables/chat/MessageField.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/chat/MessageField.kt rename to app/src/main/java/chat/peptide/composables/chat/MessageField.kt index 3a327122..bb5ad5e2 100644 --- a/app/src/main/java/chat/revolt/composables/chat/MessageField.kt +++ b/app/src/main/java/chat/peptide/composables/chat/MessageField.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import android.net.Uri import androidx.compose.animation.AnimatedVisibility @@ -79,17 +79,17 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.activities.RevoltTweenFloat -import chat.revolt.activities.RevoltTweenInt -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.BrushCompat -import chat.revolt.api.schemas.ChannelType -import chat.revolt.api.schemas.Member -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 chat.peptide.R +import chat.peptide.activities.RevoltTweenFloat +import chat.peptide.activities.RevoltTweenInt +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.BrushCompat +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.schemas.Member +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.composables.screens.chat.ChannelIcon +import chat.peptide.internals.Autocomplete import kotlinx.coroutines.launch fun Pair.asTextRange(): TextRange { @@ -111,25 +111,25 @@ private fun CharSequence.lastWordStartsAt(): Int { sealed class AutocompleteSuggestion { data class User( - val user: chat.revolt.api.schemas.User, + val user: chat.peptide.api.schemas.User, val member: Member?, val query: String ) : AutocompleteSuggestion() data class Channel( - val channel: chat.revolt.api.schemas.Channel, + val channel: chat.peptide.api.schemas.Channel, val query: String ) : AutocompleteSuggestion() data class Emoji( val shortcode: String, val unicode: String?, - val custom: chat.revolt.api.schemas.Emoji?, + val custom: chat.peptide.api.schemas.Emoji?, val query: String ) : AutocompleteSuggestion() data class Role( - val role: chat.revolt.api.schemas.Role, + val role: chat.peptide.api.schemas.Role, val id: String, val query: String ) : AutocompleteSuggestion() diff --git a/app/src/main/java/chat/revolt/composables/chat/Reaction.kt b/app/src/main/java/chat/peptide/composables/chat/Reaction.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/chat/Reaction.kt rename to app/src/main/java/chat/peptide/composables/chat/Reaction.kt index e28f48b6..f7907ff2 100644 --- a/app/src/main/java/chat/revolt/composables/chat/Reaction.kt +++ b/app/src/main/java/chat/peptide/composables/chat/Reaction.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.animation.AnimatedContent import androidx.compose.animation.animateColorAsState @@ -28,9 +28,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.isUlid -import chat.revolt.composables.generic.RemoteImage +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.isUlid +import chat.peptide.composables.generic.RemoteImage @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/java/chat/revolt/composables/chat/RoleChip.kt b/app/src/main/java/chat/peptide/composables/chat/RoleChip.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/chat/RoleChip.kt rename to app/src/main/java/chat/peptide/composables/chat/RoleChip.kt index 09a67abb..a6f8386f 100644 --- a/app/src/main/java/chat/revolt/composables/chat/RoleChip.kt +++ b/app/src/main/java/chat/peptide/composables/chat/RoleChip.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/composables/chat/RoleListEntry.kt b/app/src/main/java/chat/peptide/composables/chat/RoleListEntry.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/chat/RoleListEntry.kt rename to app/src/main/java/chat/peptide/composables/chat/RoleListEntry.kt index cfad0022..0dad6d37 100644 --- a/app/src/main/java/chat/revolt/composables/chat/RoleListEntry.kt +++ b/app/src/main/java/chat/peptide/composables/chat/RoleListEntry.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/composables/chat/SystemMessage.kt b/app/src/main/java/chat/peptide/composables/chat/SystemMessage.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/chat/SystemMessage.kt rename to app/src/main/java/chat/peptide/composables/chat/SystemMessage.kt index 776ef49f..f528b876 100644 --- a/app/src/main/java/chat/revolt/composables/chat/SystemMessage.kt +++ b/app/src/main/java/chat/peptide/composables/chat/SystemMessage.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -28,9 +28,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight 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.composables.markdown.RichMarkdown +import chat.peptide.R +import chat.peptide.api.schemas.Message +import chat.peptide.composables.markdown.RichMarkdown enum class SystemMessageType(val type: String) { CHANNEL_OWNERSHIP_CHANGED("channel_ownership_changed"), diff --git a/app/src/main/java/chat/revolt/composables/chat/TimeRift.kt b/app/src/main/java/chat/peptide/composables/chat/TimeRift.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/chat/TimeRift.kt rename to app/src/main/java/chat/peptide/composables/chat/TimeRift.kt index efebc12f..43371743 100644 --- a/app/src/main/java/chat/revolt/composables/chat/TimeRift.kt +++ b/app/src/main/java/chat/peptide/composables/chat/TimeRift.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -19,7 +19,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R +import chat.peptide.R @Composable fun TimeRift(modifier: Modifier = Modifier, onMessageLoad: () -> Unit) { diff --git a/app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt b/app/src/main/java/chat/peptide/composables/chat/UserBadgeList.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt rename to app/src/main/java/chat/peptide/composables/chat/UserBadgeList.kt index b191652d..23d0aba5 100644 --- a/app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt +++ b/app/src/main/java/chat/peptide/composables/chat/UserBadgeList.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat +package chat.peptide.composables.chat import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -17,9 +17,9 @@ import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.api.schemas.UserBadges -import chat.revolt.api.schemas.has +import chat.peptide.R +import chat.peptide.api.schemas.UserBadges +import chat.peptide.api.schemas.has @Composable fun BadgeListEntryTemplate( diff --git a/app/src/main/java/chat/revolt/composables/chat/specialembeds/AppleMusicEmbed.kt b/app/src/main/java/chat/peptide/composables/chat/specialembeds/AppleMusicEmbed.kt similarity index 91% rename from app/src/main/java/chat/revolt/composables/chat/specialembeds/AppleMusicEmbed.kt rename to app/src/main/java/chat/peptide/composables/chat/specialembeds/AppleMusicEmbed.kt index 586fc8eb..867b69c9 100644 --- a/app/src/main/java/chat/revolt/composables/chat/specialembeds/AppleMusicEmbed.kt +++ b/app/src/main/java/chat/peptide/composables/chat/specialembeds/AppleMusicEmbed.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat.specialembeds +package chat.peptide.composables.chat.specialembeds import android.annotation.SuppressLint import android.net.Uri @@ -11,9 +11,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView -import chat.revolt.api.schemas.Special -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.ui.theme.isThemeDark +import chat.peptide.api.schemas.Special +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.ui.theme.isThemeDark @SuppressLint("SetJavaScriptEnabled") @Composable diff --git a/app/src/main/java/chat/revolt/composables/chat/specialembeds/SpecialEmbedSwitch.kt b/app/src/main/java/chat/peptide/composables/chat/specialembeds/SpecialEmbedSwitch.kt similarity index 79% rename from app/src/main/java/chat/revolt/composables/chat/specialembeds/SpecialEmbedSwitch.kt rename to app/src/main/java/chat/peptide/composables/chat/specialembeds/SpecialEmbedSwitch.kt index 73990010..8a65fc01 100644 --- a/app/src/main/java/chat/revolt/composables/chat/specialembeds/SpecialEmbedSwitch.kt +++ b/app/src/main/java/chat/peptide/composables/chat/specialembeds/SpecialEmbedSwitch.kt @@ -1,9 +1,9 @@ -package chat.revolt.composables.chat.specialembeds +package chat.peptide.composables.chat.specialembeds import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import chat.revolt.api.schemas.Special -import chat.revolt.api.settings.LoadedSettings +import chat.peptide.api.schemas.Special +import chat.peptide.api.settings.LoadedSettings @Composable fun SpecialEmbedSwitch(special: Special, modifier: Modifier = Modifier) { diff --git a/app/src/main/java/chat/revolt/composables/chat/specialembeds/YouTubeEmbed.kt b/app/src/main/java/chat/peptide/composables/chat/specialembeds/YouTubeEmbed.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/chat/specialembeds/YouTubeEmbed.kt rename to app/src/main/java/chat/peptide/composables/chat/specialembeds/YouTubeEmbed.kt index 25e71ac5..38108f02 100644 --- a/app/src/main/java/chat/revolt/composables/chat/specialembeds/YouTubeEmbed.kt +++ b/app/src/main/java/chat/peptide/composables/chat/specialembeds/YouTubeEmbed.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.chat.specialembeds +package chat.peptide.composables.chat.specialembeds import android.annotation.SuppressLint import android.webkit.WebView @@ -21,10 +21,10 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalDensity 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.composables.chat.VideoPlayButton -import chat.revolt.composables.generic.RemoteImage +import chat.peptide.R +import chat.peptide.api.schemas.Special +import chat.peptide.composables.chat.VideoPlayButton +import chat.peptide.composables.generic.RemoteImage import org.intellij.lang.annotations.Language @Language("HTML") diff --git a/app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt b/app/src/main/java/chat/peptide/composables/emoji/EmojiPicker.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt rename to app/src/main/java/chat/peptide/composables/emoji/EmojiPicker.kt index 026814f2..ae49d32b 100644 --- a/app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt +++ b/app/src/main/java/chat/peptide/composables/emoji/EmojiPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.emoji +package chat.peptide.composables.emoji import android.util.TypedValue import android.view.HapticFeedbackConstants @@ -60,18 +60,18 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.activities.RevoltTweenFloat -import chat.revolt.api.RevoltAPI -import chat.revolt.callbacks.Action -import chat.revolt.callbacks.ActionChannel -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 -import chat.revolt.internals.FitzpatrickSkinTone -import chat.revolt.internals.UnicodeEmojiSection +import chat.peptide.R +import chat.peptide.activities.RevoltTweenFloat +import chat.peptide.api.RevoltAPI +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.composables.generic.IconPlaceholder +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.internals.Category +import chat.peptide.internals.EmojiImpl +import chat.peptide.internals.EmojiPickerItem +import chat.peptide.internals.FitzpatrickSkinTone +import chat.peptide.internals.UnicodeEmojiSection import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/revolt/composables/generic/CollapsibleCard.kt b/app/src/main/java/chat/peptide/composables/generic/CollapsibleCard.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/generic/CollapsibleCard.kt rename to app/src/main/java/chat/peptide/composables/generic/CollapsibleCard.kt index f80c966c..2f939214 100644 --- a/app/src/main/java/chat/revolt/composables/generic/CollapsibleCard.kt +++ b/app/src/main/java/chat/peptide/composables/generic/CollapsibleCard.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.clickable diff --git a/app/src/main/java/chat/revolt/composables/generic/DobPicker.kt b/app/src/main/java/chat/peptide/composables/generic/DobPicker.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/generic/DobPicker.kt rename to app/src/main/java/chat/peptide/composables/generic/DobPicker.kt index 7c1bbfa7..a2bc8910 100644 --- a/app/src/main/java/chat/revolt/composables/generic/DobPicker.kt +++ b/app/src/main/java/chat/peptide/composables/generic/DobPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -18,7 +18,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import chat.revolt.R +import chat.peptide.R sealed class DobElement { data object Day : DobElement() diff --git a/app/src/main/java/chat/revolt/composables/generic/FormTextField.kt b/app/src/main/java/chat/peptide/composables/generic/FormTextField.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/generic/FormTextField.kt rename to app/src/main/java/chat/peptide/composables/generic/FormTextField.kt index fe4eeeea..f5641c75 100644 --- a/app/src/main/java/chat/revolt/composables/generic/FormTextField.kt +++ b/app/src/main/java/chat/peptide/composables/generic/FormTextField.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.Text diff --git a/app/src/main/java/chat/revolt/composables/generic/GradientStopEditor.kt b/app/src/main/java/chat/peptide/composables/generic/GradientStopEditor.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/generic/GradientStopEditor.kt rename to app/src/main/java/chat/peptide/composables/generic/GradientStopEditor.kt index 12c82dd8..5d6a31e2 100644 --- a/app/src/main/java/chat/revolt/composables/generic/GradientStopEditor.kt +++ b/app/src/main/java/chat/peptide/composables/generic/GradientStopEditor.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import android.annotation.SuppressLint import androidx.compose.foundation.Canvas diff --git a/app/src/main/java/chat/revolt/composables/generic/HealthAlert.kt b/app/src/main/java/chat/peptide/composables/generic/HealthAlert.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/generic/HealthAlert.kt rename to app/src/main/java/chat/peptide/composables/generic/HealthAlert.kt index dfce1dc9..e864cc47 100644 --- a/app/src/main/java/chat/revolt/composables/generic/HealthAlert.kt +++ b/app/src/main/java/chat/peptide/composables/generic/HealthAlert.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.core.net.toUri -import chat.revolt.R -import chat.revolt.api.schemas.HealthNotice +import chat.peptide.R +import chat.peptide.api.schemas.HealthNotice @Composable fun HealthAlert(notice: HealthNotice, onDismiss: () -> Unit) { diff --git a/app/src/main/java/chat/revolt/composables/generic/IconPlaceholder.kt b/app/src/main/java/chat/peptide/composables/generic/IconPlaceholder.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/generic/IconPlaceholder.kt rename to app/src/main/java/chat/peptide/composables/generic/IconPlaceholder.kt index 5cd2c417..5710dfe7 100644 --- a/app/src/main/java/chat/revolt/composables/generic/IconPlaceholder.kt +++ b/app/src/main/java/chat/peptide/composables/generic/IconPlaceholder.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt b/app/src/main/java/chat/peptide/composables/generic/InlineMediaPicker.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt rename to app/src/main/java/chat/peptide/composables/generic/InlineMediaPicker.kt index 4c6cc06a..f26205f9 100644 --- a/app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt +++ b/app/src/main/java/chat/peptide/composables/generic/InlineMediaPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import android.net.Uri import androidx.activity.compose.rememberLauncherForActivityResult @@ -27,8 +27,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.api.settings.LoadedSettings +import chat.peptide.R +import chat.peptide.api.settings.LoadedSettings import com.bumptech.glide.integration.compose.CrossFade import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi import com.bumptech.glide.integration.compose.GlideImage diff --git a/app/src/main/java/chat/revolt/composables/generic/ListHeader.kt b/app/src/main/java/chat/peptide/composables/generic/ListHeader.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/generic/ListHeader.kt rename to app/src/main/java/chat/peptide/composables/generic/ListHeader.kt index 952b89b8..1d6bba9f 100644 --- a/app/src/main/java/chat/revolt/composables/generic/ListHeader.kt +++ b/app/src/main/java/chat/peptide/composables/generic/ListHeader.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt b/app/src/main/java/chat/peptide/composables/generic/NonIdealState.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt rename to app/src/main/java/chat/peptide/composables/generic/NonIdealState.kt index 2145a38c..b647341d 100644 --- a/app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt +++ b/app/src/main/java/chat/peptide/composables/generic/NonIdealState.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -26,7 +26,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import chat.revolt.R +import chat.peptide.R private val NoneLambda = @Composable { throw UnsupportedOperationException() } diff --git a/app/src/main/java/chat/revolt/composables/generic/PrimaryTabs.kt b/app/src/main/java/chat/peptide/composables/generic/PrimaryTabs.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/generic/PrimaryTabs.kt rename to app/src/main/java/chat/peptide/composables/generic/PrimaryTabs.kt index 6fb1e17e..912e594c 100644 --- a/app/src/main/java/chat/revolt/composables/generic/PrimaryTabs.kt +++ b/app/src/main/java/chat/peptide/composables/generic/PrimaryTabs.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.ExperimentalMaterial3Api @@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.viewinterop.AndroidView -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.ui.theme.Theme +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.ui.theme.Theme import com.google.android.material.tabs.TabLayout @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/revolt/composables/generic/RadioItem.kt b/app/src/main/java/chat/peptide/composables/generic/RadioItem.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/generic/RadioItem.kt rename to app/src/main/java/chat/peptide/composables/generic/RadioItem.kt index 67f9490e..da41fa94 100644 --- a/app/src/main/java/chat/revolt/composables/generic/RadioItem.kt +++ b/app/src/main/java/chat/peptide/composables/generic/RadioItem.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.selection.selectable diff --git a/app/src/main/java/chat/revolt/composables/generic/RemoteImage.kt b/app/src/main/java/chat/peptide/composables/generic/RemoteImage.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/generic/RemoteImage.kt rename to app/src/main/java/chat/peptide/composables/generic/RemoteImage.kt index 46889f09..d6c1ebf5 100644 --- a/app/src/main/java/chat/revolt/composables/generic/RemoteImage.kt +++ b/app/src/main/java/chat/peptide/composables/generic/RemoteImage.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import android.util.DisplayMetrics import androidx.compose.foundation.layout.height diff --git a/app/src/main/java/chat/revolt/composables/generic/SheetButton.kt b/app/src/main/java/chat/peptide/composables/generic/SheetButton.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/generic/SheetButton.kt rename to app/src/main/java/chat/peptide/composables/generic/SheetButton.kt index 87d997d2..7d1a7b9b 100644 --- a/app/src/main/java/chat/revolt/composables/generic/SheetButton.kt +++ b/app/src/main/java/chat/peptide/composables/generic/SheetButton.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import chat.revolt.internals.extensions.TransparentListItemColours +import chat.peptide.internals.extensions.TransparentListItemColours @Composable fun SheetButton( diff --git a/app/src/main/java/chat/revolt/composables/generic/SheetHeaderPadding.kt b/app/src/main/java/chat/peptide/composables/generic/SheetHeaderPadding.kt similarity index 92% rename from app/src/main/java/chat/revolt/composables/generic/SheetHeaderPadding.kt rename to app/src/main/java/chat/peptide/composables/generic/SheetHeaderPadding.kt index 8ec94e42..077d6ede 100644 --- a/app/src/main/java/chat/revolt/composables/generic/SheetHeaderPadding.kt +++ b/app/src/main/java/chat/peptide/composables/generic/SheetHeaderPadding.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope diff --git a/app/src/main/java/chat/revolt/composables/generic/SquareButton.kt b/app/src/main/java/chat/peptide/composables/generic/SquareButton.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/generic/SquareButton.kt rename to app/src/main/java/chat/peptide/composables/generic/SquareButton.kt index 4c8d4a30..b357832c 100644 --- a/app/src/main/java/chat/revolt/composables/generic/SquareButton.kt +++ b/app/src/main/java/chat/peptide/composables/generic/SquareButton.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import androidx.compose.foundation.shape.CornerSize import androidx.compose.material3.Button diff --git a/app/src/main/java/chat/revolt/composables/generic/UserAvatar.kt b/app/src/main/java/chat/peptide/composables/generic/UserAvatar.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/generic/UserAvatar.kt rename to app/src/main/java/chat/peptide/composables/generic/UserAvatar.kt index ad321892..19ab7695 100644 --- a/app/src/main/java/chat/revolt/composables/generic/UserAvatar.kt +++ b/app/src/main/java/chat/peptide/composables/generic/UserAvatar.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import android.graphics.Bitmap import android.graphics.drawable.BitmapDrawable @@ -24,10 +24,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.AutumnResource -import chat.revolt.api.settings.LoadedSettings +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.AutumnResource +import chat.peptide.api.settings.LoadedSettings enum class Presence { Online, diff --git a/app/src/main/java/chat/revolt/composables/generic/Weblink.kt b/app/src/main/java/chat/peptide/composables/generic/Weblink.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/generic/Weblink.kt rename to app/src/main/java/chat/peptide/composables/generic/Weblink.kt index dc0b1476..bfdde921 100644 --- a/app/src/main/java/chat/revolt/composables/generic/Weblink.kt +++ b/app/src/main/java/chat/peptide/composables/generic/Weblink.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.generic +package chat.peptide.composables.generic import android.net.Uri import androidx.browser.customtabs.CustomTabsIntent diff --git a/app/src/main/java/chat/revolt/composables/markdown/MarkdownCodeBlock.kt b/app/src/main/java/chat/peptide/composables/markdown/MarkdownCodeBlock.kt similarity index 89% rename from app/src/main/java/chat/revolt/composables/markdown/MarkdownCodeBlock.kt rename to app/src/main/java/chat/peptide/composables/markdown/MarkdownCodeBlock.kt index 97a48abf..db63ec28 100644 --- a/app/src/main/java/chat/revolt/composables/markdown/MarkdownCodeBlock.kt +++ b/app/src/main/java/chat/peptide/composables/markdown/MarkdownCodeBlock.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.markdown +package chat.peptide.composables.markdown import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -9,8 +9,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp -import chat.revolt.ndk.AstNode -import chat.revolt.ui.theme.FragmentMono +import chat.peptide.ndk.AstNode +import chat.peptide.ui.theme.FragmentMono @Composable fun MarkdownCodeBlock(node: AstNode, modifier: Modifier = Modifier) { diff --git a/app/src/main/java/chat/revolt/composables/markdown/MarkdownText.kt b/app/src/main/java/chat/peptide/composables/markdown/MarkdownText.kt similarity index 89% rename from app/src/main/java/chat/revolt/composables/markdown/MarkdownText.kt rename to app/src/main/java/chat/peptide/composables/markdown/MarkdownText.kt index 5c70613b..04ddef40 100644 --- a/app/src/main/java/chat/revolt/composables/markdown/MarkdownText.kt +++ b/app/src/main/java/chat/peptide/composables/markdown/MarkdownText.kt @@ -1,6 +1,7 @@ -package chat.revolt.composables.markdown +package chat.peptide.composables.markdown import android.content.Intent +import android.util.Log import android.widget.Toast import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent @@ -33,18 +34,19 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontSynthesis import androidx.compose.ui.text.font.FontWeight import androidx.core.net.toUri -import chat.revolt.R -import chat.revolt.activities.InviteActivity -import chat.revolt.api.RevoltAPI -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.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 +import chat.peptide.R +import chat.peptide.activities.InviteActivity +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.custom.fetchEmoji +import chat.peptide.api.schemas.isInviteUri +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.utils.detectTapGesturesConditionalConsume +import chat.peptide.internals.resolveTimestamp +import chat.peptide.ndk.AstNode +import chat.peptide.ui.theme.FragmentMono +import chat.peptide.utils.InternalLinkHandler import kotlinx.coroutines.launch @@ -306,10 +308,12 @@ fun MarkdownText(textNode: AstNode, modifier: Modifier = Modifier) { end = offset ).firstOrNull()?.let { annotation -> val url = annotation.item + Log.d("MarkdownText", "URL clicked: $url") try { val uri = url.toUri() if (uri.isInviteUri()) { + Log.d("MarkdownText", "URL is an invite URI, launching InviteActivity") scope.launch { Intent(context, InviteActivity::class.java).apply { data = uri @@ -322,6 +326,25 @@ fun MarkdownText(textNode: AstNode, modifier: Modifier = Modifier) { // no-op } + // Check if this is an internal link that should be handled by the app + Log.d("MarkdownText", "Checking if URL is internal link") + if (InternalLinkHandler.isInternalLink(url)) { + Log.d("MarkdownText", "URL is internal link, attempting to handle internally") + // Try to handle the link internally + val handled = InternalLinkHandler.handleInternalLink(context, url, true) + Log.d("MarkdownText", "Internal link handled: $handled") + if (handled) { + // Link was handled internally + Log.d("MarkdownText", "Link handled internally, returning") + return@handler true + } else { + Log.d("MarkdownText", "Failed to handle link internally, falling back to browser") + } + } else { + Log.d("MarkdownText", "URL is not internal link, opening in browser") + } + + // If not an internal link or couldn't be handled internally, open in browser val customTab = CustomTabsIntent.Builder() .setShowTitle(true) .setDefaultColorSchemeParams( diff --git a/app/src/main/java/chat/revolt/composables/markdown/MarkdownTree.kt b/app/src/main/java/chat/peptide/composables/markdown/MarkdownTree.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/markdown/MarkdownTree.kt rename to app/src/main/java/chat/peptide/composables/markdown/MarkdownTree.kt index 4a17ceb7..6022664e 100644 --- a/app/src/main/java/chat/revolt/composables/markdown/MarkdownTree.kt +++ b/app/src/main/java/chat/peptide/composables/markdown/MarkdownTree.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.markdown +package chat.peptide.composables.markdown import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -22,8 +22,8 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.api.internals.solidColor -import chat.revolt.ndk.AstNode +import chat.peptide.api.internals.solidColor +import chat.peptide.ndk.AstNode data class MarkdownTreeConfig( val linksClickable: Boolean = true, diff --git a/app/src/main/java/chat/revolt/composables/markdown/RichMarkdown.kt b/app/src/main/java/chat/peptide/composables/markdown/RichMarkdown.kt similarity index 68% rename from app/src/main/java/chat/revolt/composables/markdown/RichMarkdown.kt rename to app/src/main/java/chat/peptide/composables/markdown/RichMarkdown.kt index f09a8eca..0d14da97 100644 --- a/app/src/main/java/chat/revolt/composables/markdown/RichMarkdown.kt +++ b/app/src/main/java/chat/peptide/composables/markdown/RichMarkdown.kt @@ -1,12 +1,12 @@ -package chat.revolt.composables.markdown +package chat.peptide.composables.markdown import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import chat.revolt.api.settings.Experiments -import chat.revolt.markdown.jbm.JBM -import chat.revolt.markdown.jbm.JBMRenderer -import chat.revolt.ndk.Stendal +import chat.peptide.api.settings.Experiments +import chat.peptide.markdown.jbm.JBM +import chat.peptide.markdown.jbm.JBMRenderer +import chat.peptide.ndk.Stendal @OptIn(JBM::class) @Composable diff --git a/app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt b/app/src/main/java/chat/peptide/composables/media/AudioPlayer.kt similarity index 99% rename from app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt rename to app/src/main/java/chat/peptide/composables/media/AudioPlayer.kt index 3dd8d09d..2bf7551b 100644 --- a/app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt +++ b/app/src/main/java/chat/peptide/composables/media/AudioPlayer.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.media +package chat.peptide.composables.media import android.content.ContentValues import android.content.Intent @@ -40,8 +40,8 @@ import androidx.compose.ui.unit.dp import androidx.media3.common.MediaItem import androidx.media3.common.Player import androidx.media3.exoplayer.ExoPlayer -import chat.revolt.R -import chat.revolt.api.RevoltHttp +import chat.peptide.R +import chat.peptide.api.RevoltHttp import io.ktor.client.request.get import io.ktor.client.statement.readBytes import kotlinx.coroutines.delay diff --git a/app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt b/app/src/main/java/chat/peptide/composables/media/MediaPickerGateway.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt rename to app/src/main/java/chat/peptide/composables/media/MediaPickerGateway.kt index a8e90b94..8025ee7c 100644 --- a/app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt +++ b/app/src/main/java/chat/peptide/composables/media/MediaPickerGateway.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.media +package chat.peptide.composables.media import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -27,7 +27,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import chat.revolt.R +import chat.peptide.R @Composable fun MediaPickerGateway( diff --git a/app/src/main/java/chat/revolt/composables/profile/UserCard.kt b/app/src/main/java/chat/peptide/composables/profile/UserCard.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/profile/UserCard.kt rename to app/src/main/java/chat/peptide/composables/profile/UserCard.kt index 710345c9..209034a1 100644 --- a/app/src/main/java/chat/revolt/composables/profile/UserCard.kt +++ b/app/src/main/java/chat/peptide/composables/profile/UserCard.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.profile +package chat.peptide.composables.profile import android.graphics.Bitmap import android.icu.text.DateFormat @@ -51,13 +51,13 @@ import androidx.compose.ui.unit.sp import androidx.constraintlayout.compose.ConstraintLayout import androidx.core.graphics.drawable.toBitmap import androidx.palette.graphics.Palette -import chat.revolt.R -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.composables.generic.UserAvatar -import chat.revolt.ui.theme.FragmentMono +import chat.peptide.R +import chat.peptide.api.internals.ResourceLocations +import chat.peptide.api.internals.ULID +import chat.peptide.api.internals.UserQR +import chat.peptide.api.schemas.User +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.ui.theme.FragmentMono import com.bumptech.glide.Glide import com.google.zxing.BarcodeFormat import com.google.zxing.EncodeHintType diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt b/app/src/main/java/chat/peptide/composables/screens/chat/AttachmentManager.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/AttachmentManager.kt index 04c8c9ad..f7eb7015 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/AttachmentManager.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat +package chat.peptide.composables.screens.chat import android.text.format.Formatter import androidx.compose.animation.AnimatedVisibility @@ -50,9 +50,9 @@ import androidx.compose.ui.text.font.FontWeight 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.api.routes.microservices.autumn.FileArgs -import chat.revolt.composables.generic.RemoteImage +import chat.peptide.R +import chat.peptide.api.routes.microservices.autumn.FileArgs +import chat.peptide.composables.generic.RemoteImage import kotlinx.coroutines.launch import java.io.File diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt b/app/src/main/java/chat/peptide/composables/screens/chat/ChannelHeader.kt similarity index 94% rename from app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/ChannelHeader.kt index a841cd63..74a0e186 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/ChannelHeader.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat +package chat.peptide.composables.screens.chat import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row @@ -22,10 +22,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.api.internals.ChannelUtils -import chat.revolt.api.schemas.Channel -import chat.revolt.api.schemas.ChannelType +import chat.peptide.R +import chat.peptide.api.internals.ChannelUtils +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.ChannelType @Composable fun ChannelHeader( diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt b/app/src/main/java/chat/peptide/composables/screens/chat/ChannelIcon.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/ChannelIcon.kt index 87dd0907..658d8ff5 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/ChannelIcon.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat +package chat.peptide.composables.screens.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -16,8 +16,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.api.schemas.ChannelType +import chat.peptide.R +import chat.peptide.api.schemas.ChannelType @Composable fun ChannelIcon(channelType: ChannelType, modifier: Modifier = Modifier) { diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelSheetHeader.kt b/app/src/main/java/chat/peptide/composables/screens/chat/ChannelSheetHeader.kt similarity index 89% rename from app/src/main/java/chat/revolt/composables/screens/chat/ChannelSheetHeader.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/ChannelSheetHeader.kt index 0ee6371c..a698090b 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelSheetHeader.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/ChannelSheetHeader.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat +package chat.peptide.composables.screens.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -26,15 +26,15 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.AutumnResource -import chat.revolt.api.schemas.ChannelType -import chat.revolt.api.schemas.User -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 +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.AutumnResource +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.schemas.User +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.composables.markdown.MarkdownTree +import chat.peptide.ndk.AstNode +import chat.peptide.ndk.Stendal @Composable fun ChannelSheetHeader( diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt b/app/src/main/java/chat/peptide/composables/screens/chat/ReplyManager.kt similarity index 91% rename from app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/ReplyManager.kt index 5250e1e2..ee2a5287 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/ReplyManager.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat +package chat.peptide.composables.screens.chat import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -27,15 +27,15 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -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.composables.chat.authorAvatarUrl -import chat.revolt.composables.chat.authorColour -import chat.revolt.composables.chat.authorName -import chat.revolt.composables.generic.UserAvatar +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.ULID +import chat.peptide.api.routes.channel.SendMessageReply +import chat.peptide.api.schemas.Message +import chat.peptide.composables.chat.authorAvatarUrl +import chat.peptide.composables.chat.authorColour +import chat.peptide.composables.chat.authorName +import chat.peptide.composables.generic.UserAvatar @Composable fun replyContentText(message: Message): String { diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/TypingIndicator.kt b/app/src/main/java/chat/peptide/composables/screens/chat/TypingIndicator.kt similarity index 92% rename from app/src/main/java/chat/revolt/composables/screens/chat/TypingIndicator.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/TypingIndicator.kt index a8443e3f..81dcbb91 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/TypingIndicator.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/TypingIndicator.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat +package chat.peptide.composables.screens.chat import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -21,12 +21,12 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.activities.RevoltTweenFloat -import chat.revolt.activities.RevoltTweenInt -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.User -import chat.revolt.composables.generic.UserAvatar +import chat.peptide.R +import chat.peptide.activities.RevoltTweenFloat +import chat.peptide.activities.RevoltTweenInt +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.User +import chat.peptide.composables.generic.UserAvatar @Composable fun StackedUserAvatars( diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt b/app/src/main/java/chat/peptide/composables/screens/chat/atoms/RegularMessage.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/atoms/RegularMessage.kt index 505102f0..0b4b6fd3 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/atoms/RegularMessage.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat.atoms +package chat.peptide.composables.screens.chat.atoms import android.annotation.SuppressLint import androidx.compose.animation.AnimatedContent @@ -41,16 +41,16 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.min -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.Channel -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.composables.chat.Message -import chat.revolt.internals.extensions.supportSwipeReply +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.Message +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.api.settings.MessageReplyStyle +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.composables.chat.Message +import chat.peptide.internals.extensions.supportSwipeReply import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import kotlin.math.abs diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersList.kt b/app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersList.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersList.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersList.kt index 374d924a..e50ee85b 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersList.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersList.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat.discover +package chat.peptide.composables.screens.chat.discover import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -39,10 +39,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.graphics.toColorInt import androidx.hilt.navigation.compose.hiltViewModel -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.routes.googlesheets.ServerData -import chat.revolt.composables.generic.SquareButton +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.googlesheets.ServerData +import chat.peptide.composables.generic.SquareButton @Composable fun DiscoverServersList( diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersListViewModel.kt b/app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersListViewModel.kt similarity index 91% rename from app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersListViewModel.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersListViewModel.kt index ae55a2ed..e123b15f 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersListViewModel.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersListViewModel.kt @@ -1,15 +1,15 @@ -package chat.revolt.composables.screens.chat.discover +package chat.peptide.composables.screens.chat.discover import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import chat.revolt.api.RevoltError -import chat.revolt.api.routes.googlesheets.ServerData -import chat.revolt.api.routes.googlesheets.ServerDataRepository -import chat.revolt.api.routes.invites.fetchInviteByCode -import chat.revolt.api.routes.invites.joinInviteByCode -import chat.revolt.api.schemas.Invite -import chat.revolt.api.schemas.InviteJoined -import chat.revolt.api.schemas.RsResult +import chat.peptide.api.RevoltError +import chat.peptide.api.routes.googlesheets.ServerData +import chat.peptide.api.routes.googlesheets.ServerDataRepository +import chat.peptide.api.routes.invites.fetchInviteByCode +import chat.peptide.api.routes.invites.joinInviteByCode +import chat.peptide.api.schemas.Invite +import chat.peptide.api.schemas.InviteJoined +import chat.peptide.api.schemas.RsResult import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteDialog.kt b/app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteDialog.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteDialog.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteDialog.kt index 88472408..ba907ccd 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteDialog.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteDialog.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat.discover +package chat.peptide.composables.screens.chat.discover import androidx.compose.foundation.Image import androidx.compose.foundation.border @@ -30,12 +30,12 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltError -import chat.revolt.api.schemas.Invite -import chat.revolt.composables.generic.IconPlaceholder -import chat.revolt.composables.generic.RemoteImage +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltError +import chat.peptide.api.schemas.Invite +import chat.peptide.composables.generic.IconPlaceholder +import chat.peptide.composables.generic.RemoteImage @Composable fun ServerInviteDialog( diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteHandler.kt b/app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteHandler.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteHandler.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteHandler.kt index c63b555c..788b1503 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteHandler.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteHandler.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat.discover +package chat.peptide.composables.screens.chat.discover import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState @@ -8,7 +8,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.hilt.navigation.compose.hiltViewModel -import chat.revolt.api.RevoltError +import chat.peptide.api.RevoltError import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt b/app/src/main/java/chat/peptide/composables/screens/chat/drawer/ChannelSideDrawer.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/drawer/ChannelSideDrawer.kt index c948cb5e..f1b61b1f 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/drawer/ChannelSideDrawer.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat.drawer +package chat.peptide.composables.screens.chat.drawer import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.Spring @@ -72,30 +72,30 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.CategorisedChannelList -import chat.revolt.api.internals.ChannelUtils -import chat.revolt.api.internals.DirectMessages -import chat.revolt.api.schemas.Category -import chat.revolt.api.schemas.Channel -import chat.revolt.api.schemas.ChannelType -import chat.revolt.api.schemas.ServerFlags -import chat.revolt.api.schemas.User -import chat.revolt.api.schemas.has -import chat.revolt.api.settings.GeoStateProvider -import chat.revolt.api.settings.NotificationSettingsProvider -import chat.revolt.api.settings.SyncedSettings -import chat.revolt.composables.generic.GroupIcon -import chat.revolt.composables.generic.IconPlaceholder -import chat.revolt.composables.generic.RemoteImage -import chat.revolt.composables.generic.SquareButton -import chat.revolt.composables.generic.UserAvatar -import chat.revolt.composables.generic.presenceFromStatus -import chat.revolt.composables.screens.chat.ChannelIcon -import chat.revolt.composables.screens.chat.discover.DiscoverServersList -import chat.revolt.screens.chat.ChatRouterDestination -import chat.revolt.sheets.ChannelContextSheet +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.CategorisedChannelList +import chat.peptide.api.internals.ChannelUtils +import chat.peptide.api.internals.DirectMessages +import chat.peptide.api.schemas.Category +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.schemas.ServerFlags +import chat.peptide.api.schemas.User +import chat.peptide.api.schemas.has +import chat.peptide.api.settings.GeoStateProvider +import chat.peptide.api.settings.NotificationSettingsProvider +import chat.peptide.api.settings.SyncedSettings +import chat.peptide.composables.generic.GroupIcon +import chat.peptide.composables.generic.IconPlaceholder +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.generic.SquareButton +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.composables.generic.presenceFromStatus +import chat.peptide.composables.screens.chat.ChannelIcon +import chat.peptide.composables.screens.chat.discover.DiscoverServersList +import chat.peptide.screens.chat.ChatRouterDestination +import chat.peptide.sheets.ChannelContextSheet @OptIn( ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class, diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/molecules/JoinVoiceChannelButton.kt b/app/src/main/java/chat/peptide/composables/screens/chat/molecules/JoinVoiceChannelButton.kt similarity index 89% rename from app/src/main/java/chat/revolt/composables/screens/chat/molecules/JoinVoiceChannelButton.kt rename to app/src/main/java/chat/peptide/composables/screens/chat/molecules/JoinVoiceChannelButton.kt index dcdec0a9..a7dc5c87 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/molecules/JoinVoiceChannelButton.kt +++ b/app/src/main/java/chat/peptide/composables/screens/chat/molecules/JoinVoiceChannelButton.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.chat.molecules +package chat.peptide.composables.screens.chat.molecules import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -15,10 +15,10 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.callbacks.Action -import chat.revolt.callbacks.ActionChannel -import chat.revolt.composables.screens.chat.StackedUserAvatars +import chat.peptide.R +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.composables.screens.chat.StackedUserAvatars import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/revolt/composables/screens/services/DiscoverView.kt b/app/src/main/java/chat/peptide/composables/screens/services/DiscoverView.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/screens/services/DiscoverView.kt rename to app/src/main/java/chat/peptide/composables/screens/services/DiscoverView.kt index 80a4df91..e2cb65d2 100644 --- a/app/src/main/java/chat/revolt/composables/screens/services/DiscoverView.kt +++ b/app/src/main/java/chat/peptide/composables/screens/services/DiscoverView.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.services +package chat.peptide.composables.screens.services import android.annotation.SuppressLint import android.content.Intent @@ -22,11 +22,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView -import chat.revolt.activities.InviteActivity -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltJson -import chat.revolt.api.buildUserAgent -import chat.revolt.api.internals.ThemeCompat +import chat.peptide.activities.InviteActivity +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltJson +import chat.peptide.api.buildUserAgent +import chat.peptide.api.internals.ThemeCompat import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive diff --git a/app/src/main/java/chat/revolt/composables/screens/settings/AttributionItem.kt b/app/src/main/java/chat/peptide/composables/screens/settings/AttributionItem.kt similarity index 85% rename from app/src/main/java/chat/revolt/composables/screens/settings/AttributionItem.kt rename to app/src/main/java/chat/peptide/composables/screens/settings/AttributionItem.kt index 12482e38..89ad9dbf 100644 --- a/app/src/main/java/chat/revolt/composables/screens/settings/AttributionItem.kt +++ b/app/src/main/java/chat/peptide/composables/screens/settings/AttributionItem.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.settings +package chat.peptide.composables.screens.settings import androidx.compose.foundation.clickable import androidx.compose.material3.ListItem @@ -6,8 +6,8 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import chat.revolt.R -import chat.revolt.screens.about.Library +import chat.peptide.R +import chat.peptide.screens.about.Library @Composable fun AttributionItem(library: Library, onClick: () -> Unit) { diff --git a/app/src/main/java/chat/revolt/composables/screens/settings/ServerOverview.kt b/app/src/main/java/chat/peptide/composables/screens/settings/ServerOverview.kt similarity index 93% rename from app/src/main/java/chat/revolt/composables/screens/settings/ServerOverview.kt rename to app/src/main/java/chat/peptide/composables/screens/settings/ServerOverview.kt index 693db19c..2875be55 100644 --- a/app/src/main/java/chat/revolt/composables/screens/settings/ServerOverview.kt +++ b/app/src/main/java/chat/peptide/composables/screens/settings/ServerOverview.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.settings +package chat.peptide.composables.screens.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -26,13 +26,13 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.Server -import chat.revolt.api.schemas.ServerFlags -import chat.revolt.api.schemas.has -import chat.revolt.composables.generic.IconPlaceholder -import chat.revolt.composables.generic.RemoteImage +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.Server +import chat.peptide.api.schemas.ServerFlags +import chat.peptide.api.schemas.has +import chat.peptide.composables.generic.IconPlaceholder +import chat.peptide.composables.generic.RemoteImage @Composable fun ServerOverview(server: Server) { diff --git a/app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt b/app/src/main/java/chat/peptide/composables/screens/settings/UserButtons.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt rename to app/src/main/java/chat/peptide/composables/screens/settings/UserButtons.kt index 35a8cc51..ca05c389 100644 --- a/app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt +++ b/app/src/main/java/chat/peptide/composables/screens/settings/UserButtons.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.settings +package chat.peptide.composables.screens.settings import android.widget.Toast import androidx.compose.animation.animateContentSize @@ -31,18 +31,18 @@ import androidx.compose.ui.res.painterResource 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.api.RevoltAPI -import chat.revolt.api.routes.user.acceptFriendRequest -import chat.revolt.api.routes.user.blockUser -import chat.revolt.api.routes.user.friendUser -import chat.revolt.api.routes.user.openDM -import chat.revolt.api.routes.user.unblockUser -import chat.revolt.api.routes.user.unfriendUser -import chat.revolt.api.schemas.User -import chat.revolt.callbacks.Action -import chat.revolt.callbacks.ActionChannel -import chat.revolt.internals.Platform +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.user.acceptFriendRequest +import chat.peptide.api.routes.user.blockUser +import chat.peptide.api.routes.user.friendUser +import chat.peptide.api.routes.user.openDM +import chat.peptide.api.routes.user.unblockUser +import chat.peptide.api.routes.user.unfriendUser +import chat.peptide.api.schemas.User +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.internals.Platform import kotlinx.coroutines.launch import logcat.LogPriority import logcat.asLog diff --git a/app/src/main/java/chat/revolt/composables/screens/settings/UserOverview.kt b/app/src/main/java/chat/peptide/composables/screens/settings/UserOverview.kt similarity index 91% rename from app/src/main/java/chat/revolt/composables/screens/settings/UserOverview.kt rename to app/src/main/java/chat/peptide/composables/screens/settings/UserOverview.kt index fc91a77c..30f5fdd3 100644 --- a/app/src/main/java/chat/revolt/composables/screens/settings/UserOverview.kt +++ b/app/src/main/java/chat/peptide/composables/screens/settings/UserOverview.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.settings +package chat.peptide.composables.screens.settings import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -30,18 +30,18 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.SpecialUsers -import chat.revolt.api.internals.ULID -import chat.revolt.api.internals.solidColor -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.composables.generic.RemoteImage -import chat.revolt.composables.generic.UserAvatar -import chat.revolt.composables.generic.presenceFromStatus +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.SpecialUsers +import chat.peptide.api.internals.ULID +import chat.peptide.api.internals.solidColor +import chat.peptide.api.routes.user.fetchUserProfile +import chat.peptide.api.schemas.AutumnResource +import chat.peptide.api.schemas.Profile +import chat.peptide.api.schemas.User +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.composables.generic.presenceFromStatus import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking diff --git a/app/src/main/java/chat/revolt/composables/screens/settings/appearance/ColourChip.kt b/app/src/main/java/chat/peptide/composables/screens/settings/appearance/ColourChip.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/screens/settings/appearance/ColourChip.kt rename to app/src/main/java/chat/peptide/composables/screens/settings/appearance/ColourChip.kt index 60bfc210..cf1cca80 100644 --- a/app/src/main/java/chat/revolt/composables/screens/settings/appearance/ColourChip.kt +++ b/app/src/main/java/chat/peptide/composables/screens/settings/appearance/ColourChip.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.settings.appearance +package chat.peptide.composables.screens.settings.appearance import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/app/src/main/java/chat/revolt/composables/screens/settings/appearance/CornerRadiusPicker.kt b/app/src/main/java/chat/peptide/composables/screens/settings/appearance/CornerRadiusPicker.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/screens/settings/appearance/CornerRadiusPicker.kt rename to app/src/main/java/chat/peptide/composables/screens/settings/appearance/CornerRadiusPicker.kt index 50c7340f..5c89b5a9 100644 --- a/app/src/main/java/chat/revolt/composables/screens/settings/appearance/CornerRadiusPicker.kt +++ b/app/src/main/java/chat/peptide/composables/screens/settings/appearance/CornerRadiusPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.settings.appearance +package chat.peptide.composables.screens.settings.appearance import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -31,7 +31,7 @@ import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import chat.revolt.R +import chat.peptide.R enum class CornerRadiusPreset(val percentage: Int) { SHARP(0), diff --git a/app/src/main/java/chat/revolt/composables/screens/splash/DisconnectedScreen.kt b/app/src/main/java/chat/peptide/composables/screens/splash/DisconnectedScreen.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/screens/splash/DisconnectedScreen.kt rename to app/src/main/java/chat/peptide/composables/screens/splash/DisconnectedScreen.kt index 05710bad..e311d859 100644 --- a/app/src/main/java/chat/revolt/composables/screens/splash/DisconnectedScreen.kt +++ b/app/src/main/java/chat/peptide/composables/screens/splash/DisconnectedScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.screens.splash +package chat.peptide.composables.screens.splash import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -16,7 +16,7 @@ import androidx.compose.ui.res.stringResource 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.peptide.R @Composable fun DisconnectedScreen(onRetry: () -> Unit) { diff --git a/app/src/main/java/chat/revolt/composables/settings/SettingsHintBanner.kt b/app/src/main/java/chat/peptide/composables/settings/SettingsHintBanner.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/settings/SettingsHintBanner.kt rename to app/src/main/java/chat/peptide/composables/settings/SettingsHintBanner.kt index ab5e13ce..ce697ded 100644 --- a/app/src/main/java/chat/revolt/composables/settings/SettingsHintBanner.kt +++ b/app/src/main/java/chat/peptide/composables/settings/SettingsHintBanner.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.settings +package chat.peptide.composables.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/chat/revolt/composables/settings/profile/StatusPicker.kt b/app/src/main/java/chat/peptide/composables/settings/profile/StatusPicker.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/settings/profile/StatusPicker.kt rename to app/src/main/java/chat/peptide/composables/settings/profile/StatusPicker.kt index a9e602e8..06291f0d 100644 --- a/app/src/main/java/chat/revolt/composables/settings/profile/StatusPicker.kt +++ b/app/src/main/java/chat/peptide/composables/settings/profile/StatusPicker.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.settings.profile +package chat.peptide.composables.settings.profile import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -18,9 +18,9 @@ import androidx.compose.ui.res.stringResource 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.composables.generic.Presence -import chat.revolt.composables.generic.presenceColour +import chat.peptide.R +import chat.peptide.composables.generic.Presence +import chat.peptide.composables.generic.presenceColour fun Presence.stringResource(): Int { return when (this) { diff --git a/app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt b/app/src/main/java/chat/peptide/composables/settings/sessions/SessionItem.kt similarity index 92% rename from app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt rename to app/src/main/java/chat/peptide/composables/settings/sessions/SessionItem.kt index 660f9c15..a8775627 100644 --- a/app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt +++ b/app/src/main/java/chat/peptide/composables/settings/sessions/SessionItem.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.settings.sessions +package chat.peptide.composables.settings.sessions import android.text.format.DateUtils import androidx.compose.material3.Icon @@ -13,9 +13,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow -import chat.revolt.R -import chat.revolt.api.internals.ULID -import chat.revolt.api.schemas.Session +import chat.peptide.R +import chat.peptide.api.internals.ULID +import chat.peptide.api.schemas.Session @Composable fun SessionItem( diff --git a/app/src/main/java/chat/revolt/composables/sheets/SheetSelection.kt b/app/src/main/java/chat/peptide/composables/sheets/SheetSelection.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/sheets/SheetSelection.kt rename to app/src/main/java/chat/peptide/composables/sheets/SheetSelection.kt index 5efeccf3..5545e0ef 100644 --- a/app/src/main/java/chat/revolt/composables/sheets/SheetSelection.kt +++ b/app/src/main/java/chat/peptide/composables/sheets/SheetSelection.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.sheets +package chat.peptide.composables.sheets import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -15,7 +15,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import chat.revolt.R +import chat.peptide.R /** * Sheet selection. Used when a modal sheet prompts a choice out of x options. diff --git a/app/src/main/java/chat/revolt/composables/sheets/SheetTile.kt b/app/src/main/java/chat/peptide/composables/sheets/SheetTile.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/sheets/SheetTile.kt rename to app/src/main/java/chat/peptide/composables/sheets/SheetTile.kt index 4336576f..f9b39c71 100644 --- a/app/src/main/java/chat/revolt/composables/sheets/SheetTile.kt +++ b/app/src/main/java/chat/peptide/composables/sheets/SheetTile.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.sheets +package chat.peptide.composables.sheets import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -22,7 +22,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Brush import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import chat.revolt.api.internals.solidColor +import chat.peptide.api.internals.solidColor @Composable fun SheetTile( diff --git a/app/src/main/java/chat/revolt/composables/skeletons/MessageSkeleton.kt b/app/src/main/java/chat/peptide/composables/skeletons/MessageSkeleton.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/skeletons/MessageSkeleton.kt rename to app/src/main/java/chat/peptide/composables/skeletons/MessageSkeleton.kt index a6a2274a..4aea113b 100644 --- a/app/src/main/java/chat/revolt/composables/skeletons/MessageSkeleton.kt +++ b/app/src/main/java/chat/peptide/composables/skeletons/MessageSkeleton.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.skeletons +package chat.peptide.composables.skeletons import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import chat.revolt.api.settings.LoadedSettings +import chat.peptide.api.settings.LoadedSettings enum class MessageSkeletonVariant { One, diff --git a/app/src/main/java/chat/revolt/composables/skeletons/SkeletonGlobals.kt b/app/src/main/java/chat/peptide/composables/skeletons/SkeletonGlobals.kt similarity index 74% rename from app/src/main/java/chat/revolt/composables/skeletons/SkeletonGlobals.kt rename to app/src/main/java/chat/peptide/composables/skeletons/SkeletonGlobals.kt index e7967cc2..b3510478 100644 --- a/app/src/main/java/chat/revolt/composables/skeletons/SkeletonGlobals.kt +++ b/app/src/main/java/chat/peptide/composables/skeletons/SkeletonGlobals.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.skeletons +package chat.peptide.composables.skeletons import androidx.compose.material3.LocalContentColor import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/revolt/composables/skeletons/UserOverviewSkeleton.kt b/app/src/main/java/chat/peptide/composables/skeletons/UserOverviewSkeleton.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/skeletons/UserOverviewSkeleton.kt rename to app/src/main/java/chat/peptide/composables/skeletons/UserOverviewSkeleton.kt index 55c70cdf..3b272079 100644 --- a/app/src/main/java/chat/revolt/composables/skeletons/UserOverviewSkeleton.kt +++ b/app/src/main/java/chat/peptide/composables/skeletons/UserOverviewSkeleton.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.skeletons +package chat.peptide.composables.skeletons import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -18,7 +18,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import chat.revolt.api.settings.LoadedSettings +import chat.peptide.api.settings.LoadedSettings import com.valentinilk.shimmer.shimmer @Composable diff --git a/app/src/main/java/chat/revolt/composables/utils/ConditionalConsumptionPointerInput.kt b/app/src/main/java/chat/peptide/composables/utils/ConditionalConsumptionPointerInput.kt similarity index 99% rename from app/src/main/java/chat/revolt/composables/utils/ConditionalConsumptionPointerInput.kt rename to app/src/main/java/chat/peptide/composables/utils/ConditionalConsumptionPointerInput.kt index f16e5957..7f1cb39c 100644 --- a/app/src/main/java/chat/revolt/composables/utils/ConditionalConsumptionPointerInput.kt +++ b/app/src/main/java/chat/peptide/composables/utils/ConditionalConsumptionPointerInput.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.utils +package chat.peptide.composables.utils import androidx.compose.foundation.gestures.GestureCancellationException import androidx.compose.foundation.gestures.PressGestureScope diff --git a/app/src/main/java/chat/revolt/composables/utils/SizeMeasured.kt b/app/src/main/java/chat/peptide/composables/utils/SizeMeasured.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/utils/SizeMeasured.kt rename to app/src/main/java/chat/peptide/composables/utils/SizeMeasured.kt index 3e0c389d..41d1fb9c 100644 --- a/app/src/main/java/chat/revolt/composables/utils/SizeMeasured.kt +++ b/app/src/main/java/chat/peptide/composables/utils/SizeMeasured.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.utils +package chat.peptide.composables.utils import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/app/src/main/java/chat/revolt/composables/vectorassets/CreateServer.kt b/app/src/main/java/chat/peptide/composables/vectorassets/CreateServer.kt similarity index 97% rename from app/src/main/java/chat/revolt/composables/vectorassets/CreateServer.kt rename to app/src/main/java/chat/peptide/composables/vectorassets/CreateServer.kt index 5047f61a..c27be546 100644 --- a/app/src/main/java/chat/revolt/composables/vectorassets/CreateServer.kt +++ b/app/src/main/java/chat/peptide/composables/vectorassets/CreateServer.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.vectorassets +package chat.peptide.composables.vectorassets import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/revolt/composables/vectorassets/GeoGateUX.kt b/app/src/main/java/chat/peptide/composables/vectorassets/GeoGateUX.kt similarity index 98% rename from app/src/main/java/chat/revolt/composables/vectorassets/GeoGateUX.kt rename to app/src/main/java/chat/peptide/composables/vectorassets/GeoGateUX.kt index d5a04e9a..52a2ba2a 100644 --- a/app/src/main/java/chat/revolt/composables/vectorassets/GeoGateUX.kt +++ b/app/src/main/java/chat/peptide/composables/vectorassets/GeoGateUX.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.vectorassets +package chat.peptide.composables.vectorassets import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/revolt/composables/vectorassets/JoinServer.kt b/app/src/main/java/chat/peptide/composables/vectorassets/JoinServer.kt similarity index 95% rename from app/src/main/java/chat/revolt/composables/vectorassets/JoinServer.kt rename to app/src/main/java/chat/peptide/composables/vectorassets/JoinServer.kt index 5aa2a5fa..fc18f5be 100644 --- a/app/src/main/java/chat/revolt/composables/vectorassets/JoinServer.kt +++ b/app/src/main/java/chat/peptide/composables/vectorassets/JoinServer.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.vectorassets +package chat.peptide.composables.vectorassets import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/revolt/composables/vectorassets/NewServer.kt b/app/src/main/java/chat/peptide/composables/vectorassets/NewServer.kt similarity index 99% rename from app/src/main/java/chat/revolt/composables/vectorassets/NewServer.kt rename to app/src/main/java/chat/peptide/composables/vectorassets/NewServer.kt index e9e2c520..56014ee0 100644 --- a/app/src/main/java/chat/revolt/composables/vectorassets/NewServer.kt +++ b/app/src/main/java/chat/peptide/composables/vectorassets/NewServer.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.vectorassets +package chat.peptide.composables.vectorassets import androidx.compose.foundation.Image import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/chat/revolt/composables/vectorassets/RevoltTagIntro.kt b/app/src/main/java/chat/peptide/composables/vectorassets/RevoltTagIntro.kt similarity index 99% rename from app/src/main/java/chat/revolt/composables/vectorassets/RevoltTagIntro.kt rename to app/src/main/java/chat/peptide/composables/vectorassets/RevoltTagIntro.kt index c040e5fc..ae91f6b6 100644 --- a/app/src/main/java/chat/revolt/composables/vectorassets/RevoltTagIntro.kt +++ b/app/src/main/java/chat/peptide/composables/vectorassets/RevoltTagIntro.kt @@ -1,4 +1,4 @@ -package chat.revolt.components.vectorassets +package chat.peptide.components.vectorassets import androidx.compose.foundation.Image import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/chat/revolt/composables/vectorassets/SwipeToReplySpark.kt b/app/src/main/java/chat/peptide/composables/vectorassets/SwipeToReplySpark.kt similarity index 99% rename from app/src/main/java/chat/revolt/composables/vectorassets/SwipeToReplySpark.kt rename to app/src/main/java/chat/peptide/composables/vectorassets/SwipeToReplySpark.kt index 1dfdc51c..988b16d9 100644 --- a/app/src/main/java/chat/revolt/composables/vectorassets/SwipeToReplySpark.kt +++ b/app/src/main/java/chat/peptide/composables/vectorassets/SwipeToReplySpark.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.vectorassets +package chat.peptide.composables.vectorassets import androidx.compose.foundation.Image import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/chat/revolt/composables/voice/VoicePermissionSwitch.kt b/app/src/main/java/chat/peptide/composables/voice/VoicePermissionSwitch.kt similarity index 99% rename from app/src/main/java/chat/revolt/composables/voice/VoicePermissionSwitch.kt rename to app/src/main/java/chat/peptide/composables/voice/VoicePermissionSwitch.kt index 7410e153..a03def46 100644 --- a/app/src/main/java/chat/revolt/composables/voice/VoicePermissionSwitch.kt +++ b/app/src/main/java/chat/peptide/composables/voice/VoicePermissionSwitch.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.voice +package chat.peptide.composables.voice import android.Manifest import android.content.Intent @@ -29,7 +29,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.core.net.toUri -import chat.revolt.R +import chat.peptide.R import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.PermissionStatus import com.google.accompanist.permissions.rememberMultiplePermissionsState diff --git a/app/src/main/java/chat/revolt/composables/voice/VoiceSheet.kt b/app/src/main/java/chat/peptide/composables/voice/VoiceSheet.kt similarity index 96% rename from app/src/main/java/chat/revolt/composables/voice/VoiceSheet.kt rename to app/src/main/java/chat/peptide/composables/voice/VoiceSheet.kt index 7deb95fd..4a787eae 100644 --- a/app/src/main/java/chat/revolt/composables/voice/VoiceSheet.kt +++ b/app/src/main/java/chat/peptide/composables/voice/VoiceSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.composables.voice +package chat.peptide.composables.voice import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -8,9 +8,9 @@ import androidx.compose.runtime.setValue import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewmodel.compose.viewModel -import chat.revolt.R -import chat.revolt.api.routes.misc.getRootRoute -import chat.revolt.api.routes.voice.joinCall +import chat.peptide.R +import chat.peptide.api.routes.misc.getRootRoute +import chat.peptide.api.routes.voice.joinCall import logcat.LogPriority import logcat.asLog import logcat.logcat diff --git a/app/src/main/java/chat/revolt/di/GoogleSheetsModule.kt b/app/src/main/java/chat/peptide/di/GoogleSheetsModule.kt similarity index 86% rename from app/src/main/java/chat/revolt/di/GoogleSheetsModule.kt rename to app/src/main/java/chat/peptide/di/GoogleSheetsModule.kt index 2825e080..e2613c41 100644 --- a/app/src/main/java/chat/revolt/di/GoogleSheetsModule.kt +++ b/app/src/main/java/chat/peptide/di/GoogleSheetsModule.kt @@ -1,6 +1,6 @@ -package chat.revolt.di +package chat.peptide.di -import chat.revolt.api.routes.googlesheets.ServerDataRepository +import chat.peptide.api.routes.googlesheets.ServerDataRepository import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/chat/revolt/dialogs/NotificationRationaleDialog.kt b/app/src/main/java/chat/peptide/dialogs/NotificationRationaleDialog.kt similarity index 97% rename from app/src/main/java/chat/revolt/dialogs/NotificationRationaleDialog.kt rename to app/src/main/java/chat/peptide/dialogs/NotificationRationaleDialog.kt index 4e1ac34e..02580232 100644 --- a/app/src/main/java/chat/revolt/dialogs/NotificationRationaleDialog.kt +++ b/app/src/main/java/chat/peptide/dialogs/NotificationRationaleDialog.kt @@ -1,4 +1,4 @@ -package chat.revolt.dialogs +package chat.peptide.dialogs import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -19,8 +19,8 @@ import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import chat.revolt.BuildConfig -import chat.revolt.R +import chat.peptide.BuildConfig +import chat.peptide.R @Composable fun NotificationRationaleDialog( diff --git a/app/src/main/java/chat/revolt/fragments/ChangelogBottomSheetFragment.kt b/app/src/main/java/chat/peptide/fragments/ChangelogBottomSheetFragment.kt similarity index 97% rename from app/src/main/java/chat/revolt/fragments/ChangelogBottomSheetFragment.kt rename to app/src/main/java/chat/peptide/fragments/ChangelogBottomSheetFragment.kt index e3231ad5..399f9d59 100644 --- a/app/src/main/java/chat/revolt/fragments/ChangelogBottomSheetFragment.kt +++ b/app/src/main/java/chat/peptide/fragments/ChangelogBottomSheetFragment.kt @@ -1,4 +1,4 @@ -package chat.revolt.fragments +package chat.peptide.fragments import android.annotation.SuppressLint import android.content.DialogInterface @@ -19,10 +19,10 @@ import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent import androidx.core.content.res.ResourcesCompat import androidx.webkit.WebViewAssetLoader -import chat.revolt.R -import chat.revolt.activities.InviteActivity -import chat.revolt.api.RevoltAPI -import chat.revolt.databinding.SheetChangelogBinding +import chat.peptide.R +import chat.peptide.activities.InviteActivity +import chat.peptide.api.RevoltAPI +import chat.peptide.databinding.SheetChangelogBinding import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.color.MaterialColors diff --git a/app/src/main/java/chat/revolt/internals/Autocomplete.kt b/app/src/main/java/chat/peptide/internals/Autocomplete.kt similarity index 95% rename from app/src/main/java/chat/revolt/internals/Autocomplete.kt rename to app/src/main/java/chat/peptide/internals/Autocomplete.kt index 9fa2fa3d..08e0ce27 100644 --- a/app/src/main/java/chat/revolt/internals/Autocomplete.kt +++ b/app/src/main/java/chat/peptide/internals/Autocomplete.kt @@ -1,12 +1,12 @@ -package chat.revolt.internals +package chat.peptide.internals -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.PermissionBit -import chat.revolt.api.internals.Roles -import chat.revolt.api.internals.has -import chat.revolt.api.schemas.ChannelType -import chat.revolt.api.settings.FeatureFlags -import chat.revolt.composables.chat.AutocompleteSuggestion +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.PermissionBit +import chat.peptide.api.internals.Roles +import chat.peptide.api.internals.has +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.settings.FeatureFlags +import chat.peptide.composables.chat.AutocompleteSuggestion object Autocomplete { private val emojiImpl = EmojiImpl() diff --git a/app/src/main/java/chat/revolt/internals/Changelogs.kt b/app/src/main/java/chat/peptide/internals/Changelogs.kt similarity index 93% rename from app/src/main/java/chat/revolt/internals/Changelogs.kt rename to app/src/main/java/chat/peptide/internals/Changelogs.kt index c168a036..c229467b 100644 --- a/app/src/main/java/chat/revolt/internals/Changelogs.kt +++ b/app/src/main/java/chat/peptide/internals/Changelogs.kt @@ -1,11 +1,11 @@ -package chat.revolt.internals +package chat.peptide.internals import android.content.Context -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltHttp -import chat.revolt.api.RevoltJson -import chat.revolt.internals.IndexHolder.cachedIndex -import chat.revolt.persistence.KVStorage +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltHttp +import chat.peptide.api.RevoltJson +import chat.peptide.internals.IndexHolder.cachedIndex +import chat.peptide.persistence.KVStorage import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/revolt/internals/EmojiImpl.kt b/app/src/main/java/chat/peptide/internals/EmojiImpl.kt similarity index 97% rename from app/src/main/java/chat/revolt/internals/EmojiImpl.kt rename to app/src/main/java/chat/peptide/internals/EmojiImpl.kt index 15801c4c..9b6c1b86 100644 --- a/app/src/main/java/chat/revolt/internals/EmojiImpl.kt +++ b/app/src/main/java/chat/peptide/internals/EmojiImpl.kt @@ -1,11 +1,11 @@ -package chat.revolt.internals +package chat.peptide.internals import android.content.Context -import chat.revolt.R -import chat.revolt.RevoltApplication -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltJson -import chat.revolt.api.schemas.Server +import chat.peptide.R +import chat.peptide.RevoltApplication +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltJson +import chat.peptide.api.schemas.Server import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.ListSerializer @@ -58,7 +58,7 @@ sealed class EmojiPickerItem { val alternates: List> ) : EmojiPickerItem() - data class ServerEmote(val emote: chat.revolt.api.schemas.Emoji) : EmojiPickerItem() + data class ServerEmote(val emote: chat.peptide.api.schemas.Emoji) : EmojiPickerItem() } class EmojiImpl { diff --git a/app/src/main/java/chat/revolt/internals/Platform.kt b/app/src/main/java/chat/peptide/internals/Platform.kt similarity index 84% rename from app/src/main/java/chat/revolt/internals/Platform.kt rename to app/src/main/java/chat/peptide/internals/Platform.kt index 1296e91a..b62a493e 100644 --- a/app/src/main/java/chat/revolt/internals/Platform.kt +++ b/app/src/main/java/chat/peptide/internals/Platform.kt @@ -1,4 +1,4 @@ -package chat.revolt.internals +package chat.peptide.internals import android.os.Build diff --git a/app/src/main/java/chat/revolt/internals/TailwindColourScheme.kt b/app/src/main/java/chat/peptide/internals/TailwindColourScheme.kt similarity index 99% rename from app/src/main/java/chat/revolt/internals/TailwindColourScheme.kt rename to app/src/main/java/chat/peptide/internals/TailwindColourScheme.kt index 741e23ef..c4d2b4e7 100644 --- a/app/src/main/java/chat/revolt/internals/TailwindColourScheme.kt +++ b/app/src/main/java/chat/peptide/internals/TailwindColourScheme.kt @@ -1,4 +1,4 @@ -package chat.revolt.internals +package chat.peptide.internals import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/chat/revolt/internals/Timestamp.kt b/app/src/main/java/chat/peptide/internals/Timestamp.kt similarity index 98% rename from app/src/main/java/chat/revolt/internals/Timestamp.kt rename to app/src/main/java/chat/peptide/internals/Timestamp.kt index 38128f3b..c90c5216 100644 --- a/app/src/main/java/chat/revolt/internals/Timestamp.kt +++ b/app/src/main/java/chat/peptide/internals/Timestamp.kt @@ -1,4 +1,4 @@ -package chat.revolt.internals +package chat.peptide.internals import android.text.format.DateUtils import android.util.Log diff --git a/app/src/main/java/chat/revolt/internals/extensions/Defaults.kt b/app/src/main/java/chat/peptide/internals/extensions/Defaults.kt similarity index 87% rename from app/src/main/java/chat/revolt/internals/extensions/Defaults.kt rename to app/src/main/java/chat/peptide/internals/extensions/Defaults.kt index 0df18d8b..56340619 100644 --- a/app/src/main/java/chat/revolt/internals/extensions/Defaults.kt +++ b/app/src/main/java/chat/peptide/internals/extensions/Defaults.kt @@ -1,4 +1,4 @@ -package chat.revolt.internals.extensions +package chat.peptide.internals.extensions import androidx.compose.material3.ListItemColors import androidx.compose.material3.ListItemDefaults diff --git a/app/src/main/java/chat/revolt/internals/extensions/Input.kt b/app/src/main/java/chat/peptide/internals/extensions/Input.kt similarity index 96% rename from app/src/main/java/chat/revolt/internals/extensions/Input.kt rename to app/src/main/java/chat/peptide/internals/extensions/Input.kt index f63c1ea9..f5f03ec8 100644 --- a/app/src/main/java/chat/revolt/internals/extensions/Input.kt +++ b/app/src/main/java/chat/peptide/internals/extensions/Input.kt @@ -1,4 +1,4 @@ -package chat.revolt.internals.extensions +package chat.peptide.internals.extensions import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown diff --git a/app/src/main/java/chat/revolt/internals/extensions/Insets.kt b/app/src/main/java/chat/peptide/internals/extensions/Insets.kt similarity index 92% rename from app/src/main/java/chat/revolt/internals/extensions/Insets.kt rename to app/src/main/java/chat/peptide/internals/extensions/Insets.kt index dc950659..420c6bf8 100644 --- a/app/src/main/java/chat/revolt/internals/extensions/Insets.kt +++ b/app/src/main/java/chat/peptide/internals/extensions/Insets.kt @@ -1,4 +1,4 @@ -package chat.revolt.internals.extensions +package chat.peptide.internals.extensions import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.exclude diff --git a/app/src/main/java/chat/revolt/internals/extensions/Locales.kt b/app/src/main/java/chat/peptide/internals/extensions/Locales.kt similarity index 94% rename from app/src/main/java/chat/revolt/internals/extensions/Locales.kt rename to app/src/main/java/chat/peptide/internals/extensions/Locales.kt index a972e44f..1d42d64c 100644 --- a/app/src/main/java/chat/revolt/internals/extensions/Locales.kt +++ b/app/src/main/java/chat/peptide/internals/extensions/Locales.kt @@ -1,4 +1,4 @@ -package chat.revolt.internals.extensions +package chat.peptide.internals.extensions import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/chat/revolt/internals/extensions/Permissions.kt b/app/src/main/java/chat/peptide/internals/extensions/Permissions.kt similarity index 90% rename from app/src/main/java/chat/revolt/internals/extensions/Permissions.kt rename to app/src/main/java/chat/peptide/internals/extensions/Permissions.kt index 5f39b1af..3ea3e933 100644 --- a/app/src/main/java/chat/revolt/internals/extensions/Permissions.kt +++ b/app/src/main/java/chat/peptide/internals/extensions/Permissions.kt @@ -1,12 +1,12 @@ -package chat.revolt.internals.extensions +package chat.peptide.internals.extensions import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableLongState import androidx.compose.runtime.mutableLongStateOf import androidx.compose.runtime.saveable.rememberSaveable -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.Roles +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.Roles @Composable fun rememberChannelPermissions(channelId: String, key1: Any = Unit): MutableLongState { diff --git a/app/src/main/java/chat/revolt/internals/text/Gigamoji.kt b/app/src/main/java/chat/peptide/internals/text/Gigamoji.kt similarity index 96% rename from app/src/main/java/chat/revolt/internals/text/Gigamoji.kt rename to app/src/main/java/chat/peptide/internals/text/Gigamoji.kt index ceb2c0ad..b055c1d1 100644 --- a/app/src/main/java/chat/revolt/internals/text/Gigamoji.kt +++ b/app/src/main/java/chat/peptide/internals/text/Gigamoji.kt @@ -1,4 +1,4 @@ -package chat.revolt.internals.text +package chat.peptide.internals.text private val STRING_IS_CUSTOM_EMOTES_REGEX = Regex("(?::[0-9A-HJKMNP-TV-Z]{26}:|\\s)+") diff --git a/app/src/main/java/chat/revolt/internals/text/MessageProcessor.kt b/app/src/main/java/chat/peptide/internals/text/MessageProcessor.kt similarity index 94% rename from app/src/main/java/chat/revolt/internals/text/MessageProcessor.kt rename to app/src/main/java/chat/peptide/internals/text/MessageProcessor.kt index 37fc89eb..2bb76b30 100644 --- a/app/src/main/java/chat/revolt/internals/text/MessageProcessor.kt +++ b/app/src/main/java/chat/peptide/internals/text/MessageProcessor.kt @@ -1,8 +1,8 @@ -package chat.revolt.internals.text +package chat.peptide.internals.text -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.ChannelType -import chat.revolt.internals.EmojiImpl +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.ChannelType +import chat.peptide.internals.EmojiImpl object MessageProcessor { private val MentionRegex = Regex("@((?:\\p{L}|[\\d_.-])+)#([0-9]{4})", RegexOption.IGNORE_CASE) diff --git a/app/src/main/java/chat/revolt/markdown/jbm/FallbackRenderer.kt b/app/src/main/java/chat/peptide/markdown/jbm/FallbackRenderer.kt similarity index 95% rename from app/src/main/java/chat/revolt/markdown/jbm/FallbackRenderer.kt rename to app/src/main/java/chat/peptide/markdown/jbm/FallbackRenderer.kt index 0e58e3bd..b8fb282e 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/FallbackRenderer.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/FallbackRenderer.kt @@ -16,12 +16,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.viewinterop.AndroidView import androidx.webkit.WebViewAssetLoader -import chat.revolt.activities.InviteActivity -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.ResourceLocations -import chat.revolt.markdown.jbm.LocalJBMarkdownTreeState -import chat.revolt.markdown.jbm.MentionResolver -import chat.revolt.markdown.jbm.asHexString +import chat.peptide.activities.InviteActivity +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.ResourceLocations +import chat.peptide.markdown.jbm.LocalJBMarkdownTreeState +import chat.peptide.markdown.jbm.MentionResolver +import chat.peptide.markdown.jbm.asHexString @SuppressLint("SetJavaScriptEnabled") @Composable diff --git a/app/src/main/java/chat/revolt/markdown/jbm/JBMApi.kt b/app/src/main/java/chat/peptide/markdown/jbm/JBMApi.kt similarity index 92% rename from app/src/main/java/chat/revolt/markdown/jbm/JBMApi.kt rename to app/src/main/java/chat/peptide/markdown/jbm/JBMApi.kt index 4ce186b1..2c7ae10b 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/JBMApi.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/JBMApi.kt @@ -1,4 +1,4 @@ -package chat.revolt.markdown.jbm +package chat.peptide.markdown.jbm import org.intellij.markdown.ast.ASTNode import org.intellij.markdown.parser.MarkdownParser diff --git a/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt b/app/src/main/java/chat/peptide/markdown/jbm/JBMRenderer.kt similarity index 98% rename from app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt rename to app/src/main/java/chat/peptide/markdown/jbm/JBMRenderer.kt index 3155a2c4..32bdf93c 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/JBMRenderer.kt @@ -1,4 +1,4 @@ -package chat.revolt.markdown.jbm +package chat.peptide.markdown.jbm import FallbackRenderer import android.content.Intent @@ -71,23 +71,23 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.net.toUri -import chat.revolt.R -import chat.revolt.activities.InviteActivity -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.BrushCompat -import chat.revolt.api.internals.InstancedBrushCompat -import chat.revolt.api.internals.isUlid -import chat.revolt.api.routes.custom.fetchEmoji -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.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 chat.peptide.R +import chat.peptide.activities.InviteActivity +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.BrushCompat +import chat.peptide.api.internals.InstancedBrushCompat +import chat.peptide.api.internals.isUlid +import chat.peptide.api.routes.custom.fetchEmoji +import chat.peptide.api.schemas.isInviteUri +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.composables.markdown.Annotations +import chat.peptide.composables.utils.detectTapGesturesConditionalConsume +import chat.peptide.ui.theme.FragmentMono +import chat.peptide.ui.theme.isThemeDark import dev.snipme.highlights.Highlights import dev.snipme.highlights.model.BoldHighlight import dev.snipme.highlights.model.CodeHighlight diff --git a/app/src/main/java/chat/revolt/markdown/jbm/KatexRenderer.kt b/app/src/main/java/chat/peptide/markdown/jbm/KatexRenderer.kt similarity index 97% rename from app/src/main/java/chat/revolt/markdown/jbm/KatexRenderer.kt rename to app/src/main/java/chat/peptide/markdown/jbm/KatexRenderer.kt index fc934268..51ea91b0 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/KatexRenderer.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/KatexRenderer.kt @@ -1,4 +1,4 @@ -package chat.revolt.markdown.jbm +package chat.peptide.markdown.jbm import android.annotation.SuppressLint import android.content.Intent @@ -19,8 +19,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.viewinterop.AndroidView import androidx.webkit.WebViewAssetLoader -import chat.revolt.activities.InviteActivity -import chat.revolt.api.RevoltAPI +import chat.peptide.activities.InviteActivity +import chat.peptide.api.RevoltAPI internal fun Color.asHexString(includeAlphaComponent: Boolean = true): String { val argb = toArgb() diff --git a/app/src/main/java/chat/revolt/markdown/jbm/MentionResolver.kt b/app/src/main/java/chat/peptide/markdown/jbm/MentionResolver.kt similarity index 93% rename from app/src/main/java/chat/revolt/markdown/jbm/MentionResolver.kt rename to app/src/main/java/chat/peptide/markdown/jbm/MentionResolver.kt index 1874863a..c123ea4f 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/MentionResolver.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/MentionResolver.kt @@ -1,6 +1,6 @@ -package chat.revolt.markdown.jbm +package chat.peptide.markdown.jbm -import chat.revolt.api.RevoltAPI +import chat.peptide.api.RevoltAPI object MentionResolver { /** diff --git a/app/src/main/java/chat/revolt/markdown/jbm/RSMElementTypes.kt b/app/src/main/java/chat/peptide/markdown/jbm/RSMElementTypes.kt similarity index 94% rename from app/src/main/java/chat/revolt/markdown/jbm/RSMElementTypes.kt rename to app/src/main/java/chat/peptide/markdown/jbm/RSMElementTypes.kt index 72c57355..ddd02ffe 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/RSMElementTypes.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/RSMElementTypes.kt @@ -1,4 +1,4 @@ -package chat.revolt.markdown.jbm +package chat.peptide.markdown.jbm import org.intellij.markdown.IElementType import org.intellij.markdown.MarkdownElementType diff --git a/app/src/main/java/chat/revolt/markdown/jbm/RSMFlavourDescriptor.kt b/app/src/main/java/chat/peptide/markdown/jbm/RSMFlavourDescriptor.kt similarity index 82% rename from app/src/main/java/chat/revolt/markdown/jbm/RSMFlavourDescriptor.kt rename to app/src/main/java/chat/peptide/markdown/jbm/RSMFlavourDescriptor.kt index b3f51b0b..3a77ea8a 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/RSMFlavourDescriptor.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/RSMFlavourDescriptor.kt @@ -1,10 +1,10 @@ -package chat.revolt.markdown.jbm +package chat.peptide.markdown.jbm -import chat.revolt.markdown.jbm.sequentialparsers.ChannelMentionParser -import chat.revolt.markdown.jbm.sequentialparsers.CustomEmoteParser -import chat.revolt.markdown.jbm.sequentialparsers.MassMentionParser -import chat.revolt.markdown.jbm.sequentialparsers.RoleMentionParser -import chat.revolt.markdown.jbm.sequentialparsers.UserMentionParser +import chat.peptide.markdown.jbm.sequentialparsers.ChannelMentionParser +import chat.peptide.markdown.jbm.sequentialparsers.CustomEmoteParser +import chat.peptide.markdown.jbm.sequentialparsers.MassMentionParser +import chat.peptide.markdown.jbm.sequentialparsers.RoleMentionParser +import chat.peptide.markdown.jbm.sequentialparsers.UserMentionParser import org.intellij.markdown.MarkdownTokenTypes import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor import org.intellij.markdown.flavours.gfm.GFMTokenTypes diff --git a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/ChannelMentionParser.kt b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/ChannelMentionParser.kt similarity index 93% rename from app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/ChannelMentionParser.kt rename to app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/ChannelMentionParser.kt index 29b7332b..c878f80d 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/ChannelMentionParser.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/ChannelMentionParser.kt @@ -1,6 +1,6 @@ -package chat.revolt.markdown.jbm.sequentialparsers +package chat.peptide.markdown.jbm.sequentialparsers -import chat.revolt.markdown.jbm.RSMElementTypes +import chat.peptide.markdown.jbm.RSMElementTypes import org.intellij.markdown.MarkdownTokenTypes import org.intellij.markdown.parser.sequentialparsers.RangesListBuilder import org.intellij.markdown.parser.sequentialparsers.SequentialParser diff --git a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/CustomEmoteParser.kt b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/CustomEmoteParser.kt similarity index 94% rename from app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/CustomEmoteParser.kt rename to app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/CustomEmoteParser.kt index 95ac1eb8..00b88e05 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/CustomEmoteParser.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/CustomEmoteParser.kt @@ -1,6 +1,6 @@ -package chat.revolt.markdown.jbm.sequentialparsers +package chat.peptide.markdown.jbm.sequentialparsers -import chat.revolt.markdown.jbm.RSMElementTypes +import chat.peptide.markdown.jbm.RSMElementTypes import org.intellij.markdown.MarkdownTokenTypes import org.intellij.markdown.parser.sequentialparsers.RangesListBuilder import org.intellij.markdown.parser.sequentialparsers.SequentialParser diff --git a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/MassMentionParser.kt b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/MassMentionParser.kt similarity index 92% rename from app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/MassMentionParser.kt rename to app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/MassMentionParser.kt index 37944adf..29c7b5c3 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/MassMentionParser.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/MassMentionParser.kt @@ -1,4 +1,4 @@ -package chat.revolt.markdown.jbm.sequentialparsers +package chat.peptide.markdown.jbm.sequentialparsers import org.intellij.markdown.parser.sequentialparsers.RangesListBuilder import org.intellij.markdown.parser.sequentialparsers.SequentialParser diff --git a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/RoleMentionParser.kt b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/RoleMentionParser.kt similarity index 94% rename from app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/RoleMentionParser.kt rename to app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/RoleMentionParser.kt index 98cecafd..e9d7c908 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/RoleMentionParser.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/RoleMentionParser.kt @@ -1,6 +1,6 @@ -package chat.revolt.markdown.jbm.sequentialparsers +package chat.peptide.markdown.jbm.sequentialparsers -import chat.revolt.markdown.jbm.RSMElementTypes +import chat.peptide.markdown.jbm.RSMElementTypes import org.intellij.markdown.MarkdownTokenTypes import org.intellij.markdown.parser.sequentialparsers.RangesListBuilder import org.intellij.markdown.parser.sequentialparsers.SequentialParser diff --git a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/UserMentionParser.kt b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/UserMentionParser.kt similarity index 93% rename from app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/UserMentionParser.kt rename to app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/UserMentionParser.kt index 7788b795..f92d95bc 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/UserMentionParser.kt +++ b/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/UserMentionParser.kt @@ -1,6 +1,6 @@ -package chat.revolt.markdown.jbm.sequentialparsers +package chat.peptide.markdown.jbm.sequentialparsers -import chat.revolt.markdown.jbm.RSMElementTypes +import chat.peptide.markdown.jbm.RSMElementTypes import org.intellij.markdown.MarkdownTokenTypes import org.intellij.markdown.parser.sequentialparsers.RangesListBuilder import org.intellij.markdown.parser.sequentialparsers.SequentialParser diff --git a/app/src/main/java/chat/revolt/material/EasingTokens.kt b/app/src/main/java/chat/peptide/material/EasingTokens.kt similarity index 89% rename from app/src/main/java/chat/revolt/material/EasingTokens.kt rename to app/src/main/java/chat/peptide/material/EasingTokens.kt index 9fc5a323..5884c5ae 100644 --- a/app/src/main/java/chat/revolt/material/EasingTokens.kt +++ b/app/src/main/java/chat/peptide/material/EasingTokens.kt @@ -1,4 +1,4 @@ -package chat.revolt.material +package chat.peptide.material import androidx.compose.animation.core.CubicBezierEasing diff --git a/app/src/main/java/chat/revolt/ndk/NativeLibraries.kt b/app/src/main/java/chat/peptide/ndk/NativeLibraries.kt similarity index 91% rename from app/src/main/java/chat/revolt/ndk/NativeLibraries.kt rename to app/src/main/java/chat/peptide/ndk/NativeLibraries.kt index 10af43e7..29fcf6e8 100644 --- a/app/src/main/java/chat/revolt/ndk/NativeLibraries.kt +++ b/app/src/main/java/chat/peptide/ndk/NativeLibraries.kt @@ -1,4 +1,4 @@ -package chat.revolt.ndk +package chat.peptide.ndk annotation class NativeLibrary(val name: String) { companion object { diff --git a/app/src/main/java/chat/revolt/ndk/Stendal.kt b/app/src/main/java/chat/peptide/ndk/Stendal.kt similarity index 96% rename from app/src/main/java/chat/revolt/ndk/Stendal.kt rename to app/src/main/java/chat/peptide/ndk/Stendal.kt index 070c6ad3..9ea491dc 100644 --- a/app/src/main/java/chat/revolt/ndk/Stendal.kt +++ b/app/src/main/java/chat/peptide/ndk/Stendal.kt @@ -1,4 +1,4 @@ -package chat.revolt.ndk +package chat.peptide.ndk import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/revolt/persistence/KVStorage.kt b/app/src/main/java/chat/peptide/persistence/KVStorage.kt similarity index 98% rename from app/src/main/java/chat/revolt/persistence/KVStorage.kt rename to app/src/main/java/chat/peptide/persistence/KVStorage.kt index f42f28ef..fc81d5a6 100644 --- a/app/src/main/java/chat/revolt/persistence/KVStorage.kt +++ b/app/src/main/java/chat/peptide/persistence/KVStorage.kt @@ -1,4 +1,4 @@ -package chat.revolt.persistence +package chat.peptide.persistence import android.content.Context import androidx.datastore.core.DataStore diff --git a/app/src/main/java/chat/revolt/persistence/SqlStorage.kt b/app/src/main/java/chat/peptide/persistence/SqlStorage.kt similarity index 79% rename from app/src/main/java/chat/revolt/persistence/SqlStorage.kt rename to app/src/main/java/chat/peptide/persistence/SqlStorage.kt index a46590a4..4cc025dd 100644 --- a/app/src/main/java/chat/revolt/persistence/SqlStorage.kt +++ b/app/src/main/java/chat/peptide/persistence/SqlStorage.kt @@ -1,8 +1,8 @@ -package chat.revolt.persistence +package chat.peptide.persistence import app.cash.sqldelight.db.SqlDriver import app.cash.sqldelight.driver.android.AndroidSqliteDriver -import chat.revolt.RevoltApplication +import chat.peptide.RevoltApplication object SqlStorage { val driver: SqlDriver = AndroidSqliteDriver( diff --git a/app/src/main/java/chat/revolt/providers/AttachmentProvider.kt b/app/src/main/java/chat/peptide/providers/AttachmentProvider.kt similarity index 86% rename from app/src/main/java/chat/revolt/providers/AttachmentProvider.kt rename to app/src/main/java/chat/peptide/providers/AttachmentProvider.kt index 3336188f..b07dc3d1 100644 --- a/app/src/main/java/chat/revolt/providers/AttachmentProvider.kt +++ b/app/src/main/java/chat/peptide/providers/AttachmentProvider.kt @@ -1,11 +1,11 @@ -package chat.revolt.providers +package chat.peptide.providers import android.content.Context import android.net.Uri import androidx.core.content.FileProvider -import chat.revolt.BuildConfig -import chat.revolt.R -import chat.revolt.api.RevoltHttp +import chat.peptide.BuildConfig +import chat.peptide.R +import chat.peptide.api.RevoltHttp import io.ktor.client.request.get import io.ktor.client.statement.readBytes import java.io.File diff --git a/app/src/main/java/chat/revolt/screens/DefaultDestinationScreen.kt b/app/src/main/java/chat/peptide/screens/DefaultDestinationScreen.kt similarity index 89% rename from app/src/main/java/chat/revolt/screens/DefaultDestinationScreen.kt rename to app/src/main/java/chat/peptide/screens/DefaultDestinationScreen.kt index e86af7f2..c42558e5 100644 --- a/app/src/main/java/chat/revolt/screens/DefaultDestinationScreen.kt +++ b/app/src/main/java/chat/peptide/screens/DefaultDestinationScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens +package chat.peptide.screens import android.app.Activity import androidx.compose.foundation.layout.Box @@ -10,9 +10,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.navigation.NavController -import chat.revolt.RevoltApplication -import chat.revolt.api.internals.getComponentActivity -import chat.revolt.composables.screens.splash.DisconnectedScreen +import chat.peptide.RevoltApplication +import chat.peptide.api.internals.getComponentActivity +import chat.peptide.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/peptide/screens/about/AboutScreen.kt similarity index 96% rename from app/src/main/java/chat/revolt/screens/about/AboutScreen.kt rename to app/src/main/java/chat/peptide/screens/about/AboutScreen.kt index 89454eb0..08d72f89 100644 --- a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt +++ b/app/src/main/java/chat/peptide/screens/about/AboutScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.about +package chat.peptide.screens.about import android.os.Build import android.widget.Toast @@ -51,14 +51,14 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.revolt.BuildConfig -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltJson -import chat.revolt.api.routes.misc.Root -import chat.revolt.api.routes.misc.getRootRoute -import chat.revolt.composables.generic.PrimaryTabs -import chat.revolt.internals.Platform +import chat.peptide.BuildConfig +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltJson +import chat.peptide.api.routes.misc.Root +import chat.peptide.api.routes.misc.getRootRoute +import chat.peptide.composables.generic.PrimaryTabs +import chat.peptide.internals.Platform import kotlinx.coroutines.launch import kotlinx.serialization.encodeToString import java.net.URI diff --git a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt b/app/src/main/java/chat/peptide/screens/about/AttributionScreen.kt similarity index 98% rename from app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt rename to app/src/main/java/chat/peptide/screens/about/AttributionScreen.kt index cc9a002d..212e8d02 100644 --- a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt +++ b/app/src/main/java/chat/peptide/screens/about/AttributionScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.about +package chat.peptide.screens.about import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -41,8 +41,8 @@ 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.R -import chat.revolt.composables.screens.settings.AttributionItem +import chat.peptide.R +import chat.peptide.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/peptide/screens/chat/ChatRouterScreen.kt similarity index 95% rename from app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt rename to app/src/main/java/chat/peptide/screens/chat/ChatRouterScreen.kt index 236eb076..bd2d2e4c 100644 --- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt +++ b/app/src/main/java/chat/peptide/screens/chat/ChatRouterScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat +package chat.peptide.screens.chat import android.Manifest import android.annotation.SuppressLint @@ -61,39 +61,39 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.compose.LifecycleEventEffect import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.revolt.BuildConfig -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.DirectMessages -import chat.revolt.api.realtime.DisconnectionState -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.composables.chat.DisconnectedNotice -import chat.revolt.composables.screens.chat.drawer.ChannelSideDrawer -import chat.revolt.dialogs.NotificationRationaleDialog -import chat.revolt.internals.Changelogs -import chat.revolt.utils.DeepLinkHandler -import chat.revolt.persistence.KVStorage -import chat.revolt.screens.chat.dialogs.safety.ReportMessageDialog -import chat.revolt.screens.chat.dialogs.safety.ReportServerDialog -import chat.revolt.screens.chat.dialogs.safety.ReportUserDialog -import chat.revolt.screens.chat.views.FriendsScreen -import chat.revolt.screens.chat.views.NoCurrentChannelScreen -import chat.revolt.screens.chat.views.channel.ChannelScreen -import chat.revolt.screens.settings.SettingsScreen -import chat.revolt.sheets.AddServerSheet -import chat.revolt.sheets.ChangelogSheet -import chat.revolt.sheets.EarlyAccessSheet -import chat.revolt.sheets.EmoteInfoSheet -import chat.revolt.sheets.LinkInfoSheet -import chat.revolt.sheets.ReactionInfoSheet -import chat.revolt.sheets.ServerContextSheet -import chat.revolt.sheets.StatusSheet -import chat.revolt.sheets.UserInfoSheet -import chat.revolt.sheets.WebHookUserSheet -import chat.revolt.sheets.spark.SwipeToReplySparkSheet +import chat.peptide.BuildConfig +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.DirectMessages +import chat.peptide.api.realtime.DisconnectionState +import chat.peptide.api.realtime.RealtimeSocket +import chat.peptide.api.routes.push.subscribePush +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.composables.chat.DisconnectedNotice +import chat.peptide.composables.screens.chat.drawer.ChannelSideDrawer +import chat.peptide.dialogs.NotificationRationaleDialog +import chat.peptide.internals.Changelogs +import chat.peptide.utils.DeepLinkHandler +import chat.peptide.persistence.KVStorage +import chat.peptide.screens.chat.dialogs.safety.ReportMessageDialog +import chat.peptide.screens.chat.dialogs.safety.ReportServerDialog +import chat.peptide.screens.chat.dialogs.safety.ReportUserDialog +import chat.peptide.screens.chat.views.FriendsScreen +import chat.peptide.screens.chat.views.NoCurrentChannelScreen +import chat.peptide.screens.chat.views.channel.ChannelScreen +import chat.peptide.screens.settings.SettingsScreen +import chat.peptide.sheets.AddServerSheet +import chat.peptide.sheets.ChangelogSheet +import chat.peptide.sheets.EarlyAccessSheet +import chat.peptide.sheets.EmoteInfoSheet +import chat.peptide.sheets.LinkInfoSheet +import chat.peptide.sheets.ReactionInfoSheet +import chat.peptide.sheets.ServerContextSheet +import chat.peptide.sheets.StatusSheet +import chat.peptide.sheets.UserInfoSheet +import chat.peptide.sheets.WebHookUserSheet +import chat.peptide.sheets.spark.SwipeToReplySparkSheet import com.google.android.gms.tasks.OnCompleteListener import com.google.firebase.messaging.FirebaseMessaging import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/InviteDialog.kt b/app/src/main/java/chat/peptide/screens/chat/dialogs/InviteDialog.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/chat/dialogs/InviteDialog.kt rename to app/src/main/java/chat/peptide/screens/chat/dialogs/InviteDialog.kt index a99e8598..019e6cb9 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/InviteDialog.kt +++ b/app/src/main/java/chat/peptide/screens/chat/dialogs/InviteDialog.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.dialogs +package chat.peptide.screens.chat.dialogs import android.net.Uri import android.widget.Toast @@ -41,11 +41,11 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.routes.channel.createInvite -import chat.revolt.internals.Platform -import chat.revolt.ui.theme.FragmentMono +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.channel.createInvite +import chat.peptide.internals.Platform +import chat.peptide.ui.theme.FragmentMono import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt b/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportMessageDialog.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt rename to app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportMessageDialog.kt index 114deea9..6633ffed 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt +++ b/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportMessageDialog.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.dialogs.safety +package chat.peptide.screens.chat.dialogs.safety import android.util.Log import androidx.compose.foundation.background @@ -37,13 +37,13 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -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.composables.chat.Message -import chat.revolt.composables.generic.FormTextField +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.safety.putMessageReport +import chat.peptide.api.routes.user.blockUser +import chat.peptide.api.schemas.ContentReportReason +import chat.peptide.composables.chat.Message +import chat.peptide.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/peptide/screens/chat/dialogs/safety/ReportServerDialog.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt rename to app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportServerDialog.kt index d7bf403c..8e58bf14 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt +++ b/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportServerDialog.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.dialogs.safety +package chat.peptide.screens.chat.dialogs.safety import android.util.Log import androidx.compose.foundation.layout.Column @@ -32,12 +32,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -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.composables.generic.FormTextField -import chat.revolt.composables.screens.settings.ServerOverview +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.safety.putServerReport +import chat.peptide.api.schemas.ContentReportReason +import chat.peptide.composables.generic.FormTextField +import chat.peptide.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/peptide/screens/chat/dialogs/safety/ReportUserDialog.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt rename to app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportUserDialog.kt index cf8c7a43..69df6954 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt +++ b/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportUserDialog.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.dialogs.safety +package chat.peptide.screens.chat.dialogs.safety import android.util.Log import androidx.compose.foundation.layout.Column @@ -30,13 +30,13 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -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.composables.generic.FormTextField -import chat.revolt.composables.screens.settings.UserOverview +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.safety.putUserReport +import chat.peptide.api.routes.user.blockUser +import chat.peptide.api.schemas.UserReportReason +import chat.peptide.composables.generic.FormTextField +import chat.peptide.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/peptide/screens/chat/views/FriendsScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt rename to app/src/main/java/chat/peptide/screens/chat/views/FriendsScreen.kt index 6b242e69..c2b37013 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/chat/views/FriendsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.views +package chat.peptide.screens.chat.views import android.content.Context import android.widget.Toast @@ -76,25 +76,25 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.api.internals.FriendRequests -import chat.revolt.api.internals.UserQR -import chat.revolt.api.internals.UserQRContents -import chat.revolt.api.routes.user.friendUser -import chat.revolt.api.routes.user.unfriendUser -import chat.revolt.api.schemas.AutumnResource -import chat.revolt.api.schemas.Metadata -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.callbacks.Action -import chat.revolt.callbacks.ActionChannel -import chat.revolt.components.vectorassets.HL_TAG -import chat.revolt.components.vectorassets.HL_USERNAME -import chat.revolt.components.vectorassets.RevoltTagIntro -import chat.revolt.composables.chat.MemberListItem -import chat.revolt.composables.generic.CountableListHeader -import chat.revolt.composables.generic.UserAvatar -import chat.revolt.internals.extensions.zero -import chat.revolt.markdown.jbm.asHexString +import chat.peptide.R +import chat.peptide.api.internals.FriendRequests +import chat.peptide.api.internals.UserQR +import chat.peptide.api.internals.UserQRContents +import chat.peptide.api.routes.user.friendUser +import chat.peptide.api.routes.user.unfriendUser +import chat.peptide.api.schemas.AutumnResource +import chat.peptide.api.schemas.Metadata +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.components.vectorassets.HL_TAG +import chat.peptide.components.vectorassets.HL_USERNAME +import chat.peptide.components.vectorassets.RevoltTagIntro +import chat.peptide.composables.chat.MemberListItem +import chat.peptide.composables.generic.CountableListHeader +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.internals.extensions.zero +import chat.peptide.markdown.jbm.asHexString import io.github.g00fy2.quickie.QRResult import io.github.g00fy2.quickie.ScanQRCode import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/chat/revolt/screens/chat/views/NoCurrentChannelScreen.kt b/app/src/main/java/chat/peptide/screens/chat/views/NoCurrentChannelScreen.kt similarity index 95% rename from app/src/main/java/chat/revolt/screens/chat/views/NoCurrentChannelScreen.kt rename to app/src/main/java/chat/peptide/screens/chat/views/NoCurrentChannelScreen.kt index 91dcc03e..f1f36d8f 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/NoCurrentChannelScreen.kt +++ b/app/src/main/java/chat/peptide/screens/chat/views/NoCurrentChannelScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.views +package chat.peptide.screens.chat.views import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Arrangement @@ -25,9 +25,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.internals.extensions.zero -import chat.revolt.screens.chat.LocalIsConnected +import chat.peptide.R +import chat.peptide.internals.extensions.zero +import chat.peptide.screens.chat.LocalIsConnected @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt b/app/src/main/java/chat/peptide/screens/chat/views/OverviewScreen.kt similarity index 96% rename from app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt rename to app/src/main/java/chat/peptide/screens/chat/views/OverviewScreen.kt index fa9bc235..44a3785a 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt +++ b/app/src/main/java/chat/peptide/screens/chat/views/OverviewScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.views +package chat.peptide.screens.chat.views import android.util.Log import android.widget.Toast @@ -52,16 +52,16 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController -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.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.screens.chat.LocalIsConnected -import chat.revolt.sheets.UserCardSheet +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.user.fetchSelf +import chat.peptide.api.schemas.User +import chat.peptide.composables.generic.NonIdealState +import chat.peptide.composables.screens.settings.UserOverview +import chat.peptide.composables.skeletons.UserOverviewSkeleton +import chat.peptide.internals.extensions.zero +import chat.peptide.screens.chat.LocalIsConnected +import chat.peptide.sheets.UserCardSheet import io.sentry.Sentry @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt rename to app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt index fa55778e..856e47fe 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt +++ b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.views.channel +package chat.peptide.screens.chat.views.channel import android.annotation.SuppressLint import android.app.Activity @@ -105,47 +105,47 @@ import androidx.compose.ui.unit.em import androidx.compose.ui.unit.sp import androidx.documentfile.provider.DocumentFile import androidx.hilt.navigation.compose.hiltViewModel -import chat.revolt.R -import chat.revolt.RevoltApplication -import chat.revolt.activities.RevoltTweenDp -import chat.revolt.activities.RevoltTweenFloat -import chat.revolt.activities.RevoltTweenInt -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.ChannelUtils -import chat.revolt.api.internals.PermissionBit -import chat.revolt.api.internals.has -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.FeatureFlags -import chat.revolt.callbacks.Action -import chat.revolt.callbacks.ActionChannel -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.screens.chat.molecules.JoinVoiceChannelButton -import chat.revolt.composables.skeletons.MessageSkeleton -import chat.revolt.composables.skeletons.MessageSkeletonVariant -import chat.revolt.internals.extensions.rememberChannelPermissions -import chat.revolt.internals.extensions.zero -import chat.revolt.screens.chat.LocalIsConnected -import chat.revolt.sheets.ChannelInfoSheet -import chat.revolt.sheets.MessageContextSheet -import chat.revolt.sheets.ReactSheet +import chat.peptide.R +import chat.peptide.RevoltApplication +import chat.peptide.activities.RevoltTweenDp +import chat.peptide.activities.RevoltTweenFloat +import chat.peptide.activities.RevoltTweenInt +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.ChannelUtils +import chat.peptide.api.internals.PermissionBit +import chat.peptide.api.internals.has +import chat.peptide.api.routes.channel.react +import chat.peptide.api.routes.microservices.autumn.FileArgs +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.schemas.Message +import chat.peptide.api.settings.FeatureFlags +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.composables.chat.DateDivider +import chat.peptide.composables.chat.Message +import chat.peptide.composables.chat.MessageField +import chat.peptide.composables.chat.SystemMessage +import chat.peptide.composables.emoji.EmojiPicker +import chat.peptide.composables.generic.GroupIcon +import chat.peptide.composables.generic.PresenceBadge +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.composables.generic.UserAvatarWidthPlaceholder +import chat.peptide.composables.generic.presenceFromStatus +import chat.peptide.composables.media.MediaPickerGateway +import chat.peptide.composables.screens.chat.AttachmentManager +import chat.peptide.composables.screens.chat.ChannelIcon +import chat.peptide.composables.screens.chat.ReplyManager +import chat.peptide.composables.screens.chat.TypingIndicator +import chat.peptide.composables.screens.chat.atoms.RegularMessage +import chat.peptide.composables.screens.chat.molecules.JoinVoiceChannelButton +import chat.peptide.composables.skeletons.MessageSkeleton +import chat.peptide.composables.skeletons.MessageSkeletonVariant +import chat.peptide.internals.extensions.rememberChannelPermissions +import chat.peptide.internals.extensions.zero +import chat.peptide.screens.chat.LocalIsConnected +import chat.peptide.sheets.ChannelInfoSheet +import chat.peptide.sheets.MessageContextSheet +import chat.peptide.sheets.ReactSheet import com.valentinilk.shimmer.ShimmerBounds import com.valentinilk.shimmer.rememberShimmer import com.valentinilk.shimmer.shimmer diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenAgeGate.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt rename to app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenAgeGate.kt index 23898040..ab470085 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt +++ b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenAgeGate.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.views.channel +package chat.peptide.screens.chat.views.channel import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -29,9 +29,9 @@ import androidx.compose.ui.text.intl.Locale 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.composables.generic.DobPicker -import chat.revolt.composables.generic.DobRegion +import chat.peptide.R +import chat.peptide.composables.generic.DobPicker +import chat.peptide.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/chat/views/channel/ChannelScreenGeoGate.kt b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenGeoGate.kt similarity index 93% rename from app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenGeoGate.kt rename to app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenGeoGate.kt index 9fa9d6b6..f6dd504f 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenGeoGate.kt +++ b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenGeoGate.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.views.channel +package chat.peptide.screens.chat.views.channel import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -17,9 +17,9 @@ import androidx.compose.ui.res.stringResource 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.api.settings.GeoStateProvider -import chat.revolt.composables.vectorassets.GeoGateUX +import chat.peptide.R +import chat.peptide.api.settings.GeoStateProvider +import chat.peptide.composables.vectorassets.GeoGateUX @Composable fun ChannelScreenGeoGate( diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenViewModel.kt similarity index 94% rename from app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt rename to app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenViewModel.kt index 1402e278..9a245855 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt +++ b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenViewModel.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chat.views.channel +package chat.peptide.screens.chat.views.channel import android.util.Log import androidx.compose.runtime.getValue @@ -10,48 +10,48 @@ import androidx.compose.runtime.toMutableStateList import androidx.compose.ui.util.fastDistinctBy import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.RevoltJson -import chat.revolt.api.internals.ChannelUtils -import chat.revolt.api.internals.PermissionBit -import chat.revolt.api.internals.Roles -import chat.revolt.api.internals.SpecialUsers -import chat.revolt.api.internals.ULID -import chat.revolt.api.internals.has -import chat.revolt.api.realtime.RealtimeSocket -import chat.revolt.api.realtime.RealtimeSocketFrames -import chat.revolt.api.realtime.frames.receivable.ChannelDeleteFrame -import chat.revolt.api.realtime.frames.receivable.ChannelStartTypingFrame -import chat.revolt.api.realtime.frames.receivable.ChannelStopTypingFrame -import chat.revolt.api.realtime.frames.receivable.MessageAppendFrame -import chat.revolt.api.realtime.frames.receivable.MessageDeleteFrame -import chat.revolt.api.realtime.frames.receivable.MessageFrame -import chat.revolt.api.realtime.frames.receivable.MessageReactFrame -import chat.revolt.api.realtime.frames.receivable.MessageUnreactFrame -import chat.revolt.api.realtime.frames.receivable.MessageUpdateFrame -import chat.revolt.api.routes.channel.SendMessageReply -import chat.revolt.api.routes.channel.ackChannel -import chat.revolt.api.routes.channel.editMessage -import chat.revolt.api.routes.channel.fetchMessagesFromChannel -import chat.revolt.api.routes.channel.sendMessage -import chat.revolt.api.routes.microservices.autumn.FileArgs -import chat.revolt.api.routes.microservices.autumn.MAX_ATTACHMENTS_PER_MESSAGE -import chat.revolt.api.routes.microservices.autumn.uploadToAutumn -import chat.revolt.api.routes.server.fetchMember -import chat.revolt.api.routes.user.addUserIfUnknown -import chat.revolt.api.routes.user.fetchUser -import chat.revolt.api.schemas.Channel -import chat.revolt.api.schemas.Message -import chat.revolt.api.settings.GeoStateProvider -import chat.revolt.callbacks.Action -import chat.revolt.callbacks.ActionChannel -import chat.revolt.callbacks.UiCallback -import chat.revolt.callbacks.UiCallbacks -import chat.revolt.internals.text.MessageProcessor -import chat.revolt.persistence.KVStorage -import chat.revolt.screens.chat.ChatRouterDestination -import chat.revolt.settings.providers.AgeGateUnlockedStorageProvider +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.RevoltJson +import chat.peptide.api.internals.ChannelUtils +import chat.peptide.api.internals.PermissionBit +import chat.peptide.api.internals.Roles +import chat.peptide.api.internals.SpecialUsers +import chat.peptide.api.internals.ULID +import chat.peptide.api.internals.has +import chat.peptide.api.realtime.RealtimeSocket +import chat.peptide.api.realtime.RealtimeSocketFrames +import chat.peptide.api.realtime.frames.receivable.ChannelDeleteFrame +import chat.peptide.api.realtime.frames.receivable.ChannelStartTypingFrame +import chat.peptide.api.realtime.frames.receivable.ChannelStopTypingFrame +import chat.peptide.api.realtime.frames.receivable.MessageAppendFrame +import chat.peptide.api.realtime.frames.receivable.MessageDeleteFrame +import chat.peptide.api.realtime.frames.receivable.MessageFrame +import chat.peptide.api.realtime.frames.receivable.MessageReactFrame +import chat.peptide.api.realtime.frames.receivable.MessageUnreactFrame +import chat.peptide.api.realtime.frames.receivable.MessageUpdateFrame +import chat.peptide.api.routes.channel.SendMessageReply +import chat.peptide.api.routes.channel.ackChannel +import chat.peptide.api.routes.channel.editMessage +import chat.peptide.api.routes.channel.fetchMessagesFromChannel +import chat.peptide.api.routes.channel.sendMessage +import chat.peptide.api.routes.microservices.autumn.FileArgs +import chat.peptide.api.routes.microservices.autumn.MAX_ATTACHMENTS_PER_MESSAGE +import chat.peptide.api.routes.microservices.autumn.uploadToAutumn +import chat.peptide.api.routes.server.fetchMember +import chat.peptide.api.routes.user.addUserIfUnknown +import chat.peptide.api.routes.user.fetchUser +import chat.peptide.api.schemas.Channel +import chat.peptide.api.schemas.Message +import chat.peptide.api.settings.GeoStateProvider +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.callbacks.UiCallback +import chat.peptide.callbacks.UiCallbacks +import chat.peptide.internals.text.MessageProcessor +import chat.peptide.persistence.KVStorage +import chat.peptide.screens.chat.ChatRouterDestination +import chat.peptide.settings.providers.AgeGateUnlockedStorageProvider import dagger.hilt.android.lifecycle.HiltViewModel import io.ktor.http.ContentType import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/chat/revolt/screens/chooseplatform/ChoosePlatformScreen.kt b/app/src/main/java/chat/peptide/screens/chooseplatform/ChoosePlatformScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/chooseplatform/ChoosePlatformScreen.kt rename to app/src/main/java/chat/peptide/screens/chooseplatform/ChoosePlatformScreen.kt index 79e57f43..afcfb578 100644 --- a/app/src/main/java/chat/revolt/screens/chooseplatform/ChoosePlatformScreen.kt +++ b/app/src/main/java/chat/peptide/screens/chooseplatform/ChoosePlatformScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.chooseplatform +package chat.peptide.screens.chooseplatform import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -32,10 +32,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.api.ApplicationPlatform -import chat.revolt.api.RevoltAPI -import chat.revolt.composables.generic.SquareButton +import chat.peptide.R +import chat.peptide.api.ApplicationPlatform +import chat.peptide.api.RevoltAPI +import chat.peptide.composables.generic.SquareButton @Composable fun ChoosePlatformScreen(navController: NavController) { diff --git a/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt b/app/src/main/java/chat/peptide/screens/create/CreateGroupScreen.kt similarity index 95% rename from app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt rename to app/src/main/java/chat/peptide/screens/create/CreateGroupScreen.kt index cdbb61ed..f9b6e17c 100644 --- a/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt +++ b/app/src/main/java/chat/peptide/screens/create/CreateGroupScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.create +package chat.peptide.screens.create import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.scaleIn @@ -36,14 +36,14 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.activities.RevoltTweenFloat -import chat.revolt.api.RevoltAPI -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.composables.chat.MemberListItem +import chat.peptide.R +import chat.peptide.activities.RevoltTweenFloat +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.FriendRequests +import chat.peptide.api.routes.channel.createGroupDM +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.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/LabsHomeScreen.kt b/app/src/main/java/chat/peptide/screens/labs/LabsHomeScreen.kt similarity index 98% rename from app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt rename to app/src/main/java/chat/peptide/screens/labs/LabsHomeScreen.kt index 3f878803..b380a40a 100644 --- a/app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt +++ b/app/src/main/java/chat/peptide/screens/labs/LabsHomeScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.labs +package chat.peptide.screens.labs import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -35,8 +35,8 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.ui.theme.FragmentMono +import chat.peptide.R +import chat.peptide.ui.theme.FragmentMono enum class LabsHomeScreenTab { Home, diff --git a/app/src/main/java/chat/revolt/screens/labs/LabsRootScreen.kt b/app/src/main/java/chat/peptide/screens/labs/LabsRootScreen.kt similarity index 85% rename from app/src/main/java/chat/revolt/screens/labs/LabsRootScreen.kt rename to app/src/main/java/chat/peptide/screens/labs/LabsRootScreen.kt index a4f81a9e..dc9246ad 100644 --- a/app/src/main/java/chat/revolt/screens/labs/LabsRootScreen.kt +++ b/app/src/main/java/chat/peptide/screens/labs/LabsRootScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.labs +package chat.peptide.screens.labs import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -11,12 +11,12 @@ import androidx.navigation.NavController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import chat.revolt.api.settings.FeatureFlags -import chat.revolt.screens.labs.ui.mockups.NewLoginExperienceMockup -import chat.revolt.screens.labs.ui.sandbox.CoreLibSandbox -import chat.revolt.screens.labs.ui.sandbox.GradientEditorSandbox -import chat.revolt.screens.labs.ui.sandbox.JBMSandbox -import chat.revolt.screens.labs.ui.sandbox.SettingsDslSandbox +import chat.peptide.api.settings.FeatureFlags +import chat.peptide.screens.labs.ui.mockups.NewLoginExperienceMockup +import chat.peptide.screens.labs.ui.sandbox.CoreLibSandbox +import chat.peptide.screens.labs.ui.sandbox.GradientEditorSandbox +import chat.peptide.screens.labs.ui.sandbox.JBMSandbox +import chat.peptide.screens.labs.ui.sandbox.SettingsDslSandbox annotation class LabsFeature diff --git a/app/src/main/java/chat/revolt/screens/labs/ui/mockups/NewLoginExperienceMockup.kt b/app/src/main/java/chat/peptide/screens/labs/ui/mockups/NewLoginExperienceMockup.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/labs/ui/mockups/NewLoginExperienceMockup.kt rename to app/src/main/java/chat/peptide/screens/labs/ui/mockups/NewLoginExperienceMockup.kt index e23d1cbf..84442035 100644 --- a/app/src/main/java/chat/revolt/screens/labs/ui/mockups/NewLoginExperienceMockup.kt +++ b/app/src/main/java/chat/peptide/screens/labs/ui/mockups/NewLoginExperienceMockup.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.labs.ui.mockups +package chat.peptide.screens.labs.ui.mockups import androidx.compose.animation.core.tween import androidx.compose.animation.slideIn @@ -36,9 +36,9 @@ import androidx.navigation.NavController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import chat.revolt.R -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.ui.theme.Theme +import chat.peptide.R +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.ui.theme.Theme @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/CoreLibSandbox.kt b/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/CoreLibSandbox.kt similarity index 89% rename from app/src/main/java/chat/revolt/screens/labs/ui/sandbox/CoreLibSandbox.kt rename to app/src/main/java/chat/peptide/screens/labs/ui/sandbox/CoreLibSandbox.kt index ddee7d68..0ed27055 100644 --- a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/CoreLibSandbox.kt +++ b/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/CoreLibSandbox.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.labs.ui.sandbox +package chat.peptide.screens.labs.ui.sandbox import androidx.compose.material3.Button import androidx.compose.material3.Text @@ -11,8 +11,8 @@ import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextOverflow import androidx.navigation.NavController -import chat.revolt.settings.dsl.SettingsPage -import chat.revolt.ui.theme.FragmentMono +import chat.peptide.settings.dsl.SettingsPage +import chat.peptide.ui.theme.FragmentMono @Composable fun CoreLibSandbox(navController: NavController) { diff --git a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/GradientEditorSandbox.kt b/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/GradientEditorSandbox.kt similarity index 93% rename from app/src/main/java/chat/revolt/screens/labs/ui/sandbox/GradientEditorSandbox.kt rename to app/src/main/java/chat/peptide/screens/labs/ui/sandbox/GradientEditorSandbox.kt index d2287b37..41076628 100644 --- a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/GradientEditorSandbox.kt +++ b/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/GradientEditorSandbox.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.labs.ui.sandbox +package chat.peptide.screens.labs.ui.sandbox import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.height @@ -15,8 +15,8 @@ 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.composables.generic.GradientStopEditor -import chat.revolt.settings.dsl.SettingsPage +import chat.peptide.composables.generic.GradientStopEditor +import chat.peptide.settings.dsl.SettingsPage @Composable fun GradientEditorSandbox(navController: NavController) { diff --git a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/JBMSandbox.kt b/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/JBMSandbox.kt similarity index 94% rename from app/src/main/java/chat/revolt/screens/labs/ui/sandbox/JBMSandbox.kt rename to app/src/main/java/chat/peptide/screens/labs/ui/sandbox/JBMSandbox.kt index 6684d2d2..b3c78431 100644 --- a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/JBMSandbox.kt +++ b/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/JBMSandbox.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.labs.ui.sandbox +package chat.peptide.screens.labs.ui.sandbox import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -19,10 +19,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import chat.revolt.markdown.jbm.JBM -import chat.revolt.markdown.jbm.JBMRenderer -import chat.revolt.markdown.jbm.LocalJBMarkdownTreeState -import chat.revolt.settings.dsl.SettingsPage +import chat.peptide.markdown.jbm.JBM +import chat.peptide.markdown.jbm.JBMRenderer +import chat.peptide.markdown.jbm.LocalJBMarkdownTreeState +import chat.peptide.settings.dsl.SettingsPage @OptIn(JBM::class) @Composable diff --git a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/SettingsDslSandbox.kt b/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/SettingsDslSandbox.kt similarity index 87% rename from app/src/main/java/chat/revolt/screens/labs/ui/sandbox/SettingsDslSandbox.kt rename to app/src/main/java/chat/peptide/screens/labs/ui/sandbox/SettingsDslSandbox.kt index 11e9bc4e..865cd13d 100644 --- a/app/src/main/java/chat/revolt/screens/labs/ui/sandbox/SettingsDslSandbox.kt +++ b/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/SettingsDslSandbox.kt @@ -1,11 +1,11 @@ -package chat.revolt.screens.labs.ui.sandbox +package chat.peptide.screens.labs.ui.sandbox import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.text.style.TextOverflow import androidx.navigation.NavController -import chat.revolt.settings.dsl.SettingsPage -import chat.revolt.settings.dsl.SubcategoryContentInsets +import chat.peptide.settings.dsl.SettingsPage +import chat.peptide.settings.dsl.SubcategoryContentInsets enum class SettingsDslSandboxTab { General, diff --git a/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt b/app/src/main/java/chat/peptide/screens/login/LoginGreetingScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt rename to app/src/main/java/chat/peptide/screens/login/LoginGreetingScreen.kt index c538463a..7a8d75fa 100644 --- a/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt +++ b/app/src/main/java/chat/peptide/screens/login/LoginGreetingScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.login +package chat.peptide.screens.login import android.widget.Toast import androidx.compose.animation.AnimatedVisibility @@ -38,9 +38,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController -import chat.revolt.R -import chat.revolt.composables.generic.SquareButton -import chat.revolt.composables.generic.SquareElevatedButton +import chat.peptide.R +import chat.peptide.composables.generic.SquareButton +import chat.peptide.composables.generic.SquareElevatedButton @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt b/app/src/main/java/chat/peptide/screens/login/LoginScreen.kt similarity index 95% rename from app/src/main/java/chat/revolt/screens/login/LoginScreen.kt rename to app/src/main/java/chat/peptide/screens/login/LoginScreen.kt index 180e4af1..ed16cd92 100644 --- a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt +++ b/app/src/main/java/chat/peptide/screens/login/LoginScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.login +package chat.peptide.screens.login import android.util.Log import androidx.compose.foundation.Image @@ -49,17 +49,17 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.RevoltApplication -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.composables.generic.FormTextField -import chat.revolt.composables.generic.SquareButton -import chat.revolt.composables.generic.Weblink -import chat.revolt.persistence.KVStorage -import chat.revolt.ui.theme.FragmentMono +import chat.peptide.R +import chat.peptide.RevoltApplication +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.account.EmailPasswordAssessment +import chat.peptide.api.routes.account.negotiateAuthentication +import chat.peptide.api.routes.onboard.needsOnboarding +import chat.peptide.composables.generic.FormTextField +import chat.peptide.composables.generic.SquareButton +import chat.peptide.composables.generic.Weblink +import chat.peptide.persistence.KVStorage +import chat.peptide.ui.theme.FragmentMono import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt b/app/src/main/java/chat/peptide/screens/login/MfaScreen.kt similarity index 96% rename from app/src/main/java/chat/revolt/screens/login/MfaScreen.kt rename to app/src/main/java/chat/peptide/screens/login/MfaScreen.kt index effa1085..9cf18c75 100644 --- a/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt +++ b/app/src/main/java/chat/peptide/screens/login/MfaScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.login +package chat.peptide.screens.login import android.util.Log import androidx.compose.foundation.Image @@ -36,15 +36,15 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.api.RevoltAPI -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.composables.generic.CollapsibleCard -import chat.revolt.composables.generic.FormTextField -import chat.revolt.persistence.KVStorage +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.account.MfaResponseRecoveryCode +import chat.peptide.api.routes.account.MfaResponseTotpCode +import chat.peptide.api.routes.account.authenticateWithMfaRecoveryCode +import chat.peptide.api.routes.account.authenticateWithMfaTotpCode +import chat.peptide.composables.generic.CollapsibleCard +import chat.peptide.composables.generic.FormTextField +import chat.peptide.persistence.KVStorage import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/chat/revolt/screens/login2/InitScreen.kt b/app/src/main/java/chat/peptide/screens/login2/InitScreen.kt similarity index 95% rename from app/src/main/java/chat/revolt/screens/login2/InitScreen.kt rename to app/src/main/java/chat/peptide/screens/login2/InitScreen.kt index 7090add8..2eacb051 100644 --- a/app/src/main/java/chat/revolt/screens/login2/InitScreen.kt +++ b/app/src/main/java/chat/peptide/screens/login2/InitScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.login2 +package chat.peptide.screens.login2 import android.content.Intent import android.net.Uri @@ -33,13 +33,13 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import chat.revolt.BuildConfig -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.composables.generic.AnyLink -import chat.revolt.composables.generic.Weblink -import chat.revolt.ui.theme.Theme +import chat.peptide.BuildConfig +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.composables.generic.AnyLink +import chat.peptide.composables.generic.Weblink +import chat.peptide.ui.theme.Theme import com.chuckerteam.chucker.api.Chucker @Composable diff --git a/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt b/app/src/main/java/chat/peptide/screens/main/ConversationsScreen.kt similarity index 94% rename from app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt rename to app/src/main/java/chat/peptide/screens/main/ConversationsScreen.kt index 22cb903e..3d2e9bbf 100644 --- a/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/main/ConversationsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.main +package chat.peptide.screens.main import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -29,13 +29,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import chat.revolt.R -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.composables.generic.UserAvatar -import chat.revolt.internals.extensions.zero +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.schemas.User +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.internals.extensions.zero // Note - this is not a traditional screen per se, as it is a part of the main screen @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/revolt/screens/main/MainScreen.kt b/app/src/main/java/chat/peptide/screens/main/MainScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/main/MainScreen.kt rename to app/src/main/java/chat/peptide/screens/main/MainScreen.kt index afb3b3d1..94cebda1 100644 --- a/app/src/main/java/chat/revolt/screens/main/MainScreen.kt +++ b/app/src/main/java/chat/peptide/screens/main/MainScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.main +package chat.peptide.screens.main import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding @@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.screens.chat.views.OverviewScreen +import chat.peptide.R +import chat.peptide.screens.chat.views.OverviewScreen enum class MainScreenTab { Communities, diff --git a/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt b/app/src/main/java/chat/peptide/screens/register/OnboardingScreen.kt similarity index 95% rename from app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt rename to app/src/main/java/chat/peptide/screens/register/OnboardingScreen.kt index d21decf6..df813666 100644 --- a/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt +++ b/app/src/main/java/chat/peptide/screens/register/OnboardingScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.register +package chat.peptide.screens.register import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -30,12 +30,12 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController -import chat.revolt.R -import chat.revolt.api.routes.onboard.OnboardingCompletionBody -import chat.revolt.api.routes.onboard.completeOnboarding -import chat.revolt.composables.generic.FormTextField -import chat.revolt.composables.generic.SquareButton -import chat.revolt.persistence.KVStorage +import chat.peptide.R +import chat.peptide.api.routes.onboard.OnboardingCompletionBody +import chat.peptide.api.routes.onboard.completeOnboarding +import chat.peptide.composables.generic.FormTextField +import chat.peptide.composables.generic.SquareButton +import chat.peptide.persistence.KVStorage import kotlinx.coroutines.launch @OptIn(ExperimentalLayoutApi::class) diff --git a/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt b/app/src/main/java/chat/peptide/screens/register/RegisterDetailsScreen.kt similarity index 96% rename from app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt rename to app/src/main/java/chat/peptide/screens/register/RegisterDetailsScreen.kt index 31483187..e9d39356 100644 --- a/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/register/RegisterDetailsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.register +package chat.peptide.screens.register import android.content.Context import androidx.compose.foundation.Image @@ -44,13 +44,13 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.revolt.R -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.composables.generic.FormTextField -import chat.revolt.composables.generic.SquareButton +import chat.peptide.R +import chat.peptide.RevoltApplication +import chat.peptide.api.routes.account.RegistrationBody +import chat.peptide.api.routes.account.register +import chat.peptide.api.routes.misc.getRootRoute +import chat.peptide.composables.generic.FormTextField +import chat.peptide.composables.generic.SquareButton 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/register/RegisterGreetingScreen.kt b/app/src/main/java/chat/peptide/screens/register/RegisterGreetingScreen.kt similarity index 98% rename from app/src/main/java/chat/revolt/screens/register/RegisterGreetingScreen.kt rename to app/src/main/java/chat/peptide/screens/register/RegisterGreetingScreen.kt index 279fe19f..101fa769 100644 --- a/app/src/main/java/chat/revolt/screens/register/RegisterGreetingScreen.kt +++ b/app/src/main/java/chat/peptide/screens/register/RegisterGreetingScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.register +package chat.peptide.screens.register import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -26,7 +26,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import chat.revolt.R +import chat.peptide.R @Composable fun RegisterGreetingScreen(navController: NavController) { diff --git a/app/src/main/java/chat/revolt/screens/register/RegisterVerifyScreen.kt b/app/src/main/java/chat/peptide/screens/register/RegisterVerifyScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/register/RegisterVerifyScreen.kt rename to app/src/main/java/chat/peptide/screens/register/RegisterVerifyScreen.kt index 55f74d26..2364b723 100644 --- a/app/src/main/java/chat/revolt/screens/register/RegisterVerifyScreen.kt +++ b/app/src/main/java/chat/peptide/screens/register/RegisterVerifyScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.register +package chat.peptide.screens.register import android.content.Intent import androidx.activity.compose.rememberLauncherForActivityResult @@ -32,8 +32,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController -import chat.revolt.R -import chat.revolt.composables.generic.SquareButton +import chat.peptide.R +import chat.peptide.composables.generic.SquareButton @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt b/app/src/main/java/chat/peptide/screens/services/DiscoverScreen.kt similarity index 93% rename from app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt rename to app/src/main/java/chat/peptide/screens/services/DiscoverScreen.kt index 119406d0..63eefab6 100644 --- a/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt +++ b/app/src/main/java/chat/peptide/screens/services/DiscoverScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.services +package chat.peptide.screens.services import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -17,8 +17,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.composables.screens.services.DiscoverView +import chat.peptide.R +import chat.peptide.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/peptide/screens/settings/AppearanceSettingsScreen.kt similarity index 96% rename from app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt rename to app/src/main/java/chat/peptide/screens/settings/AppearanceSettingsScreen.kt index cd7fe0a4..cbb1c687 100644 --- a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/AppearanceSettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings +package chat.peptide.screens.settings import android.content.Context import android.net.Uri @@ -57,19 +57,19 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.revolt.R -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.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 -import chat.revolt.ui.theme.getFieldByName -import chat.revolt.ui.theme.systemSupportsDynamicColors +import chat.peptide.R +import chat.peptide.api.RevoltCbor +import chat.peptide.api.RevoltJson +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.api.settings.SyncedSettings +import chat.peptide.composables.generic.ListHeader +import chat.peptide.composables.screens.settings.appearance.ColourChip +import chat.peptide.composables.screens.settings.appearance.CornerRadiusPicker +import chat.peptide.sheets.ColourPickerSheet +import chat.peptide.ui.theme.OverridableColourScheme +import chat.peptide.ui.theme.Theme +import chat.peptide.ui.theme.getFieldByName +import chat.peptide.ui.theme.systemSupportsDynamicColors import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt b/app/src/main/java/chat/peptide/screens/settings/ChangelogsScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt rename to app/src/main/java/chat/peptide/screens/settings/ChangelogsScreen.kt index 6dd235ec..af51b730 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/ChangelogsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings +package chat.peptide.screens.settings import android.content.Context import android.text.format.DateUtils @@ -40,11 +40,11 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.internals.ChangelogIndex -import chat.revolt.internals.Changelogs -import chat.revolt.persistence.KVStorage -import chat.revolt.sheets.ChangelogSheet +import chat.peptide.R +import chat.peptide.internals.ChangelogIndex +import chat.peptide.internals.Changelogs +import chat.peptide.persistence.KVStorage +import chat.peptide.sheets.ChangelogSheet import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt b/app/src/main/java/chat/peptide/screens/settings/ChatSettingsScreen.kt similarity index 96% rename from app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt rename to app/src/main/java/chat/peptide/screens/settings/ChatSettingsScreen.kt index 96ab36aa..7e16920f 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/ChatSettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings +package chat.peptide.screens.settings import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -37,13 +37,13 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.revolt.R -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.composables.generic.ListHeader -import chat.revolt.composables.generic.RadioItem +import chat.peptide.R +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.api.settings.MessageReplyStyle +import chat.peptide.api.settings.SpecialEmbedSettings +import chat.peptide.api.settings.SyncedSettings +import chat.peptide.composables.generic.ListHeader +import chat.peptide.composables.generic.RadioItem import kotlinx.coroutines.launch class ChatSettingsScreenViewModel : ViewModel() { diff --git a/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt b/app/src/main/java/chat/peptide/screens/settings/DebugSettingsScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt rename to app/src/main/java/chat/peptide/screens/settings/DebugSettingsScreen.kt index 44e33dea..b26fa1d1 100644 --- a/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/DebugSettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings +package chat.peptide.screens.settings import android.os.Build import android.util.Log @@ -48,13 +48,13 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.api.routes.push.subscribePush -import chat.revolt.dialogs.NotificationRationaleDialog -import chat.revolt.persistence.Database -import chat.revolt.persistence.KVStorage -import chat.revolt.persistence.SqlStorage -import chat.revolt.ui.theme.FragmentMono +import chat.peptide.R +import chat.peptide.api.routes.push.subscribePush +import chat.peptide.dialogs.NotificationRationaleDialog +import chat.peptide.persistence.Database +import chat.peptide.persistence.KVStorage +import chat.peptide.persistence.SqlStorage +import chat.peptide.ui.theme.FragmentMono import com.google.android.gms.common.ConnectionResult import com.google.android.gms.common.GoogleApiAvailabilityLight import com.google.android.gms.tasks.OnCompleteListener diff --git a/app/src/main/java/chat/revolt/screens/settings/ExperimentsSettingsScreen.kt b/app/src/main/java/chat/peptide/screens/settings/ExperimentsSettingsScreen.kt similarity index 95% rename from app/src/main/java/chat/revolt/screens/settings/ExperimentsSettingsScreen.kt rename to app/src/main/java/chat/peptide/screens/settings/ExperimentsSettingsScreen.kt index 5b931589..98ace33d 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ExperimentsSettingsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/ExperimentsSettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings +package chat.peptide.screens.settings import android.content.Context import android.content.Intent @@ -21,13 +21,13 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.revolt.BuildConfig -import chat.revolt.RevoltApplication -import chat.revolt.api.settings.Experiments -import chat.revolt.api.settings.LoadedSettings -import chat.revolt.persistence.KVStorage -import chat.revolt.settings.dsl.SettingsPage -import chat.revolt.settings.dsl.SubcategoryContentInsets +import chat.peptide.BuildConfig +import chat.peptide.RevoltApplication +import chat.peptide.api.settings.Experiments +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.persistence.KVStorage +import chat.peptide.settings.dsl.SettingsPage +import chat.peptide.settings.dsl.SubcategoryContentInsets import kotlinx.coroutines.launch class ExperimentsSettingsScreenViewModel : ViewModel() { diff --git a/app/src/main/java/chat/revolt/screens/settings/LanguagePickerSettingsScreen.kt b/app/src/main/java/chat/peptide/screens/settings/LanguagePickerSettingsScreen.kt similarity index 98% rename from app/src/main/java/chat/revolt/screens/settings/LanguagePickerSettingsScreen.kt rename to app/src/main/java/chat/peptide/screens/settings/LanguagePickerSettingsScreen.kt index 1b801a9c..0076e4cd 100644 --- a/app/src/main/java/chat/revolt/screens/settings/LanguagePickerSettingsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/LanguagePickerSettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings +package chat.peptide.screens.settings import android.content.Context import androidx.appcompat.app.AppCompatDelegate @@ -31,8 +31,8 @@ import androidx.core.os.LocaleListCompat import androidx.lifecycle.ViewModel import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.internals.extensions.getSupportedLocales +import chat.peptide.R +import chat.peptide.internals.extensions.getSupportedLocales import java.util.Locale class LanguagePickerSettingsScreen : ViewModel() { diff --git a/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt b/app/src/main/java/chat/peptide/screens/settings/ProfileSettngsScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt rename to app/src/main/java/chat/peptide/screens/settings/ProfileSettngsScreen.kt index 55e2d90e..5e064195 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/ProfileSettngsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings +package chat.peptide.screens.settings import android.content.Context import android.net.Uri @@ -46,14 +46,14 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.api.RevoltAPI -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.composables.generic.InlineMediaPicker -import chat.revolt.composables.screens.settings.RawUserOverview +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.microservices.autumn.uploadToAutumn +import chat.peptide.api.routes.user.fetchUserProfile +import chat.peptide.api.routes.user.patchSelf +import chat.peptide.api.schemas.Profile +import chat.peptide.composables.generic.InlineMediaPicker +import chat.peptide.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/peptide/screens/settings/SessionSettngsScreen.kt similarity index 95% rename from app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt rename to app/src/main/java/chat/peptide/screens/settings/SessionSettngsScreen.kt index 483a16a5..251b2edc 100644 --- a/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/SessionSettngsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings +package chat.peptide.screens.settings import android.util.Log import androidx.compose.foundation.ExperimentalFoundationApi @@ -48,15 +48,15 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.api.RevoltAPI -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.composables.generic.ListHeader -import chat.revolt.composables.markdown.RichMarkdown -import chat.revolt.composables.settings.sessions.SessionItem +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.auth.fetchAllSessions +import chat.peptide.api.routes.auth.logoutAllSessions +import chat.peptide.api.routes.auth.logoutSessionById +import chat.peptide.api.schemas.Session +import chat.peptide.composables.generic.ListHeader +import chat.peptide.composables.markdown.RichMarkdown +import chat.peptide.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/peptide/screens/settings/SettingsScreen.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt rename to app/src/main/java/chat/peptide/screens/settings/SettingsScreen.kt index 8b7eac44..41a4428c 100644 --- a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/SettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings +package chat.peptide.screens.settings import android.content.Intent import androidx.compose.foundation.clickable @@ -30,14 +30,14 @@ import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.navigation.NavController -import chat.revolt.BuildConfig -import chat.revolt.R -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.composables.generic.ListHeader -import chat.revolt.persistence.KVStorage +import chat.peptide.BuildConfig +import chat.peptide.R +import chat.peptide.activities.InviteActivity +import chat.peptide.api.RevoltAPI +import chat.peptide.api.settings.FeatureFlags +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.composables.generic.ListHeader +import chat.peptide.persistence.KVStorage import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.runBlocking import javax.inject.Inject diff --git a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt b/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsHome.kt similarity index 94% rename from app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt rename to app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsHome.kt index e3729722..445a68c2 100644 --- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt +++ b/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsHome.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings.channel +package chat.peptide.screens.settings.channel import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -36,15 +36,15 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.PermissionBit -import chat.revolt.api.internals.hasPermission -import chat.revolt.api.routes.channel.leaveDeleteOrCloseChannel -import chat.revolt.api.schemas.ChannelType -import chat.revolt.api.settings.FeatureFlags -import chat.revolt.internals.extensions.rememberChannelPermissions -import chat.revolt.screens.settings.SettingsIcon +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.PermissionBit +import chat.peptide.api.internals.hasPermission +import chat.peptide.api.routes.channel.leaveDeleteOrCloseChannel +import chat.peptide.api.schemas.ChannelType +import chat.peptide.api.settings.FeatureFlags +import chat.peptide.internals.extensions.rememberChannelPermissions +import chat.peptide.screens.settings.SettingsIcon import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt b/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsOverview.kt similarity index 97% rename from app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt rename to app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsOverview.kt index 4b643868..2d391d69 100644 --- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt +++ b/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsOverview.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings.channel +package chat.peptide.screens.settings.channel import android.content.Context import android.net.Uri @@ -56,14 +56,14 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.activities.RevoltTweenFloat -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.composables.generic.InlineMediaPicker -import chat.revolt.composables.generic.ListHeader +import chat.peptide.R +import chat.peptide.activities.RevoltTweenFloat +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.channel.patchChannel +import chat.peptide.api.routes.microservices.autumn.uploadToAutumn +import chat.peptide.api.schemas.Channel +import chat.peptide.composables.generic.InlineMediaPicker +import chat.peptide.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/screens/settings/channel/ChannelSettingsPermissions.kt b/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsPermissions.kt similarity index 96% rename from app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt rename to app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsPermissions.kt index 695c4d16..49bd64ee 100644 --- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt +++ b/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsPermissions.kt @@ -1,4 +1,4 @@ -package chat.revolt.screens.settings.channel +package chat.peptide.screens.settings.channel import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -25,8 +25,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.api.RevoltAPI +import chat.peptide.R +import chat.peptide.api.RevoltAPI @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt b/app/src/main/java/chat/peptide/settings/dsl/SettingsPage.kt similarity index 96% rename from app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt rename to app/src/main/java/chat/peptide/settings/dsl/SettingsPage.kt index 7c7b0a73..d3544dc9 100644 --- a/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt +++ b/app/src/main/java/chat/peptide/settings/dsl/SettingsPage.kt @@ -1,4 +1,4 @@ -package chat.revolt.settings.dsl +package chat.peptide.settings.dsl import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -28,9 +28,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import chat.revolt.R -import chat.revolt.composables.generic.ListHeader -import chat.revolt.composables.generic.RadioItem +import chat.peptide.R +import chat.peptide.composables.generic.ListHeader +import chat.peptide.composables.generic.RadioItem import kotlinx.coroutines.launch import kotlin.enums.EnumEntries diff --git a/app/src/main/java/chat/revolt/settings/providers/AgeGateUnlockedStorageProvider.kt b/app/src/main/java/chat/peptide/settings/providers/AgeGateUnlockedStorageProvider.kt similarity index 72% rename from app/src/main/java/chat/revolt/settings/providers/AgeGateUnlockedStorageProvider.kt rename to app/src/main/java/chat/peptide/settings/providers/AgeGateUnlockedStorageProvider.kt index 4357b047..8a7e796e 100644 --- a/app/src/main/java/chat/revolt/settings/providers/AgeGateUnlockedStorageProvider.kt +++ b/app/src/main/java/chat/peptide/settings/providers/AgeGateUnlockedStorageProvider.kt @@ -1,7 +1,7 @@ -package chat.revolt.settings.providers +package chat.peptide.settings.providers -import chat.revolt.RevoltApplication -import chat.revolt.persistence.KVStorage +import chat.peptide.RevoltApplication +import chat.peptide.persistence.KVStorage object AgeGateUnlockedStorageProvider { private val kv = KVStorage(RevoltApplication.instance) diff --git a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt b/app/src/main/java/chat/peptide/sheets/AddServerSheet.kt similarity index 97% rename from app/src/main/java/chat/revolt/sheets/AddServerSheet.kt rename to app/src/main/java/chat/peptide/sheets/AddServerSheet.kt index a879b031..0e1d30ce 100644 --- a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/AddServerSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.content.Intent import android.util.Log @@ -52,19 +52,19 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.core.net.toUri -import chat.revolt.R -import chat.revolt.activities.InviteActivity -import chat.revolt.api.RevoltAPI -import chat.revolt.api.routes.server.createServer -import chat.revolt.callbacks.Action -import chat.revolt.callbacks.ActionChannel -import chat.revolt.composables.sheets.SheetSelection -import chat.revolt.composables.vectorassets.CreateServer -import chat.revolt.composables.vectorassets.JoinServer -import chat.revolt.composables.vectorassets.NewServer -import chat.revolt.material.EasingTokens -import chat.revolt.screens.chat.ChatRouterDestination -import chat.revolt.ui.theme.FragmentMono +import chat.peptide.R +import chat.peptide.activities.InviteActivity +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.server.createServer +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.composables.sheets.SheetSelection +import chat.peptide.composables.vectorassets.CreateServer +import chat.peptide.composables.vectorassets.JoinServer +import chat.peptide.composables.vectorassets.NewServer +import chat.peptide.material.EasingTokens +import chat.peptide.screens.chat.ChatRouterDestination +import chat.peptide.ui.theme.FragmentMono import kotlinx.coroutines.launch import logcat.asLog import logcat.logcat diff --git a/app/src/main/java/chat/revolt/sheets/ChangelogSheet.kt b/app/src/main/java/chat/peptide/sheets/ChangelogSheet.kt similarity index 91% rename from app/src/main/java/chat/revolt/sheets/ChangelogSheet.kt rename to app/src/main/java/chat/peptide/sheets/ChangelogSheet.kt index 4cdb9a16..7e2000e6 100644 --- a/app/src/main/java/chat/revolt/sheets/ChangelogSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/ChangelogSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -7,8 +7,8 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.platform.LocalContext -import chat.revolt.api.internals.getFragmentActivity -import chat.revolt.fragments.ChangelogBottomSheetFragment +import chat.peptide.api.internals.getFragmentActivity +import chat.peptide.fragments.ChangelogBottomSheetFragment @Composable fun ChangelogSheet( diff --git a/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt b/app/src/main/java/chat/peptide/sheets/ChannelContextSheet.kt similarity index 94% rename from app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt rename to app/src/main/java/chat/peptide/sheets/ChannelContextSheet.kt index 57ef991d..f8a27175 100644 --- a/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/ChannelContextSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.widget.Toast import androidx.compose.foundation.layout.Box @@ -17,11 +17,11 @@ import androidx.compose.ui.res.painterResource 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.api.RevoltAPI -import chat.revolt.composables.generic.SheetButton +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.composables.generic.SheetButton -import chat.revolt.internals.Platform +import chat.peptide.internals.Platform import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt b/app/src/main/java/chat/peptide/sheets/ChannelInfoSheet.kt similarity index 91% rename from app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt rename to app/src/main/java/chat/peptide/sheets/ChannelInfoSheet.kt index 36ffb27b..d83fc526 100644 --- a/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/ChannelInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -25,19 +25,19 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.ChannelUtils -import chat.revolt.api.internals.PermissionBit -import chat.revolt.api.internals.Roles -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.composables.generic.SheetButton -import chat.revolt.composables.screens.chat.ChannelSheetHeader -import chat.revolt.internals.extensions.rememberChannelPermissions -import chat.revolt.screens.chat.dialogs.InviteDialog +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.ChannelUtils +import chat.peptide.api.internals.PermissionBit +import chat.peptide.api.internals.Roles +import chat.peptide.api.internals.has +import chat.peptide.api.schemas.ChannelType +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.composables.generic.SheetButton +import chat.peptide.composables.screens.chat.ChannelSheetHeader +import chat.peptide.internals.extensions.rememberChannelPermissions +import chat.peptide.screens.chat.dialogs.InviteDialog import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/sheets/ColourPickerSheet.kt b/app/src/main/java/chat/peptide/sheets/ColourPickerSheet.kt similarity index 99% rename from app/src/main/java/chat/revolt/sheets/ColourPickerSheet.kt rename to app/src/main/java/chat/peptide/sheets/ColourPickerSheet.kt index 0449fc3e..a3a1e379 100644 --- a/app/src/main/java/chat/revolt/sheets/ColourPickerSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/ColourPickerSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.graphics.RuntimeShader import android.os.Build @@ -61,8 +61,8 @@ import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import chat.revolt.R -import chat.revolt.internals.TailwindColourScheme +import chat.peptide.R +import chat.peptide.internals.TailwindColourScheme import org.intellij.lang.annotations.Language enum class ColourPickerMode { diff --git a/app/src/main/java/chat/revolt/sheets/EarlyAccessSheet.kt b/app/src/main/java/chat/peptide/sheets/EarlyAccessSheet.kt similarity index 97% rename from app/src/main/java/chat/revolt/sheets/EarlyAccessSheet.kt rename to app/src/main/java/chat/peptide/sheets/EarlyAccessSheet.kt index 0608a985..bb5d1ac2 100644 --- a/app/src/main/java/chat/revolt/sheets/EarlyAccessSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/EarlyAccessSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -16,7 +16,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R +import chat.peptide.R @Composable fun EarlyAccessSheet(onClose: () -> Unit) { diff --git a/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt b/app/src/main/java/chat/peptide/sheets/EmoteInfoSheet.kt similarity index 92% rename from app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt rename to app/src/main/java/chat/peptide/sheets/EmoteInfoSheet.kt index bb70f794..479486a3 100644 --- a/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/EmoteInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.widget.Toast import androidx.compose.foundation.layout.Arrangement @@ -30,14 +30,14 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -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.composables.generic.RemoteImage -import chat.revolt.composables.generic.SheetButton -import chat.revolt.internals.Platform +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.custom.fetchEmoji +import chat.peptide.api.schemas.Emoji +import chat.peptide.api.schemas.Server +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.composables.generic.SheetButton +import chat.peptide.internals.Platform import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/revolt/sheets/JBMDebuggerSheet.kt b/app/src/main/java/chat/peptide/sheets/JBMDebuggerSheet.kt similarity index 95% rename from app/src/main/java/chat/revolt/sheets/JBMDebuggerSheet.kt rename to app/src/main/java/chat/peptide/sheets/JBMDebuggerSheet.kt index 6faa88f5..90c524c6 100644 --- a/app/src/main/java/chat/revolt/sheets/JBMDebuggerSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/JBMDebuggerSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -21,9 +21,9 @@ 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.composables.generic.SheetHeaderPadding -import chat.revolt.markdown.jbm.JBM -import chat.revolt.markdown.jbm.JBMApi +import chat.peptide.composables.generic.SheetHeaderPadding +import chat.peptide.markdown.jbm.JBM +import chat.peptide.markdown.jbm.JBMApi import org.intellij.markdown.ast.ASTNode import org.intellij.markdown.ast.getTextInNode diff --git a/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt b/app/src/main/java/chat/peptide/sheets/LinkInfoSheet.kt similarity index 96% rename from app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt rename to app/src/main/java/chat/peptide/sheets/LinkInfoSheet.kt index 45c5dde5..c9d4fb68 100644 --- a/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/LinkInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.net.Uri import android.widget.Toast @@ -24,9 +24,9 @@ import androidx.compose.ui.res.painterResource 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.composables.generic.SheetButton -import chat.revolt.internals.Platform +import chat.peptide.R +import chat.peptide.composables.generic.SheetButton +import chat.peptide.internals.Platform import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt b/app/src/main/java/chat/peptide/sheets/MemberContextSheet.kt similarity index 95% rename from app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt rename to app/src/main/java/chat/peptide/sheets/MemberContextSheet.kt index 6ccf99c0..904d3406 100644 --- a/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/MemberContextSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.widget.Toast import androidx.compose.foundation.layout.ColumnScope @@ -16,11 +16,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString 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.composables.generic.SheetButton -import chat.revolt.internals.Platform +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.channel.removeMember +import chat.peptide.composables.generic.SheetButton +import chat.peptide.internals.Platform import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt b/app/src/main/java/chat/peptide/sheets/MemberListSheet.kt similarity index 95% rename from app/src/main/java/chat/revolt/sheets/MemberListSheet.kt rename to app/src/main/java/chat/peptide/sheets/MemberListSheet.kt index 03a2d296..f2ce2498 100644 --- a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/MemberListSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.annotation.SuppressLint import android.content.Context @@ -32,20 +32,20 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.PermissionBit -import chat.revolt.api.internals.Roles -import chat.revolt.api.internals.hasPermission -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.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 chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.PermissionBit +import chat.peptide.api.internals.Roles +import chat.peptide.api.internals.hasPermission +import chat.peptide.api.routes.channel.fetchGroupParticipants +import chat.peptide.api.routes.server.fetchMembers +import chat.peptide.api.schemas.Member +import chat.peptide.api.schemas.User +import chat.peptide.composables.chat.MemberListItem +import chat.peptide.composables.generic.CountableListHeader +import chat.peptide.composables.generic.Presence +import chat.peptide.composables.generic.SheetHeaderPadding +import chat.peptide.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/peptide/sheets/MessageContextSheet.kt similarity index 96% rename from app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt rename to app/src/main/java/chat/peptide/sheets/MessageContextSheet.kt index 3e103127..b505d7a8 100644 --- a/app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/MessageContextSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.widget.Toast import androidx.compose.foundation.layout.Arrangement @@ -33,19 +33,19 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp -import chat.revolt.BuildConfig -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.PermissionBit -import chat.revolt.api.internals.Roles -import chat.revolt.api.internals.has -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.composables.chat.Message -import chat.revolt.composables.generic.SheetButton -import chat.revolt.internals.Platform +import chat.peptide.BuildConfig +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.PermissionBit +import chat.peptide.api.internals.Roles +import chat.peptide.api.internals.has +import chat.peptide.api.routes.channel.deleteMessage +import chat.peptide.api.routes.channel.react +import chat.peptide.api.settings.Experiments +import chat.peptide.callbacks.UiCallbacks +import chat.peptide.composables.chat.Message +import chat.peptide.composables.generic.SheetButton +import chat.peptide.internals.Platform import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/revolt/sheets/ReactSheet.kt b/app/src/main/java/chat/peptide/sheets/ReactSheet.kt similarity index 73% rename from app/src/main/java/chat/revolt/sheets/ReactSheet.kt rename to app/src/main/java/chat/peptide/sheets/ReactSheet.kt index 88f2f576..ee452b4e 100644 --- a/app/src/main/java/chat/revolt/sheets/ReactSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/ReactSheet.kt @@ -1,8 +1,8 @@ -package chat.revolt.sheets +package chat.peptide.sheets import androidx.compose.runtime.Composable -import chat.revolt.api.RevoltAPI -import chat.revolt.composables.emoji.EmojiPicker +import chat.peptide.api.RevoltAPI +import chat.peptide.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/peptide/sheets/ReactionInfoSheet.kt similarity index 96% rename from app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt rename to app/src/main/java/chat/peptide/sheets/ReactionInfoSheet.kt index f71d4fdb..b41acfec 100644 --- a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/ReactionInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable @@ -43,18 +43,18 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.isUlid -import chat.revolt.api.routes.custom.fetchEmoji -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.composables.chat.MemberListItem -import chat.revolt.composables.generic.RemoteImage -import chat.revolt.internals.text.MessageProcessor -import chat.revolt.persistence.KVStorage +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.isUlid +import chat.peptide.api.routes.custom.fetchEmoji +import chat.peptide.api.routes.user.fetchUser +import chat.peptide.api.schemas.Emoji +import chat.peptide.api.schemas.User +import chat.peptide.api.settings.LoadedSettings +import chat.peptide.composables.chat.MemberListItem +import chat.peptide.composables.generic.RemoteImage +import chat.peptide.internals.text.MessageProcessor +import chat.peptide.persistence.KVStorage import kotlinx.coroutines.launch @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt b/app/src/main/java/chat/peptide/sheets/ServerContextSheet.kt similarity index 96% rename from app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt rename to app/src/main/java/chat/peptide/sheets/ServerContextSheet.kt index 98403d24..032fab70 100644 --- a/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/ServerContextSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.content.Intent import android.widget.Toast @@ -40,14 +40,14 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp import androidx.core.net.toUri -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.routes.server.leaveOrDeleteServer -import chat.revolt.composables.generic.SheetButton -import chat.revolt.composables.markdown.RichMarkdown -import chat.revolt.composables.screens.settings.ServerOverview -import chat.revolt.composables.sheets.SheetSelection -import chat.revolt.internals.Platform +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.server.leaveOrDeleteServer +import chat.peptide.composables.generic.SheetButton +import chat.peptide.composables.markdown.RichMarkdown +import chat.peptide.composables.screens.settings.ServerOverview +import chat.peptide.composables.sheets.SheetSelection +import chat.peptide.internals.Platform import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/revolt/sheets/ServerIdentityOptionsSheet.kt b/app/src/main/java/chat/peptide/sheets/ServerIdentityOptionsSheet.kt similarity index 97% rename from app/src/main/java/chat/revolt/sheets/ServerIdentityOptionsSheet.kt rename to app/src/main/java/chat/peptide/sheets/ServerIdentityOptionsSheet.kt index 65004869..3e140d38 100644 --- a/app/src/main/java/chat/revolt/sheets/ServerIdentityOptionsSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/ServerIdentityOptionsSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -24,8 +24,8 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import chat.revolt.api.RevoltAPI -import chat.revolt.persistence.KVStorage +import chat.peptide.api.RevoltAPI +import chat.peptide.persistence.KVStorage import kotlinx.coroutines.launch // Internal: Untranslated diff --git a/app/src/main/java/chat/revolt/sheets/StatusSheet.kt b/app/src/main/java/chat/peptide/sheets/StatusSheet.kt similarity index 95% rename from app/src/main/java/chat/revolt/sheets/StatusSheet.kt rename to app/src/main/java/chat/peptide/sheets/StatusSheet.kt index fb2fdac0..2dcb4d91 100644 --- a/app/src/main/java/chat/revolt/sheets/StatusSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/StatusSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.util.Log import androidx.compose.foundation.background @@ -37,15 +37,15 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -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.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 chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.routes.user.patchSelf +import chat.peptide.api.schemas.User +import chat.peptide.composables.generic.SheetButton +import chat.peptide.composables.generic.asApiName +import chat.peptide.composables.generic.presenceFromStatus +import chat.peptide.composables.screens.settings.UserOverview +import chat.peptide.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/peptide/sheets/UserCardSheet.kt similarity index 96% rename from app/src/main/java/chat/revolt/sheets/UserCardSheet.kt rename to app/src/main/java/chat/peptide/sheets/UserCardSheet.kt index c6386a55..3d617529 100644 --- a/app/src/main/java/chat/revolt/sheets/UserCardSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/UserCardSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.content.ClipData import android.content.Intent @@ -36,12 +36,12 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.core.content.FileProvider -import chat.revolt.BuildConfig -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.schemas.User -import chat.revolt.composables.profile.UserCard -import chat.revolt.internals.Platform +import chat.peptide.BuildConfig +import chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.schemas.User +import chat.peptide.composables.profile.UserCard +import chat.peptide.internals.Platform import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt b/app/src/main/java/chat/peptide/sheets/UserInfoSheet.kt similarity index 94% rename from app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt rename to app/src/main/java/chat/peptide/sheets/UserInfoSheet.kt index fee3cf9d..68d4b9ab 100644 --- a/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/UserInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.text.format.DateUtils import androidx.compose.foundation.layout.Arrangement @@ -38,24 +38,24 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import chat.revolt.R -import chat.revolt.api.RevoltAPI -import chat.revolt.api.internals.BrushCompat -import chat.revolt.api.internals.ULID -import chat.revolt.api.internals.solidColor -import chat.revolt.api.routes.user.fetchUserProfile -import chat.revolt.api.schemas.Profile -import chat.revolt.api.settings.Experiments -import chat.revolt.api.settings.FeatureFlags -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 chat.peptide.R +import chat.peptide.api.RevoltAPI +import chat.peptide.api.internals.BrushCompat +import chat.peptide.api.internals.ULID +import chat.peptide.api.internals.solidColor +import chat.peptide.api.routes.user.fetchUserProfile +import chat.peptide.api.schemas.Profile +import chat.peptide.api.settings.Experiments +import chat.peptide.api.settings.FeatureFlags +import chat.peptide.composables.chat.RoleListEntry +import chat.peptide.composables.chat.UserBadgeList +import chat.peptide.composables.chat.UserBadgeRow +import chat.peptide.composables.generic.NonIdealState +import chat.peptide.composables.generic.UserAvatar +import chat.peptide.composables.markdown.RichMarkdown +import chat.peptide.composables.screens.settings.RawUserOverview +import chat.peptide.composables.screens.settings.UserButtons +import chat.peptide.composables.sheets.SheetTile import kotlinx.datetime.Instant @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/revolt/sheets/WebHookUserSheet.kt b/app/src/main/java/chat/peptide/sheets/WebHookUserSheet.kt similarity index 97% rename from app/src/main/java/chat/revolt/sheets/WebHookUserSheet.kt rename to app/src/main/java/chat/peptide/sheets/WebHookUserSheet.kt index c29beb01..c4b9939a 100644 --- a/app/src/main/java/chat/revolt/sheets/WebHookUserSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/WebHookUserSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets +package chat.peptide.sheets import android.widget.Toast import androidx.compose.foundation.Image @@ -18,7 +18,7 @@ import androidx.compose.ui.res.stringResource 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.peptide.R @Composable fun WebHookUserSheet(modifier: Modifier = Modifier) { diff --git a/app/src/main/java/chat/revolt/sheets/spark/SwipeToReplySparkSheet.kt b/app/src/main/java/chat/peptide/sheets/spark/SwipeToReplySparkSheet.kt similarity index 95% rename from app/src/main/java/chat/revolt/sheets/spark/SwipeToReplySparkSheet.kt rename to app/src/main/java/chat/peptide/sheets/spark/SwipeToReplySparkSheet.kt index 0fa77d65..cb8fa27e 100644 --- a/app/src/main/java/chat/revolt/sheets/spark/SwipeToReplySparkSheet.kt +++ b/app/src/main/java/chat/peptide/sheets/spark/SwipeToReplySparkSheet.kt @@ -1,4 +1,4 @@ -package chat.revolt.sheets.spark +package chat.peptide.sheets.spark import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -19,8 +19,8 @@ import androidx.compose.ui.res.stringResource 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.composables.vectorassets.SwipeToReplySpark +import chat.peptide.R +import chat.peptide.composables.vectorassets.SwipeToReplySpark @Composable fun SwipeToReplySparkSheet( diff --git a/app/src/main/java/chat/revolt/ui/theme/Colour.kt b/app/src/main/java/chat/peptide/ui/theme/Colour.kt similarity index 99% rename from app/src/main/java/chat/revolt/ui/theme/Colour.kt rename to app/src/main/java/chat/peptide/ui/theme/Colour.kt index 5fcb762b..82c8abc7 100644 --- a/app/src/main/java/chat/revolt/ui/theme/Colour.kt +++ b/app/src/main/java/chat/peptide/ui/theme/Colour.kt @@ -1,4 +1,4 @@ -package chat.revolt.ui.theme +package chat.peptide.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/chat/revolt/ui/theme/OverridableColourScheme.kt b/app/src/main/java/chat/peptide/ui/theme/OverridableColourScheme.kt similarity index 99% rename from app/src/main/java/chat/revolt/ui/theme/OverridableColourScheme.kt rename to app/src/main/java/chat/peptide/ui/theme/OverridableColourScheme.kt index dbfcdd86..91e3f4f0 100644 --- a/app/src/main/java/chat/revolt/ui/theme/OverridableColourScheme.kt +++ b/app/src/main/java/chat/peptide/ui/theme/OverridableColourScheme.kt @@ -1,9 +1,9 @@ -package chat.revolt.ui.theme +package chat.peptide.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import chat.revolt.R +import chat.peptide.R import kotlinx.serialization.Serializable // Word of warning, this file is ugly, because I've had to fight a bit with the Compose compiler, diff --git a/app/src/main/java/chat/revolt/ui/theme/Theme.kt b/app/src/main/java/chat/peptide/ui/theme/Theme.kt similarity index 99% rename from app/src/main/java/chat/revolt/ui/theme/Theme.kt rename to app/src/main/java/chat/peptide/ui/theme/Theme.kt index b8b0411c..63fedbf2 100644 --- a/app/src/main/java/chat/revolt/ui/theme/Theme.kt +++ b/app/src/main/java/chat/peptide/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package chat.revolt.ui.theme +package chat.peptide.ui.theme import android.annotation.SuppressLint import android.app.Activity diff --git a/app/src/main/java/chat/revolt/ui/theme/Typography.kt b/app/src/main/java/chat/peptide/ui/theme/Typography.kt similarity index 98% rename from app/src/main/java/chat/revolt/ui/theme/Typography.kt rename to app/src/main/java/chat/peptide/ui/theme/Typography.kt index 05daf8ad..d2447f35 100644 --- a/app/src/main/java/chat/revolt/ui/theme/Typography.kt +++ b/app/src/main/java/chat/peptide/ui/theme/Typography.kt @@ -1,4 +1,4 @@ -package chat.revolt.ui.theme +package chat.peptide.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle @@ -7,7 +7,8 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -import chat.revolt.R +import chat.peptide.R + private val Inter = FontFamily( Font(R.font.inter_thin, FontWeight.Thin), diff --git a/app/src/main/java/chat/peptide/utils/DeepLinkHandler.kt b/app/src/main/java/chat/peptide/utils/DeepLinkHandler.kt new file mode 100644 index 00000000..71c0c0d4 --- /dev/null +++ b/app/src/main/java/chat/peptide/utils/DeepLinkHandler.kt @@ -0,0 +1,42 @@ +package chat.peptide.utils + +/** + * Static handler for deep link data that needs to be passed between activities and composables. + */ +object DeepLinkHandler { + /** + * Channel ID from deep link + */ + var channelId: String? = null + + /** + * Server ID from deep link + */ + var serverId: String? = null + + /** + * User ID from deep link + */ + var userId: String? = null + + /** + * Message ID from deep link + */ + var messageId: String? = null + + /** + * Flag indicating if there is an active deep link to process + */ + var hasDeepLink: Boolean = false + + /** + * Clears all deep link data + */ + fun clear() { + channelId = null + serverId = null + userId = null + messageId = null + hasDeepLink = false + } +} diff --git a/app/src/main/java/chat/revolt/utils/DeepLinkUtils.kt b/app/src/main/java/chat/peptide/utils/DeepLinkUtils.kt similarity index 98% rename from app/src/main/java/chat/revolt/utils/DeepLinkUtils.kt rename to app/src/main/java/chat/peptide/utils/DeepLinkUtils.kt index cd8f921a..206717a6 100644 --- a/app/src/main/java/chat/revolt/utils/DeepLinkUtils.kt +++ b/app/src/main/java/chat/peptide/utils/DeepLinkUtils.kt @@ -1,10 +1,10 @@ -package chat.revolt.utils +package chat.peptide.utils import android.content.Context import android.content.Intent import android.net.Uri -import chat.revolt.activities.DeepLinkActivity -import chat.revolt.activities.MainActivity +import chat.peptide.activities.DeepLinkActivity +import chat.peptide.activities.MainActivity /** * Utility class for handling deep links in the Revolt app. diff --git a/app/src/main/java/chat/peptide/utils/InternalLinkHandler.kt b/app/src/main/java/chat/peptide/utils/InternalLinkHandler.kt new file mode 100644 index 00000000..f09e703e --- /dev/null +++ b/app/src/main/java/chat/peptide/utils/InternalLinkHandler.kt @@ -0,0 +1,155 @@ +package chat.peptide.utils + +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.util.Log +import chat.peptide.activities.DeepLinkActivity +import chat.peptide.callbacks.Action +import chat.peptide.callbacks.ActionChannel +import chat.peptide.screens.chat.ChatRouterDestination +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch + +/** + * Utility class to handle internal links within the app + */ +object InternalLinkHandler { + private const val TAG = "InternalLinkHandler" + + /** + * Checks if a URL is an internal link that should be handled by the app + * + * @param url The URL to check + * @return true if the URL is an internal link, false otherwise + */ + fun isInternalLink(url: String): Boolean { + val uri = Uri.parse(url) + val isInternal = DeepLinkUtils.isRevoltDeepLink(uri) + Log.d(TAG, "isInternalLink: $url -> $isInternal") + return isInternal + } + + /** + * Handles an internal link by either navigating within the app or launching the DeepLinkActivity + * + * @param context The context to use for launching activities + * @param url The URL to handle + * @param isAlreadyInChatScreen Whether the user is already in the chat screen + * @return true if the link was handled, false otherwise + */ + fun handleInternalLink(context: Context, url: String, isAlreadyInChatScreen: Boolean = false): Boolean { + Log.d(TAG, "handleInternalLink called with url: $url, isAlreadyInChatScreen: $isAlreadyInChatScreen") + + if (!isInternalLink(url)) { + Log.d(TAG, "Not an internal link, returning false") + return false + } + + Log.d(TAG, "Handling internal link: $url") + val uri = Uri.parse(url) + + // If we're already in the chat screen, we can use the ActionChannel to navigate + if (isAlreadyInChatScreen) { + Log.d(TAG, "Already in chat screen, using ActionChannel") + val result = handleLinkInChatScreen(uri) + Log.d(TAG, "handleLinkInChatScreen result: $result") + return result + } + + // Otherwise, launch the DeepLinkActivity + try { + Log.d(TAG, "Launching DeepLinkActivity") + val intent = Intent(Intent.ACTION_VIEW, uri, context, DeepLinkActivity::class.java) + context.startActivity(intent) + Log.d(TAG, "DeepLinkActivity launched successfully") + return true + } catch (e: Exception) { + Log.e(TAG, "Error launching DeepLinkActivity", e) + return false + } + } + + /** + * Handles a link when already in the chat screen by sending actions through the ActionChannel + * + * @param uri The URI to handle + * @return true if the link was handled, false otherwise + */ + private fun handleLinkInChatScreen(uri: Uri): Boolean { + Log.d(TAG, "handleLinkInChatScreen called with uri: $uri") + + try { + // Extract data from the URI + val serverChannelMessage = DeepLinkUtils.extractServerChannelMessage(uri) + Log.d(TAG, "serverChannelMessage: $serverChannelMessage") + + if (serverChannelMessage != null) { + // Handle server/channel/message format + val serverId = serverChannelMessage.serverId + val channelId = serverChannelMessage.channelId + val messageId = serverChannelMessage.messageId + + Log.d(TAG, "Handling server/channel/message: $serverId/$channelId/$messageId") + + // First navigate to the channel + CoroutineScope(Dispatchers.Main).launch { + try { + Log.d(TAG, "Sending SwitchChannel action for channelId: $channelId") + ActionChannel.send(Action.SwitchChannel(channelId)) + Log.d(TAG, "SwitchChannel action sent successfully") + + // TODO: If messageId is not null, add logic to scroll to the message + } catch (e: Exception) { + Log.e(TAG, "Error sending action", e) + } + } + + return true + } + + // Handle channel deep link + val channelId = DeepLinkUtils.extractChannelId(uri) + Log.d(TAG, "extractChannelId result: $channelId") + + if (channelId != null) { + Log.d(TAG, "Handling channel: $channelId") + CoroutineScope(Dispatchers.Main).launch { + try { + Log.d(TAG, "Sending SwitchChannel action for channelId: $channelId") + ActionChannel.send(Action.SwitchChannel(channelId)) + Log.d(TAG, "SwitchChannel action sent successfully") + } catch (e: Exception) { + Log.e(TAG, "Error sending action", e) + } + } + return true + } + + // Handle server deep link + val serverId = DeepLinkUtils.extractServerId(uri) + Log.d(TAG, "extractServerId result: $serverId") + + if (serverId != null) { + Log.d(TAG, "Handling server: $serverId") + CoroutineScope(Dispatchers.Main).launch { + try { + Log.d(TAG, "Sending ChatNavigate action for serverId: $serverId") + ActionChannel.send(Action.ChatNavigate(ChatRouterDestination.ServersChannels(serverId))) + Log.d(TAG, "ChatNavigate action sent successfully") + } catch (e: Exception) { + Log.e(TAG, "Error sending action", e) + } + } + return true + } + + Log.d(TAG, "No handlers matched for this URI") + return false + } catch (e: Exception) { + Log.e(TAG, "Error in handleLinkInChatScreen", e) + return false + } + } +} diff --git a/app/src/main/sqldelight/chat/revolt/persistence/cache/Channel.sq b/app/src/main/sqldelight/chat/peptide/persistence/cache/Channel.sq similarity index 100% rename from app/src/main/sqldelight/chat/revolt/persistence/cache/Channel.sq rename to app/src/main/sqldelight/chat/peptide/persistence/cache/Channel.sq diff --git a/app/src/main/sqldelight/chat/revolt/persistence/cache/Server.sq b/app/src/main/sqldelight/chat/peptide/persistence/cache/Server.sq similarity index 100% rename from app/src/main/sqldelight/chat/revolt/persistence/cache/Server.sq rename to app/src/main/sqldelight/chat/peptide/persistence/cache/Server.sq diff --git a/docs/src/content/docs/beta/joining-the-public-beta-test.md b/docs/src/content/docs/beta/joining-the-public-beta-test.md index 75754a0b..51770263 100644 --- a/docs/src/content/docs/beta/joining-the-public-beta-test.md +++ b/docs/src/content/docs/beta/joining-the-public-beta-test.md @@ -10,8 +10,8 @@ beta test is available. The beta test is open to everyone, and you can join the following these steps: 1. [Join the Revolt for Android Alpha Track on Google Groups](https://groups.google.com/g/revolt-android-alpha-track). -2. [Opt-in to the Revolt for Android Beta Test on Google Play](https://play.google.com/apps/testing/chat.revolt). -3. [Download Revolt for Android from Google Play](https://play.google.com/store/apps/details?id=chat.revolt). +2. [Opt-in to the Revolt for Android Beta Test on Google Play](https://play.google.com/apps/testing/chat.peptide). +3. [Download Revolt for Android from Google Play](https://play.google.com/store/apps/details?id=chat.peptide). You're all set! You can now use Revolt on Android and help us test new features and improvements.