From 24fe3ef5430e14092b181af77173edabdf313567 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Wed, 1 Apr 2026 19:52:59 +0100 Subject: [PATCH] android frontend first implementation --- .idea/caches/deviceStreaming.xml | 1550 +++++++++++++++++ .idea/deviceManager.xml | 13 + android/.gitignore | 15 + android/.idea/.gitignore | 3 + android/.idea/.name | 1 + android/.idea/AndroidProjectSystem.xml | 6 + android/.idea/appInsightsSettings.xml | 6 + android/.idea/codeStyles/Project.xml | 123 ++ android/.idea/codeStyles/codeStyleConfig.xml | 5 + android/.idea/compiler.xml | 6 + android/.idea/deploymentTargetSelector.xml | 13 + android/.idea/deviceManager.xml | 13 + android/.idea/gradle.xml | 18 + .../inspectionProfiles/Project_Default.xml | 61 + android/.idea/misc.xml | 9 + android/.idea/runConfigurations.xml | 17 + android/.idea/studiobot.xml | 6 + android/.idea/vcs.xml | 6 + android/app/.gitignore | 1 + android/app/build.gradle.kts | 76 + android/app/proguard-rules.pro | 21 + .../android/ExampleInstrumentedTest.kt | 24 + android/app/src/main/AndroidManifest.xml | 31 + .../zxq5/chatapp/android/ChatApplication.kt | 11 + .../dev/zxq5/chatapp/android/MainActivity.kt | 50 + .../dev/zxq5/chatapp/android/api/ApiClient.kt | 361 ++++ .../zxq5/chatapp/android/core/constants.kt | 3 + .../chatapp/android/core/data/TokenStore.kt | 78 + .../chatapp/android/core/error/ApiResult.kt | 7 + .../android/data/repository/AuthRepository.kt | 35 + .../chatapp/android/model/ChatViewModel.kt | 325 ++++ .../chatapp/android/model/LoginRequest.kt | 11 + .../chatapp/android/model/LoginResponse.kt | 6 + .../zxq5/chatapp/android/model/LoginState.kt | 9 + .../dev/zxq5/chatapp/android/model/Message.kt | 11 + .../zxq5/chatapp/android/model/SendMessage.kt | 10 + .../chatapp/android/model/SignupRequest.kt | 14 + .../chatapp/android/ui/components/chat.kt | 435 +++++ .../chatapp/android/ui/components/login.kt | 318 ++++ .../chatapp/android/ui/components/settings.kt | 368 ++++ .../android/ui/components/textfield.kt | 45 + .../zxq5/chatapp/android/ui/theme/Color.kt | 20 + .../zxq5/chatapp/android/ui/theme/Theme.kt | 48 + .../dev/zxq5/chatapp/android/ui/theme/Type.kt | 37 + .../res/drawable/ic_launcher_background.xml | 170 ++ .../res/drawable/ic_launcher_foreground.xml | 30 + .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../main/res/nothing_messenger_mockup.html | 765 ++++++++ .../app/src/main/res/nothing_table_ui.html | 627 +++++++ android/app/src/main/res/values/colors.xml | 10 + android/app/src/main/res/values/strings.xml | 3 + android/app/src/main/res/values/themes.xml | 5 + android/app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 + .../zxq5/chatapp/android/ExampleUnitTest.kt | 17 + android/build.gradle.kts | 6 + android/gradle.properties | 15 + android/gradle/gradle-daemon-jvm.properties | 12 + android/gradle/libs.versions.toml | 51 + android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 + android/gradlew | 251 +++ android/gradlew.bat | 94 + android/settings.gradle.kts | 27 + 75 files changed, 6362 insertions(+) create mode 100644 .idea/caches/deviceStreaming.xml create mode 100644 .idea/deviceManager.xml create mode 100644 android/.gitignore create mode 100644 android/.idea/.gitignore create mode 100644 android/.idea/.name create mode 100644 android/.idea/AndroidProjectSystem.xml create mode 100644 android/.idea/appInsightsSettings.xml create mode 100644 android/.idea/codeStyles/Project.xml create mode 100644 android/.idea/codeStyles/codeStyleConfig.xml create mode 100644 android/.idea/compiler.xml create mode 100644 android/.idea/deploymentTargetSelector.xml create mode 100644 android/.idea/deviceManager.xml create mode 100644 android/.idea/gradle.xml create mode 100644 android/.idea/inspectionProfiles/Project_Default.xml create mode 100644 android/.idea/misc.xml create mode 100644 android/.idea/runConfigurations.xml create mode 100644 android/.idea/studiobot.xml create mode 100644 android/.idea/vcs.xml create mode 100644 android/app/.gitignore create mode 100644 android/app/build.gradle.kts create mode 100644 android/app/proguard-rules.pro create mode 100644 android/app/src/androidTest/java/dev/zxq5/chatapp/android/ExampleInstrumentedTest.kt create mode 100644 android/app/src/main/AndroidManifest.xml create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/ChatApplication.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/MainActivity.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/api/ApiClient.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/core/constants.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/core/data/TokenStore.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/core/error/ApiResult.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/data/repository/AuthRepository.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/model/ChatViewModel.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginRequest.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginResponse.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginState.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/model/Message.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/model/SendMessage.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/model/SignupRequest.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/chat.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/login.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/settings.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/textfield.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Color.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Theme.kt create mode 100644 android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Type.kt create mode 100644 android/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 android/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 android/app/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/nothing_messenger_mockup.html create mode 100644 android/app/src/main/res/nothing_table_ui.html create mode 100644 android/app/src/main/res/values/colors.xml create mode 100644 android/app/src/main/res/values/strings.xml create mode 100644 android/app/src/main/res/values/themes.xml create mode 100644 android/app/src/main/res/xml/backup_rules.xml create mode 100644 android/app/src/main/res/xml/data_extraction_rules.xml create mode 100644 android/app/src/test/java/dev/zxq5/chatapp/android/ExampleUnitTest.kt create mode 100644 android/build.gradle.kts create mode 100644 android/gradle.properties create mode 100644 android/gradle/gradle-daemon-jvm.properties create mode 100644 android/gradle/libs.versions.toml create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100755 android/gradlew create mode 100644 android/gradlew.bat create mode 100644 android/settings.gradle.kts diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml new file mode 100644 index 0000000..6a3e9f5 --- /dev/null +++ b/.idea/caches/deviceStreaming.xml @@ -0,0 +1,1550 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml new file mode 100644 index 0000000..91f9558 --- /dev/null +++ b/.idea/deviceManager.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/android/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/android/.idea/.name b/android/.idea/.name new file mode 100644 index 0000000..00796b0 --- /dev/null +++ b/android/.idea/.name @@ -0,0 +1 @@ +Chatapp \ No newline at end of file diff --git a/android/.idea/AndroidProjectSystem.xml b/android/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/android/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/android/.idea/appInsightsSettings.xml b/android/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..7f73dc8 --- /dev/null +++ b/android/.idea/appInsightsSettings.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/android/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/android/.idea/codeStyles/codeStyleConfig.xml b/android/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/android/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/android/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/deploymentTargetSelector.xml b/android/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..fc8303f --- /dev/null +++ b/android/.idea/deploymentTargetSelector.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/android/.idea/deviceManager.xml b/android/.idea/deviceManager.xml new file mode 100644 index 0000000..91f9558 --- /dev/null +++ b/android/.idea/deviceManager.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml new file mode 100644 index 0000000..02c4aa5 --- /dev/null +++ b/android/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/android/.idea/inspectionProfiles/Project_Default.xml b/android/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..7061a0d --- /dev/null +++ b/android/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,61 @@ + + + + \ No newline at end of file diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml new file mode 100644 index 0000000..b2c751a --- /dev/null +++ b/android/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/android/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/studiobot.xml b/android/.idea/studiobot.xml new file mode 100644 index 0000000..539e3b8 --- /dev/null +++ b/android/.idea/studiobot.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/android/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/app/.gitignore b/android/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/android/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts new file mode 100644 index 0000000..46ac932 --- /dev/null +++ b/android/app/build.gradle.kts @@ -0,0 +1,76 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.serialization) +} + +android { + namespace = "dev.zxq5.chatapp.android" + compileSdk = 35 + + defaultConfig { + applicationId = "dev.zxq5.chatapp.android" + minSdk = 26 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + buildFeatures { + compose = true + } +} + +dependencies { + // Ktor client + implementation(libs.ktor.client.android) + implementation(libs.ktor.client.content.negotiation) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(libs.ktor.client.auth) // Auth plugin + // Kotlinx Serialization + implementation(libs.kotlinx.serialization.json) + + // Coroutines + implementation(libs.kotlinx.coroutines.android) + + // ViewModel + implementation(libs.androidx.lifecycle.viewmodel.compose) + + // Encrypted storage for session cookie/token + implementation(libs.androidx.security.crypto) + + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.foundation.layout) + implementation(libs.androidx.compose.material.icons.extended) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.tooling) + debugImplementation(libs.androidx.compose.ui.test.manifest) +} \ No newline at end of file diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/android/app/src/androidTest/java/dev/zxq5/chatapp/android/ExampleInstrumentedTest.kt b/android/app/src/androidTest/java/dev/zxq5/chatapp/android/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..9e02c75 --- /dev/null +++ b/android/app/src/androidTest/java/dev/zxq5/chatapp/android/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package dev.zxq5.chatapp.android + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("dev.zxq5.chatapp.android", appContext.packageName) + } +} \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..92adfa2 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/ChatApplication.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/ChatApplication.kt new file mode 100644 index 0000000..907df9a --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/ChatApplication.kt @@ -0,0 +1,11 @@ +package dev.zxq5.chatapp.android + +import android.app.Application +import dev.zxq5.chatapp.android.api.ApiClient + +class ChatApplication : Application() { + override fun onCreate() { + super.onCreate() + ApiClient.init(this) + } +} diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/MainActivity.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/MainActivity.kt new file mode 100644 index 0000000..d8d1512 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/MainActivity.kt @@ -0,0 +1,50 @@ +package dev.zxq5.chatapp.android + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.lifecycle.viewmodel.compose.viewModel +import dev.zxq5.chatapp.android.model.ChatViewModel +import dev.zxq5.chatapp.android.model.LoginState +import dev.zxq5.chatapp.android.model.MainScreen +import dev.zxq5.chatapp.android.ui.components.AuthScreen +import dev.zxq5.chatapp.android.ui.components.ChatScreen +import dev.zxq5.chatapp.android.ui.components.SettingsScreen +import dev.zxq5.chatapp.android.ui.theme.ChatappTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + ChatappTheme { + val viewModel: ChatViewModel = viewModel() + val loginState by viewModel.loginState.collectAsState() + val currentScreen by viewModel.currentScreen.collectAsState() + + Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> + androidx.compose.foundation.layout.Box(modifier = Modifier.padding(innerPadding)) { + if (loginState is LoginState.Success) { + when (currentScreen) { + MainScreen.CHAT -> ChatScreen(viewModel = viewModel) + MainScreen.SETTINGS -> SettingsScreen(viewModel = viewModel) + } + } else { + AuthScreen( + viewModel = viewModel, + onSuccess = { } + ) + } + } + } + } + } + } +} diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/api/ApiClient.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/api/ApiClient.kt new file mode 100644 index 0000000..7c9e333 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/api/ApiClient.kt @@ -0,0 +1,361 @@ +package dev.zxq5.chatapp.android.api + +import android.content.Context +import android.util.Log +import dev.zxq5.chatapp.android.core.data.TokenStore.getScopeFromToken +import dev.zxq5.chatapp.android.model.LoginRequest +import dev.zxq5.chatapp.android.model.LoginResponse +import dev.zxq5.chatapp.android.model.Message +import dev.zxq5.chatapp.android.model.SendMessage +import dev.zxq5.chatapp.android.model.SignupRequest +import io.ktor.client.HttpClient +import io.ktor.client.call.body +import io.ktor.client.engine.android.Android +import io.ktor.client.plugins.contentnegotiation.ContentNegotiation +import io.ktor.client.request.get +import io.ktor.client.request.post +import io.ktor.client.request.delete +import io.ktor.client.request.prepareGet +import io.ktor.client.request.setBody +import io.ktor.client.statement.bodyAsChannel +import io.ktor.http.ContentType +import io.ktor.http.contentType +import io.ktor.http.isSuccess +import io.ktor.serialization.kotlinx.json.json +import io.ktor.utils.io.readUTF8Line +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flow +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.Json + +import io.ktor.client.plugins.auth.Auth +import io.ktor.client.plugins.auth.providers.BearerTokens +import io.ktor.client.plugins.auth.providers.bearer +import io.ktor.http.encodedPath +import dev.zxq5.chatapp.android.core.BASE_URL +import dev.zxq5.chatapp.android.core.data.TokenStore +import dev.zxq5.chatapp.android.core.data.TokenStore.getUserIdFromToken +import dev.zxq5.chatapp.android.core.error.ApiResult +import kotlinx.serialization.KSerializer +import kotlinx.serialization.descriptors.PrimitiveKind +import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor +import kotlinx.serialization.descriptors.SerialDescriptor +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder + +@Serializable +data class QrResponse(val qr_code: String) + +@Serializable +data class TOTPSixDigitCode(val code: String) + +@Serializable(with = TotpStatusSerializer::class) +enum class TotpStatus { + ENABLED, DISABLED; + + val isEnabled: Boolean get() = this == ENABLED +} + +object TotpStatusSerializer : KSerializer { + override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("TotpStatus", PrimitiveKind.STRING) + override fun serialize(encoder: Encoder, value: TotpStatus) = encoder.encodeString(value.name.lowercase()) + override fun deserialize(decoder: Decoder): TotpStatus = + TotpStatus.valueOf(decoder.decodeString().uppercase()) +} + +@Serializable +data class TotpStatusResponse(val status: TotpStatus) + +@Serializable +data class PasswordChangeRequest(val old_password: String, val new_password: String) + +@Serializable +data class DisplayNameRequest(val display_name: String?) + +object ApiClient { + private lateinit var appContext: Context + + fun init(context: Context) { + appContext = context.applicationContext + } + + fun hasToken(): Boolean { + return TokenStore.get(appContext) != null + } + + fun getTokenScope(): String? { + val token = TokenStore.get(appContext) ?: return null + val scope = getScopeFromToken(token) + Log.d("Chat", "Current token scope: $scope") + return scope + } + + fun getStoredUserId(): Int? { + return TokenStore.getUserId(appContext) + } + + fun is2faEnabledLocal(): Boolean { + return TokenStore.is2faEnabled(appContext) + } + + fun set2faEnabledLocal(enabled: Boolean) { + TokenStore.save2faEnabled(appContext, enabled) + } + + private var _http: HttpClient? = null + val http: HttpClient + get() = synchronized(this) { + _http ?: createClient().also { _http = it } + } + + private fun createClient(): HttpClient { + return HttpClient(Android) { + install(ContentNegotiation) { + json(Json { ignoreUnknownKeys = true }) + } + install(Auth) { + bearer { + loadTokens { + val token = TokenStore.get(appContext) ?: return@loadTokens null + Log.d("Chat", "Auth plugin loading token: ${getScopeFromToken(token)}") + BearerTokens(token, "") + } + sendWithoutRequest { request -> + val path = request.url.encodedPath + !path.endsWith("/login") && !path.endsWith("/signup") + } + } + } + } + } + + private fun resetClient() { + Log.d("Chat", "Resetting HttpClient to refresh tokens") + _http?.close() + _http = null + } + + suspend fun login(username: String, password: String): ApiResult { + return try { + val response = http.post("${BASE_URL}/api/login") { + contentType(ContentType.Application.Json) + setBody(LoginRequest(username, password)) + } + if (response.status.isSuccess()) { + val body = response.body() + Log.d("Chat", "Login token scope: ${getScopeFromToken(body.token)}") + TokenStore.save(appContext, body.token) + resetClient() + ApiResult.Success(body) + } else { + ApiResult.HttpError( + status = response.status.value, + message = when (response.status.value) { + 401 -> "Invalid username or password" + 403 -> "Account suspended" + 429 -> "Too many attempts, please wait" + else -> "Login failed (${response.status.value})" + } + ) + } + } catch (e: Exception) { + Log.e("Chat", "Login network error", e) + ApiResult.NetworkError(e.localizedMessage ?: "Network error") + } + } + + suspend fun signup(username: String, email: String, password: String, token: String): ApiResult { + return try { + val response = http.post("${BASE_URL}/api/signup") { + contentType(ContentType.Application.Json) + setBody(SignupRequest(username = username, email = email, password = password, access_token = token)) + } + if (response.status.isSuccess()) { + val body = response.body() + TokenStore.save(appContext, body.token) + resetClient() + ApiResult.Success(body) + } else { + ApiResult.HttpError( + status = response.status.value, + message = when (response.status.value) { + 401 -> "Invalid access token" + else -> "Signup failed (${response.status.value})" + } + ) + } + } catch (e: Exception) { + Log.e("Chat", "Signup error", e) + ApiResult.NetworkError(e.localizedMessage ?: "Network error") + } + } + + fun logout() { + TokenStore.clear(appContext) + resetClient() + } + + suspend fun sendMessage(channelId: Int, text: String) { + val userId = TokenStore.getUserId(appContext) ?: return + http.post("${BASE_URL}/api/chat/$channelId") { + contentType(ContentType.Application.Json) + setBody(SendMessage( + user_id = userId, + text = text, + timestamp = System.currentTimeMillis() + )) + } + } + + fun messageStream(channelId: Int): Flow = flow { + http.prepareGet("${BASE_URL}/api/events/$channelId").execute { response -> + val channel = response.bodyAsChannel() + while (!channel.isClosedForRead) { + val line = channel.readUTF8Line(256) ?: break + if (line.startsWith("data:")) { + val json = line.removePrefix("data:").trim() + runCatching { Json.decodeFromString(json) } + .onSuccess { emit(it) } + } + } + } + } + + suspend fun getTotpQr(): QrResponse? { + return try { + http.get("${BASE_URL}/api/totp.jpg").body() + } catch (e: Exception) { + Log.e("Chat", "Error fetching TOTP QR", e) + null + } + } + + suspend fun confirmTotp(code: String): Boolean { + return try { + val response = http.post("${BASE_URL}/api/totp") { + contentType(ContentType.Application.Json) + setBody(TOTPSixDigitCode(code)) + } + if (response.status.isSuccess()) { + // If confirming TOTP returns a new token (e.g. from partial to full), we should save it + // Assuming confirm might return a LoginResponse if it upgrades the session + runCatching { + val body = response.body() + TokenStore.save(appContext, body.token) + resetClient() + } + set2faEnabledLocal(true) + true + } else { + false + } + } catch (e: Exception) { + Log.e("Chat", "Error confirming TOTP", e) + false + } + } + + suspend fun verifyTotpLogin(code: String): ApiResult { + return try { + val response = http.post("${BASE_URL}/api/totp/verify") { + contentType(ContentType.Application.Json) + setBody(TOTPSixDigitCode(code)) + } + if (response.status.isSuccess()) { + val body = response.body() + + val tok = body.token; + Log.d("Chat", "UID ${getUserIdFromToken(tok)}"); + Log.d("Chat", "Token ${getScopeFromToken(tok)}"); + + TokenStore.save(appContext, body.token) + resetClient() + ApiResult.Success(body) + } else { + val errorText = try { response.body() } catch (e: Exception) { "Unknown error" } + Log.e("Chat", "TOTP verify failed: ${response.status.value} - $errorText") + ApiResult.HttpError( + status = response.status.value, + message = when (response.status.value) { + 401 -> "Incorrect code, please try again" + 403 -> "Session expired, please log in again" + 429 -> "Too many attempts, please wait" + else -> "Verification failed (${response.status.value})" + } + ) + } + } catch (e: Exception) { + Log.e("Chat", "TOTP verify network error", e) + ApiResult.NetworkError(e.localizedMessage ?: "Network error") + } + } + + suspend fun getTotpStatus(): Boolean { + return try { + val response = http.get("${BASE_URL}/api/totp/status") + if (response.status.isSuccess()) { + val status = response.body() + val enabled = status.isEnabled + set2faEnabledLocal(enabled) + enabled + } else { + is2faEnabledLocal() + } + } catch (e: Exception) { + Log.e("Chat", "Error getting TOTP status", e) + is2faEnabledLocal() + } + } + + suspend fun disableTotp(): ApiResult { + return try { + val response = http.delete("${BASE_URL}/api/totp") + if (response.status.isSuccess()) { + val body = response.body() + TokenStore.save(appContext, body.token) + set2faEnabledLocal(false) + resetClient() + ApiResult.Success(body) + } else { + ApiResult.HttpError(response.status.value, "Failed to disable TOTP") + } + } catch (e: Exception) { + Log.e("Chat", "Error disabling TOTP", e) + ApiResult.NetworkError(e.localizedMessage ?: "Network error") + } + } + + suspend fun changePassword(old: String, new: String): ApiResult { + return try { + val response = http.post("${BASE_URL}/api/settings/password") { + contentType(ContentType.Application.Json) + setBody(PasswordChangeRequest(old, new)) + } + if (response.status.isSuccess()) { + ApiResult.Success(Unit) + } else { + ApiResult.HttpError( + response.status.value, + if (response.status.value == 401) "Old password is wrong" else "Password change failed" + ) + } + } catch (e: Exception) { + Log.e("Chat", "Error changing password", e) + ApiResult.NetworkError(e.localizedMessage ?: "Network error") + } + } + + suspend fun updateDisplayName(name: String?): Boolean { + return try { + val response = http.post("${BASE_URL}/api/settings/display_name") { + contentType(ContentType.Application.Json) + setBody(DisplayNameRequest(name)) + } + response.status.isSuccess() + } catch (e: Exception) { + Log.e("Chat", "Error updating display name", e) + false + } + } +} + diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/core/constants.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/core/constants.kt new file mode 100644 index 0000000..c67d567 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/core/constants.kt @@ -0,0 +1,3 @@ +package dev.zxq5.chatapp.android.core + +const val BASE_URL = "http://zxq5-x1:8000" \ No newline at end of file diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/core/data/TokenStore.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/core/data/TokenStore.kt new file mode 100644 index 0000000..f25e33c --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/core/data/TokenStore.kt @@ -0,0 +1,78 @@ +package dev.zxq5.chatapp.android.core.data + +import android.content.Context +import android.content.SharedPreferences +import android.util.Base64 +import androidx.core.content.edit +import androidx.security.crypto.EncryptedSharedPreferences +import androidx.security.crypto.MasterKey +import org.json.JSONObject + +// In your ApiClient or a dedicated TokenStore +object TokenStore { + private const val KEY = "auth_token" + private const val TWOFA_KEY = "twofa_enabled" + + private fun prefs(context: Context): SharedPreferences { + return EncryptedSharedPreferences.create( + context, + "secure_prefs", + MasterKey.Builder(context) + .setKeyScheme(MasterKey.KeyScheme.AES256_GCM) + .build(), + EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV, + EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM + ) + } + + fun save(context: Context, token: String) = + prefs(context).edit { putString(KEY, token) } + + fun get(context: Context): String? = + prefs(context).getString(KEY, null) + + fun save2faEnabled(context: Context, enabled: Boolean) = + prefs(context).edit { putBoolean(TWOFA_KEY, enabled) } + + fun is2faEnabled(context: Context): Boolean = + prefs(context).getBoolean(TWOFA_KEY, false) + + fun clear(context: Context) = + prefs(context).edit { remove(KEY).remove(TWOFA_KEY) } + + fun getUserId(context: Context): Int? { + val token = get(context) ?: return null + return getUserIdFromToken(token) + } + + fun getUserIdFromToken(token: String): Int? { + return try { + val payload = token.split(".")[1] + // base64url needs padding restored + val padded = payload + "==".take((4 - payload.length % 4) % 4) + val jsonString = String(Base64.decode(padded, Base64.URL_SAFE)) + val json = JSONObject(jsonString) + + // Handle both standard 'sub' and custom 'user_id' + when { + json.has("sub") -> json.getInt("sub") + json.has("user_id") -> json.getInt("user_id") + else -> null + } + } catch (e: Exception) { + null + } + } + + fun getScopeFromToken(token: String): String? { + return try { + val payload = token.split(".")[1] + val padded = payload + "==".take((4 - payload.length % 4) % 4) + val jsonString = String(Base64.decode(padded, Base64.URL_SAFE)) + val json = JSONObject(jsonString) + if (json.has("scope")) json.getString("scope") else null + } catch (e: Exception) { + null + } + } +} \ No newline at end of file diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/core/error/ApiResult.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/core/error/ApiResult.kt new file mode 100644 index 0000000..3c90458 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/core/error/ApiResult.kt @@ -0,0 +1,7 @@ +package dev.zxq5.chatapp.android.core.error + +sealed class ApiResult { + data class Success(val data: T) : ApiResult() + data class HttpError(val status: Int, val message: String) : ApiResult() + data class NetworkError(val message: String) : ApiResult() +} \ No newline at end of file diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/data/repository/AuthRepository.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/data/repository/AuthRepository.kt new file mode 100644 index 0000000..6d5a3b5 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/data/repository/AuthRepository.kt @@ -0,0 +1,35 @@ +package dev.zxq5.chatapp.android.data.repository + +import dev.zxq5.chatapp.android.api.ApiClient +import dev.zxq5.chatapp.android.core.data.TokenStore +import dev.zxq5.chatapp.android.core.error.ApiResult +// +//class AuthRepository( +// private val apiClient: ApiClient, +// private val tokenStore: TokenStore, +//) { +// +// suspend fun login(username: String, password: String): LoginResult { +//// return when(val result = apiClient.login(username, password)) { +//// is ApiResult.Success -> { +//// tokenStore.save(context = context, result.data.token); +//// } +//// } +// } +//} + + + + +sealed class LoginResult { + object Success : LoginResult() + object TotpRequired : LoginResult() // step 1 outcome → go to totp screen + data class TotpError(val message: String) : LoginResult() // step 2 failure → stay on totp screen, show error + data class Error(val message: String) : LoginResult() // general failure → show on login form +} + +sealed class AuthState { + object Authenticated : AuthState() + object AwaitingTotp : AuthState() + object Unauthenticated : AuthState() +} \ No newline at end of file diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/model/ChatViewModel.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/model/ChatViewModel.kt new file mode 100644 index 0000000..53ea713 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/model/ChatViewModel.kt @@ -0,0 +1,325 @@ +package dev.zxq5.chatapp.android.model + +import android.util.Log +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dev.zxq5.chatapp.android.api.ApiClient +import dev.zxq5.chatapp.android.core.error.ApiResult +import dev.zxq5.chatapp.android.api.QrResponse +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.filterNotNull +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch + +enum class AuthMode { + LOGIN, SIGNUP +} + +enum class MainScreen { + CHAT, SETTINGS +} + +class ChatViewModel : ViewModel() { + + private val _messages = MutableStateFlow>(emptyList()) + val messages: StateFlow> = _messages + + private val _channelId = MutableStateFlow(null) + val channelId: StateFlow = _channelId + + private val _currentUserId = MutableStateFlow(null) + val currentUserId: StateFlow = _currentUserId + + private val _currentScreen = MutableStateFlow(MainScreen.CHAT) + val currentScreen: StateFlow = _currentScreen + + val loginState = MutableStateFlow(LoginState.Idle) + + // Tracks whether the user is viewing the Login or Signup screen + val authMode = MutableStateFlow(AuthMode.LOGIN) + + // 2FA state + private val _totpQr = MutableStateFlow(null) + val totpQr: StateFlow = _totpQr + + private val _is2faEnabled = MutableStateFlow(false) + val is2faEnabled: StateFlow = _is2faEnabled + + private val _totpError = MutableStateFlow(null) + val totpError: StateFlow = _totpError + + // Settings state + private val _settingsError = MutableStateFlow(null) + val settingsError: StateFlow = _settingsError + + private val _settingsSuccess = MutableStateFlow(null) + val settingsSuccess: StateFlow = _settingsSuccess + + fun clearSettingsMessages() { + _settingsError.value = null + _settingsSuccess.value = null + } + + fun clearTotpError() { + _totpError.value = null + } + + private var streamJob: Job? = null + + init { + initAuth(ApiClient.hasToken()) + } + + fun initAuth(hasToken: Boolean) { + if (hasToken) { + val scope = ApiClient.getTokenScope() + if (scope == TokenScope.TOTP_PENDING) { + loginState.value = LoginState.TwoFactorRequired + } else if (scope == TokenScope.FULL) { + loginState.value = LoginState.Success + _currentUserId.value = ApiClient.getStoredUserId() + _is2faEnabled.value = ApiClient.is2faEnabledLocal() + fetchTotpStatus() + observeChannel() + } else { + loginState.value = LoginState.Error("Unknown token scope: $scope") + } + } else { + loginState.value = LoginState.Idle + } + } + + private fun observeChannel() { + // restart stream whenever channel changes + viewModelScope.launch { + _channelId.filterNotNull().collect { id -> + streamJob?.cancel() + _messages.value = emptyList() + streamJob = launch { + ApiClient.messageStream(id) + .catch { e -> + Log.e("Chat", "Stream error", e) + } + .collect { message -> + _messages.update { it + message } + } + } + } + } + } + + fun navigateTo(screen: MainScreen) { + _currentScreen.value = screen + if (screen == MainScreen.SETTINGS) { + fetchTotpStatus() + } + } + + fun switchChannel(id: Int?) { + _channelId.value = id + } + + fun setAuthMode(mode: AuthMode) { + authMode.value = mode + // Clear errors when switching modes + if (loginState.value is LoginState.Error || loginState.value is LoginState.TwoFactorRequired) { + loginState.value = LoginState.Idle + } + } + + fun sendMessage(text: String) { + val currentId = _channelId.value ?: return + viewModelScope.launch { + runCatching { + ApiClient.sendMessage( + channelId = currentId, + text = text + ) + }.onFailure { e -> + Log.e("Chat", "Send message error", e) + } + } + } + + fun login(username: String, password: String) { + viewModelScope.launch { + loginState.value = LoginState.Loading + when (val result = ApiClient.login(username, password)) { + is ApiResult.Success -> { + when (val scope = ApiClient.getTokenScope()) { + TokenScope.FULL -> { + _currentUserId.value = ApiClient.getStoredUserId() + _is2faEnabled.value = ApiClient.is2faEnabledLocal() + loginState.value = LoginState.Success + fetchTotpStatus() + observeChannel() + } + TokenScope.TOTP_PENDING -> { + loginState.value = LoginState.TwoFactorRequired + } + else -> { + loginState.value = LoginState.Error("Unknown token scope: $scope") + } + } + } + is ApiResult.HttpError -> { + loginState.value = LoginState.Error(result.message) + } + is ApiResult.NetworkError -> { + loginState.value = LoginState.Error("Could not reach server: ${result.message}") + } + } + } + } + + fun verifyLogin2fa(code: String) { + viewModelScope.launch { + loginState.value = LoginState.Loading + when (val result = ApiClient.verifyTotpLogin(code)) { + is ApiResult.Success -> { + val scope = ApiClient.getTokenScope() + if (scope == TokenScope.FULL) { + _currentUserId.value = ApiClient.getStoredUserId() + _is2faEnabled.value = ApiClient.is2faEnabledLocal() + loginState.value = LoginState.Success + fetchTotpStatus() + observeChannel() + } else { + // token came back but scope is wrong — shouldn't happen + loginState.value = LoginState.Error("Unexpected token scope after verification") + } + } + is ApiResult.HttpError -> { + // stay on TOTP screen but show the error + loginState.value = LoginState.TwoFactorRequired + // use a separate error signal so we don't lose the TOTP state + _totpError.value = result.message + } + is ApiResult.NetworkError -> { + loginState.value = LoginState.TwoFactorRequired + _totpError.value = "Could not reach server: ${result.message}" + } + } + } + } + + fun signup(username: String, email: String, password: String, accessToken: String) { + viewModelScope.launch { + loginState.value = LoginState.Loading + try { + + when (val result = ApiClient.signup(username, email, password, accessToken)) { + is ApiResult.Success -> { + _currentUserId.value = ApiClient.getStoredUserId() + _is2faEnabled.value = ApiClient.is2faEnabledLocal() + loginState.value = LoginState.Success + observeChannel() + } + is ApiResult.HttpError -> { + loginState.value = LoginState.Error(result.message) + } + is ApiResult.NetworkError -> { + loginState.value = LoginState.Error("Could not reach server: ${result.message}") + } + } + } catch (e: Exception) { + Log.e("Chat", "Signup error", e) + loginState.value = LoginState.Error("Signup failed: ${e.localizedMessage}") + } + } + } + + fun logout() { + viewModelScope.launch { + ApiClient.logout() + _currentUserId.value = null + _is2faEnabled.value = false + loginState.value = LoginState.Idle + _messages.value = emptyList() + _channelId.value = null + _currentScreen.value = MainScreen.CHAT + streamJob?.cancel() + } + } + + fun fetchTotpQr() { + viewModelScope.launch { + _totpQr.value = ApiClient.getTotpQr() + } + } + + fun confirmTotp(code: String) { + viewModelScope.launch { + val success = ApiClient.confirmTotp(code) + if (success) { + _is2faEnabled.value = true + ApiClient.set2faEnabledLocal(true) + _totpQr.value = null + } else { + _totpError.value = "Invalid verification code" + } + } + } + + fun fetchTotpStatus() { + viewModelScope.launch { + _is2faEnabled.value = ApiClient.getTotpStatus() + } + } + + fun disableTotp() { + viewModelScope.launch { + when (val result = ApiClient.disableTotp()) { + is ApiResult.Success -> { + _is2faEnabled.value = false + _settingsSuccess.value = "2FA disabled successfully" + } + is ApiResult.HttpError -> { + _settingsError.value = result.message + } + is ApiResult.NetworkError -> { + _settingsError.value = "Network error: ${result.message}" + } + } + } + } + + fun changePassword(old: String, new: String) { + viewModelScope.launch { + _settingsError.value = null + _settingsSuccess.value = null + when (val result = ApiClient.changePassword(old, new)) { + is ApiResult.Success -> { + _settingsSuccess.value = "Password updated" + } + is ApiResult.HttpError -> { + _settingsError.value = result.message + } + is ApiResult.NetworkError -> { + _settingsError.value = "Network error: ${result.message}" + } + } + } + } + + fun updateDisplayName(name: String?) { + viewModelScope.launch { + _settingsError.value = null + _settingsSuccess.value = null + val success = ApiClient.updateDisplayName(name) + if (success) { + _settingsSuccess.value = "Display name updated" + } else { + _settingsError.value = "Failed to update display name" + } + } + } +} + +object TokenScope { + const val FULL = "full"; + const val TOTP_PENDING = "totp_pending"; +} diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginRequest.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginRequest.kt new file mode 100644 index 0000000..ee3730b --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginRequest.kt @@ -0,0 +1,11 @@ +package dev.zxq5.chatapp.android.model + +import kotlinx.serialization.Serializable + +@Serializable +data class LoginRequest( + val username: String, + val password: String +) + + diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginResponse.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginResponse.kt new file mode 100644 index 0000000..3304cdb --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginResponse.kt @@ -0,0 +1,6 @@ +package dev.zxq5.chatapp.android.model + +import kotlinx.serialization.Serializable + +@Serializable +data class LoginResponse(val token: String) \ No newline at end of file diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginState.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginState.kt new file mode 100644 index 0000000..32f53d6 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/model/LoginState.kt @@ -0,0 +1,9 @@ +package dev.zxq5.chatapp.android.model + +sealed class LoginState { + object Idle : LoginState() + object Loading : LoginState() + object Success : LoginState() + object TwoFactorRequired : LoginState() + data class Error(val message: String) : LoginState() +} \ No newline at end of file diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/model/Message.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/model/Message.kt new file mode 100644 index 0000000..edd97b8 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/model/Message.kt @@ -0,0 +1,11 @@ +package dev.zxq5.chatapp.android.model + +import kotlinx.serialization.Serializable + +@Serializable +data class Message( + val user_id: Int, + val display_name: String, + val text: String, + val timestamp: Long +) diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/model/SendMessage.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/model/SendMessage.kt new file mode 100644 index 0000000..34254f7 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/model/SendMessage.kt @@ -0,0 +1,10 @@ +package dev.zxq5.chatapp.android.model + +import kotlinx.serialization.Serializable + +@Serializable +data class SendMessage( + val user_id: Int, + val text: String, + val timestamp: Long +) diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/model/SignupRequest.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/model/SignupRequest.kt new file mode 100644 index 0000000..7e2e626 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/model/SignupRequest.kt @@ -0,0 +1,14 @@ +package dev.zxq5.chatapp.android.model + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class SignupRequest( + val username: String, + val password: String, + val email: String, + + @SerialName("access_token") + val access_token: String +) diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/chat.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/chat.kt new file mode 100644 index 0000000..9b53965 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/chat.kt @@ -0,0 +1,435 @@ +package dev.zxq5.chatapp.android.ui.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.IntrinsicSize +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.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +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.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ExitToApp +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Send +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.outlined.ChatBubbleOutline +import androidx.compose.material.icons.outlined.Settings +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.NavigationBarItemDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.unit.dp +import dev.zxq5.chatapp.android.model.ChatViewModel +import dev.zxq5.chatapp.android.model.MainScreen +import dev.zxq5.chatapp.android.model.Message +import java.text.DateFormat +import java.util.Date + +@Composable +fun ChatScreen(viewModel: ChatViewModel) { + val selectedChannelId by viewModel.channelId.collectAsState() + + if (selectedChannelId == null) { + ChannelListScreen( + viewModel = viewModel, + onChannelSelect = { viewModel.switchChannel(it) } + ) + } else { + MessageScreen( + channelId = selectedChannelId!!, + viewModel = viewModel, + onBack = { viewModel.switchChannel(null) } + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ChannelListScreen(viewModel: ChatViewModel, onChannelSelect: (Int) -> Unit) { + Scaffold( + containerColor = MaterialTheme.colorScheme.background, + topBar = { + Column { + Spacer(Modifier.height(8.dp)) + Text( + "contacts", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), + modifier = Modifier.padding(horizontal = 20.dp) + ) + TopAppBar( + title = { + Text( + "messages", + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onSurface + ) + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = Color.Transparent, + titleContentColor = MaterialTheme.colorScheme.onSurface + ) + ) + Text( + "5 channels · end-to-end encrypted", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f), + modifier = Modifier.padding(horizontal = 20.dp, vertical = 2.dp) + ) + Spacer(Modifier.height(12.dp)) + + Row( + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.secondary.copy(alpha = 0.2f)) + .padding(horizontal = 20.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .size(6.dp) + .clip(CircleShape) + .background(MaterialTheme.colorScheme.primary) + ) + Spacer(Modifier.width(10.dp)) + Text( + "global · walkie talkie", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.weight(1f) + ) + Surface( + color = Color.Transparent, + border = border(0.5.dp, MaterialTheme.colorScheme.outlineVariant), + shape = RoundedCornerShape(4.dp) + ) { + Text( + "hold to talk", + modifier = Modifier.padding(horizontal = 8.dp, vertical = 3.dp), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + }, + bottomBar = { BottomDock(viewModel) } + ) { padding -> + LazyColumn(modifier = Modifier.padding(padding).fillMaxSize()) { + items(10) { i -> + val id = i + 1 + ChannelItem(id = id, onClick = { onChannelSelect(id) }) + HorizontalDivider( + modifier = Modifier.padding(horizontal = 20.dp), + thickness = 0.5.dp, + color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f) + ) + } + } + } +} + +@Composable +fun BottomDock(viewModel: ChatViewModel) { + val currentScreen by viewModel.currentScreen.collectAsState() + + NavigationBar( + containerColor = MaterialTheme.colorScheme.background, + tonalElevation = 0.dp, + modifier = Modifier.border(0.5.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f), RoundedCornerShape(topStart = 0.dp, topEnd = 0.dp)) + ) { + NavigationBarItem( + selected = currentScreen == MainScreen.CHAT, + onClick = { viewModel.navigateTo(MainScreen.CHAT) }, + icon = { Icon(Icons.Outlined.ChatBubbleOutline, contentDescription = "Chat") }, + label = { Text("chat", style = MaterialTheme.typography.labelSmall) }, + colors = NavigationBarItemDefaults.colors( + selectedIconColor = MaterialTheme.colorScheme.primary, + unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), + indicatorColor = Color.Transparent + ) + ) + NavigationBarItem( + selected = currentScreen == MainScreen.SETTINGS, + onClick = { viewModel.navigateTo(MainScreen.SETTINGS) }, + icon = { Icon(Icons.Outlined.Settings, contentDescription = "Settings") }, + label = { Text("settings", style = MaterialTheme.typography.labelSmall) }, + colors = NavigationBarItemDefaults.colors( + selectedIconColor = MaterialTheme.colorScheme.primary, + unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), + indicatorColor = Color.Transparent + ) + ) + } +} + +@Composable +fun ChannelItem(id: Int, onClick: () -> Unit) { + Row( + modifier = Modifier + .fillMaxWidth() + .clickable(onClick = onClick) + .padding(horizontal = 20.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .size(36.dp) + .clip(CircleShape) + .border(0.5.dp, MaterialTheme.colorScheme.outlineVariant, CircleShape), + contentAlignment = Alignment.Center + ) { + Text( + "C$id", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + Spacer(Modifier.width(12.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = "channel $id", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurface + ) + Text( + text = "tap to join", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f) + ) + } + Text( + "14:22", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.3f) + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MessageScreen(channelId: Int, viewModel: ChatViewModel, onBack: () -> Unit) { + val messages by viewModel.messages.collectAsState() + val currentUserId by viewModel.currentUserId.collectAsState() + var input by remember { mutableStateOf("") } + val listState = rememberLazyListState() + + LaunchedEffect(messages.size) { + if (messages.isNotEmpty()) { + listState.animateScrollToItem(messages.size - 1) + } + } + + Scaffold( + containerColor = MaterialTheme.colorScheme.background, + topBar = { + TopAppBar( + title = { + Column { + Text( + "channel $channelId", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurface + ) + Text( + "online", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f) + ) + } + }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = Color.Transparent + ) + ) + } + ) { padding -> + Column(modifier = Modifier.padding(padding).fillMaxSize()) { + LazyColumn( + state = listState, + modifier = Modifier.weight(1f).padding(horizontal = 16.dp), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + items(messages) { message -> + MessageBubble(message, currentUserId) + } + item { Spacer(Modifier.height(10.dp)) } + } + + Row( + modifier = Modifier + .fillMaxWidth() + .height(IntrinsicSize.Min) + .padding(horizontal = 14.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + IconButton( + onClick = { /* add action */ }, + modifier = Modifier + .size(36.dp) + .border(0.5.dp, MaterialTheme.colorScheme.outlineVariant, CircleShape) + ) { + Icon( + Icons.Default.Add, + contentDescription = "Add", + modifier = Modifier.size(16.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + Spacer(Modifier.width(8.dp)) + + Box( + modifier = Modifier + .weight(1f) + .fillMaxHeight() + .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f), RoundedCornerShape(20.dp)) + .border(0.5.dp, MaterialTheme.colorScheme.outlineVariant, RoundedCornerShape(20.dp)) + .padding(horizontal = 14.dp), + contentAlignment = Alignment.CenterStart + ) { + if (input.isEmpty()) { + Text( + "message", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f) + ) + } + BasicTextField( + value = input, + onValueChange = { input = it }, + modifier = Modifier.fillMaxWidth(), + textStyle = MaterialTheme.typography.bodyLarge.copy(color = MaterialTheme.colorScheme.onSurface), + cursorBrush = SolidColor(MaterialTheme.colorScheme.primary), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send), + keyboardActions = KeyboardActions(onSend = { + if (input.isNotBlank()) { + viewModel.sendMessage(input) + input = "" + } + }) + ) + } + + if (input.isNotBlank()) { + Spacer(Modifier.width(8.dp)) + IconButton( + onClick = { + viewModel.sendMessage(input) + input = "" + }, + modifier = Modifier + .size(36.dp) + .background(MaterialTheme.colorScheme.primary, CircleShape) + ) { + Icon( + Icons.Default.Send, + contentDescription = "Send", + modifier = Modifier.size(16.dp), + tint = MaterialTheme.colorScheme.onPrimary + ) + } + } + } + } + } +} + +@Composable +fun MessageBubble(message: Message, currentUserId: Int?) { + val time = remember(message.timestamp) { + DateFormat.getTimeInstance(DateFormat.SHORT).format(Date(message.timestamp)).lowercase() + } + + val isMe = currentUserId != null && message.user_id == currentUserId + + Column( + modifier = Modifier.fillMaxWidth(), + horizontalAlignment = if (isMe) Alignment.End else Alignment.Start + ) { + Surface( + color = if (isMe) MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f) else MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.2f), + shape = RoundedCornerShape( + topStart = 14.dp, + topEnd = 14.dp, + bottomStart = if (isMe) 14.dp else 4.dp, + bottomEnd = if (isMe) 4.dp else 14.dp + ), + border = border(0.5.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f)) + ) { + Column(modifier = Modifier.padding(horizontal = 11.dp, vertical = 8.dp)) { + if (!isMe) { + Text( + message.display_name.lowercase(), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.primary.copy(alpha = 0.7f), + modifier = Modifier.padding(bottom = 2.dp) + ) + } + Text( + text = message.text, + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f) + ) + } + } + Text( + text = time, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.3f), + modifier = Modifier.padding(horizontal = 4.dp, vertical = 2.dp) + ) + } +} + +private fun border(width: androidx.compose.ui.unit.Dp, color: Color) = + androidx.compose.foundation.BorderStroke(width, color) diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/login.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/login.kt new file mode 100644 index 0000000..90e0286 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/login.kt @@ -0,0 +1,318 @@ +package dev.zxq5.chatapp.android.ui.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +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.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import dev.zxq5.chatapp.android.model.AuthMode +import dev.zxq5.chatapp.android.model.ChatViewModel +import dev.zxq5.chatapp.android.model.LoginState + +@Composable +fun AuthScreen(viewModel: ChatViewModel, onSuccess: () -> Unit) { + val loginState by viewModel.loginState.collectAsState() + val authMode by viewModel.authMode.collectAsState() + val totpError by viewModel.totpError.collectAsState() + + var username by remember { mutableStateOf("") } + var email by remember { mutableStateOf("") } + var password by remember { mutableStateOf("") } + var confirmPassword by remember { mutableStateOf("") } + var accessToken by remember { mutableStateOf("") } + var localError by remember { mutableStateOf(null) } + + + + LaunchedEffect(loginState) { + if (loginState is LoginState.Success) onSuccess() + } + + LaunchedEffect(authMode) { + localError = null + } + + if (loginState is LoginState.TwoFactorRequired || + (loginState is LoginState.Loading && totpError != null)) { + TwoFactorLoginScreen( + onVerify = { code -> viewModel.verifyLogin2fa(code) }, + onBack = { + viewModel.clearTotpError() + viewModel.setAuthMode(AuthMode.LOGIN) + }, + isLoading = loginState is LoginState.Loading, + error = totpError + ) + return + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(MaterialTheme.colorScheme.background) + .padding(24.dp) + .verticalScroll(rememberScrollState()), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Spacer(Modifier.height(40.dp)) + + Text( + text = "messenger", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(bottom = 8.dp) + ) + + Text( + text = if (authMode == AuthMode.LOGIN) "welcome back" else "create account", + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.padding(bottom = 48.dp) + ) + + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + TextField( + value = username, + onValueChange = { username = it }, + label = "username" + ) + + if (authMode == AuthMode.SIGNUP) { + TextField( + value = email, + onValueChange = { email = it }, + label = "email" + ) + } + + TextField( + value = password, + onValueChange = { password = it }, + label = "password", + isPassword = true + ) + + if (authMode == AuthMode.SIGNUP) { + TextField( + value = confirmPassword, + onValueChange = { confirmPassword = it }, + label = "confirm password", + isPassword = true + ) + TextField( + value = accessToken, + onValueChange = { accessToken = it }, + label = "access token" + ) + } + } + + Spacer(Modifier.height(32.dp)) + + Button( + onClick = { + localError = null + if (authMode == AuthMode.LOGIN) { + if (username.isBlank() || password.isBlank()) { + localError = "fill all fields" + return@Button + } + viewModel.login(username, password) + } else { + if (username.isBlank() || email.isBlank() || password.isBlank() || accessToken.isBlank()) { + localError = "fill all fields" + return@Button + } + if (password != confirmPassword) { + localError = "passwords mismatch" + return@Button + } + viewModel.signup(username, email, password, accessToken) + } + }, + enabled = loginState !is LoginState.Loading, + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(8.dp), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary, + disabledContainerColor = MaterialTheme.colorScheme.secondary + ) + ) { + if (loginState is LoginState.Loading) { + CircularProgressIndicator(modifier = Modifier.size(16.dp), color = MaterialTheme.colorScheme.onPrimary, strokeWidth = 2.dp) + } else { + Text( + if (authMode == AuthMode.LOGIN) "login" else "sign up", + style = MaterialTheme.typography.bodyLarge + ) + } + } + + val displayError = localError ?: (loginState as? LoginState.Error)?.message + if (displayError != null) { + Text( + text = displayError.lowercase(), + style = MaterialTheme.typography.labelSmall, + color = Color.Red, + modifier = Modifier.padding(top = 16.dp) + ) + } + + Spacer(Modifier.height(16.dp)) + + TextButton( + onClick = { + viewModel.setAuthMode(if (authMode == AuthMode.LOGIN) AuthMode.SIGNUP else AuthMode.LOGIN) + } + ) { + Text( + if (authMode == AuthMode.LOGIN) "no account? sign up" + else "have account? login", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } +} + +@Composable +fun TwoFactorLoginScreen( + onVerify: (String) -> Unit, + onBack: () -> Unit, + isLoading: Boolean, + error: String? +) { + var code by remember { mutableStateOf("") } + + Column( + modifier = Modifier + .fillMaxSize() + .background(MaterialTheme.colorScheme.background) + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + IconButton(onClick = onBack) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + Text( + "security verification", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + Spacer(Modifier.height(80.dp)) + + Text( + "two-factor auth", + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onSurface + ) + + Text( + "enter the 6-digit code from your app", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), + modifier = Modifier.padding(top = 8.dp, bottom = 48.dp) + ) + + OutlinedTextField( + value = code, + onValueChange = { if (it.length <= 6) code = it }, + placeholder = { Text("000000", color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.3f)) }, + modifier = Modifier.width(200.dp), + textStyle = MaterialTheme.typography.headlineMedium.copy( + textAlign = TextAlign.Center, + letterSpacing = 8.sp + ), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + shape = RoundedCornerShape(8.dp), + colors = OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + unfocusedBorderColor = MaterialTheme.colorScheme.outlineVariant, + focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.1f), + unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.1f) + ), + singleLine = true + ) + + if (error != null) { + Text( + text = error.lowercase(), + style = MaterialTheme.typography.labelSmall, + color = Color.Red, + modifier = Modifier.padding(top = 12.dp) + ) + } else { + Spacer(Modifier.height(12.dp)) // keep layout stable when no error + } + + Spacer(Modifier.height(36.dp)) + + Button( + onClick = { if (code.length == 6) onVerify(code) }, + enabled = code.length == 6 && !isLoading, + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(8.dp), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + if (isLoading) { + CircularProgressIndicator(modifier = Modifier.size(16.dp), color = MaterialTheme.colorScheme.onPrimary, strokeWidth = 2.dp) + } else { + Text("verify", style = MaterialTheme.typography.bodyLarge) + } + } + } +} + diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/settings.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/settings.kt new file mode 100644 index 0000000..bb70398 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/settings.kt @@ -0,0 +1,368 @@ +package dev.zxq5.chatapp.android.ui.components + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +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.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +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.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardOptions +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.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Switch +import androidx.compose.material3.SwitchDefaults +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import dev.zxq5.chatapp.android.model.ChatViewModel +import dev.zxq5.chatapp.android.model.MainScreen +import android.util.Base64 +import android.graphics.BitmapFactory +import androidx.compose.runtime.LaunchedEffect + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SettingsScreen(viewModel: ChatViewModel) { + val is2faEnabled by viewModel.is2faEnabled.collectAsState() + val totpQr by viewModel.totpQr.collectAsState() + val settingsError by viewModel.settingsError.collectAsState() + val settingsSuccess by viewModel.settingsSuccess.collectAsState() + + var show2faSetup by remember { mutableStateOf(false) } + var displayName by remember { mutableStateOf("") } + var oldPassword by remember { mutableStateOf("") } + var newPassword by remember { mutableStateOf("") } + + LaunchedEffect(Unit) { + viewModel.clearSettingsMessages() + viewModel.fetchTotpStatus() + } + + Scaffold( + containerColor = MaterialTheme.colorScheme.background, + topBar = { + TopAppBar( + title = { + Text( + "settings", + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onSurface + ) + }, + navigationIcon = { + IconButton(onClick = { viewModel.navigateTo(MainScreen.CHAT) }) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = Color.Transparent + ) + ) + } + ) { padding -> + Column( + modifier = Modifier + .padding(padding) + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(20.dp), + verticalArrangement = Arrangement.spacedBy(24.dp) + ) { + if (settingsError != null) { + Text(settingsError!!, color = Color.Red, style = MaterialTheme.typography.bodySmall) + } + if (settingsSuccess != null) { + Text(settingsSuccess!!, color = Color.Green, style = MaterialTheme.typography.bodySmall) + } + + // Profile Section + Column { + Text( + "profile", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), + modifier = Modifier.padding(bottom = 12.dp) + ) + + OutlinedTextField( + value = displayName, + onValueChange = { displayName = it }, + label = { Text("display name") }, + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(8.dp), + trailingIcon = { + IconButton(onClick = { viewModel.updateDisplayName(displayName.ifBlank { null }) }) { + Icon(Icons.Default.Check, "Save") + } + } + ) + } + + HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)) + + // Security Section + Column { + Text( + "account security", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), + modifier = Modifier.padding(bottom = 12.dp) + ) + + Row( + modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + "two-factor authentication", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurface + ) + Text( + if (is2faEnabled) "enabled" else "disabled", + style = MaterialTheme.typography.labelSmall, + color = if (is2faEnabled) Color.Green.copy(alpha = 0.7f) else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f) + ) + } + + if (!is2faEnabled) { + Button( + onClick = { + show2faSetup = true + viewModel.fetchTotpQr() + }, + shape = RoundedCornerShape(8.dp), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f), + contentColor = MaterialTheme.colorScheme.onSurface + ), + modifier = Modifier.height(32.dp) + ) { + Text("setup", style = MaterialTheme.typography.labelSmall) + } + } else { + Button( + onClick = { viewModel.disableTotp() }, + shape = RoundedCornerShape(8.dp), + colors = ButtonDefaults.buttonColors( + containerColor = Color.Red.copy(alpha = 0.1f), + contentColor = Color.Red + ), + modifier = Modifier.height(32.dp) + ) { + Text("disable", style = MaterialTheme.typography.labelSmall) + } + } + } + + if (show2faSetup && !is2faEnabled) { + Spacer(Modifier.height(16.dp)) + TwoFactorSetup( + qrCodeBase64 = totpQr?.qr_code, + onConfirm = { code -> + viewModel.confirmTotp(code) + }, + onCancel = { show2faSetup = false } + ) + } + + Spacer(Modifier.height(16.dp)) + + Text("change password", style = MaterialTheme.typography.bodyMedium, modifier = Modifier.padding(bottom = 8.dp)) + OutlinedTextField( + value = oldPassword, + onValueChange = { oldPassword = it }, + label = { Text("old password") }, + visualTransformation = PasswordVisualTransformation(), + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(8.dp) + ) + Spacer(Modifier.height(8.dp)) + OutlinedTextField( + value = newPassword, + onValueChange = { newPassword = it }, + label = { Text("new password") }, + visualTransformation = PasswordVisualTransformation(), + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(8.dp) + ) + Spacer(Modifier.height(12.dp)) + Button( + onClick = { + viewModel.changePassword(oldPassword, newPassword) + oldPassword = "" + newPassword = "" + }, + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(8.dp), + enabled = oldPassword.isNotEmpty() && newPassword.isNotEmpty() + ) { + Text("update password") + } + } + + HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)) + + // Application Section + Column { + Text( + "application", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), + modifier = Modifier.padding(bottom = 12.dp) + ) + + Button( + onClick = { viewModel.logout() }, + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(8.dp), + colors = ButtonDefaults.buttonColors( + containerColor = Color.Red.copy(alpha = 0.1f), + contentColor = Color.Red + ) + ) { + Text("logout", style = MaterialTheme.typography.bodyLarge) + } + } + } + } +} + +@Composable +fun TwoFactorSetup( + qrCodeBase64: String?, + onConfirm: (String) -> Unit, + onCancel: () -> Unit +) { + var code by remember { mutableStateOf("") } + + Column( + modifier = Modifier + .fillMaxWidth() + .border(0.5.dp, MaterialTheme.colorScheme.outlineVariant, RoundedCornerShape(12.dp)) + .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.1f), RoundedCornerShape(12.dp)) + .padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + "scan qr code", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + + Spacer(Modifier.height(16.dp)) + + if (qrCodeBase64 != null) { + val bitmap = remember(qrCodeBase64) { + val base64Data = qrCodeBase64.substringAfter("base64,") + val decodedString = Base64.decode(base64Data, Base64.DEFAULT) + BitmapFactory.decodeByteArray(decodedString, 0, decodedString.size) + } + + bitmap?.let { + Image( + bitmap = it.asImageBitmap(), + contentDescription = "QR Code", + modifier = Modifier + .size(180.dp) + .clip(RoundedCornerShape(8.dp)) + .background(Color.White) // QR codes usually need white background + .padding(8.dp) + ) + } + } else { + Box( + modifier = Modifier.size(180.dp), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator(color = MaterialTheme.colorScheme.primary) + } + } + + Spacer(Modifier.height(24.dp)) + + OutlinedTextField( + value = code, + onValueChange = { if (it.length <= 6) code = it }, + placeholder = { Text("000000", color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.3f)) }, + modifier = Modifier.width(150.dp), + textStyle = MaterialTheme.typography.headlineMedium.copy( + textAlign = androidx.compose.ui.text.style.TextAlign.Center, + letterSpacing = 4.sp + ), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + shape = RoundedCornerShape(8.dp), + colors = OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + unfocusedBorderColor = MaterialTheme.colorScheme.outlineVariant + ) + ) + + Spacer(Modifier.height(24.dp)) + + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + Button( + onClick = onCancel, + modifier = Modifier.weight(1f), + shape = RoundedCornerShape(8.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent, contentColor = MaterialTheme.colorScheme.onSurfaceVariant) + ) { + Text("cancel", style = MaterialTheme.typography.labelSmall) + } + + Button( + onClick = { if (code.length == 6) onConfirm(code) }, + enabled = code.length == 6, + modifier = Modifier.weight(1f), + shape = RoundedCornerShape(8.dp) + ) { + Text("confirm", style = MaterialTheme.typography.labelSmall) + } + } + } +} diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/textfield.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/textfield.kt new file mode 100644 index 0000000..349cfa3 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/components/textfield.kt @@ -0,0 +1,45 @@ +package dev.zxq5.chatapp.android.ui.components + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp + +@Composable +fun TextField( + value: String, + onValueChange: (String) -> Unit, + label: String, + isPassword: Boolean = false +) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + placeholder = { + Text( + label, + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f) + ) + }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + textStyle = MaterialTheme.typography.bodyLarge, + visualTransformation = if (isPassword) PasswordVisualTransformation() else androidx.compose.ui.text.input.VisualTransformation.None, + shape = RoundedCornerShape(8.dp), + colors = OutlinedTextFieldDefaults.colors( + focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f), + unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f), + focusedBorderColor = MaterialTheme.colorScheme.outlineVariant, + unfocusedBorderColor = MaterialTheme.colorScheme.outline, + focusedTextColor = MaterialTheme.colorScheme.onSurface, + unfocusedTextColor = MaterialTheme.colorScheme.onSurface + ) + ) +} diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Color.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Color.kt new file mode 100644 index 0000000..fec32eb --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Color.kt @@ -0,0 +1,20 @@ +package dev.zxq5.chatapp.android.ui.theme + +import androidx.compose.ui.graphics.Color + +val Black = Color(0xFF0A0A0A) +val DarkGrey = Color(0xFF0D0D0D) +val Grey = Color(0xFF141414) +val LightGrey = Color(0xFF1E1E1E) +val White = Color(0xFFE8E8E8) + +val TextPrimary = Color(0xFFE8E8E8) +val TextSecondary = Color(0xFF888888) +val TextTertiary = Color(0xFF555555) +val TextMuted = Color(0xFF333333) + +val Border = Color(0xFF1A1A1A) +val BorderLight = Color(0xFF222222) + +val Red = Color(0xFFFF0000) +val Surface = Color(0xFF111111) diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Theme.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Theme.kt new file mode 100644 index 0000000..363f84a --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Theme.kt @@ -0,0 +1,48 @@ +package dev.zxq5.chatapp.android.ui.theme + +import android.app.Activity +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = White, + onPrimary = Black, + secondary = LightGrey, + onSecondary = White, + tertiary = Grey, + background = Black, + onBackground = White, + surface = Black, + onSurface = White, + surfaceVariant = Grey, + onSurfaceVariant = TextSecondary, + outline = Border, + outlineVariant = BorderLight +) + +@Composable +fun ChatappTheme( + darkTheme: Boolean = true, // Force dark theme for Nothing style + content: @Composable () -> Unit +) { + val colorScheme = DarkColorScheme + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = Black.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = false + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} diff --git a/android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Type.kt b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Type.kt new file mode 100644 index 0000000..1726004 --- /dev/null +++ b/android/app/src/main/java/dev/zxq5/chatapp/android/ui/theme/Type.kt @@ -0,0 +1,37 @@ +package dev.zxq5.chatapp.android.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.Normal, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.02.sp + ), + titleLarge = TextStyle( + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.Medium, + fontSize = 20.sp, + lineHeight = 28.sp, + letterSpacing = (-0.02).sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.Medium, + fontSize = 10.sp, + lineHeight = 14.sp, + letterSpacing = 0.05.sp + ), + headlineMedium = TextStyle( + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + letterSpacing = (-0.02).sp + ) +) diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/nothing_messenger_mockup.html b/android/app/src/main/res/nothing_messenger_mockup.html new file mode 100644 index 0000000..f3fc079 --- /dev/null +++ b/android/app/src/main/res/nothing_messenger_mockup.html @@ -0,0 +1,765 @@ + + +

+ + +
+
+
09:41▪▪▪
+
contacts
+
+
messages
+
5 contacts · end-to-end encrypted
+
+ +
+
+
flat · walkie talkie
+
hold to talk
+
+ +
+
+
JM
+
+
jamie
+
voice message · 0:12
+
+
+
now
+
+
+
+
+
RP
+
+
climbing crew
+
priya: who's in sat?
+
+
+
14:22
+
+
+
+
+
AL
+
+
alex
+
sent a file
+
+
+
tue
+
+
+
+
SC
+
+
sam
+
yeah let's do it
+
+
+
mon
+
+
+ +
+
+
add contact
+
tap phones · or share a link
+
+
+ +
+
+
+ +
+
chats
+
+
+
+ +
+
contacts
+
+
+
+ +
+
spaces
+
+
+
+ +
+
settings
+
+
+
+
+ + +
+
+
09:41▪▪▪
+
chat
+
+
‹
+
+
climbing crew
+
3 members · e2e encrypted
+
+
+ + + +
+
+ +
+
+
who's in for saturday?
+
priya · 14:20
+
+ +
+
climbing saturday
+
+
morning
+
+
70%
+
+
+
afternoon
+
+
20%
+
+
+
can't make it
+
+
10%
+
+
+ +
+
morning works, i'll book the wall
+
14:31
+
+
+
+1 2
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0:12
+
+
jamie · 14:38
+
+ +
+
+ +
+
message
+
+ +
+
+ +
+
+
+
+ + +
+
+
09:41▪▪▪
+
shared space
+
+
climbing crew
+
space
+
3 members
+
+ +
+
files
+
docs
+
links
+
+ +
+
+
jpg
+
+
wall-beta-map.jpg
+
priya · 3 days ago
+
+
2.1mb
+
+
+
pdf
+
+
membership-discount.pdf
+
jamie · 1 week ago
+
+
84kb
+
+
+
mp4
+
+
dyno-attempt.mp4
+
you · 2 weeks ago
+
+
18mb
+
+ +
+ +
+
+
+
+
+
+
+
+
gear checklist
+
shared doc · edited yesterday
+
+
+ +
+
+ upload file
+
+ new doc
+
+ +
+
storage used
+
+
+
+
+
34%
+
+
+
+ +
+
+
+ +
+
chats
+
+
+
+ +
+
contacts
+
+
+
+ +
+
spaces
+
+
+
+ +
+
settings
+
+
+
+
+ +
\ No newline at end of file diff --git a/android/app/src/main/res/nothing_table_ui.html b/android/app/src/main/res/nothing_table_ui.html new file mode 100644 index 0000000..86f3719 --- /dev/null +++ b/android/app/src/main/res/nothing_table_ui.html @@ -0,0 +1,627 @@ + + +
+ + +
+
+
09:41▪▪▪
+
shared space · tables
+
+
climbing crew
+
space
+
3 members
+
+
+
files
+
docs
+
tables
+
links
+
+ +
+
+ +
+
+
availability
+
edited today
+
+
+ + + + + + + + + + + + + + + +
namesatsunnotes
priyamorning
jamie
youam only
+
+
+ +
+
+
gear to bring
+
edited 3 days ago
+
+
+ + + + + + + + + + + + + + +
itemwhopacked
ropejamie
crash padpriya
first aidyou
+
+
+ + + +
+
+ +
+
chats
+
contacts
+
spaces
+
settings
+
+
+
+ + +
+
+
09:41▪▪▪
+
table view
+ +
+
+
climbing crew · space
+
availability
+
+
+
filter
+
+ col
+
+
+ +
+
all rows
+
sat only
+
available
+
missing
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
nametxt
satbool
sunbool
monbool
notestxt
priyamorning only
jamie
youam only
+ add row
+
+ +
+
3 rows · 5 columns
+
synced · e2e
+
+ +
+
chats
+
contacts
+
spaces
+
settings
+
+
+
+ + +
+
+
09:41▪▪▪
+
new table
+ +
+
climbing crew · space
+
new table
+
define columns · start typing
+
+ +
+ +
+
table name
+
expenses
+
+ +
+
start from template
+
+
availability
+
shopping list
+
expenses
+
tasks
+
blank
+
+
+ +
+
columns
+
+
+
⠿
+ + +
+
+
⠿
+ + +
+
+
⠿
+ + +
+
+
⠿
+ + +
+
+ + + add column +
+
+
+ + + +
+
+
+ +
\ No newline at end of file diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..6c72cec --- /dev/null +++ b/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Chatapp + \ No newline at end of file diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..5c0fe13 --- /dev/null +++ b/android/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +