diff --git a/.idea/.name b/.idea/.name index 5b7ffa9e..aade4835 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -PepChat \ No newline at end of file +ZekoChat \ No newline at end of file diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml index 558059d9..3c3874eb 100644 --- a/.idea/dictionaries/project.xml +++ b/.idea/dictionaries/project.xml @@ -3,6 +3,7 @@ kjbook unreads + zeko \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d8a6e111..fdeee54a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -69,7 +69,7 @@ android { compileSdk = 35 defaultConfig { - applicationId = "chat.peptide" + applicationId = "com.zekochat" minSdk = 24 targetSdk = 35 versionCode = Integer.parseInt("001_003_106".replace("_", ""), 10) @@ -146,7 +146,7 @@ android { androidResources { generateLocaleConfig = true } - namespace = "chat.peptide" + namespace = "chat.zekochat" externalNativeBuild { cmake { path(file("src/main/cpp/CMakeLists.txt")) @@ -336,7 +336,7 @@ aboutLibraries { sqldelight { databases { create("Database") { - packageName.set("chat.peptide.persistence") + packageName.set("com.zekochat.persistence") } } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 472788cc..48f43d74 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -109,4 +109,4 @@ public ; } --keep class chat.peptide.ndk.AstNode { *; } \ No newline at end of file +-keep class chat.zekochat.ndk.AstNode { *; } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d2b2979..e741a861 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,7 +32,7 @@ android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:name=".PeptideApplication" android:theme="@style/Theme.Peptide" @@ -54,10 +54,10 @@ + android:resource="@drawable/zeko_transparent_logo" /> + android:name="com.google.firebase.messaging.default_notification_\color" + android:resource="@color/notification_background" /> GetMethodID(localArrayListClass, "", "(I)V"); addArrayListMethod = env->GetMethodID(localArrayListClass, "add", "(Ljava/lang/Object;)Z"); - jclass localAstNodeClass = env->FindClass("chat/peptide/ndk/AstNode"); + jclass localAstNodeClass = env->FindClass("chat/zekochat/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_peptide_ndk_Stendal_init(JNIEnv *env, [[maybe_unused]] jobject thiz) { +Java_chat_zekochat_ndk_Stendal_init(JNIEnv *env, [[maybe_unused]] jobject thiz) { Stendal::init(env); } extern "C" JNIEXPORT jobject JNICALL -Java_chat_peptide_ndk_Stendal_render(JNIEnv *env, [[maybe_unused]] jobject thiz, jstring input) { +Java_chat_zekochat_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/peptide/sheets/EarlyAccessSheet.kt b/app/src/main/java/chat/peptide/sheets/EarlyAccessSheet.kt deleted file mode 100644 index 386c1536..00000000 --- a/app/src/main/java/chat/peptide/sheets/EarlyAccessSheet.kt +++ /dev/null @@ -1,63 +0,0 @@ -package chat.peptide.sheets - -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -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 androidx.compose.ui.unit.sp -import chat.peptide.R -import chat.peptide.composables.generic.PepTextButton - -@Composable -fun EarlyAccessSheet(onClose: () -> Unit) { - Column( - Modifier - .padding(16.dp) - .padding(horizontal = 8.dp) - .padding(top = 8.dp), - verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically), - horizontalAlignment = Alignment.CenterHorizontally - ) { - Image( - painter = painterResource(R.drawable.ux_early_access), - contentDescription = null, - modifier = Modifier - .fillMaxWidth(0.5f) - .padding(vertical = 8.dp) - ) - Text( - stringResource(R.string.spark_early_access), - style = MaterialTheme.typography.headlineLarge.copy(fontSize = 24.sp), - textAlign = TextAlign.Center - ) - Text( - stringResource(R.string.spark_early_access_description_1), - style = MaterialTheme.typography.bodyLarge, - textAlign = TextAlign.Center - ) - Text( - stringResource(R.string.spark_early_access_description_2), - style = MaterialTheme.typography.bodyLarge, - textAlign = TextAlign.Center - ) - Text( - stringResource(R.string.spark_early_access_description_3), - style = MaterialTheme.typography.bodyLarge, - textAlign = TextAlign.Center - ) - PepTextButton(onClick = onClose, modifier = Modifier.fillMaxWidth()) { - Text(stringResource(R.string.spark_early_access_cta)) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/chat/peptide/PeptideApplication.kt b/app/src/main/java/chat/zekochat/PeptideApplication.kt similarity index 88% rename from app/src/main/java/chat/peptide/PeptideApplication.kt rename to app/src/main/java/chat/zekochat/PeptideApplication.kt index b316c348..37c2e322 100644 --- a/app/src/main/java/chat/peptide/PeptideApplication.kt +++ b/app/src/main/java/chat/zekochat/PeptideApplication.kt @@ -1,8 +1,8 @@ -package chat.peptide +package chat.zekochat import android.app.Application -import chat.peptide.api.PeptideHttp -import chat.peptide.persistence.KVStorage +import chat.zekochat.api.PeptideHttp +import chat.zekochat.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/peptide/activities/DeepLinkActivity.kt b/app/src/main/java/chat/zekochat/activities/DeepLinkActivity.kt similarity index 98% rename from app/src/main/java/chat/peptide/activities/DeepLinkActivity.kt rename to app/src/main/java/chat/zekochat/activities/DeepLinkActivity.kt index c1dc1042..41210257 100644 --- a/app/src/main/java/chat/peptide/activities/DeepLinkActivity.kt +++ b/app/src/main/java/chat/zekochat/activities/DeepLinkActivity.kt @@ -1,4 +1,4 @@ -package chat.peptide.activities +package chat.zekochat.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.peptide.persistence.KVStorage -import chat.peptide.utils.DeepLinkUtils +import chat.zekochat.persistence.KVStorage +import chat.zekochat.utils.DeepLinkUtils import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/chat/peptide/activities/InviteActivity.kt b/app/src/main/java/chat/zekochat/activities/InviteActivity.kt similarity index 94% rename from app/src/main/java/chat/peptide/activities/InviteActivity.kt rename to app/src/main/java/chat/zekochat/activities/InviteActivity.kt index 3de43204..8185d057 100644 --- a/app/src/main/java/chat/peptide/activities/InviteActivity.kt +++ b/app/src/main/java/chat/zekochat/activities/InviteActivity.kt @@ -1,4 +1,4 @@ -package chat.peptide.activities +package chat.zekochat.activities import android.os.Bundle import androidx.activity.ComponentActivity @@ -44,21 +44,21 @@ import androidx.core.view.WindowCompat import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel -import chat.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideError -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.PepTextButton -import chat.peptide.composables.generic.RemoteImage -import chat.peptide.composables.generic.SquareButton -import chat.peptide.ui.theme.PeptideTheme +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideError +import chat.zekochat.api.routes.invites.fetchInviteByCode +import chat.zekochat.api.routes.invites.joinInviteByCode +import chat.zekochat.api.schemas.Invite +import chat.zekochat.api.schemas.InviteJoined +import chat.zekochat.api.schemas.RsResult +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.composables.generic.IconPlaceholder +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.ui.theme.PeptideTheme 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/peptide/activities/MainActivity.kt b/app/src/main/java/chat/zekochat/activities/MainActivity.kt similarity index 92% rename from app/src/main/java/chat/peptide/activities/MainActivity.kt rename to app/src/main/java/chat/zekochat/activities/MainActivity.kt index fa913400..029e6388 100644 --- a/app/src/main/java/chat/peptide/activities/MainActivity.kt +++ b/app/src/main/java/chat/zekochat/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package chat.peptide.activities +package chat.zekochat.activities import android.annotation.SuppressLint import android.content.Context @@ -43,7 +43,6 @@ import androidx.compose.material3.Card import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi import androidx.compose.material3.windowsizeclass.WindowSizeClass import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass @@ -73,63 +72,62 @@ import androidx.lifecycle.viewModelScope import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import chat.peptide.BuildConfig -import chat.peptide.R -import chat.peptide.PeptideApplication -import chat.peptide.api.ApplicationPlatform -import chat.peptide.api.HitRateLimitException -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideAPI.setPlatform -import chat.peptide.api.PeptideHttp -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.generic.PepTextButton -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.PeptideTheme -import chat.peptide.utils.DeepLinkHandler +import chat.zekochat.R +import chat.zekochat.PeptideApplication +import chat.zekochat.api.ApplicationPlatform +import chat.zekochat.api.HitRateLimitException +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideAPI.setPlatform +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.UrlsStorageKeys +import chat.zekochat.api.api +import chat.zekochat.api.routes.microservices.geo.queryGeo +import chat.zekochat.api.routes.microservices.health.healthCheck +import chat.zekochat.api.routes.onboard.needsOnboarding +import chat.zekochat.api.schemas.HealthNotice +import chat.zekochat.api.settings.Experiments +import chat.zekochat.api.settings.GeoStateProvider +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.composables.generic.HealthAlert +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.voice.VoicePermissionSwitch +import chat.zekochat.composables.voice.VoiceSheet +import chat.zekochat.material.EasingTokens +import chat.zekochat.ndk.NativeLibraries +import chat.zekochat.persistence.KVStorage +import chat.zekochat.screens.DefaultDestinationScreen +import chat.zekochat.screens.about.AboutScreen +import chat.zekochat.screens.about.AttributionScreen +import chat.zekochat.screens.chat.ChatRouterScreen +import chat.zekochat.screens.chat.views.channel.ChannelScreen +import chat.zekochat.screens.chooseplatform.ChoosePlatformScreen +import chat.zekochat.screens.create.CreateGroupScreen +import chat.zekochat.screens.labs.LabsRootScreen +import chat.zekochat.screens.login.LoginGreetingScreen +import chat.zekochat.screens.login.LoginScreen +import chat.zekochat.screens.login.MfaScreen +import chat.zekochat.screens.login2.InitScreen +import chat.zekochat.screens.main.MainScreen +import chat.zekochat.screens.register.OnboardingScreen +import chat.zekochat.screens.register.RegisterDetailsScreen +import chat.zekochat.screens.register.RegisterGreetingScreen +import chat.zekochat.screens.register.RegisterVerifyScreen +import chat.zekochat.screens.services.DiscoverScreen +import chat.zekochat.screens.settings.AppearanceSettingsScreen +import chat.zekochat.screens.settings.ChangelogsSettingsScreen +import chat.zekochat.screens.settings.ChatSettingsScreen +import chat.zekochat.screens.settings.DebugSettingsScreen +import chat.zekochat.screens.settings.ExperimentsSettingsScreen +import chat.zekochat.screens.settings.LanguagePickerSettingsScreen +import chat.zekochat.screens.settings.ProfileSettingsScreen +import chat.zekochat.screens.settings.SessionSettingsScreen +import chat.zekochat.screens.settings.SettingsScreen +import chat.zekochat.screens.settings.channel.ChannelSettingsHome +import chat.zekochat.screens.settings.channel.ChannelSettingsOverview +import chat.zekochat.screens.settings.channel.ChannelSettingsPermissions +import chat.zekochat.ui.theme.PeptideTheme +import chat.zekochat.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/peptide/activities/ShareTargetActivity.kt b/app/src/main/java/chat/zekochat/activities/ShareTargetActivity.kt similarity index 94% rename from app/src/main/java/chat/peptide/activities/ShareTargetActivity.kt rename to app/src/main/java/chat/zekochat/activities/ShareTargetActivity.kt index 7fed102d..351b88e5 100644 --- a/app/src/main/java/chat/peptide/activities/ShareTargetActivity.kt +++ b/app/src/main/java/chat/zekochat/activities/ShareTargetActivity.kt @@ -1,4 +1,4 @@ -package chat.peptide.activities +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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.PeptideTheme +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.ChannelUtils +import chat.zekochat.api.routes.channel.sendMessage +import chat.zekochat.api.routes.microservices.autumn.FileArgs +import chat.zekochat.api.routes.microservices.autumn.MAX_ATTACHMENTS_PER_MESSAGE +import chat.zekochat.api.routes.microservices.autumn.uploadToAutumn +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.composables.chat.MessageField +import chat.zekochat.composables.emoji.EmojiPicker +import chat.zekochat.composables.screens.chat.AttachmentManager +import chat.zekochat.composables.screens.chat.drawer.ChannelItem +import chat.zekochat.composables.screens.chat.drawer.ChannelItemIconType +import chat.zekochat.composables.screens.chat.drawer.DMOrGroupItem +import chat.zekochat.persistence.KVStorage +import chat.zekochat.screens.chat.views.channel.ChannelScreenActivePane +import chat.zekochat.ui.theme.PeptideTheme import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel import io.ktor.http.ContentType diff --git a/app/src/main/java/chat/peptide/activities/media/ImageViewActivity.kt b/app/src/main/java/chat/zekochat/activities/media/ImageViewActivity.kt similarity index 96% rename from app/src/main/java/chat/peptide/activities/media/ImageViewActivity.kt rename to app/src/main/java/chat/zekochat/activities/media/ImageViewActivity.kt index a2a84ba3..e96ccd0f 100644 --- a/app/src/main/java/chat/peptide/activities/media/ImageViewActivity.kt +++ b/app/src/main/java/chat/zekochat/activities/media/ImageViewActivity.kt @@ -1,4 +1,4 @@ -package chat.peptide.activities.media +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideHttp -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.PeptideTheme +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.schemas.AutumnResource +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.providers.getAttachmentContentUri +import chat.zekochat.ui.theme.PeptideTheme import io.ktor.client.request.get import io.ktor.client.statement.readBytes import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/peptide/activities/media/VideoViewActivity.kt b/app/src/main/java/chat/zekochat/activities/media/VideoViewActivity.kt similarity index 96% rename from app/src/main/java/chat/peptide/activities/media/VideoViewActivity.kt rename to app/src/main/java/chat/zekochat/activities/media/VideoViewActivity.kt index 1f07b445..75fb1361 100644 --- a/app/src/main/java/chat/peptide/activities/media/VideoViewActivity.kt +++ b/app/src/main/java/chat/zekochat/activities/media/VideoViewActivity.kt @@ -1,4 +1,4 @@ -package chat.peptide.activities.media +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideHttp -import chat.peptide.api.schemas.AutumnResource -import chat.peptide.databinding.ActivityVideoplayerBinding -import chat.peptide.providers.getAttachmentContentUri +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.schemas.AutumnResource +import chat.zekochat.databinding.ActivityVideoplayerBinding +import chat.zekochat.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/peptide/api/AppAPI.kt b/app/src/main/java/chat/zekochat/api/AppAPI.kt similarity index 94% rename from app/src/main/java/chat/peptide/api/AppAPI.kt rename to app/src/main/java/chat/zekochat/api/AppAPI.kt index f9ca6c21..40335921 100644 --- a/app/src/main/java/chat/peptide/api/AppAPI.kt +++ b/app/src/main/java/chat/zekochat/api/AppAPI.kt @@ -1,29 +1,29 @@ -package chat.peptide.api +package chat.zekochat.api import android.os.Handler import android.os.Looper import android.util.Log import androidx.compose.runtime.mutableStateMapOf -import chat.peptide.BuildConfig -import chat.peptide.PeptideApplication -import chat.peptide.api.PeptideAPI.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 chat.zekochat.BuildConfig +import chat.zekochat.PeptideApplication +import chat.zekochat.api.PeptideAPI.initialize +import chat.zekochat.api.internals.Members +import chat.zekochat.api.realtime.DisconnectionState +import chat.zekochat.api.realtime.RealtimeSocket +import chat.zekochat.api.routes.user.fetchSelf +import chat.zekochat.api.schemas.AutumnResource +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.Emoji +import chat.zekochat.api.schemas.Message +import chat.zekochat.api.schemas.Server +import chat.zekochat.api.schemas.User +import chat.zekochat.api.unreads.Unreads +import chat.zekochat.getKVStorage +import chat.zekochat.persistence.SqlStorage import com.chuckerteam.chucker.api.ChuckerCollector import com.chuckerteam.chucker.api.ChuckerInterceptor import com.chuckerteam.chucker.api.RetentionManager +import com.zekochat.persistence.Database import io.ktor.client.HttpClient import io.ktor.client.engine.okhttp.OkHttp import io.ktor.client.plugins.DefaultRequest @@ -51,13 +51,13 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.cbor.Cbor import kotlinx.serialization.json.Json import java.net.SocketException -import chat.peptide.api.schemas.Channel as ChannelSchema +import chat.zekochat.api.schemas.Channel as ChannelSchema /** * Enum representing available platforms in the application. */ enum class ApplicationPlatform(val baseUrl: String) { - REVOLT("https://api.peptide.chat"), + REVOLT("https://api.revolt.chat"), PEP("https://peptide.chat/api"); companion object { diff --git a/app/src/main/java/chat/peptide/api/internals/BrushCompat.kt b/app/src/main/java/chat/zekochat/api/internals/BrushCompat.kt similarity index 99% rename from app/src/main/java/chat/peptide/api/internals/BrushCompat.kt rename to app/src/main/java/chat/zekochat/api/internals/BrushCompat.kt index 69e02d47..e3421ced 100644 --- a/app/src/main/java/chat/peptide/api/internals/BrushCompat.kt +++ b/app/src/main/java/chat/zekochat/api/internals/BrushCompat.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.internals +package chat.zekochat.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.peptide.api.internals.colour.CSSColours +import chat.zekochat.api.internals.colour.CSSColours fun Brush.Companion.solidColor(colour: Color) = SolidColor(colour) diff --git a/app/src/main/java/chat/peptide/api/internals/ChannelUtils.kt b/app/src/main/java/chat/zekochat/api/internals/ChannelUtils.kt similarity index 83% rename from app/src/main/java/chat/peptide/api/internals/ChannelUtils.kt rename to app/src/main/java/chat/zekochat/api/internals/ChannelUtils.kt index c3c78d0d..069ae7d8 100644 --- a/app/src/main/java/chat/peptide/api/internals/ChannelUtils.kt +++ b/app/src/main/java/chat/zekochat/api/internals/ChannelUtils.kt @@ -1,13 +1,13 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals -import chat.peptide.api.PeptideAPI -import chat.peptide.api.schemas.Channel -import chat.peptide.api.schemas.Server -import chat.peptide.api.schemas.User +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.Server +import chat.zekochat.api.schemas.User sealed class CategorisedChannelList { - data class Channel(val channel: chat.peptide.api.schemas.Channel) : CategorisedChannelList() - data class Category(val category: chat.peptide.api.schemas.Category) : CategorisedChannelList() + data class Channel(val channel: chat.zekochat.api.schemas.Channel) : CategorisedChannelList() + data class Category(val category: chat.zekochat.api.schemas.Category) : CategorisedChannelList() } object ChannelUtils { diff --git a/app/src/main/java/chat/peptide/api/internals/DirectMessages.kt b/app/src/main/java/chat/zekochat/api/internals/DirectMessages.kt similarity index 82% rename from app/src/main/java/chat/peptide/api/internals/DirectMessages.kt rename to app/src/main/java/chat/zekochat/api/internals/DirectMessages.kt index 9b016dfc..f33cad64 100644 --- a/app/src/main/java/chat/peptide/api/internals/DirectMessages.kt +++ b/app/src/main/java/chat/zekochat/api/internals/DirectMessages.kt @@ -1,9 +1,9 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals -import chat.peptide.api.PeptideAPI -import chat.peptide.api.internals.SpecialUsers.PLATFORM_MODERATION_USER -import chat.peptide.api.schemas.Channel -import chat.peptide.api.schemas.ChannelType +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.SpecialUsers.PLATFORM_MODERATION_USER +import chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.ChannelType object DirectMessages { fun unreadDMs(): List { diff --git a/app/src/main/java/chat/peptide/api/internals/Extensions.kt b/app/src/main/java/chat/zekochat/api/internals/Extensions.kt similarity index 93% rename from app/src/main/java/chat/peptide/api/internals/Extensions.kt rename to app/src/main/java/chat/zekochat/api/internals/Extensions.kt index 8a2ba9a4..1f577423 100644 --- a/app/src/main/java/chat/peptide/api/internals/Extensions.kt +++ b/app/src/main/java/chat/zekochat/api/internals/Extensions.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals import android.content.Context import android.content.ContextWrapper diff --git a/app/src/main/java/chat/peptide/api/internals/FriendRequests.kt b/app/src/main/java/chat/zekochat/api/internals/FriendRequests.kt similarity index 89% rename from app/src/main/java/chat/peptide/api/internals/FriendRequests.kt rename to app/src/main/java/chat/zekochat/api/internals/FriendRequests.kt index b33ea787..64611c95 100644 --- a/app/src/main/java/chat/peptide/api/internals/FriendRequests.kt +++ b/app/src/main/java/chat/zekochat/api/internals/FriendRequests.kt @@ -1,7 +1,7 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals -import chat.peptide.api.PeptideAPI -import chat.peptide.api.schemas.User +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.User object FriendRequests { fun getIncoming(): List { diff --git a/app/src/main/java/chat/peptide/api/internals/Members.kt b/app/src/main/java/chat/zekochat/api/internals/Members.kt similarity index 94% rename from app/src/main/java/chat/peptide/api/internals/Members.kt rename to app/src/main/java/chat/zekochat/api/internals/Members.kt index a1204a91..3fadf79c 100644 --- a/app/src/main/java/chat/peptide/api/internals/Members.kt +++ b/app/src/main/java/chat/zekochat/api/internals/Members.kt @@ -1,6 +1,6 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals -import chat.peptide.api.schemas.Member +import chat.zekochat.api.schemas.Member class Members { // memberCache (mapping of serverId to userId to member) diff --git a/app/src/main/java/chat/peptide/api/internals/MessageFlag.kt b/app/src/main/java/chat/zekochat/api/internals/MessageFlag.kt similarity index 96% rename from app/src/main/java/chat/peptide/api/internals/MessageFlag.kt rename to app/src/main/java/chat/zekochat/api/internals/MessageFlag.kt index b2263285..cfc833d8 100644 --- a/app/src/main/java/chat/peptide/api/internals/MessageFlag.kt +++ b/app/src/main/java/chat/zekochat/api/internals/MessageFlag.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals /** * Flags for messages that can be set to modify their behavior. diff --git a/app/src/main/java/chat/peptide/api/internals/Permissions.kt b/app/src/main/java/chat/zekochat/api/internals/Permissions.kt similarity index 98% rename from app/src/main/java/chat/peptide/api/internals/Permissions.kt rename to app/src/main/java/chat/zekochat/api/internals/Permissions.kt index 704318d7..5ea14159 100644 --- a/app/src/main/java/chat/peptide/api/internals/Permissions.kt +++ b/app/src/main/java/chat/zekochat/api/internals/Permissions.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals enum class PermissionBit(val value: Long) { // * Generic permissions diff --git a/app/src/main/java/chat/peptide/api/internals/ResourceLocations.kt b/app/src/main/java/chat/zekochat/api/internals/ResourceLocations.kt similarity index 68% rename from app/src/main/java/chat/peptide/api/internals/ResourceLocations.kt rename to app/src/main/java/chat/zekochat/api/internals/ResourceLocations.kt index 30c7c015..5bc1799d 100644 --- a/app/src/main/java/chat/peptide/api/internals/ResourceLocations.kt +++ b/app/src/main/java/chat/zekochat/api/internals/ResourceLocations.kt @@ -1,8 +1,8 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals -import chat.peptide.api.PeptideAPI -import chat.peptide.api.api -import chat.peptide.api.schemas.User +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.api +import chat.zekochat.api.schemas.User object ResourceLocations { fun userAvatarUrl(user: User?): String { diff --git a/app/src/main/java/chat/peptide/api/internals/Roles.kt b/app/src/main/java/chat/zekochat/api/internals/Roles.kt similarity index 91% rename from app/src/main/java/chat/peptide/api/internals/Roles.kt rename to app/src/main/java/chat/zekochat/api/internals/Roles.kt index 8ae10245..c1fea24f 100644 --- a/app/src/main/java/chat/peptide/api/internals/Roles.kt +++ b/app/src/main/java/chat/zekochat/api/internals/Roles.kt @@ -1,13 +1,13 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals -import chat.peptide.api.PeptideAPI -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 chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.Member +import chat.zekochat.api.schemas.PermissionDescription +import chat.zekochat.api.schemas.Role +import chat.zekochat.api.schemas.Server +import chat.zekochat.api.schemas.User import kotlinx.datetime.Clock object Roles { diff --git a/app/src/main/java/chat/peptide/api/internals/SpecialUsers.kt b/app/src/main/java/chat/zekochat/api/internals/SpecialUsers.kt similarity index 98% rename from app/src/main/java/chat/peptide/api/internals/SpecialUsers.kt rename to app/src/main/java/chat/zekochat/api/internals/SpecialUsers.kt index add1eb78..7bd32649 100644 --- a/app/src/main/java/chat/peptide/api/internals/SpecialUsers.kt +++ b/app/src/main/java/chat/zekochat/api/internals/SpecialUsers.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals import android.content.Context import android.graphics.RuntimeShader diff --git a/app/src/main/java/chat/peptide/api/internals/TextViewCompat.kt b/app/src/main/java/chat/zekochat/api/internals/TextViewCompat.kt similarity index 98% rename from app/src/main/java/chat/peptide/api/internals/TextViewCompat.kt rename to app/src/main/java/chat/zekochat/api/internals/TextViewCompat.kt index f5265132..0a0eb125 100644 --- a/app/src/main/java/chat/peptide/api/internals/TextViewCompat.kt +++ b/app/src/main/java/chat/zekochat/api/internals/TextViewCompat.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.internals +package chat.zekochat.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.peptide.api.internals.colour.CSSColours +import chat.zekochat.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/peptide/api/internals/ThemeCompat.kt b/app/src/main/java/chat/zekochat/api/internals/ThemeCompat.kt similarity index 99% rename from app/src/main/java/chat/peptide/api/internals/ThemeCompat.kt rename to app/src/main/java/chat/zekochat/api/internals/ThemeCompat.kt index d91226f9..f7be2950 100644 --- a/app/src/main/java/chat/peptide/api/internals/ThemeCompat.kt +++ b/app/src/main/java/chat/zekochat/api/internals/ThemeCompat.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/peptide/api/internals/ULID.kt b/app/src/main/java/chat/zekochat/api/internals/ULID.kt similarity index 99% rename from app/src/main/java/chat/peptide/api/internals/ULID.kt rename to app/src/main/java/chat/zekochat/api/internals/ULID.kt index 42fed50d..5306a1b3 100644 --- a/app/src/main/java/chat/peptide/api/internals/ULID.kt +++ b/app/src/main/java/chat/zekochat/api/internals/ULID.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals import kotlin.experimental.and import kotlin.random.Random diff --git a/app/src/main/java/chat/peptide/api/internals/UserQR.kt b/app/src/main/java/chat/zekochat/api/internals/UserQR.kt similarity index 94% rename from app/src/main/java/chat/peptide/api/internals/UserQR.kt rename to app/src/main/java/chat/zekochat/api/internals/UserQR.kt index dd473e6f..1b9db76f 100644 --- a/app/src/main/java/chat/peptide/api/internals/UserQR.kt +++ b/app/src/main/java/chat/zekochat/api/internals/UserQR.kt @@ -1,8 +1,8 @@ -package chat.peptide.api.internals +package chat.zekochat.api.internals import androidx.core.net.toUri -import chat.peptide.api.PeptideCbor -import chat.peptide.api.schemas.User +import chat.zekochat.api.PeptideCbor +import chat.zekochat.api.schemas.User import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlin.io.encoding.Base64 diff --git a/app/src/main/java/chat/peptide/api/internals/colour/CSSColours.kt b/app/src/main/java/chat/zekochat/api/internals/colour/CSSColours.kt similarity index 99% rename from app/src/main/java/chat/peptide/api/internals/colour/CSSColours.kt rename to app/src/main/java/chat/zekochat/api/internals/colour/CSSColours.kt index bb18b47d..f27c4379 100644 --- a/app/src/main/java/chat/peptide/api/internals/colour/CSSColours.kt +++ b/app/src/main/java/chat/zekochat/api/internals/colour/CSSColours.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.internals.colour +package chat.zekochat.api.internals.colour import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/chat/peptide/api/realtime/RealtimeSocket.kt b/app/src/main/java/chat/zekochat/api/realtime/RealtimeSocket.kt similarity index 93% rename from app/src/main/java/chat/peptide/api/realtime/RealtimeSocket.kt rename to app/src/main/java/chat/zekochat/api/realtime/RealtimeSocket.kt index 828732be..8580743b 100644 --- a/app/src/main/java/chat/peptide/api/realtime/RealtimeSocket.kt +++ b/app/src/main/java/chat/zekochat/api/realtime/RealtimeSocket.kt @@ -1,48 +1,48 @@ -package chat.peptide.api.realtime +package chat.zekochat.api.realtime import android.util.Log import androidx.compose.runtime.mutableStateOf -import chat.peptide.PeptideApplication -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -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 chat.zekochat.PeptideApplication +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.realtime.frames.receivable.AnyFrame +import chat.zekochat.api.realtime.frames.receivable.BulkFrame +import chat.zekochat.api.realtime.frames.receivable.ChannelAckFrame +import chat.zekochat.api.realtime.frames.receivable.ChannelDeleteFrame +import chat.zekochat.api.realtime.frames.receivable.ChannelStartTypingFrame +import chat.zekochat.api.realtime.frames.receivable.ChannelStopTypingFrame +import chat.zekochat.api.realtime.frames.receivable.ChannelUpdateFrame +import chat.zekochat.api.realtime.frames.receivable.MessageAppendFrame +import chat.zekochat.api.realtime.frames.receivable.MessageDeleteFrame +import chat.zekochat.api.realtime.frames.receivable.MessageFrame +import chat.zekochat.api.realtime.frames.receivable.MessageReactFrame +import chat.zekochat.api.realtime.frames.receivable.MessageUpdateFrame +import chat.zekochat.api.realtime.frames.receivable.PongFrame +import chat.zekochat.api.realtime.frames.receivable.ReadyFrame +import chat.zekochat.api.realtime.frames.receivable.ServerCreateFrame +import chat.zekochat.api.realtime.frames.receivable.ServerDeleteFrame +import chat.zekochat.api.realtime.frames.receivable.ServerMemberJoinFrame +import chat.zekochat.api.realtime.frames.receivable.ServerMemberLeaveFrame +import chat.zekochat.api.realtime.frames.receivable.ServerMemberUpdateFrame +import chat.zekochat.api.realtime.frames.receivable.ServerRoleDeleteFrame +import chat.zekochat.api.realtime.frames.receivable.ServerRoleUpdateFrame +import chat.zekochat.api.realtime.frames.receivable.ServerUpdateFrame +import chat.zekochat.api.realtime.frames.receivable.UserRelationshipFrame +import chat.zekochat.api.realtime.frames.receivable.UserUpdateFrame +import chat.zekochat.api.realtime.frames.sendable.AuthorizationFrame +import chat.zekochat.api.realtime.frames.sendable.BeginTypingFrame +import chat.zekochat.api.realtime.frames.sendable.EndTypingFrame +import chat.zekochat.api.realtime.frames.sendable.PingFrame +import chat.zekochat.api.routes.server.fetchMember +import chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.Role +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.c2dm.ChannelRegistrator +import com.zekochat.persistence.Database +import chat.zekochat.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/peptide/api/realtime/frames/receivable/ReceivableFrames.kt b/app/src/main/java/chat/zekochat/api/realtime/frames/receivable/ReceivableFrames.kt similarity index 91% rename from app/src/main/java/chat/peptide/api/realtime/frames/receivable/ReceivableFrames.kt rename to app/src/main/java/chat/zekochat/api/realtime/frames/receivable/ReceivableFrames.kt index 1a878889..2ff21cab 100644 --- a/app/src/main/java/chat/peptide/api/realtime/frames/receivable/ReceivableFrames.kt +++ b/app/src/main/java/chat/zekochat/api/realtime/frames/receivable/ReceivableFrames.kt @@ -1,15 +1,15 @@ -package chat.peptide.api.realtime.frames.receivable +package chat.zekochat.api.realtime.frames.receivable -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 chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.ChannelVoiceState +import chat.zekochat.api.schemas.Embed +import chat.zekochat.api.schemas.Emoji +import chat.zekochat.api.schemas.Member +import chat.zekochat.api.schemas.Message +import chat.zekochat.api.schemas.Role +import chat.zekochat.api.schemas.Server +import chat.zekochat.api.schemas.ServerUserChoice +import chat.zekochat.api.schemas.User import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonObject diff --git a/app/src/main/java/chat/peptide/api/realtime/frames/sendable/SendableFrames.kt b/app/src/main/java/chat/zekochat/api/realtime/frames/sendable/SendableFrames.kt similarity index 88% rename from app/src/main/java/chat/peptide/api/realtime/frames/sendable/SendableFrames.kt rename to app/src/main/java/chat/zekochat/api/realtime/frames/sendable/SendableFrames.kt index 72be1e90..e6d87aa7 100644 --- a/app/src/main/java/chat/peptide/api/realtime/frames/sendable/SendableFrames.kt +++ b/app/src/main/java/chat/zekochat/api/realtime/frames/sendable/SendableFrames.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.realtime.frames.sendable +package chat.zekochat.api.realtime.frames.sendable import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/peptide/api/routes/account/Login.kt b/app/src/main/java/chat/zekochat/api/routes/account/Login.kt similarity index 96% rename from app/src/main/java/chat/peptide/api/routes/account/Login.kt rename to app/src/main/java/chat/zekochat/api/routes/account/Login.kt index 4423b9dc..97c9dd23 100644 --- a/app/src/main/java/chat/peptide/api/routes/account/Login.kt +++ b/app/src/main/java/chat/zekochat/api/routes/account/Login.kt @@ -1,11 +1,11 @@ -package chat.peptide.api.routes.account +package chat.zekochat.api.routes.account import android.os.Build import android.util.Log -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.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/peptide/api/routes/account/Register.kt b/app/src/main/java/chat/zekochat/api/routes/account/Register.kt similarity index 80% rename from app/src/main/java/chat/peptide/api/routes/account/Register.kt rename to app/src/main/java/chat/zekochat/api/routes/account/Register.kt index 077b7e47..4ae24877 100644 --- a/app/src/main/java/chat/peptide/api/routes/account/Register.kt +++ b/app/src/main/java/chat/zekochat/api/routes/account/Register.kt @@ -1,10 +1,10 @@ -package chat.peptide.api.routes.account +package chat.zekochat.api.routes.account -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.schemas.RsResult -import chat.peptide.api.api +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.schemas.RsResult +import chat.zekochat.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/peptide/api/routes/auth/Sessions.kt b/app/src/main/java/chat/zekochat/api/routes/auth/Sessions.kt similarity index 79% rename from app/src/main/java/chat/peptide/api/routes/auth/Sessions.kt rename to app/src/main/java/chat/zekochat/api/routes/auth/Sessions.kt index 1920cf4c..a31761f1 100644 --- a/app/src/main/java/chat/peptide/api/routes/auth/Sessions.kt +++ b/app/src/main/java/chat/zekochat/api/routes/auth/Sessions.kt @@ -1,9 +1,9 @@ -package chat.peptide.api.routes.auth +package chat.zekochat.api.routes.auth -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api -import chat.peptide.api.schemas.Session +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.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/peptide/api/routes/channel/Channel.kt b/app/src/main/java/chat/zekochat/api/routes/channel/Channel.kt similarity index 94% rename from app/src/main/java/chat/peptide/api/routes/channel/Channel.kt rename to app/src/main/java/chat/zekochat/api/routes/channel/Channel.kt index 3b4cb21e..c9bfb316 100644 --- a/app/src/main/java/chat/peptide/api/routes/channel/Channel.kt +++ b/app/src/main/java/chat/zekochat/api/routes/channel/Channel.kt @@ -1,15 +1,15 @@ -package chat.peptide.api.routes.channel +package chat.zekochat.api.routes.channel -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -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 chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.api.internals.ULID +import chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.Message +import chat.zekochat.api.schemas.MessagesInChannel +import chat.zekochat.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/peptide/api/routes/channel/GroupDM.kt b/app/src/main/java/chat/zekochat/api/routes/channel/GroupDM.kt similarity index 85% rename from app/src/main/java/chat/peptide/api/routes/channel/GroupDM.kt rename to app/src/main/java/chat/zekochat/api/routes/channel/GroupDM.kt index 194b47ca..cbacdab9 100644 --- a/app/src/main/java/chat/peptide/api/routes/channel/GroupDM.kt +++ b/app/src/main/java/chat/zekochat/api/routes/channel/GroupDM.kt @@ -1,11 +1,11 @@ -package chat.peptide.api.routes.channel +package chat.zekochat.api.routes.channel -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api -import chat.peptide.api.schemas.Channel -import chat.peptide.screens.create.MAX_ADDABLE_PEOPLE_IN_GROUP +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.api.schemas.Channel +import chat.zekochat.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/peptide/api/routes/channel/Message.kt b/app/src/main/java/chat/zekochat/api/routes/channel/Message.kt similarity index 78% rename from app/src/main/java/chat/peptide/api/routes/channel/Message.kt rename to app/src/main/java/chat/zekochat/api/routes/channel/Message.kt index bb87cc44..7b7862d6 100644 --- a/app/src/main/java/chat/peptide/api/routes/channel/Message.kt +++ b/app/src/main/java/chat/zekochat/api/routes/channel/Message.kt @@ -1,7 +1,7 @@ -package chat.peptide.api.routes.channel +package chat.zekochat.api.routes.channel -import chat.peptide.api.PeptideHttp -import chat.peptide.api.api +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.api import io.ktor.client.request.delete import io.ktor.client.request.put diff --git a/app/src/main/java/chat/peptide/api/routes/custom/Emoji.kt b/app/src/main/java/chat/zekochat/api/routes/custom/Emoji.kt similarity index 61% rename from app/src/main/java/chat/peptide/api/routes/custom/Emoji.kt rename to app/src/main/java/chat/zekochat/api/routes/custom/Emoji.kt index 420fd4f5..74bc966c 100644 --- a/app/src/main/java/chat/peptide/api/routes/custom/Emoji.kt +++ b/app/src/main/java/chat/zekochat/api/routes/custom/Emoji.kt @@ -1,9 +1,9 @@ -package chat.peptide.api.routes.custom +package chat.zekochat.api.routes.custom -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api -import chat.peptide.api.schemas.Emoji +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.api.schemas.Emoji import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText diff --git a/app/src/main/java/chat/peptide/api/routes/googlesheets/GoogleSheetsService.kt b/app/src/main/java/chat/zekochat/api/routes/googlesheets/GoogleSheetsService.kt similarity index 96% rename from app/src/main/java/chat/peptide/api/routes/googlesheets/GoogleSheetsService.kt rename to app/src/main/java/chat/zekochat/api/routes/googlesheets/GoogleSheetsService.kt index 832f066e..d75a0e18 100644 --- a/app/src/main/java/chat/peptide/api/routes/googlesheets/GoogleSheetsService.kt +++ b/app/src/main/java/chat/zekochat/api/routes/googlesheets/GoogleSheetsService.kt @@ -1,14 +1,13 @@ -package chat.peptide.api.routes.googlesheets +package chat.zekochat.api.routes.googlesheets -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import kotlinx.serialization.json.Json /** * Service for fetching and parsing Google Sheets data diff --git a/app/src/main/java/chat/peptide/api/routes/googlesheets/ServerDataRepository.kt b/app/src/main/java/chat/zekochat/api/routes/googlesheets/ServerDataRepository.kt similarity index 96% rename from app/src/main/java/chat/peptide/api/routes/googlesheets/ServerDataRepository.kt rename to app/src/main/java/chat/zekochat/api/routes/googlesheets/ServerDataRepository.kt index fc5c9b21..28bb12ee 100644 --- a/app/src/main/java/chat/peptide/api/routes/googlesheets/ServerDataRepository.kt +++ b/app/src/main/java/chat/zekochat/api/routes/googlesheets/ServerDataRepository.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.routes.googlesheets +package chat.zekochat.api.routes.googlesheets import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/chat/peptide/api/routes/invites/Invites.kt b/app/src/main/java/chat/zekochat/api/routes/invites/Invites.kt similarity index 79% rename from app/src/main/java/chat/peptide/api/routes/invites/Invites.kt rename to app/src/main/java/chat/zekochat/api/routes/invites/Invites.kt index c8d81165..ab3b57ac 100644 --- a/app/src/main/java/chat/peptide/api/routes/invites/Invites.kt +++ b/app/src/main/java/chat/zekochat/api/routes/invites/Invites.kt @@ -1,12 +1,12 @@ -package chat.peptide.api.routes.invites +package chat.zekochat.api.routes.invites -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api -import chat.peptide.api.schemas.Invite -import chat.peptide.api.schemas.InviteJoined -import chat.peptide.api.schemas.RsResult +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.api.schemas.Invite +import chat.zekochat.api.schemas.InviteJoined +import chat.zekochat.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/peptide/api/routes/microservices/autumn/Autumn.kt b/app/src/main/java/chat/zekochat/api/routes/microservices/autumn/Autumn.kt similarity index 88% rename from app/src/main/java/chat/peptide/api/routes/microservices/autumn/Autumn.kt rename to app/src/main/java/chat/zekochat/api/routes/microservices/autumn/Autumn.kt index 7d62faaa..24374380 100644 --- a/app/src/main/java/chat/peptide/api/routes/microservices/autumn/Autumn.kt +++ b/app/src/main/java/chat/zekochat/api/routes/microservices/autumn/Autumn.kt @@ -1,11 +1,11 @@ -package chat.peptide.api.routes.microservices.autumn +package chat.zekochat.api.routes.microservices.autumn -import chat.peptide.api.HitRateLimitException -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.schemas.AutumnError -import chat.peptide.api.schemas.AutumnId +import chat.zekochat.api.HitRateLimitException +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.schemas.AutumnError +import chat.zekochat.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/peptide/api/routes/microservices/geo/Geo.kt b/app/src/main/java/chat/zekochat/api/routes/microservices/geo/Geo.kt similarity index 81% rename from app/src/main/java/chat/peptide/api/routes/microservices/geo/Geo.kt rename to app/src/main/java/chat/zekochat/api/routes/microservices/geo/Geo.kt index e6d09751..8bc0d4f5 100644 --- a/app/src/main/java/chat/peptide/api/routes/microservices/geo/Geo.kt +++ b/app/src/main/java/chat/zekochat/api/routes/microservices/geo/Geo.kt @@ -1,9 +1,9 @@ -package chat.peptide.api.routes.microservices.geo +package chat.zekochat.api.routes.microservices.geo -import chat.peptide.api.HitRateLimitException -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.buildUserAgent +import chat.zekochat.api.HitRateLimitException +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.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/peptide/api/routes/microservices/health/Health.kt b/app/src/main/java/chat/zekochat/api/routes/microservices/health/Health.kt similarity index 62% rename from app/src/main/java/chat/peptide/api/routes/microservices/health/Health.kt rename to app/src/main/java/chat/zekochat/api/routes/microservices/health/Health.kt index 87ee1530..ce8466a7 100644 --- a/app/src/main/java/chat/peptide/api/routes/microservices/health/Health.kt +++ b/app/src/main/java/chat/zekochat/api/routes/microservices/health/Health.kt @@ -1,8 +1,8 @@ -package chat.peptide.api.routes.microservices.health +package chat.zekochat.api.routes.microservices.health -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.schemas.HealthNotice +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.schemas.HealthNotice import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText diff --git a/app/src/main/java/chat/peptide/api/routes/microservices/january/January.kt b/app/src/main/java/chat/zekochat/api/routes/microservices/january/January.kt similarity index 65% rename from app/src/main/java/chat/peptide/api/routes/microservices/january/January.kt rename to app/src/main/java/chat/zekochat/api/routes/microservices/january/January.kt index 33bf6b1e..815485fc 100644 --- a/app/src/main/java/chat/peptide/api/routes/microservices/january/January.kt +++ b/app/src/main/java/chat/zekochat/api/routes/microservices/january/January.kt @@ -1,6 +1,6 @@ -package chat.peptide.api.routes.microservices.january +package chat.zekochat.api.routes.microservices.january -import chat.peptide.api.PeptideAPI +import chat.zekochat.api.PeptideAPI import java.net.URLEncoder fun asJanuaryProxyUrl(url: String): String { diff --git a/app/src/main/java/chat/peptide/api/routes/misc/Root.kt b/app/src/main/java/chat/zekochat/api/routes/misc/Root.kt similarity index 92% rename from app/src/main/java/chat/peptide/api/routes/misc/Root.kt rename to app/src/main/java/chat/zekochat/api/routes/misc/Root.kt index 1933ca03..d0a9232e 100644 --- a/app/src/main/java/chat/peptide/api/routes/misc/Root.kt +++ b/app/src/main/java/chat/zekochat/api/routes/misc/Root.kt @@ -1,7 +1,7 @@ -package chat.peptide.api.routes.misc +package chat.zekochat.api.routes.misc -import chat.peptide.api.PeptideHttp -import chat.peptide.api.api +import chat.zekochat.api.PeptideHttp +import chat.zekochat.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/peptide/api/routes/onboard/Onboarding.kt b/app/src/main/java/chat/zekochat/api/routes/onboard/Onboarding.kt similarity index 87% rename from app/src/main/java/chat/peptide/api/routes/onboard/Onboarding.kt rename to app/src/main/java/chat/zekochat/api/routes/onboard/Onboarding.kt index 893daf8f..a2372ce9 100644 --- a/app/src/main/java/chat/peptide/api/routes/onboard/Onboarding.kt +++ b/app/src/main/java/chat/zekochat/api/routes/onboard/Onboarding.kt @@ -1,12 +1,12 @@ -package chat.peptide.api.routes.onboard +package chat.zekochat.api.routes.onboard -import chat.peptide.api.RateLimitResponse -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api -import chat.peptide.api.schemas.RsResult +import chat.zekochat.api.RateLimitResponse +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.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/peptide/api/routes/push/Push.kt b/app/src/main/java/chat/zekochat/api/routes/push/Push.kt similarity index 76% rename from app/src/main/java/chat/peptide/api/routes/push/Push.kt rename to app/src/main/java/chat/zekochat/api/routes/push/Push.kt index b438e83c..16b315b1 100644 --- a/app/src/main/java/chat/peptide/api/routes/push/Push.kt +++ b/app/src/main/java/chat/zekochat/api/routes/push/Push.kt @@ -1,8 +1,8 @@ -package chat.peptide.api.routes.push +package chat.zekochat.api.routes.push -import chat.peptide.api.PeptideHttp -import chat.peptide.api.routes.account.WebPushData -import chat.peptide.api.api +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.routes.account.WebPushData +import chat.zekochat.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/peptide/api/routes/safety/Reporting.kt b/app/src/main/java/chat/zekochat/api/routes/safety/Reporting.kt similarity index 82% rename from app/src/main/java/chat/peptide/api/routes/safety/Reporting.kt rename to app/src/main/java/chat/zekochat/api/routes/safety/Reporting.kt index 9386e4f9..11046ebf 100644 --- a/app/src/main/java/chat/peptide/api/routes/safety/Reporting.kt +++ b/app/src/main/java/chat/zekochat/api/routes/safety/Reporting.kt @@ -1,17 +1,17 @@ -package chat.peptide.api.routes.safety +package chat.zekochat.api.routes.safety -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -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 chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.schemas.ContentReportReason +import chat.zekochat.api.schemas.FullMessageReport +import chat.zekochat.api.schemas.FullServerReport +import chat.zekochat.api.schemas.FullUserReport +import chat.zekochat.api.schemas.MessageReport +import chat.zekochat.api.schemas.ServerReport +import chat.zekochat.api.schemas.UserReport +import chat.zekochat.api.schemas.UserReportReason +import chat.zekochat.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/peptide/api/routes/server/Server.kt b/app/src/main/java/chat/zekochat/api/routes/server/Server.kt similarity index 90% rename from app/src/main/java/chat/peptide/api/routes/server/Server.kt rename to app/src/main/java/chat/zekochat/api/routes/server/Server.kt index 0b8b379d..639ac8ae 100644 --- a/app/src/main/java/chat/peptide/api/routes/server/Server.kt +++ b/app/src/main/java/chat/zekochat/api/routes/server/Server.kt @@ -1,13 +1,13 @@ -package chat.peptide.api.routes.server +package chat.zekochat.api.routes.server -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api -import chat.peptide.api.schemas.Member -import chat.peptide.api.schemas.ServerWithChannelObjects -import chat.peptide.api.schemas.User +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.api.schemas.Member +import chat.zekochat.api.schemas.ServerWithChannelObjects +import chat.zekochat.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/peptide/api/routes/sync/SettingsSync.kt b/app/src/main/java/chat/zekochat/api/routes/sync/SettingsSync.kt similarity index 92% rename from app/src/main/java/chat/peptide/api/routes/sync/SettingsSync.kt rename to app/src/main/java/chat/zekochat/api/routes/sync/SettingsSync.kt index c3d5503c..0db55aec 100644 --- a/app/src/main/java/chat/peptide/api/routes/sync/SettingsSync.kt +++ b/app/src/main/java/chat/zekochat/api/routes/sync/SettingsSync.kt @@ -1,9 +1,9 @@ -package chat.peptide.api.routes.sync +package chat.zekochat.api.routes.sync -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.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/peptide/api/routes/sync/UnreadSync.kt b/app/src/main/java/chat/zekochat/api/routes/sync/UnreadSync.kt similarity index 66% rename from app/src/main/java/chat/peptide/api/routes/sync/UnreadSync.kt rename to app/src/main/java/chat/zekochat/api/routes/sync/UnreadSync.kt index 073faacd..e6ff489c 100644 --- a/app/src/main/java/chat/peptide/api/routes/sync/UnreadSync.kt +++ b/app/src/main/java/chat/zekochat/api/routes/sync/UnreadSync.kt @@ -1,9 +1,9 @@ -package chat.peptide.api.routes.sync +package chat.zekochat.api.routes.sync -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api -import chat.peptide.api.schemas.ChannelUnreadResponse +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.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/peptide/api/routes/user/DirectMessaging.kt b/app/src/main/java/chat/zekochat/api/routes/user/DirectMessaging.kt similarity index 70% rename from app/src/main/java/chat/peptide/api/routes/user/DirectMessaging.kt rename to app/src/main/java/chat/zekochat/api/routes/user/DirectMessaging.kt index fbeda2c9..5d4fa14b 100644 --- a/app/src/main/java/chat/peptide/api/routes/user/DirectMessaging.kt +++ b/app/src/main/java/chat/zekochat/api/routes/user/DirectMessaging.kt @@ -1,10 +1,10 @@ -package chat.peptide.api.routes.user +package chat.zekochat.api.routes.user -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api -import chat.peptide.api.schemas.Channel +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.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/peptide/api/routes/user/Relationships.kt b/app/src/main/java/chat/zekochat/api/routes/user/Relationships.kt similarity index 92% rename from app/src/main/java/chat/peptide/api/routes/user/Relationships.kt rename to app/src/main/java/chat/zekochat/api/routes/user/Relationships.kt index 4551b3e0..73604022 100644 --- a/app/src/main/java/chat/peptide/api/routes/user/Relationships.kt +++ b/app/src/main/java/chat/zekochat/api/routes/user/Relationships.kt @@ -1,9 +1,9 @@ -package chat.peptide.api.routes.user +package chat.zekochat.api.routes.user -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.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/peptide/api/routes/user/User.kt b/app/src/main/java/chat/zekochat/api/routes/user/User.kt similarity index 92% rename from app/src/main/java/chat/peptide/api/routes/user/User.kt rename to app/src/main/java/chat/zekochat/api/routes/user/User.kt index d249d288..0974462e 100644 --- a/app/src/main/java/chat/peptide/api/routes/user/User.kt +++ b/app/src/main/java/chat/zekochat/api/routes/user/User.kt @@ -1,13 +1,13 @@ -package chat.peptide.api.routes.user +package chat.zekochat.api.routes.user -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api -import chat.peptide.api.schemas.Profile -import chat.peptide.api.schemas.Status -import chat.peptide.api.schemas.User +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.api +import chat.zekochat.api.schemas.Profile +import chat.zekochat.api.schemas.Status +import chat.zekochat.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/peptide/api/routes/voice/Voice.kt b/app/src/main/java/chat/zekochat/api/routes/voice/Voice.kt similarity index 83% rename from app/src/main/java/chat/peptide/api/routes/voice/Voice.kt rename to app/src/main/java/chat/zekochat/api/routes/voice/Voice.kt index 5df2c143..bf91222d 100644 --- a/app/src/main/java/chat/peptide/api/routes/voice/Voice.kt +++ b/app/src/main/java/chat/zekochat/api/routes/voice/Voice.kt @@ -1,9 +1,9 @@ -package chat.peptide.api.routes.voice +package chat.zekochat.api.routes.voice -import chat.peptide.api.PeptideError -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.api.api +import chat.zekochat.api.PeptideError +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.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/peptide/api/schemas/Auth.kt b/app/src/main/java/chat/zekochat/api/schemas/Auth.kt similarity index 78% rename from app/src/main/java/chat/peptide/api/schemas/Auth.kt rename to app/src/main/java/chat/zekochat/api/schemas/Auth.kt index 5a82a044..dc87a4e7 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Auth.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Auth.kt @@ -1,6 +1,6 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas -import chat.peptide.api.PeptideAPI +import chat.zekochat.api.PeptideAPI import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/peptide/api/schemas/Channel.kt b/app/src/main/java/chat/zekochat/api/schemas/Channel.kt similarity index 99% rename from app/src/main/java/chat/peptide/api/schemas/Channel.kt rename to app/src/main/java/chat/zekochat/api/schemas/Channel.kt index f4a84a0c..8a68dd6e 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Channel.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Channel.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas import kotlinx.datetime.Instant import kotlinx.serialization.KSerializer diff --git a/app/src/main/java/chat/peptide/api/schemas/Generic.kt b/app/src/main/java/chat/zekochat/api/schemas/Generic.kt similarity index 96% rename from app/src/main/java/chat/peptide/api/schemas/Generic.kt rename to app/src/main/java/chat/zekochat/api/schemas/Generic.kt index 43a593da..fbf7deef 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Generic.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Generic.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/chat/peptide/api/schemas/Health.kt b/app/src/main/java/chat/zekochat/api/schemas/Health.kt similarity index 93% rename from app/src/main/java/chat/peptide/api/schemas/Health.kt rename to app/src/main/java/chat/zekochat/api/schemas/Health.kt index 7d580d5e..725b8909 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Health.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Health.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/peptide/api/schemas/Invites.kt b/app/src/main/java/chat/zekochat/api/schemas/Invites.kt similarity index 95% rename from app/src/main/java/chat/peptide/api/schemas/Invites.kt rename to app/src/main/java/chat/zekochat/api/schemas/Invites.kt index 109ad690..40f36e20 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Invites.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Invites.kt @@ -1,8 +1,8 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas import android.net.Uri import androidx.core.net.toUri -import chat.peptide.api.PeptideAPI +import chat.zekochat.api.PeptideAPI import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/peptide/api/schemas/Messages.kt b/app/src/main/java/chat/zekochat/api/schemas/Messages.kt similarity index 96% rename from app/src/main/java/chat/peptide/api/schemas/Messages.kt rename to app/src/main/java/chat/zekochat/api/schemas/Messages.kt index c42e4206..6845496d 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Messages.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Messages.kt @@ -1,6 +1,6 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas -import chat.peptide.api.PeptideAPI +import chat.zekochat.api.PeptideAPI 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.peptide.api.internals.MessageFlag] + * See [chat.zekochat.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/peptide/api/schemas/Safety.kt b/app/src/main/java/chat/zekochat/api/schemas/Safety.kt similarity index 99% rename from app/src/main/java/chat/peptide/api/schemas/Safety.kt rename to app/src/main/java/chat/zekochat/api/schemas/Safety.kt index 00c52b03..01890ef3 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Safety.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Safety.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/peptide/api/schemas/Server.kt b/app/src/main/java/chat/zekochat/api/schemas/Server.kt similarity index 99% rename from app/src/main/java/chat/peptide/api/schemas/Server.kt rename to app/src/main/java/chat/zekochat/api/schemas/Server.kt index a12fd284..1266fcd8 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Server.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Server.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/peptide/api/schemas/Settings.kt b/app/src/main/java/chat/zekochat/api/schemas/Settings.kt similarity index 95% rename from app/src/main/java/chat/peptide/api/schemas/Settings.kt rename to app/src/main/java/chat/zekochat/api/schemas/Settings.kt index 761c369d..fddf4777 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Settings.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Settings.kt @@ -1,6 +1,6 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas -import chat.peptide.ui.theme.OverridableColourScheme +import chat.zekochat.ui.theme.OverridableColourScheme import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonElement diff --git a/app/src/main/java/chat/peptide/api/schemas/User.kt b/app/src/main/java/chat/zekochat/api/schemas/User.kt similarity index 98% rename from app/src/main/java/chat/peptide/api/schemas/User.kt rename to app/src/main/java/chat/zekochat/api/schemas/User.kt index 2f06589d..4d3e065f 100644 --- a/app/src/main/java/chat/peptide/api/schemas/User.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/User.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/chat/peptide/api/schemas/Util.kt b/app/src/main/java/chat/zekochat/api/schemas/Util.kt similarity index 96% rename from app/src/main/java/chat/peptide/api/schemas/Util.kt rename to app/src/main/java/chat/zekochat/api/schemas/Util.kt index 1f110531..b562d1ab 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Util.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Util.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.schemas +package chat.zekochat.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/peptide/api/schemas/Voice.kt b/app/src/main/java/chat/zekochat/api/schemas/Voice.kt similarity index 92% rename from app/src/main/java/chat/peptide/api/schemas/Voice.kt rename to app/src/main/java/chat/zekochat/api/schemas/Voice.kt index 722d5159..dd34ebea 100644 --- a/app/src/main/java/chat/peptide/api/schemas/Voice.kt +++ b/app/src/main/java/chat/zekochat/api/schemas/Voice.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.schemas +package chat.zekochat.api.schemas import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/peptide/api/settings/Experiments.kt b/app/src/main/java/chat/zekochat/api/settings/Experiments.kt similarity index 92% rename from app/src/main/java/chat/peptide/api/settings/Experiments.kt rename to app/src/main/java/chat/zekochat/api/settings/Experiments.kt index 2db9a1ac..1cf1490d 100644 --- a/app/src/main/java/chat/peptide/api/settings/Experiments.kt +++ b/app/src/main/java/chat/zekochat/api/settings/Experiments.kt @@ -1,11 +1,11 @@ -package chat.peptide.api.settings +package chat.zekochat.api.settings import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import chat.peptide.BuildConfig -import chat.peptide.PeptideApplication -import chat.peptide.persistence.KVStorage +import chat.zekochat.BuildConfig +import chat.zekochat.PeptideApplication +import chat.zekochat.persistence.KVStorage class ExperimentInstance(default: Boolean) { private var _isEnabled by mutableStateOf(default) diff --git a/app/src/main/java/chat/peptide/api/settings/FeatureFlags.kt b/app/src/main/java/chat/zekochat/api/settings/FeatureFlags.kt similarity index 96% rename from app/src/main/java/chat/peptide/api/settings/FeatureFlags.kt rename to app/src/main/java/chat/zekochat/api/settings/FeatureFlags.kt index 44c5a6e0..f14e87aa 100644 --- a/app/src/main/java/chat/peptide/api/settings/FeatureFlags.kt +++ b/app/src/main/java/chat/zekochat/api/settings/FeatureFlags.kt @@ -1,10 +1,10 @@ -package chat.peptide.api.settings +package chat.zekochat.api.settings import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import chat.peptide.api.PeptideAPI -import chat.peptide.api.internals.SpecialUsers +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.SpecialUsers annotation class FeatureFlag(val name: String) annotation class Treatment(val description: String) diff --git a/app/src/main/java/chat/peptide/api/settings/GeoStateProvider.kt b/app/src/main/java/chat/zekochat/api/settings/GeoStateProvider.kt similarity index 84% rename from app/src/main/java/chat/peptide/api/settings/GeoStateProvider.kt rename to app/src/main/java/chat/zekochat/api/settings/GeoStateProvider.kt index a84ab72a..baff57d4 100644 --- a/app/src/main/java/chat/peptide/api/settings/GeoStateProvider.kt +++ b/app/src/main/java/chat/zekochat/api/settings/GeoStateProvider.kt @@ -1,9 +1,9 @@ -package chat.peptide.api.settings +package chat.zekochat.api.settings import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import chat.peptide.api.routes.microservices.geo.GeoResponse +import chat.zekochat.api.routes.microservices.geo.GeoResponse object GeoStateProvider { var geoState by mutableStateOf(null) diff --git a/app/src/main/java/chat/peptide/api/settings/LoadedSettings.kt b/app/src/main/java/chat/zekochat/api/settings/LoadedSettings.kt similarity index 88% rename from app/src/main/java/chat/peptide/api/settings/LoadedSettings.kt rename to app/src/main/java/chat/zekochat/api/settings/LoadedSettings.kt index 436c5fd9..685a3e02 100644 --- a/app/src/main/java/chat/peptide/api/settings/LoadedSettings.kt +++ b/app/src/main/java/chat/zekochat/api/settings/LoadedSettings.kt @@ -1,12 +1,12 @@ -package chat.peptide.api.settings +package chat.zekochat.api.settings import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import chat.peptide.api.schemas.AndroidSpecificSettingsSpecialEmbedSettings -import chat.peptide.ui.theme.Theme -import chat.peptide.ui.theme.getDefaultTheme +import chat.zekochat.api.schemas.AndroidSpecificSettingsSpecialEmbedSettings +import chat.zekochat.ui.theme.Theme +import chat.zekochat.ui.theme.getDefaultTheme enum class MessageReplyStyle { None, diff --git a/app/src/main/java/chat/peptide/api/settings/NotificationSettingsProvider.kt b/app/src/main/java/chat/zekochat/api/settings/NotificationSettingsProvider.kt similarity index 91% rename from app/src/main/java/chat/peptide/api/settings/NotificationSettingsProvider.kt rename to app/src/main/java/chat/zekochat/api/settings/NotificationSettingsProvider.kt index b6e340a4..f153624f 100644 --- a/app/src/main/java/chat/peptide/api/settings/NotificationSettingsProvider.kt +++ b/app/src/main/java/chat/zekochat/api/settings/NotificationSettingsProvider.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.settings +package chat.zekochat.api.settings object NotificationSettingsProvider { fun isChannelMuted(channelId: String, serverId: String?): Boolean { diff --git a/app/src/main/java/chat/peptide/api/settings/NotificationType.kt b/app/src/main/java/chat/zekochat/api/settings/NotificationType.kt similarity index 93% rename from app/src/main/java/chat/peptide/api/settings/NotificationType.kt rename to app/src/main/java/chat/zekochat/api/settings/NotificationType.kt index 4d55fc23..fe201ffa 100644 --- a/app/src/main/java/chat/peptide/api/settings/NotificationType.kt +++ b/app/src/main/java/chat/zekochat/api/settings/NotificationType.kt @@ -1,4 +1,4 @@ -package chat.peptide.api.settings +package chat.zekochat.api.settings enum class NotificationType(val storageValue: String) { DEFAULT("all"), diff --git a/app/src/main/java/chat/peptide/api/settings/SyncedSettings.kt b/app/src/main/java/chat/zekochat/api/settings/SyncedSettings.kt similarity index 92% rename from app/src/main/java/chat/peptide/api/settings/SyncedSettings.kt rename to app/src/main/java/chat/zekochat/api/settings/SyncedSettings.kt index 20bf8306..b36d53f4 100644 --- a/app/src/main/java/chat/peptide/api/settings/SyncedSettings.kt +++ b/app/src/main/java/chat/zekochat/api/settings/SyncedSettings.kt @@ -1,14 +1,14 @@ -package chat.peptide.api.settings +package chat.zekochat.api.settings import androidx.compose.runtime.mutableStateOf -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideJson -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 chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.routes.sync.getKeys +import chat.zekochat.api.routes.sync.setKey +import chat.zekochat.api.schemas.AndroidSpecificSettings +import chat.zekochat.api.schemas.NotificationSettings +import chat.zekochat.api.schemas.OrderingSettings +import chat.zekochat.api.schemas._NotificationSettingsToParse import kotlinx.serialization.json.JsonPrimitive import kotlinx.serialization.json.jsonPrimitive import logcat.LogPriority diff --git a/app/src/main/java/chat/peptide/api/unreads/Unreads.kt b/app/src/main/java/chat/zekochat/api/unreads/Unreads.kt similarity index 88% rename from app/src/main/java/chat/peptide/api/unreads/Unreads.kt rename to app/src/main/java/chat/zekochat/api/unreads/Unreads.kt index 54c62168..06ac10dd 100644 --- a/app/src/main/java/chat/peptide/api/unreads/Unreads.kt +++ b/app/src/main/java/chat/zekochat/api/unreads/Unreads.kt @@ -1,16 +1,16 @@ -package chat.peptide.api.unreads +package chat.zekochat.api.unreads import android.util.Log import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf -import chat.peptide.api.PeptideAPI -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 +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.ULID +import chat.zekochat.api.routes.channel.ackChannel +import chat.zekochat.api.routes.server.ackServer +import chat.zekochat.api.routes.sync.syncUnreads +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.ChannelUnread +import chat.zekochat.api.settings.NotificationSettingsProvider class Unreads { private val hasLoaded = mutableStateOf(false) diff --git a/app/src/main/java/chat/peptide/c2dm/ChannelRegistrator.kt b/app/src/main/java/chat/zekochat/c2dm/ChannelRegistrator.kt similarity index 97% rename from app/src/main/java/chat/peptide/c2dm/ChannelRegistrator.kt rename to app/src/main/java/chat/zekochat/c2dm/ChannelRegistrator.kt index 8e880c70..cad0c1d6 100644 --- a/app/src/main/java/chat/peptide/c2dm/ChannelRegistrator.kt +++ b/app/src/main/java/chat/zekochat/c2dm/ChannelRegistrator.kt @@ -1,11 +1,11 @@ -package chat.peptide.c2dm +package chat.zekochat.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.peptide.R +import chat.zekochat.R // TODO // * Add the remaining groups. diff --git a/app/src/main/java/chat/peptide/c2dm/HandlerService.kt b/app/src/main/java/chat/zekochat/c2dm/HandlerService.kt similarity index 91% rename from app/src/main/java/chat/peptide/c2dm/HandlerService.kt rename to app/src/main/java/chat/zekochat/c2dm/HandlerService.kt index f21d473e..89654fa0 100644 --- a/app/src/main/java/chat/peptide/c2dm/HandlerService.kt +++ b/app/src/main/java/chat/zekochat/c2dm/HandlerService.kt @@ -1,4 +1,4 @@ -package chat.peptide.c2dm +package chat.zekochat.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.peptide.R -import chat.peptide.activities.MainActivity -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideJson -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 chat.zekochat.R +import chat.zekochat.activities.MainActivity +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.internals.ULID +import chat.zekochat.api.routes.push.subscribePush +import chat.zekochat.api.schemas.Message +import chat.zekochat.api.schemas.User +import chat.zekochat.c2dm.ChannelRegistrator.Companion.CHANNEL_ID_GROUP_SOCIAL_FRIENDREQUESTS +import com.zekochat.persistence.Database +import chat.zekochat.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/peptide/callbacks/ActionChannel.kt b/app/src/main/java/chat/zekochat/callbacks/ActionChannel.kt similarity index 91% rename from app/src/main/java/chat/peptide/callbacks/ActionChannel.kt rename to app/src/main/java/chat/zekochat/callbacks/ActionChannel.kt index a674e917..b8606a17 100644 --- a/app/src/main/java/chat/peptide/callbacks/ActionChannel.kt +++ b/app/src/main/java/chat/zekochat/callbacks/ActionChannel.kt @@ -1,6 +1,6 @@ -package chat.peptide.callbacks +package chat.zekochat.callbacks -import chat.peptide.screens.chat.ChatRouterDestination +import chat.zekochat.screens.chat.ChatRouterDestination import kotlinx.coroutines.channels.Channel sealed class Action { diff --git a/app/src/main/java/chat/peptide/callbacks/UiCallbacks.kt b/app/src/main/java/chat/zekochat/callbacks/UiCallbacks.kt similarity index 96% rename from app/src/main/java/chat/peptide/callbacks/UiCallbacks.kt rename to app/src/main/java/chat/zekochat/callbacks/UiCallbacks.kt index 519f2a16..2916f087 100644 --- a/app/src/main/java/chat/peptide/callbacks/UiCallbacks.kt +++ b/app/src/main/java/chat/zekochat/callbacks/UiCallbacks.kt @@ -1,4 +1,4 @@ -package chat.peptide.callbacks +package chat.zekochat.callbacks import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/app/src/main/java/chat/peptide/composables/chat/DateDivider.kt b/app/src/main/java/chat/zekochat/composables/chat/DateDivider.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/chat/DateDivider.kt rename to app/src/main/java/chat/zekochat/composables/chat/DateDivider.kt index 400186c0..c2bdddbf 100644 --- a/app/src/main/java/chat/peptide/composables/chat/DateDivider.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/DateDivider.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.composables.chat import android.icu.text.DateFormat import android.text.format.DateUtils diff --git a/app/src/main/java/chat/peptide/composables/chat/DisconnectedNotice.kt b/app/src/main/java/chat/zekochat/composables/chat/DisconnectedNotice.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/chat/DisconnectedNotice.kt rename to app/src/main/java/chat/zekochat/composables/chat/DisconnectedNotice.kt index cdfd058c..4eb48008 100644 --- a/app/src/main/java/chat/peptide/composables/chat/DisconnectedNotice.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/DisconnectedNotice.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.peptide.R -import chat.peptide.api.realtime.DisconnectionState -import chat.peptide.api.settings.LoadedSettings -import chat.peptide.ui.theme.Theme +import chat.zekochat.R +import chat.zekochat.api.realtime.DisconnectionState +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.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/peptide/composables/chat/Embed.kt b/app/src/main/java/chat/zekochat/composables/chat/Embed.kt similarity index 91% rename from app/src/main/java/chat/peptide/composables/chat/Embed.kt rename to app/src/main/java/chat/zekochat/composables/chat/Embed.kt index 08103352..dcaf16f8 100644 --- a/app/src/main/java/chat/peptide/composables/chat/Embed.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/Embed.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.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 +import chat.zekochat.api.internals.BrushCompat +import chat.zekochat.api.internals.solidColor +import chat.zekochat.api.routes.microservices.january.asJanuaryProxyUrl +import chat.zekochat.api.schemas.Embed +import chat.zekochat.composables.chat.specialembeds.SpecialEmbedSwitch +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.markdown.RichMarkdown +import chat.zekochat.api.schemas.Embed as EmbedSchema @Composable fun RegularEmbed( diff --git a/app/src/main/java/chat/peptide/composables/chat/InReplyTo.kt b/app/src/main/java/chat/zekochat/composables/chat/InReplyTo.kt similarity index 92% rename from app/src/main/java/chat/peptide/composables/chat/InReplyTo.kt rename to app/src/main/java/chat/zekochat/composables/chat/InReplyTo.kt index a6b1fcbc..f0c7654a 100644 --- a/app/src/main/java/chat/peptide/composables/chat/InReplyTo.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/InReplyTo.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.solidColor +import chat.zekochat.api.routes.channel.fetchSingleMessage +import chat.zekochat.api.schemas.User +import chat.zekochat.api.settings.Experiments +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.markdown.jbm.JBM +import chat.zekochat.markdown.jbm.JBMRenderer +import chat.zekochat.markdown.jbm.LocalJBMarkdownTreeState import java.util.concurrent.CancellationException @OptIn(JBM::class) diff --git a/app/src/main/java/chat/peptide/composables/chat/InlineBadge.kt b/app/src/main/java/chat/zekochat/composables/chat/InlineBadge.kt similarity index 98% rename from app/src/main/java/chat/peptide/composables/chat/InlineBadge.kt rename to app/src/main/java/chat/zekochat/composables/chat/InlineBadge.kt index 1a92e2a7..ce0cafba 100644 --- a/app/src/main/java/chat/peptide/composables/chat/InlineBadge.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/InlineBadge.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.peptide.R +import chat.zekochat.R enum class InlineBadge { Bot, diff --git a/app/src/main/java/chat/peptide/composables/chat/MemberListItem.kt b/app/src/main/java/chat/zekochat/composables/chat/MemberListItem.kt similarity index 83% rename from app/src/main/java/chat/peptide/composables/chat/MemberListItem.kt rename to app/src/main/java/chat/zekochat/composables/chat/MemberListItem.kt index 9e36bc51..19017820 100644 --- a/app/src/main/java/chat/peptide/composables/chat/MemberListItem.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/MemberListItem.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.peptide.api.PeptideAPI -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 +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.BrushCompat +import chat.zekochat.api.internals.Roles +import chat.zekochat.api.internals.solidColor +import chat.zekochat.api.schemas.Member +import chat.zekochat.api.schemas.User +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.composables.generic.presenceFromStatus +import chat.zekochat.internals.extensions.TransparentListItemColours @Composable fun MemberListItem( diff --git a/app/src/main/java/chat/peptide/composables/chat/Message.kt b/app/src/main/java/chat/zekochat/composables/chat/Message.kt similarity index 94% rename from app/src/main/java/chat/peptide/composables/chat/Message.kt rename to app/src/main/java/chat/zekochat/composables/chat/Message.kt index c27d59af..4bc89300 100644 --- a/app/src/main/java/chat/peptide/composables/chat/Message.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/Message.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.composables.chat import android.annotation.SuppressLint import android.content.Intent @@ -60,41 +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.peptide.R -import chat.peptide.activities.media.ImageViewActivity -import chat.peptide.activities.media.VideoViewActivity -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.activities.media.ImageViewActivity +import chat.zekochat.activities.media.VideoViewActivity +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.BrushCompat +import chat.zekochat.api.internals.MessageFlag +import chat.zekochat.api.internals.Roles +import chat.zekochat.api.internals.SpecialUsers +import chat.zekochat.api.internals.ULID +import chat.zekochat.api.internals.has +import chat.zekochat.api.internals.solidColor +import chat.zekochat.api.routes.channel.react +import chat.zekochat.api.routes.channel.unreact +import chat.zekochat.api.routes.microservices.january.asJanuaryProxyUrl +import chat.zekochat.api.schemas.AutumnResource +import chat.zekochat.api.schemas.User +import chat.zekochat.api.settings.Experiments +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.api.settings.MessageReplyStyle +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.utils.InternalLinkHandler +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.composables.generic.UserAvatarWidthPlaceholder +import chat.zekochat.composables.markdown.LocalMarkdownTreeConfig +import chat.zekochat.composables.markdown.RichMarkdown +import chat.zekochat.internals.text.Gigamoji +import chat.zekochat.internals.text.MessageProcessor +import chat.zekochat.markdown.jbm.JBM +import chat.zekochat.markdown.jbm.JBMRenderer +import chat.zekochat.markdown.jbm.LocalJBMarkdownTreeState +import chat.zekochat.persistence.KVStorage import kotlinx.coroutines.launch -import chat.peptide.api.schemas.Message as MessageSchema +import chat.zekochat.api.schemas.Message as MessageSchema @Composable fun authorColour(message: MessageSchema): Brush { diff --git a/app/src/main/java/chat/peptide/composables/chat/MessageAttachment.kt b/app/src/main/java/chat/zekochat/composables/chat/MessageAttachment.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/chat/MessageAttachment.kt rename to app/src/main/java/chat/zekochat/composables/chat/MessageAttachment.kt index 56ce72b4..77ddec87 100644 --- a/app/src/main/java/chat/peptide/composables/chat/MessageAttachment.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/MessageAttachment.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.schemas.AutumnResource -import chat.peptide.composables.generic.RemoteImage -import chat.peptide.composables.media.AudioPlayer +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.AutumnResource +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.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/peptide/composables/chat/MessageField.kt b/app/src/main/java/chat/zekochat/composables/chat/MessageField.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/chat/MessageField.kt rename to app/src/main/java/chat/zekochat/composables/chat/MessageField.kt index 341f9044..4db280c7 100644 --- a/app/src/main/java/chat/peptide/composables/chat/MessageField.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/MessageField.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.peptide.R -import chat.peptide.activities.PeptideTweenFloat -import chat.peptide.activities.PeptideTweenInt -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.activities.PeptideTweenFloat +import chat.zekochat.activities.PeptideTweenInt +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.BrushCompat +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.Member +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.composables.screens.chat.ChannelIcon +import chat.zekochat.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.peptide.api.schemas.User, + val user: chat.zekochat.api.schemas.User, val member: Member?, val query: String ) : AutocompleteSuggestion() data class Channel( - val channel: chat.peptide.api.schemas.Channel, + val channel: chat.zekochat.api.schemas.Channel, val query: String ) : AutocompleteSuggestion() data class Emoji( val shortcode: String, val unicode: String?, - val custom: chat.peptide.api.schemas.Emoji?, + val custom: chat.zekochat.api.schemas.Emoji?, val query: String ) : AutocompleteSuggestion() data class Role( - val role: chat.peptide.api.schemas.Role, + val role: chat.zekochat.api.schemas.Role, val id: String, val query: String ) : AutocompleteSuggestion() diff --git a/app/src/main/java/chat/peptide/composables/chat/Reaction.kt b/app/src/main/java/chat/zekochat/composables/chat/Reaction.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/chat/Reaction.kt rename to app/src/main/java/chat/zekochat/composables/chat/Reaction.kt index f9a45b1e..3d53e433 100644 --- a/app/src/main/java/chat/peptide/composables/chat/Reaction.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/Reaction.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.peptide.api.PeptideAPI -import chat.peptide.api.internals.isUlid -import chat.peptide.composables.generic.RemoteImage +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.isUlid +import chat.zekochat.composables.generic.RemoteImage @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/java/chat/peptide/composables/chat/RoleChip.kt b/app/src/main/java/chat/zekochat/composables/chat/RoleChip.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/chat/RoleChip.kt rename to app/src/main/java/chat/zekochat/composables/chat/RoleChip.kt index a6f8386f..c15d2e15 100644 --- a/app/src/main/java/chat/peptide/composables/chat/RoleChip.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/RoleChip.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/peptide/composables/chat/RoleListEntry.kt b/app/src/main/java/chat/zekochat/composables/chat/RoleListEntry.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/chat/RoleListEntry.kt rename to app/src/main/java/chat/zekochat/composables/chat/RoleListEntry.kt index 0dad6d37..222b91d6 100644 --- a/app/src/main/java/chat/peptide/composables/chat/RoleListEntry.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/RoleListEntry.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/peptide/composables/chat/SystemMessage.kt b/app/src/main/java/chat/zekochat/composables/chat/SystemMessage.kt similarity index 98% rename from app/src/main/java/chat/peptide/composables/chat/SystemMessage.kt rename to app/src/main/java/chat/zekochat/composables/chat/SystemMessage.kt index f528b876..2543e9b5 100644 --- a/app/src/main/java/chat/peptide/composables/chat/SystemMessage.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/SystemMessage.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.peptide.R -import chat.peptide.api.schemas.Message -import chat.peptide.composables.markdown.RichMarkdown +import chat.zekochat.R +import chat.zekochat.api.schemas.Message +import chat.zekochat.composables.markdown.RichMarkdown enum class SystemMessageType(val type: String) { CHANNEL_OWNERSHIP_CHANGED("channel_ownership_changed"), diff --git a/app/src/main/java/chat/peptide/composables/chat/TimeRift.kt b/app/src/main/java/chat/zekochat/composables/chat/TimeRift.kt similarity index 93% rename from app/src/main/java/chat/peptide/composables/chat/TimeRift.kt rename to app/src/main/java/chat/zekochat/composables/chat/TimeRift.kt index b1d1844b..3875ada5 100644 --- a/app/src/main/java/chat/peptide/composables/chat/TimeRift.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/TimeRift.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.composables.chat import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -19,8 +18,8 @@ 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.peptide.R -import chat.peptide.composables.generic.PepTextButton +import chat.zekochat.R +import chat.zekochat.composables.generic.PepTextButton @Composable fun TimeRift(modifier: Modifier = Modifier, onMessageLoad: () -> Unit) { diff --git a/app/src/main/java/chat/peptide/composables/chat/UserBadgeList.kt b/app/src/main/java/chat/zekochat/composables/chat/UserBadgeList.kt similarity index 98% rename from app/src/main/java/chat/peptide/composables/chat/UserBadgeList.kt rename to app/src/main/java/chat/zekochat/composables/chat/UserBadgeList.kt index 23d0aba5..d1b09347 100644 --- a/app/src/main/java/chat/peptide/composables/chat/UserBadgeList.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/UserBadgeList.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat +package chat.zekochat.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.peptide.R -import chat.peptide.api.schemas.UserBadges -import chat.peptide.api.schemas.has +import chat.zekochat.R +import chat.zekochat.api.schemas.UserBadges +import chat.zekochat.api.schemas.has @Composable fun BadgeListEntryTemplate( diff --git a/app/src/main/java/chat/peptide/composables/chat/specialembeds/AppleMusicEmbed.kt b/app/src/main/java/chat/zekochat/composables/chat/specialembeds/AppleMusicEmbed.kt similarity index 90% rename from app/src/main/java/chat/peptide/composables/chat/specialembeds/AppleMusicEmbed.kt rename to app/src/main/java/chat/zekochat/composables/chat/specialembeds/AppleMusicEmbed.kt index 867b69c9..7b0b2648 100644 --- a/app/src/main/java/chat/peptide/composables/chat/specialembeds/AppleMusicEmbed.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/specialembeds/AppleMusicEmbed.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat.specialembeds +package chat.zekochat.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.peptide.api.schemas.Special -import chat.peptide.api.settings.LoadedSettings -import chat.peptide.ui.theme.isThemeDark +import chat.zekochat.api.schemas.Special +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.ui.theme.isThemeDark @SuppressLint("SetJavaScriptEnabled") @Composable diff --git a/app/src/main/java/chat/peptide/composables/chat/specialembeds/SpecialEmbedSwitch.kt b/app/src/main/java/chat/zekochat/composables/chat/specialembeds/SpecialEmbedSwitch.kt similarity index 78% rename from app/src/main/java/chat/peptide/composables/chat/specialembeds/SpecialEmbedSwitch.kt rename to app/src/main/java/chat/zekochat/composables/chat/specialembeds/SpecialEmbedSwitch.kt index 8a65fc01..72444756 100644 --- a/app/src/main/java/chat/peptide/composables/chat/specialembeds/SpecialEmbedSwitch.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/specialembeds/SpecialEmbedSwitch.kt @@ -1,9 +1,9 @@ -package chat.peptide.composables.chat.specialembeds +package chat.zekochat.composables.chat.specialembeds import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import chat.peptide.api.schemas.Special -import chat.peptide.api.settings.LoadedSettings +import chat.zekochat.api.schemas.Special +import chat.zekochat.api.settings.LoadedSettings @Composable fun SpecialEmbedSwitch(special: Special, modifier: Modifier = Modifier) { diff --git a/app/src/main/java/chat/peptide/composables/chat/specialembeds/YouTubeEmbed.kt b/app/src/main/java/chat/zekochat/composables/chat/specialembeds/YouTubeEmbed.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/chat/specialembeds/YouTubeEmbed.kt rename to app/src/main/java/chat/zekochat/composables/chat/specialembeds/YouTubeEmbed.kt index 38108f02..0b60cf08 100644 --- a/app/src/main/java/chat/peptide/composables/chat/specialembeds/YouTubeEmbed.kt +++ b/app/src/main/java/chat/zekochat/composables/chat/specialembeds/YouTubeEmbed.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.chat.specialembeds +package chat.zekochat.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.peptide.R -import chat.peptide.api.schemas.Special -import chat.peptide.composables.chat.VideoPlayButton -import chat.peptide.composables.generic.RemoteImage +import chat.zekochat.R +import chat.zekochat.api.schemas.Special +import chat.zekochat.composables.chat.VideoPlayButton +import chat.zekochat.composables.generic.RemoteImage import org.intellij.lang.annotations.Language @Language("HTML") diff --git a/app/src/main/java/chat/peptide/composables/emoji/EmojiPicker.kt b/app/src/main/java/chat/zekochat/composables/emoji/EmojiPicker.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/emoji/EmojiPicker.kt rename to app/src/main/java/chat/zekochat/composables/emoji/EmojiPicker.kt index 04f7a621..fc71e2f1 100644 --- a/app/src/main/java/chat/peptide/composables/emoji/EmojiPicker.kt +++ b/app/src/main/java/chat/zekochat/composables/emoji/EmojiPicker.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.emoji +package chat.zekochat.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.peptide.R -import chat.peptide.activities.PeptideTweenFloat -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.activities.PeptideTweenFloat +import chat.zekochat.api.PeptideAPI +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.generic.IconPlaceholder +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.internals.Category +import chat.zekochat.internals.EmojiImpl +import chat.zekochat.internals.EmojiPickerItem +import chat.zekochat.internals.FitzpatrickSkinTone +import chat.zekochat.internals.UnicodeEmojiSection import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/peptide/composables/generic/CollapsibleCard.kt b/app/src/main/java/chat/zekochat/composables/generic/CollapsibleCard.kt similarity index 98% rename from app/src/main/java/chat/peptide/composables/generic/CollapsibleCard.kt rename to app/src/main/java/chat/zekochat/composables/generic/CollapsibleCard.kt index 2f939214..34a819f4 100644 --- a/app/src/main/java/chat/peptide/composables/generic/CollapsibleCard.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/CollapsibleCard.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.clickable diff --git a/app/src/main/java/chat/peptide/composables/generic/DobPicker.kt b/app/src/main/java/chat/zekochat/composables/generic/DobPicker.kt similarity index 98% rename from app/src/main/java/chat/peptide/composables/generic/DobPicker.kt rename to app/src/main/java/chat/zekochat/composables/generic/DobPicker.kt index a2bc8910..be8d7f60 100644 --- a/app/src/main/java/chat/peptide/composables/generic/DobPicker.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/DobPicker.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.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.peptide.R +import chat.zekochat.R sealed class DobElement { data object Day : DobElement() diff --git a/app/src/main/java/chat/peptide/composables/generic/FormTextField.kt b/app/src/main/java/chat/zekochat/composables/generic/FormTextField.kt similarity index 94% rename from app/src/main/java/chat/peptide/composables/generic/FormTextField.kt rename to app/src/main/java/chat/zekochat/composables/generic/FormTextField.kt index d869c0f7..87846b55 100644 --- a/app/src/main/java/chat/peptide/composables/generic/FormTextField.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/FormTextField.kt @@ -1,9 +1,8 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.Text import androidx.compose.material3.TextField -import androidx.compose.material3.TextFieldDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.ImeAction diff --git a/app/src/main/java/chat/peptide/composables/generic/GradientStopEditor.kt b/app/src/main/java/chat/zekochat/composables/generic/GradientStopEditor.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/generic/GradientStopEditor.kt rename to app/src/main/java/chat/zekochat/composables/generic/GradientStopEditor.kt index 5d6a31e2..a7c8e98d 100644 --- a/app/src/main/java/chat/peptide/composables/generic/GradientStopEditor.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/GradientStopEditor.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import android.annotation.SuppressLint import androidx.compose.foundation.Canvas diff --git a/app/src/main/java/chat/peptide/composables/generic/HealthAlert.kt b/app/src/main/java/chat/zekochat/composables/generic/HealthAlert.kt similarity index 93% rename from app/src/main/java/chat/peptide/composables/generic/HealthAlert.kt rename to app/src/main/java/chat/zekochat/composables/generic/HealthAlert.kt index 1c5a41a7..e6c715c5 100644 --- a/app/src/main/java/chat/peptide/composables/generic/HealthAlert.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/HealthAlert.kt @@ -1,18 +1,17 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent import androidx.compose.material3.AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable 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.peptide.R -import chat.peptide.api.schemas.HealthNotice +import chat.zekochat.R +import chat.zekochat.api.schemas.HealthNotice @Composable fun HealthAlert(notice: HealthNotice, onDismiss: () -> Unit) { diff --git a/app/src/main/java/chat/peptide/composables/generic/IconPlaceholder.kt b/app/src/main/java/chat/zekochat/composables/generic/IconPlaceholder.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/generic/IconPlaceholder.kt rename to app/src/main/java/chat/zekochat/composables/generic/IconPlaceholder.kt index 5710dfe7..4a50dfa0 100644 --- a/app/src/main/java/chat/peptide/composables/generic/IconPlaceholder.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/IconPlaceholder.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/peptide/composables/generic/InlineMediaPicker.kt b/app/src/main/java/chat/zekochat/composables/generic/InlineMediaPicker.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/generic/InlineMediaPicker.kt rename to app/src/main/java/chat/zekochat/composables/generic/InlineMediaPicker.kt index 9639b72f..17af0b72 100644 --- a/app/src/main/java/chat/peptide/composables/generic/InlineMediaPicker.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/InlineMediaPicker.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import android.net.Uri import androidx.activity.compose.rememberLauncherForActivityResult @@ -17,7 +17,6 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -27,8 +26,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.peptide.R -import chat.peptide.api.settings.LoadedSettings +import chat.zekochat.R +import chat.zekochat.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/peptide/composables/generic/ListHeader.kt b/app/src/main/java/chat/zekochat/composables/generic/ListHeader.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/generic/ListHeader.kt rename to app/src/main/java/chat/zekochat/composables/generic/ListHeader.kt index 1d6bba9f..35d2eed3 100644 --- a/app/src/main/java/chat/peptide/composables/generic/ListHeader.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/ListHeader.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/chat/peptide/composables/generic/NonIdealState.kt b/app/src/main/java/chat/zekochat/composables/generic/NonIdealState.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/generic/NonIdealState.kt rename to app/src/main/java/chat/zekochat/composables/generic/NonIdealState.kt index 6d48cab9..84ddcb5d 100644 --- a/app/src/main/java/chat/peptide/composables/generic/NonIdealState.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/NonIdealState.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Star import androidx.compose.material.icons.filled.Warning -import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalTextStyle @@ -26,7 +25,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.peptide.R +import chat.zekochat.R private val NoneLambda = @Composable { throw UnsupportedOperationException() } diff --git a/app/src/main/java/chat/peptide/composables/generic/PepButtons.kt b/app/src/main/java/chat/zekochat/composables/generic/PepButtons.kt similarity index 98% rename from app/src/main/java/chat/peptide/composables/generic/PepButtons.kt rename to app/src/main/java/chat/zekochat/composables/generic/PepButtons.kt index 5a3f33a9..ac1448f8 100644 --- a/app/src/main/java/chat/peptide/composables/generic/PepButtons.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/PepButtons.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.compose.foundation.shape.CornerSize import androidx.compose.material3.Button diff --git a/app/src/main/java/chat/peptide/composables/generic/PrimaryTabs.kt b/app/src/main/java/chat/zekochat/composables/generic/PrimaryTabs.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/generic/PrimaryTabs.kt rename to app/src/main/java/chat/zekochat/composables/generic/PrimaryTabs.kt index 912e594c..1f2626ec 100644 --- a/app/src/main/java/chat/peptide/composables/generic/PrimaryTabs.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/PrimaryTabs.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.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.peptide.api.settings.LoadedSettings -import chat.peptide.ui.theme.Theme +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.ui.theme.Theme import com.google.android.material.tabs.TabLayout @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/peptide/composables/generic/RadioItem.kt b/app/src/main/java/chat/zekochat/composables/generic/RadioItem.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/generic/RadioItem.kt rename to app/src/main/java/chat/zekochat/composables/generic/RadioItem.kt index da41fa94..d0a75f9a 100644 --- a/app/src/main/java/chat/peptide/composables/generic/RadioItem.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/RadioItem.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.selection.selectable diff --git a/app/src/main/java/chat/peptide/composables/generic/RemoteImage.kt b/app/src/main/java/chat/zekochat/composables/generic/RemoteImage.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/generic/RemoteImage.kt rename to app/src/main/java/chat/zekochat/composables/generic/RemoteImage.kt index d6c1ebf5..6325ee4a 100644 --- a/app/src/main/java/chat/peptide/composables/generic/RemoteImage.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/RemoteImage.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import android.util.DisplayMetrics import androidx.compose.foundation.layout.height diff --git a/app/src/main/java/chat/peptide/composables/generic/SheetButton.kt b/app/src/main/java/chat/zekochat/composables/generic/SheetButton.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/generic/SheetButton.kt rename to app/src/main/java/chat/zekochat/composables/generic/SheetButton.kt index 99b1eade..b6e3a492 100644 --- a/app/src/main/java/chat/peptide/composables/generic/SheetButton.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/SheetButton.kt @@ -1,9 +1,8 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.padding import androidx.compose.material3.ListItem import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Info @@ -15,8 +14,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import chat.peptide.internals.extensions.TransparentListItemColours +import chat.zekochat.internals.extensions.TransparentListItemColours @Composable fun SheetButton( diff --git a/app/src/main/java/chat/peptide/composables/generic/SheetHeaderPadding.kt b/app/src/main/java/chat/zekochat/composables/generic/SheetHeaderPadding.kt similarity index 92% rename from app/src/main/java/chat/peptide/composables/generic/SheetHeaderPadding.kt rename to app/src/main/java/chat/zekochat/composables/generic/SheetHeaderPadding.kt index 077d6ede..fa9cfd2e 100644 --- a/app/src/main/java/chat/peptide/composables/generic/SheetHeaderPadding.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/SheetHeaderPadding.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope diff --git a/app/src/main/java/chat/peptide/composables/generic/UserAvatar.kt b/app/src/main/java/chat/zekochat/composables/generic/UserAvatar.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/generic/UserAvatar.kt rename to app/src/main/java/chat/zekochat/composables/generic/UserAvatar.kt index 236add2d..3782a0a4 100644 --- a/app/src/main/java/chat/peptide/composables/generic/UserAvatar.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/UserAvatar.kt @@ -1,7 +1,5 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic -import android.graphics.Bitmap -import android.graphics.drawable.BitmapDrawable import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -24,10 +22,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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.schemas.AutumnResource -import chat.peptide.api.settings.LoadedSettings +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.AutumnResource +import chat.zekochat.api.settings.LoadedSettings enum class Presence { Online, diff --git a/app/src/main/java/chat/peptide/composables/generic/Weblink.kt b/app/src/main/java/chat/zekochat/composables/generic/Weblink.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/generic/Weblink.kt rename to app/src/main/java/chat/zekochat/composables/generic/Weblink.kt index d3cfc20a..dc74af27 100644 --- a/app/src/main/java/chat/peptide/composables/generic/Weblink.kt +++ b/app/src/main/java/chat/zekochat/composables/generic/Weblink.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.generic +package chat.zekochat.composables.generic import android.net.Uri import androidx.browser.customtabs.CustomTabsIntent diff --git a/app/src/main/java/chat/peptide/composables/markdown/MarkdownCodeBlock.kt b/app/src/main/java/chat/zekochat/composables/markdown/MarkdownCodeBlock.kt similarity index 89% rename from app/src/main/java/chat/peptide/composables/markdown/MarkdownCodeBlock.kt rename to app/src/main/java/chat/zekochat/composables/markdown/MarkdownCodeBlock.kt index db63ec28..e39c5774 100644 --- a/app/src/main/java/chat/peptide/composables/markdown/MarkdownCodeBlock.kt +++ b/app/src/main/java/chat/zekochat/composables/markdown/MarkdownCodeBlock.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.markdown +package chat.zekochat.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.peptide.ndk.AstNode -import chat.peptide.ui.theme.FragmentMono +import chat.zekochat.ndk.AstNode +import chat.zekochat.ui.theme.FragmentMono @Composable fun MarkdownCodeBlock(node: AstNode, modifier: Modifier = Modifier) { diff --git a/app/src/main/java/chat/peptide/composables/markdown/MarkdownText.kt b/app/src/main/java/chat/zekochat/composables/markdown/MarkdownText.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/markdown/MarkdownText.kt rename to app/src/main/java/chat/zekochat/composables/markdown/MarkdownText.kt index a35df96a..c29f90c2 100644 --- a/app/src/main/java/chat/peptide/composables/markdown/MarkdownText.kt +++ b/app/src/main/java/chat/zekochat/composables/markdown/MarkdownText.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.markdown +package chat.zekochat.composables.markdown import android.content.Intent import android.util.Log @@ -35,19 +35,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.peptide.R -import chat.peptide.activities.InviteActivity -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.activities.InviteActivity +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.custom.fetchEmoji +import chat.zekochat.api.schemas.isInviteUri +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.utils.detectTapGesturesConditionalConsume +import chat.zekochat.internals.resolveTimestamp +import chat.zekochat.ndk.AstNode +import chat.zekochat.ui.theme.FragmentMono +import chat.zekochat.utils.InternalLinkHandler import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/peptide/composables/markdown/MarkdownTree.kt b/app/src/main/java/chat/zekochat/composables/markdown/MarkdownTree.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/markdown/MarkdownTree.kt rename to app/src/main/java/chat/zekochat/composables/markdown/MarkdownTree.kt index 6022664e..cb5ce855 100644 --- a/app/src/main/java/chat/peptide/composables/markdown/MarkdownTree.kt +++ b/app/src/main/java/chat/zekochat/composables/markdown/MarkdownTree.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.markdown +package chat.zekochat.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.peptide.api.internals.solidColor -import chat.peptide.ndk.AstNode +import chat.zekochat.api.internals.solidColor +import chat.zekochat.ndk.AstNode data class MarkdownTreeConfig( val linksClickable: Boolean = true, diff --git a/app/src/main/java/chat/peptide/composables/markdown/RichMarkdown.kt b/app/src/main/java/chat/zekochat/composables/markdown/RichMarkdown.kt similarity index 67% rename from app/src/main/java/chat/peptide/composables/markdown/RichMarkdown.kt rename to app/src/main/java/chat/zekochat/composables/markdown/RichMarkdown.kt index 0d14da97..f61973a0 100644 --- a/app/src/main/java/chat/peptide/composables/markdown/RichMarkdown.kt +++ b/app/src/main/java/chat/zekochat/composables/markdown/RichMarkdown.kt @@ -1,12 +1,12 @@ -package chat.peptide.composables.markdown +package chat.zekochat.composables.markdown import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import chat.peptide.api.settings.Experiments -import chat.peptide.markdown.jbm.JBM -import chat.peptide.markdown.jbm.JBMRenderer -import chat.peptide.ndk.Stendal +import chat.zekochat.api.settings.Experiments +import chat.zekochat.markdown.jbm.JBM +import chat.zekochat.markdown.jbm.JBMRenderer +import chat.zekochat.ndk.Stendal @OptIn(JBM::class) @Composable diff --git a/app/src/main/java/chat/peptide/composables/media/AudioPlayer.kt b/app/src/main/java/chat/zekochat/composables/media/AudioPlayer.kt similarity index 99% rename from app/src/main/java/chat/peptide/composables/media/AudioPlayer.kt rename to app/src/main/java/chat/zekochat/composables/media/AudioPlayer.kt index f1b8986e..b96af6c5 100644 --- a/app/src/main/java/chat/peptide/composables/media/AudioPlayer.kt +++ b/app/src/main/java/chat/zekochat/composables/media/AudioPlayer.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.media +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideHttp +import chat.zekochat.R +import chat.zekochat.api.PeptideHttp import io.ktor.client.request.get import io.ktor.client.statement.readBytes import kotlinx.coroutines.delay diff --git a/app/src/main/java/chat/peptide/composables/media/MediaPickerGateway.kt b/app/src/main/java/chat/zekochat/composables/media/MediaPickerGateway.kt similarity index 98% rename from app/src/main/java/chat/peptide/composables/media/MediaPickerGateway.kt rename to app/src/main/java/chat/zekochat/composables/media/MediaPickerGateway.kt index 8025ee7c..2468233a 100644 --- a/app/src/main/java/chat/peptide/composables/media/MediaPickerGateway.kt +++ b/app/src/main/java/chat/zekochat/composables/media/MediaPickerGateway.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.media +package chat.zekochat.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.peptide.R +import chat.zekochat.R @Composable fun MediaPickerGateway( diff --git a/app/src/main/java/chat/peptide/composables/profile/UserCard.kt b/app/src/main/java/chat/zekochat/composables/profile/UserCard.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/profile/UserCard.kt rename to app/src/main/java/chat/zekochat/composables/profile/UserCard.kt index 7fcc462b..97bdcaa7 100644 --- a/app/src/main/java/chat/peptide/composables/profile/UserCard.kt +++ b/app/src/main/java/chat/zekochat/composables/profile/UserCard.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.profile +package chat.zekochat.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.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 chat.zekochat.R +import chat.zekochat.api.internals.ResourceLocations +import chat.zekochat.api.internals.ULID +import chat.zekochat.api.internals.UserQR +import chat.zekochat.api.schemas.User +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.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/peptide/composables/screens/chat/AttachmentManager.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/AttachmentManager.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/screens/chat/AttachmentManager.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/AttachmentManager.kt index b11f84ea..4e71bbb7 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/AttachmentManager.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/AttachmentManager.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat +package chat.zekochat.composables.screens.chat import android.text.format.Formatter import androidx.compose.animation.AnimatedVisibility @@ -48,11 +48,11 @@ 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.peptide.R -import chat.peptide.api.routes.microservices.autumn.FileArgs -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.RemoteImage -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.api.routes.microservices.autumn.FileArgs +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.SquareButton import kotlinx.coroutines.launch import java.io.File diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/ChannelHeader.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/ChannelHeader.kt similarity index 91% rename from app/src/main/java/chat/peptide/composables/screens/chat/ChannelHeader.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/ChannelHeader.kt index 74a0e186..12e75d8a 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/ChannelHeader.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/ChannelHeader.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat +package chat.zekochat.composables.screens.chat import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row @@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Menu import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.Text @@ -22,10 +20,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.peptide.R -import chat.peptide.api.internals.ChannelUtils -import chat.peptide.api.schemas.Channel -import chat.peptide.api.schemas.ChannelType +import chat.zekochat.R +import chat.zekochat.api.internals.ChannelUtils +import chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.ChannelType @Composable fun ChannelHeader( diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/ChannelIcon.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/ChannelIcon.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/screens/chat/ChannelIcon.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/ChannelIcon.kt index 658d8ff5..d08cb956 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/ChannelIcon.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/ChannelIcon.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat +package chat.zekochat.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.peptide.R -import chat.peptide.api.schemas.ChannelType +import chat.zekochat.R +import chat.zekochat.api.schemas.ChannelType @Composable fun ChannelIcon(channelType: ChannelType, modifier: Modifier = Modifier) { diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/ChannelSheetHeader.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/ChannelSheetHeader.kt similarity index 89% rename from app/src/main/java/chat/peptide/composables/screens/chat/ChannelSheetHeader.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/ChannelSheetHeader.kt index 1d5fd0e1..65fd5461 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/ChannelSheetHeader.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/ChannelSheetHeader.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat +package chat.zekochat.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.peptide.api.PeptideAPI -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 +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.AutumnResource +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.User +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.composables.markdown.MarkdownTree +import chat.zekochat.ndk.AstNode +import chat.zekochat.ndk.Stendal @Composable fun ChannelSheetHeader( diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/ReplyManager.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/ReplyManager.kt similarity index 89% rename from app/src/main/java/chat/peptide/composables/screens/chat/ReplyManager.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/ReplyManager.kt index f0442b26..e55d8dff 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/ReplyManager.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/ReplyManager.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat +package chat.zekochat.composables.screens.chat import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Close import androidx.compose.material3.Icon import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme @@ -27,15 +25,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.peptide.R -import chat.peptide.api.PeptideAPI -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 +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.ULID +import chat.zekochat.api.routes.channel.SendMessageReply +import chat.zekochat.api.schemas.Message +import chat.zekochat.composables.chat.authorAvatarUrl +import chat.zekochat.composables.chat.authorColour +import chat.zekochat.composables.chat.authorName +import chat.zekochat.composables.generic.UserAvatar @Composable fun replyContentText(message: Message): String { diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/TypingIndicator.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/TypingIndicator.kt similarity index 92% rename from app/src/main/java/chat/peptide/composables/screens/chat/TypingIndicator.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/TypingIndicator.kt index 8c131472..88412350 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/TypingIndicator.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/TypingIndicator.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat +package chat.zekochat.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.peptide.R -import chat.peptide.activities.PeptideTweenFloat -import chat.peptide.activities.PeptideTweenInt -import chat.peptide.api.PeptideAPI -import chat.peptide.api.schemas.User -import chat.peptide.composables.generic.UserAvatar +import chat.zekochat.R +import chat.zekochat.activities.PeptideTweenFloat +import chat.zekochat.activities.PeptideTweenInt +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.User +import chat.zekochat.composables.generic.UserAvatar @Composable fun StackedUserAvatars( diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/atoms/RegularMessage.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/atoms/RegularMessage.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/screens/chat/atoms/RegularMessage.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/atoms/RegularMessage.kt index 20d27361..2f053159 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/atoms/RegularMessage.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/atoms/RegularMessage.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat.atoms +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.Message +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.api.settings.MessageReplyStyle +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.chat.Message +import chat.zekochat.internals.extensions.supportSwipeReply import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import kotlin.math.abs diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersList.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/discover/DiscoverServersList.kt similarity index 98% rename from app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersList.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/discover/DiscoverServersList.kt index 1fc58149..f66f8d63 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersList.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/discover/DiscoverServersList.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat.discover +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.routes.googlesheets.ServerData -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.googlesheets.ServerData +import chat.zekochat.composables.generic.SquareButton @Composable fun DiscoverServersList( diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersListViewModel.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/discover/DiscoverServersListViewModel.kt similarity index 90% rename from app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersListViewModel.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/discover/DiscoverServersListViewModel.kt index 73eb6128..36fe271e 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/discover/DiscoverServersListViewModel.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/discover/DiscoverServersListViewModel.kt @@ -1,15 +1,15 @@ -package chat.peptide.composables.screens.chat.discover +package chat.zekochat.composables.screens.chat.discover import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import chat.peptide.api.PeptideError -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 chat.zekochat.api.PeptideError +import chat.zekochat.api.routes.googlesheets.ServerData +import chat.zekochat.api.routes.googlesheets.ServerDataRepository +import chat.zekochat.api.routes.invites.fetchInviteByCode +import chat.zekochat.api.routes.invites.joinInviteByCode +import chat.zekochat.api.schemas.Invite +import chat.zekochat.api.schemas.InviteJoined +import chat.zekochat.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/peptide/composables/screens/chat/discover/ServerInviteDialog.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/discover/ServerInviteDialog.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteDialog.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/discover/ServerInviteDialog.kt index f326209d..a6946e1e 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteDialog.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/discover/ServerInviteDialog.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat.discover +package chat.zekochat.composables.screens.chat.discover import androidx.compose.foundation.Image import androidx.compose.foundation.border @@ -13,11 +13,9 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -30,14 +28,14 @@ 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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideError -import chat.peptide.api.schemas.Invite -import chat.peptide.composables.generic.IconPlaceholder -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.RemoteImage -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideError +import chat.zekochat.api.schemas.Invite +import chat.zekochat.composables.generic.IconPlaceholder +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.SquareButton @Composable fun ServerInviteDialog( diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteHandler.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/discover/ServerInviteHandler.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteHandler.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/discover/ServerInviteHandler.kt index bb0a1f28..e77d24d8 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/discover/ServerInviteHandler.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/discover/ServerInviteHandler.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat.discover +package chat.zekochat.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.peptide.api.PeptideError +import chat.zekochat.api.PeptideError import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/drawer/ChannelSideDrawer.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/drawer/ChannelSideDrawer.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/screens/chat/drawer/ChannelSideDrawer.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/drawer/ChannelSideDrawer.kt index 29ca4590..8a03c5f9 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/drawer/ChannelSideDrawer.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/drawer/ChannelSideDrawer.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat.drawer +package chat.zekochat.composables.screens.chat.drawer import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.Spring @@ -72,31 +72,31 @@ 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.peptide.R -import chat.peptide.api.PeptideAPI -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 -import chat.peptide.sheets.UserInfoSheet +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.CategorisedChannelList +import chat.zekochat.api.internals.ChannelUtils +import chat.zekochat.api.internals.DirectMessages +import chat.zekochat.api.schemas.Category +import chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.ServerFlags +import chat.zekochat.api.schemas.User +import chat.zekochat.api.schemas.has +import chat.zekochat.api.settings.GeoStateProvider +import chat.zekochat.api.settings.NotificationSettingsProvider +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.composables.generic.GroupIcon +import chat.zekochat.composables.generic.IconPlaceholder +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.composables.generic.presenceFromStatus +import chat.zekochat.composables.screens.chat.ChannelIcon +import chat.zekochat.composables.screens.chat.discover.DiscoverServersList +import chat.zekochat.screens.chat.ChatRouterDestination +import chat.zekochat.sheets.ChannelContextSheet +import chat.zekochat.sheets.UserInfoSheet @OptIn( ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class, diff --git a/app/src/main/java/chat/peptide/composables/screens/chat/molecules/JoinVoiceChannelButton.kt b/app/src/main/java/chat/zekochat/composables/screens/chat/molecules/JoinVoiceChannelButton.kt similarity index 89% rename from app/src/main/java/chat/peptide/composables/screens/chat/molecules/JoinVoiceChannelButton.kt rename to app/src/main/java/chat/zekochat/composables/screens/chat/molecules/JoinVoiceChannelButton.kt index a7dc5c87..1ea635bb 100644 --- a/app/src/main/java/chat/peptide/composables/screens/chat/molecules/JoinVoiceChannelButton.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/chat/molecules/JoinVoiceChannelButton.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.chat.molecules +package chat.zekochat.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.peptide.R -import chat.peptide.callbacks.Action -import chat.peptide.callbacks.ActionChannel -import chat.peptide.composables.screens.chat.StackedUserAvatars +import chat.zekochat.R +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.screens.chat.StackedUserAvatars import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/peptide/composables/screens/services/DiscoverView.kt b/app/src/main/java/chat/zekochat/composables/screens/services/DiscoverView.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/screens/services/DiscoverView.kt rename to app/src/main/java/chat/zekochat/composables/screens/services/DiscoverView.kt index f71310c1..5114e86c 100644 --- a/app/src/main/java/chat/peptide/composables/screens/services/DiscoverView.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/services/DiscoverView.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.services +package chat.zekochat.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.peptide.activities.InviteActivity -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideJson -import chat.peptide.api.buildUserAgent -import chat.peptide.api.internals.ThemeCompat +import chat.zekochat.activities.InviteActivity +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.buildUserAgent +import chat.zekochat.api.internals.ThemeCompat import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive diff --git a/app/src/main/java/chat/peptide/composables/screens/settings/AttributionItem.kt b/app/src/main/java/chat/zekochat/composables/screens/settings/AttributionItem.kt similarity index 85% rename from app/src/main/java/chat/peptide/composables/screens/settings/AttributionItem.kt rename to app/src/main/java/chat/zekochat/composables/screens/settings/AttributionItem.kt index 89ad9dbf..b0ff02e4 100644 --- a/app/src/main/java/chat/peptide/composables/screens/settings/AttributionItem.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/settings/AttributionItem.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.settings +package chat.zekochat.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.peptide.R -import chat.peptide.screens.about.Library +import chat.zekochat.R +import chat.zekochat.screens.about.Library @Composable fun AttributionItem(library: Library, onClick: () -> Unit) { diff --git a/app/src/main/java/chat/peptide/composables/screens/settings/ServerOverview.kt b/app/src/main/java/chat/zekochat/composables/screens/settings/ServerOverview.kt similarity index 93% rename from app/src/main/java/chat/peptide/composables/screens/settings/ServerOverview.kt rename to app/src/main/java/chat/zekochat/composables/screens/settings/ServerOverview.kt index 180b8aef..25f7ed12 100644 --- a/app/src/main/java/chat/peptide/composables/screens/settings/ServerOverview.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/settings/ServerOverview.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.settings +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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 +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.Server +import chat.zekochat.api.schemas.ServerFlags +import chat.zekochat.api.schemas.has +import chat.zekochat.composables.generic.IconPlaceholder +import chat.zekochat.composables.generic.RemoteImage @Composable fun ServerOverview(server: Server) { diff --git a/app/src/main/java/chat/peptide/composables/screens/settings/UserButtons.kt b/app/src/main/java/chat/zekochat/composables/screens/settings/UserButtons.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/screens/settings/UserButtons.kt rename to app/src/main/java/chat/zekochat/composables/screens/settings/UserButtons.kt index 99f84223..8c7b766e 100644 --- a/app/src/main/java/chat/peptide/composables/screens/settings/UserButtons.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/settings/UserButtons.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.settings +package chat.zekochat.composables.screens.settings import android.widget.Toast import androidx.compose.animation.animateContentSize @@ -28,16 +28,16 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import chat.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.routes.user.acceptFriendRequest -import chat.peptide.api.routes.user.friendUser -import chat.peptide.api.routes.user.openDM -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.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.user.acceptFriendRequest +import chat.zekochat.api.routes.user.friendUser +import chat.zekochat.api.routes.user.openDM +import chat.zekochat.api.routes.user.unfriendUser +import chat.zekochat.api.schemas.User +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.generic.SquareButton import kotlinx.coroutines.launch import logcat.LogPriority import logcat.asLog diff --git a/app/src/main/java/chat/peptide/composables/screens/settings/UserOverview.kt b/app/src/main/java/chat/zekochat/composables/screens/settings/UserOverview.kt similarity index 91% rename from app/src/main/java/chat/peptide/composables/screens/settings/UserOverview.kt rename to app/src/main/java/chat/zekochat/composables/screens/settings/UserOverview.kt index fb1da006..4ad48651 100644 --- a/app/src/main/java/chat/peptide/composables/screens/settings/UserOverview.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/settings/UserOverview.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.settings +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.SpecialUsers +import chat.zekochat.api.internals.ULID +import chat.zekochat.api.internals.solidColor +import chat.zekochat.api.routes.user.fetchUserProfile +import chat.zekochat.api.schemas.AutumnResource +import chat.zekochat.api.schemas.Profile +import chat.zekochat.api.schemas.User +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.composables.generic.presenceFromStatus import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking diff --git a/app/src/main/java/chat/peptide/composables/screens/settings/appearance/ColourChip.kt b/app/src/main/java/chat/zekochat/composables/screens/settings/appearance/ColourChip.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/screens/settings/appearance/ColourChip.kt rename to app/src/main/java/chat/zekochat/composables/screens/settings/appearance/ColourChip.kt index cf1cca80..33da9fe4 100644 --- a/app/src/main/java/chat/peptide/composables/screens/settings/appearance/ColourChip.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/settings/appearance/ColourChip.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.settings.appearance +package chat.zekochat.composables.screens.settings.appearance import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/app/src/main/java/chat/peptide/composables/screens/settings/appearance/CornerRadiusPicker.kt b/app/src/main/java/chat/zekochat/composables/screens/settings/appearance/CornerRadiusPicker.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/screens/settings/appearance/CornerRadiusPicker.kt rename to app/src/main/java/chat/zekochat/composables/screens/settings/appearance/CornerRadiusPicker.kt index 5445ec64..281ef696 100644 --- a/app/src/main/java/chat/peptide/composables/screens/settings/appearance/CornerRadiusPicker.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/settings/appearance/CornerRadiusPicker.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.settings.appearance +package chat.zekochat.composables.screens.settings.appearance import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -29,9 +29,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.peptide.R -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton enum class CornerRadiusPreset(val percentage: Int) { SHARP(0), diff --git a/app/src/main/java/chat/peptide/composables/screens/splash/DisconnectedScreen.kt b/app/src/main/java/chat/zekochat/composables/screens/splash/DisconnectedScreen.kt similarity index 92% rename from app/src/main/java/chat/peptide/composables/screens/splash/DisconnectedScreen.kt rename to app/src/main/java/chat/zekochat/composables/screens/splash/DisconnectedScreen.kt index c846eb62..98263c0a 100644 --- a/app/src/main/java/chat/peptide/composables/screens/splash/DisconnectedScreen.kt +++ b/app/src/main/java/chat/zekochat/composables/screens/splash/DisconnectedScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.screens.splash +package chat.zekochat.composables.screens.splash import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -16,8 +15,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.peptide.R -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.composables.generic.SquareButton @Composable fun DisconnectedScreen(onRetry: () -> Unit) { diff --git a/app/src/main/java/chat/peptide/composables/settings/SettingsHintBanner.kt b/app/src/main/java/chat/zekochat/composables/settings/SettingsHintBanner.kt similarity index 94% rename from app/src/main/java/chat/peptide/composables/settings/SettingsHintBanner.kt rename to app/src/main/java/chat/zekochat/composables/settings/SettingsHintBanner.kt index d9c00b7e..b21217c8 100644 --- a/app/src/main/java/chat/peptide/composables/settings/SettingsHintBanner.kt +++ b/app/src/main/java/chat/zekochat/composables/settings/SettingsHintBanner.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.settings +package chat.zekochat.composables.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn -import androidx.compose.material3.Button import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ProvideTextStyle @@ -19,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.peptide.composables.generic.SquareButton +import chat.zekochat.composables.generic.SquareButton @Composable fun SettingsHintBanner( diff --git a/app/src/main/java/chat/peptide/composables/settings/profile/StatusPicker.kt b/app/src/main/java/chat/zekochat/composables/settings/profile/StatusPicker.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/settings/profile/StatusPicker.kt rename to app/src/main/java/chat/zekochat/composables/settings/profile/StatusPicker.kt index 06291f0d..11e9afb8 100644 --- a/app/src/main/java/chat/peptide/composables/settings/profile/StatusPicker.kt +++ b/app/src/main/java/chat/zekochat/composables/settings/profile/StatusPicker.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.settings.profile +package chat.zekochat.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.peptide.R -import chat.peptide.composables.generic.Presence -import chat.peptide.composables.generic.presenceColour +import chat.zekochat.R +import chat.zekochat.composables.generic.Presence +import chat.zekochat.composables.generic.presenceColour fun Presence.stringResource(): Int { return when (this) { diff --git a/app/src/main/java/chat/peptide/composables/settings/sessions/SessionItem.kt b/app/src/main/java/chat/zekochat/composables/settings/sessions/SessionItem.kt similarity index 92% rename from app/src/main/java/chat/peptide/composables/settings/sessions/SessionItem.kt rename to app/src/main/java/chat/zekochat/composables/settings/sessions/SessionItem.kt index a8775627..176a14c6 100644 --- a/app/src/main/java/chat/peptide/composables/settings/sessions/SessionItem.kt +++ b/app/src/main/java/chat/zekochat/composables/settings/sessions/SessionItem.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.settings.sessions +package chat.zekochat.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.peptide.R -import chat.peptide.api.internals.ULID -import chat.peptide.api.schemas.Session +import chat.zekochat.R +import chat.zekochat.api.internals.ULID +import chat.zekochat.api.schemas.Session @Composable fun SessionItem( diff --git a/app/src/main/java/chat/peptide/composables/sheets/SheetSelection.kt b/app/src/main/java/chat/zekochat/composables/sheets/SheetSelection.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/sheets/SheetSelection.kt rename to app/src/main/java/chat/zekochat/composables/sheets/SheetSelection.kt index 5545e0ef..23bbcec5 100644 --- a/app/src/main/java/chat/peptide/composables/sheets/SheetSelection.kt +++ b/app/src/main/java/chat/zekochat/composables/sheets/SheetSelection.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.sheets +package chat.zekochat.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.peptide.R +import chat.zekochat.R /** * Sheet selection. Used when a modal sheet prompts a choice out of x options. diff --git a/app/src/main/java/chat/peptide/composables/sheets/SheetTile.kt b/app/src/main/java/chat/zekochat/composables/sheets/SheetTile.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/sheets/SheetTile.kt rename to app/src/main/java/chat/zekochat/composables/sheets/SheetTile.kt index f9b39c71..c5274885 100644 --- a/app/src/main/java/chat/peptide/composables/sheets/SheetTile.kt +++ b/app/src/main/java/chat/zekochat/composables/sheets/SheetTile.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.sheets +package chat.zekochat.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.peptide.api.internals.solidColor +import chat.zekochat.api.internals.solidColor @Composable fun SheetTile( diff --git a/app/src/main/java/chat/peptide/composables/skeletons/MessageSkeleton.kt b/app/src/main/java/chat/zekochat/composables/skeletons/MessageSkeleton.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/skeletons/MessageSkeleton.kt rename to app/src/main/java/chat/zekochat/composables/skeletons/MessageSkeleton.kt index 4aea113b..151ba1e0 100644 --- a/app/src/main/java/chat/peptide/composables/skeletons/MessageSkeleton.kt +++ b/app/src/main/java/chat/zekochat/composables/skeletons/MessageSkeleton.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.skeletons +package chat.zekochat.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.peptide.api.settings.LoadedSettings +import chat.zekochat.api.settings.LoadedSettings enum class MessageSkeletonVariant { One, diff --git a/app/src/main/java/chat/peptide/composables/skeletons/SkeletonGlobals.kt b/app/src/main/java/chat/zekochat/composables/skeletons/SkeletonGlobals.kt similarity index 74% rename from app/src/main/java/chat/peptide/composables/skeletons/SkeletonGlobals.kt rename to app/src/main/java/chat/zekochat/composables/skeletons/SkeletonGlobals.kt index b3510478..760113e5 100644 --- a/app/src/main/java/chat/peptide/composables/skeletons/SkeletonGlobals.kt +++ b/app/src/main/java/chat/zekochat/composables/skeletons/SkeletonGlobals.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.skeletons +package chat.zekochat.composables.skeletons import androidx.compose.material3.LocalContentColor import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/peptide/composables/skeletons/UserOverviewSkeleton.kt b/app/src/main/java/chat/zekochat/composables/skeletons/UserOverviewSkeleton.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/skeletons/UserOverviewSkeleton.kt rename to app/src/main/java/chat/zekochat/composables/skeletons/UserOverviewSkeleton.kt index 3b272079..3a2c3c14 100644 --- a/app/src/main/java/chat/peptide/composables/skeletons/UserOverviewSkeleton.kt +++ b/app/src/main/java/chat/zekochat/composables/skeletons/UserOverviewSkeleton.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.skeletons +package chat.zekochat.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.peptide.api.settings.LoadedSettings +import chat.zekochat.api.settings.LoadedSettings import com.valentinilk.shimmer.shimmer @Composable diff --git a/app/src/main/java/chat/peptide/composables/utils/ConditionalConsumptionPointerInput.kt b/app/src/main/java/chat/zekochat/composables/utils/ConditionalConsumptionPointerInput.kt similarity index 99% rename from app/src/main/java/chat/peptide/composables/utils/ConditionalConsumptionPointerInput.kt rename to app/src/main/java/chat/zekochat/composables/utils/ConditionalConsumptionPointerInput.kt index 7f1cb39c..baf53ba9 100644 --- a/app/src/main/java/chat/peptide/composables/utils/ConditionalConsumptionPointerInput.kt +++ b/app/src/main/java/chat/zekochat/composables/utils/ConditionalConsumptionPointerInput.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.utils +package chat.zekochat.composables.utils import androidx.compose.foundation.gestures.GestureCancellationException import androidx.compose.foundation.gestures.PressGestureScope diff --git a/app/src/main/java/chat/peptide/composables/utils/SizeMeasured.kt b/app/src/main/java/chat/zekochat/composables/utils/SizeMeasured.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/utils/SizeMeasured.kt rename to app/src/main/java/chat/zekochat/composables/utils/SizeMeasured.kt index 41d1fb9c..ec6b37b0 100644 --- a/app/src/main/java/chat/peptide/composables/utils/SizeMeasured.kt +++ b/app/src/main/java/chat/zekochat/composables/utils/SizeMeasured.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.utils +package chat.zekochat.composables.utils import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/app/src/main/java/chat/peptide/composables/vectorassets/CreateServer.kt b/app/src/main/java/chat/zekochat/composables/vectorassets/CreateServer.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/vectorassets/CreateServer.kt rename to app/src/main/java/chat/zekochat/composables/vectorassets/CreateServer.kt index c27be546..e604efaa 100644 --- a/app/src/main/java/chat/peptide/composables/vectorassets/CreateServer.kt +++ b/app/src/main/java/chat/zekochat/composables/vectorassets/CreateServer.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.vectorassets +package chat.zekochat.composables.vectorassets import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/peptide/composables/vectorassets/GeoGateUX.kt b/app/src/main/java/chat/zekochat/composables/vectorassets/GeoGateUX.kt similarity index 98% rename from app/src/main/java/chat/peptide/composables/vectorassets/GeoGateUX.kt rename to app/src/main/java/chat/zekochat/composables/vectorassets/GeoGateUX.kt index 52a2ba2a..5f712bed 100644 --- a/app/src/main/java/chat/peptide/composables/vectorassets/GeoGateUX.kt +++ b/app/src/main/java/chat/zekochat/composables/vectorassets/GeoGateUX.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.vectorassets +package chat.zekochat.composables.vectorassets import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/peptide/composables/vectorassets/JoinServer.kt b/app/src/main/java/chat/zekochat/composables/vectorassets/JoinServer.kt similarity index 95% rename from app/src/main/java/chat/peptide/composables/vectorassets/JoinServer.kt rename to app/src/main/java/chat/zekochat/composables/vectorassets/JoinServer.kt index fc18f5be..f0842bcd 100644 --- a/app/src/main/java/chat/peptide/composables/vectorassets/JoinServer.kt +++ b/app/src/main/java/chat/zekochat/composables/vectorassets/JoinServer.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.vectorassets +package chat.zekochat.composables.vectorassets import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/chat/peptide/composables/vectorassets/NewServer.kt b/app/src/main/java/chat/zekochat/composables/vectorassets/NewServer.kt similarity index 99% rename from app/src/main/java/chat/peptide/composables/vectorassets/NewServer.kt rename to app/src/main/java/chat/zekochat/composables/vectorassets/NewServer.kt index 56014ee0..e5ce1711 100644 --- a/app/src/main/java/chat/peptide/composables/vectorassets/NewServer.kt +++ b/app/src/main/java/chat/zekochat/composables/vectorassets/NewServer.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.vectorassets +package chat.zekochat.composables.vectorassets import androidx.compose.foundation.Image import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/chat/peptide/composables/vectorassets/PeptideTagIntro.kt b/app/src/main/java/chat/zekochat/composables/vectorassets/PeptideTagIntro.kt similarity index 99% rename from app/src/main/java/chat/peptide/composables/vectorassets/PeptideTagIntro.kt rename to app/src/main/java/chat/zekochat/composables/vectorassets/PeptideTagIntro.kt index 2694ae4a..885ea139 100644 --- a/app/src/main/java/chat/peptide/composables/vectorassets/PeptideTagIntro.kt +++ b/app/src/main/java/chat/zekochat/composables/vectorassets/PeptideTagIntro.kt @@ -1,4 +1,4 @@ -package chat.peptide.components.vectorassets +package chat.zekochat.components.vectorassets import androidx.compose.foundation.Image import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/chat/peptide/composables/vectorassets/SwipeToReplySpark.kt b/app/src/main/java/chat/zekochat/composables/vectorassets/SwipeToReplySpark.kt similarity index 99% rename from app/src/main/java/chat/peptide/composables/vectorassets/SwipeToReplySpark.kt rename to app/src/main/java/chat/zekochat/composables/vectorassets/SwipeToReplySpark.kt index 988b16d9..1279d6bf 100644 --- a/app/src/main/java/chat/peptide/composables/vectorassets/SwipeToReplySpark.kt +++ b/app/src/main/java/chat/zekochat/composables/vectorassets/SwipeToReplySpark.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.vectorassets +package chat.zekochat.composables.vectorassets import androidx.compose.foundation.Image import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/chat/peptide/composables/voice/VoicePermissionSwitch.kt b/app/src/main/java/chat/zekochat/composables/voice/VoicePermissionSwitch.kt similarity index 97% rename from app/src/main/java/chat/peptide/composables/voice/VoicePermissionSwitch.kt rename to app/src/main/java/chat/zekochat/composables/voice/VoicePermissionSwitch.kt index 18618f63..fb702cd5 100644 --- a/app/src/main/java/chat/peptide/composables/voice/VoicePermissionSwitch.kt +++ b/app/src/main/java/chat/zekochat/composables/voice/VoicePermissionSwitch.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.voice +package chat.zekochat.composables.voice import android.Manifest import android.content.Intent @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -29,8 +28,8 @@ 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.peptide.R -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.composables.generic.SquareButton 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/peptide/composables/voice/VoiceSheet.kt b/app/src/main/java/chat/zekochat/composables/voice/VoiceSheet.kt similarity index 96% rename from app/src/main/java/chat/peptide/composables/voice/VoiceSheet.kt rename to app/src/main/java/chat/zekochat/composables/voice/VoiceSheet.kt index d7abb126..1bd46250 100644 --- a/app/src/main/java/chat/peptide/composables/voice/VoiceSheet.kt +++ b/app/src/main/java/chat/zekochat/composables/voice/VoiceSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.composables.voice +package chat.zekochat.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.peptide.R -import chat.peptide.api.routes.misc.getRootRoute -import chat.peptide.api.routes.voice.joinCall +import chat.zekochat.R +import chat.zekochat.api.routes.misc.getRootRoute +import chat.zekochat.api.routes.voice.joinCall import logcat.LogPriority import logcat.asLog import logcat.logcat diff --git a/app/src/main/java/chat/peptide/di/GoogleSheetsModule.kt b/app/src/main/java/chat/zekochat/di/GoogleSheetsModule.kt similarity index 85% rename from app/src/main/java/chat/peptide/di/GoogleSheetsModule.kt rename to app/src/main/java/chat/zekochat/di/GoogleSheetsModule.kt index e2613c41..fad0f3e5 100644 --- a/app/src/main/java/chat/peptide/di/GoogleSheetsModule.kt +++ b/app/src/main/java/chat/zekochat/di/GoogleSheetsModule.kt @@ -1,6 +1,6 @@ -package chat.peptide.di +package chat.zekochat.di -import chat.peptide.api.routes.googlesheets.ServerDataRepository +import chat.zekochat.api.routes.googlesheets.ServerDataRepository import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/chat/peptide/dialogs/NotificationRationaleDialog.kt b/app/src/main/java/chat/zekochat/dialogs/NotificationRationaleDialog.kt similarity index 93% rename from app/src/main/java/chat/peptide/dialogs/NotificationRationaleDialog.kt rename to app/src/main/java/chat/zekochat/dialogs/NotificationRationaleDialog.kt index 14e57127..81b6eaac 100644 --- a/app/src/main/java/chat/peptide/dialogs/NotificationRationaleDialog.kt +++ b/app/src/main/java/chat/zekochat/dialogs/NotificationRationaleDialog.kt @@ -1,4 +1,4 @@ -package chat.peptide.dialogs +package chat.zekochat.dialogs import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -17,10 +17,10 @@ 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.peptide.BuildConfig -import chat.peptide.R -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.BuildConfig +import chat.zekochat.R +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton @Composable fun NotificationRationaleDialog( diff --git a/app/src/main/java/chat/peptide/fragments/ChangelogBottomSheetFragment.kt b/app/src/main/java/chat/zekochat/fragments/ChangelogBottomSheetFragment.kt similarity index 97% rename from app/src/main/java/chat/peptide/fragments/ChangelogBottomSheetFragment.kt rename to app/src/main/java/chat/zekochat/fragments/ChangelogBottomSheetFragment.kt index 66bddc88..c0378315 100644 --- a/app/src/main/java/chat/peptide/fragments/ChangelogBottomSheetFragment.kt +++ b/app/src/main/java/chat/zekochat/fragments/ChangelogBottomSheetFragment.kt @@ -1,4 +1,4 @@ -package chat.peptide.fragments +package chat.zekochat.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.peptide.R -import chat.peptide.activities.InviteActivity -import chat.peptide.api.PeptideAPI -import chat.peptide.databinding.SheetChangelogBinding +import chat.zekochat.R +import chat.zekochat.activities.InviteActivity +import chat.zekochat.api.PeptideAPI +import chat.zekochat.databinding.SheetChangelogBinding import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.color.MaterialColors diff --git a/app/src/main/java/chat/peptide/internals/Autocomplete.kt b/app/src/main/java/chat/zekochat/internals/Autocomplete.kt similarity index 95% rename from app/src/main/java/chat/peptide/internals/Autocomplete.kt rename to app/src/main/java/chat/zekochat/internals/Autocomplete.kt index 5f72796d..9bb1b80a 100644 --- a/app/src/main/java/chat/peptide/internals/Autocomplete.kt +++ b/app/src/main/java/chat/zekochat/internals/Autocomplete.kt @@ -1,12 +1,12 @@ -package chat.peptide.internals +package chat.zekochat.internals -import chat.peptide.api.PeptideAPI -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 +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.PermissionBit +import chat.zekochat.api.internals.Roles +import chat.zekochat.api.internals.has +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.settings.FeatureFlags +import chat.zekochat.composables.chat.AutocompleteSuggestion object Autocomplete { private val emojiImpl = EmojiImpl() diff --git a/app/src/main/java/chat/peptide/internals/Changelogs.kt b/app/src/main/java/chat/zekochat/internals/Changelogs.kt similarity index 93% rename from app/src/main/java/chat/peptide/internals/Changelogs.kt rename to app/src/main/java/chat/zekochat/internals/Changelogs.kt index b7f36740..57810cb6 100644 --- a/app/src/main/java/chat/peptide/internals/Changelogs.kt +++ b/app/src/main/java/chat/zekochat/internals/Changelogs.kt @@ -1,11 +1,11 @@ -package chat.peptide.internals +package chat.zekochat.internals import android.content.Context -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideHttp -import chat.peptide.api.PeptideJson -import chat.peptide.internals.IndexHolder.cachedIndex -import chat.peptide.persistence.KVStorage +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideHttp +import chat.zekochat.api.PeptideJson +import chat.zekochat.internals.IndexHolder.cachedIndex +import chat.zekochat.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/peptide/internals/EmojiImpl.kt b/app/src/main/java/chat/zekochat/internals/EmojiImpl.kt similarity index 97% rename from app/src/main/java/chat/peptide/internals/EmojiImpl.kt rename to app/src/main/java/chat/zekochat/internals/EmojiImpl.kt index 9da69b67..a21b3fac 100644 --- a/app/src/main/java/chat/peptide/internals/EmojiImpl.kt +++ b/app/src/main/java/chat/zekochat/internals/EmojiImpl.kt @@ -1,11 +1,11 @@ -package chat.peptide.internals +package chat.zekochat.internals import android.content.Context -import chat.peptide.R -import chat.peptide.PeptideApplication -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideJson -import chat.peptide.api.schemas.Server +import chat.zekochat.R +import chat.zekochat.PeptideApplication +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideJson +import chat.zekochat.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.peptide.api.schemas.Emoji) : EmojiPickerItem() + data class ServerEmote(val emote: chat.zekochat.api.schemas.Emoji) : EmojiPickerItem() } class EmojiImpl { diff --git a/app/src/main/java/chat/peptide/internals/Platform.kt b/app/src/main/java/chat/zekochat/internals/Platform.kt similarity index 83% rename from app/src/main/java/chat/peptide/internals/Platform.kt rename to app/src/main/java/chat/zekochat/internals/Platform.kt index b62a493e..1d080fdf 100644 --- a/app/src/main/java/chat/peptide/internals/Platform.kt +++ b/app/src/main/java/chat/zekochat/internals/Platform.kt @@ -1,4 +1,4 @@ -package chat.peptide.internals +package chat.zekochat.internals import android.os.Build diff --git a/app/src/main/java/chat/peptide/internals/TailwindColourScheme.kt b/app/src/main/java/chat/zekochat/internals/TailwindColourScheme.kt similarity index 99% rename from app/src/main/java/chat/peptide/internals/TailwindColourScheme.kt rename to app/src/main/java/chat/zekochat/internals/TailwindColourScheme.kt index c4d2b4e7..2d90095a 100644 --- a/app/src/main/java/chat/peptide/internals/TailwindColourScheme.kt +++ b/app/src/main/java/chat/zekochat/internals/TailwindColourScheme.kt @@ -1,4 +1,4 @@ -package chat.peptide.internals +package chat.zekochat.internals import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/chat/peptide/internals/Timestamp.kt b/app/src/main/java/chat/zekochat/internals/Timestamp.kt similarity index 98% rename from app/src/main/java/chat/peptide/internals/Timestamp.kt rename to app/src/main/java/chat/zekochat/internals/Timestamp.kt index c90c5216..0529ffef 100644 --- a/app/src/main/java/chat/peptide/internals/Timestamp.kt +++ b/app/src/main/java/chat/zekochat/internals/Timestamp.kt @@ -1,4 +1,4 @@ -package chat.peptide.internals +package chat.zekochat.internals import android.text.format.DateUtils import android.util.Log diff --git a/app/src/main/java/chat/peptide/internals/extensions/Defaults.kt b/app/src/main/java/chat/zekochat/internals/extensions/Defaults.kt similarity index 87% rename from app/src/main/java/chat/peptide/internals/extensions/Defaults.kt rename to app/src/main/java/chat/zekochat/internals/extensions/Defaults.kt index 56340619..a32a7347 100644 --- a/app/src/main/java/chat/peptide/internals/extensions/Defaults.kt +++ b/app/src/main/java/chat/zekochat/internals/extensions/Defaults.kt @@ -1,4 +1,4 @@ -package chat.peptide.internals.extensions +package chat.zekochat.internals.extensions import androidx.compose.material3.ListItemColors import androidx.compose.material3.ListItemDefaults diff --git a/app/src/main/java/chat/peptide/internals/extensions/Input.kt b/app/src/main/java/chat/zekochat/internals/extensions/Input.kt similarity index 95% rename from app/src/main/java/chat/peptide/internals/extensions/Input.kt rename to app/src/main/java/chat/zekochat/internals/extensions/Input.kt index f5f03ec8..339de116 100644 --- a/app/src/main/java/chat/peptide/internals/extensions/Input.kt +++ b/app/src/main/java/chat/zekochat/internals/extensions/Input.kt @@ -1,4 +1,4 @@ -package chat.peptide.internals.extensions +package chat.zekochat.internals.extensions import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown diff --git a/app/src/main/java/chat/peptide/internals/extensions/Insets.kt b/app/src/main/java/chat/zekochat/internals/extensions/Insets.kt similarity index 54% rename from app/src/main/java/chat/peptide/internals/extensions/Insets.kt rename to app/src/main/java/chat/zekochat/internals/extensions/Insets.kt index 420c6bf8..0cfce73a 100644 --- a/app/src/main/java/chat/peptide/internals/extensions/Insets.kt +++ b/app/src/main/java/chat/zekochat/internals/extensions/Insets.kt @@ -1,10 +1,6 @@ -package chat.peptide.internals.extensions +package chat.zekochat.internals.extensions import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.exclude -import androidx.compose.foundation.layout.navigationBars -import androidx.compose.material3.BottomSheetDefaults -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable import androidx.compose.runtime.NonRestartableComposable diff --git a/app/src/main/java/chat/peptide/internals/extensions/Locales.kt b/app/src/main/java/chat/zekochat/internals/extensions/Locales.kt similarity index 94% rename from app/src/main/java/chat/peptide/internals/extensions/Locales.kt rename to app/src/main/java/chat/zekochat/internals/extensions/Locales.kt index 1d42d64c..f9df9435 100644 --- a/app/src/main/java/chat/peptide/internals/extensions/Locales.kt +++ b/app/src/main/java/chat/zekochat/internals/extensions/Locales.kt @@ -1,4 +1,4 @@ -package chat.peptide.internals.extensions +package chat.zekochat.internals.extensions import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/chat/peptide/internals/extensions/Permissions.kt b/app/src/main/java/chat/zekochat/internals/extensions/Permissions.kt similarity index 90% rename from app/src/main/java/chat/peptide/internals/extensions/Permissions.kt rename to app/src/main/java/chat/zekochat/internals/extensions/Permissions.kt index 20be373c..d7ec08df 100644 --- a/app/src/main/java/chat/peptide/internals/extensions/Permissions.kt +++ b/app/src/main/java/chat/zekochat/internals/extensions/Permissions.kt @@ -1,12 +1,12 @@ -package chat.peptide.internals.extensions +package chat.zekochat.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.peptide.api.PeptideAPI -import chat.peptide.api.internals.Roles +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.Roles @Composable fun rememberChannelPermissions(channelId: String, key1: Any = Unit): MutableLongState { diff --git a/app/src/main/java/chat/peptide/internals/text/Gigamoji.kt b/app/src/main/java/chat/zekochat/internals/text/Gigamoji.kt similarity index 96% rename from app/src/main/java/chat/peptide/internals/text/Gigamoji.kt rename to app/src/main/java/chat/zekochat/internals/text/Gigamoji.kt index b055c1d1..18d18abe 100644 --- a/app/src/main/java/chat/peptide/internals/text/Gigamoji.kt +++ b/app/src/main/java/chat/zekochat/internals/text/Gigamoji.kt @@ -1,4 +1,4 @@ -package chat.peptide.internals.text +package chat.zekochat.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/peptide/internals/text/MessageProcessor.kt b/app/src/main/java/chat/zekochat/internals/text/MessageProcessor.kt similarity index 94% rename from app/src/main/java/chat/peptide/internals/text/MessageProcessor.kt rename to app/src/main/java/chat/zekochat/internals/text/MessageProcessor.kt index f1270413..87fac35c 100644 --- a/app/src/main/java/chat/peptide/internals/text/MessageProcessor.kt +++ b/app/src/main/java/chat/zekochat/internals/text/MessageProcessor.kt @@ -1,8 +1,8 @@ -package chat.peptide.internals.text +package chat.zekochat.internals.text -import chat.peptide.api.PeptideAPI -import chat.peptide.api.schemas.ChannelType -import chat.peptide.internals.EmojiImpl +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.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/peptide/markdown/jbm/FallbackRenderer.kt b/app/src/main/java/chat/zekochat/markdown/jbm/FallbackRenderer.kt similarity index 95% rename from app/src/main/java/chat/peptide/markdown/jbm/FallbackRenderer.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/FallbackRenderer.kt index b88c6c7e..a1a77043 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/FallbackRenderer.kt +++ b/app/src/main/java/chat/zekochat/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.peptide.activities.InviteActivity -import chat.peptide.api.PeptideAPI -import chat.peptide.api.internals.ResourceLocations -import chat.peptide.markdown.jbm.LocalJBMarkdownTreeState -import chat.peptide.markdown.jbm.MentionResolver -import chat.peptide.markdown.jbm.asHexString +import chat.zekochat.activities.InviteActivity +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.ResourceLocations +import chat.zekochat.markdown.jbm.LocalJBMarkdownTreeState +import chat.zekochat.markdown.jbm.MentionResolver +import chat.zekochat.markdown.jbm.asHexString @SuppressLint("SetJavaScriptEnabled") @Composable diff --git a/app/src/main/java/chat/peptide/markdown/jbm/JBMApi.kt b/app/src/main/java/chat/zekochat/markdown/jbm/JBMApi.kt similarity index 92% rename from app/src/main/java/chat/peptide/markdown/jbm/JBMApi.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/JBMApi.kt index 2c7ae10b..a4801a5e 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/JBMApi.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/JBMApi.kt @@ -1,4 +1,4 @@ -package chat.peptide.markdown.jbm +package chat.zekochat.markdown.jbm import org.intellij.markdown.ast.ASTNode import org.intellij.markdown.parser.MarkdownParser diff --git a/app/src/main/java/chat/peptide/markdown/jbm/JBMRenderer.kt b/app/src/main/java/chat/zekochat/markdown/jbm/JBMRenderer.kt similarity index 98% rename from app/src/main/java/chat/peptide/markdown/jbm/JBMRenderer.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/JBMRenderer.kt index dceba08b..5fd02abb 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/JBMRenderer.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/JBMRenderer.kt @@ -1,4 +1,4 @@ -package chat.peptide.markdown.jbm +package chat.zekochat.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.peptide.R -import chat.peptide.activities.InviteActivity -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.activities.InviteActivity +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.BrushCompat +import chat.zekochat.api.internals.InstancedBrushCompat +import chat.zekochat.api.internals.isUlid +import chat.zekochat.api.routes.custom.fetchEmoji +import chat.zekochat.api.schemas.isInviteUri +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.composables.markdown.Annotations +import chat.zekochat.composables.utils.detectTapGesturesConditionalConsume +import chat.zekochat.ui.theme.FragmentMono +import chat.zekochat.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/peptide/markdown/jbm/KatexRenderer.kt b/app/src/main/java/chat/zekochat/markdown/jbm/KatexRenderer.kt similarity index 97% rename from app/src/main/java/chat/peptide/markdown/jbm/KatexRenderer.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/KatexRenderer.kt index f303d13a..76265890 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/KatexRenderer.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/KatexRenderer.kt @@ -1,4 +1,4 @@ -package chat.peptide.markdown.jbm +package chat.zekochat.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.peptide.activities.InviteActivity -import chat.peptide.api.PeptideAPI +import chat.zekochat.activities.InviteActivity +import chat.zekochat.api.PeptideAPI internal fun Color.asHexString(includeAlphaComponent: Boolean = true): String { val argb = toArgb() diff --git a/app/src/main/java/chat/peptide/markdown/jbm/MentionResolver.kt b/app/src/main/java/chat/zekochat/markdown/jbm/MentionResolver.kt similarity index 93% rename from app/src/main/java/chat/peptide/markdown/jbm/MentionResolver.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/MentionResolver.kt index a5958bad..05a8b093 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/MentionResolver.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/MentionResolver.kt @@ -1,6 +1,6 @@ -package chat.peptide.markdown.jbm +package chat.zekochat.markdown.jbm -import chat.peptide.api.PeptideAPI +import chat.zekochat.api.PeptideAPI object MentionResolver { /** diff --git a/app/src/main/java/chat/peptide/markdown/jbm/RSMElementTypes.kt b/app/src/main/java/chat/zekochat/markdown/jbm/RSMElementTypes.kt similarity index 94% rename from app/src/main/java/chat/peptide/markdown/jbm/RSMElementTypes.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/RSMElementTypes.kt index ddd02ffe..217f16da 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/RSMElementTypes.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/RSMElementTypes.kt @@ -1,4 +1,4 @@ -package chat.peptide.markdown.jbm +package chat.zekochat.markdown.jbm import org.intellij.markdown.IElementType import org.intellij.markdown.MarkdownElementType diff --git a/app/src/main/java/chat/peptide/markdown/jbm/RSMFlavourDescriptor.kt b/app/src/main/java/chat/zekochat/markdown/jbm/RSMFlavourDescriptor.kt similarity index 82% rename from app/src/main/java/chat/peptide/markdown/jbm/RSMFlavourDescriptor.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/RSMFlavourDescriptor.kt index 3a77ea8a..2590db24 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/RSMFlavourDescriptor.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/RSMFlavourDescriptor.kt @@ -1,10 +1,10 @@ -package chat.peptide.markdown.jbm +package chat.zekochat.markdown.jbm -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 chat.zekochat.markdown.jbm.sequentialparsers.ChannelMentionParser +import chat.zekochat.markdown.jbm.sequentialparsers.CustomEmoteParser +import chat.zekochat.markdown.jbm.sequentialparsers.MassMentionParser +import chat.zekochat.markdown.jbm.sequentialparsers.RoleMentionParser +import chat.zekochat.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/peptide/markdown/jbm/sequentialparsers/ChannelMentionParser.kt b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/ChannelMentionParser.kt similarity index 93% rename from app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/ChannelMentionParser.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/ChannelMentionParser.kt index c878f80d..c75ba68c 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/ChannelMentionParser.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/ChannelMentionParser.kt @@ -1,6 +1,6 @@ -package chat.peptide.markdown.jbm.sequentialparsers +package chat.zekochat.markdown.jbm.sequentialparsers -import chat.peptide.markdown.jbm.RSMElementTypes +import chat.zekochat.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/peptide/markdown/jbm/sequentialparsers/CustomEmoteParser.kt b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/CustomEmoteParser.kt similarity index 94% rename from app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/CustomEmoteParser.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/CustomEmoteParser.kt index 00b88e05..11701e0a 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/CustomEmoteParser.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/CustomEmoteParser.kt @@ -1,6 +1,6 @@ -package chat.peptide.markdown.jbm.sequentialparsers +package chat.zekochat.markdown.jbm.sequentialparsers -import chat.peptide.markdown.jbm.RSMElementTypes +import chat.zekochat.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/peptide/markdown/jbm/sequentialparsers/MassMentionParser.kt b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/MassMentionParser.kt similarity index 91% rename from app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/MassMentionParser.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/MassMentionParser.kt index 29c7b5c3..3c8baf44 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/MassMentionParser.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/MassMentionParser.kt @@ -1,4 +1,4 @@ -package chat.peptide.markdown.jbm.sequentialparsers +package chat.zekochat.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/peptide/markdown/jbm/sequentialparsers/RoleMentionParser.kt b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/RoleMentionParser.kt similarity index 93% rename from app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/RoleMentionParser.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/RoleMentionParser.kt index e9d7c908..4a3b5e1f 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/RoleMentionParser.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/RoleMentionParser.kt @@ -1,6 +1,6 @@ -package chat.peptide.markdown.jbm.sequentialparsers +package chat.zekochat.markdown.jbm.sequentialparsers -import chat.peptide.markdown.jbm.RSMElementTypes +import chat.zekochat.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/peptide/markdown/jbm/sequentialparsers/UserMentionParser.kt b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/UserMentionParser.kt similarity index 93% rename from app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/UserMentionParser.kt rename to app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/UserMentionParser.kt index f92d95bc..0b5b377b 100644 --- a/app/src/main/java/chat/peptide/markdown/jbm/sequentialparsers/UserMentionParser.kt +++ b/app/src/main/java/chat/zekochat/markdown/jbm/sequentialparsers/UserMentionParser.kt @@ -1,6 +1,6 @@ -package chat.peptide.markdown.jbm.sequentialparsers +package chat.zekochat.markdown.jbm.sequentialparsers -import chat.peptide.markdown.jbm.RSMElementTypes +import chat.zekochat.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/peptide/material/EasingTokens.kt b/app/src/main/java/chat/zekochat/material/EasingTokens.kt similarity index 89% rename from app/src/main/java/chat/peptide/material/EasingTokens.kt rename to app/src/main/java/chat/zekochat/material/EasingTokens.kt index 5884c5ae..10f35824 100644 --- a/app/src/main/java/chat/peptide/material/EasingTokens.kt +++ b/app/src/main/java/chat/zekochat/material/EasingTokens.kt @@ -1,4 +1,4 @@ -package chat.peptide.material +package chat.zekochat.material import androidx.compose.animation.core.CubicBezierEasing diff --git a/app/src/main/java/chat/peptide/ndk/NativeLibraries.kt b/app/src/main/java/chat/zekochat/ndk/NativeLibraries.kt similarity index 91% rename from app/src/main/java/chat/peptide/ndk/NativeLibraries.kt rename to app/src/main/java/chat/zekochat/ndk/NativeLibraries.kt index 29fcf6e8..49dae3fe 100644 --- a/app/src/main/java/chat/peptide/ndk/NativeLibraries.kt +++ b/app/src/main/java/chat/zekochat/ndk/NativeLibraries.kt @@ -1,4 +1,4 @@ -package chat.peptide.ndk +package chat.zekochat.ndk annotation class NativeLibrary(val name: String) { companion object { diff --git a/app/src/main/java/chat/peptide/ndk/Stendal.kt b/app/src/main/java/chat/zekochat/ndk/Stendal.kt similarity index 96% rename from app/src/main/java/chat/peptide/ndk/Stendal.kt rename to app/src/main/java/chat/zekochat/ndk/Stendal.kt index 9ea491dc..4679f66f 100644 --- a/app/src/main/java/chat/peptide/ndk/Stendal.kt +++ b/app/src/main/java/chat/zekochat/ndk/Stendal.kt @@ -1,4 +1,4 @@ -package chat.peptide.ndk +package chat.zekochat.ndk import kotlinx.serialization.Serializable diff --git a/app/src/main/java/chat/peptide/persistence/KVStorage.kt b/app/src/main/java/chat/zekochat/persistence/KVStorage.kt similarity index 98% rename from app/src/main/java/chat/peptide/persistence/KVStorage.kt rename to app/src/main/java/chat/zekochat/persistence/KVStorage.kt index 90f529d0..85490a24 100644 --- a/app/src/main/java/chat/peptide/persistence/KVStorage.kt +++ b/app/src/main/java/chat/zekochat/persistence/KVStorage.kt @@ -1,4 +1,4 @@ -package chat.peptide.persistence +package chat.zekochat.persistence import android.content.Context import androidx.datastore.core.DataStore diff --git a/app/src/main/java/chat/peptide/persistence/SqlStorage.kt b/app/src/main/java/chat/zekochat/persistence/SqlStorage.kt similarity index 70% rename from app/src/main/java/chat/peptide/persistence/SqlStorage.kt rename to app/src/main/java/chat/zekochat/persistence/SqlStorage.kt index 6fd7479f..c700dcdd 100644 --- a/app/src/main/java/chat/peptide/persistence/SqlStorage.kt +++ b/app/src/main/java/chat/zekochat/persistence/SqlStorage.kt @@ -1,8 +1,9 @@ -package chat.peptide.persistence +package chat.zekochat.persistence import app.cash.sqldelight.db.SqlDriver import app.cash.sqldelight.driver.android.AndroidSqliteDriver -import chat.peptide.PeptideApplication +import chat.zekochat.PeptideApplication +import com.zekochat.persistence.Database object SqlStorage { val driver: SqlDriver = AndroidSqliteDriver( diff --git a/app/src/main/java/chat/peptide/providers/AttachmentProvider.kt b/app/src/main/java/chat/zekochat/providers/AttachmentProvider.kt similarity index 86% rename from app/src/main/java/chat/peptide/providers/AttachmentProvider.kt rename to app/src/main/java/chat/zekochat/providers/AttachmentProvider.kt index 86e07dc9..afa4976a 100644 --- a/app/src/main/java/chat/peptide/providers/AttachmentProvider.kt +++ b/app/src/main/java/chat/zekochat/providers/AttachmentProvider.kt @@ -1,11 +1,11 @@ -package chat.peptide.providers +package chat.zekochat.providers import android.content.Context import android.net.Uri import androidx.core.content.FileProvider -import chat.peptide.BuildConfig -import chat.peptide.R -import chat.peptide.api.PeptideHttp +import chat.zekochat.BuildConfig +import chat.zekochat.R +import chat.zekochat.api.PeptideHttp import io.ktor.client.request.get import io.ktor.client.statement.readBytes import java.io.File diff --git a/app/src/main/java/chat/peptide/screens/DefaultDestinationScreen.kt b/app/src/main/java/chat/zekochat/screens/DefaultDestinationScreen.kt similarity index 88% rename from app/src/main/java/chat/peptide/screens/DefaultDestinationScreen.kt rename to app/src/main/java/chat/zekochat/screens/DefaultDestinationScreen.kt index c59d9f82..f91dedba 100644 --- a/app/src/main/java/chat/peptide/screens/DefaultDestinationScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/DefaultDestinationScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens +package chat.zekochat.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.peptide.PeptideApplication -import chat.peptide.api.internals.getComponentActivity -import chat.peptide.composables.screens.splash.DisconnectedScreen +import chat.zekochat.PeptideApplication +import chat.zekochat.api.internals.getComponentActivity +import chat.zekochat.composables.screens.splash.DisconnectedScreen import com.google.android.material.color.DynamicColors @Composable diff --git a/app/src/main/java/chat/peptide/screens/about/AboutScreen.kt b/app/src/main/java/chat/zekochat/screens/about/AboutScreen.kt similarity index 95% rename from app/src/main/java/chat/peptide/screens/about/AboutScreen.kt rename to app/src/main/java/chat/zekochat/screens/about/AboutScreen.kt index 7d5db1f5..114ce3dc 100644 --- a/app/src/main/java/chat/peptide/screens/about/AboutScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/about/AboutScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.about +package chat.zekochat.screens.about import android.os.Build import android.widget.Toast @@ -24,7 +24,6 @@ import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -49,15 +48,15 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.peptide.BuildConfig -import chat.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideJson -import chat.peptide.api.routes.misc.Root -import chat.peptide.api.routes.misc.getRootRoute -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.PrimaryTabs -import chat.peptide.internals.Platform +import chat.zekochat.BuildConfig +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.routes.misc.Root +import chat.zekochat.api.routes.misc.getRootRoute +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.PrimaryTabs +import chat.zekochat.internals.Platform import kotlinx.coroutines.launch import kotlinx.serialization.encodeToString import java.net.URI diff --git a/app/src/main/java/chat/peptide/screens/about/AttributionScreen.kt b/app/src/main/java/chat/zekochat/screens/about/AttributionScreen.kt similarity index 97% rename from app/src/main/java/chat/peptide/screens/about/AttributionScreen.kt rename to app/src/main/java/chat/zekochat/screens/about/AttributionScreen.kt index 212e8d02..8cf995b0 100644 --- a/app/src/main/java/chat/peptide/screens/about/AttributionScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/about/AttributionScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.about +package chat.zekochat.screens.about import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -12,8 +12,6 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -41,8 +39,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.peptide.R -import chat.peptide.composables.screens.settings.AttributionItem +import chat.zekochat.R +import chat.zekochat.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/peptide/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/zekochat/screens/chat/ChatRouterScreen.kt similarity index 92% rename from app/src/main/java/chat/peptide/screens/chat/ChatRouterScreen.kt rename to app/src/main/java/chat/zekochat/screens/chat/ChatRouterScreen.kt index 53b0ba39..f110102a 100644 --- a/app/src/main/java/chat/peptide/screens/chat/ChatRouterScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/ChatRouterScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat +package chat.zekochat.screens.chat import android.Manifest import android.annotation.SuppressLint @@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsetsSides -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.only @@ -25,8 +24,6 @@ import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.material3.AlertDialog import androidx.compose.material3.BottomAppBar -import androidx.compose.material3.DismissibleDrawerSheet -import androidx.compose.material3.DismissibleNavigationDrawer import androidx.compose.material3.DrawerValue import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -69,40 +66,38 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.compose.LifecycleEventEffect import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.peptide.BuildConfig -import chat.peptide.R -import chat.peptide.api.PeptideAPI -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.generic.PepTextButton -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.DirectMessages +import chat.zekochat.api.realtime.DisconnectionState +import chat.zekochat.api.realtime.RealtimeSocket +import chat.zekochat.api.routes.push.subscribePush +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.chat.DisconnectedNotice +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.screens.chat.drawer.ChannelSideDrawer +import chat.zekochat.dialogs.NotificationRationaleDialog +import chat.zekochat.internals.Changelogs +import chat.zekochat.persistence.KVStorage +import chat.zekochat.screens.chat.dialogs.safety.ReportMessageDialog +import chat.zekochat.screens.chat.dialogs.safety.ReportServerDialog +import chat.zekochat.screens.chat.dialogs.safety.ReportUserDialog +import chat.zekochat.screens.chat.views.FriendsScreen +import chat.zekochat.screens.chat.views.NoCurrentChannelScreen +import chat.zekochat.screens.chat.views.channel.ChannelScreen +import chat.zekochat.screens.settings.SettingsScreen +import chat.zekochat.sheets.AddServerSheet +import chat.zekochat.sheets.ChangelogSheet +import chat.zekochat.sheets.EmoteInfoSheet +import chat.zekochat.sheets.LinkInfoSheet +import chat.zekochat.sheets.ReactionInfoSheet +import chat.zekochat.sheets.ServerContextSheet +import chat.zekochat.sheets.StatusSheet +import chat.zekochat.sheets.UserInfoSheet +import chat.zekochat.sheets.WebHookUserSheet +import chat.zekochat.sheets.spark.SwipeToReplySparkSheet +import chat.zekochat.utils.DeepLinkHandler import com.google.android.gms.tasks.OnCompleteListener import com.google.firebase.messaging.FirebaseMessaging import dagger.hilt.android.lifecycle.HiltViewModel @@ -169,7 +164,6 @@ class ChatRouterViewModel @Inject constructor( var latestChangelog by mutableStateOf("") var latestChangelogBody by mutableStateOf("") var showNotificationRationale by mutableStateOf(false) - var showEarlyAccessSpark by mutableStateOf(false) var showSwipeToReplySpark by mutableStateOf(false) private val changelogs = Changelogs(context, kvStorage) @@ -201,12 +195,6 @@ class ChatRouterViewModel @Inject constructor( val seenEarlyAccess = kvStorage.getBoolean("spark/earlyAccess/dismissed") val seenSwipeToReply = kvStorage.getBoolean("spark/swipeToReply/dismissed") - if (seenEarlyAccess == null) { - showEarlyAccessSpark = true - // we don't show swipe to reply to new users, - // as they would expect it to be working already - kvStorage.set("spark/swipeToReply/dismissed", true) - } if (seenEarlyAccess == true && seenSwipeToReply != true) { showSwipeToReplySpark = true @@ -215,7 +203,7 @@ class ChatRouterViewModel @Inject constructor( val hasNotificationPermission = NotificationManagerCompat.from(context).areNotificationsEnabled() // right now we only show this in debug builds so Chucker can show its notification - if (!hasNotificationPermission && BuildConfig.DEBUG) { + if (!hasNotificationPermission) { showNotificationRationale = true } } @@ -259,13 +247,6 @@ class ChatRouterViewModel @Inject constructor( } } - fun dismissEarlyAccessSpark() { - showEarlyAccessSpark = false - viewModelScope.launch { - kvStorage.set("spark/earlyAccess/dismissed", true) - } - } - fun dismissSwipeToReplySpark() { showSwipeToReplySpark = false viewModelScope.launch { @@ -825,29 +806,6 @@ fun ChatRouterScreen( ) } - if (viewModel.showEarlyAccessSpark) { - val earlyAccessSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) - - ModalBottomSheet( - sheetState = earlyAccessSheetState, - sheetGesturesEnabled = false, - dragHandle = {}, - onDismissRequest = { - // Only dismiss using button in sheet - } - ) { - EarlyAccessSheet( - onClose = { - scope.launch { - - earlyAccessSheetState.hide() - viewModel.dismissEarlyAccessSpark() - } - } - ) - } - } - if (viewModel.showSwipeToReplySpark) { val swipeToReplySheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) diff --git a/app/src/main/java/chat/peptide/screens/chat/dialogs/InviteDialog.kt b/app/src/main/java/chat/zekochat/screens/chat/dialogs/InviteDialog.kt similarity index 94% rename from app/src/main/java/chat/peptide/screens/chat/dialogs/InviteDialog.kt rename to app/src/main/java/chat/zekochat/screens/chat/dialogs/InviteDialog.kt index 4bfb5b63..cfd566f1 100644 --- a/app/src/main/java/chat/peptide/screens/chat/dialogs/InviteDialog.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/dialogs/InviteDialog.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.dialogs +package chat.zekochat.screens.chat.dialogs import android.net.Uri import android.widget.Toast @@ -18,10 +18,8 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width -import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -41,13 +39,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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.routes.channel.createInvite -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.internals.Platform -import chat.peptide.ui.theme.FragmentMono +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.channel.createInvite +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.internals.Platform +import chat.zekochat.ui.theme.FragmentMono import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportMessageDialog.kt b/app/src/main/java/chat/zekochat/screens/chat/dialogs/safety/ReportMessageDialog.kt similarity index 97% rename from app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportMessageDialog.kt rename to app/src/main/java/chat/zekochat/screens/chat/dialogs/safety/ReportMessageDialog.kt index 91ae448e..9f97e94d 100644 --- a/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportMessageDialog.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/dialogs/safety/ReportMessageDialog.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.dialogs.safety +package chat.zekochat.screens.chat.dialogs.safety import android.util.Log import androidx.compose.foundation.background @@ -20,7 +20,6 @@ import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -37,14 +36,14 @@ 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.peptide.R -import chat.peptide.api.PeptideAPI -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 chat.peptide.composables.generic.PepTextButton +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.safety.putMessageReport +import chat.zekochat.api.routes.user.blockUser +import chat.zekochat.api.schemas.ContentReportReason +import chat.zekochat.composables.chat.Message +import chat.zekochat.composables.generic.FormTextField +import chat.zekochat.composables.generic.PepTextButton import kotlinx.coroutines.launch enum class MessageReportFlowState { diff --git a/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportServerDialog.kt b/app/src/main/java/chat/zekochat/screens/chat/dialogs/safety/ReportServerDialog.kt similarity index 95% rename from app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportServerDialog.kt rename to app/src/main/java/chat/zekochat/screens/chat/dialogs/safety/ReportServerDialog.kt index f044174a..4f9bc76d 100644 --- a/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportServerDialog.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/dialogs/safety/ReportServerDialog.kt @@ -1,13 +1,10 @@ -package chat.peptide.screens.chat.dialogs.safety +package chat.zekochat.screens.chat.dialogs.safety import android.util.Log import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Check -import androidx.compose.material.icons.filled.Close import androidx.compose.material3.AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenuItem @@ -17,7 +14,6 @@ import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -32,13 +28,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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.routes.safety.putServerReport -import chat.peptide.api.schemas.ContentReportReason -import chat.peptide.composables.generic.FormTextField -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.screens.settings.ServerOverview +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.safety.putServerReport +import chat.zekochat.api.schemas.ContentReportReason +import chat.zekochat.composables.generic.FormTextField +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.screens.settings.ServerOverview import kotlinx.coroutines.launch enum class ServerReportFlowState { diff --git a/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportUserDialog.kt b/app/src/main/java/chat/zekochat/screens/chat/dialogs/safety/ReportUserDialog.kt similarity index 96% rename from app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportUserDialog.kt rename to app/src/main/java/chat/zekochat/screens/chat/dialogs/safety/ReportUserDialog.kt index 201850d0..522b7904 100644 --- a/app/src/main/java/chat/peptide/screens/chat/dialogs/safety/ReportUserDialog.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/dialogs/safety/ReportUserDialog.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.dialogs.safety +package chat.zekochat.screens.chat.dialogs.safety import android.util.Log import androidx.compose.foundation.layout.Column @@ -14,7 +14,6 @@ import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -30,14 +29,14 @@ 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.peptide.R -import chat.peptide.api.PeptideAPI -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.generic.PepTextButton -import chat.peptide.composables.screens.settings.UserOverview +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.safety.putUserReport +import chat.zekochat.api.routes.user.blockUser +import chat.zekochat.api.schemas.UserReportReason +import chat.zekochat.composables.generic.FormTextField +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.screens.settings.UserOverview import kotlinx.coroutines.launch enum class UserReportFlowState { diff --git a/app/src/main/java/chat/peptide/screens/chat/views/FriendsScreen.kt b/app/src/main/java/chat/zekochat/screens/chat/views/FriendsScreen.kt similarity index 96% rename from app/src/main/java/chat/peptide/screens/chat/views/FriendsScreen.kt rename to app/src/main/java/chat/zekochat/screens/chat/views/FriendsScreen.kt index d9bcbd1c..1bb615ff 100644 --- a/app/src/main/java/chat/peptide/screens/chat/views/FriendsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/views/FriendsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.views +package chat.zekochat.screens.chat.views import android.content.Context import android.widget.Toast @@ -74,27 +74,27 @@ 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.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.PeptideTagIntro -import chat.peptide.composables.chat.MemberListItem -import chat.peptide.composables.generic.CountableListHeader -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.composables.generic.UserAvatar -import chat.peptide.internals.extensions.zero -import chat.peptide.markdown.jbm.asHexString +import chat.zekochat.R +import chat.zekochat.api.internals.FriendRequests +import chat.zekochat.api.internals.UserQR +import chat.zekochat.api.internals.UserQRContents +import chat.zekochat.api.routes.user.friendUser +import chat.zekochat.api.routes.user.unfriendUser +import chat.zekochat.api.schemas.AutumnResource +import chat.zekochat.api.schemas.Metadata +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.components.vectorassets.HL_TAG +import chat.zekochat.components.vectorassets.HL_USERNAME +import chat.zekochat.components.vectorassets.PeptideTagIntro +import chat.zekochat.composables.chat.MemberListItem +import chat.zekochat.composables.generic.CountableListHeader +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.internals.extensions.zero +import chat.zekochat.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/peptide/screens/chat/views/NoCurrentChannelScreen.kt b/app/src/main/java/chat/zekochat/screens/chat/views/NoCurrentChannelScreen.kt similarity index 95% rename from app/src/main/java/chat/peptide/screens/chat/views/NoCurrentChannelScreen.kt rename to app/src/main/java/chat/zekochat/screens/chat/views/NoCurrentChannelScreen.kt index f1f36d8f..0b9793b9 100644 --- a/app/src/main/java/chat/peptide/screens/chat/views/NoCurrentChannelScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/views/NoCurrentChannelScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.views +package chat.zekochat.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.peptide.R -import chat.peptide.internals.extensions.zero -import chat.peptide.screens.chat.LocalIsConnected +import chat.zekochat.R +import chat.zekochat.internals.extensions.zero +import chat.zekochat.screens.chat.LocalIsConnected @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/chat/peptide/screens/chat/views/OverviewScreen.kt b/app/src/main/java/chat/zekochat/screens/chat/views/OverviewScreen.kt similarity index 96% rename from app/src/main/java/chat/peptide/screens/chat/views/OverviewScreen.kt rename to app/src/main/java/chat/zekochat/screens/chat/views/OverviewScreen.kt index 6fbfbc63..feeca153 100644 --- a/app/src/main/java/chat/peptide/screens/chat/views/OverviewScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/views/OverviewScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.views +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.user.fetchSelf +import chat.zekochat.api.schemas.User +import chat.zekochat.composables.generic.NonIdealState +import chat.zekochat.composables.screens.settings.UserOverview +import chat.zekochat.composables.skeletons.UserOverviewSkeleton +import chat.zekochat.internals.extensions.zero +import chat.zekochat.screens.chat.LocalIsConnected +import chat.zekochat.sheets.UserCardSheet @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt b/app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreen.kt similarity index 97% rename from app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt rename to app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreen.kt index 1bb2ac13..0376c2ca 100644 --- a/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.views.channel +package chat.zekochat.screens.chat.views.channel import android.Manifest import android.annotation.SuppressLint @@ -61,14 +61,12 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.requiredHeight import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBars -import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.text.InlineTextContent import androidx.compose.foundation.text.appendInlineContent import androidx.compose.material3.AssistChip -import androidx.compose.material3.Button import androidx.compose.material3.Card import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenu @@ -127,49 +125,49 @@ import androidx.compose.ui.zIndex import androidx.core.content.ContextCompat import androidx.documentfile.provider.DocumentFile import androidx.hilt.navigation.compose.hiltViewModel -import chat.peptide.R -import chat.peptide.PeptideApplication -import chat.peptide.activities.PeptideTweenDp -import chat.peptide.activities.PeptideTweenFloat -import chat.peptide.activities.PeptideTweenInt -import chat.peptide.api.PeptideAPI -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.PepTextButton -import chat.peptide.composables.generic.PresenceBadge -import chat.peptide.composables.generic.SquareButton -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 chat.zekochat.R +import chat.zekochat.PeptideApplication +import chat.zekochat.activities.PeptideTweenDp +import chat.zekochat.activities.PeptideTweenFloat +import chat.zekochat.activities.PeptideTweenInt +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.ChannelUtils +import chat.zekochat.api.internals.PermissionBit +import chat.zekochat.api.internals.has +import chat.zekochat.api.routes.channel.react +import chat.zekochat.api.routes.microservices.autumn.FileArgs +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.Message +import chat.zekochat.api.settings.FeatureFlags +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.chat.DateDivider +import chat.zekochat.composables.chat.Message +import chat.zekochat.composables.chat.MessageField +import chat.zekochat.composables.chat.SystemMessage +import chat.zekochat.composables.emoji.EmojiPicker +import chat.zekochat.composables.generic.GroupIcon +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.PresenceBadge +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.composables.generic.UserAvatarWidthPlaceholder +import chat.zekochat.composables.generic.presenceFromStatus +import chat.zekochat.composables.media.MediaPickerGateway +import chat.zekochat.composables.screens.chat.AttachmentManager +import chat.zekochat.composables.screens.chat.ChannelIcon +import chat.zekochat.composables.screens.chat.ReplyManager +import chat.zekochat.composables.screens.chat.TypingIndicator +import chat.zekochat.composables.screens.chat.atoms.RegularMessage +import chat.zekochat.composables.screens.chat.molecules.JoinVoiceChannelButton +import chat.zekochat.composables.skeletons.MessageSkeleton +import chat.zekochat.composables.skeletons.MessageSkeletonVariant +import chat.zekochat.internals.extensions.rememberChannelPermissions +import chat.zekochat.internals.extensions.zero +import chat.zekochat.screens.chat.LocalIsConnected +import chat.zekochat.sheets.ChannelInfoSheet +import chat.zekochat.sheets.MessageContextSheet +import chat.zekochat.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/peptide/screens/chat/views/channel/ChannelScreenAgeGate.kt b/app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreenAgeGate.kt similarity index 94% rename from app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenAgeGate.kt rename to app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreenAgeGate.kt index d03c5ed5..85feafc6 100644 --- a/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenAgeGate.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreenAgeGate.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.views.channel +package chat.zekochat.screens.chat.views.channel import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -8,11 +8,9 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -29,11 +27,11 @@ 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.peptide.R -import chat.peptide.composables.generic.DobPicker -import chat.peptide.composables.generic.DobRegion -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.composables.generic.DobPicker +import chat.zekochat.composables.generic.DobRegion +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton import kotlinx.datetime.Clock import kotlinx.datetime.LocalDateTime import kotlinx.datetime.TimeZone diff --git a/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenGeoGate.kt b/app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreenGeoGate.kt similarity index 90% rename from app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenGeoGate.kt rename to app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreenGeoGate.kt index eef90b15..ad959aa3 100644 --- a/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenGeoGate.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreenGeoGate.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.views.channel +package chat.zekochat.screens.chat.views.channel import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -17,10 +16,10 @@ 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.peptide.R -import chat.peptide.api.settings.GeoStateProvider -import chat.peptide.composables.generic.SquareButton -import chat.peptide.composables.vectorassets.GeoGateUX +import chat.zekochat.R +import chat.zekochat.api.settings.GeoStateProvider +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.vectorassets.GeoGateUX @Composable fun ChannelScreenGeoGate( diff --git a/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenViewModel.kt b/app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreenViewModel.kt similarity index 94% rename from app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenViewModel.kt rename to app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreenViewModel.kt index e39d7daf..e9125cca 100644 --- a/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreenViewModel.kt +++ b/app/src/main/java/chat/zekochat/screens/chat/views/channel/ChannelScreenViewModel.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chat.views.channel +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.PeptideJson -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.internals.ChannelUtils +import chat.zekochat.api.internals.PermissionBit +import chat.zekochat.api.internals.Roles +import chat.zekochat.api.internals.SpecialUsers +import chat.zekochat.api.internals.ULID +import chat.zekochat.api.internals.has +import chat.zekochat.api.realtime.RealtimeSocket +import chat.zekochat.api.realtime.RealtimeSocketFrames +import chat.zekochat.api.realtime.frames.receivable.ChannelDeleteFrame +import chat.zekochat.api.realtime.frames.receivable.ChannelStartTypingFrame +import chat.zekochat.api.realtime.frames.receivable.ChannelStopTypingFrame +import chat.zekochat.api.realtime.frames.receivable.MessageAppendFrame +import chat.zekochat.api.realtime.frames.receivable.MessageDeleteFrame +import chat.zekochat.api.realtime.frames.receivable.MessageFrame +import chat.zekochat.api.realtime.frames.receivable.MessageReactFrame +import chat.zekochat.api.realtime.frames.receivable.MessageUnreactFrame +import chat.zekochat.api.realtime.frames.receivable.MessageUpdateFrame +import chat.zekochat.api.routes.channel.SendMessageReply +import chat.zekochat.api.routes.channel.ackChannel +import chat.zekochat.api.routes.channel.editMessage +import chat.zekochat.api.routes.channel.fetchMessagesFromChannel +import chat.zekochat.api.routes.channel.sendMessage +import chat.zekochat.api.routes.microservices.autumn.FileArgs +import chat.zekochat.api.routes.microservices.autumn.MAX_ATTACHMENTS_PER_MESSAGE +import chat.zekochat.api.routes.microservices.autumn.uploadToAutumn +import chat.zekochat.api.routes.server.fetchMember +import chat.zekochat.api.routes.user.addUserIfUnknown +import chat.zekochat.api.routes.user.fetchUser +import chat.zekochat.api.schemas.Channel +import chat.zekochat.api.schemas.Message +import chat.zekochat.api.settings.GeoStateProvider +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.callbacks.UiCallback +import chat.zekochat.callbacks.UiCallbacks +import chat.zekochat.internals.text.MessageProcessor +import chat.zekochat.persistence.KVStorage +import chat.zekochat.screens.chat.ChatRouterDestination +import chat.zekochat.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/peptide/screens/chooseplatform/ChoosePlatformScreen.kt b/app/src/main/java/chat/zekochat/screens/chooseplatform/ChoosePlatformScreen.kt similarity index 88% rename from app/src/main/java/chat/peptide/screens/chooseplatform/ChoosePlatformScreen.kt rename to app/src/main/java/chat/zekochat/screens/chooseplatform/ChoosePlatformScreen.kt index b1e8c182..7e34f79b 100644 --- a/app/src/main/java/chat/peptide/screens/chooseplatform/ChoosePlatformScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/chooseplatform/ChoosePlatformScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.chooseplatform +package chat.zekochat.screens.chooseplatform import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -7,11 +7,13 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Card @@ -32,10 +34,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.peptide.R -import chat.peptide.api.ApplicationPlatform -import chat.peptide.api.PeptideAPI -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.api.ApplicationPlatform +import chat.zekochat.api.PeptideAPI +import chat.zekochat.composables.generic.SquareButton @Composable fun ChoosePlatformScreen(navController: NavController) { @@ -53,13 +55,17 @@ fun ChoosePlatformScreen(navController: NavController) { horizontalAlignment = Alignment.CenterHorizontally, ) { Image( - modifier = Modifier.padding(vertical = 24.dp), - painter = painterResource(id = R.drawable.peptide_logo_wide), + modifier = Modifier + .padding(vertical = 24.dp) + .width(160.dp), + painter = painterResource(id = R.drawable.zeko_text_logo), contentDescription = "Pep Wide Logo" ) Image( - modifier = Modifier.padding(vertical = 24.dp), + modifier = Modifier + .padding(vertical = 24.dp) + .width(300.dp), painter = painterResource(id = R.drawable.choose_platform_hligh_hand_img), contentDescription = "Choose Platform Highlight Image" ) @@ -67,9 +73,11 @@ fun ChoosePlatformScreen(navController: NavController) { Column( modifier = Modifier .padding(vertical = 32.dp) + .fillMaxHeight() ) { + Spacer(Modifier.weight(1f)) Text( - text = "Welcome to PepChat!", + text = "Welcome to ZekoChat!", style = MaterialTheme.typography.displaySmall.copy( fontSize = 26.sp, fontWeight = FontWeight.Black, @@ -109,7 +117,7 @@ fun ChoosePlatformScreen(navController: NavController) { .padding(bottom = 8.dp) .size(72.dp) .clickable { - apiUrlValue.value = "https://peptide.chat/api" + apiUrlValue.value = ApplicationPlatform.PEP.baseUrl }, ) { Box( @@ -143,7 +151,7 @@ fun ChoosePlatformScreen(navController: NavController) { .padding(bottom = 8.dp) .size(72.dp) .clickable { - apiUrlValue.value = "https://api.peptide.chat" + apiUrlValue.value = ApplicationPlatform.REVOLT.baseUrl }, ) { Box( @@ -152,12 +160,12 @@ fun ChoosePlatformScreen(navController: NavController) { ) { Image( painter = painterResource(id = R.drawable.ic_revolt_r), - contentDescription = "Peptide Logo" + contentDescription = "revolt Logo" ) } } Text( - text = "Peptide", + text = "Revolt", color = MaterialTheme.colorScheme.onBackground.copy( alpha = 0.5f ), @@ -218,7 +226,7 @@ fun ChoosePlatformScreen(navController: NavController) { contentAlignment = Alignment.Center ) { Text( - text = "PepChat v1.0", + text = "ZekoChat v1.0", color = MaterialTheme.colorScheme.onBackground.copy( alpha = 0.5f ), diff --git a/app/src/main/java/chat/peptide/screens/create/CreateGroupScreen.kt b/app/src/main/java/chat/zekochat/screens/create/CreateGroupScreen.kt similarity index 95% rename from app/src/main/java/chat/peptide/screens/create/CreateGroupScreen.kt rename to app/src/main/java/chat/zekochat/screens/create/CreateGroupScreen.kt index c8f92923..718b69fb 100644 --- a/app/src/main/java/chat/peptide/screens/create/CreateGroupScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/create/CreateGroupScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.create +package chat.zekochat.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.peptide.R -import chat.peptide.activities.PeptideTweenFloat -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.activities.PeptideTweenFloat +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.FriendRequests +import chat.zekochat.api.routes.channel.createGroupDM +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.chat.MemberListItem import kotlinx.coroutines.launch const val MAX_PEOPLE_IN_GROUP = 50 diff --git a/app/src/main/java/chat/peptide/screens/labs/LabsHomeScreen.kt b/app/src/main/java/chat/zekochat/screens/labs/LabsHomeScreen.kt similarity index 97% rename from app/src/main/java/chat/peptide/screens/labs/LabsHomeScreen.kt rename to app/src/main/java/chat/zekochat/screens/labs/LabsHomeScreen.kt index f924877d..5d4db7ba 100644 --- a/app/src/main/java/chat/peptide/screens/labs/LabsHomeScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/labs/LabsHomeScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.labs +package chat.zekochat.screens.labs import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon @@ -35,8 +33,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.peptide.R -import chat.peptide.ui.theme.FragmentMono +import chat.zekochat.R +import chat.zekochat.ui.theme.FragmentMono enum class LabsHomeScreenTab { Home, diff --git a/app/src/main/java/chat/peptide/screens/labs/LabsRootScreen.kt b/app/src/main/java/chat/zekochat/screens/labs/LabsRootScreen.kt similarity index 82% rename from app/src/main/java/chat/peptide/screens/labs/LabsRootScreen.kt rename to app/src/main/java/chat/zekochat/screens/labs/LabsRootScreen.kt index 52030a99..c6d02c41 100644 --- a/app/src/main/java/chat/peptide/screens/labs/LabsRootScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/labs/LabsRootScreen.kt @@ -1,23 +1,22 @@ -package chat.peptide.screens.labs +package chat.zekochat.screens.labs import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.AlertDialog import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.navigation.NavController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import chat.peptide.api.settings.FeatureFlags -import chat.peptide.composables.generic.PepTextButton -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 +import chat.zekochat.api.settings.FeatureFlags +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.screens.labs.ui.mockups.NewLoginExperienceMockup +import chat.zekochat.screens.labs.ui.sandbox.CoreLibSandbox +import chat.zekochat.screens.labs.ui.sandbox.GradientEditorSandbox +import chat.zekochat.screens.labs.ui.sandbox.JBMSandbox +import chat.zekochat.screens.labs.ui.sandbox.SettingsDslSandbox annotation class LabsFeature diff --git a/app/src/main/java/chat/peptide/screens/labs/ui/mockups/NewLoginExperienceMockup.kt b/app/src/main/java/chat/zekochat/screens/labs/ui/mockups/NewLoginExperienceMockup.kt similarity index 94% rename from app/src/main/java/chat/peptide/screens/labs/ui/mockups/NewLoginExperienceMockup.kt rename to app/src/main/java/chat/zekochat/screens/labs/ui/mockups/NewLoginExperienceMockup.kt index 0972b99c..e556e98b 100644 --- a/app/src/main/java/chat/peptide/screens/labs/ui/mockups/NewLoginExperienceMockup.kt +++ b/app/src/main/java/chat/zekochat/screens/labs/ui/mockups/NewLoginExperienceMockup.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.labs.ui.mockups +package chat.zekochat.screens.labs.ui.mockups import androidx.compose.animation.core.tween import androidx.compose.animation.slideIn @@ -16,11 +16,9 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn -import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -36,11 +34,11 @@ import androidx.navigation.NavController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import chat.peptide.R -import chat.peptide.api.settings.LoadedSettings -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.ui.theme.Theme +import chat.zekochat.R +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.ui.theme.Theme @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/CoreLibSandbox.kt b/app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/CoreLibSandbox.kt similarity index 85% rename from app/src/main/java/chat/peptide/screens/labs/ui/sandbox/CoreLibSandbox.kt rename to app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/CoreLibSandbox.kt index 6db1888a..0c0ec6d4 100644 --- a/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/CoreLibSandbox.kt +++ b/app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/CoreLibSandbox.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.labs.ui.sandbox +package chat.zekochat.screens.labs.ui.sandbox import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -10,9 +10,9 @@ 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.peptide.composables.generic.SquareButton -import chat.peptide.settings.dsl.SettingsPage -import chat.peptide.ui.theme.FragmentMono +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.settings.dsl.SettingsPage +import chat.zekochat.ui.theme.FragmentMono @Composable fun CoreLibSandbox(navController: NavController) { diff --git a/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/GradientEditorSandbox.kt b/app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/GradientEditorSandbox.kt similarity index 88% rename from app/src/main/java/chat/peptide/screens/labs/ui/sandbox/GradientEditorSandbox.kt rename to app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/GradientEditorSandbox.kt index 9a51ff9a..ff75bb70 100644 --- a/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/GradientEditorSandbox.kt +++ b/app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/GradientEditorSandbox.kt @@ -1,9 +1,8 @@ -package chat.peptide.screens.labs.ui.sandbox +package chat.zekochat.screens.labs.ui.sandbox import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.height import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf @@ -15,9 +14,9 @@ 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.peptide.composables.generic.GradientStopEditor -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.settings.dsl.SettingsPage +import chat.zekochat.composables.generic.GradientStopEditor +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.settings.dsl.SettingsPage @Composable fun GradientEditorSandbox(navController: NavController) { diff --git a/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/JBMSandbox.kt b/app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/JBMSandbox.kt similarity index 91% rename from app/src/main/java/chat/peptide/screens/labs/ui/sandbox/JBMSandbox.kt rename to app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/JBMSandbox.kt index ce49b0b5..1b92f0df 100644 --- a/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/JBMSandbox.kt +++ b/app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/JBMSandbox.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.labs.ui.sandbox +package chat.zekochat.screens.labs.ui.sandbox import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.width import androidx.compose.material3.Checkbox import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -19,11 +18,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.markdown.jbm.JBM -import chat.peptide.markdown.jbm.JBMRenderer -import chat.peptide.markdown.jbm.LocalJBMarkdownTreeState -import chat.peptide.settings.dsl.SettingsPage +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.markdown.jbm.JBM +import chat.zekochat.markdown.jbm.JBMRenderer +import chat.zekochat.markdown.jbm.LocalJBMarkdownTreeState +import chat.zekochat.settings.dsl.SettingsPage @OptIn(JBM::class) @Composable diff --git a/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/SettingsDslSandbox.kt b/app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/SettingsDslSandbox.kt similarity index 87% rename from app/src/main/java/chat/peptide/screens/labs/ui/sandbox/SettingsDslSandbox.kt rename to app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/SettingsDslSandbox.kt index 865cd13d..0e439a5d 100644 --- a/app/src/main/java/chat/peptide/screens/labs/ui/sandbox/SettingsDslSandbox.kt +++ b/app/src/main/java/chat/zekochat/screens/labs/ui/sandbox/SettingsDslSandbox.kt @@ -1,11 +1,11 @@ -package chat.peptide.screens.labs.ui.sandbox +package chat.zekochat.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.peptide.settings.dsl.SettingsPage -import chat.peptide.settings.dsl.SubcategoryContentInsets +import chat.zekochat.settings.dsl.SettingsPage +import chat.zekochat.settings.dsl.SubcategoryContentInsets enum class SettingsDslSandboxTab { General, diff --git a/app/src/main/java/chat/peptide/screens/login/LoginGreetingScreen.kt b/app/src/main/java/chat/zekochat/screens/login/LoginGreetingScreen.kt similarity index 96% rename from app/src/main/java/chat/peptide/screens/login/LoginGreetingScreen.kt rename to app/src/main/java/chat/zekochat/screens/login/LoginGreetingScreen.kt index 0d426574..2d46e94f 100644 --- a/app/src/main/java/chat/peptide/screens/login/LoginGreetingScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/login/LoginGreetingScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.login +package chat.zekochat.screens.login import android.widget.Toast import androidx.compose.animation.AnimatedVisibility @@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf @@ -38,10 +37,10 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController -import chat.peptide.R -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.composables.generic.SquareElevatedButton +import chat.zekochat.R +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.generic.SquareElevatedButton @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/java/chat/peptide/screens/login/LoginScreen.kt b/app/src/main/java/chat/zekochat/screens/login/LoginScreen.kt similarity index 96% rename from app/src/main/java/chat/peptide/screens/login/LoginScreen.kt rename to app/src/main/java/chat/zekochat/screens/login/LoginScreen.kt index 674319e0..be3aebee 100644 --- a/app/src/main/java/chat/peptide/screens/login/LoginScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/login/LoginScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.login +package chat.zekochat.screens.login import android.util.Log import android.app.Activity @@ -55,17 +55,17 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.peptide.R -import chat.peptide.PeptideApplication -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.PeptideApplication +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.account.EmailPasswordAssessment +import chat.zekochat.api.routes.account.negotiateAuthentication +import chat.zekochat.api.routes.onboard.needsOnboarding +import chat.zekochat.composables.generic.FormTextField +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.generic.Weblink +import chat.zekochat.persistence.KVStorage +import chat.zekochat.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/peptide/screens/login/MfaScreen.kt b/app/src/main/java/chat/zekochat/screens/login/MfaScreen.kt similarity index 95% rename from app/src/main/java/chat/peptide/screens/login/MfaScreen.kt rename to app/src/main/java/chat/zekochat/screens/login/MfaScreen.kt index 3c920dd3..ecebad38 100644 --- a/app/src/main/java/chat/peptide/screens/login/MfaScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/login/MfaScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.login +package chat.zekochat.screens.login import android.util.Log import androidx.compose.foundation.Image @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button import androidx.compose.material3.ElevatedButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -36,16 +35,16 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.peptide.R -import chat.peptide.api.PeptideAPI -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.composables.generic.SquareButton -import chat.peptide.persistence.KVStorage +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.account.MfaResponseRecoveryCode +import chat.zekochat.api.routes.account.MfaResponseTotpCode +import chat.zekochat.api.routes.account.authenticateWithMfaRecoveryCode +import chat.zekochat.api.routes.account.authenticateWithMfaTotpCode +import chat.zekochat.composables.generic.CollapsibleCard +import chat.zekochat.composables.generic.FormTextField +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.persistence.KVStorage import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/chat/peptide/screens/login2/InitScreen.kt b/app/src/main/java/chat/zekochat/screens/login2/InitScreen.kt similarity index 92% rename from app/src/main/java/chat/peptide/screens/login2/InitScreen.kt rename to app/src/main/java/chat/zekochat/screens/login2/InitScreen.kt index cb5728b9..9b1fc565 100644 --- a/app/src/main/java/chat/peptide/screens/login2/InitScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/login2/InitScreen.kt @@ -1,7 +1,5 @@ -package chat.peptide.screens.login2 +package chat.zekochat.screens.login2 -import android.content.Intent -import android.net.Uri import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -14,10 +12,8 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn -import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass import androidx.compose.material3.windowsizeclass.WindowSizeClass import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass @@ -33,15 +29,15 @@ 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.peptide.BuildConfig -import chat.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.settings.LoadedSettings -import chat.peptide.composables.generic.AnyLink -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.composables.generic.Weblink -import chat.peptide.ui.theme.Theme +import chat.zekochat.BuildConfig +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.composables.generic.AnyLink +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.generic.Weblink +import chat.zekochat.ui.theme.Theme import com.chuckerteam.chucker.api.Chucker @Composable diff --git a/app/src/main/java/chat/peptide/screens/main/ConversationsScreen.kt b/app/src/main/java/chat/zekochat/screens/main/ConversationsScreen.kt similarity index 94% rename from app/src/main/java/chat/peptide/screens/main/ConversationsScreen.kt rename to app/src/main/java/chat/zekochat/screens/main/ConversationsScreen.kt index d8413d15..42afb640 100644 --- a/app/src/main/java/chat/peptide/screens/main/ConversationsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/main/ConversationsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.main +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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 +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.User +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.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/peptide/screens/main/MainScreen.kt b/app/src/main/java/chat/zekochat/screens/main/MainScreen.kt similarity index 97% rename from app/src/main/java/chat/peptide/screens/main/MainScreen.kt rename to app/src/main/java/chat/zekochat/screens/main/MainScreen.kt index 94cebda1..50255c11 100644 --- a/app/src/main/java/chat/peptide/screens/main/MainScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/main/MainScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.main +package chat.zekochat.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.peptide.R -import chat.peptide.screens.chat.views.OverviewScreen +import chat.zekochat.R +import chat.zekochat.screens.chat.views.OverviewScreen enum class MainScreenTab { Communities, diff --git a/app/src/main/java/chat/peptide/screens/register/OnboardingScreen.kt b/app/src/main/java/chat/zekochat/screens/register/OnboardingScreen.kt similarity index 95% rename from app/src/main/java/chat/peptide/screens/register/OnboardingScreen.kt rename to app/src/main/java/chat/zekochat/screens/register/OnboardingScreen.kt index df813666..e7837cf3 100644 --- a/app/src/main/java/chat/peptide/screens/register/OnboardingScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/register/OnboardingScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.register +package chat.zekochat.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.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 chat.zekochat.R +import chat.zekochat.api.routes.onboard.OnboardingCompletionBody +import chat.zekochat.api.routes.onboard.completeOnboarding +import chat.zekochat.composables.generic.FormTextField +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.persistence.KVStorage import kotlinx.coroutines.launch @OptIn(ExperimentalLayoutApi::class) diff --git a/app/src/main/java/chat/peptide/screens/register/RegisterDetailsScreen.kt b/app/src/main/java/chat/zekochat/screens/register/RegisterDetailsScreen.kt similarity index 97% rename from app/src/main/java/chat/peptide/screens/register/RegisterDetailsScreen.kt rename to app/src/main/java/chat/zekochat/screens/register/RegisterDetailsScreen.kt index 28c9fe8f..e9646824 100644 --- a/app/src/main/java/chat/peptide/screens/register/RegisterDetailsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/register/RegisterDetailsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.register +package chat.zekochat.screens.register import android.content.Context import android.app.Activity @@ -55,14 +55,14 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.peptide.R -import chat.peptide.PeptideApplication -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 chat.peptide.ui.theme.FragmentMono +import chat.zekochat.R +import chat.zekochat.PeptideApplication +import chat.zekochat.api.routes.account.RegistrationBody +import chat.zekochat.api.routes.account.register +import chat.zekochat.api.routes.misc.getRootRoute +import chat.zekochat.composables.generic.FormTextField +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.ui.theme.FragmentMono import com.hcaptcha.sdk.HCaptcha import com.hcaptcha.sdk.HCaptchaConfig import com.hcaptcha.sdk.HCaptchaSize diff --git a/app/src/main/java/chat/peptide/screens/register/RegisterGreetingScreen.kt b/app/src/main/java/chat/zekochat/screens/register/RegisterGreetingScreen.kt similarity index 93% rename from app/src/main/java/chat/peptide/screens/register/RegisterGreetingScreen.kt rename to app/src/main/java/chat/zekochat/screens/register/RegisterGreetingScreen.kt index 27d86f56..1c968221 100644 --- a/app/src/main/java/chat/peptide/screens/register/RegisterGreetingScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/register/RegisterGreetingScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.register +package chat.zekochat.screens.register import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -12,10 +12,8 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -26,9 +24,9 @@ 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.peptide.R -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton @Composable fun RegisterGreetingScreen(navController: NavController) { diff --git a/app/src/main/java/chat/peptide/screens/register/RegisterVerifyScreen.kt b/app/src/main/java/chat/zekochat/screens/register/RegisterVerifyScreen.kt similarity index 97% rename from app/src/main/java/chat/peptide/screens/register/RegisterVerifyScreen.kt rename to app/src/main/java/chat/zekochat/screens/register/RegisterVerifyScreen.kt index 2364b723..e770195e 100644 --- a/app/src/main/java/chat/peptide/screens/register/RegisterVerifyScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/register/RegisterVerifyScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.register +package chat.zekochat.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.peptide.R -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.composables.generic.SquareButton @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/chat/peptide/screens/services/DiscoverScreen.kt b/app/src/main/java/chat/zekochat/screens/services/DiscoverScreen.kt similarity index 87% rename from app/src/main/java/chat/peptide/screens/services/DiscoverScreen.kt rename to app/src/main/java/chat/zekochat/screens/services/DiscoverScreen.kt index 63eefab6..1322912e 100644 --- a/app/src/main/java/chat/peptide/screens/services/DiscoverScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/services/DiscoverScreen.kt @@ -1,10 +1,8 @@ -package chat.peptide.screens.services +package chat.zekochat.screens.services import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -17,8 +15,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.peptide.R -import chat.peptide.composables.screens.services.DiscoverView +import chat.zekochat.R +import chat.zekochat.composables.screens.services.DiscoverView @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/chat/peptide/screens/settings/AppearanceSettingsScreen.kt b/app/src/main/java/chat/zekochat/screens/settings/AppearanceSettingsScreen.kt similarity index 96% rename from app/src/main/java/chat/peptide/screens/settings/AppearanceSettingsScreen.kt rename to app/src/main/java/chat/zekochat/screens/settings/AppearanceSettingsScreen.kt index 8719efaa..b1d7d750 100644 --- a/app/src/main/java/chat/peptide/screens/settings/AppearanceSettingsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/AppearanceSettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.settings +package chat.zekochat.screens.settings import android.content.Context import android.net.Uri @@ -55,20 +55,20 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.peptide.R -import chat.peptide.api.PeptideCbor -import chat.peptide.api.PeptideJson -import chat.peptide.api.settings.LoadedSettings -import chat.peptide.api.settings.SyncedSettings -import chat.peptide.composables.generic.ListHeader -import chat.peptide.composables.generic.PepTextButton -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 chat.zekochat.R +import chat.zekochat.api.PeptideCbor +import chat.zekochat.api.PeptideJson +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.composables.generic.ListHeader +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.screens.settings.appearance.ColourChip +import chat.zekochat.composables.screens.settings.appearance.CornerRadiusPicker +import chat.zekochat.sheets.ColourPickerSheet +import chat.zekochat.ui.theme.OverridableColourScheme +import chat.zekochat.ui.theme.Theme +import chat.zekochat.ui.theme.getFieldByName +import chat.zekochat.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/peptide/screens/settings/ChangelogsScreen.kt b/app/src/main/java/chat/zekochat/screens/settings/ChangelogsScreen.kt similarity index 97% rename from app/src/main/java/chat/peptide/screens/settings/ChangelogsScreen.kt rename to app/src/main/java/chat/zekochat/screens/settings/ChangelogsScreen.kt index af51b730..96d05238 100644 --- a/app/src/main/java/chat/peptide/screens/settings/ChangelogsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/ChangelogsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.settings +package chat.zekochat.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.peptide.R -import chat.peptide.internals.ChangelogIndex -import chat.peptide.internals.Changelogs -import chat.peptide.persistence.KVStorage -import chat.peptide.sheets.ChangelogSheet +import chat.zekochat.R +import chat.zekochat.internals.ChangelogIndex +import chat.zekochat.internals.Changelogs +import chat.zekochat.persistence.KVStorage +import chat.zekochat.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/peptide/screens/settings/ChatSettingsScreen.kt b/app/src/main/java/chat/zekochat/screens/settings/ChatSettingsScreen.kt similarity index 95% rename from app/src/main/java/chat/peptide/screens/settings/ChatSettingsScreen.kt rename to app/src/main/java/chat/zekochat/screens/settings/ChatSettingsScreen.kt index 4ebaef25..e364bd90 100644 --- a/app/src/main/java/chat/peptide/screens/settings/ChatSettingsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/ChatSettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.settings +package chat.zekochat.screens.settings import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.Card import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -23,7 +21,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope @@ -37,14 +34,14 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -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.PepTextButton -import chat.peptide.composables.generic.RadioItem +import chat.zekochat.R +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.api.settings.MessageReplyStyle +import chat.zekochat.api.settings.SpecialEmbedSettings +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.composables.generic.ListHeader +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.RadioItem import kotlinx.coroutines.launch class ChatSettingsScreenViewModel : ViewModel() { diff --git a/app/src/main/java/chat/peptide/screens/settings/DebugSettingsScreen.kt b/app/src/main/java/chat/zekochat/screens/settings/DebugSettingsScreen.kt similarity index 95% rename from app/src/main/java/chat/peptide/screens/settings/DebugSettingsScreen.kt rename to app/src/main/java/chat/zekochat/screens/settings/DebugSettingsScreen.kt index e1228dfe..55e1925b 100644 --- a/app/src/main/java/chat/peptide/screens/settings/DebugSettingsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/DebugSettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.settings +package chat.zekochat.screens.settings import android.os.Build import android.util.Log @@ -15,10 +15,7 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.ElevatedButton import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider @@ -29,7 +26,6 @@ import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -48,19 +44,19 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.peptide.R -import chat.peptide.api.routes.push.subscribePush -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -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 chat.zekochat.R +import chat.zekochat.api.routes.push.subscribePush +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.dialogs.NotificationRationaleDialog +import chat.zekochat.persistence.KVStorage +import chat.zekochat.persistence.SqlStorage +import chat.zekochat.ui.theme.FragmentMono import com.google.android.gms.common.ConnectionResult import com.google.android.gms.common.GoogleApiAvailabilityLight import com.google.android.gms.tasks.OnCompleteListener import com.google.firebase.messaging.FirebaseMessaging +import com.zekochat.persistence.Database import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/chat/peptide/screens/settings/ExperimentsSettingsScreen.kt b/app/src/main/java/chat/zekochat/screens/settings/ExperimentsSettingsScreen.kt similarity index 92% rename from app/src/main/java/chat/peptide/screens/settings/ExperimentsSettingsScreen.kt rename to app/src/main/java/chat/zekochat/screens/settings/ExperimentsSettingsScreen.kt index f02f5be7..2c2c5e01 100644 --- a/app/src/main/java/chat/peptide/screens/settings/ExperimentsSettingsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/ExperimentsSettingsScreen.kt @@ -1,16 +1,14 @@ -package chat.peptide.screens.settings +package chat.zekochat.screens.settings import android.content.Context import android.content.Intent import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.ElevatedButton import androidx.compose.material3.ListItem import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.mutableStateOf @@ -21,15 +19,15 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.peptide.BuildConfig -import chat.peptide.PeptideApplication -import chat.peptide.api.settings.Experiments -import chat.peptide.api.settings.LoadedSettings -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.persistence.KVStorage -import chat.peptide.settings.dsl.SettingsPage -import chat.peptide.settings.dsl.SubcategoryContentInsets +import chat.zekochat.BuildConfig +import chat.zekochat.PeptideApplication +import chat.zekochat.api.settings.Experiments +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.persistence.KVStorage +import chat.zekochat.settings.dsl.SettingsPage +import chat.zekochat.settings.dsl.SubcategoryContentInsets import kotlinx.coroutines.launch class ExperimentsSettingsScreenViewModel : ViewModel() { diff --git a/app/src/main/java/chat/peptide/screens/settings/LanguagePickerSettingsScreen.kt b/app/src/main/java/chat/zekochat/screens/settings/LanguagePickerSettingsScreen.kt similarity index 96% rename from app/src/main/java/chat/peptide/screens/settings/LanguagePickerSettingsScreen.kt rename to app/src/main/java/chat/zekochat/screens/settings/LanguagePickerSettingsScreen.kt index 0076e4cd..4f551a3e 100644 --- a/app/src/main/java/chat/peptide/screens/settings/LanguagePickerSettingsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/LanguagePickerSettingsScreen.kt @@ -1,11 +1,9 @@ -package chat.peptide.screens.settings +package chat.zekochat.screens.settings import android.content.Context import androidx.appcompat.app.AppCompatDelegate import androidx.compose.foundation.clickable import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -31,8 +29,8 @@ import androidx.core.os.LocaleListCompat import androidx.lifecycle.ViewModel import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.peptide.R -import chat.peptide.internals.extensions.getSupportedLocales +import chat.zekochat.R +import chat.zekochat.internals.extensions.getSupportedLocales import java.util.Locale class LanguagePickerSettingsScreen : ViewModel() { diff --git a/app/src/main/java/chat/peptide/screens/settings/ProfileSettngsScreen.kt b/app/src/main/java/chat/zekochat/screens/settings/ProfileSettngsScreen.kt similarity index 96% rename from app/src/main/java/chat/peptide/screens/settings/ProfileSettngsScreen.kt rename to app/src/main/java/chat/zekochat/screens/settings/ProfileSettngsScreen.kt index ff498b5a..3d6b2d28 100644 --- a/app/src/main/java/chat/peptide/screens/settings/ProfileSettngsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/ProfileSettngsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.settings +package chat.zekochat.screens.settings import android.content.Context import android.net.Uri @@ -28,7 +28,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -46,15 +45,15 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.peptide.R -import chat.peptide.api.PeptideAPI -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.generic.PepTextButton -import chat.peptide.composables.screens.settings.RawUserOverview +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.microservices.autumn.uploadToAutumn +import chat.zekochat.api.routes.user.fetchUserProfile +import chat.zekochat.api.routes.user.patchSelf +import chat.zekochat.api.schemas.Profile +import chat.zekochat.composables.generic.InlineMediaPicker +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.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/peptide/screens/settings/SessionSettngsScreen.kt b/app/src/main/java/chat/zekochat/screens/settings/SessionSettngsScreen.kt similarity index 94% rename from app/src/main/java/chat/peptide/screens/settings/SessionSettngsScreen.kt rename to app/src/main/java/chat/zekochat/screens/settings/SessionSettngsScreen.kt index f34471b1..070a1d56 100644 --- a/app/src/main/java/chat/peptide/screens/settings/SessionSettngsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/SessionSettngsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.settings +package chat.zekochat.screens.settings import android.util.Log import androidx.compose.foundation.ExperimentalFoundationApi @@ -44,17 +44,17 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import chat.peptide.R -import chat.peptide.api.PeptideAPI -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.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.composables.markdown.RichMarkdown -import chat.peptide.composables.settings.sessions.SessionItem +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.auth.fetchAllSessions +import chat.zekochat.api.routes.auth.logoutAllSessions +import chat.zekochat.api.routes.auth.logoutSessionById +import chat.zekochat.api.schemas.Session +import chat.zekochat.composables.generic.ListHeader +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.markdown.RichMarkdown +import chat.zekochat.composables.settings.sessions.SessionItem import kotlinx.coroutines.launch class SessionSettingsScreenViewModel : ViewModel() { diff --git a/app/src/main/java/chat/peptide/screens/settings/SettingsScreen.kt b/app/src/main/java/chat/zekochat/screens/settings/SettingsScreen.kt similarity index 97% rename from app/src/main/java/chat/peptide/screens/settings/SettingsScreen.kt rename to app/src/main/java/chat/zekochat/screens/settings/SettingsScreen.kt index 10ab1b50..3e6e6e7a 100644 --- a/app/src/main/java/chat/peptide/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/SettingsScreen.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.settings +package chat.zekochat.screens.settings import android.content.Intent import androidx.compose.foundation.clickable @@ -10,14 +10,11 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.LargeTopAppBar import androidx.compose.material3.ListItem import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -33,14 +30,14 @@ import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.navigation.NavController -import chat.peptide.BuildConfig -import chat.peptide.R -import chat.peptide.activities.InviteActivity -import chat.peptide.api.PeptideAPI -import chat.peptide.api.settings.FeatureFlags -import chat.peptide.api.settings.LoadedSettings -import chat.peptide.composables.generic.ListHeader -import chat.peptide.persistence.KVStorage +import chat.zekochat.BuildConfig +import chat.zekochat.R +import chat.zekochat.activities.InviteActivity +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.settings.FeatureFlags +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.composables.generic.ListHeader +import chat.zekochat.persistence.KVStorage import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.runBlocking import javax.inject.Inject diff --git a/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsHome.kt b/app/src/main/java/chat/zekochat/screens/settings/channel/ChannelSettingsHome.kt similarity index 93% rename from app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsHome.kt rename to app/src/main/java/chat/zekochat/screens/settings/channel/ChannelSettingsHome.kt index 3724687c..5787b77b 100644 --- a/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsHome.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/channel/ChannelSettingsHome.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.settings.channel +package chat.zekochat.screens.settings.channel import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -34,17 +34,17 @@ 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.peptide.R -import chat.peptide.api.PeptideAPI -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.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.internals.extensions.rememberChannelPermissions -import chat.peptide.screens.settings.SettingsIcon +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.PermissionBit +import chat.zekochat.api.internals.hasPermission +import chat.zekochat.api.routes.channel.leaveDeleteOrCloseChannel +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.settings.FeatureFlags +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.internals.extensions.rememberChannelPermissions +import chat.zekochat.screens.settings.SettingsIcon import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsOverview.kt b/app/src/main/java/chat/zekochat/screens/settings/channel/ChannelSettingsOverview.kt similarity index 95% rename from app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsOverview.kt rename to app/src/main/java/chat/zekochat/screens/settings/channel/ChannelSettingsOverview.kt index ea854112..6b9d796a 100644 --- a/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsOverview.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/channel/ChannelSettingsOverview.kt @@ -1,8 +1,7 @@ -package chat.peptide.screens.settings.channel +package chat.zekochat.screens.settings.channel import android.content.Context import android.net.Uri -import android.util.Log import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateContentSize import androidx.compose.animation.scaleIn @@ -15,11 +14,7 @@ import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material.icons.filled.Check import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FloatingActionButton @@ -31,7 +26,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TextField import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable @@ -45,7 +39,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight @@ -56,16 +49,16 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import chat.peptide.R -import chat.peptide.activities.PeptideTweenFloat -import chat.peptide.api.PeptideAPI -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 chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.activities.PeptideTweenFloat +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.channel.patchChannel +import chat.zekochat.api.routes.microservices.autumn.uploadToAutumn +import chat.zekochat.api.schemas.Channel +import chat.zekochat.composables.generic.InlineMediaPicker +import chat.zekochat.composables.generic.ListHeader +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton 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/peptide/screens/settings/channel/ChannelSettingsPermissions.kt b/app/src/main/java/chat/zekochat/screens/settings/channel/ChannelSettingsPermissions.kt similarity index 93% rename from app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsPermissions.kt rename to app/src/main/java/chat/zekochat/screens/settings/channel/ChannelSettingsPermissions.kt index a7f3dab5..6226e219 100644 --- a/app/src/main/java/chat/peptide/screens/settings/channel/ChannelSettingsPermissions.kt +++ b/app/src/main/java/chat/zekochat/screens/settings/channel/ChannelSettingsPermissions.kt @@ -1,4 +1,4 @@ -package chat.peptide.screens.settings.channel +package chat.zekochat.screens.settings.channel import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -25,8 +23,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.peptide.R -import chat.peptide.api.PeptideAPI +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/chat/peptide/settings/dsl/SettingsPage.kt b/app/src/main/java/chat/zekochat/settings/dsl/SettingsPage.kt similarity index 94% rename from app/src/main/java/chat/peptide/settings/dsl/SettingsPage.kt rename to app/src/main/java/chat/zekochat/settings/dsl/SettingsPage.kt index d3544dc9..0614c7a3 100644 --- a/app/src/main/java/chat/peptide/settings/dsl/SettingsPage.kt +++ b/app/src/main/java/chat/zekochat/settings/dsl/SettingsPage.kt @@ -1,4 +1,4 @@ -package chat.peptide.settings.dsl +package chat.zekochat.settings.dsl import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -28,9 +26,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.peptide.R -import chat.peptide.composables.generic.ListHeader -import chat.peptide.composables.generic.RadioItem +import chat.zekochat.R +import chat.zekochat.composables.generic.ListHeader +import chat.zekochat.composables.generic.RadioItem import kotlinx.coroutines.launch import kotlin.enums.EnumEntries diff --git a/app/src/main/java/chat/peptide/settings/providers/AgeGateUnlockedStorageProvider.kt b/app/src/main/java/chat/zekochat/settings/providers/AgeGateUnlockedStorageProvider.kt similarity index 71% rename from app/src/main/java/chat/peptide/settings/providers/AgeGateUnlockedStorageProvider.kt rename to app/src/main/java/chat/zekochat/settings/providers/AgeGateUnlockedStorageProvider.kt index 2aa65ffc..e21e04f0 100644 --- a/app/src/main/java/chat/peptide/settings/providers/AgeGateUnlockedStorageProvider.kt +++ b/app/src/main/java/chat/zekochat/settings/providers/AgeGateUnlockedStorageProvider.kt @@ -1,7 +1,7 @@ -package chat.peptide.settings.providers +package chat.zekochat.settings.providers -import chat.peptide.PeptideApplication -import chat.peptide.persistence.KVStorage +import chat.zekochat.PeptideApplication +import chat.zekochat.persistence.KVStorage object AgeGateUnlockedStorageProvider { private val kv = KVStorage(PeptideApplication.instance) diff --git a/app/src/main/java/chat/peptide/sheets/AddServerSheet.kt b/app/src/main/java/chat/zekochat/sheets/AddServerSheet.kt similarity index 97% rename from app/src/main/java/chat/peptide/sheets/AddServerSheet.kt rename to app/src/main/java/chat/zekochat/sheets/AddServerSheet.kt index 997cec74..a185c9d9 100644 --- a/app/src/main/java/chat/peptide/sheets/AddServerSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/AddServerSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import android.content.Intent import android.util.Log @@ -25,7 +25,6 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.input.TextFieldLineLimits import androidx.compose.foundation.text.input.rememberTextFieldState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.LocalContentColor @@ -52,20 +51,20 @@ 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.peptide.R -import chat.peptide.activities.InviteActivity -import chat.peptide.api.PeptideAPI -import chat.peptide.api.routes.server.createServer -import chat.peptide.callbacks.Action -import chat.peptide.callbacks.ActionChannel -import chat.peptide.composables.generic.SquareButton -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 chat.zekochat.R +import chat.zekochat.activities.InviteActivity +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.server.createServer +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.sheets.SheetSelection +import chat.zekochat.composables.vectorassets.CreateServer +import chat.zekochat.composables.vectorassets.JoinServer +import chat.zekochat.composables.vectorassets.NewServer +import chat.zekochat.material.EasingTokens +import chat.zekochat.screens.chat.ChatRouterDestination +import chat.zekochat.ui.theme.FragmentMono import kotlinx.coroutines.launch import logcat.asLog import logcat.logcat diff --git a/app/src/main/java/chat/peptide/sheets/ChangelogSheet.kt b/app/src/main/java/chat/zekochat/sheets/ChangelogSheet.kt similarity index 90% rename from app/src/main/java/chat/peptide/sheets/ChangelogSheet.kt rename to app/src/main/java/chat/zekochat/sheets/ChangelogSheet.kt index 7e2000e6..57efacd2 100644 --- a/app/src/main/java/chat/peptide/sheets/ChangelogSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/ChangelogSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.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.peptide.api.internals.getFragmentActivity -import chat.peptide.fragments.ChangelogBottomSheetFragment +import chat.zekochat.api.internals.getFragmentActivity +import chat.zekochat.fragments.ChangelogBottomSheetFragment @Composable fun ChangelogSheet( diff --git a/app/src/main/java/chat/peptide/sheets/ChannelContextSheet.kt b/app/src/main/java/chat/zekochat/sheets/ChannelContextSheet.kt similarity index 97% rename from app/src/main/java/chat/peptide/sheets/ChannelContextSheet.kt rename to app/src/main/java/chat/zekochat/sheets/ChannelContextSheet.kt index e7020fc9..8428e75d 100644 --- a/app/src/main/java/chat/peptide/sheets/ChannelContextSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/ChannelContextSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import android.widget.Toast import androidx.compose.animation.AnimatedContent @@ -41,17 +41,17 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import chat.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.internals.ChannelUtils -import chat.peptide.composables.generic.RemoteImage -import chat.peptide.composables.generic.SheetButton -import chat.peptide.internals.Platform -import chat.peptide.screens.chat.dialogs.InviteDialog +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.ChannelUtils +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.SheetButton +import chat.zekochat.internals.Platform +import chat.zekochat.screens.chat.dialogs.InviteDialog import kotlinx.coroutines.launch -import chat.peptide.api.settings.NotificationType -import chat.peptide.api.settings.SyncedSettings -import chat.peptide.api.schemas.NotificationSettings +import chat.zekochat.api.settings.NotificationType +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.api.schemas.NotificationSettings import kotlinx.coroutines.GlobalScope @Composable diff --git a/app/src/main/java/chat/peptide/sheets/ChannelInfoSheet.kt b/app/src/main/java/chat/zekochat/sheets/ChannelInfoSheet.kt similarity index 91% rename from app/src/main/java/chat/peptide/sheets/ChannelInfoSheet.kt rename to app/src/main/java/chat/zekochat/sheets/ChannelInfoSheet.kt index 588689fc..8d63e660 100644 --- a/app/src/main/java/chat/peptide/sheets/ChannelInfoSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/ChannelInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.ChannelUtils +import chat.zekochat.api.internals.PermissionBit +import chat.zekochat.api.internals.Roles +import chat.zekochat.api.internals.has +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.generic.SheetButton +import chat.zekochat.composables.screens.chat.ChannelSheetHeader +import chat.zekochat.internals.extensions.rememberChannelPermissions +import chat.zekochat.screens.chat.dialogs.InviteDialog import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/peptide/sheets/ColourPickerSheet.kt b/app/src/main/java/chat/zekochat/sheets/ColourPickerSheet.kt similarity index 99% rename from app/src/main/java/chat/peptide/sheets/ColourPickerSheet.kt rename to app/src/main/java/chat/zekochat/sheets/ColourPickerSheet.kt index f3e0edfc..b63f5e36 100644 --- a/app/src/main/java/chat/peptide/sheets/ColourPickerSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/ColourPickerSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import android.graphics.RuntimeShader import android.os.Build @@ -59,10 +59,10 @@ 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.peptide.R -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.internals.TailwindColourScheme +import chat.zekochat.R +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.internals.TailwindColourScheme import org.intellij.lang.annotations.Language enum class ColourPickerMode { diff --git a/app/src/main/java/chat/peptide/sheets/EmoteInfoSheet.kt b/app/src/main/java/chat/zekochat/sheets/EmoteInfoSheet.kt similarity index 91% rename from app/src/main/java/chat/peptide/sheets/EmoteInfoSheet.kt rename to app/src/main/java/chat/zekochat/sheets/EmoteInfoSheet.kt index 4edc3ac1..34b98e5f 100644 --- a/app/src/main/java/chat/peptide/sheets/EmoteInfoSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/EmoteInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.custom.fetchEmoji +import chat.zekochat.api.schemas.Emoji +import chat.zekochat.api.schemas.Server +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.SheetButton +import chat.zekochat.internals.Platform import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/peptide/sheets/JBMDebuggerSheet.kt b/app/src/main/java/chat/zekochat/sheets/JBMDebuggerSheet.kt similarity index 95% rename from app/src/main/java/chat/peptide/sheets/JBMDebuggerSheet.kt rename to app/src/main/java/chat/zekochat/sheets/JBMDebuggerSheet.kt index 90c524c6..c26505b2 100644 --- a/app/src/main/java/chat/peptide/sheets/JBMDebuggerSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/JBMDebuggerSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.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.peptide.composables.generic.SheetHeaderPadding -import chat.peptide.markdown.jbm.JBM -import chat.peptide.markdown.jbm.JBMApi +import chat.zekochat.composables.generic.SheetHeaderPadding +import chat.zekochat.markdown.jbm.JBM +import chat.zekochat.markdown.jbm.JBMApi import org.intellij.markdown.ast.ASTNode import org.intellij.markdown.ast.getTextInNode diff --git a/app/src/main/java/chat/peptide/sheets/LinkInfoSheet.kt b/app/src/main/java/chat/zekochat/sheets/LinkInfoSheet.kt similarity index 96% rename from app/src/main/java/chat/peptide/sheets/LinkInfoSheet.kt rename to app/src/main/java/chat/zekochat/sheets/LinkInfoSheet.kt index c9d4fb68..0485c9a8 100644 --- a/app/src/main/java/chat/peptide/sheets/LinkInfoSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/LinkInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.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.peptide.R -import chat.peptide.composables.generic.SheetButton -import chat.peptide.internals.Platform +import chat.zekochat.R +import chat.zekochat.composables.generic.SheetButton +import chat.zekochat.internals.Platform import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/peptide/sheets/MemberContextSheet.kt b/app/src/main/java/chat/zekochat/sheets/MemberContextSheet.kt similarity index 95% rename from app/src/main/java/chat/peptide/sheets/MemberContextSheet.kt rename to app/src/main/java/chat/zekochat/sheets/MemberContextSheet.kt index 5b4401c5..40fad96b 100644 --- a/app/src/main/java/chat/peptide/sheets/MemberContextSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/MemberContextSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.routes.channel.removeMember -import chat.peptide.composables.generic.SheetButton -import chat.peptide.internals.Platform +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.channel.removeMember +import chat.zekochat.composables.generic.SheetButton +import chat.zekochat.internals.Platform import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/peptide/sheets/MemberListSheet.kt b/app/src/main/java/chat/zekochat/sheets/MemberListSheet.kt similarity index 95% rename from app/src/main/java/chat/peptide/sheets/MemberListSheet.kt rename to app/src/main/java/chat/zekochat/sheets/MemberListSheet.kt index 9a422e6d..1ad01c02 100644 --- a/app/src/main/java/chat/peptide/sheets/MemberListSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/MemberListSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.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.peptide.R -import chat.peptide.api.PeptideAPI -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.PermissionBit +import chat.zekochat.api.internals.Roles +import chat.zekochat.api.internals.hasPermission +import chat.zekochat.api.routes.channel.fetchGroupParticipants +import chat.zekochat.api.routes.server.fetchMembers +import chat.zekochat.api.schemas.Member +import chat.zekochat.api.schemas.User +import chat.zekochat.composables.chat.MemberListItem +import chat.zekochat.composables.generic.CountableListHeader +import chat.zekochat.composables.generic.Presence +import chat.zekochat.composables.generic.SheetHeaderPadding +import chat.zekochat.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/peptide/sheets/MessageContextSheet.kt b/app/src/main/java/chat/zekochat/sheets/MessageContextSheet.kt similarity index 96% rename from app/src/main/java/chat/peptide/sheets/MessageContextSheet.kt rename to app/src/main/java/chat/zekochat/sheets/MessageContextSheet.kt index 5e862cd1..5704178a 100644 --- a/app/src/main/java/chat/peptide/sheets/MessageContextSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/MessageContextSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import android.widget.Toast import androidx.compose.foundation.layout.Arrangement @@ -31,21 +31,21 @@ 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.peptide.BuildConfig -import chat.peptide.R -import chat.peptide.api.PeptideAPI -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.PepTextButton -import chat.peptide.composables.generic.SheetButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.internals.Platform +import chat.zekochat.BuildConfig +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.PermissionBit +import chat.zekochat.api.internals.Roles +import chat.zekochat.api.internals.has +import chat.zekochat.api.routes.channel.deleteMessage +import chat.zekochat.api.routes.channel.react +import chat.zekochat.api.settings.Experiments +import chat.zekochat.callbacks.UiCallbacks +import chat.zekochat.composables.chat.Message +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SheetButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.internals.Platform import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/chat/peptide/sheets/ReactSheet.kt b/app/src/main/java/chat/zekochat/sheets/ReactSheet.kt similarity index 73% rename from app/src/main/java/chat/peptide/sheets/ReactSheet.kt rename to app/src/main/java/chat/zekochat/sheets/ReactSheet.kt index 98c69aac..a333c22a 100644 --- a/app/src/main/java/chat/peptide/sheets/ReactSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/ReactSheet.kt @@ -1,8 +1,8 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import androidx.compose.runtime.Composable -import chat.peptide.api.PeptideAPI -import chat.peptide.composables.emoji.EmojiPicker +import chat.zekochat.api.PeptideAPI +import chat.zekochat.composables.emoji.EmojiPicker @Composable fun ReactSheet(messageId: String, onSelect: (String?) -> Unit) { diff --git a/app/src/main/java/chat/peptide/sheets/ReactionInfoSheet.kt b/app/src/main/java/chat/zekochat/sheets/ReactionInfoSheet.kt similarity index 95% rename from app/src/main/java/chat/peptide/sheets/ReactionInfoSheet.kt rename to app/src/main/java/chat/zekochat/sheets/ReactionInfoSheet.kt index f77b818e..7e7d70dc 100644 --- a/app/src/main/java/chat/peptide/sheets/ReactionInfoSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/ReactionInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable @@ -41,20 +41,20 @@ 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.peptide.R -import chat.peptide.api.PeptideAPI -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.PepTextButton -import chat.peptide.composables.generic.RemoteImage -import chat.peptide.composables.generic.SquareButton -import chat.peptide.internals.text.MessageProcessor -import chat.peptide.persistence.KVStorage +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.internals.isUlid +import chat.zekochat.api.routes.custom.fetchEmoji +import chat.zekochat.api.routes.user.fetchUser +import chat.zekochat.api.schemas.Emoji +import chat.zekochat.api.schemas.User +import chat.zekochat.api.settings.LoadedSettings +import chat.zekochat.composables.chat.MemberListItem +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.RemoteImage +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.internals.text.MessageProcessor +import chat.zekochat.persistence.KVStorage import kotlinx.coroutines.launch @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/chat/peptide/sheets/ServerContextSheet.kt b/app/src/main/java/chat/zekochat/sheets/ServerContextSheet.kt similarity index 95% rename from app/src/main/java/chat/peptide/sheets/ServerContextSheet.kt rename to app/src/main/java/chat/zekochat/sheets/ServerContextSheet.kt index 3704e291..777e9c11 100644 --- a/app/src/main/java/chat/peptide/sheets/ServerContextSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/ServerContextSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import android.content.Intent import android.widget.Toast @@ -23,7 +23,6 @@ import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.foundation.verticalScroll import androidx.compose.material3.AlertDialog import androidx.compose.material3.Checkbox -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor @@ -50,22 +49,22 @@ 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.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.routes.server.leaveOrDeleteServer -import chat.peptide.api.schemas.NotificationSettings -import chat.peptide.api.settings.NotificationType -import chat.peptide.api.settings.SyncedSettings -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SheetButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.composables.markdown.RichMarkdown -import chat.peptide.composables.screens.settings.ServerOverview -import chat.peptide.composables.sheets.SheetSelection -import chat.peptide.callbacks.Action -import chat.peptide.callbacks.ActionChannel -import chat.peptide.internals.Platform -import chat.peptide.screens.chat.ChatRouterDestination +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.server.leaveOrDeleteServer +import chat.zekochat.api.schemas.NotificationSettings +import chat.zekochat.api.settings.NotificationType +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SheetButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.markdown.RichMarkdown +import chat.zekochat.composables.screens.settings.ServerOverview +import chat.zekochat.composables.sheets.SheetSelection +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.internals.Platform +import chat.zekochat.screens.chat.ChatRouterDestination import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/peptide/sheets/ServerIdentityOptionsSheet.kt b/app/src/main/java/chat/zekochat/sheets/ServerIdentityOptionsSheet.kt similarity index 97% rename from app/src/main/java/chat/peptide/sheets/ServerIdentityOptionsSheet.kt rename to app/src/main/java/chat/zekochat/sheets/ServerIdentityOptionsSheet.kt index 4ffd50a9..753417ce 100644 --- a/app/src/main/java/chat/peptide/sheets/ServerIdentityOptionsSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/ServerIdentityOptionsSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.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.peptide.api.PeptideAPI -import chat.peptide.persistence.KVStorage +import chat.zekochat.api.PeptideAPI +import chat.zekochat.persistence.KVStorage import kotlinx.coroutines.launch // Internal: Untranslated diff --git a/app/src/main/java/chat/peptide/sheets/StatusSheet.kt b/app/src/main/java/chat/zekochat/sheets/StatusSheet.kt similarity index 94% rename from app/src/main/java/chat/peptide/sheets/StatusSheet.kt rename to app/src/main/java/chat/zekochat/sheets/StatusSheet.kt index 73ad4817..d9f30660 100644 --- a/app/src/main/java/chat/peptide/sheets/StatusSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/StatusSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import android.util.Log import androidx.compose.foundation.background @@ -34,16 +34,16 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import chat.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.routes.user.patchSelf -import chat.peptide.api.schemas.User -import chat.peptide.composables.generic.PepTextButton -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 chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.user.patchSelf +import chat.zekochat.api.schemas.User +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SheetButton +import chat.zekochat.composables.generic.asApiName +import chat.zekochat.composables.generic.presenceFromStatus +import chat.zekochat.composables.screens.settings.UserOverview +import chat.zekochat.composables.settings.profile.StatusPicker import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/chat/peptide/sheets/UserCardSheet.kt b/app/src/main/java/chat/zekochat/sheets/UserCardSheet.kt similarity index 95% rename from app/src/main/java/chat/peptide/sheets/UserCardSheet.kt rename to app/src/main/java/chat/zekochat/sheets/UserCardSheet.kt index eaac638d..276974de 100644 --- a/app/src/main/java/chat/peptide/sheets/UserCardSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/UserCardSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import android.content.ClipData import android.content.Intent @@ -34,14 +34,14 @@ 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.peptide.BuildConfig -import chat.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.schemas.User -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.composables.profile.UserCard -import chat.peptide.internals.Platform +import chat.zekochat.BuildConfig +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.schemas.User +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.profile.UserCard +import chat.zekochat.internals.Platform import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/chat/peptide/sheets/UserInfoSheet.kt b/app/src/main/java/chat/zekochat/sheets/UserInfoSheet.kt similarity index 96% rename from app/src/main/java/chat/peptide/sheets/UserInfoSheet.kt rename to app/src/main/java/chat/zekochat/sheets/UserInfoSheet.kt index d744a7d2..48c8ad00 100644 --- a/app/src/main/java/chat/peptide/sheets/UserInfoSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/UserInfoSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import android.widget.Toast import androidx.compose.animation.AnimatedContent @@ -49,25 +49,25 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import chat.peptide.R -import chat.peptide.api.PeptideAPI -import chat.peptide.api.routes.user.blockUser -import chat.peptide.api.routes.user.fetchUser -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.ChannelType -import chat.peptide.api.schemas.NotificationSettings -import chat.peptide.api.settings.Experiments -import chat.peptide.api.settings.NotificationType -import chat.peptide.api.settings.SyncedSettings -import chat.peptide.callbacks.Action -import chat.peptide.callbacks.ActionChannel -import chat.peptide.composables.generic.NonIdealState -import chat.peptide.composables.generic.SheetButton -import chat.peptide.composables.generic.UserAvatar -import chat.peptide.composables.screens.settings.UserButtons -import chat.peptide.internals.Platform +import chat.zekochat.R +import chat.zekochat.api.PeptideAPI +import chat.zekochat.api.routes.user.blockUser +import chat.zekochat.api.routes.user.fetchUser +import chat.zekochat.api.routes.user.openDM +import chat.zekochat.api.routes.user.unblockUser +import chat.zekochat.api.routes.user.unfriendUser +import chat.zekochat.api.schemas.ChannelType +import chat.zekochat.api.schemas.NotificationSettings +import chat.zekochat.api.settings.Experiments +import chat.zekochat.api.settings.NotificationType +import chat.zekochat.api.settings.SyncedSettings +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.composables.generic.NonIdealState +import chat.zekochat.composables.generic.SheetButton +import chat.zekochat.composables.generic.UserAvatar +import chat.zekochat.composables.screens.settings.UserButtons +import chat.zekochat.internals.Platform import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import logcat.LogPriority diff --git a/app/src/main/java/chat/peptide/sheets/WebHookUserSheet.kt b/app/src/main/java/chat/zekochat/sheets/WebHookUserSheet.kt similarity index 94% rename from app/src/main/java/chat/peptide/sheets/WebHookUserSheet.kt rename to app/src/main/java/chat/zekochat/sheets/WebHookUserSheet.kt index 696362e8..03b18f2e 100644 --- a/app/src/main/java/chat/peptide/sheets/WebHookUserSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/WebHookUserSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets +package chat.zekochat.sheets import android.widget.Toast import androidx.compose.foundation.Image @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -18,8 +17,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.peptide.R -import chat.peptide.composables.generic.SquareButton +import chat.zekochat.R +import chat.zekochat.composables.generic.SquareButton @Composable fun WebHookUserSheet(modifier: Modifier = Modifier) { diff --git a/app/src/main/java/chat/peptide/sheets/spark/SwipeToReplySparkSheet.kt b/app/src/main/java/chat/zekochat/sheets/spark/SwipeToReplySparkSheet.kt similarity index 90% rename from app/src/main/java/chat/peptide/sheets/spark/SwipeToReplySparkSheet.kt rename to app/src/main/java/chat/zekochat/sheets/spark/SwipeToReplySparkSheet.kt index d1637983..d6fa0f33 100644 --- a/app/src/main/java/chat/peptide/sheets/spark/SwipeToReplySparkSheet.kt +++ b/app/src/main/java/chat/zekochat/sheets/spark/SwipeToReplySparkSheet.kt @@ -1,4 +1,4 @@ -package chat.peptide.sheets.spark +package chat.zekochat.sheets.spark import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -17,10 +17,10 @@ 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.peptide.R -import chat.peptide.composables.generic.PepTextButton -import chat.peptide.composables.generic.SquareButton -import chat.peptide.composables.vectorassets.SwipeToReplySpark +import chat.zekochat.R +import chat.zekochat.composables.generic.PepTextButton +import chat.zekochat.composables.generic.SquareButton +import chat.zekochat.composables.vectorassets.SwipeToReplySpark @Composable fun SwipeToReplySparkSheet( diff --git a/app/src/main/java/chat/peptide/ui/theme/AppColors.kt b/app/src/main/java/chat/zekochat/ui/theme/AppColors.kt similarity index 99% rename from app/src/main/java/chat/peptide/ui/theme/AppColors.kt rename to app/src/main/java/chat/zekochat/ui/theme/AppColors.kt index cc6b9771..ec8215c3 100644 --- a/app/src/main/java/chat/peptide/ui/theme/AppColors.kt +++ b/app/src/main/java/chat/zekochat/ui/theme/AppColors.kt @@ -1,4 +1,4 @@ -package chat.peptide.ui.theme +package chat.zekochat.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/chat/peptide/ui/theme/OverridableColourScheme.kt b/app/src/main/java/chat/zekochat/ui/theme/OverridableColourScheme.kt similarity index 99% rename from app/src/main/java/chat/peptide/ui/theme/OverridableColourScheme.kt rename to app/src/main/java/chat/zekochat/ui/theme/OverridableColourScheme.kt index 91e3f4f0..74b199be 100644 --- a/app/src/main/java/chat/peptide/ui/theme/OverridableColourScheme.kt +++ b/app/src/main/java/chat/zekochat/ui/theme/OverridableColourScheme.kt @@ -1,9 +1,9 @@ -package chat.peptide.ui.theme +package chat.zekochat.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import chat.peptide.R +import chat.zekochat.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/peptide/ui/theme/Theme.kt b/app/src/main/java/chat/zekochat/ui/theme/Theme.kt similarity index 98% rename from app/src/main/java/chat/peptide/ui/theme/Theme.kt rename to app/src/main/java/chat/zekochat/ui/theme/Theme.kt index 3b91fc26..85000c20 100644 --- a/app/src/main/java/chat/peptide/ui/theme/Theme.kt +++ b/app/src/main/java/chat/zekochat/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package chat.peptide.ui.theme +package chat.zekochat.ui.theme import android.annotation.SuppressLint import android.app.Activity @@ -10,7 +10,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme -import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/chat/peptide/ui/theme/Typography.kt b/app/src/main/java/chat/zekochat/ui/theme/Typography.kt similarity index 98% rename from app/src/main/java/chat/peptide/ui/theme/Typography.kt rename to app/src/main/java/chat/zekochat/ui/theme/Typography.kt index 1e5446ff..509ab097 100644 --- a/app/src/main/java/chat/peptide/ui/theme/Typography.kt +++ b/app/src/main/java/chat/zekochat/ui/theme/Typography.kt @@ -1,4 +1,4 @@ -package chat.peptide.ui.theme +package chat.zekochat.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle @@ -7,7 +7,7 @@ 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.peptide.R +import chat.zekochat.R private val Inter = FontFamily( diff --git a/app/src/main/java/chat/peptide/utils/DeepLinkHandler.kt b/app/src/main/java/chat/zekochat/utils/DeepLinkHandler.kt similarity index 96% rename from app/src/main/java/chat/peptide/utils/DeepLinkHandler.kt rename to app/src/main/java/chat/zekochat/utils/DeepLinkHandler.kt index 71c0c0d4..d606229c 100644 --- a/app/src/main/java/chat/peptide/utils/DeepLinkHandler.kt +++ b/app/src/main/java/chat/zekochat/utils/DeepLinkHandler.kt @@ -1,4 +1,4 @@ -package chat.peptide.utils +package chat.zekochat.utils /** * Static handler for deep link data that needs to be passed between activities and composables. diff --git a/app/src/main/java/chat/peptide/utils/DeepLinkUtils.kt b/app/src/main/java/chat/zekochat/utils/DeepLinkUtils.kt similarity index 98% rename from app/src/main/java/chat/peptide/utils/DeepLinkUtils.kt rename to app/src/main/java/chat/zekochat/utils/DeepLinkUtils.kt index d703f24d..a4c78abe 100644 --- a/app/src/main/java/chat/peptide/utils/DeepLinkUtils.kt +++ b/app/src/main/java/chat/zekochat/utils/DeepLinkUtils.kt @@ -1,10 +1,10 @@ -package chat.peptide.utils +package chat.zekochat.utils import android.content.Context import android.content.Intent import android.net.Uri -import chat.peptide.activities.DeepLinkActivity -import chat.peptide.activities.MainActivity +import chat.zekochat.activities.DeepLinkActivity +import chat.zekochat.activities.MainActivity /** * Utility class for handling deep links in the Peptide app. diff --git a/app/src/main/java/chat/peptide/utils/InternalLinkHandler.kt b/app/src/main/java/chat/zekochat/utils/InternalLinkHandler.kt similarity index 96% rename from app/src/main/java/chat/peptide/utils/InternalLinkHandler.kt rename to app/src/main/java/chat/zekochat/utils/InternalLinkHandler.kt index 389915ea..28bc9d06 100644 --- a/app/src/main/java/chat/peptide/utils/InternalLinkHandler.kt +++ b/app/src/main/java/chat/zekochat/utils/InternalLinkHandler.kt @@ -1,13 +1,13 @@ -package chat.peptide.utils +package chat.zekochat.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 chat.zekochat.activities.DeepLinkActivity +import chat.zekochat.callbacks.Action +import chat.zekochat.callbacks.ActionChannel +import chat.zekochat.screens.chat.ChatRouterDestination import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/res/drawable/splash_screen_icon.xml b/app/src/main/res/drawable/splash_screen_icon.xml new file mode 100644 index 00000000..69586c69 --- /dev/null +++ b/app/src/main/res/drawable/splash_screen_icon.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/zeko_rounded_icon.xml b/app/src/main/res/drawable/zeko_rounded_icon.xml new file mode 100644 index 00000000..1ea2a531 --- /dev/null +++ b/app/src/main/res/drawable/zeko_rounded_icon.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/zeko_text_logo.xml b/app/src/main/res/drawable/zeko_text_logo.xml new file mode 100644 index 00000000..1ffe9a7b --- /dev/null +++ b/app/src/main/res/drawable/zeko_text_logo.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/zeko_transparent_logo.xml b/app/src/main/res/drawable/zeko_transparent_logo.xml new file mode 100644 index 00000000..71896c6c --- /dev/null +++ b/app/src/main/res/drawable/zeko_transparent_logo.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index b070c763..00000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index b070c763..00000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index fe170f68..a4ecf258 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index ee98a72a..a33d49ec 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index b9044ea5..7dcb22cf 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 4bc233c3..2d842b14 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b67bea85..6d55bf2f 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml index bfa994a3..97632d5b 100644 --- a/app/src/main/res/values-v31/themes.xml +++ b/app/src/main/res/values-v31/themes.xml @@ -5,6 +5,6 @@ @android:color/transparent @android:color/transparent @color/background - @drawable/ic_launcher_foreground + @drawable/splash_screen_icon \ No newline at end of file diff --git a/app/src/main/res/values-v33/themes.xml b/app/src/main/res/values-v33/themes.xml index 5680b8cf..cfebe11d 100644 --- a/app/src/main/res/values-v33/themes.xml +++ b/app/src/main/res/values-v33/themes.xml @@ -2,7 +2,7 @@ diff --git a/settings.gradle.kts b/settings.gradle.kts index be0ef9cc..f24ef083 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,5 +27,5 @@ dependencyResolutionManagement { } } } -rootProject.name = "PepChat" +rootProject.name = "ZekoChat" include(":app")