From cb9d0c4885e20c2093088e692ed95cecd06dc217 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Mon, 27 May 2024 13:20:01 +0200 Subject: [PATCH 01/30] Revert "Merge branch 'features/mobiles' into features/assistant-create-form" This reverts commit 634fd6d31ee551b21ec1875195ae333ce5c50b56, reversing changes made to 77befd9debec79d87b7ed719ef961958a2efe721. --- .../com/xebia/functional/xef/server/Server.kt | 2 +- .../xef/server/http/routes/AssistantRoutes.kt | 4 +- .../functional/xef/server/models/Responses.kt | 3 +- .../server/services/UserRepositoryService.kt | 5 +- server/web/src/utils/api/assistants.ts | 2 +- server/web/src/utils/api/chatCompletions.ts | 2 +- server/xefMobile/.gitignore | 153 ---------- server/xefMobile/.idea/vcs.xml | 6 - .../kotlin-compiler-859541645610285268.salive | 0 server/xefMobile/README.MD | 15 - server/xefMobile/build.gradle.kts | 8 - server/xefMobile/composeApp/build.gradle.kts | 143 --------- .../src/androidMain/AndroidManifest.xml | 22 -- .../kotlin/com/xef/xefMobile/MainActivity.kt | 20 -- .../kotlin/com/xef/xefMobile/MainLayout.kt | 271 ------------------ .../kotlin/com/xef/xefMobile/XefAndroidApp.kt | 57 ---- .../com/xef/xefMobile/model/AssistantModel.kt | 14 - .../xefMobile/model/AuthenticationModels.kt | 34 --- .../xefMobile/network/client/HttpClient.kt | 19 -- .../com/xef/xefMobile/services/ApiService.kt | 61 ---- .../services/UserRepositoryService.kt | 35 --- .../com/xef/xefMobile/theme/Theme.android.kt | 19 -- .../ui/composable/FilePickerDialog.kt | 153 ---------- .../xefMobile/ui/composable/UriPathFinder.kt | 103 ------- .../xef/xefMobile/ui/navigation/Navigation.kt | 31 -- .../ui/screens/FilePicker/PathScreenState.kt | 6 - .../xef/xefMobile/ui/screens/LoginScreen.kt | 110 ------- .../xefMobile/ui/screens/RegisterScreen.kt | 125 -------- .../com/xef/xefMobile/ui/screens/Screens.kt | 15 - .../ui/screens/menu/AssistantScreen.kt | 101 ------- .../ui/screens/menu/CreateAssistantScreen.kt | 270 ----------------- .../navigationdrawercompose/HomeScreen.kt | 40 --- .../navigationdrawercompose/MenuItem.kt | 10 - .../com/xef/xefMobile/ui/themes/Color.kt | 70 ----- .../com/xef/xefMobile/ui/themes/Theme.kt | 104 ------- .../com/xef/xefMobile/ui/themes/Type.kt | 28 -- .../xefMobile/ui/viewmodels/AuthViewModel.kt | 149 ---------- .../xefMobile/ui/viewmodels/IAuthViewModel.kt | 14 - .../xefMobile/ui/viewmodels/PathViewModel.kt | 43 --- .../composeResources/drawable/chat_24px.xml | 11 - .../composeResources/drawable/home_24px.xml | 10 - .../composeResources/drawable/ic_cyclone.xml | 12 - .../drawable/ic_dark_mode.xml | 9 - .../drawable/ic_light_mode.xml | 9 - .../drawable/ic_rotate_right.xml | 10 - .../composeResources/drawable/school_24px.xml | 10 - .../drawable/settings_24px.xml | 10 - .../drawable/smart_toy_24px.xml | 10 - .../drawable/source_environment_24px.xml | 10 - .../drawable/support_agent_24px.xml | 10 - .../drawable/xef_brand_icon.xml | 25 -- .../drawable/xef_brand_name.xml | 35 --- .../drawable/xef_brand_name_white.xml | 35 --- .../font/IndieFlower-Regular.ttf | Bin 55416 -> 0 bytes .../composeResources/font/montserrat_bold.ttf | 0 .../font/montserrat_regular.ttf | 0 .../composeResources/values/strings.xml | 7 - .../com/xef/xefMobile/theme/theme/Color.kt | 70 ----- .../com/xef/xefMobile/theme/theme/Theme.kt | 107 ------- .../kotlin/org/xef/xefMobile/ComposeTest.kt | 45 --- .../src/main/res/drawable/chat_24px.xml | 11 - .../src/main/res/drawable/home_24px.xml | 10 - ...logout_24dp_fill0_wght400_grad0_opsz24.xml | 9 - .../src/main/res/drawable/school_24px.xml | 10 - .../src/main/res/drawable/settings_24px.xml | 10 - .../src/main/res/drawable/smart_toy_24px.xml | 10 - .../res/drawable/source_environment_24px.xml | 10 - .../main/res/drawable/support_agent_24px.xml | 10 - .../src/main/res/drawable/xef_brand_icon.xml | 25 -- .../src/main/res/drawable/xef_brand_name.xml | 35 --- .../res/drawable/xef_brand_name_white.xml | 35 --- .../src/main/res/font/montserrat_bold.ttf | 0 .../src/main/res/font/montserrat_regular.ttf | 0 .../main/res/xml/network_security_config.xml | 8 - server/xefMobile/gradle.properties | 19 -- server/xefMobile/gradle/libs.versions.toml | 52 ---- .../gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 8 - server/xefMobile/gradlew | 250 ---------------- server/xefMobile/gradlew.bat | 93 ------ server/xefMobile/settings.gradle.kts | 17 -- 81 files changed, 8 insertions(+), 3316 deletions(-) delete mode 100644 server/xefMobile/.gitignore delete mode 100644 server/xefMobile/.idea/vcs.xml delete mode 100644 server/xefMobile/.kotlin/sessions/kotlin-compiler-859541645610285268.salive delete mode 100644 server/xefMobile/README.MD delete mode 100644 server/xefMobile/build.gradle.kts delete mode 100644 server/xefMobile/composeApp/build.gradle.kts delete mode 100644 server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Color.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt delete mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/chat_24px.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/home_24px.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_cyclone.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_dark_mode.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_light_mode.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_rotate_right.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/school_24px.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/settings_24px.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/smart_toy_24px.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/source_environment_24px.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/support_agent_24px.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_icon.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name_white.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/font/IndieFlower-Regular.ttf delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/font/montserrat_bold.ttf delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/font/montserrat_regular.ttf delete mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/values/strings.xml delete mode 100644 server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Color.kt delete mode 100644 server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt delete mode 100644 server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/chat_24px.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/home_24px.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/logout_24dp_fill0_wght400_grad0_opsz24.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/school_24px.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/settings_24px.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/smart_toy_24px.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/source_environment_24px.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/support_agent_24px.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/xef_brand_icon.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name_white.xml delete mode 100644 server/xefMobile/composeApp/src/main/res/font/montserrat_bold.ttf delete mode 100644 server/xefMobile/composeApp/src/main/res/font/montserrat_regular.ttf delete mode 100644 server/xefMobile/composeApp/src/main/res/xml/network_security_config.xml delete mode 100644 server/xefMobile/gradle.properties delete mode 100644 server/xefMobile/gradle/libs.versions.toml delete mode 100644 server/xefMobile/gradle/wrapper/gradle-wrapper.jar delete mode 100644 server/xefMobile/gradle/wrapper/gradle-wrapper.properties delete mode 100755 server/xefMobile/gradlew delete mode 100644 server/xefMobile/gradlew.bat delete mode 100644 server/xefMobile/settings.gradle.kts diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/Server.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/Server.kt index 92aecf7ee..2566c167f 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/Server.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/Server.kt @@ -59,7 +59,7 @@ object Server { requestTimeout = 0 // disabled } install(Auth) - install(Logging) { level = LogLevel.ALL } + install(Logging) { level = LogLevel.INFO } install(ClientContentNegotiation) } diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt index f6733e26a..5784679fe 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt @@ -14,7 +14,7 @@ import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.server.routing.* -fun Routing.assistantRoutes(logger: KLogger) { +fun Routing.assistantRoutes(logger: KLogger) { authenticate("auth-bearer") { post("/v1/settings/assistants") { try { @@ -103,4 +103,4 @@ fun Routing.assistantRoutes(logger: KLogger) { } } } -} +} \ No newline at end of file diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/models/Responses.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/models/Responses.kt index 5591935e4..7db23bad2 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/models/Responses.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/models/Responses.kt @@ -6,8 +6,7 @@ import com.xebia.functional.xef.server.db.tables.User import com.xebia.functional.xef.server.db.tables.XefTokens import kotlinx.serialization.Serializable -@Serializable -data class LoginResponse(val authToken: String, val user: UserResponse) +@Serializable data class LoginResponse(val authToken: String) @Serializable data class UserResponse(val id: Int, val name: String) diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/services/UserRepositoryService.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/services/UserRepositoryService.kt index 49f2b150a..01d4a9f97 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/services/UserRepositoryService.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/services/UserRepositoryService.kt @@ -6,7 +6,6 @@ import com.xebia.functional.xef.server.models.LoginRequest import com.xebia.functional.xef.server.models.LoginResponse import com.xebia.functional.xef.server.models.RegisterRequest import com.xebia.functional.xef.server.models.exceptions.XefExceptions.UserException -import com.xebia.functional.xef.server.models.toUserResponse import com.xebia.functional.xef.server.utils.HashUtils import io.github.oshai.kotlinlogging.KLogger import kotlinx.uuid.UUID @@ -34,7 +33,7 @@ class UserRepositoryService(private val logger: KLogger) { authToken = UUID.generateUUID(passwordHashed).toString() } } - LoginResponse(user.authToken, user.toUserResponse()) + LoginResponse(user.authToken) } } @@ -48,7 +47,7 @@ class UserRepositoryService(private val logger: KLogger) { if (!HashUtils.checkPassword(request.password, user.salt, user.passwordHash)) throw Exception("Invalid password") - LoginResponse(user.authToken, user.toUserResponse()) + LoginResponse(user.authToken) } } } diff --git a/server/web/src/utils/api/assistants.ts b/server/web/src/utils/api/assistants.ts index e762c028f..e101f2640 100644 --- a/server/web/src/utils/api/assistants.ts +++ b/server/web/src/utils/api/assistants.ts @@ -92,4 +92,4 @@ import { export async function deleteAssistant(authToken: string, id: string): Promise { await executeRequest(authToken, 'DELETE', `/${id}`); - } + } \ No newline at end of file diff --git a/server/web/src/utils/api/chatCompletions.ts b/server/web/src/utils/api/chatCompletions.ts index 56cdba055..adf4fb61c 100644 --- a/server/web/src/utils/api/chatCompletions.ts +++ b/server/web/src/utils/api/chatCompletions.ts @@ -8,4 +8,4 @@ export function openai (settings: Settings): OpenAI { dangerouslyAllowBrowser: true, apiKey: settings.apiKey, // defaults to process.env["OPENAI_API_KEY"] }); -} \ No newline at end of file +} diff --git a/server/xefMobile/.gitignore b/server/xefMobile/.gitignore deleted file mode 100644 index efd959ba4..000000000 --- a/server/xefMobile/.gitignore +++ /dev/null @@ -1,153 +0,0 @@ -# Created by https://www.gitignore.io/api/android,intellij - -### Android ### -# Built application files -*.apk -*.ap_ - -# Files for the ART/Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ -out/ -tokenizer/karma.config.d/ - -# Gradle files -.gradle/ -build/ - -# dokka + ank apidocs merge to sources -apidocs/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - -# Android Studio Navigation editor temp files -.navigation/ - -# Android Studio captures folder -captures/ - -# Intellij -*.iml -.idea/* -!.idea/vcs.xml - -# Keystore files -*.jks - -# External native build folder generated in Android Studio 2.2 and later -.externalNativeBuild - -# Google Services (e.g. APIs or Firebase) -google-services.json - -# Freeline -freeline.py -freeline/ -freeline_project_description.json - -### Android Patch ### -gen-external-apklibs - -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea/**/workspace.xml -.idea/**/tasks.xml - -# Sensitive or high-churn files: -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.xml -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml - -# Gradle: -.idea/**/gradle.xml -.idea/**/libraries - -#Kotlintest -**/.kotlintest - -# Mongo Explorer plugin: -.idea/**/mongoSettings.xml - -## File-based project format: -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Jekyll -_site -.sass-cache -vendor -.bundle - -# Ruby -Gemfile.lock - -### Intellij Patch ### -# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 - -# *.iml -# modules.xml -# .idea/misc.xml -# *.ipr - -###################### - -reports/ - -# End of https://www.gitignore.io/api/android,intellij -/.idea/misc.xml - -.DS_Store - -target/ - -.bash_profile -**/.kotlintest/ - - -_site/ -kotlin-js-store/ -.sass-cache/ -.jekyll-cache/ -.jekyll-metadata - -.env - -*.bin -model.log -operations.log \ No newline at end of file diff --git a/server/xefMobile/.idea/vcs.xml b/server/xefMobile/.idea/vcs.xml deleted file mode 100644 index b2bdec2d7..000000000 --- a/server/xefMobile/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/server/xefMobile/.kotlin/sessions/kotlin-compiler-859541645610285268.salive b/server/xefMobile/.kotlin/sessions/kotlin-compiler-859541645610285268.salive deleted file mode 100644 index e69de29bb..000000000 diff --git a/server/xefMobile/README.MD b/server/xefMobile/README.MD deleted file mode 100644 index 583cb36ec..000000000 --- a/server/xefMobile/README.MD +++ /dev/null @@ -1,15 +0,0 @@ -# Compose Multiplatform Application - -## Before running! - - install JDK 17 or higher on your machine - - add `local.properties` file to the project root and set a path to Android SDK there - -### Android -To run the application on android device/emulator: - - open project in Android Studio and run imported android run configuration - -To build the application bundle: - - run `./gradlew :composeApp:assembleDebug` - - find `.apk` file in `composeApp/build/outputs/apk/debug/composeApp-debug.apk` -Run android simulator UI tests: `./gradlew :composeApp:pixel5Check` - diff --git a/server/xefMobile/build.gradle.kts b/server/xefMobile/build.gradle.kts deleted file mode 100644 index 4b93c8e5a..000000000 --- a/server/xefMobile/build.gradle.kts +++ /dev/null @@ -1,8 +0,0 @@ -plugins { - alias(libs.plugins.multiplatform).apply(false) - alias(libs.plugins.compose.compiler).apply(false) - alias(libs.plugins.compose).apply(false) - alias(libs.plugins.android.application).apply(false) - alias(libs.plugins.buildConfig).apply(false) - alias(libs.plugins.kotlinx.serialization).apply(false) -} diff --git a/server/xefMobile/composeApp/build.gradle.kts b/server/xefMobile/composeApp/build.gradle.kts deleted file mode 100644 index 3b024bef1..000000000 --- a/server/xefMobile/composeApp/build.gradle.kts +++ /dev/null @@ -1,143 +0,0 @@ -import org.jetbrains.compose.ExperimentalComposeLibrary -import com.android.build.api.dsl.ManagedVirtualDevice -import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.dsl.JvmTarget -import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree - -plugins { - alias(libs.plugins.multiplatform) - alias(libs.plugins.compose.compiler) - alias(libs.plugins.compose) - alias(libs.plugins.android.application) - alias(libs.plugins.buildConfig) - alias(libs.plugins.kotlinx.serialization) -} - -kotlin { - androidTarget { - compilations.all { - compileTaskProvider { - compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) - freeCompilerArgs.add("-Xjdk-release=${JavaVersion.VERSION_1_8}") - } - } - } - @OptIn(ExperimentalKotlinGradlePluginApi::class) - instrumentedTestVariant { - sourceSetTree.set(KotlinSourceSetTree.test) - dependencies { - debugImplementation(libs.androidx.testManifest) - implementation(libs.androidx.junit4) - } - } - } - - sourceSets { - all { - languageSettings { - optIn("org.jetbrains.compose.resources.ExperimentalResourceApi") - } - } - val commonMain by getting { - dependencies { - implementation(compose.runtime) - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.components.resources) - implementation(compose.components.uiToolingPreview) - implementation(libs.voyager.navigator) - implementation(libs.composeImageLoader) - implementation(libs.napier) - implementation(libs.kotlinx.coroutines.core) - implementation(libs.ktor.core) - implementation(libs.kotlinx.serialization.json) - implementation(libs.multiplatformSettings) - implementation(libs.ktor.client.json) - implementation("io.ktor:ktor-client-content-negotiation:2.3.11") - implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.11") - implementation("androidx.navigation:navigation-compose:2.7.7") - implementation("com.squareup.retrofit2:retrofit:2.11.0") - implementation("com.squareup.retrofit2:converter-gson:2.11.0") - implementation("io.ktor:ktor-client-serialization-jvm:2.3.11") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3") - implementation("com.google.accompanist:accompanist-permissions:0.34.0") - } - } - - val commonTest by getting { - dependencies { - implementation(kotlin("test")) - @OptIn(ExperimentalComposeLibrary::class) - implementation(compose.uiTest) - implementation(libs.kotlinx.coroutines.test) - } - } - - val androidMain by getting { - dependencies { - implementation(compose.uiTooling) - implementation(libs.androidx.activityCompose) - implementation(libs.kotlinx.coroutines.android) - implementation(libs.ktor.client.okhttp) - implementation("io.ktor:ktor-client-android:2.3.11") - implementation(libs.ktor.client.json) - implementation("io.ktor:ktor-client-content-negotiation:2.3.11") - implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.11") - implementation("androidx.navigation:navigation-compose:2.7.7") - implementation("androidx.datastore:datastore-preferences:1.1.1") - implementation("androidx.compose.runtime:runtime-livedata:1.6.7") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3") - implementation("io.ktor:ktor-client-serialization-jvm:2.3.11") - implementation("com.google.accompanist:accompanist-permissions:0.34.0") - } - } - } -} - -android { - namespace = "org.xef.xefMobile" - compileSdk = 34 - - defaultConfig { - minSdk = 24 - targetSdk = 34 - applicationId = "org.xef.xefMobile.androidApp" - versionCode = 1 - versionName = "1.0.0" - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - sourceSets["main"].apply { - manifest.srcFile("src/androidMain/AndroidManifest.xml") - res.srcDirs("src/androidMain/res") - } - - @Suppress("UnstableApiUsage") - testOptions { - managedDevices.devices { - maybeCreate("pixel5").apply { - device = "Pixel 5" - apiLevel = 34 - systemImageSource = "aosp" - } - } - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - buildFeatures { - compose = true - } - - composeOptions { - kotlinCompilerExtensionVersion = "1.5.11" - } -} - -buildConfig { - // BuildConfig configuration here. -} diff --git a/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml b/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml deleted file mode 100644 index c6670f1a1..000000000 --- a/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt deleted file mode 100644 index cb9e66be7..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.xef.xefMobile - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import com.server.movile.xef.android.ui.viewmodels.AuthViewModel -import com.xef.xefMobile.services.ApiService - -class MainActivity : ComponentActivity() { - private lateinit var authViewModel: AuthViewModel - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - authViewModel = AuthViewModel(this, ApiService()) - - setContent { - XefAndroidApp(authViewModel = authViewModel) - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt deleted file mode 100644 index 595921724..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt +++ /dev/null @@ -1,271 +0,0 @@ -package com.xef.xefMobile - -import android.annotation.SuppressLint -import android.widget.Toast -import androidx.compose.foundation.Image -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.Menu -import androidx.compose.material3.* -import androidx.compose.runtime.Composable -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.unit.dp -import androidx.navigation.NavController -import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel -import kotlinx.coroutines.launch -import org.xef.xefMobile.R -import com.xef.xefMobile.ui.screens.Screens - -@OptIn(ExperimentalMaterial3Api::class) -@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") -@Composable -fun MainLayout( - navController: NavController, - authViewModel: IAuthViewModel, - userName: String, - content: @Composable () -> Unit -) { - val coroutineScope = rememberCoroutineScope() - val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) - val CustomLightBlue = Color(0xFFADD8E6) - val CustomTextBlue = Color(0xFF0199D7) - val context = LocalContext.current - - ModalNavigationDrawer( - drawerState = drawerState, - gesturesEnabled = true, - drawerContent = { - ModalDrawerSheet { - Box( - modifier = Modifier - .background(CustomLightBlue) - .fillMaxWidth() - .height(100.dp) - ) { - Image( - painter = painterResource(id = R.drawable.xef_brand_name), - contentDescription = "Logo", - modifier = Modifier - .size(150.dp) - .align(Alignment.Center) - ) - } - HorizontalDivider() - - NavigationDrawerItem( - label = { Text(text = "Home", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.home_24px), - contentDescription = "home", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Home.screen) { - popUpTo(0) - } - } - ) - NavigationDrawerItem( - label = { Text(text = "Organizations", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.source_environment_24px), - contentDescription = "organizations", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Organizations.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Assistants", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.smart_toy_24px), - contentDescription = "assistants", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Assistants.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Projects", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.school_24px), - contentDescription = "projects", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Projects.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Chat", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.chat_24px), - contentDescription = "chat", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Chat.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Generic question", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.support_agent_24px), - contentDescription = "generic question", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.GenericQuestion.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Settings", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.settings_24px), - contentDescription = "settings", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Settings.screen) { - popUpTo(0) - } - }) - - Spacer(modifier = Modifier.weight(1f)) - NavigationDrawerItem( - label = { Text(text = "Logout", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.logout_24dp_fill0_wght400_grad0_opsz24), - contentDescription = "logout", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - authViewModel.logout() - Toast.makeText(context, "Logged out", Toast.LENGTH_SHORT).show() - navController.navigate(Screens.Login.screen) { - popUpTo(0) { - inclusive = true - } - } - }) - } - }, - ) { - Scaffold( - topBar = { - TopAppBar( - title = { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween, - modifier = Modifier.fillMaxWidth() - ) { - Image( - painter = painterResource(id = R.drawable.xef_brand_name_white), - contentDescription = "Logo", - modifier = Modifier.size(60.dp) - ) - Spacer(modifier = Modifier.weight(1f)) - Text( - text = userName, - color = Color.White, - style = MaterialTheme.typography.bodyLarge, - modifier = Modifier.padding(end = 16.dp) - ) - } - }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = CustomLightBlue, - titleContentColor = Color.White, - navigationIconContentColor = Color.White - ), - navigationIcon = { - IconButton(onClick = { - coroutineScope.launch { - drawerState.open() - } - }) { - Icon( - Icons.Rounded.Menu, contentDescription = "MenuButton" - ) - } - }, - ) - } - ) { - Box(modifier = Modifier.padding(it)) { - content() - } - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt deleted file mode 100644 index 23cc9b8c9..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.xef.xefMobile - -import android.annotation.SuppressLint -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.livedata.observeAsState -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import androidx.navigation.compose.NavHost -import androidx.navigation.compose.composable -import androidx.navigation.compose.rememberNavController -import com.server.movile.xef.android.ui.screens.* -import com.server.movile.xef.android.ui.screens.menu.AssistantScreen -import com.server.movile.xef.android.ui.screens.menu.CreateAssistantScreen -import com.server.movile.xef.android.ui.screens.navigationdrawercompose.HomeScreen -import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel -import com.xef.xefMobile.ui.screens.Screens - -@OptIn(ExperimentalMaterial3Api::class) -@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") -@Composable -fun XefAndroidApp(authViewModel: IAuthViewModel) { - val navigationController = rememberNavController() - val userName by authViewModel.userName.observeAsState("") - - NavHost( - navController = navigationController, - startDestination = Screens.Login.screen, - modifier = Modifier.padding(top = 16.dp) - ) { - composable(Screens.Login.screen) { - LoginScreen(authViewModel, navigationController) - } - composable(Screens.Register.screen) { - RegisterScreen(authViewModel, navigationController) - } - composable(Screens.Home.screen) { - MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { - HomeScreen(authViewModel, navigationController) - } - } - composable(Screens.Assistants.screen) { - MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { - AssistantScreen(navigationController, authViewModel) - } - } - composable(Screens.CreateAssistant.screen) { - MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { - CreateAssistantScreen(navigationController) - } - } - // ... other composable screens ... - } -} - diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt deleted file mode 100644 index 668bb97d4..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.xef.xefMobile.model - -import kotlinx.serialization.Serializable - -@Serializable -data class Assistant( - val id: String, - val name: String -) - -@Serializable -data class AssistantsResponse( - val data: List -) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt deleted file mode 100644 index 3b4a8fcf7..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.xef.xefMobile.model - -import kotlinx.serialization.Serializable - -@Serializable -data class RegisterRequest( - val name: String, - val email: String, - val password: String -) - -@Serializable -data class RegisterResponse( - - val authToken: String -) - -@Serializable -data class LoginRequest( - val email: String, - val password: String -) - -@Serializable -data class LoginResponse( - val authToken: String, - val user: UserResponse -) - -@Serializable -data class UserResponse( - val id: Int, - val name: String -) \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt deleted file mode 100644 index 4de2a18d5..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.xef.xefMobile.network.client - -import io.ktor.client.* -import io.ktor.client.engine.android.* -import io.ktor.client.plugins.contentnegotiation.* -import io.ktor.serialization.kotlinx.json.* -import kotlinx.serialization.json.Json - -object HttpClientProvider { - val client: HttpClient = HttpClient(Android) { - install(ContentNegotiation) { - json(Json { - ignoreUnknownKeys = true - isLenient = true - prettyPrint = true - }) - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt deleted file mode 100644 index fa1fb1f0b..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ /dev/null @@ -1,61 +0,0 @@ -package com.xef.xefMobile.services - -import android.util.Log -import com.xef.xefMobile.model.* -import com.xef.xefMobile.network.client.HttpClientProvider -import io.ktor.client.call.* -import io.ktor.client.request.* -import io.ktor.client.statement.* -import io.ktor.http.* - -class ApiService { - - suspend fun registerUser(request: RegisterRequest): RegisterResponse { - return try { - HttpClientProvider.client.post { - url("http://10.0.2.2:8081/register") - contentType(ContentType.Application.Json) - setBody(request) - }.body() - } catch (e: Exception) { - Log.e("ApiService", "Register failed: ${e.message}", e) - throw e - } - } - - suspend fun loginUser(request: LoginRequest): LoginResponse { - return try { - val response: HttpResponse = HttpClientProvider.client.post { - url("http://10.0.2.2:8081/login") - contentType(ContentType.Application.Json) - setBody(request) - } - - val responseBody: String = response.bodyAsText() - Log.d("ApiService", "Login response body: $responseBody") - - response.body() - } catch (e: Exception) { - Log.e("ApiService", "Login failed: ${e.message}", e) - throw e - } - } - - suspend fun getAssistants(authToken: String): AssistantsResponse { - return try { - val response: HttpResponse = HttpClientProvider.client.get { - url("http://10.0.2.2:8081/v1/settings/assistants") - header(HttpHeaders.Authorization, "Bearer $authToken") - header("OpenAI-Beta", "assistants=v1") - } - - val responseBody: String = response.bodyAsText() - Log.d("ApiService", "Assistants response body: $responseBody") - - response.body() - } catch (e: Exception) { - Log.e("ApiService", "Fetching assistants failed: ${e.message}", e) - throw e - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt deleted file mode 100644 index 9cda93716..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.xef.xefMobile.services - -import com.xef.xefMobile.model.LoginRequest -import com.xef.xefMobile.model.LoginResponse -import com.xef.xefMobile.model.RegisterRequest -import com.xef.xefMobile.model.RegisterResponse -import io.ktor.client.call.* -import io.ktor.client.request.* -import io.ktor.http.* -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext -import kotlinx.serialization.json.Json -import com.xef.xefMobile.network.client.HttpClientProvider - -class UserRepositoryService { - private val client = HttpClientProvider.client - private val baseUrl = "https://api.miservidor.com" - private val json = Json { isLenient = true; ignoreUnknownKeys = true } - - suspend fun register(request: RegisterRequest): RegisterResponse = withContext(Dispatchers.IO) { - client.post { - url("$baseUrl/register") - contentType(ContentType.Application.Json) - setBody(request) - }.body() - } - - suspend fun login(request: LoginRequest): LoginResponse = withContext(Dispatchers.IO) { - client.post { - url("$baseUrl/login") - contentType(ContentType.Application.Json) - setBody(request) - }.body() - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt deleted file mode 100644 index 92bf160bd..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.xef.xefMobile.theme - -import android.app.Activity -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.ui.platform.LocalView -import androidx.core.view.WindowInsetsControllerCompat - -@Composable -internal fun SystemAppearance(isDark: Boolean) { - val view = LocalView.current - LaunchedEffect(isDark) { - val window = (view.context as Activity).window - WindowInsetsControllerCompat(window, window.decorView).apply { - isAppearanceLightStatusBars = !isDark - isAppearanceLightNavigationBars = !isDark - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt deleted file mode 100644 index 7c9e11755..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ /dev/null @@ -1,153 +0,0 @@ -package com.xef.xefMobile.ui.composable - -import androidx.activity.compose.rememberLauncherForActivityResult -import androidx.activity.result.contract.ActivityResultContracts -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.dp -import androidx.compose.ui.platform.LocalContext -import androidx.lifecycle.viewmodel.compose.viewModel -import com.google.accompanist.permissions.ExperimentalPermissionsApi -import com.google.accompanist.permissions.isGranted -import com.google.accompanist.permissions.rememberPermissionState - -import com.server.movile.xef.android.ui.themes.CustomColors -import com.xef.xefMobile.ui.viewmodels.PathViewModel - -@OptIn(ExperimentalPermissionsApi::class) -@Composable -fun FilePickerDialog( - onDismissRequest: () -> Unit, - customColors: CustomColors, - onFilesSelected: () -> Unit // Callback for when files are selected -) { - val viewModel: PathViewModel = viewModel() - val state = viewModel.state - val context = LocalContext.current - - val permissionState = rememberPermissionState( - permission = android.Manifest.permission.READ_EXTERNAL_STORAGE - ) - - var selectedFile by remember { mutableStateOf(null) } - - SideEffect { - if (!permissionState.status.isGranted) { - permissionState.launchPermissionRequest() - } - } - - val filePickerLauncher = rememberLauncherForActivityResult( - contract = ActivityResultContracts.GetMultipleContents(), - onResult = { uris -> - viewModel.onFilePathsListChange(uris, context) - if (uris.isNotEmpty()) { - onFilesSelected() // Call the callback when files are selected - selectedFile = state.filePaths.firstOrNull() - } - } - ) - - AlertDialog( - onDismissRequest = onDismissRequest, - title = { - Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text( - text = "Selected Files", - fontWeight = FontWeight.Bold - ) - Spacer(modifier = Modifier.height(8.dp)) - HorizontalDivider() - } - }, - text = { - Column( - modifier = Modifier - .fillMaxSize() - .padding(15.dp), - verticalArrangement = Arrangement.SpaceEvenly, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Box( - modifier = Modifier - .fillMaxWidth() - .fillMaxHeight(0.76f), - contentAlignment = Alignment.Center - ) { - if (state.filePaths.isEmpty()) { - Box( - modifier = Modifier - .fillMaxSize(), - contentAlignment = Alignment.Center - ) { - Text(text = "No files selected") - } - } else { - LazyColumn { - items(state.filePaths) { path -> - Text( - text = path, - modifier = Modifier - .fillMaxWidth() - .clickable { - selectedFile = path - } - .padding(8.dp), - color = if (selectedFile == path) Color.Blue else Color.Unspecified - ) - } - } - } - } - OutlinedButton( - onClick = { - if (permissionState.status.isGranted) { - filePickerLauncher.launch("*/*") - } else { - permissionState.launchPermissionRequest() - } - }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text(text = "Browse files") - } - if (selectedFile != null) { - OutlinedButton( - onClick = { - viewModel.removeFilePath(selectedFile!!) - selectedFile = null - }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text(text = "Remove") - } - } - } - }, - confirmButton = { - Button( - onClick = { onDismissRequest() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) - ) { - Text("Done") - } - } - ) -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt deleted file mode 100644 index 2c59cf416..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt +++ /dev/null @@ -1,103 +0,0 @@ -package com.xef.xefMobile.ui.composable - -import android.content.ContentUris -import android.content.Context -import android.database.Cursor -import android.net.Uri -import android.os.Build -import android.os.Environment -import android.provider.DocumentsContract -import android.provider.MediaStore -import java.lang.NumberFormatException - -class UriPathFinder { - - fun getPath(context: Context, uri: Uri): String? { - return when { - DocumentsContract.isDocumentUri(context, uri) -> { - when { - isExternalStorageDocument(uri) -> handleExternalStorageDocument(uri) - isDownloadsDocument(uri) -> handleDownloadsDocument(context, uri) - isMediaDocument(uri) -> handleMediaDocument(context, uri) - else -> null - } - } - "content".equals(uri.scheme, ignoreCase = true) -> getDataColumn(context, uri, null, null) - "file".equals(uri.scheme, ignoreCase = true) -> uri.path - else -> null - } - } - - private fun handleExternalStorageDocument(uri: Uri): String? { - val docId = DocumentsContract.getDocumentId(uri) - val split = docId.split(":").toTypedArray() - val type = split[0] - return if ("primary".equals(type, ignoreCase = true)) { - Environment.getExternalStorageDirectory().toString() + "/" + split[1] - } else { - // Handle non-primary volumes (e.g., "content://com.android.externalstorage.documents/document/primary:...") - val storageDefinition = System.getenv("SECONDARY_STORAGE")?.split(":") - storageDefinition?.find { it.contains(type) }?.let { "$it/${split[1]}" } - } - } - - private fun handleDownloadsDocument(context: Context, uri: Uri): String? { - val id = DocumentsContract.getDocumentId(uri) - return try { - val contentUri = ContentUris.withAppendedId( - Uri.parse("content://downloads/public_downloads"), - java.lang.Long.valueOf(id) - ) - getDataColumn(context, contentUri, null, null) - } catch (e: NumberFormatException) { - // Handle the case where the id is not a pure number - null - } - } - - private fun handleMediaDocument(context: Context, uri: Uri): String? { - val docId = DocumentsContract.getDocumentId(uri) - val split = docId.split(":").toTypedArray() - val type = split[0] - val contentUri: Uri? = when (type) { - "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI - "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI - "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI - else -> null - } - val selection = "_id=?" - val selectionArgs = arrayOf(split[1]) - return getDataColumn(context, contentUri, selection, selectionArgs) - } - - private fun getDataColumn( - context: Context, - uri: Uri?, - selection: String?, - selectionArgs: Array? - ): String? { - val cursor: Cursor? = uri?.let { - context.contentResolver.query(it, arrayOf("_data"), selection, selectionArgs, null) - } - return cursor?.use { - if (it.moveToFirst()) { - val columnIndex: Int = it.getColumnIndexOrThrow("_data") - it.getString(columnIndex) - } else { - null - } - } - } - - private fun isExternalStorageDocument(uri: Uri): Boolean { - return "com.android.externalstorage.documents" == uri.authority - } - - private fun isDownloadsDocument(uri: Uri): Boolean { - return "com.android.providers.downloads.documents" == uri.authority - } - - private fun isMediaDocument(uri: Uri): Boolean { - return "com.android.providers.media.documents" == uri.authority - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt deleted file mode 100644 index d54a113de..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.xef.xefMobile.ui.navigation - -import androidx.compose.runtime.Composable -import androidx.navigation.compose.NavHost -import androidx.navigation.compose.composable -import androidx.navigation.compose.rememberNavController -import com.server.movile.xef.android.ui.screens.LoginScreen -import com.server.movile.xef.android.ui.screens.RegisterScreen -import com.server.movile.xef.android.ui.screens.menu.AssistantScreen -import com.server.movile.xef.android.ui.screens.menu.CreateAssistantScreen -import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel -import com.xef.xefMobile.ui.screens.Screens - -@Composable -fun AppNavigator(authViewModel: IAuthViewModel) { - val navController = rememberNavController() - NavHost(navController = navController, startDestination = Screens.Login.screen) { - composable(Screens.Login.screen) { - LoginScreen(authViewModel = authViewModel, navController = navController) - } - composable(Screens.Register.screen) { - RegisterScreen(authViewModel = authViewModel, navController = navController) - } - composable(Screens.Assistants.screen) { - AssistantScreen(navController = navController, authViewModel = authViewModel) - } - composable(Screens.CreateAssistant.screen) { - CreateAssistantScreen(navController = navController) - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt deleted file mode 100644 index 18d10e543..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.xef.xefMobile.ui.screens.FilePicker - -data class PathScreenState( - val filePaths:List = emptyList() - -) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt deleted file mode 100644 index 11b567156..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt +++ /dev/null @@ -1,110 +0,0 @@ -package com.server.movile.xef.android.ui.screens - -import android.util.Log -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material3.* -import androidx.navigation.NavController -import androidx.compose.runtime.* -import androidx.compose.runtime.livedata.observeAsState -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.input.PasswordVisualTransformation -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel -import com.xef.xefMobile.ui.screens.Screens - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun LoginScreen(authViewModel: IAuthViewModel, navController: NavController) { - val authToken by authViewModel.authToken.observeAsState() - var email by remember { mutableStateOf("") } - var password by remember { mutableStateOf("") } - var errorMessage by remember { mutableStateOf(null) } - - LaunchedEffect(authToken) { - if (authToken != null) { - Log.d("LoginScreen", "Navigation to Start Screen") - navController.navigate(Screens.Home.screen) { - popUpTo(Screens.Login.screen) { inclusive = true } - } - } - } - - Column( - modifier = Modifier - .fillMaxSize() - .background(Color.White), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - Text( - text = "Xef Server", - fontSize = 24.sp, - textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(16.dp)) - - if (errorMessage != null) { - Text(text = errorMessage!!, color = Color.Red, textAlign = TextAlign.Center) - Spacer(modifier = Modifier.height(8.dp)) - } - - OutlinedTextField( - value = email, - onValueChange = { email = it }, - label = { Text("Email") }, - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email) - ) - Spacer(modifier = Modifier.height(8.dp)) - OutlinedTextField( - value = password, - onValueChange = { password = it }, - label = { Text("Password") }, - visualTransformation = PasswordVisualTransformation(), - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) - ) - Spacer(modifier = Modifier.height(16.dp)) - Button( - onClick = { - when { - email.isBlank() -> { - errorMessage = "Email field is empty" - Log.d("LoginScreen", "Email field is empty") - } - password.isBlank() -> { - errorMessage = "Password field is empty" - Log.d("LoginScreen", "Password field is empty") - } - else -> { - errorMessage = null - authViewModel.login(email = email, password = password) - Log.d("LoginScreen", "Login button pressed") - } - } - }, - modifier = Modifier.width(200.dp), - colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF009688)) - ) { - Text("Login") - } - Spacer(modifier = Modifier.height(8.dp)) - TextButton( - onClick = { - navController.navigate(Screens.Register.screen) - Log.d("LoginScreen", "Navigate to Register Screen") - }, - modifier = Modifier.fillMaxWidth() - ) { - Text("Create An Account") - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt deleted file mode 100644 index a84df0346..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt +++ /dev/null @@ -1,125 +0,0 @@ -package com.server.movile.xef.android.ui.screens - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.text.KeyboardOptions -import androidx.navigation.NavController -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.runtime.livedata.observeAsState -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.input.PasswordVisualTransformation -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel -import com.xef.xefMobile.ui.screens.Screens - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun RegisterScreen(authViewModel: IAuthViewModel, navController: NavController) { - var errorMessage by remember { mutableStateOf(null) } - val authToken by authViewModel.authToken.observeAsState() - - LaunchedEffect(authToken) { - if (authToken != null) { - navController.navigate(Screens.Login.screen) { - popUpTo(Screens.Register.screen) { inclusive = true } - } - } - } - - Column( - modifier = Modifier - .fillMaxSize() - .background(Color.White), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - Text( - text = "Xef Server", - fontSize = 30.sp, - textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = "Create an account", - fontSize = 24.sp, - textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(16.dp)) - var name by remember { mutableStateOf("") } - var email by remember { mutableStateOf("") } - var password by remember { mutableStateOf("") } - var rePassword by remember { mutableStateOf("") } - - OutlinedTextField( - value = name, - onValueChange = { name = it }, - label = { Text("Name") }, - singleLine = true - ) - Spacer(modifier = Modifier.height(8.dp)) - OutlinedTextField( - value = email, - onValueChange = { email = it }, - label = { Text("Email") }, - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email) - ) - Spacer(modifier = Modifier.height(8.dp)) - OutlinedTextField( - value = password, - onValueChange = { password = it }, - label = { Text("Password") }, - visualTransformation = PasswordVisualTransformation(), - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) - ) - Spacer(modifier = Modifier.height(8.dp)) - OutlinedTextField( - value = rePassword, - onValueChange = { rePassword = it }, - label = { Text("Re-Password") }, - visualTransformation = PasswordVisualTransformation(), - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) - ) - Spacer(modifier = Modifier.height(16.dp)) - errorMessage?.let { - Text(text = it, color = Color.Red, style = MaterialTheme.typography.bodyLarge) - Spacer(modifier = Modifier.height(8.dp)) - } - - Button( - onClick = { - errorMessage = when { - name.isBlank() -> "Name is empty" - email.isBlank() -> "Email is empty" - password.isEmpty() -> "Password is empty" - password != rePassword -> "Passwords do not match" - else -> null - } - if (errorMessage == null) { - authViewModel.register(name, email, password) - } - }, - modifier = Modifier.width(200.dp), - colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF009688)) - ) { - Text("Create Account") - } - Spacer(modifier = Modifier.height(8.dp)) - TextButton( - onClick = { navController.navigate(Screens.Login.screen) }, - modifier = Modifier.fillMaxWidth() - ) { - Text("Back") - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt deleted file mode 100644 index d64384395..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.xef.xefMobile.ui.screens - -sealed class Screens(val screen: String) { - object Login : Screens("loginScreen") - object Register : Screens("registerScreen") - object Start : Screens("startScreen") - object Home : Screens("homeScreen") - object Organizations : Screens("organizationsScreen") - object Assistants : Screens("assistantsScreen") - object Projects : Screens("projectsScreen") - object Chat : Screens("chatScreen") - object GenericQuestion : Screens("genericQuestionScreen") - object Settings : Screens("settingsScreen") - object CreateAssistant : Screens("createAssistantScreen") -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt deleted file mode 100644 index defee5364..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt +++ /dev/null @@ -1,101 +0,0 @@ -package com.server.movile.xef.android.ui.screens.menu - -import androidx.compose.foundation.layout.* -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.navigation.NavController -import androidx.navigation.compose.rememberNavController -import com.server.movile.xef.android.ui.viewmodels.AuthViewModel -import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel -import com.xef.xefMobile.model.Assistant -import com.xef.xefMobile.services.ApiService -import com.xef.xefMobile.theme.theme.LocalCustomColors -import com.xef.xefMobile.ui.screens.Screens -import kotlinx.coroutines.launch - -@Composable -fun AssistantScreen(navController: NavController, authViewModel: IAuthViewModel) { - val customColors = LocalCustomColors.current - val coroutineScope = rememberCoroutineScope() - var assistants by remember { mutableStateOf>(emptyList()) } - var loading by remember { mutableStateOf(true) } - var errorMessage by remember { mutableStateOf(null) } - - val authToken = authViewModel.authToken.value ?: error("Auth token not found") - - LaunchedEffect(Unit) { - coroutineScope.launch { - try { - val response = ApiService().getAssistants(authToken) - assistants = response.data - } catch (e: Exception) { - errorMessage = "Failed to load assistants" - } finally { - loading = false - } - } - } - - Box(modifier = Modifier.fillMaxSize()) { - if (loading) { - CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) - } else if (errorMessage != null) { - Text( - text = errorMessage!!, - color = MaterialTheme.colorScheme.error, - modifier = Modifier.align(Alignment.Center) - ) - } else { - Column( - modifier = Modifier - .align(Alignment.TopCenter) - .padding(20.dp), - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text( - text = "Assistants", - fontWeight = FontWeight.Bold, - fontSize = 24.sp, - ) - HorizontalDivider( - modifier = Modifier - .fillMaxWidth() - .padding(top = 8.dp) - ) - - Spacer(modifier = Modifier.height(16.dp)) - - assistants.forEach { assistant -> - Text( - text = assistant.name, - fontWeight = FontWeight.Bold - - ) - Text(text = assistant.id) - Spacer(modifier = Modifier.height(8.dp)) - } - } - - Button( - onClick = { navController.navigate(Screens.CreateAssistant.screen) }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ), - modifier = Modifier - .align(Alignment.BottomCenter) - .padding(16.dp) - ) { - Text(text = "Create New Assistant") - } - } - } -} - - diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt deleted file mode 100644 index 0527f6fbd..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ /dev/null @@ -1,270 +0,0 @@ -package com.server.movile.xef.android.ui.screens.menu - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material3.* -import androidx.compose.runtime.* -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.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.navigation.NavController -import androidx.navigation.compose.rememberNavController -import com.server.movile.xef.android.ui.themes.LocalCustomColors - - -class CreateAssistantActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContent { - // Pass the NavController to CreateAssistantScreen - val navController = rememberNavController() - CreateAssistantScreen(navController) - } - } -} - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun CreateAssistantScreen(navController: NavController) { - var name by remember { mutableStateOf("") } - var instructions by remember { mutableStateOf("") } - var temperature by remember { mutableStateOf(1f) } - var topP by remember { mutableStateOf(1f) } - var fileSearchEnabled by remember { mutableStateOf(false) } - var codeInterpreterEnabled by remember { mutableStateOf(false) } - var model by remember { mutableStateOf("gpt-4-turbo") } - val list = listOf("gpt-4o", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") - var isExpanded by remember { mutableStateOf(false) } - var selectedText by remember { mutableStateOf(list[0]) } - - val customColors = LocalCustomColors.current - - Box(modifier = Modifier.fillMaxSize()) { - Column( - modifier = Modifier - .padding(8.dp) - .fillMaxSize(), - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text( - text = "Create Assistant", - fontSize = 24.sp, - modifier = Modifier.padding(bottom = 16.dp) - ) - - TextField( - value = name, - onValueChange = { name = it }, - label = { Text("Name") }, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(8.dp)) - TextField( - value = instructions, - onValueChange = { instructions = it }, - label = { Text("Instructions") }, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(8.dp)) - Column( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 8.dp), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - ExposedDropdownMenuBox( - expanded = isExpanded, - onExpandedChange = { isExpanded = !isExpanded }, - modifier = Modifier.fillMaxWidth() - ) { - TextField( - modifier = Modifier - .fillMaxWidth() - .menuAnchor(), - value = selectedText, - onValueChange = {}, - readOnly = true, - trailingIcon = { - ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) - } - ) - ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { - list.forEachIndexed { index, text -> - DropdownMenuItem( - text = { Text(text = text) }, - onClick = { - selectedText = list[index] - isExpanded = false - }, - contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding - ) - } - } - } - } - Spacer(modifier = Modifier.height(12.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - Text(text = "TOOLS") - - HorizontalDivider( - modifier = Modifier - .fillMaxWidth() - .padding(top = 10.dp) - ) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - OutlinedButton( - onClick = { /* handle cancel */ }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text("File Search") - } - Spacer(modifier = Modifier.weight(1f)) - Switch( - checked = fileSearchEnabled, - onCheckedChange = { fileSearchEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) - ) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - OutlinedButton( - onClick = { /* handle cancel */ }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text("Code Interpreter") - } - Spacer(modifier = Modifier.weight(1f)) - Switch( - checked = codeInterpreterEnabled, - onCheckedChange = { codeInterpreterEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) - ) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - OutlinedButton( - onClick = { /* handle cancel */ }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text("Functions") - } - Spacer(modifier = Modifier.weight(1f)) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - Text(text = "MODEL CONFIGURATION") - - HorizontalDivider( - modifier = Modifier - .fillMaxWidth() - .padding(top = 8.dp) - ) - } - Spacer(modifier = Modifier.width(8.dp)) - AssistantFloatField(label = "Temperature", value = temperature, onValueChange = { temperature = it }) - - AssistantFloatField(label = "Top P", value = topP, onValueChange = { topP = it }) - - Row( - horizontalArrangement = Arrangement.Center, - modifier = Modifier.fillMaxWidth() - ) { - Button( - onClick = { navController.navigateUp() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) - ) { - Text("Cancel") - } - Spacer(modifier = Modifier.width(8.dp)) - Button( - onClick = { /* handle create */ }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) - ) { - Text("Create") - } - } - } - } -} - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> Unit) { - val customColors = LocalCustomColors.current - Column( - modifier = Modifier - .fillMaxWidth() - ) { - Text( - text = label, - modifier = Modifier.padding(bottom = 2.dp) // Reduce padding for the label - ) - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth() - ) { - Slider( - value = value, - onValueChange = onValueChange, - valueRange = 0f..2f, - steps = 100, // This ensures the slider moves in increments of 0.02 - modifier = Modifier.weight(3f), - colors = SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) - ) - Spacer(modifier = Modifier.width(2.dp)) // Add a small spacer between the slider and text field - TextField( - value = String.format("%.2f", value), - onValueChange = { - val newValue = it.toFloatOrNull() ?: 0f - onValueChange(newValue) - }, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), - modifier = Modifier - .width(60.dp) - .height(50.dp), - textStyle = LocalTextStyle.current.copy(fontSize = 12.sp) // Optionally adjust text size - ) - } - } -} - -@Preview(showBackground = false) -@Composable -fun CreateAssistantScreenPreview() { - // Create a mock NavController for the preview - val navController = rememberNavController() - CreateAssistantScreen(navController) -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt deleted file mode 100644 index b4be5b21f..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.server.movile.xef.android.ui.screens.navigationdrawercompose - -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.* -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.compose.material3.MaterialTheme -import androidx.navigation.NavController -import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel -import org.xef.xefMobile.R - -@Composable -fun HomeScreen(authViewModel: IAuthViewModel, navController: NavController) { - Box(modifier = Modifier.fillMaxSize()) { - Column( - modifier = Modifier - .fillMaxSize() - .align(Alignment.Center), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Image( - painter = painterResource(id = R.drawable.xef_brand_icon), - contentDescription = "Logo", - modifier = Modifier.size(50.dp) - ) - Spacer(modifier = Modifier.height(16.dp)) - Text( - text = "Welcome to Xef.ai", - fontSize = 30.sp, - color = MaterialTheme.colorScheme.onBackground - ) - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt deleted file mode 100644 index c04e940eb..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.server.movile.xef.android.ui.screens.navigationdrawercompose - -import androidx.compose.ui.graphics.vector.ImageVector - -data class MenuItem( - val id: String, - val title: String, - val contentDescription: String, - val icon: ImageVector -) \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Color.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Color.kt deleted file mode 100644 index 131c831bb..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Color.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.server.movile.xef.android.ui.themes - -import androidx.compose.ui.graphics.Color - -// Light Theme Colors -internal val md_theme_light_primary = Color(0xFF00687A) -internal val md_theme_light_onPrimary = Color(0xFFFFFFFF) -internal val md_theme_light_primaryContainer = Color(0xFFABEDFF) -internal val md_theme_light_onPrimaryContainer = Color(0xFF001F26) -internal val md_theme_light_secondary = Color(0xFF00696E) -internal val md_theme_light_onSecondary = Color(0xFFFFFFFF) -internal val md_theme_light_secondaryContainer = Color(0xFF6FF6FE) -internal val md_theme_light_onSecondaryContainer = Color(0xFF002022) -internal val md_theme_light_tertiary = Color(0xFF904D00) -internal val md_theme_light_onTertiary = Color(0xFFFFFFFF) -internal val md_theme_light_tertiaryContainer = Color(0xFFFFDCC2) -internal val md_theme_light_onTertiaryContainer = Color(0xFF2E1500) -internal val md_theme_light_error = Color(0xFFBA1A1A) -internal val md_theme_light_errorContainer = Color(0xFFFFDAD6) -internal val md_theme_light_onError = Color(0xFFFFFFFF) -internal val md_theme_light_onErrorContainer = Color(0xFF410002) -internal val md_theme_light_background = Color(0xFFFFFBFF) -internal val md_theme_light_onBackground = Color(0xFF221B00) -internal val md_theme_light_surface = Color(0xFFFFFBFF) -internal val md_theme_light_onSurface = Color(0xFF221B00) -internal val md_theme_light_surfaceVariant = Color(0xFFDBE4E7) -internal val md_theme_light_onSurfaceVariant = Color(0xFF3F484B) -internal val md_theme_light_outline = Color(0xFF70797B) -internal val md_theme_light_inverseOnSurface = Color(0xFFFFF0C0) -internal val md_theme_light_inverseSurface = Color(0xFF3A3000) -internal val md_theme_light_inversePrimary = Color(0xFF55D6F4) -internal val md_theme_light_shadow = Color(0xFF000000) -internal val md_theme_light_surfaceTint = Color(0xFF00687A) -internal val md_theme_light_outlineVariant = Color(0xFFBFC8CB) -internal val md_theme_light_scrim = Color(0xFF000000) - -// Dark Theme Colors -internal val md_theme_dark_primary = Color(0xFF55D6F4) -internal val md_theme_dark_onPrimary = Color(0xFF003640) -internal val md_theme_dark_primaryContainer = Color(0xFF004E5C) -internal val md_theme_dark_onPrimaryContainer = Color(0xFFABEDFF) -internal val md_theme_dark_secondary = Color(0xFF4CD9E2) -internal val md_theme_dark_onSecondary = Color(0xFF00373A) -internal val md_theme_dark_secondaryContainer = Color(0xFF004F53) -internal val md_theme_dark_onSecondaryContainer = Color(0xFF6FF6FE) -internal val md_theme_dark_tertiary = Color(0xFFFFB77C) -internal val md_theme_dark_onTertiary = Color(0xFF4D2700) -internal val md_theme_dark_tertiaryContainer = Color(0xFF6D3900) -internal val md_theme_dark_onTertiaryContainer = Color(0xFFFFDCC2) -internal val md_theme_dark_error = Color(0xFFFFB4AB) -internal val md_theme_dark_errorContainer = Color(0xFF93000A) -internal val md_theme_dark_onError = Color(0xFF690005) -internal val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) -internal val md_theme_dark_background = Color(0xFF221B00) -internal val md_theme_dark_onBackground = Color(0xFFFFE264) -internal val md_theme_dark_surface = Color(0xFF221B00) -internal val md_theme_dark_onSurface = Color(0xFFFFE264) -internal val md_theme_dark_surfaceVariant = Color(0xFF3F484B) -internal val md_theme_dark_onSurfaceVariant = Color(0xFFBFC8CB) -internal val md_theme_dark_outline = Color(0xFF899295) -internal val md_theme_dark_inverseOnSurface = Color(0xFF221B00) -internal val md_theme_dark_inverseSurface = Color(0xFFFFE264) -internal val md_theme_dark_inversePrimary = Color(0xFF00687A) -internal val md_theme_dark_shadow = Color(0xFF000000) -internal val md_theme_dark_surfaceTint = Color(0xFF55D6F4) -internal val md_theme_dark_outlineVariant = Color(0xFF3F484B) -internal val md_theme_dark_scrim = Color(0xFF000000) - -// Seed color for dynamic theming -internal val seed = Color(0xFF2C3639) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt deleted file mode 100644 index fc1f48a17..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt +++ /dev/null @@ -1,104 +0,0 @@ -package com.server.movile.xef.android.ui.themes - -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.ui.graphics.Color - -// Define custom colors -val CustomButtonColor = Color(0xFF01A2D1) -val CustomSliderThumbColor = Color(0xFF03DAC5) -val CustomSliderTrackColor = Color(0xFF018786) - -private val LightColorScheme = lightColorScheme( - primary = md_theme_light_primary, - onPrimary = md_theme_light_onPrimary, - primaryContainer = md_theme_light_primaryContainer, - onPrimaryContainer = md_theme_light_onPrimaryContainer, - secondary = md_theme_light_secondary, - onSecondary = md_theme_light_onSecondary, - secondaryContainer = md_theme_light_secondaryContainer, - onSecondaryContainer = md_theme_light_onSecondaryContainer, - tertiary = md_theme_light_tertiary, - onTertiary = md_theme_light_onTertiary, - tertiaryContainer = md_theme_light_tertiaryContainer, - onTertiaryContainer = md_theme_light_onTertiaryContainer, - error = md_theme_light_error, - errorContainer = md_theme_light_errorContainer, - onError = md_theme_light_onError, - onErrorContainer = md_theme_light_onErrorContainer, - background = md_theme_light_background, - onBackground = md_theme_light_onBackground, - surface = md_theme_light_surface, - onSurface = md_theme_light_onSurface, - surfaceVariant = md_theme_light_surfaceVariant, - onSurfaceVariant = md_theme_light_onSurfaceVariant, - outline = md_theme_light_outline, - inverseOnSurface = md_theme_light_inverseOnSurface, - inverseSurface = md_theme_light_inverseSurface, - inversePrimary = md_theme_light_inversePrimary, - surfaceTint = md_theme_light_surfaceTint, - outlineVariant = md_theme_light_outlineVariant, - scrim = md_theme_light_scrim, -) - -private val DarkColorScheme = darkColorScheme( - primary = md_theme_dark_primary, - onPrimary = md_theme_dark_onPrimary, - primaryContainer = md_theme_dark_primaryContainer, - onPrimaryContainer = md_theme_dark_onPrimaryContainer, - secondary = md_theme_dark_secondary, - onSecondary = md_theme_dark_onSecondary, - secondaryContainer = md_theme_dark_secondaryContainer, - onSecondaryContainer = md_theme_dark_onSecondaryContainer, - tertiary = md_theme_dark_tertiary, - onTertiary = md_theme_dark_onTertiary, - tertiaryContainer = md_theme_dark_tertiaryContainer, - onTertiaryContainer = md_theme_dark_onTertiaryContainer, - error = md_theme_dark_error, - errorContainer = md_theme_dark_errorContainer, - onError = md_theme_dark_onError, - onErrorContainer = md_theme_dark_onErrorContainer, - background = md_theme_dark_background, - onBackground = md_theme_dark_onBackground, - surface = md_theme_dark_surface, - onSurface = md_theme_dark_onSurface, - surfaceVariant = md_theme_dark_surfaceVariant, - onSurfaceVariant = md_theme_dark_onSurfaceVariant, - outline = md_theme_dark_outline, - inverseOnSurface = md_theme_dark_inverseOnSurface, - inverseSurface = md_theme_dark_inverseSurface, - inversePrimary = md_theme_dark_inversePrimary, - surfaceTint = md_theme_dark_surfaceTint, - outlineVariant = md_theme_dark_outlineVariant, - scrim = md_theme_dark_scrim, -) - -internal val LocalThemeIsDark = compositionLocalOf { mutableStateOf(true) } - -val LocalCustomColors = staticCompositionLocalOf { CustomColors() } - -data class CustomColors( - val buttonColor: Color = CustomButtonColor, - val sliderThumbColor: Color = CustomSliderThumbColor, - val sliderTrackColor: Color = CustomSliderTrackColor -) - -@Composable -internal fun AppTheme( - content: @Composable () -> Unit -) { - val systemIsDark = isSystemInDarkTheme() - val isDarkState = remember { mutableStateOf(systemIsDark) } - CompositionLocalProvider( - LocalThemeIsDark provides isDarkState, - LocalCustomColors provides CustomColors() - ) { - val isDark by isDarkState - //com.xef.xefMobile.theme.SystemAppearance(isDark) - MaterialTheme( - colorScheme = if (isDark) DarkColorScheme else LightColorScheme, - content = { Surface(content = content) } - ) - } -} \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt deleted file mode 100644 index 637bb1a72..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.server.movile.xef.android.ui.themes - -import androidx.compose.material3.Typography -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.Font -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.sp -import org.xef.xefMobile.R - - -val Montserrat = FontFamily( - Font(R.font.montserrat_regular), - Font(R.font.montserrat_bold, FontWeight.Bold) -) - -val Typography = Typography( - displayLarge = TextStyle( - fontFamily = Montserrat, - fontWeight = FontWeight.Bold, - fontSize = 24.sp - ), - bodyLarge = TextStyle( - fontFamily = Montserrat, - fontWeight = FontWeight.Bold, - fontSize = 15.sp - ) -) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt deleted file mode 100644 index 1bd88b147..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt +++ /dev/null @@ -1,149 +0,0 @@ -package com.server.movile.xef.android.ui.viewmodels - -import android.content.Context -import android.util.Log -import androidx.datastore.preferences.core.edit -import androidx.datastore.preferences.core.stringPreferencesKey -import androidx.datastore.preferences.preferencesDataStore -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.xef.xefMobile.model.LoginRequest -import com.xef.xefMobile.model.RegisterRequest -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.firstOrNull -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import com.xef.xefMobile.services.ApiService -import retrofit2.HttpException -import java.io.IOException - -// Extension function to provide DataStore instance -private val Context.dataStore by preferencesDataStore(name = "settings") - -class AuthViewModel( - context: Context, - private val apiService: ApiService -) : ViewModel(), IAuthViewModel { - - private val dataStore = context.dataStore - - private val _authToken = MutableLiveData() - override val authToken: LiveData = _authToken - - private val _isLoading = MutableLiveData() - override val isLoading: LiveData = _isLoading - - private val _errorMessage = MutableLiveData() - override val errorMessage: LiveData = _errorMessage - - private val _userName = MutableLiveData() - override val userName: LiveData = _userName - - init { - loadAuthToken() - } - - private fun loadAuthToken() { - viewModelScope.launch { - val token = dataStore.data.map { preferences -> - preferences[stringPreferencesKey("authToken")] - }.firstOrNull() - _authToken.value = token - - - token?.let { - loadUserName() - } - } - } - - private suspend fun loadUserName() { - withContext(Dispatchers.IO) { - val name = dataStore.data.map { preferences -> - preferences[stringPreferencesKey("userName")] - }.firstOrNull() - _userName.postValue(name) - } - } - - override fun login(email: String, password: String) { - viewModelScope.launch { - _isLoading.value = true - val loginRequest = LoginRequest(email, password) - try { - val loginResponse = apiService.loginUser(loginRequest) - updateAuthToken(loginResponse.authToken) - updateUserName(loginResponse.user.name) // Extract user's name - _authToken.value = loginResponse.authToken - _userName.value = loginResponse.user.name - } catch (e: Exception) { - handleException(e) - } finally { - _isLoading.value = false - } - } - } - - private suspend fun updateAuthToken(token: String) { - withContext(Dispatchers.IO) { - dataStore.edit { preferences -> - preferences[stringPreferencesKey("authToken")] = token - } - } - } - - private suspend fun updateUserName(name: String) { - withContext(Dispatchers.IO) { - dataStore.edit { preferences -> - preferences[stringPreferencesKey("userName")] = name - } - } - } - - override fun register(name: String, email: String, password: String) { - viewModelScope.launch { - _isLoading.value = true - val request = RegisterRequest(name, email, password) - try { - val registerResponse = apiService.registerUser(request) - updateAuthToken(registerResponse.authToken) - updateUserName(name) // Directly use the name provided during registration - _authToken.value = registerResponse.authToken - _userName.value = name - } catch (e: Exception) { - handleException(e) - } finally { - _isLoading.value = false - } - } - } - - private fun handleException(e: Exception) { - when (e) { - is IOException -> _errorMessage.postValue("Network error") - is HttpException -> _errorMessage.postValue("Unexpected server error: ${e.code()}") - else -> _errorMessage.postValue("An unexpected error occurred: ${e.message}") - } - } - - override fun logout() { - viewModelScope.launch { - try { - withContext(Dispatchers.IO) { - dataStore.edit { preferences -> - preferences.remove(stringPreferencesKey("authToken")) - preferences.remove(stringPreferencesKey("userName")) // Add this line - } - } - _authToken.postValue(null) - _userName.postValue(null) // Add this line - _errorMessage.postValue("Logged out successfully") - } catch (e: Exception) { - _errorMessage.postValue("Failed to sign out") - } - } - } -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt deleted file mode 100644 index ba203733a..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.server.movile.xef.android.ui.viewmodels - -import androidx.lifecycle.LiveData - -interface IAuthViewModel { - val authToken: LiveData - val isLoading: LiveData - val errorMessage: LiveData - val userName: LiveData - - fun login(email: String, password: String) - fun register(name: String, email: String, password: String) - fun logout() -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt deleted file mode 100644 index 94328f41a..000000000 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt +++ /dev/null @@ -1,43 +0,0 @@ -package com.xef.xefMobile.ui.viewmodels - -import android.content.Context -import android.net.Uri -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.xef.xefMobile.ui.composable.UriPathFinder -import com.xef.xefMobile.ui.screens.FilePicker.PathScreenState -import kotlinx.coroutines.launch - -class PathViewModel : ViewModel() { - - var state by mutableStateOf(PathScreenState()) - private set - - private val uriPathFinder = UriPathFinder() - - fun onFilePathsListChange(list: List, context: Context) { - viewModelScope.launch { - val updatedList = state.filePaths.toMutableList() - val pathList = changeUriToPath(list, context) - updatedList += pathList - state = state.copy(filePaths = updatedList) - } - } - - fun removeFilePath(path: String) { - viewModelScope.launch { - val updatedList = state.filePaths.toMutableList() - updatedList.remove(path) - state = state.copy(filePaths = updatedList) - } - } - - private fun changeUriToPath(uris: List, context: Context): List { - return uris.mapNotNull { uri -> - uriPathFinder.getPath(context, uri) - } - } -} diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/chat_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/chat_24px.xml deleted file mode 100644 index 0163a0e13..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/chat_24px.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/home_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/home_24px.xml deleted file mode 100644 index bb05c6154..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/home_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_cyclone.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_cyclone.xml deleted file mode 100644 index f1c45b5a2..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_cyclone.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_dark_mode.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_dark_mode.xml deleted file mode 100644 index 0ce2444a2..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_dark_mode.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_light_mode.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_light_mode.xml deleted file mode 100644 index b7331d3e4..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_light_mode.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_rotate_right.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_rotate_right.xml deleted file mode 100644 index 181067170..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_rotate_right.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/school_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/school_24px.xml deleted file mode 100644 index 2d1038e2e..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/school_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/settings_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/settings_24px.xml deleted file mode 100644 index 90bc79bea..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/settings_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/smart_toy_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/smart_toy_24px.xml deleted file mode 100644 index 7382f2168..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/smart_toy_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/source_environment_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/source_environment_24px.xml deleted file mode 100644 index 3707dc440..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/source_environment_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/support_agent_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/support_agent_24px.xml deleted file mode 100644 index 9c57a03f5..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/support_agent_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_icon.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_icon.xml deleted file mode 100644 index ca0f226f1..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_icon.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name.xml deleted file mode 100644 index 756bb5129..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name_white.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name_white.xml deleted file mode 100644 index db77eab35..000000000 --- a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name_white.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/font/IndieFlower-Regular.ttf b/server/xefMobile/composeApp/src/commonMain/composeResources/font/IndieFlower-Regular.ttf deleted file mode 100644 index 3774ef55d4dd8d0d272f602542bbbf444ebbbb23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55416 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 - Cyclone - Open github - Run - Stop - Theme - \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Color.kt b/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Color.kt deleted file mode 100644 index 849ee8d9d..000000000 --- a/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Color.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.xef.xefMobile.theme.theme - -import androidx.compose.ui.graphics.Color - -// Light Theme Colors -internal val md_theme_light_primary = Color(0xFF00687A) -internal val md_theme_light_onPrimary = Color(0xFFFFFFFF) -internal val md_theme_light_primaryContainer = Color(0xFFABEDFF) -internal val md_theme_light_onPrimaryContainer = Color(0xFF001F26) -internal val md_theme_light_secondary = Color(0xFF00696E) -internal val md_theme_light_onSecondary = Color(0xFFFFFFFF) -internal val md_theme_light_secondaryContainer = Color(0xFF6FF6FE) -internal val md_theme_light_onSecondaryContainer = Color(0xFF002022) -internal val md_theme_light_tertiary = Color(0xFF904D00) -internal val md_theme_light_onTertiary = Color(0xFFFFFFFF) -internal val md_theme_light_tertiaryContainer = Color(0xFFFFDCC2) -internal val md_theme_light_onTertiaryContainer = Color(0xFF2E1500) -internal val md_theme_light_error = Color(0xFFBA1A1A) -internal val md_theme_light_errorContainer = Color(0xFFFFDAD6) -internal val md_theme_light_onError = Color(0xFFFFFFFF) -internal val md_theme_light_onErrorContainer = Color(0xFF410002) -internal val md_theme_light_background = Color(0xFFFFFBFF) -internal val md_theme_light_onBackground = Color(0xFF221B00) -internal val md_theme_light_surface = Color(0xFFFFFBFF) -internal val md_theme_light_onSurface = Color(0xFF221B00) -internal val md_theme_light_surfaceVariant = Color(0xFFDBE4E7) -internal val md_theme_light_onSurfaceVariant = Color(0xFF3F484B) -internal val md_theme_light_outline = Color(0xFF70797B) -internal val md_theme_light_inverseOnSurface = Color(0xFFFFF0C0) -internal val md_theme_light_inverseSurface = Color(0xFF3A3000) -internal val md_theme_light_inversePrimary = Color(0xFF55D6F4) -internal val md_theme_light_shadow = Color(0xFF000000) -internal val md_theme_light_surfaceTint = Color(0xFF00687A) -internal val md_theme_light_outlineVariant = Color(0xFFBFC8CB) -internal val md_theme_light_scrim = Color(0xFF000000) - -// Dark Theme Colors -internal val md_theme_dark_primary = Color(0xFF55D6F4) -internal val md_theme_dark_onPrimary = Color(0xFF003640) -internal val md_theme_dark_primaryContainer = Color(0xFF004E5C) -internal val md_theme_dark_onPrimaryContainer = Color(0xFFABEDFF) -internal val md_theme_dark_secondary = Color(0xFF4CD9E2) -internal val md_theme_dark_onSecondary = Color(0xFF00373A) -internal val md_theme_dark_secondaryContainer = Color(0xFF004F53) -internal val md_theme_dark_onSecondaryContainer = Color(0xFF6FF6FE) -internal val md_theme_dark_tertiary = Color(0xFFFFB77C) -internal val md_theme_dark_onTertiary = Color(0xFF4D2700) -internal val md_theme_dark_tertiaryContainer = Color(0xFF6D3900) -internal val md_theme_dark_onTertiaryContainer = Color(0xFFFFDCC2) -internal val md_theme_dark_error = Color(0xFFFFB4AB) -internal val md_theme_dark_errorContainer = Color(0xFF93000A) -internal val md_theme_dark_onError = Color(0xFF690005) -internal val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) -internal val md_theme_dark_background = Color(0xFF221B00) -internal val md_theme_dark_onBackground = Color(0xFFFFE264) -internal val md_theme_dark_surface = Color(0xFF221B00) -internal val md_theme_dark_onSurface = Color(0xFFFFE264) -internal val md_theme_dark_surfaceVariant = Color(0xFF3F484B) -internal val md_theme_dark_onSurfaceVariant = Color(0xFFBFC8CB) -internal val md_theme_dark_outline = Color(0xFF899295) -internal val md_theme_dark_inverseOnSurface = Color(0xFF221B00) -internal val md_theme_dark_inverseSurface = Color(0xFFFFE264) -internal val md_theme_dark_inversePrimary = Color(0xFF00687A) -internal val md_theme_dark_shadow = Color(0xFF000000) -internal val md_theme_dark_surfaceTint = Color(0xFF55D6F4) -internal val md_theme_dark_outlineVariant = Color(0xFF3F484B) -internal val md_theme_dark_scrim = Color(0xFF000000) - -// Seed color for dynamic theming -internal val seed = Color(0xFF2C3639) diff --git a/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt b/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt deleted file mode 100644 index f16f5ba17..000000000 --- a/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt +++ /dev/null @@ -1,107 +0,0 @@ -package com.xef.xefMobile.theme.theme - -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.ui.graphics.Color - -// Define custom colors -val CustomButtonColor = Color(0xFF01A2D1) -val CustomSliderThumbColor = Color(0xFF03DAC5) -val CustomSliderTrackColor = Color(0xFF018786) - -private val LightColorScheme = lightColorScheme( - primary = md_theme_light_primary, - onPrimary = md_theme_light_onPrimary, - primaryContainer = md_theme_light_primaryContainer, - onPrimaryContainer = md_theme_light_onPrimaryContainer, - secondary = md_theme_light_secondary, - onSecondary = md_theme_light_onSecondary, - secondaryContainer = md_theme_light_secondaryContainer, - onSecondaryContainer = md_theme_light_onSecondaryContainer, - tertiary = md_theme_light_tertiary, - onTertiary = md_theme_light_onTertiary, - tertiaryContainer = md_theme_light_tertiaryContainer, - onTertiaryContainer = md_theme_light_onTertiaryContainer, - error = md_theme_light_error, - errorContainer = md_theme_light_errorContainer, - onError = md_theme_light_onError, - onErrorContainer = md_theme_light_onErrorContainer, - background = md_theme_light_background, - onBackground = md_theme_light_onBackground, - surface = md_theme_light_surface, - onSurface = md_theme_light_onSurface, - surfaceVariant = md_theme_light_surfaceVariant, - onSurfaceVariant = md_theme_light_onSurfaceVariant, - outline = md_theme_light_outline, - inverseOnSurface = md_theme_light_inverseOnSurface, - inverseSurface = md_theme_light_inverseSurface, - inversePrimary = md_theme_light_inversePrimary, - surfaceTint = md_theme_light_surfaceTint, - outlineVariant = md_theme_light_outlineVariant, - scrim = md_theme_light_scrim, -) - -private val DarkColorScheme = darkColorScheme( - primary = md_theme_dark_primary, - onPrimary = md_theme_dark_onPrimary, - primaryContainer = md_theme_dark_primaryContainer, - onPrimaryContainer = md_theme_dark_onPrimaryContainer, - secondary = md_theme_dark_secondary, - onSecondary = md_theme_dark_onSecondary, - secondaryContainer = md_theme_dark_secondaryContainer, - onSecondaryContainer = md_theme_dark_onSecondaryContainer, - tertiary = md_theme_dark_tertiary, - onTertiary = md_theme_dark_onTertiary, - tertiaryContainer = md_theme_dark_tertiaryContainer, - onTertiaryContainer = md_theme_dark_onTertiaryContainer, - error = md_theme_dark_error, - errorContainer = md_theme_dark_errorContainer, - onError = md_theme_dark_onError, - onErrorContainer = md_theme_dark_onErrorContainer, - background = md_theme_dark_background, - onBackground = md_theme_dark_onBackground, - surface = md_theme_dark_surface, - onSurface = md_theme_dark_onSurface, - surfaceVariant = md_theme_dark_surfaceVariant, - onSurfaceVariant = md_theme_dark_onSurfaceVariant, - outline = md_theme_dark_outline, - inverseOnSurface = md_theme_dark_inverseOnSurface, - inverseSurface = md_theme_dark_inverseSurface, - inversePrimary = md_theme_dark_inversePrimary, - surfaceTint = md_theme_dark_surfaceTint, - outlineVariant = md_theme_dark_outlineVariant, - scrim = md_theme_dark_scrim, -) - -internal val LocalThemeIsDark = compositionLocalOf { mutableStateOf(true) } - -val LocalCustomColors = staticCompositionLocalOf { CustomColors() } - -data class CustomColors( - val buttonColor: Color = CustomButtonColor, - val sliderThumbColor: Color = CustomSliderThumbColor, - val sliderTrackColor: Color = CustomSliderTrackColor -) - -@Composable -internal fun AppTheme( - content: @Composable () -> Unit -) { - val systemIsDark = isSystemInDarkTheme() - val isDarkState = remember { mutableStateOf(systemIsDark) } - CompositionLocalProvider( - LocalThemeIsDark provides isDarkState, - LocalCustomColors provides CustomColors() - ) { - val isDark by isDarkState - //com.xef.xefMobile.theme.SystemAppearance(isDark) - MaterialTheme( - colorScheme = if (isDark) DarkColorScheme else LightColorScheme, - content = { Surface(content = content) } - ) - } -} - -//@Composable -//internal expect fun SystemAppearance(isDark: Boolean) diff --git a/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt b/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt deleted file mode 100644 index 136caf75c..000000000 --- a/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt +++ /dev/null @@ -1,45 +0,0 @@ -package org.xef.xefMobile - -import androidx.compose.foundation.layout.Column -import androidx.compose.material3.Button -import androidx.compose.material3.Text -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.test.ExperimentalTestApi -import androidx.compose.ui.test.assertTextEquals -import androidx.compose.ui.test.onNodeWithTag -import androidx.compose.ui.test.performClick -import androidx.compose.ui.test.runComposeUiTest -import kotlin.test.Test - -@OptIn(ExperimentalTestApi::class) -class ComposeTest { - - @Test - fun simpleCheck() = runComposeUiTest { - setContent { - var txt by remember { mutableStateOf("Go") } - Column { - Text( - text = txt, - modifier = Modifier.testTag("t_text") - ) - Button( - onClick = { txt += "." }, - modifier = Modifier.testTag("t_button") - ) { - Text("click me") - } - } - } - - onNodeWithTag("t_button").apply { - repeat(3) { performClick() } - } - onNodeWithTag("t_text").assertTextEquals("Go...") - } -} \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/main/res/drawable/chat_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/chat_24px.xml deleted file mode 100644 index 0163a0e13..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/chat_24px.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/home_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/home_24px.xml deleted file mode 100644 index bb05c6154..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/home_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/logout_24dp_fill0_wght400_grad0_opsz24.xml b/server/xefMobile/composeApp/src/main/res/drawable/logout_24dp_fill0_wght400_grad0_opsz24.xml deleted file mode 100644 index 65d9baa89..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/logout_24dp_fill0_wght400_grad0_opsz24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/school_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/school_24px.xml deleted file mode 100644 index 2d1038e2e..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/school_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/settings_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/settings_24px.xml deleted file mode 100644 index 90bc79bea..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/settings_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/smart_toy_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/smart_toy_24px.xml deleted file mode 100644 index 7382f2168..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/smart_toy_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/source_environment_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/source_environment_24px.xml deleted file mode 100644 index 3707dc440..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/source_environment_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/support_agent_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/support_agent_24px.xml deleted file mode 100644 index 9c57a03f5..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/support_agent_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_icon.xml b/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_icon.xml deleted file mode 100644 index ca0f226f1..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_icon.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name.xml b/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name.xml deleted file mode 100644 index 756bb5129..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name_white.xml b/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name_white.xml deleted file mode 100644 index db77eab35..000000000 --- a/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name_white.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/server/xefMobile/composeApp/src/main/res/font/montserrat_bold.ttf b/server/xefMobile/composeApp/src/main/res/font/montserrat_bold.ttf deleted file mode 100644 index e69de29bb..000000000 diff --git a/server/xefMobile/composeApp/src/main/res/font/montserrat_regular.ttf b/server/xefMobile/composeApp/src/main/res/font/montserrat_regular.ttf deleted file mode 100644 index e69de29bb..000000000 diff --git a/server/xefMobile/composeApp/src/main/res/xml/network_security_config.xml b/server/xefMobile/composeApp/src/main/res/xml/network_security_config.xml deleted file mode 100644 index f18e1f040..000000000 --- a/server/xefMobile/composeApp/src/main/res/xml/network_security_config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/server/xefMobile/gradle.properties b/server/xefMobile/gradle.properties deleted file mode 100644 index 8eee6ee5c..000000000 --- a/server/xefMobile/gradle.properties +++ /dev/null @@ -1,19 +0,0 @@ -#Gradle -org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4G" -org.gradle.caching=true -org.gradle.configuration-cache=true -org.gradle.daemon=true -org.gradle.parallel=true - -#Kotlin -kotlin.code.style=official -kotlin.js.compiler=ir - -#Android -android.useAndroidX=true -android.nonTransitiveRClass=true - -#Compose -org.jetbrains.compose.experimental.uikit.enabled=true -org.jetbrains.compose.experimental.jscanvas.enabled=true -org.jetbrains.compose.experimental.wasm.enabled=true diff --git a/server/xefMobile/gradle/libs.versions.toml b/server/xefMobile/gradle/libs.versions.toml deleted file mode 100644 index 68760a056..000000000 --- a/server/xefMobile/gradle/libs.versions.toml +++ /dev/null @@ -1,52 +0,0 @@ -[versions] - -kotlin = "2.0.0-RC2" -compose = "1.6.10-rc01" -agp = "8.2.2" -androidx-activityCompose = "1.9.0" -androidx-uiTest = "1.6.7" -voyager = "1.0.0" -composeImageLoader = "1.7.8" -napier = "2.7.1" -buildConfig = "4.1.1" -kotlinx-coroutines = "1.8.1" -ktor = "2.3.9" -kotlinx-serialization = "1.6.3" -multiplatformSettings = "1.1.1" -compose-compiler = "1.5.10.2" -navigationCompose = "2.7.7" - -[libraries] - -androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" } -androidx-testManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-uiTest" } -androidx-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-uiTest" } -voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" } -composeImageLoader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "composeImageLoader" } -napier = { module = "io.github.aakira:napier", version.ref = "napier" } -kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } -kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } -kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" } -kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } -ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } -ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" } -ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" } -ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" } -ktor-client-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktor" } -ktor-client-winhttp = { module = "io.ktor:ktor-client-winhttp", version.ref = "ktor" } -kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } -multiplatformSettings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatformSettings" } -compose-compiler = { module = "org.jetbrains.compose.compiler:compiler", version.ref = "compose-compiler" } -ktor-client-serialization = { module = "io.ktor:ktor-client-serialization-jvm", version.ref = "ktor" } -ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" } -ktor-client-json = { module = "io.ktor:ktor-client-json", version.ref = "ktor" } -androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } - -[plugins] - -multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } -compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -compose = { id = "org.jetbrains.compose", version.ref = "compose" } -android-application = { id = "com.android.application", version.ref = "agp" } -buildConfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildConfig" } -kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } \ No newline at end of file diff --git a/server/xefMobile/gradle/wrapper/gradle-wrapper.jar b/server/xefMobile/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e6441136f3d4ba8a0da8d277868979cfbc8ad796..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/server/xefMobile/gradlew.bat b/server/xefMobile/gradlew.bat deleted file mode 100644 index 5c2a58c72..000000000 --- a/server/xefMobile/gradlew.bat +++ /dev/null @@ -1,93 +0,0 @@ - -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/server/xefMobile/settings.gradle.kts b/server/xefMobile/settings.gradle.kts deleted file mode 100644 index 799f08823..000000000 --- a/server/xefMobile/settings.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -rootProject.name = "xefMobile" -include(":composeApp") - -pluginManagement { - repositories { - google() - gradlePluginPortal() - mavenCentral() - } -} - -dependencyResolutionManagement { - repositories { - google() - mavenCentral() - } -} From 73146921eeb9aaf0eb8a0f41318221c29cd4d44c Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Mon, 27 May 2024 13:48:23 +0200 Subject: [PATCH 02/30] added missing project --- server/xefMobile/.gitignore | 153 ++++++++++ server/xefMobile/.idea/vcs.xml | 6 + .../kotlin-compiler-859541645610285268.salive | 0 server/xefMobile/README.MD | 15 + server/xefMobile/build.gradle.kts | 8 + server/xefMobile/composeApp/build.gradle.kts | 143 +++++++++ .../src/androidMain/AndroidManifest.xml | 22 ++ .../kotlin/com/xef/xefMobile/MainActivity.kt | 20 ++ .../kotlin/com/xef/xefMobile/MainLayout.kt | 271 ++++++++++++++++++ .../kotlin/com/xef/xefMobile/XefAndroidApp.kt | 57 ++++ .../com/xef/xefMobile/model/AssistantModel.kt | 14 + .../xefMobile/model/AuthenticationModels.kt | 34 +++ .../xefMobile/network/client/HttpClient.kt | 19 ++ .../com/xef/xefMobile/services/ApiService.kt | 61 ++++ .../services/UserRepositoryService.kt | 35 +++ .../com/xef/xefMobile/theme/Theme.android.kt | 19 ++ .../ui/composable/FilePickerDialog.kt | 153 ++++++++++ .../xefMobile/ui/composable/UriPathFinder.kt | 103 +++++++ .../xef/xefMobile/ui/navigation/Navigation.kt | 31 ++ .../ui/screens/FilePicker/PathScreenState.kt | 6 + .../xef/xefMobile/ui/screens/LoginScreen.kt | 110 +++++++ .../xefMobile/ui/screens/RegisterScreen.kt | 125 ++++++++ .../com/xef/xefMobile/ui/screens/Screens.kt | 15 + .../ui/screens/menu/AssistantScreen.kt | 101 +++++++ .../ui/screens/menu/CreateAssistantScreen.kt | 270 +++++++++++++++++ .../navigationdrawercompose/HomeScreen.kt | 40 +++ .../navigationdrawercompose/MenuItem.kt | 10 + .../com/xef/xefMobile/ui/themes/Color.kt | 70 +++++ .../com/xef/xefMobile/ui/themes/Theme.kt | 104 +++++++ .../com/xef/xefMobile/ui/themes/Type.kt | 28 ++ .../xefMobile/ui/viewmodels/AuthViewModel.kt | 149 ++++++++++ .../xefMobile/ui/viewmodels/IAuthViewModel.kt | 14 + .../xefMobile/ui/viewmodels/PathViewModel.kt | 43 +++ .../composeResources/drawable/chat_24px.xml | 11 + .../composeResources/drawable/home_24px.xml | 10 + .../composeResources/drawable/ic_cyclone.xml | 12 + .../drawable/ic_dark_mode.xml | 9 + .../drawable/ic_light_mode.xml | 9 + .../drawable/ic_rotate_right.xml | 10 + .../composeResources/drawable/school_24px.xml | 10 + .../drawable/settings_24px.xml | 10 + .../drawable/smart_toy_24px.xml | 10 + .../drawable/source_environment_24px.xml | 10 + .../drawable/support_agent_24px.xml | 10 + .../drawable/xef_brand_icon.xml | 25 ++ .../drawable/xef_brand_name.xml | 35 +++ .../drawable/xef_brand_name_white.xml | 35 +++ .../font/IndieFlower-Regular.ttf | Bin 0 -> 55416 bytes .../composeResources/font/montserrat_bold.ttf | 0 .../font/montserrat_regular.ttf | 0 .../composeResources/values/strings.xml | 7 + .../com/xef/xefMobile/theme/theme/Color.kt | 70 +++++ .../com/xef/xefMobile/theme/theme/Theme.kt | 107 +++++++ .../kotlin/org/xef/xefMobile/ComposeTest.kt | 45 +++ .../src/main/res/drawable/chat_24px.xml | 11 + .../src/main/res/drawable/home_24px.xml | 10 + ...logout_24dp_fill0_wght400_grad0_opsz24.xml | 9 + .../src/main/res/drawable/school_24px.xml | 10 + .../src/main/res/drawable/settings_24px.xml | 10 + .../src/main/res/drawable/smart_toy_24px.xml | 10 + .../res/drawable/source_environment_24px.xml | 10 + .../main/res/drawable/support_agent_24px.xml | 10 + .../src/main/res/drawable/xef_brand_icon.xml | 25 ++ .../src/main/res/drawable/xef_brand_name.xml | 35 +++ .../res/drawable/xef_brand_name_white.xml | 35 +++ .../src/main/res/font/montserrat_bold.ttf | 0 .../src/main/res/font/montserrat_regular.ttf | 0 .../main/res/xml/network_security_config.xml | 8 + server/xefMobile/gradle.properties | 19 ++ server/xefMobile/gradle/libs.versions.toml | 52 ++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 8 + server/xefMobile/gradlew | 250 ++++++++++++++++ server/xefMobile/gradlew.bat | 93 ++++++ server/xefMobile/settings.gradle.kts | 17 ++ 75 files changed, 3306 insertions(+) create mode 100644 server/xefMobile/.gitignore create mode 100644 server/xefMobile/.idea/vcs.xml create mode 100644 server/xefMobile/.kotlin/sessions/kotlin-compiler-859541645610285268.salive create mode 100644 server/xefMobile/README.MD create mode 100644 server/xefMobile/build.gradle.kts create mode 100644 server/xefMobile/composeApp/build.gradle.kts create mode 100644 server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Color.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/chat_24px.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/home_24px.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_cyclone.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_dark_mode.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_light_mode.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_rotate_right.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/school_24px.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/settings_24px.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/smart_toy_24px.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/source_environment_24px.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/support_agent_24px.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_icon.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name_white.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/font/IndieFlower-Regular.ttf create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/font/montserrat_bold.ttf create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/font/montserrat_regular.ttf create mode 100644 server/xefMobile/composeApp/src/commonMain/composeResources/values/strings.xml create mode 100644 server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Color.kt create mode 100644 server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt create mode 100644 server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/chat_24px.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/home_24px.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/logout_24dp_fill0_wght400_grad0_opsz24.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/school_24px.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/settings_24px.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/smart_toy_24px.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/source_environment_24px.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/support_agent_24px.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/xef_brand_icon.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name.xml create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name_white.xml create mode 100644 server/xefMobile/composeApp/src/main/res/font/montserrat_bold.ttf create mode 100644 server/xefMobile/composeApp/src/main/res/font/montserrat_regular.ttf create mode 100644 server/xefMobile/composeApp/src/main/res/xml/network_security_config.xml create mode 100644 server/xefMobile/gradle.properties create mode 100644 server/xefMobile/gradle/libs.versions.toml create mode 100644 server/xefMobile/gradle/wrapper/gradle-wrapper.jar create mode 100644 server/xefMobile/gradle/wrapper/gradle-wrapper.properties create mode 100755 server/xefMobile/gradlew create mode 100644 server/xefMobile/gradlew.bat create mode 100644 server/xefMobile/settings.gradle.kts diff --git a/server/xefMobile/.gitignore b/server/xefMobile/.gitignore new file mode 100644 index 000000000..efd959ba4 --- /dev/null +++ b/server/xefMobile/.gitignore @@ -0,0 +1,153 @@ +# Created by https://www.gitignore.io/api/android,intellij + +### Android ### +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +tokenizer/karma.config.d/ + +# Gradle files +.gradle/ +build/ + +# dokka + ank apidocs merge to sources +apidocs/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# Intellij +*.iml +.idea/* +!.idea/vcs.xml + +# Keystore files +*.jks + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +### Android Patch ### +gen-external-apklibs + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea/**/workspace.xml +.idea/**/tasks.xml + +# Sensitive or high-churn files: +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.xml +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml + +# Gradle: +.idea/**/gradle.xml +.idea/**/libraries + +#Kotlintest +**/.kotlintest + +# Mongo Explorer plugin: +.idea/**/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Jekyll +_site +.sass-cache +vendor +.bundle + +# Ruby +Gemfile.lock + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +###################### + +reports/ + +# End of https://www.gitignore.io/api/android,intellij +/.idea/misc.xml + +.DS_Store + +target/ + +.bash_profile +**/.kotlintest/ + + +_site/ +kotlin-js-store/ +.sass-cache/ +.jekyll-cache/ +.jekyll-metadata + +.env + +*.bin +model.log +operations.log \ No newline at end of file diff --git a/server/xefMobile/.idea/vcs.xml b/server/xefMobile/.idea/vcs.xml new file mode 100644 index 000000000..b2bdec2d7 --- /dev/null +++ b/server/xefMobile/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/server/xefMobile/.kotlin/sessions/kotlin-compiler-859541645610285268.salive b/server/xefMobile/.kotlin/sessions/kotlin-compiler-859541645610285268.salive new file mode 100644 index 000000000..e69de29bb diff --git a/server/xefMobile/README.MD b/server/xefMobile/README.MD new file mode 100644 index 000000000..583cb36ec --- /dev/null +++ b/server/xefMobile/README.MD @@ -0,0 +1,15 @@ +# Compose Multiplatform Application + +## Before running! + - install JDK 17 or higher on your machine + - add `local.properties` file to the project root and set a path to Android SDK there + +### Android +To run the application on android device/emulator: + - open project in Android Studio and run imported android run configuration + +To build the application bundle: + - run `./gradlew :composeApp:assembleDebug` + - find `.apk` file in `composeApp/build/outputs/apk/debug/composeApp-debug.apk` +Run android simulator UI tests: `./gradlew :composeApp:pixel5Check` + diff --git a/server/xefMobile/build.gradle.kts b/server/xefMobile/build.gradle.kts new file mode 100644 index 000000000..4b93c8e5a --- /dev/null +++ b/server/xefMobile/build.gradle.kts @@ -0,0 +1,8 @@ +plugins { + alias(libs.plugins.multiplatform).apply(false) + alias(libs.plugins.compose.compiler).apply(false) + alias(libs.plugins.compose).apply(false) + alias(libs.plugins.android.application).apply(false) + alias(libs.plugins.buildConfig).apply(false) + alias(libs.plugins.kotlinx.serialization).apply(false) +} diff --git a/server/xefMobile/composeApp/build.gradle.kts b/server/xefMobile/composeApp/build.gradle.kts new file mode 100644 index 000000000..3b024bef1 --- /dev/null +++ b/server/xefMobile/composeApp/build.gradle.kts @@ -0,0 +1,143 @@ +import org.jetbrains.compose.ExperimentalComposeLibrary +import com.android.build.api.dsl.ManagedVirtualDevice +import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree + +plugins { + alias(libs.plugins.multiplatform) + alias(libs.plugins.compose.compiler) + alias(libs.plugins.compose) + alias(libs.plugins.android.application) + alias(libs.plugins.buildConfig) + alias(libs.plugins.kotlinx.serialization) +} + +kotlin { + androidTarget { + compilations.all { + compileTaskProvider { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + freeCompilerArgs.add("-Xjdk-release=${JavaVersion.VERSION_1_8}") + } + } + } + @OptIn(ExperimentalKotlinGradlePluginApi::class) + instrumentedTestVariant { + sourceSetTree.set(KotlinSourceSetTree.test) + dependencies { + debugImplementation(libs.androidx.testManifest) + implementation(libs.androidx.junit4) + } + } + } + + sourceSets { + all { + languageSettings { + optIn("org.jetbrains.compose.resources.ExperimentalResourceApi") + } + } + val commonMain by getting { + dependencies { + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.components.resources) + implementation(compose.components.uiToolingPreview) + implementation(libs.voyager.navigator) + implementation(libs.composeImageLoader) + implementation(libs.napier) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.ktor.core) + implementation(libs.kotlinx.serialization.json) + implementation(libs.multiplatformSettings) + implementation(libs.ktor.client.json) + implementation("io.ktor:ktor-client-content-negotiation:2.3.11") + implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.11") + implementation("androidx.navigation:navigation-compose:2.7.7") + implementation("com.squareup.retrofit2:retrofit:2.11.0") + implementation("com.squareup.retrofit2:converter-gson:2.11.0") + implementation("io.ktor:ktor-client-serialization-jvm:2.3.11") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3") + implementation("com.google.accompanist:accompanist-permissions:0.34.0") + } + } + + val commonTest by getting { + dependencies { + implementation(kotlin("test")) + @OptIn(ExperimentalComposeLibrary::class) + implementation(compose.uiTest) + implementation(libs.kotlinx.coroutines.test) + } + } + + val androidMain by getting { + dependencies { + implementation(compose.uiTooling) + implementation(libs.androidx.activityCompose) + implementation(libs.kotlinx.coroutines.android) + implementation(libs.ktor.client.okhttp) + implementation("io.ktor:ktor-client-android:2.3.11") + implementation(libs.ktor.client.json) + implementation("io.ktor:ktor-client-content-negotiation:2.3.11") + implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.11") + implementation("androidx.navigation:navigation-compose:2.7.7") + implementation("androidx.datastore:datastore-preferences:1.1.1") + implementation("androidx.compose.runtime:runtime-livedata:1.6.7") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3") + implementation("io.ktor:ktor-client-serialization-jvm:2.3.11") + implementation("com.google.accompanist:accompanist-permissions:0.34.0") + } + } + } +} + +android { + namespace = "org.xef.xefMobile" + compileSdk = 34 + + defaultConfig { + minSdk = 24 + targetSdk = 34 + applicationId = "org.xef.xefMobile.androidApp" + versionCode = 1 + versionName = "1.0.0" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + sourceSets["main"].apply { + manifest.srcFile("src/androidMain/AndroidManifest.xml") + res.srcDirs("src/androidMain/res") + } + + @Suppress("UnstableApiUsage") + testOptions { + managedDevices.devices { + maybeCreate("pixel5").apply { + device = "Pixel 5" + apiLevel = 34 + systemImageSource = "aosp" + } + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + buildFeatures { + compose = true + } + + composeOptions { + kotlinCompilerExtensionVersion = "1.5.11" + } +} + +buildConfig { + // BuildConfig configuration here. +} diff --git a/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml b/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml new file mode 100644 index 000000000..c6670f1a1 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt new file mode 100644 index 000000000..cb9e66be7 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt @@ -0,0 +1,20 @@ +package com.xef.xefMobile + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import com.server.movile.xef.android.ui.viewmodels.AuthViewModel +import com.xef.xefMobile.services.ApiService + +class MainActivity : ComponentActivity() { + private lateinit var authViewModel: AuthViewModel + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + authViewModel = AuthViewModel(this, ApiService()) + + setContent { + XefAndroidApp(authViewModel = authViewModel) + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt new file mode 100644 index 000000000..595921724 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt @@ -0,0 +1,271 @@ +package com.xef.xefMobile + +import android.annotation.SuppressLint +import android.widget.Toast +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Menu +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import kotlinx.coroutines.launch +import org.xef.xefMobile.R +import com.xef.xefMobile.ui.screens.Screens + +@OptIn(ExperimentalMaterial3Api::class) +@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") +@Composable +fun MainLayout( + navController: NavController, + authViewModel: IAuthViewModel, + userName: String, + content: @Composable () -> Unit +) { + val coroutineScope = rememberCoroutineScope() + val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) + val CustomLightBlue = Color(0xFFADD8E6) + val CustomTextBlue = Color(0xFF0199D7) + val context = LocalContext.current + + ModalNavigationDrawer( + drawerState = drawerState, + gesturesEnabled = true, + drawerContent = { + ModalDrawerSheet { + Box( + modifier = Modifier + .background(CustomLightBlue) + .fillMaxWidth() + .height(100.dp) + ) { + Image( + painter = painterResource(id = R.drawable.xef_brand_name), + contentDescription = "Logo", + modifier = Modifier + .size(150.dp) + .align(Alignment.Center) + ) + } + HorizontalDivider() + + NavigationDrawerItem( + label = { Text(text = "Home", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.home_24px), + contentDescription = "home", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { + drawerState.close() + } + navController.navigate(Screens.Home.screen) { + popUpTo(0) + } + } + ) + NavigationDrawerItem( + label = { Text(text = "Organizations", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.source_environment_24px), + contentDescription = "organizations", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { + drawerState.close() + } + navController.navigate(Screens.Organizations.screen) { + popUpTo(0) + } + }) + NavigationDrawerItem( + label = { Text(text = "Assistants", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.smart_toy_24px), + contentDescription = "assistants", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { + drawerState.close() + } + navController.navigate(Screens.Assistants.screen) { + popUpTo(0) + } + }) + NavigationDrawerItem( + label = { Text(text = "Projects", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.school_24px), + contentDescription = "projects", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { + drawerState.close() + } + navController.navigate(Screens.Projects.screen) { + popUpTo(0) + } + }) + NavigationDrawerItem( + label = { Text(text = "Chat", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.chat_24px), + contentDescription = "chat", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { + drawerState.close() + } + navController.navigate(Screens.Chat.screen) { + popUpTo(0) + } + }) + NavigationDrawerItem( + label = { Text(text = "Generic question", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.support_agent_24px), + contentDescription = "generic question", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { + drawerState.close() + } + navController.navigate(Screens.GenericQuestion.screen) { + popUpTo(0) + } + }) + NavigationDrawerItem( + label = { Text(text = "Settings", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.settings_24px), + contentDescription = "settings", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { + drawerState.close() + } + navController.navigate(Screens.Settings.screen) { + popUpTo(0) + } + }) + + Spacer(modifier = Modifier.weight(1f)) + NavigationDrawerItem( + label = { Text(text = "Logout", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.logout_24dp_fill0_wght400_grad0_opsz24), + contentDescription = "logout", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { + drawerState.close() + } + authViewModel.logout() + Toast.makeText(context, "Logged out", Toast.LENGTH_SHORT).show() + navController.navigate(Screens.Login.screen) { + popUpTo(0) { + inclusive = true + } + } + }) + } + }, + ) { + Scaffold( + topBar = { + TopAppBar( + title = { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier.fillMaxWidth() + ) { + Image( + painter = painterResource(id = R.drawable.xef_brand_name_white), + contentDescription = "Logo", + modifier = Modifier.size(60.dp) + ) + Spacer(modifier = Modifier.weight(1f)) + Text( + text = userName, + color = Color.White, + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.padding(end = 16.dp) + ) + } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = CustomLightBlue, + titleContentColor = Color.White, + navigationIconContentColor = Color.White + ), + navigationIcon = { + IconButton(onClick = { + coroutineScope.launch { + drawerState.open() + } + }) { + Icon( + Icons.Rounded.Menu, contentDescription = "MenuButton" + ) + } + }, + ) + } + ) { + Box(modifier = Modifier.padding(it)) { + content() + } + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt new file mode 100644 index 000000000..23cc9b8c9 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt @@ -0,0 +1,57 @@ +package com.xef.xefMobile + +import android.annotation.SuppressLint +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.livedata.observeAsState +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import com.server.movile.xef.android.ui.screens.* +import com.server.movile.xef.android.ui.screens.menu.AssistantScreen +import com.server.movile.xef.android.ui.screens.menu.CreateAssistantScreen +import com.server.movile.xef.android.ui.screens.navigationdrawercompose.HomeScreen +import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import com.xef.xefMobile.ui.screens.Screens + +@OptIn(ExperimentalMaterial3Api::class) +@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") +@Composable +fun XefAndroidApp(authViewModel: IAuthViewModel) { + val navigationController = rememberNavController() + val userName by authViewModel.userName.observeAsState("") + + NavHost( + navController = navigationController, + startDestination = Screens.Login.screen, + modifier = Modifier.padding(top = 16.dp) + ) { + composable(Screens.Login.screen) { + LoginScreen(authViewModel, navigationController) + } + composable(Screens.Register.screen) { + RegisterScreen(authViewModel, navigationController) + } + composable(Screens.Home.screen) { + MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { + HomeScreen(authViewModel, navigationController) + } + } + composable(Screens.Assistants.screen) { + MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { + AssistantScreen(navigationController, authViewModel) + } + } + composable(Screens.CreateAssistant.screen) { + MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { + CreateAssistantScreen(navigationController) + } + } + // ... other composable screens ... + } +} + diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt new file mode 100644 index 000000000..668bb97d4 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -0,0 +1,14 @@ +package com.xef.xefMobile.model + +import kotlinx.serialization.Serializable + +@Serializable +data class Assistant( + val id: String, + val name: String +) + +@Serializable +data class AssistantsResponse( + val data: List +) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt new file mode 100644 index 000000000..3b4a8fcf7 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt @@ -0,0 +1,34 @@ +package com.xef.xefMobile.model + +import kotlinx.serialization.Serializable + +@Serializable +data class RegisterRequest( + val name: String, + val email: String, + val password: String +) + +@Serializable +data class RegisterResponse( + + val authToken: String +) + +@Serializable +data class LoginRequest( + val email: String, + val password: String +) + +@Serializable +data class LoginResponse( + val authToken: String, + val user: UserResponse +) + +@Serializable +data class UserResponse( + val id: Int, + val name: String +) \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt new file mode 100644 index 000000000..4de2a18d5 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt @@ -0,0 +1,19 @@ +package com.xef.xefMobile.network.client + +import io.ktor.client.* +import io.ktor.client.engine.android.* +import io.ktor.client.plugins.contentnegotiation.* +import io.ktor.serialization.kotlinx.json.* +import kotlinx.serialization.json.Json + +object HttpClientProvider { + val client: HttpClient = HttpClient(Android) { + install(ContentNegotiation) { + json(Json { + ignoreUnknownKeys = true + isLenient = true + prettyPrint = true + }) + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt new file mode 100644 index 000000000..fa1fb1f0b --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -0,0 +1,61 @@ +package com.xef.xefMobile.services + +import android.util.Log +import com.xef.xefMobile.model.* +import com.xef.xefMobile.network.client.HttpClientProvider +import io.ktor.client.call.* +import io.ktor.client.request.* +import io.ktor.client.statement.* +import io.ktor.http.* + +class ApiService { + + suspend fun registerUser(request: RegisterRequest): RegisterResponse { + return try { + HttpClientProvider.client.post { + url("http://10.0.2.2:8081/register") + contentType(ContentType.Application.Json) + setBody(request) + }.body() + } catch (e: Exception) { + Log.e("ApiService", "Register failed: ${e.message}", e) + throw e + } + } + + suspend fun loginUser(request: LoginRequest): LoginResponse { + return try { + val response: HttpResponse = HttpClientProvider.client.post { + url("http://10.0.2.2:8081/login") + contentType(ContentType.Application.Json) + setBody(request) + } + + val responseBody: String = response.bodyAsText() + Log.d("ApiService", "Login response body: $responseBody") + + response.body() + } catch (e: Exception) { + Log.e("ApiService", "Login failed: ${e.message}", e) + throw e + } + } + + suspend fun getAssistants(authToken: String): AssistantsResponse { + return try { + val response: HttpResponse = HttpClientProvider.client.get { + url("http://10.0.2.2:8081/v1/settings/assistants") + header(HttpHeaders.Authorization, "Bearer $authToken") + header("OpenAI-Beta", "assistants=v1") + } + + val responseBody: String = response.bodyAsText() + Log.d("ApiService", "Assistants response body: $responseBody") + + response.body() + } catch (e: Exception) { + Log.e("ApiService", "Fetching assistants failed: ${e.message}", e) + throw e + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt new file mode 100644 index 000000000..9cda93716 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt @@ -0,0 +1,35 @@ +package com.xef.xefMobile.services + +import com.xef.xefMobile.model.LoginRequest +import com.xef.xefMobile.model.LoginResponse +import com.xef.xefMobile.model.RegisterRequest +import com.xef.xefMobile.model.RegisterResponse +import io.ktor.client.call.* +import io.ktor.client.request.* +import io.ktor.http.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import kotlinx.serialization.json.Json +import com.xef.xefMobile.network.client.HttpClientProvider + +class UserRepositoryService { + private val client = HttpClientProvider.client + private val baseUrl = "https://api.miservidor.com" + private val json = Json { isLenient = true; ignoreUnknownKeys = true } + + suspend fun register(request: RegisterRequest): RegisterResponse = withContext(Dispatchers.IO) { + client.post { + url("$baseUrl/register") + contentType(ContentType.Application.Json) + setBody(request) + }.body() + } + + suspend fun login(request: LoginRequest): LoginResponse = withContext(Dispatchers.IO) { + client.post { + url("$baseUrl/login") + contentType(ContentType.Application.Json) + setBody(request) + }.body() + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt new file mode 100644 index 000000000..92bf160bd --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt @@ -0,0 +1,19 @@ +package com.xef.xefMobile.theme + +import android.app.Activity +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowInsetsControllerCompat + +@Composable +internal fun SystemAppearance(isDark: Boolean) { + val view = LocalView.current + LaunchedEffect(isDark) { + val window = (view.context as Activity).window + WindowInsetsControllerCompat(window, window.decorView).apply { + isAppearanceLightStatusBars = !isDark + isAppearanceLightNavigationBars = !isDark + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt new file mode 100644 index 000000000..7c9e11755 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -0,0 +1,153 @@ +package com.xef.xefMobile.ui.composable + +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.platform.LocalContext +import androidx.lifecycle.viewmodel.compose.viewModel +import com.google.accompanist.permissions.ExperimentalPermissionsApi +import com.google.accompanist.permissions.isGranted +import com.google.accompanist.permissions.rememberPermissionState + +import com.server.movile.xef.android.ui.themes.CustomColors +import com.xef.xefMobile.ui.viewmodels.PathViewModel + +@OptIn(ExperimentalPermissionsApi::class) +@Composable +fun FilePickerDialog( + onDismissRequest: () -> Unit, + customColors: CustomColors, + onFilesSelected: () -> Unit // Callback for when files are selected +) { + val viewModel: PathViewModel = viewModel() + val state = viewModel.state + val context = LocalContext.current + + val permissionState = rememberPermissionState( + permission = android.Manifest.permission.READ_EXTERNAL_STORAGE + ) + + var selectedFile by remember { mutableStateOf(null) } + + SideEffect { + if (!permissionState.status.isGranted) { + permissionState.launchPermissionRequest() + } + } + + val filePickerLauncher = rememberLauncherForActivityResult( + contract = ActivityResultContracts.GetMultipleContents(), + onResult = { uris -> + viewModel.onFilePathsListChange(uris, context) + if (uris.isNotEmpty()) { + onFilesSelected() // Call the callback when files are selected + selectedFile = state.filePaths.firstOrNull() + } + } + ) + + AlertDialog( + onDismissRequest = onDismissRequest, + title = { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + text = "Selected Files", + fontWeight = FontWeight.Bold + ) + Spacer(modifier = Modifier.height(8.dp)) + HorizontalDivider() + } + }, + text = { + Column( + modifier = Modifier + .fillMaxSize() + .padding(15.dp), + verticalArrangement = Arrangement.SpaceEvenly, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Box( + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight(0.76f), + contentAlignment = Alignment.Center + ) { + if (state.filePaths.isEmpty()) { + Box( + modifier = Modifier + .fillMaxSize(), + contentAlignment = Alignment.Center + ) { + Text(text = "No files selected") + } + } else { + LazyColumn { + items(state.filePaths) { path -> + Text( + text = path, + modifier = Modifier + .fillMaxWidth() + .clickable { + selectedFile = path + } + .padding(8.dp), + color = if (selectedFile == path) Color.Blue else Color.Unspecified + ) + } + } + } + } + OutlinedButton( + onClick = { + if (permissionState.status.isGranted) { + filePickerLauncher.launch("*/*") + } else { + permissionState.launchPermissionRequest() + } + }, + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text(text = "Browse files") + } + if (selectedFile != null) { + OutlinedButton( + onClick = { + viewModel.removeFilePath(selectedFile!!) + selectedFile = null + }, + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text(text = "Remove") + } + } + } + }, + confirmButton = { + Button( + onClick = { onDismissRequest() }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text("Done") + } + } + ) +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt new file mode 100644 index 000000000..2c59cf416 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt @@ -0,0 +1,103 @@ +package com.xef.xefMobile.ui.composable + +import android.content.ContentUris +import android.content.Context +import android.database.Cursor +import android.net.Uri +import android.os.Build +import android.os.Environment +import android.provider.DocumentsContract +import android.provider.MediaStore +import java.lang.NumberFormatException + +class UriPathFinder { + + fun getPath(context: Context, uri: Uri): String? { + return when { + DocumentsContract.isDocumentUri(context, uri) -> { + when { + isExternalStorageDocument(uri) -> handleExternalStorageDocument(uri) + isDownloadsDocument(uri) -> handleDownloadsDocument(context, uri) + isMediaDocument(uri) -> handleMediaDocument(context, uri) + else -> null + } + } + "content".equals(uri.scheme, ignoreCase = true) -> getDataColumn(context, uri, null, null) + "file".equals(uri.scheme, ignoreCase = true) -> uri.path + else -> null + } + } + + private fun handleExternalStorageDocument(uri: Uri): String? { + val docId = DocumentsContract.getDocumentId(uri) + val split = docId.split(":").toTypedArray() + val type = split[0] + return if ("primary".equals(type, ignoreCase = true)) { + Environment.getExternalStorageDirectory().toString() + "/" + split[1] + } else { + // Handle non-primary volumes (e.g., "content://com.android.externalstorage.documents/document/primary:...") + val storageDefinition = System.getenv("SECONDARY_STORAGE")?.split(":") + storageDefinition?.find { it.contains(type) }?.let { "$it/${split[1]}" } + } + } + + private fun handleDownloadsDocument(context: Context, uri: Uri): String? { + val id = DocumentsContract.getDocumentId(uri) + return try { + val contentUri = ContentUris.withAppendedId( + Uri.parse("content://downloads/public_downloads"), + java.lang.Long.valueOf(id) + ) + getDataColumn(context, contentUri, null, null) + } catch (e: NumberFormatException) { + // Handle the case where the id is not a pure number + null + } + } + + private fun handleMediaDocument(context: Context, uri: Uri): String? { + val docId = DocumentsContract.getDocumentId(uri) + val split = docId.split(":").toTypedArray() + val type = split[0] + val contentUri: Uri? = when (type) { + "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI + "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + else -> null + } + val selection = "_id=?" + val selectionArgs = arrayOf(split[1]) + return getDataColumn(context, contentUri, selection, selectionArgs) + } + + private fun getDataColumn( + context: Context, + uri: Uri?, + selection: String?, + selectionArgs: Array? + ): String? { + val cursor: Cursor? = uri?.let { + context.contentResolver.query(it, arrayOf("_data"), selection, selectionArgs, null) + } + return cursor?.use { + if (it.moveToFirst()) { + val columnIndex: Int = it.getColumnIndexOrThrow("_data") + it.getString(columnIndex) + } else { + null + } + } + } + + private fun isExternalStorageDocument(uri: Uri): Boolean { + return "com.android.externalstorage.documents" == uri.authority + } + + private fun isDownloadsDocument(uri: Uri): Boolean { + return "com.android.providers.downloads.documents" == uri.authority + } + + private fun isMediaDocument(uri: Uri): Boolean { + return "com.android.providers.media.documents" == uri.authority + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt new file mode 100644 index 000000000..d54a113de --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt @@ -0,0 +1,31 @@ +package com.xef.xefMobile.ui.navigation + +import androidx.compose.runtime.Composable +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import com.server.movile.xef.android.ui.screens.LoginScreen +import com.server.movile.xef.android.ui.screens.RegisterScreen +import com.server.movile.xef.android.ui.screens.menu.AssistantScreen +import com.server.movile.xef.android.ui.screens.menu.CreateAssistantScreen +import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import com.xef.xefMobile.ui.screens.Screens + +@Composable +fun AppNavigator(authViewModel: IAuthViewModel) { + val navController = rememberNavController() + NavHost(navController = navController, startDestination = Screens.Login.screen) { + composable(Screens.Login.screen) { + LoginScreen(authViewModel = authViewModel, navController = navController) + } + composable(Screens.Register.screen) { + RegisterScreen(authViewModel = authViewModel, navController = navController) + } + composable(Screens.Assistants.screen) { + AssistantScreen(navController = navController, authViewModel = authViewModel) + } + composable(Screens.CreateAssistant.screen) { + CreateAssistantScreen(navController = navController) + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt new file mode 100644 index 000000000..18d10e543 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt @@ -0,0 +1,6 @@ +package com.xef.xefMobile.ui.screens.FilePicker + +data class PathScreenState( + val filePaths:List = emptyList() + +) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt new file mode 100644 index 000000000..11b567156 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt @@ -0,0 +1,110 @@ +package com.server.movile.xef.android.ui.screens + +import android.util.Log +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.* +import androidx.navigation.NavController +import androidx.compose.runtime.* +import androidx.compose.runtime.livedata.observeAsState +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.input.PasswordVisualTransformation +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import com.xef.xefMobile.ui.screens.Screens + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun LoginScreen(authViewModel: IAuthViewModel, navController: NavController) { + val authToken by authViewModel.authToken.observeAsState() + var email by remember { mutableStateOf("") } + var password by remember { mutableStateOf("") } + var errorMessage by remember { mutableStateOf(null) } + + LaunchedEffect(authToken) { + if (authToken != null) { + Log.d("LoginScreen", "Navigation to Start Screen") + navController.navigate(Screens.Home.screen) { + popUpTo(Screens.Login.screen) { inclusive = true } + } + } + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(Color.White), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text( + text = "Xef Server", + fontSize = 24.sp, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(16.dp)) + + if (errorMessage != null) { + Text(text = errorMessage!!, color = Color.Red, textAlign = TextAlign.Center) + Spacer(modifier = Modifier.height(8.dp)) + } + + OutlinedTextField( + value = email, + onValueChange = { email = it }, + label = { Text("Email") }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email) + ) + Spacer(modifier = Modifier.height(8.dp)) + OutlinedTextField( + value = password, + onValueChange = { password = it }, + label = { Text("Password") }, + visualTransformation = PasswordVisualTransformation(), + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) + ) + Spacer(modifier = Modifier.height(16.dp)) + Button( + onClick = { + when { + email.isBlank() -> { + errorMessage = "Email field is empty" + Log.d("LoginScreen", "Email field is empty") + } + password.isBlank() -> { + errorMessage = "Password field is empty" + Log.d("LoginScreen", "Password field is empty") + } + else -> { + errorMessage = null + authViewModel.login(email = email, password = password) + Log.d("LoginScreen", "Login button pressed") + } + } + }, + modifier = Modifier.width(200.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF009688)) + ) { + Text("Login") + } + Spacer(modifier = Modifier.height(8.dp)) + TextButton( + onClick = { + navController.navigate(Screens.Register.screen) + Log.d("LoginScreen", "Navigate to Register Screen") + }, + modifier = Modifier.fillMaxWidth() + ) { + Text("Create An Account") + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt new file mode 100644 index 000000000..a84df0346 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt @@ -0,0 +1,125 @@ +package com.server.movile.xef.android.ui.screens + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.text.KeyboardOptions +import androidx.navigation.NavController +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.runtime.livedata.observeAsState +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.input.PasswordVisualTransformation +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import com.xef.xefMobile.ui.screens.Screens + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RegisterScreen(authViewModel: IAuthViewModel, navController: NavController) { + var errorMessage by remember { mutableStateOf(null) } + val authToken by authViewModel.authToken.observeAsState() + + LaunchedEffect(authToken) { + if (authToken != null) { + navController.navigate(Screens.Login.screen) { + popUpTo(Screens.Register.screen) { inclusive = true } + } + } + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(Color.White), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text( + text = "Xef Server", + fontSize = 30.sp, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "Create an account", + fontSize = 24.sp, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(16.dp)) + var name by remember { mutableStateOf("") } + var email by remember { mutableStateOf("") } + var password by remember { mutableStateOf("") } + var rePassword by remember { mutableStateOf("") } + + OutlinedTextField( + value = name, + onValueChange = { name = it }, + label = { Text("Name") }, + singleLine = true + ) + Spacer(modifier = Modifier.height(8.dp)) + OutlinedTextField( + value = email, + onValueChange = { email = it }, + label = { Text("Email") }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email) + ) + Spacer(modifier = Modifier.height(8.dp)) + OutlinedTextField( + value = password, + onValueChange = { password = it }, + label = { Text("Password") }, + visualTransformation = PasswordVisualTransformation(), + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) + ) + Spacer(modifier = Modifier.height(8.dp)) + OutlinedTextField( + value = rePassword, + onValueChange = { rePassword = it }, + label = { Text("Re-Password") }, + visualTransformation = PasswordVisualTransformation(), + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) + ) + Spacer(modifier = Modifier.height(16.dp)) + errorMessage?.let { + Text(text = it, color = Color.Red, style = MaterialTheme.typography.bodyLarge) + Spacer(modifier = Modifier.height(8.dp)) + } + + Button( + onClick = { + errorMessage = when { + name.isBlank() -> "Name is empty" + email.isBlank() -> "Email is empty" + password.isEmpty() -> "Password is empty" + password != rePassword -> "Passwords do not match" + else -> null + } + if (errorMessage == null) { + authViewModel.register(name, email, password) + } + }, + modifier = Modifier.width(200.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF009688)) + ) { + Text("Create Account") + } + Spacer(modifier = Modifier.height(8.dp)) + TextButton( + onClick = { navController.navigate(Screens.Login.screen) }, + modifier = Modifier.fillMaxWidth() + ) { + Text("Back") + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt new file mode 100644 index 000000000..d64384395 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt @@ -0,0 +1,15 @@ +package com.xef.xefMobile.ui.screens + +sealed class Screens(val screen: String) { + object Login : Screens("loginScreen") + object Register : Screens("registerScreen") + object Start : Screens("startScreen") + object Home : Screens("homeScreen") + object Organizations : Screens("organizationsScreen") + object Assistants : Screens("assistantsScreen") + object Projects : Screens("projectsScreen") + object Chat : Screens("chatScreen") + object GenericQuestion : Screens("genericQuestionScreen") + object Settings : Screens("settingsScreen") + object CreateAssistant : Screens("createAssistantScreen") +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt new file mode 100644 index 000000000..defee5364 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt @@ -0,0 +1,101 @@ +package com.server.movile.xef.android.ui.screens.menu + +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.navigation.NavController +import androidx.navigation.compose.rememberNavController +import com.server.movile.xef.android.ui.viewmodels.AuthViewModel +import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import com.xef.xefMobile.model.Assistant +import com.xef.xefMobile.services.ApiService +import com.xef.xefMobile.theme.theme.LocalCustomColors +import com.xef.xefMobile.ui.screens.Screens +import kotlinx.coroutines.launch + +@Composable +fun AssistantScreen(navController: NavController, authViewModel: IAuthViewModel) { + val customColors = LocalCustomColors.current + val coroutineScope = rememberCoroutineScope() + var assistants by remember { mutableStateOf>(emptyList()) } + var loading by remember { mutableStateOf(true) } + var errorMessage by remember { mutableStateOf(null) } + + val authToken = authViewModel.authToken.value ?: error("Auth token not found") + + LaunchedEffect(Unit) { + coroutineScope.launch { + try { + val response = ApiService().getAssistants(authToken) + assistants = response.data + } catch (e: Exception) { + errorMessage = "Failed to load assistants" + } finally { + loading = false + } + } + } + + Box(modifier = Modifier.fillMaxSize()) { + if (loading) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else if (errorMessage != null) { + Text( + text = errorMessage!!, + color = MaterialTheme.colorScheme.error, + modifier = Modifier.align(Alignment.Center) + ) + } else { + Column( + modifier = Modifier + .align(Alignment.TopCenter) + .padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = "Assistants", + fontWeight = FontWeight.Bold, + fontSize = 24.sp, + ) + HorizontalDivider( + modifier = Modifier + .fillMaxWidth() + .padding(top = 8.dp) + ) + + Spacer(modifier = Modifier.height(16.dp)) + + assistants.forEach { assistant -> + Text( + text = assistant.name, + fontWeight = FontWeight.Bold + + ) + Text(text = assistant.id) + Spacer(modifier = Modifier.height(8.dp)) + } + } + + Button( + onClick = { navController.navigate(Screens.CreateAssistant.screen) }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ), + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(16.dp) + ) { + Text(text = "Create New Assistant") + } + } + } +} + + diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt new file mode 100644 index 000000000..0527f6fbd --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -0,0 +1,270 @@ +package com.server.movile.xef.android.ui.screens.menu + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.* +import androidx.compose.runtime.* +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.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.navigation.NavController +import androidx.navigation.compose.rememberNavController +import com.server.movile.xef.android.ui.themes.LocalCustomColors + + +class CreateAssistantActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + // Pass the NavController to CreateAssistantScreen + val navController = rememberNavController() + CreateAssistantScreen(navController) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CreateAssistantScreen(navController: NavController) { + var name by remember { mutableStateOf("") } + var instructions by remember { mutableStateOf("") } + var temperature by remember { mutableStateOf(1f) } + var topP by remember { mutableStateOf(1f) } + var fileSearchEnabled by remember { mutableStateOf(false) } + var codeInterpreterEnabled by remember { mutableStateOf(false) } + var model by remember { mutableStateOf("gpt-4-turbo") } + val list = listOf("gpt-4o", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") + var isExpanded by remember { mutableStateOf(false) } + var selectedText by remember { mutableStateOf(list[0]) } + + val customColors = LocalCustomColors.current + + Box(modifier = Modifier.fillMaxSize()) { + Column( + modifier = Modifier + .padding(8.dp) + .fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = "Create Assistant", + fontSize = 24.sp, + modifier = Modifier.padding(bottom = 16.dp) + ) + + TextField( + value = name, + onValueChange = { name = it }, + label = { Text("Name") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(8.dp)) + TextField( + value = instructions, + onValueChange = { instructions = it }, + label = { Text("Instructions") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(8.dp)) + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + ExposedDropdownMenuBox( + expanded = isExpanded, + onExpandedChange = { isExpanded = !isExpanded }, + modifier = Modifier.fillMaxWidth() + ) { + TextField( + modifier = Modifier + .fillMaxWidth() + .menuAnchor(), + value = selectedText, + onValueChange = {}, + readOnly = true, + trailingIcon = { + ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) + } + ) + ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { + list.forEachIndexed { index, text -> + DropdownMenuItem( + text = { Text(text = text) }, + onClick = { + selectedText = list[index] + isExpanded = false + }, + contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding + ) + } + } + } + } + Spacer(modifier = Modifier.height(12.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text(text = "TOOLS") + + HorizontalDivider( + modifier = Modifier + .fillMaxWidth() + .padding(top = 10.dp) + ) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + OutlinedButton( + onClick = { /* handle cancel */ }, + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text("File Search") + } + Spacer(modifier = Modifier.weight(1f)) + Switch( + checked = fileSearchEnabled, + onCheckedChange = { fileSearchEnabled = it }, + colors = SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) + ) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + OutlinedButton( + onClick = { /* handle cancel */ }, + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text("Code Interpreter") + } + Spacer(modifier = Modifier.weight(1f)) + Switch( + checked = codeInterpreterEnabled, + onCheckedChange = { codeInterpreterEnabled = it }, + colors = SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) + ) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + OutlinedButton( + onClick = { /* handle cancel */ }, + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text("Functions") + } + Spacer(modifier = Modifier.weight(1f)) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text(text = "MODEL CONFIGURATION") + + HorizontalDivider( + modifier = Modifier + .fillMaxWidth() + .padding(top = 8.dp) + ) + } + Spacer(modifier = Modifier.width(8.dp)) + AssistantFloatField(label = "Temperature", value = temperature, onValueChange = { temperature = it }) + + AssistantFloatField(label = "Top P", value = topP, onValueChange = { topP = it }) + + Row( + horizontalArrangement = Arrangement.Center, + modifier = Modifier.fillMaxWidth() + ) { + Button( + onClick = { navController.navigateUp() }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text("Cancel") + } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { /* handle create */ }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text("Create") + } + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> Unit) { + val customColors = LocalCustomColors.current + Column( + modifier = Modifier + .fillMaxWidth() + ) { + Text( + text = label, + modifier = Modifier.padding(bottom = 2.dp) // Reduce padding for the label + ) + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth() + ) { + Slider( + value = value, + onValueChange = onValueChange, + valueRange = 0f..2f, + steps = 100, // This ensures the slider moves in increments of 0.02 + modifier = Modifier.weight(3f), + colors = SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) + ) + Spacer(modifier = Modifier.width(2.dp)) // Add a small spacer between the slider and text field + TextField( + value = String.format("%.2f", value), + onValueChange = { + val newValue = it.toFloatOrNull() ?: 0f + onValueChange(newValue) + }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier + .width(60.dp) + .height(50.dp), + textStyle = LocalTextStyle.current.copy(fontSize = 12.sp) // Optionally adjust text size + ) + } + } +} + +@Preview(showBackground = false) +@Composable +fun CreateAssistantScreenPreview() { + // Create a mock NavController for the preview + val navController = rememberNavController() + CreateAssistantScreen(navController) +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt new file mode 100644 index 000000000..b4be5b21f --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt @@ -0,0 +1,40 @@ +package com.server.movile.xef.android.ui.screens.navigationdrawercompose + +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.* +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.material3.MaterialTheme +import androidx.navigation.NavController +import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import org.xef.xefMobile.R + +@Composable +fun HomeScreen(authViewModel: IAuthViewModel, navController: NavController) { + Box(modifier = Modifier.fillMaxSize()) { + Column( + modifier = Modifier + .fillMaxSize() + .align(Alignment.Center), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Image( + painter = painterResource(id = R.drawable.xef_brand_icon), + contentDescription = "Logo", + modifier = Modifier.size(50.dp) + ) + Spacer(modifier = Modifier.height(16.dp)) + Text( + text = "Welcome to Xef.ai", + fontSize = 30.sp, + color = MaterialTheme.colorScheme.onBackground + ) + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt new file mode 100644 index 000000000..c04e940eb --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt @@ -0,0 +1,10 @@ +package com.server.movile.xef.android.ui.screens.navigationdrawercompose + +import androidx.compose.ui.graphics.vector.ImageVector + +data class MenuItem( + val id: String, + val title: String, + val contentDescription: String, + val icon: ImageVector +) \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Color.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Color.kt new file mode 100644 index 000000000..131c831bb --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Color.kt @@ -0,0 +1,70 @@ +package com.server.movile.xef.android.ui.themes + +import androidx.compose.ui.graphics.Color + +// Light Theme Colors +internal val md_theme_light_primary = Color(0xFF00687A) +internal val md_theme_light_onPrimary = Color(0xFFFFFFFF) +internal val md_theme_light_primaryContainer = Color(0xFFABEDFF) +internal val md_theme_light_onPrimaryContainer = Color(0xFF001F26) +internal val md_theme_light_secondary = Color(0xFF00696E) +internal val md_theme_light_onSecondary = Color(0xFFFFFFFF) +internal val md_theme_light_secondaryContainer = Color(0xFF6FF6FE) +internal val md_theme_light_onSecondaryContainer = Color(0xFF002022) +internal val md_theme_light_tertiary = Color(0xFF904D00) +internal val md_theme_light_onTertiary = Color(0xFFFFFFFF) +internal val md_theme_light_tertiaryContainer = Color(0xFFFFDCC2) +internal val md_theme_light_onTertiaryContainer = Color(0xFF2E1500) +internal val md_theme_light_error = Color(0xFFBA1A1A) +internal val md_theme_light_errorContainer = Color(0xFFFFDAD6) +internal val md_theme_light_onError = Color(0xFFFFFFFF) +internal val md_theme_light_onErrorContainer = Color(0xFF410002) +internal val md_theme_light_background = Color(0xFFFFFBFF) +internal val md_theme_light_onBackground = Color(0xFF221B00) +internal val md_theme_light_surface = Color(0xFFFFFBFF) +internal val md_theme_light_onSurface = Color(0xFF221B00) +internal val md_theme_light_surfaceVariant = Color(0xFFDBE4E7) +internal val md_theme_light_onSurfaceVariant = Color(0xFF3F484B) +internal val md_theme_light_outline = Color(0xFF70797B) +internal val md_theme_light_inverseOnSurface = Color(0xFFFFF0C0) +internal val md_theme_light_inverseSurface = Color(0xFF3A3000) +internal val md_theme_light_inversePrimary = Color(0xFF55D6F4) +internal val md_theme_light_shadow = Color(0xFF000000) +internal val md_theme_light_surfaceTint = Color(0xFF00687A) +internal val md_theme_light_outlineVariant = Color(0xFFBFC8CB) +internal val md_theme_light_scrim = Color(0xFF000000) + +// Dark Theme Colors +internal val md_theme_dark_primary = Color(0xFF55D6F4) +internal val md_theme_dark_onPrimary = Color(0xFF003640) +internal val md_theme_dark_primaryContainer = Color(0xFF004E5C) +internal val md_theme_dark_onPrimaryContainer = Color(0xFFABEDFF) +internal val md_theme_dark_secondary = Color(0xFF4CD9E2) +internal val md_theme_dark_onSecondary = Color(0xFF00373A) +internal val md_theme_dark_secondaryContainer = Color(0xFF004F53) +internal val md_theme_dark_onSecondaryContainer = Color(0xFF6FF6FE) +internal val md_theme_dark_tertiary = Color(0xFFFFB77C) +internal val md_theme_dark_onTertiary = Color(0xFF4D2700) +internal val md_theme_dark_tertiaryContainer = Color(0xFF6D3900) +internal val md_theme_dark_onTertiaryContainer = Color(0xFFFFDCC2) +internal val md_theme_dark_error = Color(0xFFFFB4AB) +internal val md_theme_dark_errorContainer = Color(0xFF93000A) +internal val md_theme_dark_onError = Color(0xFF690005) +internal val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) +internal val md_theme_dark_background = Color(0xFF221B00) +internal val md_theme_dark_onBackground = Color(0xFFFFE264) +internal val md_theme_dark_surface = Color(0xFF221B00) +internal val md_theme_dark_onSurface = Color(0xFFFFE264) +internal val md_theme_dark_surfaceVariant = Color(0xFF3F484B) +internal val md_theme_dark_onSurfaceVariant = Color(0xFFBFC8CB) +internal val md_theme_dark_outline = Color(0xFF899295) +internal val md_theme_dark_inverseOnSurface = Color(0xFF221B00) +internal val md_theme_dark_inverseSurface = Color(0xFFFFE264) +internal val md_theme_dark_inversePrimary = Color(0xFF00687A) +internal val md_theme_dark_shadow = Color(0xFF000000) +internal val md_theme_dark_surfaceTint = Color(0xFF55D6F4) +internal val md_theme_dark_outlineVariant = Color(0xFF3F484B) +internal val md_theme_dark_scrim = Color(0xFF000000) + +// Seed color for dynamic theming +internal val seed = Color(0xFF2C3639) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt new file mode 100644 index 000000000..fc1f48a17 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt @@ -0,0 +1,104 @@ +package com.server.movile.xef.android.ui.themes + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.graphics.Color + +// Define custom colors +val CustomButtonColor = Color(0xFF01A2D1) +val CustomSliderThumbColor = Color(0xFF03DAC5) +val CustomSliderTrackColor = Color(0xFF018786) + +private val LightColorScheme = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, +) + +private val DarkColorScheme = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, +) + +internal val LocalThemeIsDark = compositionLocalOf { mutableStateOf(true) } + +val LocalCustomColors = staticCompositionLocalOf { CustomColors() } + +data class CustomColors( + val buttonColor: Color = CustomButtonColor, + val sliderThumbColor: Color = CustomSliderThumbColor, + val sliderTrackColor: Color = CustomSliderTrackColor +) + +@Composable +internal fun AppTheme( + content: @Composable () -> Unit +) { + val systemIsDark = isSystemInDarkTheme() + val isDarkState = remember { mutableStateOf(systemIsDark) } + CompositionLocalProvider( + LocalThemeIsDark provides isDarkState, + LocalCustomColors provides CustomColors() + ) { + val isDark by isDarkState + //com.xef.xefMobile.theme.SystemAppearance(isDark) + MaterialTheme( + colorScheme = if (isDark) DarkColorScheme else LightColorScheme, + content = { Surface(content = content) } + ) + } +} \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt new file mode 100644 index 000000000..637bb1a72 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt @@ -0,0 +1,28 @@ +package com.server.movile.xef.android.ui.themes + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp +import org.xef.xefMobile.R + + +val Montserrat = FontFamily( + Font(R.font.montserrat_regular), + Font(R.font.montserrat_bold, FontWeight.Bold) +) + +val Typography = Typography( + displayLarge = TextStyle( + fontFamily = Montserrat, + fontWeight = FontWeight.Bold, + fontSize = 24.sp + ), + bodyLarge = TextStyle( + fontFamily = Montserrat, + fontWeight = FontWeight.Bold, + fontSize = 15.sp + ) +) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt new file mode 100644 index 000000000..1bd88b147 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt @@ -0,0 +1,149 @@ +package com.server.movile.xef.android.ui.viewmodels + +import android.content.Context +import android.util.Log +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.xef.xefMobile.model.LoginRequest +import com.xef.xefMobile.model.RegisterRequest +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.firstOrNull +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import com.xef.xefMobile.services.ApiService +import retrofit2.HttpException +import java.io.IOException + +// Extension function to provide DataStore instance +private val Context.dataStore by preferencesDataStore(name = "settings") + +class AuthViewModel( + context: Context, + private val apiService: ApiService +) : ViewModel(), IAuthViewModel { + + private val dataStore = context.dataStore + + private val _authToken = MutableLiveData() + override val authToken: LiveData = _authToken + + private val _isLoading = MutableLiveData() + override val isLoading: LiveData = _isLoading + + private val _errorMessage = MutableLiveData() + override val errorMessage: LiveData = _errorMessage + + private val _userName = MutableLiveData() + override val userName: LiveData = _userName + + init { + loadAuthToken() + } + + private fun loadAuthToken() { + viewModelScope.launch { + val token = dataStore.data.map { preferences -> + preferences[stringPreferencesKey("authToken")] + }.firstOrNull() + _authToken.value = token + + + token?.let { + loadUserName() + } + } + } + + private suspend fun loadUserName() { + withContext(Dispatchers.IO) { + val name = dataStore.data.map { preferences -> + preferences[stringPreferencesKey("userName")] + }.firstOrNull() + _userName.postValue(name) + } + } + + override fun login(email: String, password: String) { + viewModelScope.launch { + _isLoading.value = true + val loginRequest = LoginRequest(email, password) + try { + val loginResponse = apiService.loginUser(loginRequest) + updateAuthToken(loginResponse.authToken) + updateUserName(loginResponse.user.name) // Extract user's name + _authToken.value = loginResponse.authToken + _userName.value = loginResponse.user.name + } catch (e: Exception) { + handleException(e) + } finally { + _isLoading.value = false + } + } + } + + private suspend fun updateAuthToken(token: String) { + withContext(Dispatchers.IO) { + dataStore.edit { preferences -> + preferences[stringPreferencesKey("authToken")] = token + } + } + } + + private suspend fun updateUserName(name: String) { + withContext(Dispatchers.IO) { + dataStore.edit { preferences -> + preferences[stringPreferencesKey("userName")] = name + } + } + } + + override fun register(name: String, email: String, password: String) { + viewModelScope.launch { + _isLoading.value = true + val request = RegisterRequest(name, email, password) + try { + val registerResponse = apiService.registerUser(request) + updateAuthToken(registerResponse.authToken) + updateUserName(name) // Directly use the name provided during registration + _authToken.value = registerResponse.authToken + _userName.value = name + } catch (e: Exception) { + handleException(e) + } finally { + _isLoading.value = false + } + } + } + + private fun handleException(e: Exception) { + when (e) { + is IOException -> _errorMessage.postValue("Network error") + is HttpException -> _errorMessage.postValue("Unexpected server error: ${e.code()}") + else -> _errorMessage.postValue("An unexpected error occurred: ${e.message}") + } + } + + override fun logout() { + viewModelScope.launch { + try { + withContext(Dispatchers.IO) { + dataStore.edit { preferences -> + preferences.remove(stringPreferencesKey("authToken")) + preferences.remove(stringPreferencesKey("userName")) // Add this line + } + } + _authToken.postValue(null) + _userName.postValue(null) // Add this line + _errorMessage.postValue("Logged out successfully") + } catch (e: Exception) { + _errorMessage.postValue("Failed to sign out") + } + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt new file mode 100644 index 000000000..ba203733a --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt @@ -0,0 +1,14 @@ +package com.server.movile.xef.android.ui.viewmodels + +import androidx.lifecycle.LiveData + +interface IAuthViewModel { + val authToken: LiveData + val isLoading: LiveData + val errorMessage: LiveData + val userName: LiveData + + fun login(email: String, password: String) + fun register(name: String, email: String, password: String) + fun logout() +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt new file mode 100644 index 000000000..94328f41a --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt @@ -0,0 +1,43 @@ +package com.xef.xefMobile.ui.viewmodels + +import android.content.Context +import android.net.Uri +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.xef.xefMobile.ui.composable.UriPathFinder +import com.xef.xefMobile.ui.screens.FilePicker.PathScreenState +import kotlinx.coroutines.launch + +class PathViewModel : ViewModel() { + + var state by mutableStateOf(PathScreenState()) + private set + + private val uriPathFinder = UriPathFinder() + + fun onFilePathsListChange(list: List, context: Context) { + viewModelScope.launch { + val updatedList = state.filePaths.toMutableList() + val pathList = changeUriToPath(list, context) + updatedList += pathList + state = state.copy(filePaths = updatedList) + } + } + + fun removeFilePath(path: String) { + viewModelScope.launch { + val updatedList = state.filePaths.toMutableList() + updatedList.remove(path) + state = state.copy(filePaths = updatedList) + } + } + + private fun changeUriToPath(uris: List, context: Context): List { + return uris.mapNotNull { uri -> + uriPathFinder.getPath(context, uri) + } + } +} diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/chat_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/chat_24px.xml new file mode 100644 index 000000000..0163a0e13 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/chat_24px.xml @@ -0,0 +1,11 @@ + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/home_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/home_24px.xml new file mode 100644 index 000000000..bb05c6154 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/home_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_cyclone.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_cyclone.xml new file mode 100644 index 000000000..f1c45b5a2 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_cyclone.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_dark_mode.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_dark_mode.xml new file mode 100644 index 000000000..0ce2444a2 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_dark_mode.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_light_mode.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_light_mode.xml new file mode 100644 index 000000000..b7331d3e4 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_light_mode.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_rotate_right.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_rotate_right.xml new file mode 100644 index 000000000..181067170 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/ic_rotate_right.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/school_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/school_24px.xml new file mode 100644 index 000000000..2d1038e2e --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/school_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/settings_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/settings_24px.xml new file mode 100644 index 000000000..90bc79bea --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/settings_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/smart_toy_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/smart_toy_24px.xml new file mode 100644 index 000000000..7382f2168 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/smart_toy_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/source_environment_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/source_environment_24px.xml new file mode 100644 index 000000000..3707dc440 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/source_environment_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/support_agent_24px.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/support_agent_24px.xml new file mode 100644 index 000000000..9c57a03f5 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/support_agent_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_icon.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_icon.xml new file mode 100644 index 000000000..ca0f226f1 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_icon.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name.xml new file mode 100644 index 000000000..756bb5129 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name_white.xml b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name_white.xml new file mode 100644 index 000000000..db77eab35 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/composeResources/drawable/xef_brand_name_white.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/server/xefMobile/composeApp/src/commonMain/composeResources/font/IndieFlower-Regular.ttf b/server/xefMobile/composeApp/src/commonMain/composeResources/font/IndieFlower-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..3774ef55d4dd8d0d272f602542bbbf444ebbbb23 GIT binary patch literal 55416 zcmdqK2e>3@T`yd3RdrQ$b#--hcXf5nIh^iuI-Z>4TO35p+v%ZCeGWkEy)L;p>+^iieV&h{r>d*o zdh7rGb9(!5jN>>T_b4ZDSJ#$TRyjYrkK>sPn7IJ)=m_$cQuz2N>& z?rnX5Ehy>Q{78_$3Bke+n>s{GqeYzbbqW`#8q0V|?cF*@rfN@SB@|&v7Q+S$N{=mFqX& zHuuqg<2dcxn8SVb+UC{7)(i108^w4F9|rgYE<|UyVwm$1VE=FUhVS@j_8BhY8)N6_ z+7ldC=iY}ik(2BAl397-#mKTV9+>+a=i)w$d-OENsq`pU!5i>AX8!Um%qTv*^~lys z#53Dt?1A(To~EZ5xA>Qb?=0NyoBkIrO{n9z-~Nd=eE;yc^~fzvJR^J=-xZqN{-419 zl)V~n=J?;`-+(Kxa*ph;xeiS^9L8~P;keczj@x5Dg?}>mA2-is{*8BF6TZy;8JB;Q z?z89ddua$Da;6Y)H0`y}QRMy+-^X!Zp@(W|lK=&*pN0Z+`gSc;KGqe+w(KI_t6twvS!FlmE^~_>c0RNj;kS zdM22OWD)?fl$qG|B&fFa7h50N`i-p*Zhc_u*S3Cj>%CiV+nU)b-g?2Ui(me&FW>Q{ z=`T%uY5YrrFLl3^`%?6a@A~4*7Y?XzlFr&|!At+o{|8bx_CCS651o1^W3N2@1l#)l zC%Bg--^;l<;qJRep5Ry`lUcdA{5ZP@U-$+t)Ur4e8kyC{h2rXwQ~A@G$1;y?-1k^! zHFM$YeUFPp`-mHxkDYF19_Nmpx`=;|oytBwe>(o;>E`LvlbA=OdGH8^KXw{3Jg_|j zj`pS2cQDA+*qeD=C>=U=_|)T%F2^6AUp^hrW-}{~fAG+$$3M6n&z?SwQPPu;0%GD` z2WA;COEuhAoLP>ZdVD_qICuK7$7s%@r}EjyAARhx_+wbd_V*{a4?g7rqH%osnACiAf2`XWVqfB&iO(eOOa5|-Pi>}tE$vP} znEo)h{9NWYv&rmZIW702xliR^k^epX_h*Gug>M(H75}mnEB$=wE9Fb&=U1%CV&#Eq zuDV)1QvJi~7pi|#lWO-ER$AFF?{{_Td?FdB(QrO|E7H@-9Sx6MbI zFK@oK`KIPCHh-o0q2?!>pKU$bdPVCeT0h%*y!HOp$3_#QZySBr=m$nWKKdu4Umlwr zd+XRQjs5D_Z;k!o*caL_>nwLZ)cIuRvz@PYzTO@0KDYakUb^@8-V?o#^nSnh=e@t~ z{d1r1zqJ3#{u}yl>%Xi2fkAH2983;Y2S)~Xjq~G=jsMvA&y2rg{C(pe9sh&z&yRm? z{F@W}#2Y7zlVg)JlN*!AC(lkkG^I^FJoSB3ubTRAQ$IKL?x|m&`oz?yr~YEDNzxb7pF0ZRV9Te>&Tlotxd9eeUcRX8&gPTXVvkZ!SJpp6krb&F!5#Irp}? zznuH0x$n%o=R@<^`H}gF`IY&@^LNf)oWD8$l7;NThZa7$@Y#j0E_{9A)}p#-E#?-R zi<66gy7WCuKd|(pOK)EK?@RAl`tZ{4E&bWjUoCxOX=~ZD9A3^Zx0a`t-@Q^<>8{ML z>{~gta^K3;mG52o!Ijsoyk+I>tBKXhYIpSy*UqfnzjkfyZEK%jm)7&^C)RJSKe7JR z^{=nr+E6#Fjoe0aV{&74b=aAX_W4h81~jND1UWZDi}H@1(s&-=DMhk3FXYjAJpeC$J<#lDE=&f#7jpQ~IF zpCJEzclXJtTnxr10bC@pmLMO(Si;RY z&d>Ysjzf4SkK?Owd<*9M#MTzZ`7u7oeiS(PNgO{6y#Evz-o|~1-Yd8<{smkH&l%kF zxiID`upj4E__uR;=H~)}#EI+?E=RcM|ClSX63$(mf_Z)LASCWnTmR0%0^r>~_H(d_ zpXJ)@W853Kj|1lz$G??J@Gk`(mN^L@4Y-fkcqiOHHc^|7nlJtH z=*e|#!$)$DPnY{D7v_G78)GN9yC5G)TONH}+}0U*&r^?2zPAMV^FseYH*S9-q&w-u z?&9`f?ihP?>!Ub-kiQNc34MoW6QnEoZ*6Uf4`cn91LJP+y{&KYf4TLop;Nr|Zmt6g zf7kyg3WB%Dg9}8?1zDG&hoLVx5A>3k(*cdaK}UevCgKMRD~oVZF2=>7-;!L4OT)9x zayc%~6}Tc-;>w5vs$31xLxUUPnp}$;<;J)+-rnVUT%Q}jm!9AzxhZa%o8e};Ir!xZ z+#uyi+zIIVQ`~9p40i|j9PUo; zF79sb9_}o-_pRK^xbNqFjr%d~uVF`C$^9_*M(!85pJhDv81&Wm!Poyf_YLkxxF6?! z5RuF0xqsr`#Qh@oFWf(K-{gLV`+vFL=6;KN2X`-bj(atCANL7vllvI=aqjoH-{F3j z`y}^2x%;_46f_kpvP;tKjHp}`(y3`_cz?%aX-X80D3*hJ;Yt&E^}|;u5i!g zu5#D7>)cK52KPMfVeV_tyN_@$fQEk|_q_8O+ZDEXYh2VipUt2#c~9i*w)R{ufKIBulY0%djlV zu{X*R=V z*&Lf^3v7{loO>r*V#{oWt+F+?j+kc;+spQG|AsjCE8JhQ{p9HoVOuWdeWQ#xxOE(rcNSAi_c@1U zyyxrBo7*p3abCD-AJmm6pH?@YJe60r!Ps<;(uyf8q?c9}z9y;p)tDWEV#k0Qitmnecxp?8;v)81J8y7F#w<%q;5Awxr;5QuLFFM%T z*aq|BHn#TcOyYT9=Um&n>#f>@yS_;K&Yrt@V^g|hAGCeDZfTcxeUbJ#2)JY)#C=$u zcnSYV2b||GJI^23^@w(P*B9x4^ZaE8ftSxxQsmkdaD;qtn><&xS9s7_;T8MfJ$T{f z<@0B+-F)cM*_$`KS9X7sjyUhW=DhpJuGeYTc72hKIPbpZ9F96qUAGUOqdQpgT;Dm@ zj_sO2yRqwwbj+FNhI2UXQ0b;arQ_Rcxw*ZT?dYzhYu9&ukxrh!b{2B`uyZ(RKPo+JAKWMJySRC6^ZLc>?uUnG(rIVl z3+#iqa`W01&#vhl%jbozN0v%-*jN=g9s%ImX2m z@`3H^5@+T9efwPDGPytBK6mdrS2;fS+3o8Z*Ui0c``nwm3XAB#qvMRSL>FK&Zoqm> z!g97?LC(RBT*UVqIB()}5jLg?3v&&2s0Hh|3Ol)k?^j`6Xykc&h77FmIoRP0EHByL zQCQ;)Z0beWsC!}Cu3;8L1hBT7nDb%$dl8n4o_g>pW6s|;qKR3rV2&z$1J(W?qFe$JxWM%-8UIW_!dX9M9qVWsKj1mCe9DUdEB&$zc2id+brz|9$v= z5No2byJy~a+YGd(6ZX@D7kYaJYi-(}49<68yZy~WcxWwG@uUL_;pGypJZ$6YtPR<4 zam+(vmPh7O2r@I900z4KvzX2)|9RC%X4)IIJk^d|I(VKT@ zaR}bo0ef`^aXf~zeW25lef22*eI`m|06TGE-+p!zIJ*X_6JHSj5qFNlC;Y#=N_zVt z_?Ro8+EydPJbvE+|l zfuFhw2_#)YvNMF@CT6{AKTER?*S7O4>7dQ+c^xU+#LRU6nmyMLlCzlmtPSl$fc+fi z8cGq#-(}$OCXUXk>8_(oX#JOQop3?gh#(t2=RoMd{yf}w@Ig{`zYPz zch<(!!#0c$Vw9ub9=5gBIsChW8`515VLb68>3|GixPb4pX3|l^`H50PNSr&)oLB9! zH?RiMWArTPYvP|By>Mk4t8~9<-`mY!4u8;_h>oOz2&N$&Zr5D|(U3CEDAGy}+&A$Y zK}HxPEZ@YrquuDrLztPq-@korXJyVx9mfQY6Z~@`>9G-X9F?{1?dnU(f5TBEt z9rF8--p=#HjbsxX?9i&n+K|q6aI^`W(7pTc-|*UhgbRlgT38d=tDUv&(3wUM9_Zff z7I4Tp4i6JX2p0sqLkD__-c1y|W@CoNT*e5JccS!AcMNemr1lWE&xVnw$FuWxde_rE z@8IzQRzp4l>6B|WcR83HLgL_;peNiCk2t)u+qw@ivm*(Fffv{^JJcVybNX(0Y3}EO zeiv;V?Px$p2R)rc&=Vxpj*RYxgz)ZoEVsXpFmMG=5w3?TI}7-(VpT*PM;8s(L1WJW zq8(UvwB&I0+t>Ua5`M%+@WF-miOznY@7phyEQh^Ww?5RkhBcp z+R-PpKF6!QJsKcuKv0uRINpOpo89mq#4Hp)5cbFtJ=LRoCfJ93H1tCp4`b+$J3h(| zCXNCpw`)en3n2f4EGXfN*67fg>=nWORIBt~;ltf)-H*53ZVPXZBc5rkLpnX3u5`Qz zx--hkB)yt)_XXDd}#8bX?zA;LGs{8EYaP$ zN}df#9=+WeJ%rVvz-}s$A9FjlZy)n)oZ!d}=|qx2dXK|3s(;NQ!zM5Hlk4MTq3P2B|>cZ82?&nj_54bs!+?fD(+MsILd zM4pdx&9UF-@r@*z-s)T@nIbHZ2TN9w85q=^ZB8cmQoa!cI* zR9<&5Fr?oz<7x*36ssLUB(nkQKoK0-i41b{q_OFI`Md1LAsZs{+OON#a3FKED$$56 zfkQ(F0|e*LW7_e=9WHWsg7OoaHg69p=y*oAul)*UCCx+}G2{yJ?uR;T=oviw>WL?v zH#vS0eINS3FWB~3C_-?~9r_I+-0=hHsU1Jr8B1$_Iz2>ViT54LK{9>mwx@@Ah2a>o zf;)2$?>Z}WBA@@W)shvs_sNKExcVWcNDhb5#1OOeE`ryIwdnjhG8E)L&}YoH)d#Rz zC!67L?{L0n<~zq*B29F=#-UkAlhfPjolg8lu|MJI>9js!ltxqT=c%^Hk)mhQ+m63F z^aC8fbjMG3IM{)U=ym@t``xxz|6hOaf1Y+vjW)kKE_o)7BTjR;>Aw<#5O)8gD18Sl`HvRy+D+R66~p?02jw94(icN0$>!@C_1ie{vB z4kI_>iD4Y*c!9U`=+Gx5IEmLraCBl+vWBFoo^QjnWQ!ZmXVVtb>PEL8^dh=;#C;dav(i`bWc9V1f`Jsg6VMIB6 z-*5#E6!+RQlNUfXcxP3FXL|bS;`1xGL$KZcp4;*4#BSsb)4U|FWN{sg-|lfaI`-Nw z`RQzH53*#>CZ+!sS#jRD!+%Er*X^frC#E6n5H2aEBi7M#~YxG-Htzfd7D1N z*mP(+Zub)$jwJpbatY~sM>3sQ#Nigw{500V=FqMao{5sfbq(pgJA2i&Deg!u$-6V_ z5a+jhl+U*Iou_t3GQ0h_oe{h9uRApV?zqCq;yG4%7|%Nv!C4JyQ)iWq43ljp4j|n? zd_WOC$v#PqBX=aPP7Z|V;oKqpLDKSUJnzinn+!QzMIOZMQncfv_HN^zXQm_J zjVMEM5}X*@MfVjH4xnw0a)yQl6GLiL}iQ{&(x1r+Pq7^{nYR;+LT>M0`wEe+PPs!;T^* z+XvV;pg|~Vb6{V`IaLyewYH-;Tg94AVkFh6GWL@hyJ~e1HP8*adukcia~N@S`+m;W zWhZg>7`mzsqJQcb?l^NC!8oepoyHZKJ7a&RZ+kJGVnpKJ6?9uUl`)DWY2*?7ORyfY z>whcTF{%;MT&Ha~SMBoy_EYp6VU8eOz~>PDJ%W)`tvrsW=o?)*DxzV;8Z;wTu~f-2=As5)UkHVhJxNitD}*Gy<@n)fLZBzdh1^MsskC} zgs4og?94(w0KMCRgYbW1dp@eF)B5+}Kbo1IC0_Y%NHVy05Toe5H2Wfs4)zIeRNLH* zp93}r?C>DLy^Qw|#I*7qs_%xFaR1#@csed1yb@Q@Ttpwj$UYknM}ff=z)v$dSLk_? z3F7djZ5%ptI{Zy|9gcOd=;Skqf`>s*2lLK+PhADA>!gjf9lSf3CJ2dB=#9f%$qtq2 zodoj`9^zW!rlBnCV1?w2AfY!AwdotZfn+T+v|6IpN^I5x3HlT^g8g2qx zP8F2=huibAPJajW42%KdVQigd`CMtx$`&Dc(%6aDrK8$h35Z zn}!uhsfOk~TLDghqEalZTf6(m-=yLqqvC|LUe6Z1sDS^P` zz9UE12O973>7o)cz1UyJqZ9cX+#d;T;H}GX!KN_7`h)(U)9wNy!AvqqmV9_|lP}LQ zToS_sMpJwPFXD|N&jSE&K$ApXmIZ;AJ*xC-!6T`L?)7?QN%QEIUsD9WkQ?u`lO;Z2Rf6ilM<#F z&>aq$Z3pF892QvTbtX%4C_KxzJMDgog-pB!*IABk26-7xAjIht;^Qt%#bRQ2SDVpYbD|2gJk;$qmFqiCNyyi0mmrG4~4ZqvW#FGId z9}k$S7){1_my*tUb)I>6Rnr6>-z8BL1@#0E8l50cVKTpj?qpth!wEpg%eoZ}p($Ae zxm^JdFELLL3jnbeJuDCjD0(nv>K;XUx#*TfqfpEnn9;3DYS2^_RgWpvdX@mh6QUxE z#2o@2$N$)pTfjFZWchK07R9?&m5+=>c*Y9^AkV`2Y9S^n_XtM7&j$di#Pg~fSo0~o z;6op~3Vv7+-h+PY*Kt3Oj^RHCSLgy5k@d?>*T7~?9)uQq(?YK)JjodYGi-%T>bG{N zmtY}ch<>MA0-JY2DS;*oKm7o}pmSC5H;p@vG8 zN<#~^3C)3rEtj3e+ObVh|XcY4OrP;2=s~(jFlBq&m2nhL6ui0(a+=ka{Fi8>w zrg$)!+XJ2#m|iRC`j5+s;+8~@TVj>fGVk?jLaZ@1S-JRJNsWYbmWY@+5Qim42C?xy z896`N?^+flEZ}3uz&U()ado+u6#4r6p7{oUL$R!YOU+fA^`NOSFc!0N>2yi)dfXx} zxOnC=qZ+X3@yMP)2)skO}}{`AHv;;5ukBrB`7l{n;~70brI4Hy$fpYsNp8x zu~i2f^oR5V@u605VfUy3X#mUCFgB52lWs4qu1?e>QDQ98@3&1UR;Uzxx}wQ{<_RV8 z<&afQ`V%7)DXSPa#+0CDRkI+D7Vuh?q;cz^V9tuf!eiyART_&~BZcs!pz4}lDMa;1 zQa2JoH5pvLh%V*Be8h96b@!;Nq0D82%>7G{l0|dH6jVyGGLd`2l?2#fl(9W^l_zaisaf9Qm zWJ(ehMLiBV@t9^fRfzDKuJMW)&?aP6SM)|Xshg%ti$+Yty{~if@ZlyO2>N-oJJs=s zKA*-!GiRECOs6%LgswI6kW^PVl}kq@7&YF-^dO`Ne8#h6t6C00r-^#CUV;ka@AJn~ zaX({Hz_d~>zv1EeWU;FIa`}S6r|X?&p7!FHu&}52zomWq!D;Nq7^GYwlQ^y^bWKr_ zJdjoq2Hb$yx_JI$l3P|JDOGNblr-J#PL1?Ov-Uh&pJ8vpUNUSj2CE7~Hl&G&^PrtT z2C`Z@E73JG)m`3Gs^r|JUz1c>g+Sz%XS*dUJHAm>_)sh%x7M2Bk7Q1qKE4z(72WSv zEJ=|H)B6waPmRtL{4PP2bQqo5(lM;Vjh#vn{w~xVxiBd{BAnC&JCHo!?I11Q>Q0Xi zS{bW27MEc!0^U?_q!9Ijl?M}1tV}SKOlxv^Z>6+6H;9O$>Xm)2pR5%Q#cylnt!XR z>lUzFZrQE**z52{X!=MZ>Vg^vFDVMIN34hrIG7-cvfHP+Koth&45X70FRx?N1aTW< zEq5vv5frbY#u5<)=G*NC(mh^ZGO6pj*WhJZgVoUFbhVx{iHj8MG5rX87h*MTV587> zi-1FzDza2SC~X;n2iWVh$D}Ei7Qj~9-f5kMY$}jn#CkBjLis&rxl{`JVA*|2wOLhM z*!Dy=9`HkCVBv!$)$ljR3;~8najX0r1W|zx!}A^wVa+8;?1NaJBB@?CAzk5_+v66D zbjC0YctBXK`Er;zjN=8ED6giz9dCny3&k`|lC#B(Y;)%JF*y0BIwYi|dV{9)RsmkP*R2RFkghhG<&5Gra(cB<_OK7@wMtIp zRb7{S2OoU#qYvLP9wCh%1aG_vJ1#@WX%(=m&DFxsN35KBg7dfH@5Qb`HhcOBF8=$t zVLZXret&dq8+H$3S^6j)wa2uLz2E3tEE)`N0&8pXHDUUmpjrf8d zK@a-iYxG-Qz27aTiaAlu=w?2y*Jf9{l~Og~3df>~3JWCrbQN08L*P4{z{ilo;0DkK zwu-kY3k`uKIB}PYlr5H$v}3VZ(!dTIhfMN)9sdB9-ef_)oE%$e1qz8kZDHShorii* zE3MH=ERxQerD7r+^8`%yYr^G(FP?>)l^)c+TD;ziMMwIpFXWlzx8Q)f^hmJQ&j$=0 zE;NH`K)h*$l0jN0gjuqzFk)jVl&ytA3Cl7dY@Sj(mCU6_;yUjNx9yePVn51X#9md3 zASmv${TX;JvSSr!nYM9t;3un!_|vvKO=w&laY3-$%jy!sUa0W^AGCs=a3Pu-jAX-L zr-%Z*PWmijdOa?td|nBg9+d$MgyIkW>m!v75NGoZpO1B5AfsJ5>uA~->0;plCIpQRpDk>Ge=VMM9h0!d)! z;Bg_Mu~{rkF^&a(LkN%k=RvO!tBlq%Vs?3uOSR`$mXmNr#BjtC8SD=NGb`6pd}*$Q{oiUZ zGrFy#evZE%zWl1K`$V{++nE!xU1i9Ym}I0qlwzmk!o|H798`g^%LXGWH?t16qdWmKPsO-acHiJ9lr3{ zC9l`*_CT+MimlF==~5Ii)>^1E7b=0`^geTTT2y0=T%cA6dt+7bUlO|Ob$kJtTaMfn ziZj7`?ZGJQFa8f5ro$l_q=Z2NDnSZO+Wv~IMnFfHUy4oNqg&balt+#fszrp)Ft;vP zM;7djck>=SxUla)M%4lwBl+kWJJrOh-JYOVZ&1pLMg*1i&i9{y4~rdnT-WMheQq13zQYp zB8iNtWed3&{4Z}b5U^skO3Cs>(vFJoI~q0qJod?VVZ9w2X~IsDNo>O;28ZTc7fhrcY{dcbgsbGBq7RWJ zy@@oIYL@!BM5i1fe}@;XfCmENk_#*S?1ab4gw&9mA)4`pB1*f(K9ZdpiG>R7MD^}_ z?$~H6npB(HyHMvPEj2z7D5itF;u&pMMKz!+P;Rj1$Oi9YXJC&~Bq{LHK^4SdWm}tr z0tnq?sYeFN40trzfFfp`;u?n?eEB50(%n$|-0c=o{W=ghKGzL{$s9B`p|E88U=F&q86p zsKClgdO+phl&zO)X*He8xV`m|(VduRCM3jKISsik-i%?0Zp9!+_=z$0Y5bbX1j!LH zK=6MAWO_sj6jCna_(CSFtlX3b`}st3e4-mvXH-analD zmSbutgltx&KR4UYd$sqlP`XknXo_LLZI{V04Mfv%Q}iXXg^=i0WCVzc5i=v?)*_{& zxV^rBW@G;4>^tlgpg_mLJVhu#MOe-Pq#_s|`O4m`fCR&~c*~=*M7GG3`TD~2OvxCZ zXep&zul1Tfg}u~j@4bFnizwBZjROY?zH%Yz1C5{&gTc4+c6Ln^0+z|kzV}PW;lSVOjSj{oO7p(^;)d}kCJ&p@l*;V=e>fc2SYBi zthj<&AQcU3Vy-z>OWF2_w(SZx@VgYG37_Q7TuHEF%ThjvTr4u-LnnzWnhX*T z^^6na{)*){bf3=*UJNGSe~))e%koGrgbb;yUYaPI(Q-Y&OJ*_cQgGF41|=U7DWyOt zse8g9_F!tf-yck7x*b&wFct2<5!RJ-XD(Yha&RLhs!#!nN0O2Cgook7PwkO!^c|rr zycWM&z-6048Q{Xwz&8ZPf%j}pUAA+RwrAm3AuL58)koe0)FE<61H`d(gv*5NBh)?A zLcb~ENpb{9Wp*qG+oMNbepjEx$5xKq)y=H$U7zm-5I{277cE308R#get;)z)v@lVz z3JZ7ijp@loK+`j&(bULFGonQ*F|%6s`P|TjZpEE25bPj0Gc6@iiFtYGzT-zTv(J0Z zATx3B?hE6^wbj*v8tEUr<7{s8rEk8obAD-=9ec;ZuiV-yYDQIwJYc6E$3W8Jf=ZerQNUl?=0S3@6N0^eGbb<;)eWEF% zU{Wr%YKqVUJ4YGz;guQ)vIA@}gn3|eSxyx0*A;KWKJua6o z67%g2)zavpw-`4j149Gs%W(kY+2<(bu)N^x>+vD2CKc-7qKsA;OH$wsWR|IC4QIA1A*BgJ|!F>Pt7 zcmRbG(}MC*bmQUoeDA!=13Sl3YQXP9al?pa%wQze$j3E4m}}3hRchl|pCEf4HB%Po z;0jgpV++l6JQc#5JfTe7%0)CS(0SyA&$p#;i~TeI=&r!j{yTfQ!z)d%PZL!a(!BUJmUw+)b`~(2TmQm; zmVX)Q)Q*NrAx*kXgEG!7nK(2L4yHs3w1bZUx?Tw(6VILZ%AzAN^q*>?2bI%`a<)#mv zxqHMNi~463zem?tcKTqmurlATr=oFm0c(I1O|oI8@6E5;jy&XT_P%7qln-sCBt*5sv}Q+tFG>i0^0`1mq38Tb=^QC`ZI^B6_$09Yan zX(fD+_>!AEDRkgC=zKZl3L}&&eF#MshN_K~OvjO!J%7^63cBFCVzEM<$-h-G&5>XW~J^AH=641d5 zl(&~PpA-sf{0Q^v-eh;J);O{;GZGhhkC`@Qw-l-j7WY*Wjik>N?T^_~0oASe!4R6; z8&Lk0a>Bgq^~kY88LKoP1mEHR2kB*|yJUF%GK6|N!$X>us*+Tr1j7dr6-?O)Dkv() zC5Io5x+Jb+os`3;`ZBZvMYFJ3Wp>G(Z?;E@$P0_`L~pmN~Q z!7|FuUS0v`E4SXsgTzv_)A$R?r^yn^a=d7UL*nsYJf?OgdmdgY$-&cn2#LRGG2Nsp@9q$PjoD{Io zhvZmg@}*X)YcrE^#qcV+W_gfXkJra12bKnF#8^)Yn?WSfNP3_dB1NW*OfBV9WD0`; zpH7a4>Wa-wPt>FF>R1D!?+OJ`F@HEMb&j7scQ6v+jn3p$D+TC+sGR*4e+r#Ku+uIW zU*3)bd1yF-l;{pJgW9tI4Q?&|FUhv_lQURij~VUp>3&TU1*BYbkPhV`P!*{PB=}Jx z5=ECw@aAi+(b0%32V#0?Y%~<|Ce{wrY85TuX5N_U&7!Vc3i!vm?MkFFyJxYjWLDQ# zQ#OkIe$i-jx>3E^A8*8&3_I+LcDu2NRbHBo#bcro^sD$C8+#>3kgX_!h9t8H5p-fw zDCZ7^3*dB=XGnwdLD(Qv+*Eu74UsHFMfLo)Td)FlR-w7SpZb~n>C;DN{eFqBEFL>` zvY>`dBs5vT70{qY_2QiKMqc8tp|{G$U8xT_ARi9)ky#K-+fNl2!-j&gx?>s=s&5cj@%@zF&ylTHUisam%NH8s*3(UFqW zL#9|-DR=JMysxdOqJ%Xe=ffWd7B|QbAgA9kbg%}ngsyG3jFcX&2EdaAAYYYH+t2oQ zJ}IF-3ZOOQ7*!=+>MkGardugrx{#K1Bb$nuo7AEE=3V}#m&J5BrQmDS5 z9j&1P6);3k|Jc>l?sOJ`b#?v1GD-y%xHrLg zG15LTU5g@l?{BvPrk2nz+A&%O5$b4GiHu)V;xtg1_N8^J&%Hq*`577y)T3`m)BL3R6dpWC*n0w2m(ib+@QjJF<8a&Bb~DL@AVjeJ44GtzelM_(q`i#(6@k42wR0gH3k%}(Le;Y2_bKtHKRgm7`^JlnLByt>J5C7IskTK9fxC<#9u}l2 zepC*^SO(xI1^hats!-Rrt*JhkU+U*sVsc@({FkR+d{y|8C};qxPV$DwkiSZ~kKQ->BUx7+l>_q3w$#$<0Gk}=_`XDUI7 z8PMPUpsYttza$}J;SMCLy==0PvHURiEB7o`6KHqP_3F&xJlR2W>tFfv$VM*NnuR*v zpqax64B>Q?5hHFJ8!<%wh?9SibO9w9Bs)FL!`<$*xiDQr9oz4_^=TtzYSo#wl-_8M zm7;nQKYd>c1*a#fr3J9XR95XCy7$8U$EM$-eH}wLUqQ9Q)l!d zp&CK0kwa1yjxWXkJ!H$!J0T%JLMenS=(eWEVj&9CtFK>1OB(a-*?jo9v zx9sr+-QY|ZCc|YS2gNHIQvMB46@rbbp5pOax@z(PzpOPcU%S@!M#B-5s)bCwsSnPd zzX*7dJL4z#5p*+Cv`LW}90Er{6W7c_Jb~<49(!DX(*cFO9I3T(+N8FxcqS#p zmN(X?@H4lOk*SPW8*h$gnj@}6Z=;%8UtjKIBS}s3MG_ICx_JELVL(nb-PiL0bl3uN z+n)}@A)1xLeG9HCd~(M%a|L}$FcS|cLLeNC7=q-5(lZR7;zRdXI0<>@RpyE%G)AQqRNbN1dt;|f#928ge{{iQuiJ>peTZ@rzr`#|!1))as=*YCmsk}5RI%y8?|Z(8s0ex_DS z!V!g8L}I{&He%#HsG|opctyd&?Z)4EQ4PBMrE~~kE1D-1cQ}^zyNlJL`m%RE7!GSp zLGu+JqO<}Xpo!7%1lIvoNI{HcOWCN)g(kYuir2}NdK?|Xeja)l<#CFv$iUgUgSdc9 zz+tsA)*maoMfh9D(d5Th_pA=Gl1E4IFN!BU?b(&NwkBn2bsq#``p~IU2WJ8j@{v4p zf@r3pF1NR^pA(MIuXl#Ky?$?yZNpvfLxh_y#PCo{PM{{EeH<9g=1Plv5D1{v`{E(J zGq=#oiRIqRpepC9VV4WoK_rf5Lc|q@eCr!Ay@h^LUeU$&iynK`%WtCNjZ71wTP#zO z^X(K0mTPxDc=^HStOo;%M-gqf+I)eIdO`5_J7aMGx3%rw*J6+%8tbcMQ|hVH92M)ILj zf83t{d&JNL=A@rdg9+WvXd;x*Jdn$v~mAR&s;#^lQ0k~}um-fGNO4NoAL zjW=>p!(AeZ0M>WmuWpUPi`&&d)*!#G;rMk_C=bA|Yv7pJ=^+DeL7ckeHIY6S`U9|@ zvqQtq5Tiygb)aF6RAMg0BX--R=}HI@r^ABun#txsRbJblwyT#CkwWdtY~=P ztRk46IzFBqOUqJieosb=nwo%y(um$0RJ^ggl}ELa_a+C&X5Vd$4f>JE`wxsTt$X)+ zT})Ktu~cEQ975ULg#ZDHHB}Cpds za($*5loi3_il-71Ho-)4XqQ3PNPTfMK0hdg&2+95$&FXc03RqXuvya+gcdF>PLC(B z6$d_#W~3_h3fy21I&375;t!yoGIiwC@#R{)F-W9}sZ@J5qrM7#8xmxd{>mA97+neT z*#E}~=+=2WCru;0dLJot_EYYat^$Ubb$1 z4MDo-j)bgQE&&}HtMz(qzfvEc?q<+o5-D{PjpyteRo5=O_+>BdhUXR+I%zFd8k=E% z7s$qZmFZkQfm*X(9KhLSTVDsoUIU6D>MWvc?dV+EJLT*JK;ac#Mmv?Q;aZ_tMeKrE z$0jfq$aV5)%m;!QcBY`ePebO~?@(I5|B)YBPn6TyFuJBCp}o@1Wpa^>l%79y=Ga@mn=lf; zhRbK7zwZnhk1R2*s@=19-_z9-BP+-D&tOZ9%z_aW@vqzNm3h^z9`_agIR1(Tyl(8W zL*oTpQ@GkBew5-YmHUv#PD;|TWN2`}gFZ0!+R;<1O|*8QwIrIz)cQG(4<#-u}70kWL=hB0kjtIoFk`nOUw+FZK%*JD&QbcbqtJLRMu_o;-8? zMK68ifxTrhAnGV3gkmU)=rH_j>lP^cdj1CXcG^BT5H!uBj~W2?iHpPVE5XRXn5-iZ zw;7x4x03>PVqUO!sZDhUCisJX(H*iZKXuA@upuEHOXMtsyLzEoO^1>rK@4>N?V)I#z0AN>z0BqU9T@ z92f0q(}T*|kG%2~tBQpFWa(AEesdgulhKL)zrx;$U-m#h0+@yZ6epJiwkL;Tn|mDV z1tse^G)T2keA|WNh=zJ7Ut4q8YS-2Xuy3F(wN<(S3zD|bm^5=FNU;e#!>~^+or0rJ5ZU-ru&sJ0;ohO>~$d}g1BF{ zVpe`~eeYV#T`0t9tHk~vxPKZgb@Ov`^O@%QnUg3XI6duu!hRm!X64y?+6y}ten=PI zZrihFMF=T$cX0H;*|FG2H51k<%O^&f`zJDE;p%wCKQ=a!lB0{0*|o{i?+lKN$Aj5= zvt@M-4U)<3{y}=87KP_p9qaYRLc!7``AWB5hZ5<1Ls@hD>uu{`=W%W2;3!wLw8F_J zdtsSlGF*BD3UI`Ojg7Ot`r-Lfsymm>ER7dJ<%$`!j9x338l6sw=}MzWjgsi~M_)Ud zq~Xsh=o7HQVGFy1zi;kDH-p9<&N*?{Qw1|vSrQ!FNUW9jH~ zjxPFae;#QJzBqT})QLR^k$~S@?`4l7t5e2b{@LD>=@>T(7X(`}Wa`92ncFEFwJCNT zM)FML1E#@`tu#XE>Ek_fw30}{IpPC`i4-g^`Sec&a*Pfff7w6mQPbCLvS&_ZzwLN?C{#Zb1E`uMCWxzjY z*ze+R7jd1T9=3Non|3_yxE7RIM81*GEWs%!D=STkWP9GGty0`qA!Cx$B-giZb>QQFtryc8G~>yNE=wTqqj|S1dW+>-D;EH9Umt z>+BD)iyyHJ0y{E600XKPnf*RFK?wQiBAEqrkHNP@9gcQ<@bDkd-K)3*KJ2uNrDM5x zXu4lwSp>gp$U8Hsvvz1{gz;#y#a|&3OYMnP5~1Jd1!+gv_JqKH$EI(Xg4%M6h{un9BBr}3+;EXUI-UCM8q>`1cAs5l;BN3IZAM| ze^9B^^MZ1oHgBL6#e?J|`iD;VlT6DM3)l((zdoG6ejc8kk`15ea~E6Hkpfz}k?QqI zzlz2)(i+Sy_4gcGYom>0;pFjkn-^T{>+DP5T(S|g+a(FOoQ=g|4;C6`?#XsMBmvMZ zX_Llj_Ol&-_Gmbpt7Zz5*mUVpth7blU%cXv6R-tE>}W8H8G5V`6AzdMQtU&2731)gN@ai85^-NA5gKrB8PtoHmg& z2K$5}@kHFK=PQ+Bn%yV3RhfCJ-KmLwC^a!TTTn%h<&)dXduA%EzI^!5l1*>MzYJCp zJX-`?im1Rl0S1K$8w=pYcn0ZYh&@sT(Nxgi zswdG)3zq~`Mn`U`*f5zdipB$36^vrSCl`v1@uFph@9EcFqw9CvbviGp9?hT5LD;2?Dl$k^ab8_7kgBvCoK#C|B=9BrrdumyRSf`|l|zcCU-B@tzCAv#h+ zGeo=JZKR}lh3FTW7;kw*Y<8Es$WyfZ!E`Z$7WF`)Gg3CdxkjxOv9PlcHJ?hO<`MFZ zktiQ^g)@a*)?;?3X5*?!JIDNpFusfk`!M`SCv^@bF-r~5O@L*a52T^NyFfdo)TvTS znQ2O0>Bv4e#U}m8fUh;Zm`hX=0gnrt2V4Rm^OveMvozPO#Hn%DCt@pZAXe(-tkF8k zbHvtY|1q)Ig%8%2+vZ?=P>_QmK@m_Lh-P>KweYrek{> znjwA2OxM>2Wi?Xi_Bs|eC>y!XbSH=X7}cm$Tq}hO5HfdRykxEydyQgsG(%nW)Rz*B z#SnK;GFJ}8vq5=ecB3$IXgaU><3P>-ZthH=CA-Rcf6l3St~zz9>eM{mQ+4YOedn?J z-rIfqc6U16otZ!;iGd6ai;xH{C_@-ToKOTc#-P!l2#U{#Ph1aT6j9^}M4keoAkU?! zOrk(gpF-FBefw0^t?s^^bVrx#MVF>Go71QE*?WJ}|Ns90`FgAK+a3JbLN*gkSBe$0 zxj5lW&No6C={DBYP#V#EnyZ2L-y#8{rFEDC&&sJ zoIssOQP;FyUjJp!?`uCw9=MOiQmfrJ%P!+zQf|D8M8Nz%IERWts~p>QMR)lYYNwJ1 zkaQ!YBzavo2bs&RxqCEVN##PacziwepBsN#I=qp~5v##E1}@H4%7k@iY;>z?=K9-|s=}TMjRCKIs)t#}5-hA%YaY!=GIR^%X3p!^@ z@`h6Tm5(b~%(em`h`Tn-V=AB*SdM8OuUK}GRAJc2PCM@TYn;Tp?kdk8?%=BfuK+@o zZr3xC>1?&6qN1G6`oXH?I=z*Bt2s|l@yG)|mFpA>Ra{c`czwQQ&im|?|3xqEoZK9T zkR5QUdZyMuBE+g@B_Y~b3wDlQH94^$N3@?3jm3k23bQGWjBa+8Q8w_`7J{wnfeIDo z<{SWP@j1>K|6qKco|o!w7Do-wLSEjzn&f8zVHGi+<@t?(a^zeFn96tsr0^t#1UF8` zs#1%SJIxzlg;)(`QU|%Quvx6eta`1H1KkQ@7kZ@G1YQryPzT={0A(Hs7n=EWwluLh zRbH7WV7^$7M1HK$S?v@=4+YZ8yM@>tOj3ahg@egpxHE^mg_*L72i9hj*~NTor&X97 zpD0@6_3VviT2<92$Cj9E02!p%hYn*iC8CF%;V1zrfQlnO@muUTW(-13Q~cs`rk!oATl+r9Jrh0=W18mnYH*|C(Bn`!4Ky=Y|k&%Rv(*YRuiSChw&*N?6{h2(gS ze)7#CkWWAnWcGYLpqO9m$QOqk_Q(xH|M&j0O6LGvH^zib!oLN<>Z7=lRQT#d$sYU?PEQ1Xi#k|lS;NikP|KSutj zuNSvA*Cr{v`4?KXj_#Y-JaO_^sh-T{^Yz5s+S*jnXsjJOam8vQnk%P@5;qo{8?SD( zkcJA{o$gFsVotNtUB7C+91nP-&FPg|W__uhDtA9l=xMczC8s_SPOi?@CTvha`T7J2 z%36|2WjvoMH>BQOo*(BUT7kqIElwe$IX{*W(TWb+e}X3A#x6I}dJ6QL^`T@uEu zQaZxg?C8Ixp8$(tk>!zEhnNd>+o+!p_h;ZKxqsdP7U}mx^$LWO=`aP#z$2jqjCvxR za3X_p8tL0FcmaF*BS|adPsBozM9R-VbmY&%i*5G4WjstRGY=c|4*q6mLxAm&5P{Z= zz#^r53@%bdV}sXP03k$lS@G~;IPDZM#B@x1n&|ZamMX2BzU|af(Hj_FKYGPZapRs7 z6Eol^uj|B@w~y@~^RR(R~O7I?mez+z_8nsL?zjoSqP!|R#yn2^NVf05Vj%~*29`9ZXSRW8o5kP zsNwUtq|n!6hTEN1EJ0S+z##Rhq@F~%(XzNyBtafXLA61hj=BJ0o9 ze};^<#@!Nk-F`Ij;s)6f9j|jqpYcuX-(E#sj}rA1)(?6g=>|i;jYP57LL&`RV<%+i zED$Hqob4#j9cY^H+_c)1tgSM^!p;yF$weehyn9KSa0bV;ILOuGoQ2o#brQtok*JKL zP|+{qq6_#6^Bb3cgs=f90Cg;s*O+E(0nK2p-3vtmktyDrQv9?Mn+;{qV5fbiY+@^ zvL;(LSRG#?k<8XB6|;0`&8hBNoka?5x=vv&mL0F8e4Qh=+|uoq*wty>;Uuk3xhLrs zPSOHJiT+7CbpZJlK43u7Q?c@NCF=DSW;ZuV#iWFJPjND_yDczMn4O zfF~rJGqX;v+^V;>&}#u8`tS~5$e$`#$8=gi9f zsOlflzd}!TZA{4_W+jwXI|K{9>?}!H$o1JIB;#9&9Y?}I!XZ~fXjv?Lw(8}xxnGeO z2MwXQCA|}$pB)2tB)>q8?lx0ogxI`jG%he;}M~&bKF4TEc5uG%hIvX_|5K&5>54Ohve2 zCe4rf^TM=2bd^L5A>#`qcpO@+AYM zAD4LC>kWFLk_qI^K*K>8i@u<}Z=zL-Tcn&?oAWJzumSw&xRoegd-JWQO2vQ?^i1FS z>{A;ZUnDTTdBs*2#|Z_+R=vJHjg(?6RlNGvJ8r&mMpdTf=r8}@^seL(&bR(^(PYY> zE}5YyN`X8-@Kqn>YN{RKfSHWMO-V#)51suGb^IbYd`1x5*XO*3D{?k4WNWnnP&J}>x#qtxR zLUgJfVQ;O7bj{?1-O5E%#is1Df71R^`z_;M_LZh7F~C3dj1&Xf z(W#~N#ZFj{T1s3XsB@>rO~eH#8vD(tS0r5k6UocJ@|2KIT9$`rDb|d5O z;@?f}wY@J+f9~KhRy3!N_x^SIS#9)pneXp?+-N}PWPa~k+Nbw9^IK~E1HF&WzUiP} z-2h+HJe?QsBk#)mXzx8n*Z44VvVe%9^^c7oR`Y+f_nzrD9{h-U{)%QgcXqE=^KE90 z8Q*5S!HM|x`#u(On-!>fI(bo0*hvPpt7zfvPRDV5wtNZ+S5J|jT`vG-ZNtzxLEwQFVn**Mn3d|+Z zD6u{l4lyVb5*YA{Qt%hW2VUmz>tgN|5{-lxyhjOK8J05Y+pT&#lPp?rMnSxn?B=-y zd+z$nAn1>gFbU`N!Ue4SJ1fON1^_`gT8QT}QO{M`dX~@~u%%UlIq8jOj-5-qk6bp5 zzo;1eX@J4u+}ZN^w0->>d0P)Az%d{N70b9eq@L&Z&^CC4`$>bDBy4F}rzM;teNK|K z)J71^M4g5IB#;5mCzTWeWss)=wIGGmU=jHWDj6)Hjs%*Q{BabJv#Q`<6+x@<#rNsH z(NAS8VJhKUU%8nTzI8e!eCumhgl;X?*ITNVQIb5o-S8>j*$8&GPVVIEooXQ+M3@Xf zGy;H^@%>zZ1wy96+zqdMb~uxS7BO@7=mnn>y`hlzy_6l{ZsH@u+6FHfOae6vG;Jt* zVE{2?9%1R?A$Ujtlc^+fr&<^e#pKhPU^*{Hqrv^S4)P2OsqesMz@7!D9do(fz4Je| zSdBDRLsSV~IJ6o=qajB^7y=uYrB#5h+_y8hPGV_Z=Z^%ERUo{SZuC^KHP$MlK#D;v zh)BU@=^BW@DS0i7Q@)+EFJhg93KbVUgW@I2ALwCg#F+X0t~FEG&@Xu=xQmF<)m`^4 z?HleLrGLrO8IGUP9v<9jjDP=NoV)I7?V;iP^kAGjZA<%CtmRkm!5;F&8J~2Y-}|)o zDaQX!#*J?d$ItXWr+tv|Cm8>{dcK;kZ}uLR=lAgOw1*A3d)?=p?p>|@yz+TmHHTO7 zp?Cdlzc4%oLJs&rT$n2Tuslt{byw0s0#;o(e50xkczXT(5V=vgV!`kNs;cT>B=C{{ z7`*`#Nl7~e8iN~=s0FnL3pjjfr3|FOLM{t7Sjamn`ao@WZ`B7}-wPxpsMv6lQni?F z0$U7QriFNOp=J{pqaB86BL7f1xtJ;hqTUxsOo;qI zJCWlC;TyV)*gs&6XXRVzJLCoW-`2R^_!GwG`g`OnBjX<(j-Sy!x;u_kv^(FgZ#Ei3 zyL!Fxv%~S7jqe&6{~yEWoTf9(Lwwr>ZNGlIenOD4!YjZHmjF~{xFyONs7m#k@KO zwyIHdx-NtFz)E%?Bbr8xb$McOKJt*%;O2vAZ^1s&6R05$}%I!6n5+gLEkp%{RIO@^9Ghn_jVBKcxO12KT}>GobJLHqfA8Hl9h*S_;6fpw5;9U~SQzNT>w#1`x0ei%c;OPLeaZMqzRcnN zmw!;ZZ8$Esi#vWsdrxjW;eujW4#!|Yaie!&9K zk}O$KvqY^m9%~KxC_e9Ae3XDMf|UOVALU})7Gh9;zE&v&viQl_Lc9QHcN;f3YUaz- z;Ifo$InaN*Iknhhq*c!S7C8w;oTn!Jz>H56D=;BuYVnD! zF{c)_g$Yr#<4Xe~#CRr*YJD&P7veq1ndRl&+MVsN#}^wif%MlDF60Z*c!5&5H~cg- zp>e-&vexQ)i{ndhDjZM^E~^44S;es|r-E*3ZGN+E)*9I?H$qDhE6l)H6UqDl{4U`T z?UXN|7y%WCif9e~>Jy5ugQn*o%h3lM`rCcOGFm#>o1P;92@5}(4|$F9Qj6q6%HpQ> z^C7yYQ3TKQG(4WTHRa&z_&_!6rcFNXLuc32Ro)~4+c!Viup+T+>H76c;QQbsg?*A< zu_h-;uSAliX8$&L(s(DQ`&j?>c%Am*;rJg9$Ioa#q`hr8F1Lrw=k@?3Ke#=fG~O^6 z*G_jqiLy}rH5j)rFUzM(&Cl)(T#k3&qduBmQC zm5G#Gjg(AsF0zCcHe_9LY%YKr;t9$|lQ~jK;m~e)vYtK^AJ8TVAnNoyJ84&<$$}X% z+Zz+k$&F57YO|HDlqz%qN{`hf$LTLt%At6x1=xqXEa3-MPMV&2ai}!YwKADZ)i#sK zX-{!xtDbDvfoc>Ah4~%*aj!|Elcm)a@E1$8^F^VC(DcYknYQ$<(ap2}E8of^3+N=PZ5xL1qMSv=M=)N?StL)#8Qlq@ zJjOWrF8x!+3gc+TsMzz}BjYa|j-R2w(AseRqy2Ht`oeoh=1UAK&*AyY{X0NCzc3ir zP7~J1-#dl^@3ekXvW*JXYxr**(Vv_Bn=NheK{p4de+oU;dG3=Nuzn8Cq1b)(0hO`C zk(We}%E!6LBC%O+=7-Pf6$2)JRR5E0TiL2|9SA#D^`OsRj3;%WDt( zF!`-|pS{qI0!%hTiS(l`e<2oape~Zi@u_U9@I5(8kN#3PDwKu{2;rdJa%P0ufGkxk zLxGWR6Uu{S@FoXT2U=mEu#}2VxLgOiQUrWq&d zse*K7kkA|h%Srq4P)uM?!0c(8qXrj3`DhTH|82CA805$ zG5mec>Hj{zcDf0MnQ=F_`&PzV>UZC#JzGC5Y4d(!`R998qbNoy?82e2!SFF|%;Z ztltZGw2**!B59CkuH5SL)?%4V$JzhD1-ZpHlT;}bri4QWL?@8COf}ctOyQ`ItDZ>O zIBj12H}}jH_TH%2>)=NEtElegr*MKrpXezA3sw;56gX0SS^uOg99(i?qhHMXKZn`= z)RBahv27H|v#0jIOb-@|*)crJr||YKiR2yt^B;}aPS)GsxB8Qw!|X$+e_o%^O?N+o zy8L;@3D;Eo{iyb${`iwBj#u-EIpL5miN@RwBH^?k;b;iNIIei$oRGT zm#G>_4b{yjatZ|>CpLSS1>_vK6?0&Mf_oTB#R`%uz#SzSh3qnaP%-9EId;!9dvtJVnc^!a4`p)(|!tK2UtIZG`?GG>abl9RHE z-0FS0zW%%9Tq#wV_-fwJMS1!oq<%zDa&~Erjz81333CdtPyrdIvp;Z-~ILoecv+DP0x4OHO)p=57 zKvlG&-FM4Nhr9Yqp2lE4xB3t3b$O1OFIHFP%WeNo?Y)ENd;G)shZt9W+Vip>L`QX}8$!@$-1r3qVUEIxK0qSD9!DU?(XyNMFh$#a6kWDV8`g`{A%T^Jtc@K#>4ry3&L$M-y@N~%n#_-&=Wwa7)lS=^Kr%} z`tN^2`y1we9n17)&phL#4&?p2SSUDXzb518Dcni~+OI5eU6B|dCnJ&x0DRpHtjgHC zA`4|o@Jjp%9Nq5Srq9cMamBIZc;%LEa*Ie1Y6bK*qNeZ^Dhwf7Cn5@3DRfJ64Gr`d zkgy4{4gkoql!BwlQE`Rr-r@{Ff7~DHi!&TvSmtT|Chl&?st#2e@&FWB8{#oNZAcE* zt;X&2ep0;6-p5#*IpYx`^g|bm&$(uHi6X}Q5;+#hssM}}5JmO~&>t#{J1uLMIx=R# z9I?{1bPg@>4X7iAr%xT(Gu`p`@JW!!AM!~op^(sqN@x|(Nf5g4(@BippRgl7W8A|p z5DmUP^FaNN?kF@JH{-li683oM&3;8NS01CULZMqMmh{x#c?7*6K4(Tu*bwPQDoFbs zRV{PZ_+alVAlamoOHcb%1dIv&(S*xntDL0PyI1=obfb9}mwDwz7h<#7=%7Xsk!JVHS!g4l z?gkBy?S=^`9nn5?4`pdC@D4p_@c&1>eI3T@g=*7CX#h$CPpBMt*68cK7iy0gcatZg z3dDOMRVW2Fl_V9p{`0eY63t+n&Xp5+_rf(Z(R45yqpJ=jtN>WwQGt~fFaewDHly|av? zp2GMkcbp{=`y_hc*BW1C9JHB=V18J8jPLVR_+>xh5hMc-ka4gIf7O3Js@whfJU`_= z$2|Lf?GEF3e?H?sJNo?344$uFt3BM4$VN0!{?zyik%v6ruU|`oW%qrC&(~f~>Qly< z52E<^V7~Tpna_TSY61P#sO~LFjYi}xIeQ|DA&gT(cK(fie~PBm@T&$J;_ES|eHiu( zO_4%KbjJO2(FhFhMA9Fht_O;f@<6G0V&zQaDj@ha& zjaEDT7-=9A3`4Bd(|XFE68J%^S*^@~Aw@@{_de|HZyGm>|0_%?%%#)jaPF$SeGnGXdDPJvv)JipCi)4^0GxwGHwk|Tk%|uFe>ze-fOSIRp#$|j7w7>`R_1mdU z%Gxt7N-F*Nd|O-!H4Z}X2IV`c=i@tlkMc3x=SvhS&&PM_?=^S)*9L#DetYk)Je*OL z6}sN|AmelDeeNS0CccWB869U_Wi++>u5%zr}2m8E zl4^oxmooj(Z-7OtwY+|-*tEp=z$B6pXKP{_;}0upPHud?b^MlD>{7Ecsj_gN_1v$2 zm0ak3l0T57zqmcaDydS;-78cOG>9Y=EK0r-Q@E0E!}yp*9b1q*H04r00kCK42V&;> z$~PAJB}T%oJZrf=TcdmOmdL}UqaHeGJ6TOug8cyT?sY9SvA=CUGTo}X$)qJ3St zMzLv|B@y1a(lQHn-Xi1d3?z8$Fp4YOzDh6Lv&_!qUQ;Lc%es%9oMJ!Tq$1}VPn^>7 zR`0Xaf1ke_zR%ay$tAC?-t+ghH}f2KzTo53e4?T6QzuT|AIrUinPI09c(SbSD51+r80 zd1Uo)`y^dABm^wFrE+)y9KtFf1W77opI)~|PT6@Y_*$I2AoxzjBnSiW6ea=EiKTp@ z8&e`b0VMLCiO5eSnUW3%LPn_M+tad$g->(SoX1A6BY{|ayoMSO;?&Pf4T!=;@WM45 z?pVo?x;u7Dd)>&6l@sCa*sZ?p^PK&JsKhf)nT`1RcI`>zftY*+fi%~ z8>Cd_m92E=Z-LMe8x&^yzf<`^GG8*V*i6Pb_6Bm-y4LC4Y}{>VvT7`jhmb2mFhgO6f6kY!A86kD{ZA))9}Z2Ml5hIOew;&#BTqaQO^S+r z_t5pvy0#jswUh#WI1((>5~h;CZ+nfrlE7b`+Siz#^q2b*_zN|!8w|;r?Y+XV(077^ zFQYdnM@vy?RbICAQ^05>Q~>&VYAA)`6m7#q^p5i$x_mvT zpq_NgOYROgep}T-*c$BcP3>3uJ0FE6Weae-)c9M}&T%n~VmlP3k@=>((^Sn=Y=_iL zu^p&C$WC+T#|HDkTt^gkTWPj?WG6FG*``0y7nm>EKX@(X;=ov}8Ho11(wL z5xFewFSxTC$O_{zl1#f)LD~HL(T*?=b)zz~zB&aUp`_<%7+XMPhHd&Z!m{&?6y^1{ z5|&NCJiYoCe&CK&Ef=hI_qAj3N(cS^YINtO=iOMVTwGvQ@Li!F5`kG+*PgIPUdr!& zqr0xe42RS>I68%!{^kDo8(2Xv^WTma|55PGN5Bi;gY9w=!%gKnO9BIX#Wf&60~H`) zjs}2Xsg}@=l`IBMVp?pK0EBU?!4FF&CL?f?Kvux5@*MuuaDFLDgA2o0I5E-h0CX4) zjX3SliP?~^ZB>T&;Zgx!KroVc9**?5&-XyFH~i?DUq@Xb#?87zaZ!gPv~Y5t05w7(VDGjoq=lLRv%zo*>*UkFLC2YW!vR_#I_69^xf*5iVlR0k7%9o;MHgz~H}gP$*m{beu8O(Ptz-yniSV)4TMAEOCqI2n&2c1w#)dT~WT z#kLwN^K)ef-%@v0w%5Df2ANtzkDG}v1dZ~(m6aKca&2y7b>{!a_c`8sm7W1Tqt*wm zN?%NZ#gK|;U?ytMjuJ zhy0X2wz|E>>WD}Vi}S^xQJG#{o=HSxan|;+Z)7JwA4cb~{*Fe=m>mu4PXK{@d8K?t zQHsKtNV(}vrH#>EP|AQ(7ZTlX@v6uc=mNPxL3b<%LxxVoqWnbmTi!z?%M8Og;dry% zWyE*jnWBE`0TxT^;jqp5c%RhsEM)6Wz3pmOsxS$~Rp}YlN~@*CqAyyg;0l9v4<}oW zgOZ~wZn$s{iVakLH2uFD--7Q(wpCsqM^3;LfhNb4OyKahI1A3g0kr{zn}|Wh+4DCk zwK?$N)q&wD}2rsZL=osXHNM#?JFSu7Z; z)uYi&-APL4^K7*a!k3gh*zyk$4Rz!$cC)m*PZ{}hA6PyzV#pq!ikWHhYw2)2L({Bm zD)_(q1EH8j3Gv*K{*>niYjs;-(a}o5%v9@a<>8-0q4Nf0g8W(mpZpnm7g(4}P-l9k zx=YVgJxSh>T#fz{pryGnFG1Pj@^mX2wAh>Ic3ZfHdL*L+CIU3N0{DW!L_6q9N6ku} z&Vh|-r7ywTNJeRba(c0E1#mpwI3O+-FC0Sv=+OajQa7u#^J~}ON;cx-lkJH9!FadR zfcwbbm$>Q$uYTaWZ(hOp3JRiUeAf6dcxU>k`haHU)6=g#+fjfCa5d6k)-jn0-i$CNkw-};y5~F5Z|f%zWPtZX%?cC_wCLJ zx~?XY+#c0Rj<674DoN8b+85gU_U*HqYdbsp&BoS|6Vru`0aApbUf3viXU2=M`Gt0Z zl6DyIJ{C%3bm;||Frx+3!();B%-n1toUu@P%jV;#PNGiVLFzIUjW?FZJJ(%%ZQF`; z4_$NeU~>J6E)KWujg5=0C1ww$qJaMW^iRUssL=IOr!CX|rLhuyBM_`7whkw)OqL)z zl*|!9dE9@zo^)fn6bWI3VJnB?(k&DyJPJeH9EF5)aHf<17axmc(S7l^*S6QB)0(Gu z)_aq2KWH}L0!yc~b2|{r7Y1P?O?*{o!2yL$!O~L=krh{vOhP?EY%WC)f;odO#oinr zK->jccbU)Ebi6tBO5}mi+CMVBwyt=gHqyi>u=$&ZcUrBn-4>QXGTi+Zmfn85%jDHB zdd(~E>lmWvov%qN;|44VntJ(B5KE#Vit@zXjf|sVw~cWu7xttn>xB1gf4S1{l zL`h+!-EoQP)P>!S|1 + Cyclone + Open github + Run + Stop + Theme + \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Color.kt b/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Color.kt new file mode 100644 index 000000000..849ee8d9d --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Color.kt @@ -0,0 +1,70 @@ +package com.xef.xefMobile.theme.theme + +import androidx.compose.ui.graphics.Color + +// Light Theme Colors +internal val md_theme_light_primary = Color(0xFF00687A) +internal val md_theme_light_onPrimary = Color(0xFFFFFFFF) +internal val md_theme_light_primaryContainer = Color(0xFFABEDFF) +internal val md_theme_light_onPrimaryContainer = Color(0xFF001F26) +internal val md_theme_light_secondary = Color(0xFF00696E) +internal val md_theme_light_onSecondary = Color(0xFFFFFFFF) +internal val md_theme_light_secondaryContainer = Color(0xFF6FF6FE) +internal val md_theme_light_onSecondaryContainer = Color(0xFF002022) +internal val md_theme_light_tertiary = Color(0xFF904D00) +internal val md_theme_light_onTertiary = Color(0xFFFFFFFF) +internal val md_theme_light_tertiaryContainer = Color(0xFFFFDCC2) +internal val md_theme_light_onTertiaryContainer = Color(0xFF2E1500) +internal val md_theme_light_error = Color(0xFFBA1A1A) +internal val md_theme_light_errorContainer = Color(0xFFFFDAD6) +internal val md_theme_light_onError = Color(0xFFFFFFFF) +internal val md_theme_light_onErrorContainer = Color(0xFF410002) +internal val md_theme_light_background = Color(0xFFFFFBFF) +internal val md_theme_light_onBackground = Color(0xFF221B00) +internal val md_theme_light_surface = Color(0xFFFFFBFF) +internal val md_theme_light_onSurface = Color(0xFF221B00) +internal val md_theme_light_surfaceVariant = Color(0xFFDBE4E7) +internal val md_theme_light_onSurfaceVariant = Color(0xFF3F484B) +internal val md_theme_light_outline = Color(0xFF70797B) +internal val md_theme_light_inverseOnSurface = Color(0xFFFFF0C0) +internal val md_theme_light_inverseSurface = Color(0xFF3A3000) +internal val md_theme_light_inversePrimary = Color(0xFF55D6F4) +internal val md_theme_light_shadow = Color(0xFF000000) +internal val md_theme_light_surfaceTint = Color(0xFF00687A) +internal val md_theme_light_outlineVariant = Color(0xFFBFC8CB) +internal val md_theme_light_scrim = Color(0xFF000000) + +// Dark Theme Colors +internal val md_theme_dark_primary = Color(0xFF55D6F4) +internal val md_theme_dark_onPrimary = Color(0xFF003640) +internal val md_theme_dark_primaryContainer = Color(0xFF004E5C) +internal val md_theme_dark_onPrimaryContainer = Color(0xFFABEDFF) +internal val md_theme_dark_secondary = Color(0xFF4CD9E2) +internal val md_theme_dark_onSecondary = Color(0xFF00373A) +internal val md_theme_dark_secondaryContainer = Color(0xFF004F53) +internal val md_theme_dark_onSecondaryContainer = Color(0xFF6FF6FE) +internal val md_theme_dark_tertiary = Color(0xFFFFB77C) +internal val md_theme_dark_onTertiary = Color(0xFF4D2700) +internal val md_theme_dark_tertiaryContainer = Color(0xFF6D3900) +internal val md_theme_dark_onTertiaryContainer = Color(0xFFFFDCC2) +internal val md_theme_dark_error = Color(0xFFFFB4AB) +internal val md_theme_dark_errorContainer = Color(0xFF93000A) +internal val md_theme_dark_onError = Color(0xFF690005) +internal val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) +internal val md_theme_dark_background = Color(0xFF221B00) +internal val md_theme_dark_onBackground = Color(0xFFFFE264) +internal val md_theme_dark_surface = Color(0xFF221B00) +internal val md_theme_dark_onSurface = Color(0xFFFFE264) +internal val md_theme_dark_surfaceVariant = Color(0xFF3F484B) +internal val md_theme_dark_onSurfaceVariant = Color(0xFFBFC8CB) +internal val md_theme_dark_outline = Color(0xFF899295) +internal val md_theme_dark_inverseOnSurface = Color(0xFF221B00) +internal val md_theme_dark_inverseSurface = Color(0xFFFFE264) +internal val md_theme_dark_inversePrimary = Color(0xFF00687A) +internal val md_theme_dark_shadow = Color(0xFF000000) +internal val md_theme_dark_surfaceTint = Color(0xFF55D6F4) +internal val md_theme_dark_outlineVariant = Color(0xFF3F484B) +internal val md_theme_dark_scrim = Color(0xFF000000) + +// Seed color for dynamic theming +internal val seed = Color(0xFF2C3639) diff --git a/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt b/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt new file mode 100644 index 000000000..f16f5ba17 --- /dev/null +++ b/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt @@ -0,0 +1,107 @@ +package com.xef.xefMobile.theme.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.graphics.Color + +// Define custom colors +val CustomButtonColor = Color(0xFF01A2D1) +val CustomSliderThumbColor = Color(0xFF03DAC5) +val CustomSliderTrackColor = Color(0xFF018786) + +private val LightColorScheme = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, +) + +private val DarkColorScheme = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, +) + +internal val LocalThemeIsDark = compositionLocalOf { mutableStateOf(true) } + +val LocalCustomColors = staticCompositionLocalOf { CustomColors() } + +data class CustomColors( + val buttonColor: Color = CustomButtonColor, + val sliderThumbColor: Color = CustomSliderThumbColor, + val sliderTrackColor: Color = CustomSliderTrackColor +) + +@Composable +internal fun AppTheme( + content: @Composable () -> Unit +) { + val systemIsDark = isSystemInDarkTheme() + val isDarkState = remember { mutableStateOf(systemIsDark) } + CompositionLocalProvider( + LocalThemeIsDark provides isDarkState, + LocalCustomColors provides CustomColors() + ) { + val isDark by isDarkState + //com.xef.xefMobile.theme.SystemAppearance(isDark) + MaterialTheme( + colorScheme = if (isDark) DarkColorScheme else LightColorScheme, + content = { Surface(content = content) } + ) + } +} + +//@Composable +//internal expect fun SystemAppearance(isDark: Boolean) diff --git a/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt b/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt new file mode 100644 index 000000000..136caf75c --- /dev/null +++ b/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt @@ -0,0 +1,45 @@ +package org.xef.xefMobile + +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.test.ExperimentalTestApi +import androidx.compose.ui.test.assertTextEquals +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.runComposeUiTest +import kotlin.test.Test + +@OptIn(ExperimentalTestApi::class) +class ComposeTest { + + @Test + fun simpleCheck() = runComposeUiTest { + setContent { + var txt by remember { mutableStateOf("Go") } + Column { + Text( + text = txt, + modifier = Modifier.testTag("t_text") + ) + Button( + onClick = { txt += "." }, + modifier = Modifier.testTag("t_button") + ) { + Text("click me") + } + } + } + + onNodeWithTag("t_button").apply { + repeat(3) { performClick() } + } + onNodeWithTag("t_text").assertTextEquals("Go...") + } +} \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/main/res/drawable/chat_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/chat_24px.xml new file mode 100644 index 000000000..0163a0e13 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/chat_24px.xml @@ -0,0 +1,11 @@ + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/home_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/home_24px.xml new file mode 100644 index 000000000..bb05c6154 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/home_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/logout_24dp_fill0_wght400_grad0_opsz24.xml b/server/xefMobile/composeApp/src/main/res/drawable/logout_24dp_fill0_wght400_grad0_opsz24.xml new file mode 100644 index 000000000..65d9baa89 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/logout_24dp_fill0_wght400_grad0_opsz24.xml @@ -0,0 +1,9 @@ + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/school_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/school_24px.xml new file mode 100644 index 000000000..2d1038e2e --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/school_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/settings_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/settings_24px.xml new file mode 100644 index 000000000..90bc79bea --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/settings_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/smart_toy_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/smart_toy_24px.xml new file mode 100644 index 000000000..7382f2168 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/smart_toy_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/source_environment_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/source_environment_24px.xml new file mode 100644 index 000000000..3707dc440 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/source_environment_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/support_agent_24px.xml b/server/xefMobile/composeApp/src/main/res/drawable/support_agent_24px.xml new file mode 100644 index 000000000..9c57a03f5 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/support_agent_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_icon.xml b/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_icon.xml new file mode 100644 index 000000000..ca0f226f1 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_icon.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name.xml b/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name.xml new file mode 100644 index 000000000..756bb5129 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name_white.xml b/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name_white.xml new file mode 100644 index 000000000..db77eab35 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/xef_brand_name_white.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/server/xefMobile/composeApp/src/main/res/font/montserrat_bold.ttf b/server/xefMobile/composeApp/src/main/res/font/montserrat_bold.ttf new file mode 100644 index 000000000..e69de29bb diff --git a/server/xefMobile/composeApp/src/main/res/font/montserrat_regular.ttf b/server/xefMobile/composeApp/src/main/res/font/montserrat_regular.ttf new file mode 100644 index 000000000..e69de29bb diff --git a/server/xefMobile/composeApp/src/main/res/xml/network_security_config.xml b/server/xefMobile/composeApp/src/main/res/xml/network_security_config.xml new file mode 100644 index 000000000..f18e1f040 --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/xml/network_security_config.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/server/xefMobile/gradle.properties b/server/xefMobile/gradle.properties new file mode 100644 index 000000000..8eee6ee5c --- /dev/null +++ b/server/xefMobile/gradle.properties @@ -0,0 +1,19 @@ +#Gradle +org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4G" +org.gradle.caching=true +org.gradle.configuration-cache=true +org.gradle.daemon=true +org.gradle.parallel=true + +#Kotlin +kotlin.code.style=official +kotlin.js.compiler=ir + +#Android +android.useAndroidX=true +android.nonTransitiveRClass=true + +#Compose +org.jetbrains.compose.experimental.uikit.enabled=true +org.jetbrains.compose.experimental.jscanvas.enabled=true +org.jetbrains.compose.experimental.wasm.enabled=true diff --git a/server/xefMobile/gradle/libs.versions.toml b/server/xefMobile/gradle/libs.versions.toml new file mode 100644 index 000000000..68760a056 --- /dev/null +++ b/server/xefMobile/gradle/libs.versions.toml @@ -0,0 +1,52 @@ +[versions] + +kotlin = "2.0.0-RC2" +compose = "1.6.10-rc01" +agp = "8.2.2" +androidx-activityCompose = "1.9.0" +androidx-uiTest = "1.6.7" +voyager = "1.0.0" +composeImageLoader = "1.7.8" +napier = "2.7.1" +buildConfig = "4.1.1" +kotlinx-coroutines = "1.8.1" +ktor = "2.3.9" +kotlinx-serialization = "1.6.3" +multiplatformSettings = "1.1.1" +compose-compiler = "1.5.10.2" +navigationCompose = "2.7.7" + +[libraries] + +androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" } +androidx-testManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-uiTest" } +androidx-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-uiTest" } +voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" } +composeImageLoader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "composeImageLoader" } +napier = { module = "io.github.aakira:napier", version.ref = "napier" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } +kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } +kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" } +kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } +ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } +ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" } +ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" } +ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" } +ktor-client-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktor" } +ktor-client-winhttp = { module = "io.ktor:ktor-client-winhttp", version.ref = "ktor" } +kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } +multiplatformSettings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatformSettings" } +compose-compiler = { module = "org.jetbrains.compose.compiler:compiler", version.ref = "compose-compiler" } +ktor-client-serialization = { module = "io.ktor:ktor-client-serialization-jvm", version.ref = "ktor" } +ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" } +ktor-client-json = { module = "io.ktor:ktor-client-json", version.ref = "ktor" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } + +[plugins] + +multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +compose = { id = "org.jetbrains.compose", version.ref = "compose" } +android-application = { id = "com.android.application", version.ref = "agp" } +buildConfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildConfig" } +kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } \ No newline at end of file diff --git a/server/xefMobile/gradle/wrapper/gradle-wrapper.jar b/server/xefMobile/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/server/xefMobile/gradlew.bat b/server/xefMobile/gradlew.bat new file mode 100644 index 000000000..5c2a58c72 --- /dev/null +++ b/server/xefMobile/gradlew.bat @@ -0,0 +1,93 @@ + +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/server/xefMobile/settings.gradle.kts b/server/xefMobile/settings.gradle.kts new file mode 100644 index 000000000..799f08823 --- /dev/null +++ b/server/xefMobile/settings.gradle.kts @@ -0,0 +1,17 @@ +rootProject.name = "xefMobile" +include(":composeApp") + +pluginManagement { + repositories { + google() + gradlePluginPortal() + mavenCentral() + } +} + +dependencyResolutionManagement { + repositories { + google() + mavenCentral() + } +} From 8576e725fbee623915d071803d71f281f02f2a11 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Mon, 27 May 2024 16:22:30 +0200 Subject: [PATCH 03/30] Upload files, settings OpenAiKey, auth fixes --- ...tlin-compiler-12236840344353816343.salive} | 0 .../src/androidMain/AndroidManifest.xml | 1 + .../kotlin/com/xef/xefMobile/MainLayout.kt | 21 +++-- .../kotlin/com/xef/xefMobile/XefAndroidApp.kt | 6 ++ .../ui/composable/FilePickerDialog.kt | 7 +- .../xefMobile/ui/screens/SettingsScreen.kt | 86 +++++++++++++++++++ .../ui/screens/menu/AssistantScreen.kt | 26 +++--- .../ui/screens/menu/CreateAssistantScreen.kt | 29 ++++--- .../xefMobile/ui/viewmodels/AuthViewModel.kt | 9 +- .../src/main/res/drawable/save_24dp.xml | 9 ++ 10 files changed, 155 insertions(+), 39 deletions(-) rename server/xefMobile/.kotlin/sessions/{kotlin-compiler-859541645610285268.salive => kotlin-compiler-12236840344353816343.salive} (100%) create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt create mode 100644 server/xefMobile/composeApp/src/main/res/drawable/save_24dp.xml diff --git a/server/xefMobile/.kotlin/sessions/kotlin-compiler-859541645610285268.salive b/server/xefMobile/.kotlin/sessions/kotlin-compiler-12236840344353816343.salive similarity index 100% rename from server/xefMobile/.kotlin/sessions/kotlin-compiler-859541645610285268.salive rename to server/xefMobile/.kotlin/sessions/kotlin-compiler-12236840344353816343.salive diff --git a/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml b/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml index c6670f1a1..b64793594 100644 --- a/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml +++ b/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml @@ -1,6 +1,7 @@ + Unit, customColors: CustomColors, - onFilesSelected: () -> Unit // Callback for when files are selected + onFilesSelected: () -> Unit ) { val viewModel: PathViewModel = viewModel() val state = viewModel.state @@ -65,7 +64,7 @@ fun FilePickerDialog( fontWeight = FontWeight.Bold ) Spacer(modifier = Modifier.height(8.dp)) - HorizontalDivider() + Divider() } }, text = { diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt new file mode 100644 index 000000000..312733d5c --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt @@ -0,0 +1,86 @@ +package com.xef.xefMobile.ui.screens + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.navigation.NavController +import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import kotlinx.coroutines.launch +import org.xef.xefMobile.R + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SettingsScreen(navController: NavController, authViewModel: IAuthViewModel) { + var apiKey by remember { mutableStateOf("") } + val coroutineScope = rememberCoroutineScope() + val customColors = Color(0xFFADD8E6) + val CustomTextBlue = Color(0xFF0199D7) + + Box( + modifier = Modifier + .fillMaxSize() + .background(Color.White) + .padding(16.dp) + ) { + Column( + modifier = Modifier.align(Alignment.Center), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text( + text = "Settings", + fontSize = 24.sp, + fontWeight = FontWeight.Bold, + color = Color.Black + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "These are xef-server settings.", + fontSize = 16.sp, + color = Color.Gray + ) + Spacer(modifier = Modifier.height(16.dp)) + TextField( + value = apiKey, + onValueChange = { apiKey = it }, + label = { Text("OpenAI API key") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(16.dp)) + Button( + onClick = { + coroutineScope.launch { + // Handle saving the API key + // Example: authViewModel.saveApiKey(apiKey) + } + }, + colors = ButtonDefaults.buttonColors(containerColor = customColors), + modifier = Modifier.fillMaxWidth() + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center + ) { + Image( + painter = painterResource(id = R.drawable.save_24dp), + contentDescription = "save settings icon", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + Spacer(modifier = Modifier.width(8.dp)) + Text(text = "Save Settings", color = CustomTextBlue) + } + } + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt index defee5364..22ff013c9 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt @@ -81,21 +81,19 @@ fun AssistantScreen(navController: NavController, authViewModel: IAuthViewModel) Spacer(modifier = Modifier.height(8.dp)) } } + } - Button( - onClick = { navController.navigate(Screens.CreateAssistant.screen) }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ), - modifier = Modifier - .align(Alignment.BottomCenter) - .padding(16.dp) - ) { - Text(text = "Create New Assistant") - } + Button( + onClick = { navController.navigate(Screens.CreateAssistant.screen) }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ), + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(16.dp) + ) { + Text(text = "Create New Assistant") } } } - - diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 0527f6fbd..c782e31d7 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -17,13 +17,12 @@ import androidx.compose.ui.unit.sp import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController import com.server.movile.xef.android.ui.themes.LocalCustomColors - +import com.xef.xefMobile.ui.composable.FilePickerDialog class CreateAssistantActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { - // Pass the NavController to CreateAssistantScreen val navController = rememberNavController() CreateAssistantScreen(navController) } @@ -43,6 +42,7 @@ fun CreateAssistantScreen(navController: NavController) { val list = listOf("gpt-4o", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } + var showFilePicker by remember { mutableStateOf(false) } val customColors = LocalCustomColors.current @@ -121,14 +121,14 @@ fun CreateAssistantScreen(navController: NavController) { } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { - OutlinedButton( - onClick = { /* handle cancel */ }, + TextButton( + onClick = { showFilePicker = true }, colors = ButtonDefaults.outlinedButtonColors( containerColor = Color.Transparent, contentColor = customColors.buttonColor ) ) { - Text("File Search") + Text("File Search +") } Spacer(modifier = Modifier.weight(1f)) Switch( @@ -142,14 +142,14 @@ fun CreateAssistantScreen(navController: NavController) { } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { - OutlinedButton( + TextButton( onClick = { /* handle cancel */ }, colors = ButtonDefaults.outlinedButtonColors( containerColor = Color.Transparent, contentColor = customColors.buttonColor ) ) { - Text("Code Interpreter") + Text("Code Interpreter +") } Spacer(modifier = Modifier.weight(1f)) Switch( @@ -163,14 +163,14 @@ fun CreateAssistantScreen(navController: NavController) { } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { - OutlinedButton( + TextButton( onClick = { /* handle cancel */ }, colors = ButtonDefaults.outlinedButtonColors( containerColor = Color.Transparent, contentColor = customColors.buttonColor ) ) { - Text("Functions") + Text("Functions +") } Spacer(modifier = Modifier.weight(1f)) } @@ -214,6 +214,16 @@ fun CreateAssistantScreen(navController: NavController) { } } } + if (showFilePicker) { + FilePickerDialog( + onDismissRequest = { showFilePicker = false }, + customColors = customColors, + onFilesSelected = { + // Handle file selection here if needed + showFilePicker = false + } + ) + } } } @@ -264,7 +274,6 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U @Preview(showBackground = false) @Composable fun CreateAssistantScreenPreview() { - // Create a mock NavController for the preview val navController = rememberNavController() CreateAssistantScreen(navController) } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt index 1bd88b147..67684fa1a 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt @@ -53,7 +53,6 @@ class AuthViewModel( }.firstOrNull() _authToken.value = token - token?.let { loadUserName() } @@ -76,7 +75,7 @@ class AuthViewModel( try { val loginResponse = apiService.loginUser(loginRequest) updateAuthToken(loginResponse.authToken) - updateUserName(loginResponse.user.name) // Extract user's name + updateUserName(loginResponse.user.name) _authToken.value = loginResponse.authToken _userName.value = loginResponse.user.name } catch (e: Exception) { @@ -110,7 +109,7 @@ class AuthViewModel( try { val registerResponse = apiService.registerUser(request) updateAuthToken(registerResponse.authToken) - updateUserName(name) // Directly use the name provided during registration + updateUserName(name) _authToken.value = registerResponse.authToken _userName.value = name } catch (e: Exception) { @@ -135,11 +134,11 @@ class AuthViewModel( withContext(Dispatchers.IO) { dataStore.edit { preferences -> preferences.remove(stringPreferencesKey("authToken")) - preferences.remove(stringPreferencesKey("userName")) // Add this line + preferences.remove(stringPreferencesKey("userName")) } } _authToken.postValue(null) - _userName.postValue(null) // Add this line + _userName.postValue(null) _errorMessage.postValue("Logged out successfully") } catch (e: Exception) { _errorMessage.postValue("Failed to sign out") diff --git a/server/xefMobile/composeApp/src/main/res/drawable/save_24dp.xml b/server/xefMobile/composeApp/src/main/res/drawable/save_24dp.xml new file mode 100644 index 000000000..6fc751aef --- /dev/null +++ b/server/xefMobile/composeApp/src/main/res/drawable/save_24dp.xml @@ -0,0 +1,9 @@ + + + From e8e32283e1b85b98158d0f6422fb2ed1de4b9345 Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Tue, 28 May 2024 08:11:27 +0000 Subject: [PATCH 04/30] Apply spotless formatting --- .../xef/server/http/routes/AssistantRoutes.kt | 26 +- .../kotlin/com/xef/xefMobile/MainActivity.kt | 14 +- .../kotlin/com/xef/xefMobile/MainLayout.kt | 436 ++++++++---------- .../kotlin/com/xef/xefMobile/XefAndroidApp.kt | 79 ++-- .../com/xef/xefMobile/model/AssistantModel.kt | 11 +- .../xefMobile/model/AuthenticationModels.kt | 31 +- .../xefMobile/network/client/HttpClient.kt | 19 +- .../com/xef/xefMobile/services/ApiService.kt | 84 ++-- .../services/UserRepositoryService.kt | 41 +- .../com/xef/xefMobile/theme/Theme.android.kt | 14 +- .../ui/composable/FilePickerDialog.kt | 210 ++++----- .../xefMobile/ui/composable/UriPathFinder.kt | 157 +++---- .../xef/xefMobile/ui/navigation/Navigation.kt | 28 +- .../ui/screens/FilePicker/PathScreenState.kt | 5 +- .../xef/xefMobile/ui/screens/LoginScreen.kt | 156 ++++--- .../xefMobile/ui/screens/RegisterScreen.kt | 189 ++++---- .../com/xef/xefMobile/ui/screens/Screens.kt | 32 +- .../xefMobile/ui/screens/SettingsScreen.kt | 100 ++-- .../ui/screens/menu/AssistantScreen.kt | 123 +++-- .../ui/screens/menu/CreateAssistantScreen.kt | 435 +++++++++-------- .../navigationdrawercompose/HomeScreen.kt | 40 +- .../navigationdrawercompose/MenuItem.kt | 10 +- .../com/xef/xefMobile/ui/themes/Theme.kt | 48 +- .../com/xef/xefMobile/ui/themes/Type.kt | 25 +- .../xefMobile/ui/viewmodels/AuthViewModel.kt | 201 ++++---- .../xefMobile/ui/viewmodels/IAuthViewModel.kt | 18 +- .../xefMobile/ui/viewmodels/PathViewModel.kt | 40 +- .../com/xef/xefMobile/theme/theme/Theme.kt | 50 +- .../kotlin/org/xef/xefMobile/ComposeTest.kt | 36 +- 29 files changed, 1268 insertions(+), 1390 deletions(-) diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt index 5784679fe..1ebfc4ac6 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt @@ -14,7 +14,7 @@ import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.server.routing.* -fun Routing.assistantRoutes(logger: KLogger) { +fun Routing.assistantRoutes(logger: KLogger) { authenticate("auth-bearer") { post("/v1/settings/assistants") { try { @@ -23,7 +23,7 @@ fun Routing.assistantRoutes(logger: KLogger) { val request = call.receive() val assistant = Assistant(request) val response = assistant.get() - logger.info{"Created assistant: ${response.name} with id: ${response.id}"} + logger.info { "Created assistant: ${response.name} with id: ${response.id}" } call.respond(status = HttpStatusCode.Created, response) } else { call.respond( @@ -42,13 +42,12 @@ fun Routing.assistantRoutes(logger: KLogger) { val token = call.getToken() val openAI = OpenAI(Config(token = token.value), logRequests = true) val assistantsApi = openAI.assistants - val response = assistantsApi.listAssistants(configure = { - header("OpenAI-Beta", "assistants=v2") - }) + val response = + assistantsApi.listAssistants(configure = { header("OpenAI-Beta", "assistants=v2") }) call.respond(HttpStatusCode.OK, response) } catch (e: Exception) { val trace = e.stackTraceToString() - logger.error{"Error creating assistant: $trace"} + logger.error { "Error creating assistant: $trace" } call.respond(HttpStatusCode.BadRequest, "Invalid request: $trace") } } @@ -65,7 +64,7 @@ fun Routing.assistantRoutes(logger: KLogger) { } val assistant = Assistant(id) val response = assistant.modify(request).get() - logger.info{"Modified assistant: ${response.name} with id: ${response.id}"} + logger.info { "Modified assistant: ${response.name} with id: ${response.id}" } call.respond(HttpStatusCode.OK, response) } else { call.respond( @@ -75,7 +74,7 @@ fun Routing.assistantRoutes(logger: KLogger) { } } catch (e: Exception) { val trace = e.stackTraceToString() - logger.error{"Error modifying assistant: $trace"} + logger.error { "Error modifying assistant: $trace" } call.respond(HttpStatusCode.BadRequest, "Invalid request: $trace") } } @@ -91,16 +90,15 @@ fun Routing.assistantRoutes(logger: KLogger) { val openAI = OpenAI(Config(token = token.value), logRequests = true) val assistantsApi = openAI.assistants val assistant = assistantsApi.getAssistant(id) - val response = assistantsApi.deleteAssistant(id, configure = { - header("OpenAI-Beta", "assistants=v2") - }) - logger.info{"Deleted assistant: ${assistant.name} with id: ${response.id}"} + val response = + assistantsApi.deleteAssistant(id, configure = { header("OpenAI-Beta", "assistants=v2") }) + logger.info { "Deleted assistant: ${assistant.name} with id: ${response.id}" } call.respond(status = HttpStatusCode.NoContent, response) } catch (e: Exception) { val trace = e.stackTraceToString() - logger.error{"Error deleting assistant: $trace"} + logger.error { "Error deleting assistant: $trace" } call.respond(HttpStatusCode.BadRequest, "Invalid request: $trace") } } } -} \ No newline at end of file +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt index cb9e66be7..6278e6be5 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt @@ -7,14 +7,12 @@ import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.xef.xefMobile.services.ApiService class MainActivity : ComponentActivity() { - private lateinit var authViewModel: AuthViewModel + private lateinit var authViewModel: AuthViewModel - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - authViewModel = AuthViewModel(this, ApiService()) + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + authViewModel = AuthViewModel(this, ApiService()) - setContent { - XefAndroidApp(authViewModel = authViewModel) - } - } + setContent { XefAndroidApp(authViewModel = authViewModel) } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt index c13cdb7a7..b44593808 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt @@ -1,7 +1,6 @@ package com.xef.xefMobile import android.annotation.SuppressLint -import android.widget.Toast import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -22,259 +21,218 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import com.xef.xefMobile.ui.screens.Screens import kotlinx.coroutines.launch import org.xef.xefMobile.R -import com.xef.xefMobile.ui.screens.Screens @OptIn(ExperimentalMaterial3Api::class) @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @Composable fun MainLayout( - navController: NavController, - authViewModel: IAuthViewModel, - userName: String, - content: @Composable () -> Unit + navController: NavController, + authViewModel: IAuthViewModel, + userName: String, + content: @Composable () -> Unit ) { - val coroutineScope = rememberCoroutineScope() - val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) - val CustomLightBlue = Color(0xFFADD8E6) - val CustomTextBlue = Color(0xFF0199D7) - val context = LocalContext.current + val coroutineScope = rememberCoroutineScope() + val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) + val CustomLightBlue = Color(0xFFADD8E6) + val CustomTextBlue = Color(0xFF0199D7) + val context = LocalContext.current - val authToken by authViewModel.authToken.observeAsState() + val authToken by authViewModel.authToken.observeAsState() - LaunchedEffect(authToken) { - if (authToken == null) { - navController.navigate(Screens.Login.screen) { - popUpTo(0) { - inclusive = true - } - } - } + LaunchedEffect(authToken) { + if (authToken == null) { + navController.navigate(Screens.Login.screen) { popUpTo(0) { inclusive = true } } } + } - ModalNavigationDrawer( - drawerState = drawerState, - gesturesEnabled = true, - drawerContent = { - ModalDrawerSheet { - Box( - modifier = Modifier - .background(CustomLightBlue) - .fillMaxWidth() - .height(100.dp) - ) { - Image( - painter = painterResource(id = R.drawable.xef_brand_name), - contentDescription = "Logo", - modifier = Modifier - .size(150.dp) - .align(Alignment.Center) - ) - } - HorizontalDivider() + ModalNavigationDrawer( + drawerState = drawerState, + gesturesEnabled = true, + drawerContent = { + ModalDrawerSheet { + Box(modifier = Modifier.background(CustomLightBlue).fillMaxWidth().height(100.dp)) { + Image( + painter = painterResource(id = R.drawable.xef_brand_name), + contentDescription = "Logo", + modifier = Modifier.size(150.dp).align(Alignment.Center) + ) + } + HorizontalDivider() - NavigationDrawerItem( - label = { Text(text = "Home", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.home_24px), - contentDescription = "home", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Home.screen) { - popUpTo(0) - } - } - ) - NavigationDrawerItem( - label = { Text(text = "Organizations", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.source_environment_24px), - contentDescription = "organizations", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Organizations.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Assistants", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.smart_toy_24px), - contentDescription = "assistants", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Assistants.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Projects", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.school_24px), - contentDescription = "projects", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Projects.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Chat", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.chat_24px), - contentDescription = "chat", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Chat.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Generic question", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.support_agent_24px), - contentDescription = "generic question", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.GenericQuestion.screen) { - popUpTo(0) - } - }) - NavigationDrawerItem( - label = { Text(text = "Settings", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.settings_24px), - contentDescription = "settings", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - navController.navigate(Screens.Settings.screen) { - popUpTo(0) - } - }) + NavigationDrawerItem( + label = { Text(text = "Home", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.home_24px), + contentDescription = "home", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { drawerState.close() } + navController.navigate(Screens.Home.screen) { popUpTo(0) } + } + ) + NavigationDrawerItem( + label = { Text(text = "Organizations", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.source_environment_24px), + contentDescription = "organizations", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { drawerState.close() } + navController.navigate(Screens.Organizations.screen) { popUpTo(0) } + } + ) + NavigationDrawerItem( + label = { Text(text = "Assistants", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.smart_toy_24px), + contentDescription = "assistants", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { drawerState.close() } + navController.navigate(Screens.Assistants.screen) { popUpTo(0) } + } + ) + NavigationDrawerItem( + label = { Text(text = "Projects", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.school_24px), + contentDescription = "projects", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { drawerState.close() } + navController.navigate(Screens.Projects.screen) { popUpTo(0) } + } + ) + NavigationDrawerItem( + label = { Text(text = "Chat", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.chat_24px), + contentDescription = "chat", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { drawerState.close() } + navController.navigate(Screens.Chat.screen) { popUpTo(0) } + } + ) + NavigationDrawerItem( + label = { Text(text = "Generic question", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.support_agent_24px), + contentDescription = "generic question", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { drawerState.close() } + navController.navigate(Screens.GenericQuestion.screen) { popUpTo(0) } + } + ) + NavigationDrawerItem( + label = { Text(text = "Settings", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.settings_24px), + contentDescription = "settings", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { drawerState.close() } + navController.navigate(Screens.Settings.screen) { popUpTo(0) } + } + ) - Spacer(modifier = Modifier.weight(1f)) - NavigationDrawerItem( - label = { Text(text = "Logout", color = CustomTextBlue) }, - selected = false, - icon = { - Image( - painter = painterResource(id = R.drawable.logout_24dp_fill0_wght400_grad0_opsz24), - contentDescription = "logout", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - }, - onClick = { - coroutineScope.launch { - drawerState.close() - } - authViewModel.logout() - }) + Spacer(modifier = Modifier.weight(1f)) + NavigationDrawerItem( + label = { Text(text = "Logout", color = CustomTextBlue) }, + selected = false, + icon = { + Image( + painter = painterResource(id = R.drawable.logout_24dp_fill0_wght400_grad0_opsz24), + contentDescription = "logout", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + }, + onClick = { + coroutineScope.launch { drawerState.close() } + authViewModel.logout() + } + ) + } + }, + ) { + Scaffold( + topBar = { + TopAppBar( + title = { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier.fillMaxWidth() + ) { + Image( + painter = painterResource(id = R.drawable.xef_brand_name_white), + contentDescription = "Logo", + modifier = Modifier.size(60.dp) + ) + Spacer(modifier = Modifier.weight(1f)) + Text( + text = userName, + color = Color.White, + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.padding(end = 16.dp) + ) } - }, - ) { - Scaffold( - topBar = { - TopAppBar( - title = { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween, - modifier = Modifier.fillMaxWidth() - ) { - Image( - painter = painterResource(id = R.drawable.xef_brand_name_white), - contentDescription = "Logo", - modifier = Modifier.size(60.dp) - ) - Spacer(modifier = Modifier.weight(1f)) - Text( - text = userName, - color = Color.White, - style = MaterialTheme.typography.bodyLarge, - modifier = Modifier.padding(end = 16.dp) - ) - } - }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = CustomLightBlue, - titleContentColor = Color.White, - navigationIconContentColor = Color.White - ), - navigationIcon = { - IconButton(onClick = { - coroutineScope.launch { - drawerState.open() - } - }) { - Icon( - Icons.Rounded.Menu, contentDescription = "MenuButton" - ) - } - }, - ) - } - ) { - Box(modifier = Modifier.padding(it)) { - content() + }, + colors = + TopAppBarDefaults.topAppBarColors( + containerColor = CustomLightBlue, + titleContentColor = Color.White, + navigationIconContentColor = Color.White + ), + navigationIcon = { + IconButton(onClick = { coroutineScope.launch { drawerState.open() } }) { + Icon(Icons.Rounded.Menu, contentDescription = "MenuButton") } - } + }, + ) + } + ) { + Box(modifier = Modifier.padding(it)) { content() } } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt index a376757a5..bdc0d2c00 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt @@ -23,41 +23,52 @@ import com.xef.xefMobile.ui.screens.SettingsScreen @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @Composable fun XefAndroidApp(authViewModel: IAuthViewModel) { - val navigationController = rememberNavController() - val userName by authViewModel.userName.observeAsState("") + val navigationController = rememberNavController() + val userName by authViewModel.userName.observeAsState("") - NavHost( + NavHost( + navController = navigationController, + startDestination = Screens.Login.screen, + modifier = Modifier.padding(top = 16.dp) + ) { + composable(Screens.Login.screen) { LoginScreen(authViewModel, navigationController) } + composable(Screens.Register.screen) { RegisterScreen(authViewModel, navigationController) } + composable(Screens.Home.screen) { + MainLayout( navController = navigationController, - startDestination = Screens.Login.screen, - modifier = Modifier.padding(top = 16.dp) - ) { - composable(Screens.Login.screen) { - LoginScreen(authViewModel, navigationController) - } - composable(Screens.Register.screen) { - RegisterScreen(authViewModel, navigationController) - } - composable(Screens.Home.screen) { - MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { - HomeScreen(authViewModel, navigationController) - } - } - composable(Screens.Assistants.screen) { - MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { - AssistantScreen(navigationController, authViewModel) - } - } - composable(Screens.CreateAssistant.screen) { - MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { - CreateAssistantScreen(navigationController) - } - } - composable(Screens.Settings.screen) { - MainLayout(navController = navigationController, authViewModel = authViewModel, userName = userName.orEmpty()) { - SettingsScreen(navigationController, authViewModel) - } - } - // ... other composable screens ... + authViewModel = authViewModel, + userName = userName.orEmpty() + ) { + HomeScreen(authViewModel, navigationController) + } } + composable(Screens.Assistants.screen) { + MainLayout( + navController = navigationController, + authViewModel = authViewModel, + userName = userName.orEmpty() + ) { + AssistantScreen(navigationController, authViewModel) + } + } + composable(Screens.CreateAssistant.screen) { + MainLayout( + navController = navigationController, + authViewModel = authViewModel, + userName = userName.orEmpty() + ) { + CreateAssistantScreen(navigationController) + } + } + composable(Screens.Settings.screen) { + MainLayout( + navController = navigationController, + authViewModel = authViewModel, + userName = userName.orEmpty() + ) { + SettingsScreen(navigationController, authViewModel) + } + } + // ... other composable screens ... + } } - diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt index 668bb97d4..6a8e331b9 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -2,13 +2,6 @@ package com.xef.xefMobile.model import kotlinx.serialization.Serializable -@Serializable -data class Assistant( - val id: String, - val name: String -) +@Serializable data class Assistant(val id: String, val name: String) -@Serializable -data class AssistantsResponse( - val data: List -) +@Serializable data class AssistantsResponse(val data: List) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt index 3b4a8fcf7..2c5a8b234 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AuthenticationModels.kt @@ -2,33 +2,12 @@ package com.xef.xefMobile.model import kotlinx.serialization.Serializable -@Serializable -data class RegisterRequest( - val name: String, - val email: String, - val password: String -) +@Serializable data class RegisterRequest(val name: String, val email: String, val password: String) -@Serializable -data class RegisterResponse( +@Serializable data class RegisterResponse(val authToken: String) - val authToken: String -) +@Serializable data class LoginRequest(val email: String, val password: String) -@Serializable -data class LoginRequest( - val email: String, - val password: String -) +@Serializable data class LoginResponse(val authToken: String, val user: UserResponse) -@Serializable -data class LoginResponse( - val authToken: String, - val user: UserResponse -) - -@Serializable -data class UserResponse( - val id: Int, - val name: String -) \ No newline at end of file +@Serializable data class UserResponse(val id: Int, val name: String) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt index 4de2a18d5..abeecabf2 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt @@ -7,13 +7,16 @@ import io.ktor.serialization.kotlinx.json.* import kotlinx.serialization.json.Json object HttpClientProvider { - val client: HttpClient = HttpClient(Android) { - install(ContentNegotiation) { - json(Json { - ignoreUnknownKeys = true - isLenient = true - prettyPrint = true - }) - } + val client: HttpClient = + HttpClient(Android) { + install(ContentNegotiation) { + json( + Json { + ignoreUnknownKeys = true + isLenient = true + prettyPrint = true + } + ) + } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index fa1fb1f0b..ce92f4db2 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -10,52 +10,56 @@ import io.ktor.http.* class ApiService { - suspend fun registerUser(request: RegisterRequest): RegisterResponse { - return try { - HttpClientProvider.client.post { - url("http://10.0.2.2:8081/register") - contentType(ContentType.Application.Json) - setBody(request) - }.body() - } catch (e: Exception) { - Log.e("ApiService", "Register failed: ${e.message}", e) - throw e + suspend fun registerUser(request: RegisterRequest): RegisterResponse { + return try { + HttpClientProvider.client + .post { + url("http://10.0.2.2:8081/register") + contentType(ContentType.Application.Json) + setBody(request) } + .body() + } catch (e: Exception) { + Log.e("ApiService", "Register failed: ${e.message}", e) + throw e } + } - suspend fun loginUser(request: LoginRequest): LoginResponse { - return try { - val response: HttpResponse = HttpClientProvider.client.post { - url("http://10.0.2.2:8081/login") - contentType(ContentType.Application.Json) - setBody(request) - } - - val responseBody: String = response.bodyAsText() - Log.d("ApiService", "Login response body: $responseBody") - - response.body() - } catch (e: Exception) { - Log.e("ApiService", "Login failed: ${e.message}", e) - throw e + suspend fun loginUser(request: LoginRequest): LoginResponse { + return try { + val response: HttpResponse = + HttpClientProvider.client.post { + url("http://10.0.2.2:8081/login") + contentType(ContentType.Application.Json) + setBody(request) } + + val responseBody: String = response.bodyAsText() + Log.d("ApiService", "Login response body: $responseBody") + + response.body() + } catch (e: Exception) { + Log.e("ApiService", "Login failed: ${e.message}", e) + throw e } + } - suspend fun getAssistants(authToken: String): AssistantsResponse { - return try { - val response: HttpResponse = HttpClientProvider.client.get { - url("http://10.0.2.2:8081/v1/settings/assistants") - header(HttpHeaders.Authorization, "Bearer $authToken") - header("OpenAI-Beta", "assistants=v1") - } - - val responseBody: String = response.bodyAsText() - Log.d("ApiService", "Assistants response body: $responseBody") - - response.body() - } catch (e: Exception) { - Log.e("ApiService", "Fetching assistants failed: ${e.message}", e) - throw e + suspend fun getAssistants(authToken: String): AssistantsResponse { + return try { + val response: HttpResponse = + HttpClientProvider.client.get { + url("http://10.0.2.2:8081/v1/settings/assistants") + header(HttpHeaders.Authorization, "Bearer $authToken") + header("OpenAI-Beta", "assistants=v1") } + + val responseBody: String = response.bodyAsText() + Log.d("ApiService", "Assistants response body: $responseBody") + + response.body() + } catch (e: Exception) { + Log.e("ApiService", "Fetching assistants failed: ${e.message}", e) + throw e } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt index 9cda93716..53ec7d408 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/UserRepositoryService.kt @@ -4,32 +4,41 @@ import com.xef.xefMobile.model.LoginRequest import com.xef.xefMobile.model.LoginResponse import com.xef.xefMobile.model.RegisterRequest import com.xef.xefMobile.model.RegisterResponse +import com.xef.xefMobile.network.client.HttpClientProvider import io.ktor.client.call.* import io.ktor.client.request.* import io.ktor.http.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.json.Json -import com.xef.xefMobile.network.client.HttpClientProvider class UserRepositoryService { - private val client = HttpClientProvider.client - private val baseUrl = "https://api.miservidor.com" - private val json = Json { isLenient = true; ignoreUnknownKeys = true } + private val client = HttpClientProvider.client + private val baseUrl = "https://api.miservidor.com" + private val json = Json { + isLenient = true + ignoreUnknownKeys = true + } - suspend fun register(request: RegisterRequest): RegisterResponse = withContext(Dispatchers.IO) { - client.post { - url("$baseUrl/register") - contentType(ContentType.Application.Json) - setBody(request) - }.body() + suspend fun register(request: RegisterRequest): RegisterResponse = + withContext(Dispatchers.IO) { + client + .post { + url("$baseUrl/register") + contentType(ContentType.Application.Json) + setBody(request) + } + .body() } - suspend fun login(request: LoginRequest): LoginResponse = withContext(Dispatchers.IO) { - client.post { - url("$baseUrl/login") - contentType(ContentType.Application.Json) - setBody(request) - }.body() + suspend fun login(request: LoginRequest): LoginResponse = + withContext(Dispatchers.IO) { + client + .post { + url("$baseUrl/login") + contentType(ContentType.Application.Json) + setBody(request) + } + .body() } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt index 92bf160bd..0f23712b5 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/theme/Theme.android.kt @@ -8,12 +8,12 @@ import androidx.core.view.WindowInsetsControllerCompat @Composable internal fun SystemAppearance(isDark: Boolean) { - val view = LocalView.current - LaunchedEffect(isDark) { - val window = (view.context as Activity).window - WindowInsetsControllerCompat(window, window.decorView).apply { - isAppearanceLightStatusBars = !isDark - isAppearanceLightNavigationBars = !isDark - } + val view = LocalView.current + LaunchedEffect(isDark) { + val window = (view.context as Activity).window + WindowInsetsControllerCompat(window, window.decorView).apply { + isAppearanceLightStatusBars = !isDark + isAppearanceLightNavigationBars = !isDark } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt index da2166d55..72ef7ab80 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -24,129 +24,117 @@ import com.xef.xefMobile.ui.viewmodels.PathViewModel @OptIn(ExperimentalPermissionsApi::class) @Composable fun FilePickerDialog( - onDismissRequest: () -> Unit, - customColors: CustomColors, - onFilesSelected: () -> Unit + onDismissRequest: () -> Unit, + customColors: CustomColors, + onFilesSelected: () -> Unit ) { - val viewModel: PathViewModel = viewModel() - val state = viewModel.state - val context = LocalContext.current + val viewModel: PathViewModel = viewModel() + val state = viewModel.state + val context = LocalContext.current - val permissionState = rememberPermissionState( - permission = android.Manifest.permission.READ_EXTERNAL_STORAGE - ) + val permissionState = + rememberPermissionState(permission = android.Manifest.permission.READ_EXTERNAL_STORAGE) - var selectedFile by remember { mutableStateOf(null) } + var selectedFile by remember { mutableStateOf(null) } - SideEffect { - if (!permissionState.status.isGranted) { - permissionState.launchPermissionRequest() - } + SideEffect { + if (!permissionState.status.isGranted) { + permissionState.launchPermissionRequest() } + } - val filePickerLauncher = rememberLauncherForActivityResult( - contract = ActivityResultContracts.GetMultipleContents(), - onResult = { uris -> - viewModel.onFilePathsListChange(uris, context) - if (uris.isNotEmpty()) { - onFilesSelected() // Call the callback when files are selected - selectedFile = state.filePaths.firstOrNull() - } + val filePickerLauncher = + rememberLauncherForActivityResult( + contract = ActivityResultContracts.GetMultipleContents(), + onResult = { uris -> + viewModel.onFilePathsListChange(uris, context) + if (uris.isNotEmpty()) { + onFilesSelected() // Call the callback when files are selected + selectedFile = state.filePaths.firstOrNull() } + } ) - AlertDialog( - onDismissRequest = onDismissRequest, - title = { - Column(horizontalAlignment = Alignment.CenterHorizontally) { + AlertDialog( + onDismissRequest = onDismissRequest, + title = { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text(text = "Selected Files", fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(8.dp)) + Divider() + } + }, + text = { + Column( + modifier = Modifier.fillMaxSize().padding(15.dp), + verticalArrangement = Arrangement.SpaceEvenly, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Box( + modifier = Modifier.fillMaxWidth().fillMaxHeight(0.76f), + contentAlignment = Alignment.Center + ) { + if (state.filePaths.isEmpty()) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(text = "No files selected") + } + } else { + LazyColumn { + items(state.filePaths) { path -> Text( - text = "Selected Files", - fontWeight = FontWeight.Bold + text = path, + modifier = + Modifier.fillMaxWidth().clickable { selectedFile = path }.padding(8.dp), + color = if (selectedFile == path) Color.Blue else Color.Unspecified ) - Spacer(modifier = Modifier.height(8.dp)) - Divider() - } - }, - text = { - Column( - modifier = Modifier - .fillMaxSize() - .padding(15.dp), - verticalArrangement = Arrangement.SpaceEvenly, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Box( - modifier = Modifier - .fillMaxWidth() - .fillMaxHeight(0.76f), - contentAlignment = Alignment.Center - ) { - if (state.filePaths.isEmpty()) { - Box( - modifier = Modifier - .fillMaxSize(), - contentAlignment = Alignment.Center - ) { - Text(text = "No files selected") - } - } else { - LazyColumn { - items(state.filePaths) { path -> - Text( - text = path, - modifier = Modifier - .fillMaxWidth() - .clickable { - selectedFile = path - } - .padding(8.dp), - color = if (selectedFile == path) Color.Blue else Color.Unspecified - ) - } - } - } - } - OutlinedButton( - onClick = { - if (permissionState.status.isGranted) { - filePickerLauncher.launch("*/*") - } else { - permissionState.launchPermissionRequest() - } - }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text(text = "Browse files") - } - if (selectedFile != null) { - OutlinedButton( - onClick = { - viewModel.removeFilePath(selectedFile!!) - selectedFile = null - }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text(text = "Remove") - } - } + } } - }, - confirmButton = { - Button( - onClick = { onDismissRequest() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) - ) { - Text("Done") + } + } + OutlinedButton( + onClick = { + if (permissionState.status.isGranted) { + filePickerLauncher.launch("*/*") + } else { + permissionState.launchPermissionRequest() } + }, + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text(text = "Browse files") } - ) + if (selectedFile != null) { + OutlinedButton( + onClick = { + viewModel.removeFilePath(selectedFile!!) + selectedFile = null + }, + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text(text = "Remove") + } + } + } + }, + confirmButton = { + Button( + onClick = { onDismissRequest() }, + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text("Done") + } + } + ) } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt index 2c59cf416..d6eba6bda 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt @@ -4,7 +4,6 @@ import android.content.ContentUris import android.content.Context import android.database.Cursor import android.net.Uri -import android.os.Build import android.os.Environment import android.provider.DocumentsContract import android.provider.MediaStore @@ -12,92 +11,96 @@ import java.lang.NumberFormatException class UriPathFinder { - fun getPath(context: Context, uri: Uri): String? { - return when { - DocumentsContract.isDocumentUri(context, uri) -> { - when { - isExternalStorageDocument(uri) -> handleExternalStorageDocument(uri) - isDownloadsDocument(uri) -> handleDownloadsDocument(context, uri) - isMediaDocument(uri) -> handleMediaDocument(context, uri) - else -> null - } - } - "content".equals(uri.scheme, ignoreCase = true) -> getDataColumn(context, uri, null, null) - "file".equals(uri.scheme, ignoreCase = true) -> uri.path - else -> null + fun getPath(context: Context, uri: Uri): String? { + return when { + DocumentsContract.isDocumentUri(context, uri) -> { + when { + isExternalStorageDocument(uri) -> handleExternalStorageDocument(uri) + isDownloadsDocument(uri) -> handleDownloadsDocument(context, uri) + isMediaDocument(uri) -> handleMediaDocument(context, uri) + else -> null } + } + "content".equals(uri.scheme, ignoreCase = true) -> getDataColumn(context, uri, null, null) + "file".equals(uri.scheme, ignoreCase = true) -> uri.path + else -> null } + } - private fun handleExternalStorageDocument(uri: Uri): String? { - val docId = DocumentsContract.getDocumentId(uri) - val split = docId.split(":").toTypedArray() - val type = split[0] - return if ("primary".equals(type, ignoreCase = true)) { - Environment.getExternalStorageDirectory().toString() + "/" + split[1] - } else { - // Handle non-primary volumes (e.g., "content://com.android.externalstorage.documents/document/primary:...") - val storageDefinition = System.getenv("SECONDARY_STORAGE")?.split(":") - storageDefinition?.find { it.contains(type) }?.let { "$it/${split[1]}" } - } + private fun handleExternalStorageDocument(uri: Uri): String? { + val docId = DocumentsContract.getDocumentId(uri) + val split = docId.split(":").toTypedArray() + val type = split[0] + return if ("primary".equals(type, ignoreCase = true)) { + Environment.getExternalStorageDirectory().toString() + "/" + split[1] + } else { + // Handle non-primary volumes (e.g., + // "content://com.android.externalstorage.documents/document/primary:...") + val storageDefinition = System.getenv("SECONDARY_STORAGE")?.split(":") + storageDefinition?.find { it.contains(type) }?.let { "$it/${split[1]}" } } + } - private fun handleDownloadsDocument(context: Context, uri: Uri): String? { - val id = DocumentsContract.getDocumentId(uri) - return try { - val contentUri = ContentUris.withAppendedId( - Uri.parse("content://downloads/public_downloads"), - java.lang.Long.valueOf(id) - ) - getDataColumn(context, contentUri, null, null) - } catch (e: NumberFormatException) { - // Handle the case where the id is not a pure number - null - } + private fun handleDownloadsDocument(context: Context, uri: Uri): String? { + val id = DocumentsContract.getDocumentId(uri) + return try { + val contentUri = + ContentUris.withAppendedId( + Uri.parse("content://downloads/public_downloads"), + java.lang.Long.valueOf(id) + ) + getDataColumn(context, contentUri, null, null) + } catch (e: NumberFormatException) { + // Handle the case where the id is not a pure number + null } + } - private fun handleMediaDocument(context: Context, uri: Uri): String? { - val docId = DocumentsContract.getDocumentId(uri) - val split = docId.split(":").toTypedArray() - val type = split[0] - val contentUri: Uri? = when (type) { - "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI - "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI - "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI - else -> null - } - val selection = "_id=?" - val selectionArgs = arrayOf(split[1]) - return getDataColumn(context, contentUri, selection, selectionArgs) - } + private fun handleMediaDocument(context: Context, uri: Uri): String? { + val docId = DocumentsContract.getDocumentId(uri) + val split = docId.split(":").toTypedArray() + val type = split[0] + val contentUri: Uri? = + when (type) { + "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI + "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + else -> null + } + val selection = "_id=?" + val selectionArgs = arrayOf(split[1]) + return getDataColumn(context, contentUri, selection, selectionArgs) + } - private fun getDataColumn( - context: Context, - uri: Uri?, - selection: String?, - selectionArgs: Array? - ): String? { - val cursor: Cursor? = uri?.let { - context.contentResolver.query(it, arrayOf("_data"), selection, selectionArgs, null) - } - return cursor?.use { - if (it.moveToFirst()) { - val columnIndex: Int = it.getColumnIndexOrThrow("_data") - it.getString(columnIndex) - } else { - null - } - } + private fun getDataColumn( + context: Context, + uri: Uri?, + selection: String?, + selectionArgs: Array? + ): String? { + val cursor: Cursor? = + uri?.let { + context.contentResolver.query(it, arrayOf("_data"), selection, selectionArgs, null) + } + return cursor?.use { + if (it.moveToFirst()) { + val columnIndex: Int = it.getColumnIndexOrThrow("_data") + it.getString(columnIndex) + } else { + null + } } + } - private fun isExternalStorageDocument(uri: Uri): Boolean { - return "com.android.externalstorage.documents" == uri.authority - } + private fun isExternalStorageDocument(uri: Uri): Boolean { + return "com.android.externalstorage.documents" == uri.authority + } - private fun isDownloadsDocument(uri: Uri): Boolean { - return "com.android.providers.downloads.documents" == uri.authority - } + private fun isDownloadsDocument(uri: Uri): Boolean { + return "com.android.providers.downloads.documents" == uri.authority + } - private fun isMediaDocument(uri: Uri): Boolean { - return "com.android.providers.media.documents" == uri.authority - } + private fun isMediaDocument(uri: Uri): Boolean { + return "com.android.providers.media.documents" == uri.authority + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt index d54a113de..ef4b14032 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt @@ -13,19 +13,19 @@ import com.xef.xefMobile.ui.screens.Screens @Composable fun AppNavigator(authViewModel: IAuthViewModel) { - val navController = rememberNavController() - NavHost(navController = navController, startDestination = Screens.Login.screen) { - composable(Screens.Login.screen) { - LoginScreen(authViewModel = authViewModel, navController = navController) - } - composable(Screens.Register.screen) { - RegisterScreen(authViewModel = authViewModel, navController = navController) - } - composable(Screens.Assistants.screen) { - AssistantScreen(navController = navController, authViewModel = authViewModel) - } - composable(Screens.CreateAssistant.screen) { - CreateAssistantScreen(navController = navController) - } + val navController = rememberNavController() + NavHost(navController = navController, startDestination = Screens.Login.screen) { + composable(Screens.Login.screen) { + LoginScreen(authViewModel = authViewModel, navController = navController) } + composable(Screens.Register.screen) { + RegisterScreen(authViewModel = authViewModel, navController = navController) + } + composable(Screens.Assistants.screen) { + AssistantScreen(navController = navController, authViewModel = authViewModel) + } + composable(Screens.CreateAssistant.screen) { + CreateAssistantScreen(navController = navController) + } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt index 18d10e543..d5ecc72fa 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/FilePicker/PathScreenState.kt @@ -1,6 +1,3 @@ package com.xef.xefMobile.ui.screens.FilePicker -data class PathScreenState( - val filePaths:List = emptyList() - -) +data class PathScreenState(val filePaths: List = emptyList()) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt index 11b567156..af9fd6fbb 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.* -import androidx.navigation.NavController import androidx.compose.runtime.* import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Alignment @@ -16,95 +15,94 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.navigation.NavController import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.xef.xefMobile.ui.screens.Screens @OptIn(ExperimentalMaterial3Api::class) @Composable fun LoginScreen(authViewModel: IAuthViewModel, navController: NavController) { - val authToken by authViewModel.authToken.observeAsState() - var email by remember { mutableStateOf("") } - var password by remember { mutableStateOf("") } - var errorMessage by remember { mutableStateOf(null) } + val authToken by authViewModel.authToken.observeAsState() + var email by remember { mutableStateOf("") } + var password by remember { mutableStateOf("") } + var errorMessage by remember { mutableStateOf(null) } - LaunchedEffect(authToken) { - if (authToken != null) { - Log.d("LoginScreen", "Navigation to Start Screen") - navController.navigate(Screens.Home.screen) { - popUpTo(Screens.Login.screen) { inclusive = true } - } - } + LaunchedEffect(authToken) { + if (authToken != null) { + Log.d("LoginScreen", "Navigation to Start Screen") + navController.navigate(Screens.Home.screen) { + popUpTo(Screens.Login.screen) { inclusive = true } + } } + } - Column( - modifier = Modifier - .fillMaxSize() - .background(Color.White), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - Text( - text = "Xef Server", - fontSize = 24.sp, - textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(16.dp)) + Column( + modifier = Modifier.fillMaxSize().background(Color.White), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text( + text = "Xef Server", + fontSize = 24.sp, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(16.dp)) - if (errorMessage != null) { - Text(text = errorMessage!!, color = Color.Red, textAlign = TextAlign.Center) - Spacer(modifier = Modifier.height(8.dp)) - } + if (errorMessage != null) { + Text(text = errorMessage!!, color = Color.Red, textAlign = TextAlign.Center) + Spacer(modifier = Modifier.height(8.dp)) + } - OutlinedTextField( - value = email, - onValueChange = { email = it }, - label = { Text("Email") }, - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email) - ) - Spacer(modifier = Modifier.height(8.dp)) - OutlinedTextField( - value = password, - onValueChange = { password = it }, - label = { Text("Password") }, - visualTransformation = PasswordVisualTransformation(), - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) - ) - Spacer(modifier = Modifier.height(16.dp)) - Button( - onClick = { - when { - email.isBlank() -> { - errorMessage = "Email field is empty" - Log.d("LoginScreen", "Email field is empty") - } - password.isBlank() -> { - errorMessage = "Password field is empty" - Log.d("LoginScreen", "Password field is empty") - } - else -> { - errorMessage = null - authViewModel.login(email = email, password = password) - Log.d("LoginScreen", "Login button pressed") - } - } - }, - modifier = Modifier.width(200.dp), - colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF009688)) - ) { - Text("Login") - } - Spacer(modifier = Modifier.height(8.dp)) - TextButton( - onClick = { - navController.navigate(Screens.Register.screen) - Log.d("LoginScreen", "Navigate to Register Screen") - }, - modifier = Modifier.fillMaxWidth() - ) { - Text("Create An Account") + OutlinedTextField( + value = email, + onValueChange = { email = it }, + label = { Text("Email") }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email) + ) + Spacer(modifier = Modifier.height(8.dp)) + OutlinedTextField( + value = password, + onValueChange = { password = it }, + label = { Text("Password") }, + visualTransformation = PasswordVisualTransformation(), + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) + ) + Spacer(modifier = Modifier.height(16.dp)) + Button( + onClick = { + when { + email.isBlank() -> { + errorMessage = "Email field is empty" + Log.d("LoginScreen", "Email field is empty") + } + password.isBlank() -> { + errorMessage = "Password field is empty" + Log.d("LoginScreen", "Password field is empty") + } + else -> { + errorMessage = null + authViewModel.login(email = email, password = password) + Log.d("LoginScreen", "Login button pressed") + } } + }, + modifier = Modifier.width(200.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF009688)) + ) { + Text("Login") + } + Spacer(modifier = Modifier.height(8.dp)) + TextButton( + onClick = { + navController.navigate(Screens.Register.screen) + Log.d("LoginScreen", "Navigate to Register Screen") + }, + modifier = Modifier.fillMaxWidth() + ) { + Text("Create An Account") } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt index a84df0346..d03b674c2 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt @@ -3,7 +3,6 @@ package com.server.movile.xef.android.ui.screens import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.foundation.text.KeyboardOptions -import androidx.navigation.NavController import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.runtime.livedata.observeAsState @@ -15,111 +14,111 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.navigation.NavController import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.xef.xefMobile.ui.screens.Screens @OptIn(ExperimentalMaterial3Api::class) @Composable fun RegisterScreen(authViewModel: IAuthViewModel, navController: NavController) { - var errorMessage by remember { mutableStateOf(null) } - val authToken by authViewModel.authToken.observeAsState() + var errorMessage by remember { mutableStateOf(null) } + val authToken by authViewModel.authToken.observeAsState() - LaunchedEffect(authToken) { - if (authToken != null) { - navController.navigate(Screens.Login.screen) { - popUpTo(Screens.Register.screen) { inclusive = true } - } - } + LaunchedEffect(authToken) { + if (authToken != null) { + navController.navigate(Screens.Login.screen) { + popUpTo(Screens.Register.screen) { inclusive = true } + } } + } - Column( - modifier = Modifier - .fillMaxSize() - .background(Color.White), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - Text( - text = "Xef Server", - fontSize = 30.sp, - textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = "Create an account", - fontSize = 24.sp, - textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(16.dp)) - var name by remember { mutableStateOf("") } - var email by remember { mutableStateOf("") } - var password by remember { mutableStateOf("") } - var rePassword by remember { mutableStateOf("") } + Column( + modifier = Modifier.fillMaxSize().background(Color.White), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text( + text = "Xef Server", + fontSize = 30.sp, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "Create an account", + fontSize = 24.sp, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(16.dp)) + var name by remember { mutableStateOf("") } + var email by remember { mutableStateOf("") } + var password by remember { mutableStateOf("") } + var rePassword by remember { mutableStateOf("") } - OutlinedTextField( - value = name, - onValueChange = { name = it }, - label = { Text("Name") }, - singleLine = true - ) - Spacer(modifier = Modifier.height(8.dp)) - OutlinedTextField( - value = email, - onValueChange = { email = it }, - label = { Text("Email") }, - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email) - ) - Spacer(modifier = Modifier.height(8.dp)) - OutlinedTextField( - value = password, - onValueChange = { password = it }, - label = { Text("Password") }, - visualTransformation = PasswordVisualTransformation(), - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) - ) - Spacer(modifier = Modifier.height(8.dp)) - OutlinedTextField( - value = rePassword, - onValueChange = { rePassword = it }, - label = { Text("Re-Password") }, - visualTransformation = PasswordVisualTransformation(), - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) - ) - Spacer(modifier = Modifier.height(16.dp)) - errorMessage?.let { - Text(text = it, color = Color.Red, style = MaterialTheme.typography.bodyLarge) - Spacer(modifier = Modifier.height(8.dp)) - } + OutlinedTextField( + value = name, + onValueChange = { name = it }, + label = { Text("Name") }, + singleLine = true + ) + Spacer(modifier = Modifier.height(8.dp)) + OutlinedTextField( + value = email, + onValueChange = { email = it }, + label = { Text("Email") }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email) + ) + Spacer(modifier = Modifier.height(8.dp)) + OutlinedTextField( + value = password, + onValueChange = { password = it }, + label = { Text("Password") }, + visualTransformation = PasswordVisualTransformation(), + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) + ) + Spacer(modifier = Modifier.height(8.dp)) + OutlinedTextField( + value = rePassword, + onValueChange = { rePassword = it }, + label = { Text("Re-Password") }, + visualTransformation = PasswordVisualTransformation(), + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password) + ) + Spacer(modifier = Modifier.height(16.dp)) + errorMessage?.let { + Text(text = it, color = Color.Red, style = MaterialTheme.typography.bodyLarge) + Spacer(modifier = Modifier.height(8.dp)) + } - Button( - onClick = { - errorMessage = when { - name.isBlank() -> "Name is empty" - email.isBlank() -> "Email is empty" - password.isEmpty() -> "Password is empty" - password != rePassword -> "Passwords do not match" - else -> null - } - if (errorMessage == null) { - authViewModel.register(name, email, password) - } - }, - modifier = Modifier.width(200.dp), - colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF009688)) - ) { - Text("Create Account") - } - Spacer(modifier = Modifier.height(8.dp)) - TextButton( - onClick = { navController.navigate(Screens.Login.screen) }, - modifier = Modifier.fillMaxWidth() - ) { - Text("Back") + Button( + onClick = { + errorMessage = + when { + name.isBlank() -> "Name is empty" + email.isBlank() -> "Email is empty" + password.isEmpty() -> "Password is empty" + password != rePassword -> "Passwords do not match" + else -> null + } + if (errorMessage == null) { + authViewModel.register(name, email, password) } + }, + modifier = Modifier.width(200.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF009688)) + ) { + Text("Create Account") + } + Spacer(modifier = Modifier.height(8.dp)) + TextButton( + onClick = { navController.navigate(Screens.Login.screen) }, + modifier = Modifier.fillMaxWidth() + ) { + Text("Back") } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt index d64384395..351e12c1a 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt @@ -1,15 +1,25 @@ package com.xef.xefMobile.ui.screens sealed class Screens(val screen: String) { - object Login : Screens("loginScreen") - object Register : Screens("registerScreen") - object Start : Screens("startScreen") - object Home : Screens("homeScreen") - object Organizations : Screens("organizationsScreen") - object Assistants : Screens("assistantsScreen") - object Projects : Screens("projectsScreen") - object Chat : Screens("chatScreen") - object GenericQuestion : Screens("genericQuestionScreen") - object Settings : Screens("settingsScreen") - object CreateAssistant : Screens("createAssistantScreen") + object Login : Screens("loginScreen") + + object Register : Screens("registerScreen") + + object Start : Screens("startScreen") + + object Home : Screens("homeScreen") + + object Organizations : Screens("organizationsScreen") + + object Assistants : Screens("assistantsScreen") + + object Projects : Screens("projectsScreen") + + object Chat : Screens("chatScreen") + + object GenericQuestion : Screens("genericQuestionScreen") + + object Settings : Screens("settingsScreen") + + object CreateAssistant : Screens("createAssistantScreen") } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt index 312733d5c..d8f29f58c 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt @@ -21,66 +21,52 @@ import org.xef.xefMobile.R @OptIn(ExperimentalMaterial3Api::class) @Composable fun SettingsScreen(navController: NavController, authViewModel: IAuthViewModel) { - var apiKey by remember { mutableStateOf("") } - val coroutineScope = rememberCoroutineScope() - val customColors = Color(0xFFADD8E6) - val CustomTextBlue = Color(0xFF0199D7) + var apiKey by remember { mutableStateOf("") } + val coroutineScope = rememberCoroutineScope() + val customColors = Color(0xFFADD8E6) + val CustomTextBlue = Color(0xFF0199D7) - Box( - modifier = Modifier - .fillMaxSize() - .background(Color.White) - .padding(16.dp) + Box(modifier = Modifier.fillMaxSize().background(Color.White).padding(16.dp)) { + Column( + modifier = Modifier.align(Alignment.Center), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center ) { - Column( - modifier = Modifier.align(Alignment.Center), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center + Text(text = "Settings", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = Color.Black) + Spacer(modifier = Modifier.height(8.dp)) + Text(text = "These are xef-server settings.", fontSize = 16.sp, color = Color.Gray) + Spacer(modifier = Modifier.height(16.dp)) + TextField( + value = apiKey, + onValueChange = { apiKey = it }, + label = { Text("OpenAI API key") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(16.dp)) + Button( + onClick = { + coroutineScope.launch { + // Handle saving the API key + // Example: authViewModel.saveApiKey(apiKey) + } + }, + colors = ButtonDefaults.buttonColors(containerColor = customColors), + modifier = Modifier.fillMaxWidth() + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center ) { - Text( - text = "Settings", - fontSize = 24.sp, - fontWeight = FontWeight.Bold, - color = Color.Black - ) - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = "These are xef-server settings.", - fontSize = 16.sp, - color = Color.Gray - ) - Spacer(modifier = Modifier.height(16.dp)) - TextField( - value = apiKey, - onValueChange = { apiKey = it }, - label = { Text("OpenAI API key") }, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(16.dp)) - Button( - onClick = { - coroutineScope.launch { - // Handle saving the API key - // Example: authViewModel.saveApiKey(apiKey) - } - }, - colors = ButtonDefaults.buttonColors(containerColor = customColors), - modifier = Modifier.fillMaxWidth() - ) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center - ) { - Image( - painter = painterResource(id = R.drawable.save_24dp), - contentDescription = "save settings icon", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - Spacer(modifier = Modifier.width(8.dp)) - Text(text = "Save Settings", color = CustomTextBlue) - } - } + Image( + painter = painterResource(id = R.drawable.save_24dp), + contentDescription = "save settings icon", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + Spacer(modifier = Modifier.width(8.dp)) + Text(text = "Save Settings", color = CustomTextBlue) } + } } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt index 22ff013c9..7b139862e 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt @@ -6,12 +6,9 @@ import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import androidx.navigation.compose.rememberNavController -import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.xef.xefMobile.model.Assistant import com.xef.xefMobile.services.ApiService @@ -21,79 +18,69 @@ import kotlinx.coroutines.launch @Composable fun AssistantScreen(navController: NavController, authViewModel: IAuthViewModel) { - val customColors = LocalCustomColors.current - val coroutineScope = rememberCoroutineScope() - var assistants by remember { mutableStateOf>(emptyList()) } - var loading by remember { mutableStateOf(true) } - var errorMessage by remember { mutableStateOf(null) } + val customColors = LocalCustomColors.current + val coroutineScope = rememberCoroutineScope() + var assistants by remember { mutableStateOf>(emptyList()) } + var loading by remember { mutableStateOf(true) } + var errorMessage by remember { mutableStateOf(null) } - val authToken = authViewModel.authToken.value ?: error("Auth token not found") + val authToken = authViewModel.authToken.value ?: error("Auth token not found") - LaunchedEffect(Unit) { - coroutineScope.launch { - try { - val response = ApiService().getAssistants(authToken) - assistants = response.data - } catch (e: Exception) { - errorMessage = "Failed to load assistants" - } finally { - loading = false - } - } + LaunchedEffect(Unit) { + coroutineScope.launch { + try { + val response = ApiService().getAssistants(authToken) + assistants = response.data + } catch (e: Exception) { + errorMessage = "Failed to load assistants" + } finally { + loading = false + } } + } - Box(modifier = Modifier.fillMaxSize()) { - if (loading) { - CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) - } else if (errorMessage != null) { - Text( - text = errorMessage!!, - color = MaterialTheme.colorScheme.error, - modifier = Modifier.align(Alignment.Center) - ) - } else { - Column( - modifier = Modifier - .align(Alignment.TopCenter) - .padding(20.dp), - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text( - text = "Assistants", - fontWeight = FontWeight.Bold, - fontSize = 24.sp, - ) - HorizontalDivider( - modifier = Modifier - .fillMaxWidth() - .padding(top = 8.dp) - ) + Box(modifier = Modifier.fillMaxSize()) { + if (loading) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else if (errorMessage != null) { + Text( + text = errorMessage!!, + color = MaterialTheme.colorScheme.error, + modifier = Modifier.align(Alignment.Center) + ) + } else { + Column( + modifier = Modifier.align(Alignment.TopCenter).padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = "Assistants", + fontWeight = FontWeight.Bold, + fontSize = 24.sp, + ) + HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) - Spacer(modifier = Modifier.height(16.dp)) + Spacer(modifier = Modifier.height(16.dp)) - assistants.forEach { assistant -> - Text( - text = assistant.name, - fontWeight = FontWeight.Bold + assistants.forEach { assistant -> + Text(text = assistant.name, fontWeight = FontWeight.Bold) - ) - Text(text = assistant.id) - Spacer(modifier = Modifier.height(8.dp)) - } - } + Text(text = assistant.id) + Spacer(modifier = Modifier.height(8.dp)) } + } + } - Button( - onClick = { navController.navigate(Screens.CreateAssistant.screen) }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ), - modifier = Modifier - .align(Alignment.BottomCenter) - .padding(16.dp) - ) { - Text(text = "Create New Assistant") - } + Button( + onClick = { navController.navigate(Screens.CreateAssistant.screen) }, + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ), + modifier = Modifier.align(Alignment.BottomCenter).padding(16.dp) + ) { + Text(text = "Create New Assistant") } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index c782e31d7..f6ed8fea8 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -20,260 +20,243 @@ import com.server.movile.xef.android.ui.themes.LocalCustomColors import com.xef.xefMobile.ui.composable.FilePickerDialog class CreateAssistantActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContent { - val navController = rememberNavController() - CreateAssistantScreen(navController) - } + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + val navController = rememberNavController() + CreateAssistantScreen(navController) } + } } @OptIn(ExperimentalMaterial3Api::class) @Composable fun CreateAssistantScreen(navController: NavController) { - var name by remember { mutableStateOf("") } - var instructions by remember { mutableStateOf("") } - var temperature by remember { mutableStateOf(1f) } - var topP by remember { mutableStateOf(1f) } - var fileSearchEnabled by remember { mutableStateOf(false) } - var codeInterpreterEnabled by remember { mutableStateOf(false) } - var model by remember { mutableStateOf("gpt-4-turbo") } - val list = listOf("gpt-4o", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") - var isExpanded by remember { mutableStateOf(false) } - var selectedText by remember { mutableStateOf(list[0]) } - var showFilePicker by remember { mutableStateOf(false) } + var name by remember { mutableStateOf("") } + var instructions by remember { mutableStateOf("") } + var temperature by remember { mutableStateOf(1f) } + var topP by remember { mutableStateOf(1f) } + var fileSearchEnabled by remember { mutableStateOf(false) } + var codeInterpreterEnabled by remember { mutableStateOf(false) } + var model by remember { mutableStateOf("gpt-4-turbo") } + val list = listOf("gpt-4o", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") + var isExpanded by remember { mutableStateOf(false) } + var selectedText by remember { mutableStateOf(list[0]) } + var showFilePicker by remember { mutableStateOf(false) } - val customColors = LocalCustomColors.current + val customColors = LocalCustomColors.current - Box(modifier = Modifier.fillMaxSize()) { - Column( - modifier = Modifier - .padding(8.dp) - .fillMaxSize(), - horizontalAlignment = Alignment.CenterHorizontally + Box(modifier = Modifier.fillMaxSize()) { + Column( + modifier = Modifier.padding(8.dp).fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text(text = "Create Assistant", fontSize = 24.sp, modifier = Modifier.padding(bottom = 16.dp)) + + TextField( + value = name, + onValueChange = { name = it }, + label = { Text("Name") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(8.dp)) + TextField( + value = instructions, + onValueChange = { instructions = it }, + label = { Text("Instructions") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(8.dp)) + Column( + modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + ExposedDropdownMenuBox( + expanded = isExpanded, + onExpandedChange = { isExpanded = !isExpanded }, + modifier = Modifier.fillMaxWidth() ) { - Text( - text = "Create Assistant", - fontSize = 24.sp, - modifier = Modifier.padding(bottom = 16.dp) - ) + TextField( + modifier = Modifier.fillMaxWidth().menuAnchor(), + value = selectedText, + onValueChange = {}, + readOnly = true, + trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) } + ) + ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { + list.forEachIndexed { index, text -> + DropdownMenuItem( + text = { Text(text = text) }, + onClick = { + selectedText = list[index] + isExpanded = false + }, + contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding + ) + } + } + } + } + Spacer(modifier = Modifier.height(12.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text(text = "TOOLS") - TextField( - value = name, - onValueChange = { name = it }, - label = { Text("Name") }, - modifier = Modifier.fillMaxWidth() + HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 10.dp)) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + TextButton( + onClick = { showFilePicker = true }, + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text("File Search +") + } + Spacer(modifier = Modifier.weight(1f)) + Switch( + checked = fileSearchEnabled, + onCheckedChange = { fileSearchEnabled = it }, + colors = + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor ) - Spacer(modifier = Modifier.height(8.dp)) - TextField( - value = instructions, - onValueChange = { instructions = it }, - label = { Text("Instructions") }, - modifier = Modifier.fillMaxWidth() + ) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + TextButton( + onClick = { /* handle cancel */}, + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor ) - Spacer(modifier = Modifier.height(8.dp)) - Column( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 8.dp), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - ExposedDropdownMenuBox( - expanded = isExpanded, - onExpandedChange = { isExpanded = !isExpanded }, - modifier = Modifier.fillMaxWidth() - ) { - TextField( - modifier = Modifier - .fillMaxWidth() - .menuAnchor(), - value = selectedText, - onValueChange = {}, - readOnly = true, - trailingIcon = { - ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) - } - ) - ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { - list.forEachIndexed { index, text -> - DropdownMenuItem( - text = { Text(text = text) }, - onClick = { - selectedText = list[index] - isExpanded = false - }, - contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding - ) - } - } - } - } - Spacer(modifier = Modifier.height(12.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - Text(text = "TOOLS") - - HorizontalDivider( - modifier = Modifier - .fillMaxWidth() - .padding(top = 10.dp) - ) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - TextButton( - onClick = { showFilePicker = true }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text("File Search +") - } - Spacer(modifier = Modifier.weight(1f)) - Switch( - checked = fileSearchEnabled, - onCheckedChange = { fileSearchEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) - ) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - TextButton( - onClick = { /* handle cancel */ }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text("Code Interpreter +") - } - Spacer(modifier = Modifier.weight(1f)) - Switch( - checked = codeInterpreterEnabled, - onCheckedChange = { codeInterpreterEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) - ) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - TextButton( - onClick = { /* handle cancel */ }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text("Functions +") - } - Spacer(modifier = Modifier.weight(1f)) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - Text(text = "MODEL CONFIGURATION") + ) { + Text("Code Interpreter +") + } + Spacer(modifier = Modifier.weight(1f)) + Switch( + checked = codeInterpreterEnabled, + onCheckedChange = { codeInterpreterEnabled = it }, + colors = + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) + ) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + TextButton( + onClick = { /* handle cancel */}, + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text("Functions +") + } + Spacer(modifier = Modifier.weight(1f)) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text(text = "MODEL CONFIGURATION") - HorizontalDivider( - modifier = Modifier - .fillMaxWidth() - .padding(top = 8.dp) - ) - } - Spacer(modifier = Modifier.width(8.dp)) - AssistantFloatField(label = "Temperature", value = temperature, onValueChange = { temperature = it }) + HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) + } + Spacer(modifier = Modifier.width(8.dp)) + AssistantFloatField( + label = "Temperature", + value = temperature, + onValueChange = { temperature = it } + ) - AssistantFloatField(label = "Top P", value = topP, onValueChange = { topP = it }) + AssistantFloatField(label = "Top P", value = topP, onValueChange = { topP = it }) - Row( - horizontalArrangement = Arrangement.Center, - modifier = Modifier.fillMaxWidth() - ) { - Button( - onClick = { navController.navigateUp() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) - ) { - Text("Cancel") - } - Spacer(modifier = Modifier.width(8.dp)) - Button( - onClick = { /* handle create */ }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) - ) { - Text("Create") - } - } + Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { + Button( + onClick = { navController.navigateUp() }, + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text("Cancel") } - if (showFilePicker) { - FilePickerDialog( - onDismissRequest = { showFilePicker = false }, - customColors = customColors, - onFilesSelected = { - // Handle file selection here if needed - showFilePicker = false - } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { /* handle create */}, + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary ) + ) { + Text("Create") } + } } + if (showFilePicker) { + FilePickerDialog( + onDismissRequest = { showFilePicker = false }, + customColors = customColors, + onFilesSelected = { + // Handle file selection here if needed + showFilePicker = false + } + ) + } + } } @OptIn(ExperimentalMaterial3Api::class) @Composable fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> Unit) { - val customColors = LocalCustomColors.current - Column( - modifier = Modifier - .fillMaxWidth() - ) { - Text( - text = label, - modifier = Modifier.padding(bottom = 2.dp) // Reduce padding for the label - ) - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth() - ) { - Slider( - value = value, - onValueChange = onValueChange, - valueRange = 0f..2f, - steps = 100, // This ensures the slider moves in increments of 0.02 - modifier = Modifier.weight(3f), - colors = SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) - ) - Spacer(modifier = Modifier.width(2.dp)) // Add a small spacer between the slider and text field - TextField( - value = String.format("%.2f", value), - onValueChange = { - val newValue = it.toFloatOrNull() ?: 0f - onValueChange(newValue) - }, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), - modifier = Modifier - .width(60.dp) - .height(50.dp), - textStyle = LocalTextStyle.current.copy(fontSize = 12.sp) // Optionally adjust text size - ) - } + val customColors = LocalCustomColors.current + Column(modifier = Modifier.fillMaxWidth()) { + Text( + text = label, + modifier = Modifier.padding(bottom = 2.dp) // Reduce padding for the label + ) + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { + Slider( + value = value, + onValueChange = onValueChange, + valueRange = 0f..2f, + steps = 100, // This ensures the slider moves in increments of 0.02 + modifier = Modifier.weight(3f), + colors = + SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) + ) + Spacer( + modifier = Modifier.width(2.dp) + ) // Add a small spacer between the slider and text field + TextField( + value = String.format("%.2f", value), + onValueChange = { + val newValue = it.toFloatOrNull() ?: 0f + onValueChange(newValue) + }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.width(60.dp).height(50.dp), + textStyle = LocalTextStyle.current.copy(fontSize = 12.sp) // Optionally adjust text size + ) } + } } @Preview(showBackground = false) @Composable fun CreateAssistantScreenPreview() { - val navController = rememberNavController() - CreateAssistantScreen(navController) + val navController = rememberNavController() + CreateAssistantScreen(navController) } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt index b4be5b21f..41b03b1fd 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/HomeScreen.kt @@ -2,6 +2,7 @@ package com.server.movile.xef.android.ui.screens.navigationdrawercompose import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -9,32 +10,29 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.compose.material3.MaterialTheme import androidx.navigation.NavController import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import org.xef.xefMobile.R @Composable fun HomeScreen(authViewModel: IAuthViewModel, navController: NavController) { - Box(modifier = Modifier.fillMaxSize()) { - Column( - modifier = Modifier - .fillMaxSize() - .align(Alignment.Center), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Image( - painter = painterResource(id = R.drawable.xef_brand_icon), - contentDescription = "Logo", - modifier = Modifier.size(50.dp) - ) - Spacer(modifier = Modifier.height(16.dp)) - Text( - text = "Welcome to Xef.ai", - fontSize = 30.sp, - color = MaterialTheme.colorScheme.onBackground - ) - } + Box(modifier = Modifier.fillMaxSize()) { + Column( + modifier = Modifier.fillMaxSize().align(Alignment.Center), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Image( + painter = painterResource(id = R.drawable.xef_brand_icon), + contentDescription = "Logo", + modifier = Modifier.size(50.dp) + ) + Spacer(modifier = Modifier.height(16.dp)) + Text( + text = "Welcome to Xef.ai", + fontSize = 30.sp, + color = MaterialTheme.colorScheme.onBackground + ) } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt index c04e940eb..61df520b8 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/navigationdrawercompose/MenuItem.kt @@ -3,8 +3,8 @@ package com.server.movile.xef.android.ui.screens.navigationdrawercompose import androidx.compose.ui.graphics.vector.ImageVector data class MenuItem( - val id: String, - val title: String, - val contentDescription: String, - val icon: ImageVector -) \ No newline at end of file + val id: String, + val title: String, + val contentDescription: String, + val icon: ImageVector +) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt index fc1f48a17..290670744 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Theme.kt @@ -10,7 +10,8 @@ val CustomButtonColor = Color(0xFF01A2D1) val CustomSliderThumbColor = Color(0xFF03DAC5) val CustomSliderTrackColor = Color(0xFF018786) -private val LightColorScheme = lightColorScheme( +private val LightColorScheme = + lightColorScheme( primary = md_theme_light_primary, onPrimary = md_theme_light_onPrimary, primaryContainer = md_theme_light_primaryContainer, @@ -40,9 +41,10 @@ private val LightColorScheme = lightColorScheme( surfaceTint = md_theme_light_surfaceTint, outlineVariant = md_theme_light_outlineVariant, scrim = md_theme_light_scrim, -) + ) -private val DarkColorScheme = darkColorScheme( +private val DarkColorScheme = + darkColorScheme( primary = md_theme_dark_primary, onPrimary = md_theme_dark_onPrimary, primaryContainer = md_theme_dark_primaryContainer, @@ -72,33 +74,31 @@ private val DarkColorScheme = darkColorScheme( surfaceTint = md_theme_dark_surfaceTint, outlineVariant = md_theme_dark_outlineVariant, scrim = md_theme_dark_scrim, -) + ) internal val LocalThemeIsDark = compositionLocalOf { mutableStateOf(true) } val LocalCustomColors = staticCompositionLocalOf { CustomColors() } data class CustomColors( - val buttonColor: Color = CustomButtonColor, - val sliderThumbColor: Color = CustomSliderThumbColor, - val sliderTrackColor: Color = CustomSliderTrackColor + val buttonColor: Color = CustomButtonColor, + val sliderThumbColor: Color = CustomSliderThumbColor, + val sliderTrackColor: Color = CustomSliderTrackColor ) @Composable -internal fun AppTheme( - content: @Composable () -> Unit -) { - val systemIsDark = isSystemInDarkTheme() - val isDarkState = remember { mutableStateOf(systemIsDark) } - CompositionLocalProvider( - LocalThemeIsDark provides isDarkState, - LocalCustomColors provides CustomColors() - ) { - val isDark by isDarkState - //com.xef.xefMobile.theme.SystemAppearance(isDark) - MaterialTheme( - colorScheme = if (isDark) DarkColorScheme else LightColorScheme, - content = { Surface(content = content) } - ) - } -} \ No newline at end of file +internal fun AppTheme(content: @Composable () -> Unit) { + val systemIsDark = isSystemInDarkTheme() + val isDarkState = remember { mutableStateOf(systemIsDark) } + CompositionLocalProvider( + LocalThemeIsDark provides isDarkState, + LocalCustomColors provides CustomColors() + ) { + val isDark by isDarkState + // com.xef.xefMobile.theme.SystemAppearance(isDark) + MaterialTheme( + colorScheme = if (isDark) DarkColorScheme else LightColorScheme, + content = { Surface(content = content) } + ) + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt index 637bb1a72..03132d758 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/themes/Type.kt @@ -8,21 +8,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp import org.xef.xefMobile.R +val Montserrat = + FontFamily(Font(R.font.montserrat_regular), Font(R.font.montserrat_bold, FontWeight.Bold)) -val Montserrat = FontFamily( - Font(R.font.montserrat_regular), - Font(R.font.montserrat_bold, FontWeight.Bold) -) - -val Typography = Typography( - displayLarge = TextStyle( - fontFamily = Montserrat, - fontWeight = FontWeight.Bold, - fontSize = 24.sp - ), - bodyLarge = TextStyle( - fontFamily = Montserrat, - fontWeight = FontWeight.Bold, - fontSize = 15.sp - ) -) +val Typography = + Typography( + displayLarge = + TextStyle(fontFamily = Montserrat, fontWeight = FontWeight.Bold, fontSize = 24.sp), + bodyLarge = TextStyle(fontFamily = Montserrat, fontWeight = FontWeight.Bold, fontSize = 15.sp) + ) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt index 67684fa1a..e19f3c16c 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt @@ -1,7 +1,6 @@ package com.server.movile.xef.android.ui.viewmodels import android.content.Context -import android.util.Log import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore @@ -11,138 +10,132 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.xef.xefMobile.model.LoginRequest import com.xef.xefMobile.model.RegisterRequest +import com.xef.xefMobile.services.ApiService +import java.io.IOException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import com.xef.xefMobile.services.ApiService import retrofit2.HttpException -import java.io.IOException // Extension function to provide DataStore instance private val Context.dataStore by preferencesDataStore(name = "settings") -class AuthViewModel( - context: Context, - private val apiService: ApiService -) : ViewModel(), IAuthViewModel { +class AuthViewModel(context: Context, private val apiService: ApiService) : + ViewModel(), IAuthViewModel { - private val dataStore = context.dataStore + private val dataStore = context.dataStore - private val _authToken = MutableLiveData() - override val authToken: LiveData = _authToken + private val _authToken = MutableLiveData() + override val authToken: LiveData = _authToken - private val _isLoading = MutableLiveData() - override val isLoading: LiveData = _isLoading + private val _isLoading = MutableLiveData() + override val isLoading: LiveData = _isLoading - private val _errorMessage = MutableLiveData() - override val errorMessage: LiveData = _errorMessage + private val _errorMessage = MutableLiveData() + override val errorMessage: LiveData = _errorMessage - private val _userName = MutableLiveData() - override val userName: LiveData = _userName + private val _userName = MutableLiveData() + override val userName: LiveData = _userName - init { - loadAuthToken() - } + init { + loadAuthToken() + } - private fun loadAuthToken() { - viewModelScope.launch { - val token = dataStore.data.map { preferences -> - preferences[stringPreferencesKey("authToken")] - }.firstOrNull() - _authToken.value = token + private fun loadAuthToken() { + viewModelScope.launch { + val token = + dataStore.data + .map { preferences -> preferences[stringPreferencesKey("authToken")] } + .firstOrNull() + _authToken.value = token - token?.let { - loadUserName() - } - } + token?.let { loadUserName() } } - - private suspend fun loadUserName() { - withContext(Dispatchers.IO) { - val name = dataStore.data.map { preferences -> - preferences[stringPreferencesKey("userName")] - }.firstOrNull() - _userName.postValue(name) - } + } + + private suspend fun loadUserName() { + withContext(Dispatchers.IO) { + val name = + dataStore.data + .map { preferences -> preferences[stringPreferencesKey("userName")] } + .firstOrNull() + _userName.postValue(name) } - - override fun login(email: String, password: String) { - viewModelScope.launch { - _isLoading.value = true - val loginRequest = LoginRequest(email, password) - try { - val loginResponse = apiService.loginUser(loginRequest) - updateAuthToken(loginResponse.authToken) - updateUserName(loginResponse.user.name) - _authToken.value = loginResponse.authToken - _userName.value = loginResponse.user.name - } catch (e: Exception) { - handleException(e) - } finally { - _isLoading.value = false - } - } + } + + override fun login(email: String, password: String) { + viewModelScope.launch { + _isLoading.value = true + val loginRequest = LoginRequest(email, password) + try { + val loginResponse = apiService.loginUser(loginRequest) + updateAuthToken(loginResponse.authToken) + updateUserName(loginResponse.user.name) + _authToken.value = loginResponse.authToken + _userName.value = loginResponse.user.name + } catch (e: Exception) { + handleException(e) + } finally { + _isLoading.value = false + } } + } - private suspend fun updateAuthToken(token: String) { - withContext(Dispatchers.IO) { - dataStore.edit { preferences -> - preferences[stringPreferencesKey("authToken")] = token - } - } + private suspend fun updateAuthToken(token: String) { + withContext(Dispatchers.IO) { + dataStore.edit { preferences -> preferences[stringPreferencesKey("authToken")] = token } } + } - private suspend fun updateUserName(name: String) { - withContext(Dispatchers.IO) { - dataStore.edit { preferences -> - preferences[stringPreferencesKey("userName")] = name - } - } + private suspend fun updateUserName(name: String) { + withContext(Dispatchers.IO) { + dataStore.edit { preferences -> preferences[stringPreferencesKey("userName")] = name } } - - override fun register(name: String, email: String, password: String) { - viewModelScope.launch { - _isLoading.value = true - val request = RegisterRequest(name, email, password) - try { - val registerResponse = apiService.registerUser(request) - updateAuthToken(registerResponse.authToken) - updateUserName(name) - _authToken.value = registerResponse.authToken - _userName.value = name - } catch (e: Exception) { - handleException(e) - } finally { - _isLoading.value = false - } - } + } + + override fun register(name: String, email: String, password: String) { + viewModelScope.launch { + _isLoading.value = true + val request = RegisterRequest(name, email, password) + try { + val registerResponse = apiService.registerUser(request) + updateAuthToken(registerResponse.authToken) + updateUserName(name) + _authToken.value = registerResponse.authToken + _userName.value = name + } catch (e: Exception) { + handleException(e) + } finally { + _isLoading.value = false + } } + } - private fun handleException(e: Exception) { - when (e) { - is IOException -> _errorMessage.postValue("Network error") - is HttpException -> _errorMessage.postValue("Unexpected server error: ${e.code()}") - else -> _errorMessage.postValue("An unexpected error occurred: ${e.message}") - } + private fun handleException(e: Exception) { + when (e) { + is IOException -> _errorMessage.postValue("Network error") + is HttpException -> _errorMessage.postValue("Unexpected server error: ${e.code()}") + else -> _errorMessage.postValue("An unexpected error occurred: ${e.message}") } + } - override fun logout() { - viewModelScope.launch { - try { - withContext(Dispatchers.IO) { - dataStore.edit { preferences -> - preferences.remove(stringPreferencesKey("authToken")) - preferences.remove(stringPreferencesKey("userName")) - } - } - _authToken.postValue(null) - _userName.postValue(null) - _errorMessage.postValue("Logged out successfully") - } catch (e: Exception) { - _errorMessage.postValue("Failed to sign out") - } + override fun logout() { + viewModelScope.launch { + try { + withContext(Dispatchers.IO) { + dataStore.edit { preferences -> + preferences.remove(stringPreferencesKey("authToken")) + preferences.remove(stringPreferencesKey("userName")) + } } + _authToken.postValue(null) + _userName.postValue(null) + _errorMessage.postValue("Logged out successfully") + } catch (e: Exception) { + _errorMessage.postValue("Failed to sign out") + } } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt index ba203733a..5cc84e2e5 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt @@ -3,12 +3,14 @@ package com.server.movile.xef.android.ui.viewmodels import androidx.lifecycle.LiveData interface IAuthViewModel { - val authToken: LiveData - val isLoading: LiveData - val errorMessage: LiveData - val userName: LiveData - - fun login(email: String, password: String) - fun register(name: String, email: String, password: String) - fun logout() + val authToken: LiveData + val isLoading: LiveData + val errorMessage: LiveData + val userName: LiveData + + fun login(email: String, password: String) + + fun register(name: String, email: String, password: String) + + fun logout() } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt index 94328f41a..53fc6d469 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt @@ -13,31 +13,29 @@ import kotlinx.coroutines.launch class PathViewModel : ViewModel() { - var state by mutableStateOf(PathScreenState()) - private set + var state by mutableStateOf(PathScreenState()) + private set - private val uriPathFinder = UriPathFinder() + private val uriPathFinder = UriPathFinder() - fun onFilePathsListChange(list: List, context: Context) { - viewModelScope.launch { - val updatedList = state.filePaths.toMutableList() - val pathList = changeUriToPath(list, context) - updatedList += pathList - state = state.copy(filePaths = updatedList) - } + fun onFilePathsListChange(list: List, context: Context) { + viewModelScope.launch { + val updatedList = state.filePaths.toMutableList() + val pathList = changeUriToPath(list, context) + updatedList += pathList + state = state.copy(filePaths = updatedList) } + } - fun removeFilePath(path: String) { - viewModelScope.launch { - val updatedList = state.filePaths.toMutableList() - updatedList.remove(path) - state = state.copy(filePaths = updatedList) - } + fun removeFilePath(path: String) { + viewModelScope.launch { + val updatedList = state.filePaths.toMutableList() + updatedList.remove(path) + state = state.copy(filePaths = updatedList) } + } - private fun changeUriToPath(uris: List, context: Context): List { - return uris.mapNotNull { uri -> - uriPathFinder.getPath(context, uri) - } - } + private fun changeUriToPath(uris: List, context: Context): List { + return uris.mapNotNull { uri -> uriPathFinder.getPath(context, uri) } + } } diff --git a/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt b/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt index f16f5ba17..236e1776b 100644 --- a/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt +++ b/server/xefMobile/composeApp/src/commonMain/kotlin/com/xef/xefMobile/theme/theme/Theme.kt @@ -10,7 +10,8 @@ val CustomButtonColor = Color(0xFF01A2D1) val CustomSliderThumbColor = Color(0xFF03DAC5) val CustomSliderTrackColor = Color(0xFF018786) -private val LightColorScheme = lightColorScheme( +private val LightColorScheme = + lightColorScheme( primary = md_theme_light_primary, onPrimary = md_theme_light_onPrimary, primaryContainer = md_theme_light_primaryContainer, @@ -40,9 +41,10 @@ private val LightColorScheme = lightColorScheme( surfaceTint = md_theme_light_surfaceTint, outlineVariant = md_theme_light_outlineVariant, scrim = md_theme_light_scrim, -) + ) -private val DarkColorScheme = darkColorScheme( +private val DarkColorScheme = + darkColorScheme( primary = md_theme_dark_primary, onPrimary = md_theme_dark_onPrimary, primaryContainer = md_theme_dark_primaryContainer, @@ -72,36 +74,34 @@ private val DarkColorScheme = darkColorScheme( surfaceTint = md_theme_dark_surfaceTint, outlineVariant = md_theme_dark_outlineVariant, scrim = md_theme_dark_scrim, -) + ) internal val LocalThemeIsDark = compositionLocalOf { mutableStateOf(true) } val LocalCustomColors = staticCompositionLocalOf { CustomColors() } data class CustomColors( - val buttonColor: Color = CustomButtonColor, - val sliderThumbColor: Color = CustomSliderThumbColor, - val sliderTrackColor: Color = CustomSliderTrackColor + val buttonColor: Color = CustomButtonColor, + val sliderThumbColor: Color = CustomSliderThumbColor, + val sliderTrackColor: Color = CustomSliderTrackColor ) @Composable -internal fun AppTheme( - content: @Composable () -> Unit -) { - val systemIsDark = isSystemInDarkTheme() - val isDarkState = remember { mutableStateOf(systemIsDark) } - CompositionLocalProvider( - LocalThemeIsDark provides isDarkState, - LocalCustomColors provides CustomColors() - ) { - val isDark by isDarkState - //com.xef.xefMobile.theme.SystemAppearance(isDark) - MaterialTheme( - colorScheme = if (isDark) DarkColorScheme else LightColorScheme, - content = { Surface(content = content) } - ) - } +internal fun AppTheme(content: @Composable () -> Unit) { + val systemIsDark = isSystemInDarkTheme() + val isDarkState = remember { mutableStateOf(systemIsDark) } + CompositionLocalProvider( + LocalThemeIsDark provides isDarkState, + LocalCustomColors provides CustomColors() + ) { + val isDark by isDarkState + // com.xef.xefMobile.theme.SystemAppearance(isDark) + MaterialTheme( + colorScheme = if (isDark) DarkColorScheme else LightColorScheme, + content = { Surface(content = content) } + ) + } } -//@Composable -//internal expect fun SystemAppearance(isDark: Boolean) +// @Composable +// internal expect fun SystemAppearance(isDark: Boolean) diff --git a/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt b/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt index 136caf75c..ac0fcf2bf 100644 --- a/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt +++ b/server/xefMobile/composeApp/src/commonTest/kotlin/org/xef/xefMobile/ComposeTest.kt @@ -19,27 +19,19 @@ import kotlin.test.Test @OptIn(ExperimentalTestApi::class) class ComposeTest { - @Test - fun simpleCheck() = runComposeUiTest { - setContent { - var txt by remember { mutableStateOf("Go") } - Column { - Text( - text = txt, - modifier = Modifier.testTag("t_text") - ) - Button( - onClick = { txt += "." }, - modifier = Modifier.testTag("t_button") - ) { - Text("click me") - } - } + @Test + fun simpleCheck() = runComposeUiTest { + setContent { + var txt by remember { mutableStateOf("Go") } + Column { + Text(text = txt, modifier = Modifier.testTag("t_text")) + Button(onClick = { txt += "." }, modifier = Modifier.testTag("t_button")) { + Text("click me") } - - onNodeWithTag("t_button").apply { - repeat(3) { performClick() } - } - onNodeWithTag("t_text").assertTextEquals("Go...") + } } -} \ No newline at end of file + + onNodeWithTag("t_button").apply { repeat(3) { performClick() } } + onNodeWithTag("t_text").assertTextEquals("Go...") + } +} From 7b5cdda221edd1a58ff9fbb1636d625cdc9bf056 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Tue, 28 May 2024 16:36:04 +0200 Subject: [PATCH 05/30] OpenAi token UI and assistant list --- ...otlin-compiler-7693726450815422477.salive} | 0 server/xefMobile/composeApp/build.gradle.kts | 1 + .../kotlin/com/xef/xefMobile/MainActivity.kt | 7 +- .../kotlin/com/xef/xefMobile/XefAndroidApp.kt | 10 +- .../com/xef/xefMobile/model/AssistantModel.kt | 6 +- .../xefMobile/network/client/HttpClient.kt | 21 ++-- .../com/xef/xefMobile/services/ApiService.kt | 22 ++-- .../xef/xefMobile/ui/navigation/Navigation.kt | 9 +- .../xefMobile/ui/screens/SettingsScreen.kt | 117 +++++++++++------ .../ui/screens/menu/AssistantScreen.kt | 118 +++++++++--------- .../ui/viewmodels/AssistantViewModel.kt | 42 +++++++ .../ui/viewmodels/SettingsViewModel.kt | 25 ++++ 12 files changed, 248 insertions(+), 130 deletions(-) rename server/xefMobile/.kotlin/sessions/{kotlin-compiler-12236840344353816343.salive => kotlin-compiler-7693726450815422477.salive} (100%) create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt diff --git a/server/xefMobile/.kotlin/sessions/kotlin-compiler-12236840344353816343.salive b/server/xefMobile/.kotlin/sessions/kotlin-compiler-7693726450815422477.salive similarity index 100% rename from server/xefMobile/.kotlin/sessions/kotlin-compiler-12236840344353816343.salive rename to server/xefMobile/.kotlin/sessions/kotlin-compiler-7693726450815422477.salive diff --git a/server/xefMobile/composeApp/build.gradle.kts b/server/xefMobile/composeApp/build.gradle.kts index 3b024bef1..e4193b512 100644 --- a/server/xefMobile/composeApp/build.gradle.kts +++ b/server/xefMobile/composeApp/build.gradle.kts @@ -90,6 +90,7 @@ kotlin { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3") implementation("io.ktor:ktor-client-serialization-jvm:2.3.11") implementation("com.google.accompanist:accompanist-permissions:0.34.0") + implementation("androidx.compose.runtime:runtime:1.6.7") } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt index 6278e6be5..f34d10655 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt @@ -5,14 +5,19 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.xef.xefMobile.services.ApiService +import com.xef.xefMobile.ui.viewmodels.SettingsViewModel class MainActivity : ComponentActivity() { private lateinit var authViewModel: AuthViewModel + private lateinit var settingsViewModel: SettingsViewModel override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) authViewModel = AuthViewModel(this, ApiService()) + settingsViewModel = SettingsViewModel(this) - setContent { XefAndroidApp(authViewModel = authViewModel) } + setContent { + XefAndroidApp(authViewModel = authViewModel, settingsViewModel = settingsViewModel) + } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt index bdc0d2c00..08b08138d 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt @@ -11,18 +11,20 @@ import androidx.compose.ui.unit.dp import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import com.server.movile.xef.android.ui.screens.* +import com.server.movile.xef.android.ui.screens.LoginScreen +import com.server.movile.xef.android.ui.screens.RegisterScreen import com.server.movile.xef.android.ui.screens.menu.AssistantScreen import com.server.movile.xef.android.ui.screens.menu.CreateAssistantScreen import com.server.movile.xef.android.ui.screens.navigationdrawercompose.HomeScreen import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.xef.xefMobile.ui.screens.Screens import com.xef.xefMobile.ui.screens.SettingsScreen +import com.xef.xefMobile.ui.viewmodels.SettingsViewModel @OptIn(ExperimentalMaterial3Api::class) @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @Composable -fun XefAndroidApp(authViewModel: IAuthViewModel) { +fun XefAndroidApp(authViewModel: IAuthViewModel, settingsViewModel: SettingsViewModel) { val navigationController = rememberNavController() val userName by authViewModel.userName.observeAsState("") @@ -48,7 +50,7 @@ fun XefAndroidApp(authViewModel: IAuthViewModel) { authViewModel = authViewModel, userName = userName.orEmpty() ) { - AssistantScreen(navigationController, authViewModel) + AssistantScreen(navigationController, authViewModel, settingsViewModel) } } composable(Screens.CreateAssistant.screen) { @@ -66,7 +68,7 @@ fun XefAndroidApp(authViewModel: IAuthViewModel) { authViewModel = authViewModel, userName = userName.orEmpty() ) { - SettingsScreen(navigationController, authViewModel) + SettingsScreen(navigationController, settingsViewModel = settingsViewModel) } } // ... other composable screens ... diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt index 6a8e331b9..7d256efa9 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -2,6 +2,8 @@ package com.xef.xefMobile.model import kotlinx.serialization.Serializable -@Serializable data class Assistant(val id: String, val name: String) +@Serializable +data class Assistant(val id: String, val name: String) -@Serializable data class AssistantsResponse(val data: List) +@Serializable +data class AssistantsResponse(val data: List) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt index abeecabf2..2c97e7436 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt @@ -7,16 +7,15 @@ import io.ktor.serialization.kotlinx.json.* import kotlinx.serialization.json.Json object HttpClientProvider { - val client: HttpClient = - HttpClient(Android) { - install(ContentNegotiation) { - json( - Json { - ignoreUnknownKeys = true - isLenient = true - prettyPrint = true - } - ) - } + val client: HttpClient = HttpClient(Android) { + install(ContentNegotiation) { + json( + Json { + ignoreUnknownKeys = true + isLenient = true + prettyPrint = true + } + ) } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index ce92f4db2..642522360 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -27,12 +27,11 @@ class ApiService { suspend fun loginUser(request: LoginRequest): LoginResponse { return try { - val response: HttpResponse = - HttpClientProvider.client.post { - url("http://10.0.2.2:8081/login") - contentType(ContentType.Application.Json) - setBody(request) - } + val response: HttpResponse = HttpClientProvider.client.post { + url("http://10.0.2.2:8081/login") + contentType(ContentType.Application.Json) + setBody(request) + } val responseBody: String = response.bodyAsText() Log.d("ApiService", "Login response body: $responseBody") @@ -46,12 +45,11 @@ class ApiService { suspend fun getAssistants(authToken: String): AssistantsResponse { return try { - val response: HttpResponse = - HttpClientProvider.client.get { - url("http://10.0.2.2:8081/v1/settings/assistants") - header(HttpHeaders.Authorization, "Bearer $authToken") - header("OpenAI-Beta", "assistants=v1") - } + val response: HttpResponse = HttpClientProvider.client.get { + url("http://10.0.2.2:8081/v1/settings/assistants") + header(HttpHeaders.Authorization, "Bearer $authToken") + header("OpenAI-Beta", "assistants=v2") + } val responseBody: String = response.bodyAsText() Log.d("ApiService", "Assistants response body: $responseBody") diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt index ef4b14032..0b4a46b75 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt @@ -10,9 +10,11 @@ import com.server.movile.xef.android.ui.screens.menu.AssistantScreen import com.server.movile.xef.android.ui.screens.menu.CreateAssistantScreen import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.xef.xefMobile.ui.screens.Screens +import com.xef.xefMobile.ui.screens.SettingsScreen +import com.xef.xefMobile.ui.viewmodels.SettingsViewModel @Composable -fun AppNavigator(authViewModel: IAuthViewModel) { +fun AppNavigator(authViewModel: IAuthViewModel, settingsViewModel: SettingsViewModel) { val navController = rememberNavController() NavHost(navController = navController, startDestination = Screens.Login.screen) { composable(Screens.Login.screen) { @@ -22,10 +24,13 @@ fun AppNavigator(authViewModel: IAuthViewModel) { RegisterScreen(authViewModel = authViewModel, navController = navController) } composable(Screens.Assistants.screen) { - AssistantScreen(navController = navController, authViewModel = authViewModel) + AssistantScreen(navController = navController, authViewModel = authViewModel, settingsViewModel = settingsViewModel) } composable(Screens.CreateAssistant.screen) { CreateAssistantScreen(navController = navController) } + composable(Screens.Settings.screen) { + SettingsScreen(navController = navController, settingsViewModel = settingsViewModel) + } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt index d8f29f58c..49fe3521c 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt @@ -14,57 +14,94 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import com.xef.xefMobile.ui.viewmodels.SettingsViewModel import kotlinx.coroutines.launch import org.xef.xefMobile.R @OptIn(ExperimentalMaterial3Api::class) @Composable -fun SettingsScreen(navController: NavController, authViewModel: IAuthViewModel) { - var apiKey by remember { mutableStateOf("") } +fun SettingsScreen(navController: NavController, settingsViewModel: SettingsViewModel) { + // Step 1: Collect and observe the API key state from the ViewModel + val apiKey by settingsViewModel.apiKey.collectAsState() + var apiKeyInput by remember { mutableStateOf(apiKey) } val coroutineScope = rememberCoroutineScope() + + // Custom colors for UI elements val customColors = Color(0xFFADD8E6) val CustomTextBlue = Color(0xFF0199D7) - Box(modifier = Modifier.fillMaxSize().background(Color.White).padding(16.dp)) { - Column( - modifier = Modifier.align(Alignment.Center), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - Text(text = "Settings", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = Color.Black) - Spacer(modifier = Modifier.height(8.dp)) - Text(text = "These are xef-server settings.", fontSize = 16.sp, color = Color.Gray) - Spacer(modifier = Modifier.height(16.dp)) - TextField( - value = apiKey, - onValueChange = { apiKey = it }, - label = { Text("OpenAI API key") }, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(16.dp)) - Button( - onClick = { - coroutineScope.launch { - // Handle saving the API key - // Example: authViewModel.saveApiKey(apiKey) - } - }, - colors = ButtonDefaults.buttonColors(containerColor = customColors), - modifier = Modifier.fillMaxWidth() + // Step 4: Snackbar state management + var showSnackbar by remember { mutableStateOf(false) } + val snackbarHostState = remember { SnackbarHostState() } + + // Display Snackbar when showSnackbar becomes true + LaunchedEffect(showSnackbar) { + if (showSnackbar) { + snackbarHostState.showSnackbar("API key saved successfully") + showSnackbar = false + } + } + + // Step 5: Scaffold to provide structure and Snackbar host + Scaffold( + snackbarHost = { SnackbarHost(snackbarHostState) } + ) { innerPadding -> + Box(modifier = Modifier + .fillMaxSize() + .background(Color.White) + .padding(innerPadding) + .padding(16.dp)) { + Column( + modifier = Modifier.align(Alignment.Center), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center ) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center + // Step 2: UI elements for settings screen + Text( + text = "Settings", + fontSize = 24.sp, + fontWeight = FontWeight.Bold, + color = Color.Black + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "These are xef-server settings.", + fontSize = 16.sp, + color = Color.Gray + ) + Spacer(modifier = Modifier.height(16.dp)) + TextField( + value = apiKeyInput, + onValueChange = { apiKeyInput = it }, + label = { Text("OpenAI API key") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(16.dp)) + // Step 3: Button to save the API key + Button( + onClick = { + coroutineScope.launch { + settingsViewModel.setApiKey(apiKeyInput) + settingsViewModel.saveApiKey() + showSnackbar = true // Trigger Snackbar + } + }, + colors = ButtonDefaults.buttonColors(containerColor = customColors), + modifier = Modifier.fillMaxWidth() ) { - Image( - painter = painterResource(id = R.drawable.save_24dp), - contentDescription = "save settings icon", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(CustomTextBlue) - ) - Spacer(modifier = Modifier.width(8.dp)) - Text(text = "Save Settings", color = CustomTextBlue) + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center + ) { + Image( + painter = painterResource(id = R.drawable.save_24dp), + contentDescription = "save settings icon", + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(CustomTextBlue) + ) + Spacer(modifier = Modifier.width(8.dp)) + Text(text = "Save Settings", color = CustomTextBlue) + } } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt index 69352e4a8..f18f308e9 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt @@ -8,79 +8,81 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController +import com.server.movile.xef.android.ui.themes.LocalCustomColors +import com.server.movile.xef.android.ui.viewmodels.AssistantViewModel import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel -import com.xef.xefMobile.model.Assistant -import com.xef.xefMobile.services.ApiService -import com.xef.xefMobile.theme.theme.LocalCustomColors import com.xef.xefMobile.ui.screens.Screens -import kotlinx.coroutines.launch +import com.xef.xefMobile.ui.viewmodels.SettingsViewModel @Composable -fun AssistantScreen(navController: NavController, authViewModel: IAuthViewModel) { +fun AssistantScreen(navController: NavController, authViewModel: IAuthViewModel, settingsViewModel: SettingsViewModel) { val customColors = LocalCustomColors.current - val coroutineScope = rememberCoroutineScope() - var assistants by remember { mutableStateOf>(emptyList()) } - var loading by remember { mutableStateOf(true) } - var errorMessage by remember { mutableStateOf(null) } - - val authToken = authViewModel.authToken.value ?: error("Auth token not found") - - LaunchedEffect(Unit) { - coroutineScope.launch { - try { - val response = ApiService().getAssistants(authToken) - assistants = response.data - } catch (e: Exception) { - errorMessage = "Failed to load assistants" - } finally { - loading = false - } - } - } + val viewModel: AssistantViewModel = viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) + val assistants by viewModel.assistants.collectAsState() + val loading by viewModel.loading.collectAsState() + val errorMessage by viewModel.errorMessage.collectAsState() Box(modifier = Modifier.fillMaxSize()) { - if (loading) { - CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) - } else if (errorMessage != null) { - Text( - text = errorMessage!!, - color = MaterialTheme.colorScheme.error, - modifier = Modifier.align(Alignment.Center) - ) - } else { - Column( - modifier = Modifier.align(Alignment.TopCenter).padding(20.dp), - horizontalAlignment = Alignment.CenterHorizontally - ) { + when { + loading -> { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } + errorMessage != null -> { Text( - text = "Assistants", - fontWeight = FontWeight.Bold, - fontSize = 24.sp, + text = errorMessage ?: "", + color = MaterialTheme.colorScheme.error, + modifier = Modifier.align(Alignment.Center) ) - HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) - - Spacer(modifier = Modifier.height(16.dp)) + } + else -> { + Column( + modifier = Modifier.align(Alignment.TopCenter).padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = "Assistants", + fontWeight = FontWeight.Bold, + fontSize = 24.sp, + ) + Divider(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) - assistants.forEach { assistant -> - Text(text = assistant.name, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(16.dp)) - Text(text = assistant.id) - Spacer(modifier = Modifier.height(8.dp)) + assistants.forEach { assistant -> + Text(text = assistant.name, fontWeight = FontWeight.Bold) + Text(text = assistant.id) + Spacer(modifier = Modifier.height(8.dp)) + } } } + } - Button( - onClick = { navController.navigate(Screens.CreateAssistant.screen) }, - colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ), - modifier = Modifier.align(Alignment.BottomCenter).padding(16.dp) - ) { - Text(text = "Create New Assistant") - } + Button( + onClick = { navController.navigate(Screens.CreateAssistant.screen) }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ), + modifier = Modifier.align(Alignment.BottomCenter).padding(16.dp) + ) { + Text(text = "Create New Assistant") + } + } +} + +class AssistantViewModelFactory( + private val authViewModel: IAuthViewModel, + private val settingsViewModel: SettingsViewModel +) : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(AssistantViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") + return AssistantViewModel(authViewModel, settingsViewModel) as T } + throw IllegalArgumentException("Unknown ViewModel class") } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt new file mode 100644 index 000000000..9879275cd --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -0,0 +1,42 @@ +package com.server.movile.xef.android.ui.viewmodels + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.xef.xefMobile.model.Assistant +import com.xef.xefMobile.services.ApiService +import com.xef.xefMobile.ui.viewmodels.SettingsViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch + +class AssistantViewModel(private val authViewModel: IAuthViewModel, private val settingsViewModel: SettingsViewModel) : ViewModel() { + private val _assistants = MutableStateFlow>(emptyList()) + val assistants: StateFlow> = _assistants.asStateFlow() + + private val _loading = MutableStateFlow(true) + val loading: StateFlow = _loading.asStateFlow() + + private val _errorMessage = MutableStateFlow(null) + val errorMessage: StateFlow = _errorMessage.asStateFlow() + + init { + fetchAssistants() + } + + private fun fetchAssistants() { + viewModelScope.launch { + _loading.value = true + _errorMessage.value = null + try { + val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") + val response = ApiService().getAssistants(token) + _assistants.value = response.data + } catch (e: Exception) { + _errorMessage.value = "Failed to load assistants: ${e.message}" + } finally { + _loading.value = false + } + } + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt new file mode 100644 index 000000000..338d46646 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt @@ -0,0 +1,25 @@ +package com.xef.xefMobile.ui.viewmodels + +import android.content.Context +import android.content.SharedPreferences +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.launch + +class SettingsViewModel(context: Context) : ViewModel() { + private val preferences: SharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE) + private val _apiKey = MutableStateFlow(preferences.getString("api_key", "") ?: "") + val apiKey: StateFlow = _apiKey + + fun setApiKey(newApiKey: String) { + _apiKey.value = newApiKey + } + + fun saveApiKey() { + viewModelScope.launch { + preferences.edit().putString("api_key", _apiKey.value).apply() + } + } +} From 171d8f22ea9ba317d7fca44e55364bcee79dd18b Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Tue, 28 May 2024 14:38:17 +0000 Subject: [PATCH 06/30] Apply spotless formatting --- .../com/xef/xefMobile/model/AssistantModel.kt | 6 +-- .../xefMobile/network/client/HttpClient.kt | 21 ++++---- .../com/xef/xefMobile/services/ApiService.kt | 22 ++++---- .../xef/xefMobile/ui/navigation/Navigation.kt | 6 ++- .../xefMobile/ui/screens/SettingsScreen.kt | 25 +++------ .../ui/screens/menu/AssistantScreen.kt | 21 +++++--- .../ui/viewmodels/AssistantViewModel.kt | 51 ++++++++++--------- .../ui/viewmodels/SettingsViewModel.kt | 21 ++++---- 8 files changed, 86 insertions(+), 87 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt index 7d256efa9..6a8e331b9 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -2,8 +2,6 @@ package com.xef.xefMobile.model import kotlinx.serialization.Serializable -@Serializable -data class Assistant(val id: String, val name: String) +@Serializable data class Assistant(val id: String, val name: String) -@Serializable -data class AssistantsResponse(val data: List) +@Serializable data class AssistantsResponse(val data: List) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt index 2c97e7436..abeecabf2 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/network/client/HttpClient.kt @@ -7,15 +7,16 @@ import io.ktor.serialization.kotlinx.json.* import kotlinx.serialization.json.Json object HttpClientProvider { - val client: HttpClient = HttpClient(Android) { - install(ContentNegotiation) { - json( - Json { - ignoreUnknownKeys = true - isLenient = true - prettyPrint = true - } - ) + val client: HttpClient = + HttpClient(Android) { + install(ContentNegotiation) { + json( + Json { + ignoreUnknownKeys = true + isLenient = true + prettyPrint = true + } + ) + } } - } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index 642522360..ce89efab5 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -27,11 +27,12 @@ class ApiService { suspend fun loginUser(request: LoginRequest): LoginResponse { return try { - val response: HttpResponse = HttpClientProvider.client.post { - url("http://10.0.2.2:8081/login") - contentType(ContentType.Application.Json) - setBody(request) - } + val response: HttpResponse = + HttpClientProvider.client.post { + url("http://10.0.2.2:8081/login") + contentType(ContentType.Application.Json) + setBody(request) + } val responseBody: String = response.bodyAsText() Log.d("ApiService", "Login response body: $responseBody") @@ -45,11 +46,12 @@ class ApiService { suspend fun getAssistants(authToken: String): AssistantsResponse { return try { - val response: HttpResponse = HttpClientProvider.client.get { - url("http://10.0.2.2:8081/v1/settings/assistants") - header(HttpHeaders.Authorization, "Bearer $authToken") - header("OpenAI-Beta", "assistants=v2") - } + val response: HttpResponse = + HttpClientProvider.client.get { + url("http://10.0.2.2:8081/v1/settings/assistants") + header(HttpHeaders.Authorization, "Bearer $authToken") + header("OpenAI-Beta", "assistants=v2") + } val responseBody: String = response.bodyAsText() Log.d("ApiService", "Assistants response body: $responseBody") diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt index 0b4a46b75..462215bdb 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt @@ -24,7 +24,11 @@ fun AppNavigator(authViewModel: IAuthViewModel, settingsViewModel: SettingsViewM RegisterScreen(authViewModel = authViewModel, navController = navController) } composable(Screens.Assistants.screen) { - AssistantScreen(navController = navController, authViewModel = authViewModel, settingsViewModel = settingsViewModel) + AssistantScreen( + navController = navController, + authViewModel = authViewModel, + settingsViewModel = settingsViewModel + ) } composable(Screens.CreateAssistant.screen) { CreateAssistantScreen(navController = navController) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt index 49fe3521c..e4228db05 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt @@ -43,32 +43,19 @@ fun SettingsScreen(navController: NavController, settingsViewModel: SettingsView } // Step 5: Scaffold to provide structure and Snackbar host - Scaffold( - snackbarHost = { SnackbarHost(snackbarHostState) } - ) { innerPadding -> - Box(modifier = Modifier - .fillMaxSize() - .background(Color.White) - .padding(innerPadding) - .padding(16.dp)) { + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }) { innerPadding -> + Box( + modifier = Modifier.fillMaxSize().background(Color.White).padding(innerPadding).padding(16.dp) + ) { Column( modifier = Modifier.align(Alignment.Center), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { // Step 2: UI elements for settings screen - Text( - text = "Settings", - fontSize = 24.sp, - fontWeight = FontWeight.Bold, - color = Color.Black - ) + Text(text = "Settings", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = Color.Black) Spacer(modifier = Modifier.height(8.dp)) - Text( - text = "These are xef-server settings.", - fontSize = 16.sp, - color = Color.Gray - ) + Text(text = "These are xef-server settings.", fontSize = 16.sp, color = Color.Gray) Spacer(modifier = Modifier.height(16.dp)) TextField( value = apiKeyInput, diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt index f18f308e9..f29799731 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt @@ -19,9 +19,14 @@ import com.xef.xefMobile.ui.screens.Screens import com.xef.xefMobile.ui.viewmodels.SettingsViewModel @Composable -fun AssistantScreen(navController: NavController, authViewModel: IAuthViewModel, settingsViewModel: SettingsViewModel) { +fun AssistantScreen( + navController: NavController, + authViewModel: IAuthViewModel, + settingsViewModel: SettingsViewModel +) { val customColors = LocalCustomColors.current - val viewModel: AssistantViewModel = viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) + val viewModel: AssistantViewModel = + viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) val assistants by viewModel.assistants.collectAsState() val loading by viewModel.loading.collectAsState() val errorMessage by viewModel.errorMessage.collectAsState() @@ -63,10 +68,11 @@ fun AssistantScreen(navController: NavController, authViewModel: IAuthViewModel, Button( onClick = { navController.navigate(Screens.CreateAssistant.screen) }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ), + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ), modifier = Modifier.align(Alignment.BottomCenter).padding(16.dp) ) { Text(text = "Create New Assistant") @@ -80,8 +86,7 @@ class AssistantViewModelFactory( ) : ViewModelProvider.Factory { override fun create(modelClass: Class): T { if (modelClass.isAssignableFrom(AssistantViewModel::class.java)) { - @Suppress("UNCHECKED_CAST") - return AssistantViewModel(authViewModel, settingsViewModel) as T + @Suppress("UNCHECKED_CAST") return AssistantViewModel(authViewModel, settingsViewModel) as T } throw IllegalArgumentException("Unknown ViewModel class") } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 9879275cd..8fc264dc6 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -10,33 +10,36 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch -class AssistantViewModel(private val authViewModel: IAuthViewModel, private val settingsViewModel: SettingsViewModel) : ViewModel() { - private val _assistants = MutableStateFlow>(emptyList()) - val assistants: StateFlow> = _assistants.asStateFlow() +class AssistantViewModel( + private val authViewModel: IAuthViewModel, + private val settingsViewModel: SettingsViewModel +) : ViewModel() { + private val _assistants = MutableStateFlow>(emptyList()) + val assistants: StateFlow> = _assistants.asStateFlow() - private val _loading = MutableStateFlow(true) - val loading: StateFlow = _loading.asStateFlow() + private val _loading = MutableStateFlow(true) + val loading: StateFlow = _loading.asStateFlow() - private val _errorMessage = MutableStateFlow(null) - val errorMessage: StateFlow = _errorMessage.asStateFlow() + private val _errorMessage = MutableStateFlow(null) + val errorMessage: StateFlow = _errorMessage.asStateFlow() - init { - fetchAssistants() - } + init { + fetchAssistants() + } - private fun fetchAssistants() { - viewModelScope.launch { - _loading.value = true - _errorMessage.value = null - try { - val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") - val response = ApiService().getAssistants(token) - _assistants.value = response.data - } catch (e: Exception) { - _errorMessage.value = "Failed to load assistants: ${e.message}" - } finally { - _loading.value = false - } - } + private fun fetchAssistants() { + viewModelScope.launch { + _loading.value = true + _errorMessage.value = null + try { + val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") + val response = ApiService().getAssistants(token) + _assistants.value = response.data + } catch (e: Exception) { + _errorMessage.value = "Failed to load assistants: ${e.message}" + } finally { + _loading.value = false + } } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt index 338d46646..10dc0c8be 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt @@ -9,17 +9,16 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch class SettingsViewModel(context: Context) : ViewModel() { - private val preferences: SharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE) - private val _apiKey = MutableStateFlow(preferences.getString("api_key", "") ?: "") - val apiKey: StateFlow = _apiKey + private val preferences: SharedPreferences = + context.getSharedPreferences("settings", Context.MODE_PRIVATE) + private val _apiKey = MutableStateFlow(preferences.getString("api_key", "") ?: "") + val apiKey: StateFlow = _apiKey - fun setApiKey(newApiKey: String) { - _apiKey.value = newApiKey - } + fun setApiKey(newApiKey: String) { + _apiKey.value = newApiKey + } - fun saveApiKey() { - viewModelScope.launch { - preferences.edit().putString("api_key", _apiKey.value).apply() - } - } + fun saveApiKey() { + viewModelScope.launch { preferences.edit().putString("api_key", _apiKey.value).apply() } + } } From f2bd552c0b4877cf3ba65edf67b81fcecf6a8f41 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Tue, 28 May 2024 16:51:36 +0200 Subject: [PATCH 07/30] Android project --- .../xef/server/http/routes/AssistantRoutes.kt | 12 +++++++++--- .../xef/server/services/UserRepositoryService.kt | 5 +++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt index 1ebfc4ac6..38c91967b 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt @@ -13,6 +13,7 @@ import io.ktor.server.auth.* import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.server.routing.* +import kotlinx.serialization.SerializationException fun Routing.assistantRoutes(logger: KLogger) { authenticate("auth-bearer") { @@ -42,16 +43,21 @@ fun Routing.assistantRoutes(logger: KLogger) { val token = call.getToken() val openAI = OpenAI(Config(token = token.value), logRequests = true) val assistantsApi = openAI.assistants - val response = - assistantsApi.listAssistants(configure = { header("OpenAI-Beta", "assistants=v2") }) + val response = assistantsApi.listAssistants(configure = { header("OpenAI-Beta", "assistants=v2") }) + call.respond(HttpStatusCode.OK, response) + } catch (e: SerializationException) { + val trace = e.stackTraceToString() + logger.error { "Serialization error: $trace" } + call.respond(HttpStatusCode.BadRequest, "Serialization error: $trace") } catch (e: Exception) { val trace = e.stackTraceToString() - logger.error { "Error creating assistant: $trace" } + logger.error { "Error retrieving assistants: $trace" } call.respond(HttpStatusCode.BadRequest, "Invalid request: $trace") } } + put("/v1/settings/assistants/{id}") { try { val contentType = call.request.contentType() diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/services/UserRepositoryService.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/services/UserRepositoryService.kt index 01d4a9f97..49f2b150a 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/services/UserRepositoryService.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/services/UserRepositoryService.kt @@ -6,6 +6,7 @@ import com.xebia.functional.xef.server.models.LoginRequest import com.xebia.functional.xef.server.models.LoginResponse import com.xebia.functional.xef.server.models.RegisterRequest import com.xebia.functional.xef.server.models.exceptions.XefExceptions.UserException +import com.xebia.functional.xef.server.models.toUserResponse import com.xebia.functional.xef.server.utils.HashUtils import io.github.oshai.kotlinlogging.KLogger import kotlinx.uuid.UUID @@ -33,7 +34,7 @@ class UserRepositoryService(private val logger: KLogger) { authToken = UUID.generateUUID(passwordHashed).toString() } } - LoginResponse(user.authToken) + LoginResponse(user.authToken, user.toUserResponse()) } } @@ -47,7 +48,7 @@ class UserRepositoryService(private val logger: KLogger) { if (!HashUtils.checkPassword(request.password, user.salt, user.passwordHash)) throw Exception("Invalid password") - LoginResponse(user.authToken) + LoginResponse(user.authToken, user.toUserResponse()) } } } From 7433a6dcd48aeade178613b9525ac099769dee6d Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Tue, 28 May 2024 14:57:17 +0000 Subject: [PATCH 08/30] Apply spotless formatting --- .../functional/xef/server/http/routes/AssistantRoutes.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt index 425bf4e08..9f89fdc50 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt @@ -44,7 +44,8 @@ fun Routing.assistantRoutes(logger: KLogger) { val token = call.getToken() val openAI = OpenAI(Config(token = token.value), logRequests = true) val assistantsApi = openAI.assistants - val response = assistantsApi.listAssistants(configure = { header("OpenAI-Beta", "assistants=v2") }) + val response = + assistantsApi.listAssistants(configure = { header("OpenAI-Beta", "assistants=v2") }) call.respond(HttpStatusCode.OK, response) } catch (e: SerializationException) { @@ -58,7 +59,6 @@ fun Routing.assistantRoutes(logger: KLogger) { } } - put("/v1/settings/assistants/{id}") { try { val contentType = call.request.contentType() From 5d7847465ebcf7a036c1b9c91c71f017fdc09d6e Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Wed, 29 May 2024 16:20:16 +0200 Subject: [PATCH 09/30] List assistants and create new assistant --- ...tlin-compiler-11133698606277225441.salive} | 0 .../kotlin/com/xef/xefMobile/MainActivity.kt | 3 + .../kotlin/com/xef/xefMobile/MainLayout.kt | 17 ++- .../kotlin/com/xef/xefMobile/XefAndroidApp.kt | 34 +++-- .../com/xef/xefMobile/model/AssistantModel.kt | 11 +- .../com/xef/xefMobile/services/ApiService.kt | 12 +- .../ui/composable/FilePickerDialog.kt | 32 +++-- .../xef/xefMobile/ui/navigation/Navigation.kt | 6 +- .../xef/xefMobile/ui/screens/LoginScreen.kt | 14 +- .../xefMobile/ui/screens/SettingsScreen.kt | 18 ++- .../ui/screens/menu/AssistantScreen.kt | 62 +++++++-- .../ui/screens/menu/CreateAssistantScreen.kt | 128 ++++++++++++------ .../ui/viewmodels/AssistantViewModel.kt | 61 +++++++++ .../xefMobile/ui/viewmodels/AuthViewModel.kt | 55 +++++--- .../xefMobile/ui/viewmodels/IAuthViewModel.kt | 1 + .../ui/viewmodels/SettingsViewModel.kt | 7 +- .../factory/AuthViewModelFactory.kt | 17 +++ .../factory/SettingsViewModelFactory.kt | 15 ++ 18 files changed, 351 insertions(+), 142 deletions(-) rename server/xefMobile/.kotlin/sessions/{kotlin-compiler-7693726450815422477.salive => kotlin-compiler-11133698606277225441.salive} (100%) create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt create mode 100644 server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/SettingsViewModelFactory.kt diff --git a/server/xefMobile/.kotlin/sessions/kotlin-compiler-7693726450815422477.salive b/server/xefMobile/.kotlin/sessions/kotlin-compiler-11133698606277225441.salive similarity index 100% rename from server/xefMobile/.kotlin/sessions/kotlin-compiler-7693726450815422477.salive rename to server/xefMobile/.kotlin/sessions/kotlin-compiler-11133698606277225441.salive diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt index f34d10655..fb9e29e96 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt @@ -16,6 +16,9 @@ class MainActivity : ComponentActivity() { authViewModel = AuthViewModel(this, ApiService()) settingsViewModel = SettingsViewModel(this) + // Log out the user when the app starts + authViewModel.logout() + setContent { XefAndroidApp(authViewModel = authViewModel, settingsViewModel = settingsViewModel) } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt index b44593808..2a5bbe240 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt @@ -188,8 +188,11 @@ fun MainLayout( ) }, onClick = { - coroutineScope.launch { drawerState.close() } - authViewModel.logout() + coroutineScope.launch { + drawerState.close() + authViewModel.logout() + navController.navigate(Screens.Login.screen) { popUpTo(0) { inclusive = true } } + } } ) } @@ -219,11 +222,11 @@ fun MainLayout( } }, colors = - TopAppBarDefaults.topAppBarColors( - containerColor = CustomLightBlue, - titleContentColor = Color.White, - navigationIconContentColor = Color.White - ), + TopAppBarDefaults.topAppBarColors( + containerColor = CustomLightBlue, + titleContentColor = Color.White, + navigationIconContentColor = Color.White + ), navigationIcon = { IconButton(onClick = { coroutineScope.launch { drawerState.open() } }) { Icon(Icons.Rounded.Menu, contentDescription = "MenuButton") diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt index 08b08138d..f1ecc5d8a 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt @@ -25,52 +25,60 @@ import com.xef.xefMobile.ui.viewmodels.SettingsViewModel @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @Composable fun XefAndroidApp(authViewModel: IAuthViewModel, settingsViewModel: SettingsViewModel) { - val navigationController = rememberNavController() + val navController = rememberNavController() val userName by authViewModel.userName.observeAsState("") NavHost( - navController = navigationController, + navController = navController, startDestination = Screens.Login.screen, modifier = Modifier.padding(top = 16.dp) ) { - composable(Screens.Login.screen) { LoginScreen(authViewModel, navigationController) } - composable(Screens.Register.screen) { RegisterScreen(authViewModel, navigationController) } + composable(Screens.Login.screen) { + LoginScreen(authViewModel, navController) + } + composable(Screens.Register.screen) { + RegisterScreen(authViewModel, navController) + } composable(Screens.Home.screen) { MainLayout( - navController = navigationController, + navController = navController, authViewModel = authViewModel, userName = userName.orEmpty() ) { - HomeScreen(authViewModel, navigationController) + HomeScreen(authViewModel, navController) } } composable(Screens.Assistants.screen) { MainLayout( - navController = navigationController, + navController = navController, authViewModel = authViewModel, userName = userName.orEmpty() ) { - AssistantScreen(navigationController, authViewModel, settingsViewModel) + AssistantScreen(navController, authViewModel, settingsViewModel) } } composable(Screens.CreateAssistant.screen) { MainLayout( - navController = navigationController, + navController = navController, authViewModel = authViewModel, userName = userName.orEmpty() ) { - CreateAssistantScreen(navigationController) + CreateAssistantScreen( + navController = navController, + authViewModel = authViewModel, + settingsViewModel = settingsViewModel + ) } } composable(Screens.Settings.screen) { MainLayout( - navController = navigationController, + navController = navController, authViewModel = authViewModel, userName = userName.orEmpty() ) { - SettingsScreen(navigationController, settingsViewModel = settingsViewModel) + SettingsScreen(navController, settingsViewModel) } } - // ... other composable screens ... + // Add other composable screens here... } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt index 6a8e331b9..02f6317ee 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -1,7 +1,14 @@ package com.xef.xefMobile.model import kotlinx.serialization.Serializable +import kotlinx.serialization.SerialName -@Serializable data class Assistant(val id: String, val name: String) +@Serializable +data class Assistant( + val id: String, + val name: String, + @SerialName("created_at") val createdAt: Long // Use the correct field name from the JSON response +) -@Serializable data class AssistantsResponse(val data: List) +@Serializable +data class AssistantsResponse(val data: List) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index ce89efab5..851209aed 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -46,16 +46,14 @@ class ApiService { suspend fun getAssistants(authToken: String): AssistantsResponse { return try { - val response: HttpResponse = - HttpClientProvider.client.get { - url("http://10.0.2.2:8081/v1/settings/assistants") - header(HttpHeaders.Authorization, "Bearer $authToken") - header("OpenAI-Beta", "assistants=v2") - } + val response: HttpResponse = HttpClientProvider.client.get { + url("http://10.0.2.2:8081/v1/settings/assistants") + header(HttpHeaders.Authorization, "Bearer $authToken") + header("OpenAI-Beta", "assistants=v2") + } val responseBody: String = response.bodyAsText() Log.d("ApiService", "Assistants response body: $responseBody") - response.body() } catch (e: Exception) { Log.e("ApiService", "Fetching assistants failed: ${e.message}", e) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt index fb255ef0e..4840dd017 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -26,7 +26,8 @@ import com.xef.xefMobile.ui.viewmodels.PathViewModel fun FilePickerDialog( onDismissRequest: () -> Unit, customColors: CustomColors, - onFilesSelected: () -> Unit + onFilesSelected: () -> Unit, + mimeTypeFilter: String = "*/*" // Default to all files ) { val viewModel: PathViewModel = viewModel() val state = viewModel.state @@ -84,7 +85,7 @@ fun FilePickerDialog( Text( text = path, modifier = - Modifier.fillMaxWidth().clickable { selectedFile = path }.padding(8.dp), + Modifier.fillMaxWidth().clickable { selectedFile = path }.padding(8.dp), color = if (selectedFile == path) Color.Blue else Color.Unspecified ) } @@ -94,16 +95,16 @@ fun FilePickerDialog( OutlinedButton( onClick = { if (permissionState.status.isGranted) { - filePickerLauncher.launch("*/*") + filePickerLauncher.launch(mimeTypeFilter) } else { permissionState.launchPermissionRequest() } }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text(text = "Browse files") } @@ -114,10 +115,10 @@ fun FilePickerDialog( selectedFile = null }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text(text = "Remove") } @@ -128,13 +129,14 @@ fun FilePickerDialog( Button( onClick = { onDismissRequest() }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Done") } } ) } + diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt index 462215bdb..7732a3f62 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt @@ -8,6 +8,7 @@ import com.server.movile.xef.android.ui.screens.LoginScreen import com.server.movile.xef.android.ui.screens.RegisterScreen import com.server.movile.xef.android.ui.screens.menu.AssistantScreen import com.server.movile.xef.android.ui.screens.menu.CreateAssistantScreen +import com.server.movile.xef.android.ui.screens.navigationdrawercompose.HomeScreen import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.xef.xefMobile.ui.screens.Screens import com.xef.xefMobile.ui.screens.SettingsScreen @@ -31,10 +32,13 @@ fun AppNavigator(authViewModel: IAuthViewModel, settingsViewModel: SettingsViewM ) } composable(Screens.CreateAssistant.screen) { - CreateAssistantScreen(navController = navController) + CreateAssistantScreen(navController = navController, authViewModel = authViewModel, settingsViewModel = settingsViewModel) } composable(Screens.Settings.screen) { SettingsScreen(navController = navController, settingsViewModel = settingsViewModel) } + composable(Screens.Home.screen) { + HomeScreen(authViewModel = authViewModel, navController = navController) + } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt index af9fd6fbb..4853df155 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt @@ -23,6 +23,7 @@ import com.xef.xefMobile.ui.screens.Screens @Composable fun LoginScreen(authViewModel: IAuthViewModel, navController: NavController) { val authToken by authViewModel.authToken.observeAsState() + val loginError by authViewModel.loginError.observeAsState() var email by remember { mutableStateOf("") } var password by remember { mutableStateOf("") } var errorMessage by remember { mutableStateOf(null) } @@ -37,7 +38,9 @@ fun LoginScreen(authViewModel: IAuthViewModel, navController: NavController) { } Column( - modifier = Modifier.fillMaxSize().background(Color.White), + modifier = Modifier + .fillMaxSize() + .background(Color.White), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { @@ -52,6 +55,9 @@ fun LoginScreen(authViewModel: IAuthViewModel, navController: NavController) { if (errorMessage != null) { Text(text = errorMessage!!, color = Color.Red, textAlign = TextAlign.Center) Spacer(modifier = Modifier.height(8.dp)) + } else if (loginError != null) { + Text(text = loginError!!, color = Color.Red, textAlign = TextAlign.Center) + Spacer(modifier = Modifier.height(8.dp)) } OutlinedTextField( @@ -75,12 +81,10 @@ fun LoginScreen(authViewModel: IAuthViewModel, navController: NavController) { onClick = { when { email.isBlank() -> { - errorMessage = "Email field is empty" - Log.d("LoginScreen", "Email field is empty") + errorMessage = "Please enter your email." } password.isBlank() -> { - errorMessage = "Password field is empty" - Log.d("LoginScreen", "Password field is empty") + errorMessage = "Please enter your password." } else -> { errorMessage = null diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt index e4228db05..803a46edc 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt @@ -21,38 +21,37 @@ import org.xef.xefMobile.R @OptIn(ExperimentalMaterial3Api::class) @Composable fun SettingsScreen(navController: NavController, settingsViewModel: SettingsViewModel) { - // Step 1: Collect and observe the API key state from the ViewModel val apiKey by settingsViewModel.apiKey.collectAsState() var apiKeyInput by remember { mutableStateOf(apiKey) } val coroutineScope = rememberCoroutineScope() - // Custom colors for UI elements val customColors = Color(0xFFADD8E6) val CustomTextBlue = Color(0xFF0199D7) - // Step 4: Snackbar state management var showSnackbar by remember { mutableStateOf(false) } val snackbarHostState = remember { SnackbarHostState() } - // Display Snackbar when showSnackbar becomes true LaunchedEffect(showSnackbar) { if (showSnackbar) { snackbarHostState.showSnackbar("API key saved successfully") showSnackbar = false + navController.navigate(Screens.Home.screen) } } - // Step 5: Scaffold to provide structure and Snackbar host Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }) { innerPadding -> Box( - modifier = Modifier.fillMaxSize().background(Color.White).padding(innerPadding).padding(16.dp) + modifier = Modifier + .fillMaxSize() + .background(Color.White) + .padding(innerPadding) + .padding(16.dp) ) { Column( modifier = Modifier.align(Alignment.Center), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { - // Step 2: UI elements for settings screen Text(text = "Settings", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = Color.Black) Spacer(modifier = Modifier.height(8.dp)) Text(text = "These are xef-server settings.", fontSize = 16.sp, color = Color.Gray) @@ -64,13 +63,12 @@ fun SettingsScreen(navController: NavController, settingsViewModel: SettingsView modifier = Modifier.fillMaxWidth() ) Spacer(modifier = Modifier.height(16.dp)) - // Step 3: Button to save the API key Button( onClick = { coroutineScope.launch { settingsViewModel.setApiKey(apiKeyInput) settingsViewModel.saveApiKey() - showSnackbar = true // Trigger Snackbar + showSnackbar = true } }, colors = ButtonDefaults.buttonColors(containerColor = customColors), @@ -93,4 +91,4 @@ fun SettingsScreen(navController: NavController, settingsViewModel: SettingsView } } } -} +} \ No newline at end of file diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt index f29799731..2d79b38b5 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt @@ -1,10 +1,13 @@ package com.server.movile.xef.android.ui.screens.menu import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -17,6 +20,9 @@ import com.server.movile.xef.android.ui.viewmodels.AssistantViewModel import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.xef.xefMobile.ui.screens.Screens import com.xef.xefMobile.ui.viewmodels.SettingsViewModel +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale @Composable fun AssistantScreen( @@ -31,6 +37,8 @@ fun AssistantScreen( val loading by viewModel.loading.collectAsState() val errorMessage by viewModel.errorMessage.collectAsState() + val sdf = remember { SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) } + Box(modifier = Modifier.fillMaxSize()) { when { loading -> { @@ -45,8 +53,8 @@ fun AssistantScreen( } else -> { Column( - modifier = Modifier.align(Alignment.TopCenter).padding(20.dp), - horizontalAlignment = Alignment.CenterHorizontally + modifier = Modifier.fillMaxSize().padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally // Align title to center ) { Text( text = "Assistants", @@ -57,10 +65,39 @@ fun AssistantScreen( Spacer(modifier = Modifier.height(16.dp)) - assistants.forEach { assistant -> - Text(text = assistant.name, fontWeight = FontWeight.Bold) - Text(text = assistant.id) - Spacer(modifier = Modifier.height(8.dp)) + LazyColumn( + modifier = Modifier.fillMaxSize() + ) { + items(assistants) { assistant -> + Column( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 8.dp), + horizontalAlignment = Alignment.Start // Align items to start + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text( + text = assistant.name.ifBlank { "Untitled assistant" }, + fontWeight = FontWeight.Bold, + fontSize = 18.sp + ) + Text( + text = sdf.format(Date(assistant.createdAt * 1000)), + fontSize = 14.sp, + color = Color.Gray, + modifier = Modifier.align(Alignment.CenterVertically) + ) + } + Text( + text = "ID: ${assistant.id}", + fontSize = 14.sp + ) + } + Divider(color = Color.Gray) + } } } } @@ -68,11 +105,10 @@ fun AssistantScreen( Button( onClick = { navController.navigate(Screens.CreateAssistant.screen) }, - colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ), + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ), modifier = Modifier.align(Alignment.BottomCenter).padding(16.dp) ) { Text(text = "Create New Assistant") @@ -86,8 +122,10 @@ class AssistantViewModelFactory( ) : ViewModelProvider.Factory { override fun create(modelClass: Class): T { if (modelClass.isAssignableFrom(AssistantViewModel::class.java)) { - @Suppress("UNCHECKED_CAST") return AssistantViewModel(authViewModel, settingsViewModel) as T + @Suppress("UNCHECKED_CAST") + return AssistantViewModel(authViewModel, settingsViewModel) as T } throw IllegalArgumentException("Unknown ViewModel class") } } + diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index f90262594..7cb970a61 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -11,28 +11,46 @@ 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.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController import com.server.movile.xef.android.ui.themes.LocalCustomColors +import com.server.movile.xef.android.ui.viewmodels.AssistantViewModel +import com.server.movile.xef.android.ui.viewmodels.AuthViewModel +import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.xef.xefMobile.ui.composable.FilePickerDialog +import com.xef.xefMobile.ui.viewmodels.SettingsViewModel +import com.xef.xefMobile.ui.viewmodels.SettingsViewModelFactory +import com.xef.xefMobile.ui.viewmodels.factory.AuthViewModelFactory + class CreateAssistantActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { - // Pass the NavController to CreateAssistantScreen val navController = rememberNavController() - CreateAssistantScreen(navController) + + // Obtain ViewModels + val authViewModel: AuthViewModel = viewModel(factory = AuthViewModelFactory(applicationContext)) + val settingsViewModel: SettingsViewModel = viewModel(factory = SettingsViewModelFactory(applicationContext)) + + // Pass the ViewModels to the Composable + CreateAssistantScreen(navController, authViewModel, settingsViewModel) } } } @OptIn(ExperimentalMaterial3Api::class) @Composable -fun CreateAssistantScreen(navController: NavController) { +fun CreateAssistantScreen( + navController: NavController, + authViewModel: IAuthViewModel, + settingsViewModel: SettingsViewModel +) { + val viewModel: AssistantViewModel = viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) + var name by remember { mutableStateOf("") } var instructions by remember { mutableStateOf("") } var temperature by remember { mutableStateOf(1f) } @@ -44,6 +62,7 @@ fun CreateAssistantScreen(navController: NavController) { var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } var showFilePicker by remember { mutableStateOf(false) } + var showCodeInterpreterPicker by remember { mutableStateOf(false) } val customColors = LocalCustomColors.current @@ -109,10 +128,10 @@ fun CreateAssistantScreen(navController: NavController) { TextButton( onClick = { showFilePicker = true }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("File Search +") } @@ -121,21 +140,21 @@ fun CreateAssistantScreen(navController: NavController) { checked = fileSearchEnabled, onCheckedChange = { fileSearchEnabled = it }, colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { TextButton( - onClick = { /* handle cancel */}, + onClick = { showCodeInterpreterPicker = true }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Code Interpreter +") } @@ -144,10 +163,10 @@ fun CreateAssistantScreen(navController: NavController) { checked = codeInterpreterEnabled, onCheckedChange = { codeInterpreterEnabled = it }, colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) @@ -155,10 +174,10 @@ fun CreateAssistantScreen(navController: NavController) { TextButton( onClick = { /* handle cancel */}, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Functions +") } @@ -183,21 +202,36 @@ fun CreateAssistantScreen(navController: NavController) { Button( onClick = { navController.navigateUp() }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } Spacer(modifier = Modifier.width(8.dp)) Button( - onClick = { /* handle create */}, - colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary + onClick = { + viewModel.createAssistant( + name = name, + instructions = instructions, + temperature = temperature, + topP = topP, + model = model, + onSuccess = { + navController.navigateUp() // Navigate back on success + }, + onError = { errorMessage -> + // Handle error (e.g., show a toast or dialog) + println("Error: $errorMessage") + } ) + }, + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Create") } @@ -213,6 +247,17 @@ fun CreateAssistantScreen(navController: NavController) { } ) } + if (showCodeInterpreterPicker) { + FilePickerDialog( + onDismissRequest = { showCodeInterpreterPicker = false }, + customColors = customColors, + onFilesSelected = { + // Handle file selection here if needed + showCodeInterpreterPicker = false + }, + mimeTypeFilter = "text/*" // Only allow text files + ) + } } } @@ -233,10 +278,10 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U steps = 100, // This ensures the slider moves in increments of 0.02 modifier = Modifier.weight(3f), colors = - SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) + SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) ) Spacer( modifier = Modifier.width(2.dp) @@ -254,10 +299,3 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U } } } - -@Preview(showBackground = false) -@Composable -fun CreateAssistantScreenPreview() { - val navController = rememberNavController() - CreateAssistantScreen(navController) -} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 8fc264dc6..b865e2c9f 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -5,10 +5,19 @@ import androidx.lifecycle.viewModelScope import com.xef.xefMobile.model.Assistant import com.xef.xefMobile.services.ApiService import com.xef.xefMobile.ui.viewmodels.SettingsViewModel +import io.ktor.client.* +import io.ktor.client.request.* +import io.ktor.client.statement.* +import io.ktor.http.* +import io.ktor.util.* import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import kotlinx.serialization.Serializable +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale class AssistantViewModel( private val authViewModel: IAuthViewModel, @@ -23,6 +32,8 @@ class AssistantViewModel( private val _errorMessage = MutableStateFlow(null) val errorMessage: StateFlow = _errorMessage.asStateFlow() + private val client = HttpClient() + init { fetchAssistants() } @@ -42,4 +53,54 @@ class AssistantViewModel( } } } + + @OptIn(InternalAPI::class) + fun createAssistant( + name: String, + instructions: String, + temperature: Float, + topP: Float, + model: String, + onSuccess: () -> Unit, + onError: (String) -> Unit + ) { + viewModelScope.launch { + try { + val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") + val response: HttpResponse = client.post("http://your.api.endpoint/v1/settings/assistants") { + contentType(ContentType.Application.Json) + header("Authorization", "Bearer $token") + body = CreateAssistantRequest( + model = model, + name = name, + instructions = instructions, + temperature = temperature.toDouble(), + topP = topP.toDouble() + ) + } + if (response.status == HttpStatusCode.Created) { + onSuccess() + } else { + onError("Failed to create assistant: ${response.status}") + } + } catch (e: Exception) { + onError("Error: ${e.message}") + } + } + } + + private fun formatDate(timestamp: Long): String { + val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) + val date = Date(timestamp * 1000) // Convert Unix timestamp to milliseconds + return sdf.format(date) + } } + +@Serializable +data class CreateAssistantRequest( + val model: String, + val name: String, + val instructions: String, + val temperature: Double, + val topP: Double +) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt index 1aed4dafc..716d5ade3 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt @@ -11,19 +11,17 @@ import androidx.lifecycle.viewModelScope import com.xef.xefMobile.model.LoginRequest import com.xef.xefMobile.model.RegisterRequest import com.xef.xefMobile.services.ApiService -import java.io.IOException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import retrofit2.HttpException +import java.io.IOException -// Extension function to provide DataStore instance private val Context.dataStore by preferencesDataStore(name = "settings") -class AuthViewModel(context: Context, private val apiService: ApiService) : - ViewModel(), IAuthViewModel { +class AuthViewModel(context: Context, private val apiService: ApiService) : ViewModel(), IAuthViewModel { private val dataStore = context.dataStore @@ -39,16 +37,18 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : private val _userName = MutableLiveData() override val userName: LiveData = _userName + private val _loginError = MutableLiveData() + override val loginError: LiveData = _loginError + init { loadAuthToken() } private fun loadAuthToken() { viewModelScope.launch { - val token = - dataStore.data - .map { preferences -> preferences[stringPreferencesKey("authToken")] } - .firstOrNull() + val token = dataStore.data + .map { preferences -> preferences[stringPreferencesKey("authToken")] } + .firstOrNull() _authToken.value = token token?.let { loadUserName() } @@ -57,10 +57,9 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : private suspend fun loadUserName() { withContext(Dispatchers.IO) { - val name = - dataStore.data - .map { preferences -> preferences[stringPreferencesKey("userName")] } - .firstOrNull() + val name = dataStore.data + .map { preferences -> preferences[stringPreferencesKey("userName")] } + .firstOrNull() _userName.postValue(name) } } @@ -72,9 +71,10 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : try { val loginResponse = apiService.loginUser(loginRequest) updateAuthToken(loginResponse.authToken) - updateUserName(loginResponse.user.name) // Extract user's name + updateUserName(loginResponse.user.name) _authToken.value = loginResponse.authToken _userName.value = loginResponse.user.name + _loginError.value = null } catch (e: Exception) { handleException(e) } finally { @@ -85,13 +85,17 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : private suspend fun updateAuthToken(token: String) { withContext(Dispatchers.IO) { - dataStore.edit { preferences -> preferences[stringPreferencesKey("authToken")] = token } + dataStore.edit { preferences -> + preferences[stringPreferencesKey("authToken")] = token + } } } private suspend fun updateUserName(name: String) { withContext(Dispatchers.IO) { - dataStore.edit { preferences -> preferences[stringPreferencesKey("userName")] = name } + dataStore.edit { preferences -> + preferences[stringPreferencesKey("userName")] = name + } } } @@ -102,7 +106,7 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : try { val registerResponse = apiService.registerUser(request) updateAuthToken(registerResponse.authToken) - updateUserName(name) // Directly use the name provided during registration + updateUserName(name) _authToken.value = registerResponse.authToken _userName.value = name } catch (e: Exception) { @@ -114,11 +118,18 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : } private fun handleException(e: Exception) { - when (e) { - is IOException -> _errorMessage.postValue("Network error") - is HttpException -> _errorMessage.postValue("Unexpected server error: ${e.code()}") - else -> _errorMessage.postValue("An unexpected error occurred: ${e.message}") + val errorMessage = when (e) { + is IOException -> "Network error" + is HttpException -> { + when (e.code()) { + 401 -> "Incorrect email or password" + 404 -> "Email not registered" + else -> "Unexpected server error" + } + } + else -> "An unexpected error occurred" } + _loginError.postValue(errorMessage) } override fun logout() { @@ -127,11 +138,11 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : withContext(Dispatchers.IO) { dataStore.edit { preferences -> preferences.remove(stringPreferencesKey("authToken")) - preferences.remove(stringPreferencesKey("userName")) // Add this line + preferences.remove(stringPreferencesKey("userName")) } } _authToken.postValue(null) - _userName.postValue(null) // Add this line + _userName.postValue(null) _errorMessage.postValue("Logged out successfully") } catch (e: Exception) { _errorMessage.postValue("Failed to sign out") diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt index 5cc84e2e5..86cb53267 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/IAuthViewModel.kt @@ -7,6 +7,7 @@ interface IAuthViewModel { val isLoading: LiveData val errorMessage: LiveData val userName: LiveData + val loginError: LiveData // Add this line fun login(email: String, password: String) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt index 10dc0c8be..074b8c203 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt @@ -9,8 +9,7 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch class SettingsViewModel(context: Context) : ViewModel() { - private val preferences: SharedPreferences = - context.getSharedPreferences("settings", Context.MODE_PRIVATE) + private val preferences: SharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE) private val _apiKey = MutableStateFlow(preferences.getString("api_key", "") ?: "") val apiKey: StateFlow = _apiKey @@ -19,6 +18,8 @@ class SettingsViewModel(context: Context) : ViewModel() { } fun saveApiKey() { - viewModelScope.launch { preferences.edit().putString("api_key", _apiKey.value).apply() } + viewModelScope.launch { + preferences.edit().putString("api_key", _apiKey.value).apply() + } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt new file mode 100644 index 000000000..742900d8c --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt @@ -0,0 +1,17 @@ +package com.xef.xefMobile.ui.viewmodels.factory + +import com.server.movile.xef.android.ui.viewmodels.AuthViewModel +import android.content.Context +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import com.xef.xefMobile.services.ApiService + +class AuthViewModelFactory(private val context: Context) : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(AuthViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") + return AuthViewModel(context, ApiService()) as T + } + throw IllegalArgumentException("Unknown ViewModel class") + } +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/SettingsViewModelFactory.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/SettingsViewModelFactory.kt new file mode 100644 index 000000000..770518f14 --- /dev/null +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/SettingsViewModelFactory.kt @@ -0,0 +1,15 @@ +package com.xef.xefMobile.ui.viewmodels + +import android.content.Context +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider + +class SettingsViewModelFactory(private val context: Context) : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(SettingsViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") + return SettingsViewModel(context) as T + } + throw IllegalArgumentException("Unknown ViewModel class") + } +} From 5674a1f3fab50a263e153f78cabc6655b62b05c9 Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Wed, 29 May 2024 14:21:44 +0000 Subject: [PATCH 10/30] Apply spotless formatting --- .../kotlin/com/xef/xefMobile/MainLayout.kt | 10 +-- .../kotlin/com/xef/xefMobile/XefAndroidApp.kt | 12 +-- .../com/xef/xefMobile/model/AssistantModel.kt | 11 ++- .../com/xef/xefMobile/services/ApiService.kt | 11 +-- .../ui/composable/FilePickerDialog.kt | 27 ++++--- .../xef/xefMobile/ui/navigation/Navigation.kt | 6 +- .../xef/xefMobile/ui/screens/LoginScreen.kt | 4 +- .../xefMobile/ui/screens/SettingsScreen.kt | 8 +- .../ui/screens/menu/AssistantScreen.kt | 26 +++---- .../ui/screens/menu/CreateAssistantScreen.kt | 74 ++++++++++--------- .../ui/viewmodels/AssistantViewModel.kt | 30 ++++---- .../xefMobile/ui/viewmodels/AuthViewModel.kt | 46 ++++++------ .../ui/viewmodels/SettingsViewModel.kt | 7 +- .../factory/AuthViewModelFactory.kt | 13 ++-- .../factory/SettingsViewModelFactory.kt | 11 ++- 15 files changed, 141 insertions(+), 155 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt index 2a5bbe240..7e6ae86ad 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainLayout.kt @@ -222,11 +222,11 @@ fun MainLayout( } }, colors = - TopAppBarDefaults.topAppBarColors( - containerColor = CustomLightBlue, - titleContentColor = Color.White, - navigationIconContentColor = Color.White - ), + TopAppBarDefaults.topAppBarColors( + containerColor = CustomLightBlue, + titleContentColor = Color.White, + navigationIconContentColor = Color.White + ), navigationIcon = { IconButton(onClick = { coroutineScope.launch { drawerState.open() } }) { Icon(Icons.Rounded.Menu, contentDescription = "MenuButton") diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt index f1ecc5d8a..e0ab551bd 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt @@ -33,12 +33,8 @@ fun XefAndroidApp(authViewModel: IAuthViewModel, settingsViewModel: SettingsView startDestination = Screens.Login.screen, modifier = Modifier.padding(top = 16.dp) ) { - composable(Screens.Login.screen) { - LoginScreen(authViewModel, navController) - } - composable(Screens.Register.screen) { - RegisterScreen(authViewModel, navController) - } + composable(Screens.Login.screen) { LoginScreen(authViewModel, navController) } + composable(Screens.Register.screen) { RegisterScreen(authViewModel, navController) } composable(Screens.Home.screen) { MainLayout( navController = navController, @@ -65,8 +61,8 @@ fun XefAndroidApp(authViewModel: IAuthViewModel, settingsViewModel: SettingsView ) { CreateAssistantScreen( navController = navController, - authViewModel = authViewModel, - settingsViewModel = settingsViewModel + authViewModel = authViewModel, + settingsViewModel = settingsViewModel ) } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt index 02f6317ee..309347ca4 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -1,14 +1,13 @@ package com.xef.xefMobile.model -import kotlinx.serialization.Serializable import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable @Serializable data class Assistant( - val id: String, - val name: String, - @SerialName("created_at") val createdAt: Long // Use the correct field name from the JSON response + val id: String, + val name: String, + @SerialName("created_at") val createdAt: Long // Use the correct field name from the JSON response ) -@Serializable -data class AssistantsResponse(val data: List) +@Serializable data class AssistantsResponse(val data: List) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index 851209aed..225e6a8cf 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -46,11 +46,12 @@ class ApiService { suspend fun getAssistants(authToken: String): AssistantsResponse { return try { - val response: HttpResponse = HttpClientProvider.client.get { - url("http://10.0.2.2:8081/v1/settings/assistants") - header(HttpHeaders.Authorization, "Bearer $authToken") - header("OpenAI-Beta", "assistants=v2") - } + val response: HttpResponse = + HttpClientProvider.client.get { + url("http://10.0.2.2:8081/v1/settings/assistants") + header(HttpHeaders.Authorization, "Bearer $authToken") + header("OpenAI-Beta", "assistants=v2") + } val responseBody: String = response.bodyAsText() Log.d("ApiService", "Assistants response body: $responseBody") diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt index 4840dd017..0c2af0393 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -85,7 +85,7 @@ fun FilePickerDialog( Text( text = path, modifier = - Modifier.fillMaxWidth().clickable { selectedFile = path }.padding(8.dp), + Modifier.fillMaxWidth().clickable { selectedFile = path }.padding(8.dp), color = if (selectedFile == path) Color.Blue else Color.Unspecified ) } @@ -101,10 +101,10 @@ fun FilePickerDialog( } }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text(text = "Browse files") } @@ -115,10 +115,10 @@ fun FilePickerDialog( selectedFile = null }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text(text = "Remove") } @@ -129,14 +129,13 @@ fun FilePickerDialog( Button( onClick = { onDismissRequest() }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Done") } } ) } - diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt index 7732a3f62..ed5fd2e9d 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt @@ -32,7 +32,11 @@ fun AppNavigator(authViewModel: IAuthViewModel, settingsViewModel: SettingsViewM ) } composable(Screens.CreateAssistant.screen) { - CreateAssistantScreen(navController = navController, authViewModel = authViewModel, settingsViewModel = settingsViewModel) + CreateAssistantScreen( + navController = navController, + authViewModel = authViewModel, + settingsViewModel = settingsViewModel + ) } composable(Screens.Settings.screen) { SettingsScreen(navController = navController, settingsViewModel = settingsViewModel) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt index 4853df155..583bce7a3 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/LoginScreen.kt @@ -38,9 +38,7 @@ fun LoginScreen(authViewModel: IAuthViewModel, navController: NavController) { } Column( - modifier = Modifier - .fillMaxSize() - .background(Color.White), + modifier = Modifier.fillMaxSize().background(Color.White), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt index 803a46edc..fea01f951 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/SettingsScreen.kt @@ -41,11 +41,7 @@ fun SettingsScreen(navController: NavController, settingsViewModel: SettingsView Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }) { innerPadding -> Box( - modifier = Modifier - .fillMaxSize() - .background(Color.White) - .padding(innerPadding) - .padding(16.dp) + modifier = Modifier.fillMaxSize().background(Color.White).padding(innerPadding).padding(16.dp) ) { Column( modifier = Modifier.align(Alignment.Center), @@ -91,4 +87,4 @@ fun SettingsScreen(navController: NavController, settingsViewModel: SettingsView } } } -} \ No newline at end of file +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt index 2d79b38b5..46988fb4b 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt @@ -65,14 +65,10 @@ fun AssistantScreen( Spacer(modifier = Modifier.height(16.dp)) - LazyColumn( - modifier = Modifier.fillMaxSize() - ) { + LazyColumn(modifier = Modifier.fillMaxSize()) { items(assistants) { assistant -> Column( - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 8.dp), + modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), horizontalAlignment = Alignment.Start // Align items to start ) { Row( @@ -91,10 +87,7 @@ fun AssistantScreen( modifier = Modifier.align(Alignment.CenterVertically) ) } - Text( - text = "ID: ${assistant.id}", - fontSize = 14.sp - ) + Text(text = "ID: ${assistant.id}", fontSize = 14.sp) } Divider(color = Color.Gray) } @@ -105,10 +98,11 @@ fun AssistantScreen( Button( onClick = { navController.navigate(Screens.CreateAssistant.screen) }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ), + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ), modifier = Modifier.align(Alignment.BottomCenter).padding(16.dp) ) { Text(text = "Create New Assistant") @@ -122,10 +116,8 @@ class AssistantViewModelFactory( ) : ViewModelProvider.Factory { override fun create(modelClass: Class): T { if (modelClass.isAssignableFrom(AssistantViewModel::class.java)) { - @Suppress("UNCHECKED_CAST") - return AssistantViewModel(authViewModel, settingsViewModel) as T + @Suppress("UNCHECKED_CAST") return AssistantViewModel(authViewModel, settingsViewModel) as T } throw IllegalArgumentException("Unknown ViewModel class") } } - diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 7cb970a61..f45b3a279 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -25,7 +25,6 @@ import com.xef.xefMobile.ui.viewmodels.SettingsViewModel import com.xef.xefMobile.ui.viewmodels.SettingsViewModelFactory import com.xef.xefMobile.ui.viewmodels.factory.AuthViewModelFactory - class CreateAssistantActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -33,8 +32,10 @@ class CreateAssistantActivity : ComponentActivity() { val navController = rememberNavController() // Obtain ViewModels - val authViewModel: AuthViewModel = viewModel(factory = AuthViewModelFactory(applicationContext)) - val settingsViewModel: SettingsViewModel = viewModel(factory = SettingsViewModelFactory(applicationContext)) + val authViewModel: AuthViewModel = + viewModel(factory = AuthViewModelFactory(applicationContext)) + val settingsViewModel: SettingsViewModel = + viewModel(factory = SettingsViewModelFactory(applicationContext)) // Pass the ViewModels to the Composable CreateAssistantScreen(navController, authViewModel, settingsViewModel) @@ -49,7 +50,8 @@ fun CreateAssistantScreen( authViewModel: IAuthViewModel, settingsViewModel: SettingsViewModel ) { - val viewModel: AssistantViewModel = viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) + val viewModel: AssistantViewModel = + viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) var name by remember { mutableStateOf("") } var instructions by remember { mutableStateOf("") } @@ -128,10 +130,10 @@ fun CreateAssistantScreen( TextButton( onClick = { showFilePicker = true }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("File Search +") } @@ -140,10 +142,10 @@ fun CreateAssistantScreen( checked = fileSearchEnabled, onCheckedChange = { fileSearchEnabled = it }, colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) @@ -151,10 +153,10 @@ fun CreateAssistantScreen( TextButton( onClick = { showCodeInterpreterPicker = true }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Code Interpreter +") } @@ -163,10 +165,10 @@ fun CreateAssistantScreen( checked = codeInterpreterEnabled, onCheckedChange = { codeInterpreterEnabled = it }, colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) @@ -174,10 +176,10 @@ fun CreateAssistantScreen( TextButton( onClick = { /* handle cancel */}, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Functions +") } @@ -202,10 +204,10 @@ fun CreateAssistantScreen( Button( onClick = { navController.navigateUp() }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } @@ -228,10 +230,10 @@ fun CreateAssistantScreen( ) }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Create") } @@ -278,10 +280,10 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U steps = 100, // This ensures the slider moves in increments of 0.02 modifier = Modifier.weight(3f), colors = - SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) + SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) ) Spacer( modifier = Modifier.width(2.dp) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index b865e2c9f..5ca40bd07 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -10,14 +10,14 @@ import io.ktor.client.request.* import io.ktor.client.statement.* import io.ktor.http.* import io.ktor.util.* +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.serialization.Serializable -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale class AssistantViewModel( private val authViewModel: IAuthViewModel, @@ -67,17 +67,19 @@ class AssistantViewModel( viewModelScope.launch { try { val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") - val response: HttpResponse = client.post("http://your.api.endpoint/v1/settings/assistants") { - contentType(ContentType.Application.Json) - header("Authorization", "Bearer $token") - body = CreateAssistantRequest( - model = model, - name = name, - instructions = instructions, - temperature = temperature.toDouble(), - topP = topP.toDouble() - ) - } + val response: HttpResponse = + client.post("http://your.api.endpoint/v1/settings/assistants") { + contentType(ContentType.Application.Json) + header("Authorization", "Bearer $token") + body = + CreateAssistantRequest( + model = model, + name = name, + instructions = instructions, + temperature = temperature.toDouble(), + topP = topP.toDouble() + ) + } if (response.status == HttpStatusCode.Created) { onSuccess() } else { diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt index 716d5ade3..af15147e9 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AuthViewModel.kt @@ -11,17 +11,18 @@ import androidx.lifecycle.viewModelScope import com.xef.xefMobile.model.LoginRequest import com.xef.xefMobile.model.RegisterRequest import com.xef.xefMobile.services.ApiService +import java.io.IOException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import retrofit2.HttpException -import java.io.IOException private val Context.dataStore by preferencesDataStore(name = "settings") -class AuthViewModel(context: Context, private val apiService: ApiService) : ViewModel(), IAuthViewModel { +class AuthViewModel(context: Context, private val apiService: ApiService) : + ViewModel(), IAuthViewModel { private val dataStore = context.dataStore @@ -46,9 +47,10 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : View private fun loadAuthToken() { viewModelScope.launch { - val token = dataStore.data - .map { preferences -> preferences[stringPreferencesKey("authToken")] } - .firstOrNull() + val token = + dataStore.data + .map { preferences -> preferences[stringPreferencesKey("authToken")] } + .firstOrNull() _authToken.value = token token?.let { loadUserName() } @@ -57,9 +59,10 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : View private suspend fun loadUserName() { withContext(Dispatchers.IO) { - val name = dataStore.data - .map { preferences -> preferences[stringPreferencesKey("userName")] } - .firstOrNull() + val name = + dataStore.data + .map { preferences -> preferences[stringPreferencesKey("userName")] } + .firstOrNull() _userName.postValue(name) } } @@ -85,17 +88,13 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : View private suspend fun updateAuthToken(token: String) { withContext(Dispatchers.IO) { - dataStore.edit { preferences -> - preferences[stringPreferencesKey("authToken")] = token - } + dataStore.edit { preferences -> preferences[stringPreferencesKey("authToken")] = token } } } private suspend fun updateUserName(name: String) { withContext(Dispatchers.IO) { - dataStore.edit { preferences -> - preferences[stringPreferencesKey("userName")] = name - } + dataStore.edit { preferences -> preferences[stringPreferencesKey("userName")] = name } } } @@ -118,17 +117,18 @@ class AuthViewModel(context: Context, private val apiService: ApiService) : View } private fun handleException(e: Exception) { - val errorMessage = when (e) { - is IOException -> "Network error" - is HttpException -> { - when (e.code()) { - 401 -> "Incorrect email or password" - 404 -> "Email not registered" - else -> "Unexpected server error" + val errorMessage = + when (e) { + is IOException -> "Network error" + is HttpException -> { + when (e.code()) { + 401 -> "Incorrect email or password" + 404 -> "Email not registered" + else -> "Unexpected server error" + } } + else -> "An unexpected error occurred" } - else -> "An unexpected error occurred" - } _loginError.postValue(errorMessage) } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt index 074b8c203..10dc0c8be 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/SettingsViewModel.kt @@ -9,7 +9,8 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch class SettingsViewModel(context: Context) : ViewModel() { - private val preferences: SharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE) + private val preferences: SharedPreferences = + context.getSharedPreferences("settings", Context.MODE_PRIVATE) private val _apiKey = MutableStateFlow(preferences.getString("api_key", "") ?: "") val apiKey: StateFlow = _apiKey @@ -18,8 +19,6 @@ class SettingsViewModel(context: Context) : ViewModel() { } fun saveApiKey() { - viewModelScope.launch { - preferences.edit().putString("api_key", _apiKey.value).apply() - } + viewModelScope.launch { preferences.edit().putString("api_key", _apiKey.value).apply() } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt index 742900d8c..982c8ab03 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt @@ -1,17 +1,16 @@ package com.xef.xefMobile.ui.viewmodels.factory -import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider +import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.xef.xefMobile.services.ApiService class AuthViewModelFactory(private val context: Context) : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { - if (modelClass.isAssignableFrom(AuthViewModel::class.java)) { - @Suppress("UNCHECKED_CAST") - return AuthViewModel(context, ApiService()) as T - } - throw IllegalArgumentException("Unknown ViewModel class") + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(AuthViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") return AuthViewModel(context, ApiService()) as T } + throw IllegalArgumentException("Unknown ViewModel class") + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/SettingsViewModelFactory.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/SettingsViewModelFactory.kt index 770518f14..a6015417e 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/SettingsViewModelFactory.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/SettingsViewModelFactory.kt @@ -5,11 +5,10 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider class SettingsViewModelFactory(private val context: Context) : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { - if (modelClass.isAssignableFrom(SettingsViewModel::class.java)) { - @Suppress("UNCHECKED_CAST") - return SettingsViewModel(context) as T - } - throw IllegalArgumentException("Unknown ViewModel class") + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(SettingsViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") return SettingsViewModel(context) as T } + throw IllegalArgumentException("Unknown ViewModel class") + } } From 7cc4f942a3d0a083f5ef13670d171b292ab73495 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Thu, 30 May 2024 11:35:32 +0200 Subject: [PATCH 11/30] Create assistant updates --- ...tlin-compiler-16732557141189752843.salive} | 0 server/xefMobile/composeApp/build.gradle.kts | 4 + .../com/xef/xefMobile/services/ApiService.kt | 15 + .../ui/screens/menu/CreateAssistantScreen.kt | 332 +++++++++--------- .../ui/viewmodels/AssistantViewModel.kt | 41 +-- .../factory/AuthViewModelFactory.kt | 13 +- 6 files changed, 211 insertions(+), 194 deletions(-) rename server/xefMobile/.kotlin/sessions/{kotlin-compiler-11133698606277225441.salive => kotlin-compiler-16732557141189752843.salive} (100%) diff --git a/server/xefMobile/.kotlin/sessions/kotlin-compiler-11133698606277225441.salive b/server/xefMobile/.kotlin/sessions/kotlin-compiler-16732557141189752843.salive similarity index 100% rename from server/xefMobile/.kotlin/sessions/kotlin-compiler-11133698606277225441.salive rename to server/xefMobile/.kotlin/sessions/kotlin-compiler-16732557141189752843.salive diff --git a/server/xefMobile/composeApp/build.gradle.kts b/server/xefMobile/composeApp/build.gradle.kts index e4193b512..39fc77d4e 100644 --- a/server/xefMobile/composeApp/build.gradle.kts +++ b/server/xefMobile/composeApp/build.gradle.kts @@ -91,6 +91,10 @@ kotlin { implementation("io.ktor:ktor-client-serialization-jvm:2.3.11") implementation("com.google.accompanist:accompanist-permissions:0.34.0") implementation("androidx.compose.runtime:runtime:1.6.7") + implementation("io.ktor:ktor-client-cio-jvm:2.3.11") + implementation("io.ktor:ktor-client-cio:2.3.11") + implementation("io.ktor:ktor-client-core-jvm:2.3.11") + implementation("androidx.compose.material3:material3:1.2.1") } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index 225e6a8cf..dfcf9e637 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -1,6 +1,7 @@ package com.xef.xefMobile.services import android.util.Log +import com.server.movile.xef.android.ui.viewmodels.CreateAssistantRequest import com.xef.xefMobile.model.* import com.xef.xefMobile.network.client.HttpClientProvider import io.ktor.client.call.* @@ -61,4 +62,18 @@ class ApiService { throw e } } + + suspend fun createAssistant(authToken: String, request: CreateAssistantRequest): HttpResponse { + return try { + HttpClientProvider.client.post { + url("http://10.0.2.2:8081/v1/settings/assistants") + contentType(ContentType.Application.Json) + header(HttpHeaders.Authorization, "Bearer $authToken") + setBody(request) + } + } catch (e: Exception) { + Log.e("ApiService", "Creating assistant failed: ${e.message}", e) + throw e + } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index f45b3a279..d27835d35 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -1,6 +1,7 @@ package com.server.movile.xef.android.ui.screens.menu import android.os.Bundle +import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.layout.* @@ -20,10 +21,11 @@ import com.server.movile.xef.android.ui.themes.LocalCustomColors import com.server.movile.xef.android.ui.viewmodels.AssistantViewModel import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel +import com.server.movile.xef.android.ui.viewmodels.factory.AuthViewModelFactory import com.xef.xefMobile.ui.composable.FilePickerDialog import com.xef.xefMobile.ui.viewmodels.SettingsViewModel import com.xef.xefMobile.ui.viewmodels.SettingsViewModelFactory -import com.xef.xefMobile.ui.viewmodels.factory.AuthViewModelFactory +import kotlinx.coroutines.launch class CreateAssistantActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -31,13 +33,9 @@ class CreateAssistantActivity : ComponentActivity() { setContent { val navController = rememberNavController() - // Obtain ViewModels - val authViewModel: AuthViewModel = - viewModel(factory = AuthViewModelFactory(applicationContext)) - val settingsViewModel: SettingsViewModel = - viewModel(factory = SettingsViewModelFactory(applicationContext)) + val authViewModel: AuthViewModel = viewModel(factory = AuthViewModelFactory(applicationContext)) + val settingsViewModel: SettingsViewModel = viewModel(factory = SettingsViewModelFactory(applicationContext)) - // Pass the ViewModels to the Composable CreateAssistantScreen(navController, authViewModel, settingsViewModel) } } @@ -50,8 +48,9 @@ fun CreateAssistantScreen( authViewModel: IAuthViewModel, settingsViewModel: SettingsViewModel ) { - val viewModel: AssistantViewModel = - viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) + val viewModel: AssistantViewModel = viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) + val snackbarHostState = remember { SnackbarHostState() } + val coroutineScope = rememberCoroutineScope() var name by remember { mutableStateOf("") } var instructions by remember { mutableStateOf("") } @@ -68,197 +67,202 @@ fun CreateAssistantScreen( val customColors = LocalCustomColors.current - Box(modifier = Modifier.fillMaxSize()) { - Column( - modifier = Modifier.padding(8.dp).fillMaxSize(), - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text(text = "Create Assistant", fontSize = 24.sp, modifier = Modifier.padding(bottom = 16.dp)) - - TextField( - value = name, - onValueChange = { name = it }, - label = { Text("Name") }, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(8.dp)) - TextField( - value = instructions, - onValueChange = { instructions = it }, - label = { Text("Instructions") }, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(8.dp)) + Scaffold( + snackbarHost = { SnackbarHost(snackbarHostState) }, + modifier = Modifier.fillMaxSize() + ) { paddingValues -> + Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { Column( - modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), - horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier.padding(8.dp).fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally ) { - ExposedDropdownMenuBox( - expanded = isExpanded, - onExpandedChange = { isExpanded = !isExpanded }, + Text(text = "Create Assistant", fontSize = 24.sp, modifier = Modifier.padding(bottom = 16.dp)) + + TextField( + value = name, + onValueChange = { name = it }, + label = { Text("Name") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(8.dp)) + TextField( + value = instructions, + onValueChange = { instructions = it }, + label = { Text("Instructions") }, modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(8.dp)) + Column( + modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { - TextField( - modifier = Modifier.fillMaxWidth().menuAnchor(), - value = selectedText, - onValueChange = {}, - readOnly = true, - trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) } - ) - ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { - list.forEachIndexed { index, text -> - DropdownMenuItem( - text = { Text(text = text) }, - onClick = { - selectedText = list[index] - isExpanded = false - }, - contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding - ) + ExposedDropdownMenuBox( + expanded = isExpanded, + onExpandedChange = { isExpanded = !isExpanded }, + modifier = Modifier.fillMaxWidth() + ) { + TextField( + modifier = Modifier.fillMaxWidth().menuAnchor(), + value = selectedText, + onValueChange = {}, + readOnly = true, + trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) } + ) + ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { + list.forEachIndexed { index, text -> + DropdownMenuItem( + text = { Text(text = text) }, + onClick = { + selectedText = list[index] + isExpanded = false + }, + contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding + ) + } } } } - } - Spacer(modifier = Modifier.height(12.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - Text(text = "TOOLS") + Spacer(modifier = Modifier.height(12.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text(text = "TOOLS") - HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 10.dp)) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - TextButton( - onClick = { showFilePicker = true }, - colors = - ButtonDefaults.outlinedButtonColors( + HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 10.dp)) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + TextButton( + onClick = { showFilePicker = true }, + colors = ButtonDefaults.outlinedButtonColors( containerColor = Color.Transparent, contentColor = customColors.buttonColor ) - ) { - Text("File Search +") - } - Spacer(modifier = Modifier.weight(1f)) - Switch( - checked = fileSearchEnabled, - onCheckedChange = { fileSearchEnabled = it }, - colors = - SwitchDefaults.colors( + ) { + Text("File Search +") + } + Spacer(modifier = Modifier.weight(1f)) + Switch( + checked = fileSearchEnabled, + onCheckedChange = { fileSearchEnabled = it }, + colors = SwitchDefaults.colors( checkedThumbColor = customColors.sliderThumbColor, checkedTrackColor = customColors.sliderTrackColor ) - ) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - TextButton( - onClick = { showCodeInterpreterPicker = true }, - colors = - ButtonDefaults.outlinedButtonColors( + ) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + TextButton( + onClick = { showCodeInterpreterPicker = true }, + colors = ButtonDefaults.outlinedButtonColors( containerColor = Color.Transparent, contentColor = customColors.buttonColor ) - ) { - Text("Code Interpreter +") - } - Spacer(modifier = Modifier.weight(1f)) - Switch( - checked = codeInterpreterEnabled, - onCheckedChange = { codeInterpreterEnabled = it }, - colors = - SwitchDefaults.colors( + ) { + Text("Code Interpreter +") + } + Spacer(modifier = Modifier.weight(1f)) + Switch( + checked = codeInterpreterEnabled, + onCheckedChange = { codeInterpreterEnabled = it }, + colors = SwitchDefaults.colors( checkedThumbColor = customColors.sliderThumbColor, checkedTrackColor = customColors.sliderTrackColor ) - ) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - TextButton( - onClick = { /* handle cancel */}, - colors = - ButtonDefaults.outlinedButtonColors( + ) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + TextButton( + onClick = { /* handle cancel */ }, + colors = ButtonDefaults.outlinedButtonColors( containerColor = Color.Transparent, contentColor = customColors.buttonColor ) - ) { - Text("Functions +") + ) { + Text("Functions +") + } + Spacer(modifier = Modifier.weight(1f)) } - Spacer(modifier = Modifier.weight(1f)) - } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - Text(text = "MODEL CONFIGURATION") + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text(text = "MODEL CONFIGURATION") - HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) - } - Spacer(modifier = Modifier.width(8.dp)) - AssistantFloatField( - label = "Temperature", - value = temperature, - onValueChange = { temperature = it } - ) + HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) + } + Spacer(modifier = Modifier.width(8.dp)) + AssistantFloatField( + label = "Temperature", + value = temperature, + onValueChange = { temperature = it } + ) - AssistantFloatField(label = "Top P", value = topP, onValueChange = { topP = it }) + AssistantFloatField(label = "Top P", value = topP, onValueChange = { topP = it }) - Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { - Button( - onClick = { navController.navigateUp() }, - colors = - ButtonDefaults.buttonColors( + Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { + Button( + onClick = { navController.navigateUp() }, + colors = ButtonDefaults.buttonColors( containerColor = customColors.buttonColor, contentColor = MaterialTheme.colorScheme.onPrimary ) - ) { - Text("Cancel") - } - Spacer(modifier = Modifier.width(8.dp)) - Button( - onClick = { - viewModel.createAssistant( - name = name, - instructions = instructions, - temperature = temperature, - topP = topP, - model = model, - onSuccess = { - navController.navigateUp() // Navigate back on success - }, - onError = { errorMessage -> - // Handle error (e.g., show a toast or dialog) - println("Error: $errorMessage") + ) { + Text("Cancel") + } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { + coroutineScope.launch { + viewModel.createAssistant( + name = name, + instructions = instructions, + temperature = temperature, + topP = topP, + model = model, + onSuccess = { + coroutineScope.launch { + snackbarHostState.showSnackbar("Assistant created successfully") + navController.navigateUp() // Navigate back on success + } + }, + onError = { errorMessage -> + Log.e("CreateAssistantScreen", errorMessage) + coroutineScope.launch { + snackbarHostState.showSnackbar(errorMessage) + } + } + ) } - ) - }, - colors = - ButtonDefaults.buttonColors( + }, + colors = ButtonDefaults.buttonColors( containerColor = customColors.buttonColor, contentColor = MaterialTheme.colorScheme.onPrimary ) - ) { - Text("Create") + ) { + Text("Create") + } } } - } - if (showFilePicker) { - FilePickerDialog( - onDismissRequest = { showFilePicker = false }, - customColors = customColors, - onFilesSelected = { - // Handle file selection here if needed - showFilePicker = false - } - ) - } - if (showCodeInterpreterPicker) { - FilePickerDialog( - onDismissRequest = { showCodeInterpreterPicker = false }, - customColors = customColors, - onFilesSelected = { - // Handle file selection here if needed - showCodeInterpreterPicker = false - }, - mimeTypeFilter = "text/*" // Only allow text files - ) + if (showFilePicker) { + FilePickerDialog( + onDismissRequest = { showFilePicker = false }, + customColors = customColors, + onFilesSelected = { + // Handle file selection here if needed + showFilePicker = false + } + ) + } + if (showCodeInterpreterPicker) { + FilePickerDialog( + onDismissRequest = { showCodeInterpreterPicker = false }, + customColors = customColors, + onFilesSelected = { + // Handle file selection here if needed + showCodeInterpreterPicker = false + }, + mimeTypeFilter = "text/*" // Only allow text files + ) + } } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 5ca40bd07..3feabc4c4 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -5,10 +5,11 @@ import androidx.lifecycle.viewModelScope import com.xef.xefMobile.model.Assistant import com.xef.xefMobile.services.ApiService import com.xef.xefMobile.ui.viewmodels.SettingsViewModel -import io.ktor.client.* -import io.ktor.client.request.* +import io.ktor.client.engine.cio.* +import io.ktor.client.plugins.contentnegotiation.* import io.ktor.client.statement.* import io.ktor.http.* +import io.ktor.serialization.kotlinx.json.* import io.ktor.util.* import java.text.SimpleDateFormat import java.util.Date @@ -18,6 +19,7 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.serialization.Serializable +import kotlinx.serialization.json.Json class AssistantViewModel( private val authViewModel: IAuthViewModel, @@ -32,7 +34,7 @@ class AssistantViewModel( private val _errorMessage = MutableStateFlow(null) val errorMessage: StateFlow = _errorMessage.asStateFlow() - private val client = HttpClient() + private val apiService = ApiService() init { fetchAssistants() @@ -44,7 +46,7 @@ class AssistantViewModel( _errorMessage.value = null try { val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") - val response = ApiService().getAssistants(token) + val response = apiService.getAssistants(token) _assistants.value = response.data } catch (e: Exception) { _errorMessage.value = "Failed to load assistants: ${e.message}" @@ -67,35 +69,26 @@ class AssistantViewModel( viewModelScope.launch { try { val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") - val response: HttpResponse = - client.post("http://your.api.endpoint/v1/settings/assistants") { - contentType(ContentType.Application.Json) - header("Authorization", "Bearer $token") - body = - CreateAssistantRequest( - model = model, - name = name, - instructions = instructions, - temperature = temperature.toDouble(), - topP = topP.toDouble() - ) - } + val response: HttpResponse = apiService.createAssistant( + authToken = token, + request = CreateAssistantRequest( + model = model, + name = name, + instructions = instructions, + temperature = temperature.toDouble(), + topP = topP.toDouble() + ) + ) if (response.status == HttpStatusCode.Created) { onSuccess() } else { onError("Failed to create assistant: ${response.status}") } } catch (e: Exception) { - onError("Error: ${e.message}") + onError("Error: ${e.message ?: "Unknown error"}") } } } - - private fun formatDate(timestamp: Long): String { - val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) - val date = Date(timestamp * 1000) // Convert Unix timestamp to milliseconds - return sdf.format(date) - } } @Serializable diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt index 982c8ab03..9a1145198 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.xef.xefMobile.ui.viewmodels.factory +package com.server.movile.xef.android.ui.viewmodels.factory import android.content.Context import androidx.lifecycle.ViewModel @@ -7,10 +7,11 @@ import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.xef.xefMobile.services.ApiService class AuthViewModelFactory(private val context: Context) : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { - if (modelClass.isAssignableFrom(AuthViewModel::class.java)) { - @Suppress("UNCHECKED_CAST") return AuthViewModel(context, ApiService()) as T + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(AuthViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") + return AuthViewModel(context, apiService = ApiService()) as T + } + throw IllegalArgumentException("Unknown ViewModel class") } - throw IllegalArgumentException("Unknown ViewModel class") - } } From 4d3801c7a01e87173f9d9f2e8b3868ddbf1f28ab Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Thu, 30 May 2024 11:56:15 +0200 Subject: [PATCH 12/30] fmt --- .../ui/screens/menu/CreateAssistantScreen.kt | 90 ++++++++++--------- .../ui/viewmodels/AssistantViewModel.kt | 24 +++-- .../factory/AuthViewModelFactory.kt | 11 ++- 3 files changed, 66 insertions(+), 59 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index d27835d35..e449dc468 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -33,8 +33,10 @@ class CreateAssistantActivity : ComponentActivity() { setContent { val navController = rememberNavController() - val authViewModel: AuthViewModel = viewModel(factory = AuthViewModelFactory(applicationContext)) - val settingsViewModel: SettingsViewModel = viewModel(factory = SettingsViewModelFactory(applicationContext)) + val authViewModel: AuthViewModel = + viewModel(factory = AuthViewModelFactory(applicationContext)) + val settingsViewModel: SettingsViewModel = + viewModel(factory = SettingsViewModelFactory(applicationContext)) CreateAssistantScreen(navController, authViewModel, settingsViewModel) } @@ -48,7 +50,8 @@ fun CreateAssistantScreen( authViewModel: IAuthViewModel, settingsViewModel: SettingsViewModel ) { - val viewModel: AssistantViewModel = viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) + val viewModel: AssistantViewModel = + viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) val snackbarHostState = remember { SnackbarHostState() } val coroutineScope = rememberCoroutineScope() @@ -67,16 +70,18 @@ fun CreateAssistantScreen( val customColors = LocalCustomColors.current - Scaffold( - snackbarHost = { SnackbarHost(snackbarHostState) }, - modifier = Modifier.fillMaxSize() - ) { paddingValues -> + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { + paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { Column( modifier = Modifier.padding(8.dp).fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally ) { - Text(text = "Create Assistant", fontSize = 24.sp, modifier = Modifier.padding(bottom = 16.dp)) + Text( + text = "Create Assistant", + fontSize = 24.sp, + modifier = Modifier.padding(bottom = 16.dp) + ) TextField( value = name, @@ -132,10 +137,11 @@ fun CreateAssistantScreen( Row(verticalAlignment = Alignment.CenterVertically) { TextButton( onClick = { showFilePicker = true }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("File Search +") } @@ -143,20 +149,22 @@ fun CreateAssistantScreen( Switch( checked = fileSearchEnabled, onCheckedChange = { fileSearchEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + colors = + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { TextButton( onClick = { showCodeInterpreterPicker = true }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Code Interpreter +") } @@ -164,20 +172,22 @@ fun CreateAssistantScreen( Switch( checked = codeInterpreterEnabled, onCheckedChange = { codeInterpreterEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + colors = + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { TextButton( - onClick = { /* handle cancel */ }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + onClick = { /* handle cancel */}, + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Functions +") } @@ -201,10 +211,11 @@ fun CreateAssistantScreen( Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { Button( onClick = { navController.navigateUp() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } @@ -226,17 +237,16 @@ fun CreateAssistantScreen( }, onError = { errorMessage -> Log.e("CreateAssistantScreen", errorMessage) - coroutineScope.launch { - snackbarHostState.showSnackbar(errorMessage) - } + coroutineScope.launch { snackbarHostState.showSnackbar(errorMessage) } } ) } }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Create") } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 3feabc4c4..ea80d561e 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -11,15 +11,11 @@ import io.ktor.client.statement.* import io.ktor.http.* import io.ktor.serialization.kotlinx.json.* import io.ktor.util.* -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.serialization.Serializable -import kotlinx.serialization.json.Json class AssistantViewModel( private val authViewModel: IAuthViewModel, @@ -69,16 +65,18 @@ class AssistantViewModel( viewModelScope.launch { try { val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") - val response: HttpResponse = apiService.createAssistant( - authToken = token, - request = CreateAssistantRequest( - model = model, - name = name, - instructions = instructions, - temperature = temperature.toDouble(), - topP = topP.toDouble() + val response: HttpResponse = + apiService.createAssistant( + authToken = token, + request = + CreateAssistantRequest( + model = model, + name = name, + instructions = instructions, + temperature = temperature.toDouble(), + topP = topP.toDouble() + ) ) - ) if (response.status == HttpStatusCode.Created) { onSuccess() } else { diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt index 9a1145198..ec206ffdb 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/factory/AuthViewModelFactory.kt @@ -7,11 +7,10 @@ import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.xef.xefMobile.services.ApiService class AuthViewModelFactory(private val context: Context) : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { - if (modelClass.isAssignableFrom(AuthViewModel::class.java)) { - @Suppress("UNCHECKED_CAST") - return AuthViewModel(context, apiService = ApiService()) as T - } - throw IllegalArgumentException("Unknown ViewModel class") + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(AuthViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") return AuthViewModel(context, apiService = ApiService()) as T } + throw IllegalArgumentException("Unknown ViewModel class") + } } From 3263e29fa23a6a374d28d7b7f265d044553ddd2a Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Mon, 3 Jun 2024 12:24:27 +0200 Subject: [PATCH 13/30] Create assistant functionality --- .../ui/screens/menu/CreateAssistantScreen.kt | 89 +++++++++++-------- .../ui/viewmodels/AssistantViewModel.kt | 47 ++++++---- 2 files changed, 80 insertions(+), 56 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index e449dc468..4c4d75b33 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -23,6 +23,7 @@ import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.server.movile.xef.android.ui.viewmodels.factory.AuthViewModelFactory import com.xef.xefMobile.ui.composable.FilePickerDialog + import com.xef.xefMobile.ui.viewmodels.SettingsViewModel import com.xef.xefMobile.ui.viewmodels.SettingsViewModelFactory import kotlinx.coroutines.launch @@ -62,16 +63,16 @@ fun CreateAssistantScreen( var fileSearchEnabled by remember { mutableStateOf(false) } var codeInterpreterEnabled by remember { mutableStateOf(false) } var model by remember { mutableStateOf("gpt-4-turbo") } - val list = listOf("gpt-4o", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") + val list = listOf("gpt-4o", "gpt-4o-2024-05-13", "gpt-4", "gpt-4-vision-preview", "gpt-4-turbo-preview", "gpt-4-2024-04-09", "gpt-4-turbo", "gpt-4-1106-preview", "gpt-4-0613", "gpt-4-0125-preview", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } var showFilePicker by remember { mutableStateOf(false) } var showCodeInterpreterPicker by remember { mutableStateOf(false) } + var showAllItems by remember { mutableStateOf(false) } val customColors = LocalCustomColors.current - Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { - paddingValues -> + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { Column( modifier = Modifier.padding(8.dp).fillMaxSize(), @@ -114,7 +115,8 @@ fun CreateAssistantScreen( trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) } ) ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { - list.forEachIndexed { index, text -> + val itemsToShow = if (showAllItems) list else list.take(5) + itemsToShow.forEachIndexed { index, text -> DropdownMenuItem( text = { Text(text = text) }, onClick = { @@ -124,6 +126,15 @@ fun CreateAssistantScreen( contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding ) } + if (!showAllItems) { + DropdownMenuItem( + text = { Text(text = "Show more") }, + onClick = { + showAllItems = true + }, + contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding + ) + } } } } @@ -138,10 +149,10 @@ fun CreateAssistantScreen( TextButton( onClick = { showFilePicker = true }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("File Search +") } @@ -150,10 +161,10 @@ fun CreateAssistantScreen( checked = fileSearchEnabled, onCheckedChange = { fileSearchEnabled = it }, colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) @@ -161,10 +172,10 @@ fun CreateAssistantScreen( TextButton( onClick = { showCodeInterpreterPicker = true }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Code Interpreter +") } @@ -173,10 +184,10 @@ fun CreateAssistantScreen( checked = codeInterpreterEnabled, onCheckedChange = { codeInterpreterEnabled = it }, colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) @@ -184,10 +195,10 @@ fun CreateAssistantScreen( TextButton( onClick = { /* handle cancel */}, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Functions +") } @@ -212,10 +223,10 @@ fun CreateAssistantScreen( Button( onClick = { navController.navigateUp() }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } @@ -228,7 +239,9 @@ fun CreateAssistantScreen( instructions = instructions, temperature = temperature, topP = topP, - model = model, + model = selectedText, + fileSearchEnabled = fileSearchEnabled, + codeInterpreterEnabled = codeInterpreterEnabled, onSuccess = { coroutineScope.launch { snackbarHostState.showSnackbar("Assistant created successfully") @@ -243,10 +256,10 @@ fun CreateAssistantScreen( } }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Create") } @@ -290,14 +303,14 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U Slider( value = value, onValueChange = onValueChange, - valueRange = 0f..2f, + valueRange = 0f..1f, steps = 100, // This ensures the slider moves in increments of 0.02 modifier = Modifier.weight(3f), colors = - SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) + SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) ) Spacer( modifier = Modifier.width(2.dp) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index ea80d561e..5fb715a2c 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -5,11 +5,8 @@ import androidx.lifecycle.viewModelScope import com.xef.xefMobile.model.Assistant import com.xef.xefMobile.services.ApiService import com.xef.xefMobile.ui.viewmodels.SettingsViewModel -import io.ktor.client.engine.cio.* -import io.ktor.client.plugins.contentnegotiation.* import io.ktor.client.statement.* import io.ktor.http.* -import io.ktor.serialization.kotlinx.json.* import io.ktor.util.* import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow @@ -36,7 +33,7 @@ class AssistantViewModel( fetchAssistants() } - private fun fetchAssistants() { + fun fetchAssistants() { viewModelScope.launch { _loading.value = true _errorMessage.value = null @@ -59,25 +56,33 @@ class AssistantViewModel( temperature: Float, topP: Float, model: String, + fileSearchEnabled: Boolean, + codeInterpreterEnabled: Boolean, onSuccess: () -> Unit, onError: (String) -> Unit ) { viewModelScope.launch { try { val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") - val response: HttpResponse = - apiService.createAssistant( - authToken = token, - request = - CreateAssistantRequest( - model = model, - name = name, - instructions = instructions, - temperature = temperature.toDouble(), - topP = topP.toDouble() - ) - ) + val tools = mutableListOf() + if (fileSearchEnabled) tools.add(Tool(type = "file_search")) + if (codeInterpreterEnabled) tools.add(Tool(type = "code_interpreter")) + + val request = CreateAssistantRequest( + model = model, + name = name, + description = "This is an example assistant for testing purposes.", + instructions = instructions, + tools = tools, + metadata = mapOf("key1" to "value1", "key2" to "value2", "key3" to "value3"), + temperature = temperature, + top_p = topP + ) + + val response: HttpResponse = apiService.createAssistant(authToken = token, request = request) + if (response.status == HttpStatusCode.Created) { + fetchAssistants() // Refresh the list of assistants after successful creation onSuccess() } else { onError("Failed to create assistant: ${response.status}") @@ -93,7 +98,13 @@ class AssistantViewModel( data class CreateAssistantRequest( val model: String, val name: String, + val description: String, val instructions: String, - val temperature: Double, - val topP: Double + val tools: List, + val metadata: Map, + val temperature: Float, + val top_p: Float ) + +@Serializable +data class Tool(val type: String) From 6ee9b030a3827b02d79ed3b326228826f6e914dd Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Mon, 3 Jun 2024 10:27:43 +0000 Subject: [PATCH 14/30] Apply spotless formatting --- .../ui/screens/menu/CreateAssistantScreen.kt | 90 +++++++++++-------- .../ui/viewmodels/AssistantViewModel.kt | 27 +++--- 2 files changed, 66 insertions(+), 51 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 4c4d75b33..bf6593750 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -23,7 +23,6 @@ import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.server.movile.xef.android.ui.viewmodels.factory.AuthViewModelFactory import com.xef.xefMobile.ui.composable.FilePickerDialog - import com.xef.xefMobile.ui.viewmodels.SettingsViewModel import com.xef.xefMobile.ui.viewmodels.SettingsViewModelFactory import kotlinx.coroutines.launch @@ -63,7 +62,23 @@ fun CreateAssistantScreen( var fileSearchEnabled by remember { mutableStateOf(false) } var codeInterpreterEnabled by remember { mutableStateOf(false) } var model by remember { mutableStateOf("gpt-4-turbo") } - val list = listOf("gpt-4o", "gpt-4o-2024-05-13", "gpt-4", "gpt-4-vision-preview", "gpt-4-turbo-preview", "gpt-4-2024-04-09", "gpt-4-turbo", "gpt-4-1106-preview", "gpt-4-0613", "gpt-4-0125-preview", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") + val list = + listOf( + "gpt-4o", + "gpt-4o-2024-05-13", + "gpt-4", + "gpt-4-vision-preview", + "gpt-4-turbo-preview", + "gpt-4-2024-04-09", + "gpt-4-turbo", + "gpt-4-1106-preview", + "gpt-4-0613", + "gpt-4-0125-preview", + "gpt-4", + "gpt-3.5-turbo-16K", + "gpt-3.5-turbo-0125", + "gpt-3.5-turbo" + ) var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } var showFilePicker by remember { mutableStateOf(false) } @@ -72,7 +87,8 @@ fun CreateAssistantScreen( val customColors = LocalCustomColors.current - Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { paddingValues -> + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { + paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { Column( modifier = Modifier.padding(8.dp).fillMaxSize(), @@ -129,9 +145,7 @@ fun CreateAssistantScreen( if (!showAllItems) { DropdownMenuItem( text = { Text(text = "Show more") }, - onClick = { - showAllItems = true - }, + onClick = { showAllItems = true }, contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding ) } @@ -149,10 +163,10 @@ fun CreateAssistantScreen( TextButton( onClick = { showFilePicker = true }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("File Search +") } @@ -161,10 +175,10 @@ fun CreateAssistantScreen( checked = fileSearchEnabled, onCheckedChange = { fileSearchEnabled = it }, colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) @@ -172,10 +186,10 @@ fun CreateAssistantScreen( TextButton( onClick = { showCodeInterpreterPicker = true }, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Code Interpreter +") } @@ -184,10 +198,10 @@ fun CreateAssistantScreen( checked = codeInterpreterEnabled, onCheckedChange = { codeInterpreterEnabled = it }, colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) @@ -195,10 +209,10 @@ fun CreateAssistantScreen( TextButton( onClick = { /* handle cancel */}, colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Functions +") } @@ -223,10 +237,10 @@ fun CreateAssistantScreen( Button( onClick = { navController.navigateUp() }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } @@ -256,10 +270,10 @@ fun CreateAssistantScreen( } }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Create") } @@ -307,10 +321,10 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U steps = 100, // This ensures the slider moves in increments of 0.02 modifier = Modifier.weight(3f), colors = - SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) + SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) ) Spacer( modifier = Modifier.width(2.dp) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 5fb715a2c..2268ff926 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -68,18 +68,20 @@ class AssistantViewModel( if (fileSearchEnabled) tools.add(Tool(type = "file_search")) if (codeInterpreterEnabled) tools.add(Tool(type = "code_interpreter")) - val request = CreateAssistantRequest( - model = model, - name = name, - description = "This is an example assistant for testing purposes.", - instructions = instructions, - tools = tools, - metadata = mapOf("key1" to "value1", "key2" to "value2", "key3" to "value3"), - temperature = temperature, - top_p = topP - ) + val request = + CreateAssistantRequest( + model = model, + name = name, + description = "This is an example assistant for testing purposes.", + instructions = instructions, + tools = tools, + metadata = mapOf("key1" to "value1", "key2" to "value2", "key3" to "value3"), + temperature = temperature, + top_p = topP + ) - val response: HttpResponse = apiService.createAssistant(authToken = token, request = request) + val response: HttpResponse = + apiService.createAssistant(authToken = token, request = request) if (response.status == HttpStatusCode.Created) { fetchAssistants() // Refresh the list of assistants after successful creation @@ -106,5 +108,4 @@ data class CreateAssistantRequest( val top_p: Float ) -@Serializable -data class Tool(val type: String) +@Serializable data class Tool(val type: String) From 97160fc0d023b1a2467b5536ebe53eed373e64cf Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Mon, 3 Jun 2024 16:26:43 +0200 Subject: [PATCH 15/30] Update assistant list after creating --- .../kotlin/com/xef/xefMobile/XefAndroidApp.kt | 23 +++- .../com/xef/xefMobile/model/AssistantModel.kt | 14 +- .../xef/xefMobile/ui/navigation/Navigation.kt | 19 ++- .../com/xef/xefMobile/ui/screens/Screens.kt | 14 +- .../ui/screens/menu/AssistantScreen.kt | 18 +-- .../ui/screens/menu/CreateAssistantScreen.kt | 129 +++++++++--------- .../ui/viewmodels/AssistantViewModel.kt | 19 ++- 7 files changed, 147 insertions(+), 89 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt index e0ab551bd..2aa786050 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/XefAndroidApp.kt @@ -8,9 +8,11 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import androidx.navigation.NavType import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import androidx.navigation.navArgument import com.server.movile.xef.android.ui.screens.LoginScreen import com.server.movile.xef.android.ui.screens.RegisterScreen import com.server.movile.xef.android.ui.screens.menu.AssistantScreen @@ -53,6 +55,24 @@ fun XefAndroidApp(authViewModel: IAuthViewModel, settingsViewModel: SettingsView AssistantScreen(navController, authViewModel, settingsViewModel) } } + composable( + route = Screens.CreateAssistantWithArgs.screen, + arguments = listOf(navArgument("assistantId") { type = NavType.StringType }) + ) { backStackEntry -> + val assistantId = backStackEntry.arguments?.getString("assistantId") + MainLayout( + navController = navController, + authViewModel = authViewModel, + userName = userName.orEmpty() + ) { + CreateAssistantScreen( + navController = navController, + authViewModel = authViewModel, + settingsViewModel = settingsViewModel, + assistantId = assistantId + ) + } + } composable(Screens.CreateAssistant.screen) { MainLayout( navController = navController, @@ -62,7 +82,8 @@ fun XefAndroidApp(authViewModel: IAuthViewModel, settingsViewModel: SettingsView CreateAssistantScreen( navController = navController, authViewModel = authViewModel, - settingsViewModel = settingsViewModel + settingsViewModel = settingsViewModel, + assistantId = null ) } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt index 309347ca4..5e6f79dbd 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -7,7 +7,17 @@ import kotlinx.serialization.Serializable data class Assistant( val id: String, val name: String, - @SerialName("created_at") val createdAt: Long // Use the correct field name from the JSON response + @SerialName("created_at") val createdAt: Long, // Use the correct field name from the JSON response + val description: String?, + val model: String, + val instructions: String, + val tools: List, + val temperature: Float, + @SerialName("top_p") val topP: Float ) -@Serializable data class AssistantsResponse(val data: List) +@Serializable +data class Tool(val type: String) + +@Serializable +data class AssistantsResponse(val data: List) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt index ed5fd2e9d..4c74dff91 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/navigation/Navigation.kt @@ -1,9 +1,11 @@ package com.xef.xefMobile.ui.navigation import androidx.compose.runtime.Composable +import androidx.navigation.NavType import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import androidx.navigation.navArgument import com.server.movile.xef.android.ui.screens.LoginScreen import com.server.movile.xef.android.ui.screens.RegisterScreen import com.server.movile.xef.android.ui.screens.menu.AssistantScreen @@ -31,11 +33,16 @@ fun AppNavigator(authViewModel: IAuthViewModel, settingsViewModel: SettingsViewM settingsViewModel = settingsViewModel ) } - composable(Screens.CreateAssistant.screen) { + composable( + route = Screens.CreateAssistantWithArgs.screen, + arguments = listOf(navArgument("assistantId") { type = NavType.StringType }) + ) { backStackEntry -> + val assistantId = backStackEntry.arguments?.getString("assistantId") CreateAssistantScreen( navController = navController, authViewModel = authViewModel, - settingsViewModel = settingsViewModel + settingsViewModel = settingsViewModel, + assistantId = assistantId ) } composable(Screens.Settings.screen) { @@ -44,5 +51,13 @@ fun AppNavigator(authViewModel: IAuthViewModel, settingsViewModel: SettingsViewM composable(Screens.Home.screen) { HomeScreen(authViewModel = authViewModel, navController = navController) } + composable(Screens.CreateAssistant.screen) { + CreateAssistantScreen( + navController = navController, + authViewModel = authViewModel, + settingsViewModel = settingsViewModel, + assistantId = null + ) + } } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt index 351e12c1a..3bafafa89 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt @@ -2,24 +2,18 @@ package com.xef.xefMobile.ui.screens sealed class Screens(val screen: String) { object Login : Screens("loginScreen") - object Register : Screens("registerScreen") - object Start : Screens("startScreen") - object Home : Screens("homeScreen") - object Organizations : Screens("organizationsScreen") - object Assistants : Screens("assistantsScreen") - object Projects : Screens("projectsScreen") - object Chat : Screens("chatScreen") - object GenericQuestion : Screens("genericQuestionScreen") - object Settings : Screens("settingsScreen") - object CreateAssistant : Screens("createAssistantScreen") + + object CreateAssistantWithArgs : Screens("createAssistantScreen/{assistantId}") { + fun createRoute(assistantId: String) = "createAssistantScreen/$assistantId" + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt index 46988fb4b..d4ea9c203 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt @@ -1,5 +1,6 @@ package com.server.movile.xef.android.ui.screens.menu +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items @@ -61,14 +62,16 @@ fun AssistantScreen( fontWeight = FontWeight.Bold, fontSize = 24.sp, ) - Divider(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) + HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) Spacer(modifier = Modifier.height(16.dp)) LazyColumn(modifier = Modifier.fillMaxSize()) { items(assistants) { assistant -> Column( - modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), + modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp).clickable { + navController.navigate(Screens.CreateAssistantWithArgs.createRoute(assistant.id)) + }, horizontalAlignment = Alignment.Start // Align items to start ) { Row( @@ -89,7 +92,7 @@ fun AssistantScreen( } Text(text = "ID: ${assistant.id}", fontSize = 14.sp) } - Divider(color = Color.Gray) + HorizontalDivider(color = Color.Gray) } } } @@ -98,11 +101,10 @@ fun AssistantScreen( Button( onClick = { navController.navigate(Screens.CreateAssistant.screen) }, - colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ), + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ), modifier = Modifier.align(Alignment.BottomCenter).padding(16.dp) ) { Text(text = "Create New Assistant") diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index bf6593750..0ca80f2a6 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -23,6 +23,7 @@ import com.server.movile.xef.android.ui.viewmodels.AuthViewModel import com.server.movile.xef.android.ui.viewmodels.IAuthViewModel import com.server.movile.xef.android.ui.viewmodels.factory.AuthViewModelFactory import com.xef.xefMobile.ui.composable.FilePickerDialog +import com.xef.xefMobile.ui.screens.Screens import com.xef.xefMobile.ui.viewmodels.SettingsViewModel import com.xef.xefMobile.ui.viewmodels.SettingsViewModelFactory import kotlinx.coroutines.launch @@ -30,6 +31,7 @@ import kotlinx.coroutines.launch class CreateAssistantActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + val assistantId = intent.getStringExtra("assistantId") setContent { val navController = rememberNavController() @@ -38,7 +40,7 @@ class CreateAssistantActivity : ComponentActivity() { val settingsViewModel: SettingsViewModel = viewModel(factory = SettingsViewModelFactory(applicationContext)) - CreateAssistantScreen(navController, authViewModel, settingsViewModel) + CreateAssistantScreen(navController, authViewModel, settingsViewModel, assistantId) } } } @@ -48,13 +50,16 @@ class CreateAssistantActivity : ComponentActivity() { fun CreateAssistantScreen( navController: NavController, authViewModel: IAuthViewModel, - settingsViewModel: SettingsViewModel + settingsViewModel: SettingsViewModel, + assistantId: String? ) { val viewModel: AssistantViewModel = viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) val snackbarHostState = remember { SnackbarHostState() } val coroutineScope = rememberCoroutineScope() + val selectedAssistant by viewModel.selectedAssistant.collectAsState() + var name by remember { mutableStateOf("") } var instructions by remember { mutableStateOf("") } var temperature by remember { mutableStateOf(1f) } @@ -62,23 +67,7 @@ fun CreateAssistantScreen( var fileSearchEnabled by remember { mutableStateOf(false) } var codeInterpreterEnabled by remember { mutableStateOf(false) } var model by remember { mutableStateOf("gpt-4-turbo") } - val list = - listOf( - "gpt-4o", - "gpt-4o-2024-05-13", - "gpt-4", - "gpt-4-vision-preview", - "gpt-4-turbo-preview", - "gpt-4-2024-04-09", - "gpt-4-turbo", - "gpt-4-1106-preview", - "gpt-4-0613", - "gpt-4-0125-preview", - "gpt-4", - "gpt-3.5-turbo-16K", - "gpt-3.5-turbo-0125", - "gpt-3.5-turbo" - ) + val list = listOf("gpt-4o", "gpt-4o-2024-05-13", "gpt-4", "gpt-4-vision-preview", "gpt-4-turbo-preview", "gpt-4-2024-04-09", "gpt-4-turbo", "gpt-4-1106-preview", "gpt-4-0613", "gpt-4-0125-preview", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } var showFilePicker by remember { mutableStateOf(false) } @@ -87,8 +76,28 @@ fun CreateAssistantScreen( val customColors = LocalCustomColors.current - Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { - paddingValues -> + // Load assistant details if assistantId is provided + LaunchedEffect(assistantId) { + if (assistantId != null) { + viewModel.loadAssistantDetails(assistantId) + } + } + + // Observe selectedAssistant and update state variables accordingly + LaunchedEffect(selectedAssistant) { + selectedAssistant?.let { assistant -> + name = assistant.name + instructions = assistant.instructions + temperature = assistant.temperature + topP = assistant.topP + model = assistant.model + selectedText = assistant.model // Ensure dropdown reflects the correct model + fileSearchEnabled = assistant.tools.any { it.type == "file_search" } + codeInterpreterEnabled = assistant.tools.any { it.type == "code_interpreter" } + } + } + + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { Column( modifier = Modifier.padding(8.dp).fillMaxSize(), @@ -137,6 +146,7 @@ fun CreateAssistantScreen( text = { Text(text = text) }, onClick = { selectedText = list[index] + model = list[index] // Ensure model state is updated isExpanded = false }, contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding @@ -162,11 +172,10 @@ fun CreateAssistantScreen( Row(verticalAlignment = Alignment.CenterVertically) { TextButton( onClick = { showFilePicker = true }, - colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("File Search +") } @@ -174,22 +183,20 @@ fun CreateAssistantScreen( Switch( checked = fileSearchEnabled, onCheckedChange = { fileSearchEnabled = it }, - colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + colors = SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { TextButton( onClick = { showCodeInterpreterPicker = true }, - colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Code Interpreter +") } @@ -197,22 +204,20 @@ fun CreateAssistantScreen( Switch( checked = codeInterpreterEnabled, onCheckedChange = { codeInterpreterEnabled = it }, - colors = - SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + colors = SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { TextButton( - onClick = { /* handle cancel */}, - colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + onClick = { /* handle cancel */ }, + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Functions +") } @@ -236,11 +241,10 @@ fun CreateAssistantScreen( Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { Button( onClick = { navController.navigateUp() }, - colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } @@ -259,7 +263,7 @@ fun CreateAssistantScreen( onSuccess = { coroutineScope.launch { snackbarHostState.showSnackbar("Assistant created successfully") - navController.navigateUp() // Navigate back on success + navController.navigate(Screens.Assistants.screen) } }, onError = { errorMessage -> @@ -269,11 +273,10 @@ fun CreateAssistantScreen( ) } }, - colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Create") } @@ -320,11 +323,10 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U valueRange = 0f..1f, steps = 100, // This ensures the slider moves in increments of 0.02 modifier = Modifier.weight(3f), - colors = - SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) + colors = SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) ) Spacer( modifier = Modifier.width(2.dp) @@ -342,3 +344,4 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U } } } + diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 2268ff926..af04d626c 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -27,6 +27,9 @@ class AssistantViewModel( private val _errorMessage = MutableStateFlow(null) val errorMessage: StateFlow = _errorMessage.asStateFlow() + private val _selectedAssistant = MutableStateFlow(null) + val selectedAssistant: StateFlow = _selectedAssistant.asStateFlow() + private val apiService = ApiService() init { @@ -41,14 +44,24 @@ class AssistantViewModel( val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") val response = apiService.getAssistants(token) _assistants.value = response.data + _loading.value = false } catch (e: Exception) { _errorMessage.value = "Failed to load assistants: ${e.message}" - } finally { _loading.value = false } } } + fun loadAssistantDetails(id: String) { + viewModelScope.launch { + _selectedAssistant.value = getAssistantById(id) + } + } + + private fun getAssistantById(id: String): Assistant? { + return assistants.value.find { it.id == id } + } + @OptIn(InternalAPI::class) fun createAssistant( name: String, @@ -84,7 +97,7 @@ class AssistantViewModel( apiService.createAssistant(authToken = token, request = request) if (response.status == HttpStatusCode.Created) { - fetchAssistants() // Refresh the list of assistants after successful creation + fetchAssistants() onSuccess() } else { onError("Failed to create assistant: ${response.status}") @@ -100,7 +113,7 @@ class AssistantViewModel( data class CreateAssistantRequest( val model: String, val name: String, - val description: String, + val description: String?, val instructions: String, val tools: List, val metadata: Map, From 3169933032875897143319af0b2ad9248c29e5e2 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Tue, 4 Jun 2024 12:12:33 +0200 Subject: [PATCH 16/30] Populate assistant data into form --- .../ui/screens/menu/CreateAssistantScreen.kt | 29 ++++++++++++------- .../ui/viewmodels/AssistantViewModel.kt | 19 ++++++++++-- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 0ca80f2a6..8b6b7738f 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -58,7 +58,8 @@ fun CreateAssistantScreen( val snackbarHostState = remember { SnackbarHostState() } val coroutineScope = rememberCoroutineScope() - val selectedAssistant by viewModel.selectedAssistant.collectAsState() + // Observe changes in selectedAssistant + val selectedAssistant by viewModel.selectedAssistant.collectAsState(initial = null) var name by remember { mutableStateOf("") } var instructions by remember { mutableStateOf("") } @@ -76,15 +77,15 @@ fun CreateAssistantScreen( val customColors = LocalCustomColors.current - // Load assistant details if assistantId is provided LaunchedEffect(assistantId) { if (assistantId != null) { + Log.d("CreateAssistantScreen", "Loading assistant details for id: $assistantId") viewModel.loadAssistantDetails(assistantId) } } - // Observe selectedAssistant and update state variables accordingly LaunchedEffect(selectedAssistant) { + Log.d("CreateAssistantScreen", "Selected assistant changed: $selectedAssistant") selectedAssistant?.let { assistant -> name = assistant.name instructions = assistant.instructions @@ -97,6 +98,7 @@ fun CreateAssistantScreen( } } + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { Column( @@ -233,10 +235,16 @@ fun CreateAssistantScreen( AssistantFloatField( label = "Temperature", value = temperature, - onValueChange = { temperature = it } + onValueChange = { temperature = it }, + valueRange = 0f..2f ) - AssistantFloatField(label = "Top P", value = topP, onValueChange = { topP = it }) + AssistantFloatField( + label = "Top P", + value = topP, + onValueChange = { topP = it }, + valueRange = 0f..1f + ) Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { Button( @@ -309,7 +317,7 @@ fun CreateAssistantScreen( @OptIn(ExperimentalMaterial3Api::class) @Composable -fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> Unit) { +fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> Unit, valueRange: ClosedFloatingPointRange) { val customColors = LocalCustomColors.current Column(modifier = Modifier.fillMaxWidth()) { Text( @@ -320,8 +328,8 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U Slider( value = value, onValueChange = onValueChange, - valueRange = 0f..1f, - steps = 100, // This ensures the slider moves in increments of 0.02 + valueRange = valueRange, // Adjust the range here + steps = 200, // Adjust the steps here modifier = Modifier.weight(3f), colors = SliderDefaults.colors( thumbColor = customColors.sliderThumbColor, @@ -330,7 +338,7 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U ) Spacer( modifier = Modifier.width(2.dp) - ) // Add a small spacer between the slider and text field + ) TextField( value = String.format("%.2f", value), onValueChange = { @@ -339,9 +347,8 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U }, keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), modifier = Modifier.width(60.dp).height(50.dp), - textStyle = LocalTextStyle.current.copy(fontSize = 12.sp) // Optionally adjust text size + textStyle = LocalTextStyle.current.copy(fontSize = 12.sp) ) } } } - diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index af04d626c..113bcf8ba 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -1,5 +1,6 @@ package com.server.movile.xef.android.ui.viewmodels +import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.xef.xefMobile.model.Assistant @@ -36,7 +37,7 @@ class AssistantViewModel( fetchAssistants() } - fun fetchAssistants() { + fun fetchAssistants(onComplete: (() -> Unit)? = null) { viewModelScope.launch { _loading.value = true _errorMessage.value = null @@ -45,16 +46,26 @@ class AssistantViewModel( val response = apiService.getAssistants(token) _assistants.value = response.data _loading.value = false + onComplete?.invoke() } catch (e: Exception) { _errorMessage.value = "Failed to load assistants: ${e.message}" _loading.value = false + onComplete?.invoke() } } } fun loadAssistantDetails(id: String) { - viewModelScope.launch { - _selectedAssistant.value = getAssistantById(id) + fetchAssistants { + viewModelScope.launch { + val assistant = getAssistantById(id) + if (assistant != null) { + _selectedAssistant.value = assistant + Log.d("AssistantViewModel", "Assistant details loaded: $assistant") + } else { + Log.d("AssistantViewModel", "Assistant not found with id: $id") + } + } } } @@ -109,6 +120,8 @@ class AssistantViewModel( } } + + @Serializable data class CreateAssistantRequest( val model: String, From 7468956e2567094a061c837a3337125bec924dc7 Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Tue, 4 Jun 2024 10:14:37 +0000 Subject: [PATCH 17/30] Apply spotless formatting --- .../com/xef/xefMobile/model/AssistantModel.kt | 9 +- .../com/xef/xefMobile/ui/screens/Screens.kt | 10 ++ .../ui/screens/menu/AssistantScreen.kt | 18 +-- .../ui/screens/menu/CreateAssistantScreen.kt | 107 +++++++++++------- .../ui/viewmodels/AssistantViewModel.kt | 2 - 5 files changed, 92 insertions(+), 54 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt index 5e6f79dbd..40fbe6095 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -7,7 +7,8 @@ import kotlinx.serialization.Serializable data class Assistant( val id: String, val name: String, - @SerialName("created_at") val createdAt: Long, // Use the correct field name from the JSON response + @SerialName("created_at") + val createdAt: Long, // Use the correct field name from the JSON response val description: String?, val model: String, val instructions: String, @@ -16,8 +17,6 @@ data class Assistant( @SerialName("top_p") val topP: Float ) -@Serializable -data class Tool(val type: String) +@Serializable data class Tool(val type: String) -@Serializable -data class AssistantsResponse(val data: List) +@Serializable data class AssistantsResponse(val data: List) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt index 3bafafa89..bc5e915fc 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/Screens.kt @@ -2,15 +2,25 @@ package com.xef.xefMobile.ui.screens sealed class Screens(val screen: String) { object Login : Screens("loginScreen") + object Register : Screens("registerScreen") + object Start : Screens("startScreen") + object Home : Screens("homeScreen") + object Organizations : Screens("organizationsScreen") + object Assistants : Screens("assistantsScreen") + object Projects : Screens("projectsScreen") + object Chat : Screens("chatScreen") + object GenericQuestion : Screens("genericQuestionScreen") + object Settings : Screens("settingsScreen") + object CreateAssistant : Screens("createAssistantScreen") object CreateAssistantWithArgs : Screens("createAssistantScreen/{assistantId}") { diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt index d4ea9c203..fb642c87a 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/AssistantScreen.kt @@ -69,9 +69,12 @@ fun AssistantScreen( LazyColumn(modifier = Modifier.fillMaxSize()) { items(assistants) { assistant -> Column( - modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp).clickable { - navController.navigate(Screens.CreateAssistantWithArgs.createRoute(assistant.id)) - }, + modifier = + Modifier.fillMaxWidth().padding(vertical = 8.dp).clickable { + navController.navigate( + Screens.CreateAssistantWithArgs.createRoute(assistant.id) + ) + }, horizontalAlignment = Alignment.Start // Align items to start ) { Row( @@ -101,10 +104,11 @@ fun AssistantScreen( Button( onClick = { navController.navigate(Screens.CreateAssistant.screen) }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ), + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ), modifier = Modifier.align(Alignment.BottomCenter).padding(16.dp) ) { Text(text = "Create New Assistant") diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 8b6b7738f..b60ede03a 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -68,7 +68,23 @@ fun CreateAssistantScreen( var fileSearchEnabled by remember { mutableStateOf(false) } var codeInterpreterEnabled by remember { mutableStateOf(false) } var model by remember { mutableStateOf("gpt-4-turbo") } - val list = listOf("gpt-4o", "gpt-4o-2024-05-13", "gpt-4", "gpt-4-vision-preview", "gpt-4-turbo-preview", "gpt-4-2024-04-09", "gpt-4-turbo", "gpt-4-1106-preview", "gpt-4-0613", "gpt-4-0125-preview", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") + val list = + listOf( + "gpt-4o", + "gpt-4o-2024-05-13", + "gpt-4", + "gpt-4-vision-preview", + "gpt-4-turbo-preview", + "gpt-4-2024-04-09", + "gpt-4-turbo", + "gpt-4-1106-preview", + "gpt-4-0613", + "gpt-4-0125-preview", + "gpt-4", + "gpt-3.5-turbo-16K", + "gpt-3.5-turbo-0125", + "gpt-3.5-turbo" + ) var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } var showFilePicker by remember { mutableStateOf(false) } @@ -98,8 +114,8 @@ fun CreateAssistantScreen( } } - - Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { paddingValues -> + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { + paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { Column( modifier = Modifier.padding(8.dp).fillMaxSize(), @@ -174,10 +190,11 @@ fun CreateAssistantScreen( Row(verticalAlignment = Alignment.CenterVertically) { TextButton( onClick = { showFilePicker = true }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("File Search +") } @@ -185,20 +202,22 @@ fun CreateAssistantScreen( Switch( checked = fileSearchEnabled, onCheckedChange = { fileSearchEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + colors = + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { TextButton( onClick = { showCodeInterpreterPicker = true }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Code Interpreter +") } @@ -206,20 +225,22 @@ fun CreateAssistantScreen( Switch( checked = codeInterpreterEnabled, onCheckedChange = { codeInterpreterEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + colors = + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { TextButton( - onClick = { /* handle cancel */ }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + onClick = { /* handle cancel */}, + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Functions +") } @@ -249,10 +270,11 @@ fun CreateAssistantScreen( Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { Button( onClick = { navController.navigateUp() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } @@ -281,10 +303,11 @@ fun CreateAssistantScreen( ) } }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Create") } @@ -317,7 +340,12 @@ fun CreateAssistantScreen( @OptIn(ExperimentalMaterial3Api::class) @Composable -fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> Unit, valueRange: ClosedFloatingPointRange) { +fun AssistantFloatField( + label: String, + value: Float, + onValueChange: (Float) -> Unit, + valueRange: ClosedFloatingPointRange +) { val customColors = LocalCustomColors.current Column(modifier = Modifier.fillMaxWidth()) { Text( @@ -331,14 +359,13 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U valueRange = valueRange, // Adjust the range here steps = 200, // Adjust the steps here modifier = Modifier.weight(3f), - colors = SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) - ) - Spacer( - modifier = Modifier.width(2.dp) + colors = + SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) ) + Spacer(modifier = Modifier.width(2.dp)) TextField( value = String.format("%.2f", value), onValueChange = { diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 113bcf8ba..783f8b859 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -120,8 +120,6 @@ class AssistantViewModel( } } - - @Serializable data class CreateAssistantRequest( val model: String, From e1de33bea4e2935a53c1df0d9b27e8301a92e710 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:09:48 +0200 Subject: [PATCH 18/30] Registration validations and ui updates --- .../com/xef/xefMobile/services/ApiService.kt | 8 +- .../xefMobile/ui/screens/RegisterScreen.kt | 31 +- .../ui/screens/menu/CreateAssistantScreen.kt | 444 +++++++++++------- 3 files changed, 304 insertions(+), 179 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index dfcf9e637..a5a0941ac 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -15,7 +15,7 @@ class ApiService { return try { HttpClientProvider.client .post { - url("http://10.0.2.2:8081/register") + url("https://ace-asp-ghastly.ngrok-free.app/register") contentType(ContentType.Application.Json) setBody(request) } @@ -30,7 +30,7 @@ class ApiService { return try { val response: HttpResponse = HttpClientProvider.client.post { - url("http://10.0.2.2:8081/login") + url("https://ace-asp-ghastly.ngrok-free.app/login") contentType(ContentType.Application.Json) setBody(request) } @@ -49,7 +49,7 @@ class ApiService { return try { val response: HttpResponse = HttpClientProvider.client.get { - url("http://10.0.2.2:8081/v1/settings/assistants") + url("https://ace-asp-ghastly.ngrok-free.app/v1/settings/assistants") header(HttpHeaders.Authorization, "Bearer $authToken") header("OpenAI-Beta", "assistants=v2") } @@ -66,7 +66,7 @@ class ApiService { suspend fun createAssistant(authToken: String, request: CreateAssistantRequest): HttpResponse { return try { HttpClientProvider.client.post { - url("http://10.0.2.2:8081/v1/settings/assistants") + url("https://ace-asp-ghastly.ngrok-free.app/v1/settings/assistants") contentType(ContentType.Application.Json) header(HttpHeaders.Authorization, "Bearer $authToken") setBody(request) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt index d03b674c2..4eee9fd82 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/RegisterScreen.kt @@ -96,14 +96,7 @@ fun RegisterScreen(authViewModel: IAuthViewModel, navController: NavController) Button( onClick = { - errorMessage = - when { - name.isBlank() -> "Name is empty" - email.isBlank() -> "Email is empty" - password.isEmpty() -> "Password is empty" - password != rePassword -> "Passwords do not match" - else -> null - } + errorMessage = validateInputs(name, email, password, rePassword) if (errorMessage == null) { authViewModel.register(name, email, password) } @@ -122,3 +115,25 @@ fun RegisterScreen(authViewModel: IAuthViewModel, navController: NavController) } } } + +fun validateInputs(name: String, email: String, password: String, rePassword: String): String? { + if (name.isBlank()) return "Name is empty" + if (email.isBlank()) return "Email is empty" + if (!isValidEmail(email)) return "Email is not valid" + if (password.isEmpty()) return "Password is empty" + if (password != rePassword) return "Passwords do not match" + if (!isValidPassword(password)) return "Password does not meet criteria" + + return null +} + +fun isValidEmail(email: String): Boolean { + val emailPattern = "^[A-Za-z0-9+_.-]+@(.+)$" + return email.matches(emailPattern.toRegex()) +} + +fun isValidPassword(password: String): Boolean { + // Minimum 8 characters, at least one letter and one number + val passwordPattern = "^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d]{8,}$" + return password.matches(passwordPattern.toRegex()) +} diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 8b6b7738f..204229286 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -5,7 +5,11 @@ import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material.icons.filled.KeyboardArrowUp import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment @@ -17,6 +21,7 @@ import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController +import com.server.movile.xef.android.ui.themes.CustomColors import com.server.movile.xef.android.ui.themes.LocalCustomColors import com.server.movile.xef.android.ui.viewmodels.AssistantViewModel import com.server.movile.xef.android.ui.viewmodels.AuthViewModel @@ -68,7 +73,22 @@ fun CreateAssistantScreen( var fileSearchEnabled by remember { mutableStateOf(false) } var codeInterpreterEnabled by remember { mutableStateOf(false) } var model by remember { mutableStateOf("gpt-4-turbo") } - val list = listOf("gpt-4o", "gpt-4o-2024-05-13", "gpt-4", "gpt-4-vision-preview", "gpt-4-turbo-preview", "gpt-4-2024-04-09", "gpt-4-turbo", "gpt-4-1106-preview", "gpt-4-0613", "gpt-4-0125-preview", "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo") + val list = listOf( + "gpt-4o", + "gpt-4o-2024-05-13", + "gpt-4", + "gpt-4-vision-preview", + "gpt-4-turbo-preview", + "gpt-4-2024-04-09", + "gpt-4-turbo", + "gpt-4-1106-preview", + "gpt-4-0613", + "gpt-4-0125-preview", + "gpt-4", + "gpt-3.5-turbo-16K", + "gpt-3.5-turbo-0125", + "gpt-3.5-turbo" + ) var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } var showFilePicker by remember { mutableStateOf(false) } @@ -98,198 +118,187 @@ fun CreateAssistantScreen( } } - Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { - Column( + LazyColumn( modifier = Modifier.padding(8.dp).fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally ) { - Text( - text = "Create Assistant", - fontSize = 24.sp, - modifier = Modifier.padding(bottom = 16.dp) - ) + item { + Text( + text = "Create Assistant", + fontSize = 24.sp, + modifier = Modifier.padding(bottom = 16.dp) + ) + } - TextField( - value = name, - onValueChange = { name = it }, - label = { Text("Name") }, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(8.dp)) - TextField( - value = instructions, - onValueChange = { instructions = it }, - label = { Text("Instructions") }, - modifier = Modifier.fillMaxWidth() - ) - Spacer(modifier = Modifier.height(8.dp)) - Column( - modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - ExposedDropdownMenuBox( - expanded = isExpanded, - onExpandedChange = { isExpanded = !isExpanded }, - modifier = Modifier.fillMaxWidth() - ) { - TextField( - modifier = Modifier.fillMaxWidth().menuAnchor(), - value = selectedText, - onValueChange = {}, - readOnly = true, - trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) } + item { + Box(modifier = Modifier.fillMaxWidth()) { + OutlinedTextField( + value = name, + onValueChange = { name = it }, + label = { Text("Name") }, + modifier = Modifier.fillMaxWidth() ) - ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { - val itemsToShow = if (showAllItems) list else list.take(5) - itemsToShow.forEachIndexed { index, text -> - DropdownMenuItem( - text = { Text(text = text) }, - onClick = { - selectedText = list[index] - model = list[index] // Ensure model state is updated - isExpanded = false - }, - contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding - ) - } - if (!showAllItems) { - DropdownMenuItem( - text = { Text(text = "Show more") }, - onClick = { showAllItems = true }, - contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding - ) - } - } } } - Spacer(modifier = Modifier.height(12.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - Text(text = "TOOLS") - HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 10.dp)) + item { + Spacer(modifier = Modifier.height(12.dp)) } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - TextButton( - onClick = { showFilePicker = true }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor + + item { + Box(modifier = Modifier.fillMaxWidth()) { + OutlinedTextField( + value = instructions, + onValueChange = { instructions = it }, + label = { Text("Instructions") }, + modifier = Modifier.fillMaxWidth() ) - ) { - Text("File Search +") } - Spacer(modifier = Modifier.weight(1f)) - Switch( - checked = fileSearchEnabled, - onCheckedChange = { fileSearchEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) - ) } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - TextButton( - onClick = { showCodeInterpreterPicker = true }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text("Code Interpreter +") + + item { + Spacer(modifier = Modifier.height(12.dp)) + } + + item { + Box(modifier = Modifier.fillMaxWidth()) { + ExposedDropdownMenuBox( + expanded = isExpanded, + onExpandedChange = { isExpanded = !isExpanded }, + modifier = Modifier.fillMaxWidth() + ) { + OutlinedTextField( + modifier = Modifier.fillMaxWidth().menuAnchor(), + value = selectedText, + onValueChange = {}, + readOnly = true, + trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) } + ) + ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { + val itemsToShow = if (showAllItems) list else list.take(5) + itemsToShow.forEachIndexed { index, text -> + DropdownMenuItem( + text = { Text(text = text) }, + onClick = { + selectedText = list[index] + model = list[index] // Ensure model state is updated + isExpanded = false + }, + contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding + ) + } + if (!showAllItems) { + DropdownMenuItem( + text = { Text(text = "Show more", color = Color.Red) }, + onClick = { showAllItems = true }, + contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding + ) + } + } + } } - Spacer(modifier = Modifier.weight(1f)) - Switch( - checked = codeInterpreterEnabled, - onCheckedChange = { codeInterpreterEnabled = it }, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + } + + item { + Spacer(modifier = Modifier.height(12.dp)) + } + + item { + ToolsSection( + showFilePicker = showFilePicker, + onShowFilePickerChange = { showFilePicker = it }, + fileSearchEnabled = fileSearchEnabled, + onFileSearchEnabledChange = { fileSearchEnabled = it }, + showCodeInterpreterPicker = showCodeInterpreterPicker, + onShowCodeInterpreterPickerChange = { showCodeInterpreterPicker = it }, + codeInterpreterEnabled = codeInterpreterEnabled, + onCodeInterpreterEnabledChange = { codeInterpreterEnabled = it }, + customColors = customColors ) } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - TextButton( - onClick = { /* handle cancel */ }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) - ) { - Text("Functions +") + + item { + Spacer(modifier = Modifier.height(12.dp)) + } + + item { + Column { + Text(text = "MODEL CONFIGURATION") + HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 4.dp)) } - Spacer(modifier = Modifier.weight(1f)) } - Spacer(modifier = Modifier.height(8.dp)) - Row(verticalAlignment = Alignment.CenterVertically) { - Text(text = "MODEL CONFIGURATION") - HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) + item { + Spacer(modifier = Modifier.height(12.dp)) } - Spacer(modifier = Modifier.width(8.dp)) - AssistantFloatField( - label = "Temperature", - value = temperature, - onValueChange = { temperature = it }, - valueRange = 0f..2f - ) - AssistantFloatField( - label = "Top P", - value = topP, - onValueChange = { topP = it }, - valueRange = 0f..1f - ) + item { + AssistantFloatField( + label = "Temperature", + value = temperature, + onValueChange = { temperature = it }, + valueRange = 0f..2f + ) + } - Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { - Button( - onClick = { navController.navigateUp() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) - ) { - Text("Cancel") - } - Spacer(modifier = Modifier.width(8.dp)) - Button( - onClick = { - coroutineScope.launch { - viewModel.createAssistant( - name = name, - instructions = instructions, - temperature = temperature, - topP = topP, - model = selectedText, - fileSearchEnabled = fileSearchEnabled, - codeInterpreterEnabled = codeInterpreterEnabled, - onSuccess = { - coroutineScope.launch { - snackbarHostState.showSnackbar("Assistant created successfully") - navController.navigate(Screens.Assistants.screen) + item { + AssistantFloatField( + label = "Top P", + value = topP, + onValueChange = { topP = it }, + valueRange = 0f..1f + ) + } + + item { + Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { + Button( + onClick = { navController.navigateUp() }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text("Cancel") + } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { + coroutineScope.launch { + viewModel.createAssistant( + name = name, + instructions = instructions, + temperature = temperature, + topP = topP, + model = selectedText, + fileSearchEnabled = fileSearchEnabled, + codeInterpreterEnabled = codeInterpreterEnabled, + onSuccess = { + coroutineScope.launch { + snackbarHostState.showSnackbar("Assistant created successfully") + navController.navigate(Screens.Assistants.screen) + } + }, + onError = { errorMessage -> + Log.e("CreateAssistantScreen", errorMessage) + coroutineScope.launch { snackbarHostState.showSnackbar(errorMessage) } } - }, - onError = { errorMessage -> - Log.e("CreateAssistantScreen", errorMessage) - coroutineScope.launch { snackbarHostState.showSnackbar(errorMessage) } - } - ) - } - }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) - ) { - Text("Create") + ) + } + }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text("Create") + } } } } + if (showFilePicker) { FilePickerDialog( onDismissRequest = { showFilePicker = false }, @@ -300,6 +309,7 @@ fun CreateAssistantScreen( } ) } + if (showCodeInterpreterPicker) { FilePickerDialog( onDismissRequest = { showCodeInterpreterPicker = false }, @@ -317,7 +327,12 @@ fun CreateAssistantScreen( @OptIn(ExperimentalMaterial3Api::class) @Composable -fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> Unit, valueRange: ClosedFloatingPointRange) { +fun AssistantFloatField( + label: String, + value: Float, + onValueChange: (Float) -> Unit, + valueRange: ClosedFloatingPointRange +) { val customColors = LocalCustomColors.current Column(modifier = Modifier.fillMaxWidth()) { Text( @@ -352,3 +367,98 @@ fun AssistantFloatField(label: String, value: Float, onValueChange: (Float) -> U } } } + +@Composable +fun ExpandableContent( + expanded: Boolean, + onExpandedChange: (Boolean) -> Unit, + header: @Composable () -> Unit, + content: @Composable () -> Unit +) { + Column { + header() + if (expanded) { + content() + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ToolsSection( + showFilePicker: Boolean, + onShowFilePickerChange: (Boolean) -> Unit, + fileSearchEnabled: Boolean, + onFileSearchEnabledChange: (Boolean) -> Unit, + showCodeInterpreterPicker: Boolean, + onShowCodeInterpreterPickerChange: (Boolean) -> Unit, + codeInterpreterEnabled: Boolean, + onCodeInterpreterEnabledChange: (Boolean) -> Unit, + customColors: CustomColors +) { + var expanded by remember { mutableStateOf(false) } + + ExpandableContent( + expanded = expanded, + onExpandedChange = { expanded = it }, + header = { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(text = "TOOLS") + Spacer(modifier = Modifier.weight(1f)) + IconButton(onClick = { expanded = !expanded }) { + Icon( + imageVector = if (expanded) Icons.Default.KeyboardArrowUp else Icons.Default.KeyboardArrowDown, + contentDescription = if (expanded) "Collapse" else "Expand" + ) + } + HorizontalDivider(modifier = Modifier.fillMaxWidth().padding(top = 10.dp)) + } + } + ) { + Column { + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + TextButton( + onClick = { onShowFilePickerChange(true) }, + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text("File Search +") + } + Spacer(modifier = Modifier.weight(1f)) + Switch( + checked = fileSearchEnabled, + onCheckedChange = onFileSearchEnabledChange, + colors = SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) + ) + } + Spacer(modifier = Modifier.height(8.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + TextButton( + onClick = { onShowCodeInterpreterPickerChange(true) }, + colors = ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) + ) { + Text("Code Interpreter +") + } + Spacer(modifier = Modifier.weight(1f)) + Switch( + checked = codeInterpreterEnabled, + onCheckedChange = onCodeInterpreterEnabledChange, + colors = SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) + ) + } + Spacer(modifier = Modifier.height(8.dp)) + } + } +} From d6fcceb47dd0073e2e4bd65720df42bb5679d6f0 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:17:25 +0200 Subject: [PATCH 19/30] Registration validations and ui updates --- ...9752843.salive => kotlin-compiler-10822383352460149637.salive} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename server/xefMobile/.kotlin/sessions/{kotlin-compiler-16732557141189752843.salive => kotlin-compiler-10822383352460149637.salive} (100%) diff --git a/server/xefMobile/.kotlin/sessions/kotlin-compiler-16732557141189752843.salive b/server/xefMobile/.kotlin/sessions/kotlin-compiler-10822383352460149637.salive similarity index 100% rename from server/xefMobile/.kotlin/sessions/kotlin-compiler-16732557141189752843.salive rename to server/xefMobile/.kotlin/sessions/kotlin-compiler-10822383352460149637.salive From 056fb9e365b57f206ccdb65d2c0516463d602b12 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:22:28 +0200 Subject: [PATCH 20/30] Delete assistant --- .../com/xef/xefMobile/services/ApiService.kt | 13 ++ .../ui/screens/menu/CreateAssistantScreen.kt | 198 ++++++++++-------- .../ui/viewmodels/AssistantViewModel.kt | 18 ++ 3 files changed, 145 insertions(+), 84 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index a5a0941ac..7b3b9f5d9 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -76,4 +76,17 @@ class ApiService { throw e } } + + suspend fun deleteAssistant(authToken: String, assistantId: String): HttpResponse { + return try { + HttpClientProvider.client.delete { + url("https://ace-asp-ghastly.ngrok-free.app/v1/settings/assistants/$assistantId") + header(HttpHeaders.Authorization, "Bearer $authToken") + header("OpenAI-Beta", "assistants=v2") + } + } catch (e: Exception) { + Log.e("ApiService", "Deleting assistant failed: ${e.message}", e) + throw e + } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index ae2d24241..e82d677c4 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -6,6 +6,7 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.KeyboardArrowDown @@ -14,7 +15,9 @@ import androidx.compose.material3.* import androidx.compose.runtime.* 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.res.painterResource import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -32,6 +35,7 @@ import com.xef.xefMobile.ui.screens.Screens import com.xef.xefMobile.ui.viewmodels.SettingsViewModel import com.xef.xefMobile.ui.viewmodels.SettingsViewModelFactory import kotlinx.coroutines.launch +import org.xef.xefMobile.R class CreateAssistantActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -63,7 +67,6 @@ fun CreateAssistantScreen( val snackbarHostState = remember { SnackbarHostState() } val coroutineScope = rememberCoroutineScope() - // Observe changes in selectedAssistant val selectedAssistant by viewModel.selectedAssistant.collectAsState(initial = null) var name by remember { mutableStateOf("") } @@ -74,20 +77,9 @@ fun CreateAssistantScreen( var codeInterpreterEnabled by remember { mutableStateOf(false) } var model by remember { mutableStateOf("gpt-4-turbo") } val list = listOf( - "gpt-4o", - "gpt-4o-2024-05-13", - "gpt-4", - "gpt-4-vision-preview", - "gpt-4-turbo-preview", - "gpt-4-2024-04-09", - "gpt-4-turbo", - "gpt-4-1106-preview", - "gpt-4-0613", - "gpt-4-0125-preview", - "gpt-4", - "gpt-3.5-turbo-16K", - "gpt-3.5-turbo-0125", - "gpt-3.5-turbo" + "gpt-4o", "gpt-4o-2024-05-13", "gpt-4", "gpt-4-vision-preview", "gpt-4-turbo-preview", + "gpt-4-2024-04-09", "gpt-4-turbo", "gpt-4-1106-preview", "gpt-4-0613", "gpt-4-0125-preview", + "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo" ) var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } @@ -112,7 +104,7 @@ fun CreateAssistantScreen( temperature = assistant.temperature topP = assistant.topP model = assistant.model - selectedText = assistant.model // Ensure dropdown reflects the correct model + selectedText = assistant.model fileSearchEnabled = assistant.tools.any { it.type == "file_search" } codeInterpreterEnabled = assistant.tools.any { it.type == "code_interpreter" } } @@ -183,7 +175,7 @@ fun CreateAssistantScreen( text = { Text(text = text) }, onClick = { selectedText = list[index] - model = list[index] // Ensure model state is updated + model = list[index] isExpanded = false }, contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding @@ -253,74 +245,113 @@ fun CreateAssistantScreen( } item { - Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { - Button( - onClick = { navController.navigateUp() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Row( + horizontalArrangement = Arrangement.Center, + modifier = Modifier.weight(1f) ) { - Text("Cancel") + Button( + onClick = { navController.navigateUp() }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text("Cancel") + } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { + coroutineScope.launch { + viewModel.createAssistant( + name = name, + instructions = instructions, + temperature = temperature, + topP = topP, + model = selectedText, + fileSearchEnabled = fileSearchEnabled, + codeInterpreterEnabled = codeInterpreterEnabled, + onSuccess = { + coroutineScope.launch { + snackbarHostState.showSnackbar("Assistant created successfully") + navController.navigate(Screens.Assistants.screen) + } + }, + onError = { errorMessage -> + Log.e("CreateAssistantScreen", errorMessage) + coroutineScope.launch { snackbarHostState.showSnackbar(errorMessage) } + } + ) + } + }, + colors = ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text("Create") + } } - Spacer(modifier = Modifier.width(8.dp)) - Button( - onClick = { - coroutineScope.launch { - viewModel.createAssistant( - name = name, - instructions = instructions, - temperature = temperature, - topP = topP, - model = selectedText, - fileSearchEnabled = fileSearchEnabled, - codeInterpreterEnabled = codeInterpreterEnabled, - onSuccess = { - coroutineScope.launch { - snackbarHostState.showSnackbar("Assistant created successfully") - navController.navigate(Screens.Assistants.screen) + if (assistantId != null) { + IconButton( + onClick = { + coroutineScope.launch { + viewModel.deleteAssistant( + assistantId, + onSuccess = { + coroutineScope.launch { + snackbarHostState.showSnackbar("Assistant deleted successfully") + navController.navigate(Screens.Assistants.screen) + } + }, + onError = { errorMessage -> + Log.e("CreateAssistantScreen", errorMessage) + coroutineScope.launch { snackbarHostState.showSnackbar(errorMessage) } } - }, - onError = { errorMessage -> - Log.e("CreateAssistantScreen", errorMessage) - coroutineScope.launch { snackbarHostState.showSnackbar(errorMessage) } - } - ) - } - }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) - ) { - Text("Create") + ) + } + }, + modifier = Modifier.size(48.dp).clip(CircleShape), + colors = IconButtonDefaults.iconButtonColors( + containerColor = Color.Red, + contentColor = Color.White + ) + ) { + Icon( + painter = painterResource(id = R.drawable.delete_24dp), + contentDescription = "Delete Assistant", + tint = Color.White, + modifier = Modifier.size(24.dp) + ) + } } } } } + } - if (showFilePicker) { - FilePickerDialog( - onDismissRequest = { showFilePicker = false }, - customColors = customColors, - onFilesSelected = { - // Handle file selection here if needed - showFilePicker = false - } - ) - } + if (showFilePicker) { + FilePickerDialog( + onDismissRequest = { showFilePicker = false }, + customColors = customColors, + onFilesSelected = { + showFilePicker = false + } + ) + } - if (showCodeInterpreterPicker) { - FilePickerDialog( - onDismissRequest = { showCodeInterpreterPicker = false }, - customColors = customColors, - onFilesSelected = { - // Handle file selection here if needed - showCodeInterpreterPicker = false - }, - mimeTypeFilter = "text/*" // Only allow text files - ) - } + if (showCodeInterpreterPicker) { + FilePickerDialog( + onDismissRequest = { showCodeInterpreterPicker = false }, + customColors = customColors, + onFilesSelected = { + showCodeInterpreterPicker = false + }, + mimeTypeFilter = "text/*" + ) } } } @@ -337,20 +368,19 @@ fun AssistantFloatField( Column(modifier = Modifier.fillMaxWidth()) { Text( text = label, - modifier = Modifier.padding(bottom = 2.dp) // Reduce padding for the label + modifier = Modifier.padding(bottom = 2.dp) ) Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { Slider( value = value, onValueChange = onValueChange, - valueRange = valueRange, // Adjust the range here - steps = 200, // Adjust the steps here + valueRange = valueRange, + steps = 200, modifier = Modifier.weight(3f), - colors = - SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) + colors = SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) ) Spacer(modifier = Modifier.width(2.dp)) TextField( diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 783f8b859..245f96c4a 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -118,6 +118,24 @@ class AssistantViewModel( } } } + + fun deleteAssistant(assistantId: String, onSuccess: () -> Unit, onError: (String) -> Unit) { + viewModelScope.launch { + try { + val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") + val response: HttpResponse = apiService.deleteAssistant(authToken = token, assistantId = assistantId) + + if (response.status == HttpStatusCode.NoContent) { + fetchAssistants() + onSuccess() + } else { + onError("Failed to delete assistant: ${response.status}") + } + } catch (e: Exception) { + onError("Error: ${e.message ?: "Unknown error"}") + } + } + } } @Serializable From e108a93e89b305fe395b1bc55f454e59806fd7d5 Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Wed, 5 Jun 2024 11:23:56 +0000 Subject: [PATCH 21/30] Apply spotless formatting --- .../ui/screens/menu/CreateAssistantScreen.kt | 148 +++++++++--------- .../ui/viewmodels/AssistantViewModel.kt | 3 +- 2 files changed, 77 insertions(+), 74 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index e82d677c4..a76d35fe6 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -76,11 +76,23 @@ fun CreateAssistantScreen( var fileSearchEnabled by remember { mutableStateOf(false) } var codeInterpreterEnabled by remember { mutableStateOf(false) } var model by remember { mutableStateOf("gpt-4-turbo") } - val list = listOf( - "gpt-4o", "gpt-4o-2024-05-13", "gpt-4", "gpt-4-vision-preview", "gpt-4-turbo-preview", - "gpt-4-2024-04-09", "gpt-4-turbo", "gpt-4-1106-preview", "gpt-4-0613", "gpt-4-0125-preview", - "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo" - ) + val list = + listOf( + "gpt-4o", + "gpt-4o-2024-05-13", + "gpt-4", + "gpt-4-vision-preview", + "gpt-4-turbo-preview", + "gpt-4-2024-04-09", + "gpt-4-turbo", + "gpt-4-1106-preview", + "gpt-4-0613", + "gpt-4-0125-preview", + "gpt-4", + "gpt-3.5-turbo-16K", + "gpt-3.5-turbo-0125", + "gpt-3.5-turbo" + ) var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } var showFilePicker by remember { mutableStateOf(false) } @@ -110,7 +122,8 @@ fun CreateAssistantScreen( } } - Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { paddingValues -> + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { + paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { LazyColumn( modifier = Modifier.padding(8.dp).fillMaxSize(), @@ -135,9 +148,7 @@ fun CreateAssistantScreen( } } - item { - Spacer(modifier = Modifier.height(12.dp)) - } + item { Spacer(modifier = Modifier.height(12.dp)) } item { Box(modifier = Modifier.fillMaxWidth()) { @@ -150,9 +161,7 @@ fun CreateAssistantScreen( } } - item { - Spacer(modifier = Modifier.height(12.dp)) - } + item { Spacer(modifier = Modifier.height(12.dp)) } item { Box(modifier = Modifier.fillMaxWidth()) { @@ -168,7 +177,10 @@ fun CreateAssistantScreen( readOnly = true, trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = isExpanded) } ) - ExposedDropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { + ExposedDropdownMenu( + expanded = isExpanded, + onDismissRequest = { isExpanded = false } + ) { val itemsToShow = if (showAllItems) list else list.take(5) itemsToShow.forEachIndexed { index, text -> DropdownMenuItem( @@ -193,9 +205,7 @@ fun CreateAssistantScreen( } } - item { - Spacer(modifier = Modifier.height(12.dp)) - } + item { Spacer(modifier = Modifier.height(12.dp)) } item { ToolsSection( @@ -211,9 +221,7 @@ fun CreateAssistantScreen( ) } - item { - Spacer(modifier = Modifier.height(12.dp)) - } + item { Spacer(modifier = Modifier.height(12.dp)) } item { Column { @@ -222,9 +230,7 @@ fun CreateAssistantScreen( } } - item { - Spacer(modifier = Modifier.height(12.dp)) - } + item { Spacer(modifier = Modifier.height(12.dp)) } item { AssistantFloatField( @@ -245,20 +251,15 @@ fun CreateAssistantScreen( } item { - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically - ) { - Row( - horizontalArrangement = Arrangement.Center, - modifier = Modifier.weight(1f) - ) { + Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.weight(1f)) { Button( onClick = { navController.navigateUp() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } @@ -287,10 +288,11 @@ fun CreateAssistantScreen( ) } }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Create") } @@ -315,10 +317,11 @@ fun CreateAssistantScreen( } }, modifier = Modifier.size(48.dp).clip(CircleShape), - colors = IconButtonDefaults.iconButtonColors( - containerColor = Color.Red, - contentColor = Color.White - ) + colors = + IconButtonDefaults.iconButtonColors( + containerColor = Color.Red, + contentColor = Color.White + ) ) { Icon( painter = painterResource(id = R.drawable.delete_24dp), @@ -337,9 +340,7 @@ fun CreateAssistantScreen( FilePickerDialog( onDismissRequest = { showFilePicker = false }, customColors = customColors, - onFilesSelected = { - showFilePicker = false - } + onFilesSelected = { showFilePicker = false } ) } @@ -347,9 +348,7 @@ fun CreateAssistantScreen( FilePickerDialog( onDismissRequest = { showCodeInterpreterPicker = false }, customColors = customColors, - onFilesSelected = { - showCodeInterpreterPicker = false - }, + onFilesSelected = { showCodeInterpreterPicker = false }, mimeTypeFilter = "text/*" ) } @@ -366,10 +365,7 @@ fun AssistantFloatField( ) { val customColors = LocalCustomColors.current Column(modifier = Modifier.fillMaxWidth()) { - Text( - text = label, - modifier = Modifier.padding(bottom = 2.dp) - ) + Text(text = label, modifier = Modifier.padding(bottom = 2.dp)) Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { Slider( value = value, @@ -377,10 +373,11 @@ fun AssistantFloatField( valueRange = valueRange, steps = 200, modifier = Modifier.weight(3f), - colors = SliderDefaults.colors( - thumbColor = customColors.sliderThumbColor, - activeTrackColor = customColors.sliderTrackColor - ) + colors = + SliderDefaults.colors( + thumbColor = customColors.sliderThumbColor, + activeTrackColor = customColors.sliderTrackColor + ) ) Spacer(modifier = Modifier.width(2.dp)) TextField( @@ -436,7 +433,8 @@ fun ToolsSection( Spacer(modifier = Modifier.weight(1f)) IconButton(onClick = { expanded = !expanded }) { Icon( - imageVector = if (expanded) Icons.Default.KeyboardArrowUp else Icons.Default.KeyboardArrowDown, + imageVector = + if (expanded) Icons.Default.KeyboardArrowUp else Icons.Default.KeyboardArrowDown, contentDescription = if (expanded) "Collapse" else "Expand" ) } @@ -449,10 +447,11 @@ fun ToolsSection( Row(verticalAlignment = Alignment.CenterVertically) { TextButton( onClick = { onShowFilePickerChange(true) }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("File Search +") } @@ -460,20 +459,22 @@ fun ToolsSection( Switch( checked = fileSearchEnabled, onCheckedChange = onFileSearchEnabledChange, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + colors = + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.CenterVertically) { TextButton( onClick = { onShowCodeInterpreterPickerChange(true) }, - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text("Code Interpreter +") } @@ -481,10 +482,11 @@ fun ToolsSection( Switch( checked = codeInterpreterEnabled, onCheckedChange = onCodeInterpreterEnabledChange, - colors = SwitchDefaults.colors( - checkedThumbColor = customColors.sliderThumbColor, - checkedTrackColor = customColors.sliderTrackColor - ) + colors = + SwitchDefaults.colors( + checkedThumbColor = customColors.sliderThumbColor, + checkedTrackColor = customColors.sliderTrackColor + ) ) } Spacer(modifier = Modifier.height(8.dp)) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 245f96c4a..a94476153 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -123,7 +123,8 @@ class AssistantViewModel( viewModelScope.launch { try { val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") - val response: HttpResponse = apiService.deleteAssistant(authToken = token, assistantId = assistantId) + val response: HttpResponse = + apiService.deleteAssistant(authToken = token, assistantId = assistantId) if (response.status == HttpStatusCode.NoContent) { fetchAssistants() From 3b34bf793b335385728acafffa3afd1bc4512658 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Wed, 5 Jun 2024 15:02:34 +0200 Subject: [PATCH 22/30] Delete assistant endpoint --- .../functional/xef/server/http/routes/AssistantRoutes.kt | 9 ++++----- .../xefMobile/ui/screens/menu/CreateAssistantScreen.kt | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt index f02f125d9..b15d8b362 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt @@ -108,11 +108,10 @@ fun Routing.assistantRoutes(logger: KLogger) { } val openAI = OpenAI(Config(token = token.value), logRequests = true) val assistantsApi = openAI.assistants - val assistant = assistantsApi.getAssistant(id) - val response = - assistantsApi.deleteAssistant(id, configure = { header("OpenAI-Beta", "assistants=v2") }) - logger.info { "Deleted assistant: ${assistant.name} with id: ${response.id}" } - call.respond(status = HttpStatusCode.NoContent, response) + val response = assistantsApi.deleteAssistant(id, configure = { header("OpenAI-Beta", "assistants=v2") }) + + logger.info { "Deleted assistant with id: $id" } + call.respond(HttpStatusCode.NoContent, response) } catch (e: Exception) { val trace = e.stackTraceToString() logger.error { "Error deleting assistant: $trace" } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index e82d677c4..9b7591c7a 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -245,6 +245,7 @@ fun CreateAssistantScreen( } item { + Spacer(modifier = Modifier.height(12.dp)) Row( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically @@ -316,7 +317,7 @@ fun CreateAssistantScreen( }, modifier = Modifier.size(48.dp).clip(CircleShape), colors = IconButtonDefaults.iconButtonColors( - containerColor = Color.Red, + containerColor = Color.Gray, contentColor = Color.White ) ) { From 8b8ea20cc89f61334a26934da6b7a6f103788c8c Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Wed, 5 Jun 2024 13:07:23 +0000 Subject: [PATCH 23/30] Apply spotless formatting --- .../xef/server/http/routes/AssistantRoutes.kt | 3 ++- .../ui/screens/menu/CreateAssistantScreen.kt | 19 +++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt index b15d8b362..f45f37fd3 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt @@ -108,7 +108,8 @@ fun Routing.assistantRoutes(logger: KLogger) { } val openAI = OpenAI(Config(token = token.value), logRequests = true) val assistantsApi = openAI.assistants - val response = assistantsApi.deleteAssistant(id, configure = { header("OpenAI-Beta", "assistants=v2") }) + val response = + assistantsApi.deleteAssistant(id, configure = { header("OpenAI-Beta", "assistants=v2") }) logger.info { "Deleted assistant with id: $id" } call.respond(HttpStatusCode.NoContent, response) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 426c643d5..14038373f 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -252,14 +252,8 @@ fun CreateAssistantScreen( item { Spacer(modifier = Modifier.height(12.dp)) - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically - ) { - Row( - horizontalArrangement = Arrangement.Center, - modifier = Modifier.weight(1f) - ) { + Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.weight(1f)) { Button( onClick = { navController.navigateUp() }, colors = @@ -324,10 +318,11 @@ fun CreateAssistantScreen( } }, modifier = Modifier.size(48.dp).clip(CircleShape), - colors = IconButtonDefaults.iconButtonColors( - containerColor = Color.Gray, - contentColor = Color.White - ) + colors = + IconButtonDefaults.iconButtonColors( + containerColor = Color.Gray, + contentColor = Color.White + ) ) { Icon( painter = painterResource(id = R.drawable.delete_24dp), From 6ebe743a3d80e8e4b8b9206beafabdd63763db2b Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:23:41 +0200 Subject: [PATCH 24/30] Add file paths to file search and code interpreter --- .../src/androidMain/AndroidManifest.xml | 6 +- .../ui/composable/FilePickerDialog.kt | 78 +++++++++---------- 2 files changed, 43 insertions(+), 41 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml b/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml index b64793594..8c8ae77c9 100644 --- a/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml +++ b/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml @@ -1,7 +1,10 @@ - + + + + + diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt index 0c2af0393..23c2b0a9b 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -1,5 +1,6 @@ package com.xef.xefMobile.ui.composable +import android.content.Intent import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.clickable @@ -18,6 +19,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState +import com.google.accompanist.permissions.rememberMultiplePermissionsState import com.server.movile.xef.android.ui.themes.CustomColors import com.xef.xefMobile.ui.viewmodels.PathViewModel @@ -33,28 +35,37 @@ fun FilePickerDialog( val state = viewModel.state val context = LocalContext.current - val permissionState = - rememberPermissionState(permission = android.Manifest.permission.READ_EXTERNAL_STORAGE) + // Define the permissions needed based on the Android version + val permissions = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { + listOf( + android.Manifest.permission.READ_MEDIA_IMAGES, + android.Manifest.permission.READ_MEDIA_VIDEO, + android.Manifest.permission.READ_MEDIA_AUDIO + ) + } else { + listOf(android.Manifest.permission.READ_EXTERNAL_STORAGE) + } + + val permissionState = rememberMultiplePermissionsState(permissions) var selectedFile by remember { mutableStateOf(null) } - SideEffect { - if (!permissionState.status.isGranted) { - permissionState.launchPermissionRequest() - } + LaunchedEffect(Unit) { + permissionState.launchMultiplePermissionRequest() } - val filePickerLauncher = - rememberLauncherForActivityResult( - contract = ActivityResultContracts.GetMultipleContents(), - onResult = { uris -> - viewModel.onFilePathsListChange(uris, context) - if (uris.isNotEmpty()) { - onFilesSelected() // Call the callback when files are selected - selectedFile = state.filePaths.firstOrNull() - } - } - ) + // File picker launcher + val filePickerLauncher = rememberLauncherForActivityResult( + contract = ActivityResultContracts.OpenDocument() + ) { uri -> + uri?.let { + val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION + context.contentResolver.takePersistableUriPermission(it, takeFlags) + viewModel.onFilePathsListChange(listOf(it), context) + onFilesSelected() // Call the callback when files are selected + selectedFile = state.filePaths.firstOrNull() + } + } AlertDialog( onDismissRequest = onDismissRequest, @@ -62,7 +73,7 @@ fun FilePickerDialog( Column(horizontalAlignment = Alignment.CenterHorizontally) { Text(text = "Selected Files", fontWeight = FontWeight.Bold) Spacer(modifier = Modifier.height(8.dp)) - HorizontalDivider() + Divider() } }, text = { @@ -83,10 +94,9 @@ fun FilePickerDialog( LazyColumn { items(state.filePaths) { path -> Text( - text = path, - modifier = - Modifier.fillMaxWidth().clickable { selectedFile = path }.padding(8.dp), - color = if (selectedFile == path) Color.Blue else Color.Unspecified + text = path.toString(), + modifier = Modifier.fillMaxWidth().clickable { selectedFile = path.toString() }.padding(8.dp), + color = if (selectedFile == path.toString()) Color.Blue else Color.Unspecified ) } } @@ -94,17 +104,13 @@ fun FilePickerDialog( } OutlinedButton( onClick = { - if (permissionState.status.isGranted) { - filePickerLauncher.launch(mimeTypeFilter) + if (permissionState.allPermissionsGranted) { + filePickerLauncher.launch(arrayOf(mimeTypeFilter)) } else { - permissionState.launchPermissionRequest() + permissionState.launchMultiplePermissionRequest() } }, - colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = ButtonDefaults.outlinedButtonColors(containerColor = Color.Transparent, contentColor = customColors.buttonColor) ) { Text(text = "Browse files") } @@ -114,11 +120,7 @@ fun FilePickerDialog( viewModel.removeFilePath(selectedFile!!) selectedFile = null }, - colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = ButtonDefaults.outlinedButtonColors(containerColor = Color.Transparent, contentColor = customColors.buttonColor) ) { Text(text = "Remove") } @@ -128,11 +130,7 @@ fun FilePickerDialog( confirmButton = { Button( onClick = { onDismissRequest() }, - colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = ButtonDefaults.buttonColors(containerColor = customColors.buttonColor, contentColor = MaterialTheme.colorScheme.onPrimary) ) { Text("Done") } From 548456a171fc6b2b357c762c4df3620d70377d77 Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Thu, 6 Jun 2024 09:25:04 +0000 Subject: [PATCH 25/30] Apply spotless formatting --- .../ui/composable/FilePickerDialog.kt | 68 +++++++++++-------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt index 23c2b0a9b..7f66bb31e 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -17,8 +17,6 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.google.accompanist.permissions.ExperimentalPermissionsApi -import com.google.accompanist.permissions.isGranted -import com.google.accompanist.permissions.rememberPermissionState import com.google.accompanist.permissions.rememberMultiplePermissionsState import com.server.movile.xef.android.ui.themes.CustomColors import com.xef.xefMobile.ui.viewmodels.PathViewModel @@ -36,36 +34,35 @@ fun FilePickerDialog( val context = LocalContext.current // Define the permissions needed based on the Android version - val permissions = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { - listOf( - android.Manifest.permission.READ_MEDIA_IMAGES, - android.Manifest.permission.READ_MEDIA_VIDEO, - android.Manifest.permission.READ_MEDIA_AUDIO - ) - } else { - listOf(android.Manifest.permission.READ_EXTERNAL_STORAGE) - } + val permissions = + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { + listOf( + android.Manifest.permission.READ_MEDIA_IMAGES, + android.Manifest.permission.READ_MEDIA_VIDEO, + android.Manifest.permission.READ_MEDIA_AUDIO + ) + } else { + listOf(android.Manifest.permission.READ_EXTERNAL_STORAGE) + } val permissionState = rememberMultiplePermissionsState(permissions) var selectedFile by remember { mutableStateOf(null) } - LaunchedEffect(Unit) { - permissionState.launchMultiplePermissionRequest() - } + LaunchedEffect(Unit) { permissionState.launchMultiplePermissionRequest() } // File picker launcher - val filePickerLauncher = rememberLauncherForActivityResult( - contract = ActivityResultContracts.OpenDocument() - ) { uri -> - uri?.let { - val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION - context.contentResolver.takePersistableUriPermission(it, takeFlags) - viewModel.onFilePathsListChange(listOf(it), context) - onFilesSelected() // Call the callback when files are selected - selectedFile = state.filePaths.firstOrNull() + val filePickerLauncher = + rememberLauncherForActivityResult(contract = ActivityResultContracts.OpenDocument()) { uri -> + uri?.let { + val takeFlags: Int = + Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION + context.contentResolver.takePersistableUriPermission(it, takeFlags) + viewModel.onFilePathsListChange(listOf(it), context) + onFilesSelected() // Call the callback when files are selected + selectedFile = state.filePaths.firstOrNull() + } } - } AlertDialog( onDismissRequest = onDismissRequest, @@ -95,7 +92,10 @@ fun FilePickerDialog( items(state.filePaths) { path -> Text( text = path.toString(), - modifier = Modifier.fillMaxWidth().clickable { selectedFile = path.toString() }.padding(8.dp), + modifier = + Modifier.fillMaxWidth() + .clickable { selectedFile = path.toString() } + .padding(8.dp), color = if (selectedFile == path.toString()) Color.Blue else Color.Unspecified ) } @@ -110,7 +110,11 @@ fun FilePickerDialog( permissionState.launchMultiplePermissionRequest() } }, - colors = ButtonDefaults.outlinedButtonColors(containerColor = Color.Transparent, contentColor = customColors.buttonColor) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text(text = "Browse files") } @@ -120,7 +124,11 @@ fun FilePickerDialog( viewModel.removeFilePath(selectedFile!!) selectedFile = null }, - colors = ButtonDefaults.outlinedButtonColors(containerColor = Color.Transparent, contentColor = customColors.buttonColor) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text(text = "Remove") } @@ -130,7 +138,11 @@ fun FilePickerDialog( confirmButton = { Button( onClick = { onDismissRequest() }, - colors = ButtonDefaults.buttonColors(containerColor = customColors.buttonColor, contentColor = MaterialTheme.colorScheme.onPrimary) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Done") } From fc4b78611d4015ca6d9edd674bbca0ff81813804 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:06:19 +0200 Subject: [PATCH 26/30] Showing path files from selected files --- .../src/androidMain/AndroidManifest.xml | 1 + .../ui/composable/FilePickerDialog.kt | 25 +++--- .../xefMobile/ui/composable/UriPathFinder.kt | 84 ++++++++----------- 3 files changed, 48 insertions(+), 62 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml b/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml index 8c8ae77c9..30c168eb5 100644 --- a/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml +++ b/server/xefMobile/composeApp/src/androidMain/AndroidManifest.xml @@ -1,6 +1,7 @@ + diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt index 23c2b0a9b..eacddb899 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -17,8 +17,6 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.google.accompanist.permissions.ExperimentalPermissionsApi -import com.google.accompanist.permissions.isGranted -import com.google.accompanist.permissions.rememberPermissionState import com.google.accompanist.permissions.rememberMultiplePermissionsState import com.server.movile.xef.android.ui.themes.CustomColors import com.xef.xefMobile.ui.viewmodels.PathViewModel @@ -29,13 +27,12 @@ fun FilePickerDialog( onDismissRequest: () -> Unit, customColors: CustomColors, onFilesSelected: () -> Unit, - mimeTypeFilter: String = "*/*" // Default to all files + mimeTypeFilter: String = "*/*" ) { val viewModel: PathViewModel = viewModel() val state = viewModel.state val context = LocalContext.current - // Define the permissions needed based on the Android version val permissions = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { listOf( android.Manifest.permission.READ_MEDIA_IMAGES, @@ -54,7 +51,6 @@ fun FilePickerDialog( permissionState.launchMultiplePermissionRequest() } - // File picker launcher val filePickerLauncher = rememberLauncherForActivityResult( contract = ActivityResultContracts.OpenDocument() ) { uri -> @@ -62,7 +58,7 @@ fun FilePickerDialog( val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION context.contentResolver.takePersistableUriPermission(it, takeFlags) viewModel.onFilePathsListChange(listOf(it), context) - onFilesSelected() // Call the callback when files are selected + onFilesSelected() selectedFile = state.filePaths.firstOrNull() } } @@ -78,12 +74,16 @@ fun FilePickerDialog( }, text = { Column( - modifier = Modifier.fillMaxSize().padding(15.dp), + modifier = Modifier + .fillMaxSize() + .padding(15.dp), verticalArrangement = Arrangement.SpaceEvenly, horizontalAlignment = Alignment.CenterHorizontally ) { Box( - modifier = Modifier.fillMaxWidth().fillMaxHeight(0.76f), + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight(0.76f), contentAlignment = Alignment.Center ) { if (state.filePaths.isEmpty()) { @@ -94,9 +94,12 @@ fun FilePickerDialog( LazyColumn { items(state.filePaths) { path -> Text( - text = path.toString(), - modifier = Modifier.fillMaxWidth().clickable { selectedFile = path.toString() }.padding(8.dp), - color = if (selectedFile == path.toString()) Color.Blue else Color.Unspecified + text = path, + modifier = Modifier + .fillMaxWidth() + .clickable { selectedFile = path } + .padding(8.dp), + color = if (selectedFile == path) Color.Blue else Color.Unspecified ) } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt index d6eba6bda..4167c306e 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt @@ -2,12 +2,10 @@ package com.xef.xefMobile.ui.composable import android.content.ContentUris import android.content.Context -import android.database.Cursor import android.net.Uri import android.os.Environment import android.provider.DocumentsContract import android.provider.MediaStore -import java.lang.NumberFormatException class UriPathFinder { @@ -18,7 +16,7 @@ class UriPathFinder { isExternalStorageDocument(uri) -> handleExternalStorageDocument(uri) isDownloadsDocument(uri) -> handleDownloadsDocument(context, uri) isMediaDocument(uri) -> handleMediaDocument(context, uri) - else -> null + else -> getDataColumn(context, uri, null, null) } } "content".equals(uri.scheme, ignoreCase = true) -> getDataColumn(context, uri, null, null) @@ -29,62 +27,54 @@ class UriPathFinder { private fun handleExternalStorageDocument(uri: Uri): String? { val docId = DocumentsContract.getDocumentId(uri) - val split = docId.split(":").toTypedArray() + val split = docId.split(":") val type = split[0] return if ("primary".equals(type, ignoreCase = true)) { Environment.getExternalStorageDirectory().toString() + "/" + split[1] } else { - // Handle non-primary volumes (e.g., - // "content://com.android.externalstorage.documents/document/primary:...") - val storageDefinition = System.getenv("SECONDARY_STORAGE")?.split(":") - storageDefinition?.find { it.contains(type) }?.let { "$it/${split[1]}" } + null } } private fun handleDownloadsDocument(context: Context, uri: Uri): String? { val id = DocumentsContract.getDocumentId(uri) - return try { - val contentUri = - ContentUris.withAppendedId( - Uri.parse("content://downloads/public_downloads"), - java.lang.Long.valueOf(id) - ) - getDataColumn(context, contentUri, null, null) - } catch (e: NumberFormatException) { - // Handle the case where the id is not a pure number - null + return if (id.startsWith("raw:")) { + id.removePrefix("raw:") + } else { + try { + val contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), id.toLong()) + getDataColumn(context, contentUri, null, null) + } catch (e: NumberFormatException) { + null + } } } private fun handleMediaDocument(context: Context, uri: Uri): String? { val docId = DocumentsContract.getDocumentId(uri) - val split = docId.split(":").toTypedArray() + val split = docId.split(":") val type = split[0] - val contentUri: Uri? = - when (type) { - "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI - "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI - "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI - else -> null - } - val selection = "_id=?" - val selectionArgs = arrayOf(split[1]) - return getDataColumn(context, contentUri, selection, selectionArgs) + val id = split[1] + + val contentUri: Uri? = when (type) { + "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI + "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + else -> null + } + + return contentUri?.let { + getDataColumn(context, it, "_id=?", arrayOf(id)) + } } - private fun getDataColumn( - context: Context, - uri: Uri?, - selection: String?, - selectionArgs: Array? - ): String? { - val cursor: Cursor? = - uri?.let { - context.contentResolver.query(it, arrayOf("_data"), selection, selectionArgs, null) - } + private fun getDataColumn(context: Context, uri: Uri?, selection: String?, selectionArgs: Array?): String? { + val cursor = uri?.let { + context.contentResolver.query(it, arrayOf("_data"), selection, selectionArgs, null) + } return cursor?.use { if (it.moveToFirst()) { - val columnIndex: Int = it.getColumnIndexOrThrow("_data") + val columnIndex = it.getColumnIndexOrThrow("_data") it.getString(columnIndex) } else { null @@ -92,15 +82,7 @@ class UriPathFinder { } } - private fun isExternalStorageDocument(uri: Uri): Boolean { - return "com.android.externalstorage.documents" == uri.authority - } - - private fun isDownloadsDocument(uri: Uri): Boolean { - return "com.android.providers.downloads.documents" == uri.authority - } - - private fun isMediaDocument(uri: Uri): Boolean { - return "com.android.providers.media.documents" == uri.authority - } + private fun isExternalStorageDocument(uri: Uri) = "com.android.externalstorage.documents" == uri.authority + private fun isDownloadsDocument(uri: Uri) = "com.android.providers.downloads.documents" == uri.authority + private fun isMediaDocument(uri: Uri) = "com.android.providers.media.documents" == uri.authority } From 32e9a56c4941fe40308c000a67b60ef94c814f76 Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Thu, 6 Jun 2024 11:08:39 +0000 Subject: [PATCH 27/30] Apply spotless formatting --- .../ui/composable/FilePickerDialog.kt | 53 +++++++++---------- .../xefMobile/ui/composable/UriPathFinder.kt | 42 +++++++++------ 2 files changed, 50 insertions(+), 45 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt index 70af6bb12..b44136f62 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -33,15 +33,16 @@ fun FilePickerDialog( val state = viewModel.state val context = LocalContext.current - val permissions = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { - listOf( - android.Manifest.permission.READ_MEDIA_IMAGES, - android.Manifest.permission.READ_MEDIA_VIDEO, - android.Manifest.permission.READ_MEDIA_AUDIO - ) - } else { - listOf(android.Manifest.permission.READ_EXTERNAL_STORAGE) - } + val permissions = + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { + listOf( + android.Manifest.permission.READ_MEDIA_IMAGES, + android.Manifest.permission.READ_MEDIA_VIDEO, + android.Manifest.permission.READ_MEDIA_AUDIO + ) + } else { + listOf(android.Manifest.permission.READ_EXTERNAL_STORAGE) + } val permissionState = rememberMultiplePermissionsState(permissions) @@ -49,17 +50,17 @@ fun FilePickerDialog( LaunchedEffect(Unit) { permissionState.launchMultiplePermissionRequest() } - val filePickerLauncher = rememberLauncherForActivityResult( - contract = ActivityResultContracts.OpenDocument() - ) { uri -> - uri?.let { - val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION - context.contentResolver.takePersistableUriPermission(it, takeFlags) - viewModel.onFilePathsListChange(listOf(it), context) - onFilesSelected() - selectedFile = state.filePaths.firstOrNull() + val filePickerLauncher = + rememberLauncherForActivityResult(contract = ActivityResultContracts.OpenDocument()) { uri -> + uri?.let { + val takeFlags: Int = + Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION + context.contentResolver.takePersistableUriPermission(it, takeFlags) + viewModel.onFilePathsListChange(listOf(it), context) + onFilesSelected() + selectedFile = state.filePaths.firstOrNull() + } } - } AlertDialog( onDismissRequest = onDismissRequest, @@ -72,16 +73,12 @@ fun FilePickerDialog( }, text = { Column( - modifier = Modifier - .fillMaxSize() - .padding(15.dp), + modifier = Modifier.fillMaxSize().padding(15.dp), verticalArrangement = Arrangement.SpaceEvenly, horizontalAlignment = Alignment.CenterHorizontally ) { Box( - modifier = Modifier - .fillMaxWidth() - .fillMaxHeight(0.76f), + modifier = Modifier.fillMaxWidth().fillMaxHeight(0.76f), contentAlignment = Alignment.Center ) { if (state.filePaths.isEmpty()) { @@ -93,10 +90,8 @@ fun FilePickerDialog( items(state.filePaths) { path -> Text( text = path, - modifier = Modifier - .fillMaxWidth() - .clickable { selectedFile = path } - .padding(8.dp), + modifier = + Modifier.fillMaxWidth().clickable { selectedFile = path }.padding(8.dp), color = if (selectedFile == path) Color.Blue else Color.Unspecified ) } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt index 4167c306e..f3e70f1a3 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/UriPathFinder.kt @@ -42,7 +42,8 @@ class UriPathFinder { id.removePrefix("raw:") } else { try { - val contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), id.toLong()) + val contentUri = + ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), id.toLong()) getDataColumn(context, contentUri, null, null) } catch (e: NumberFormatException) { null @@ -56,22 +57,27 @@ class UriPathFinder { val type = split[0] val id = split[1] - val contentUri: Uri? = when (type) { - "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI - "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI - "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI - else -> null - } + val contentUri: Uri? = + when (type) { + "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI + "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + else -> null + } - return contentUri?.let { - getDataColumn(context, it, "_id=?", arrayOf(id)) - } + return contentUri?.let { getDataColumn(context, it, "_id=?", arrayOf(id)) } } - private fun getDataColumn(context: Context, uri: Uri?, selection: String?, selectionArgs: Array?): String? { - val cursor = uri?.let { - context.contentResolver.query(it, arrayOf("_data"), selection, selectionArgs, null) - } + private fun getDataColumn( + context: Context, + uri: Uri?, + selection: String?, + selectionArgs: Array? + ): String? { + val cursor = + uri?.let { + context.contentResolver.query(it, arrayOf("_data"), selection, selectionArgs, null) + } return cursor?.use { if (it.moveToFirst()) { val columnIndex = it.getColumnIndexOrThrow("_data") @@ -82,7 +88,11 @@ class UriPathFinder { } } - private fun isExternalStorageDocument(uri: Uri) = "com.android.externalstorage.documents" == uri.authority - private fun isDownloadsDocument(uri: Uri) = "com.android.providers.downloads.documents" == uri.authority + private fun isExternalStorageDocument(uri: Uri) = + "com.android.externalstorage.documents" == uri.authority + + private fun isDownloadsDocument(uri: Uri) = + "com.android.providers.downloads.documents" == uri.authority + private fun isMediaDocument(uri: Uri) = "com.android.providers.media.documents" == uri.authority } From fbd9161c1ab5c6b5f735e43fb983188be8d2385a Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Mon, 10 Jun 2024 10:31:01 +0200 Subject: [PATCH 28/30] Load files on code interpreter --- .../ui/composable/FilePickerDialog.kt | 40 ++++++------- .../ui/screens/menu/CreateAssistantScreen.kt | 59 ++++++++----------- .../xefMobile/ui/viewmodels/PathViewModel.kt | 35 ++++++++--- 3 files changed, 72 insertions(+), 62 deletions(-) diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt index 70af6bb12..8833283b3 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -27,10 +27,11 @@ fun FilePickerDialog( onDismissRequest: () -> Unit, customColors: CustomColors, onFilesSelected: () -> Unit, - mimeTypeFilter: String = "*/*" + mimeTypeFilter: String = "*/*", + isForCodeInterpreter: Boolean = false ) { val viewModel: PathViewModel = viewModel() - val state = viewModel.state + val state = if (isForCodeInterpreter) viewModel.codeInterpreterState else viewModel.fileSearchState val context = LocalContext.current val permissions = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { @@ -47,7 +48,9 @@ fun FilePickerDialog( var selectedFile by remember { mutableStateOf(null) } - LaunchedEffect(Unit) { permissionState.launchMultiplePermissionRequest() } + LaunchedEffect(Unit) { + permissionState.launchMultiplePermissionRequest() + } val filePickerLauncher = rememberLauncherForActivityResult( contract = ActivityResultContracts.OpenDocument() @@ -55,7 +58,11 @@ fun FilePickerDialog( uri?.let { val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION context.contentResolver.takePersistableUriPermission(it, takeFlags) - viewModel.onFilePathsListChange(listOf(it), context) + if (isForCodeInterpreter) { + viewModel.onCodeInterpreterPathsChange(listOf(it), context) + } else { + viewModel.onFileSearchPathsChange(listOf(it), context) + } onFilesSelected() selectedFile = state.filePaths.firstOrNull() } @@ -111,25 +118,21 @@ fun FilePickerDialog( permissionState.launchMultiplePermissionRequest() } }, - colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = ButtonDefaults.outlinedButtonColors(containerColor = Color.Transparent, contentColor = customColors.buttonColor) ) { Text(text = "Browse files") } if (selectedFile != null) { OutlinedButton( onClick = { - viewModel.removeFilePath(selectedFile!!) + if (isForCodeInterpreter) { + viewModel.removeCodeInterpreterPath(selectedFile!!) + } else { + viewModel.removeFileSearchPath(selectedFile!!) + } selectedFile = null }, - colors = - ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = customColors.buttonColor - ) + colors = ButtonDefaults.outlinedButtonColors(containerColor = Color.Transparent, contentColor = customColors.buttonColor) ) { Text(text = "Remove") } @@ -139,14 +142,11 @@ fun FilePickerDialog( confirmButton = { Button( onClick = { onDismissRequest() }, - colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = ButtonDefaults.buttonColors(containerColor = customColors.buttonColor, contentColor = MaterialTheme.colorScheme.onPrimary) ) { Text("Done") } } ) } + diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 14038373f..17ff98c8c 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -62,8 +62,7 @@ fun CreateAssistantScreen( settingsViewModel: SettingsViewModel, assistantId: String? ) { - val viewModel: AssistantViewModel = - viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) + val viewModel: AssistantViewModel = viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) val snackbarHostState = remember { SnackbarHostState() } val coroutineScope = rememberCoroutineScope() @@ -76,23 +75,11 @@ fun CreateAssistantScreen( var fileSearchEnabled by remember { mutableStateOf(false) } var codeInterpreterEnabled by remember { mutableStateOf(false) } var model by remember { mutableStateOf("gpt-4-turbo") } - val list = - listOf( - "gpt-4o", - "gpt-4o-2024-05-13", - "gpt-4", - "gpt-4-vision-preview", - "gpt-4-turbo-preview", - "gpt-4-2024-04-09", - "gpt-4-turbo", - "gpt-4-1106-preview", - "gpt-4-0613", - "gpt-4-0125-preview", - "gpt-4", - "gpt-3.5-turbo-16K", - "gpt-3.5-turbo-0125", - "gpt-3.5-turbo" - ) + val list = listOf( + "gpt-4o", "gpt-4o-2024-05-13", "gpt-4", "gpt-4-vision-preview", "gpt-4-turbo-preview", + "gpt-4-2024-04-09", "gpt-4-turbo", "gpt-4-1106-preview", "gpt-4-0613", "gpt-4-0125-preview", + "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo" + ) var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } var showFilePicker by remember { mutableStateOf(false) } @@ -122,8 +109,7 @@ fun CreateAssistantScreen( } } - Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { - paddingValues -> + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { LazyColumn( modifier = Modifier.padding(8.dp).fillMaxSize(), @@ -257,10 +243,10 @@ fun CreateAssistantScreen( Button( onClick = { navController.navigateUp() }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } @@ -290,10 +276,10 @@ fun CreateAssistantScreen( } }, colors = - ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Create") } @@ -319,10 +305,10 @@ fun CreateAssistantScreen( }, modifier = Modifier.size(48.dp).clip(CircleShape), colors = - IconButtonDefaults.iconButtonColors( - containerColor = Color.Gray, - contentColor = Color.White - ) + IconButtonDefaults.iconButtonColors( + containerColor = Color.Gray, + contentColor = Color.White + ) ) { Icon( painter = painterResource(id = R.drawable.delete_24dp), @@ -341,7 +327,9 @@ fun CreateAssistantScreen( FilePickerDialog( onDismissRequest = { showFilePicker = false }, customColors = customColors, - onFilesSelected = { showFilePicker = false } + onFilesSelected = { showFilePicker = false }, + mimeTypeFilter = "*/*", + isForCodeInterpreter = false ) } @@ -350,7 +338,8 @@ fun CreateAssistantScreen( onDismissRequest = { showCodeInterpreterPicker = false }, customColors = customColors, onFilesSelected = { showCodeInterpreterPicker = false }, - mimeTypeFilter = "text/*" + mimeTypeFilter = "*/*", + isForCodeInterpreter = true ) } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt index 53fc6d469..1df83a8ef 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt @@ -13,25 +13,45 @@ import kotlinx.coroutines.launch class PathViewModel : ViewModel() { - var state by mutableStateOf(PathScreenState()) + var fileSearchState by mutableStateOf(PathScreenState()) + private set + + var codeInterpreterState by mutableStateOf(PathScreenState()) private set private val uriPathFinder = UriPathFinder() - fun onFilePathsListChange(list: List, context: Context) { + fun onFileSearchPathsChange(list: List, context: Context) { + viewModelScope.launch { + val updatedList = fileSearchState.filePaths.toMutableList() + val pathList = changeUriToPath(list, context) + updatedList += pathList + fileSearchState = fileSearchState.copy(filePaths = updatedList) + } + } + + fun onCodeInterpreterPathsChange(list: List, context: Context) { viewModelScope.launch { - val updatedList = state.filePaths.toMutableList() + val updatedList = codeInterpreterState.filePaths.toMutableList() val pathList = changeUriToPath(list, context) updatedList += pathList - state = state.copy(filePaths = updatedList) + codeInterpreterState = codeInterpreterState.copy(filePaths = updatedList) } } - fun removeFilePath(path: String) { + fun removeFileSearchPath(path: String) { viewModelScope.launch { - val updatedList = state.filePaths.toMutableList() + val updatedList = fileSearchState.filePaths.toMutableList() updatedList.remove(path) - state = state.copy(filePaths = updatedList) + fileSearchState = fileSearchState.copy(filePaths = updatedList) + } + } + + fun removeCodeInterpreterPath(path: String) { + viewModelScope.launch { + val updatedList = codeInterpreterState.filePaths.toMutableList() + updatedList.remove(path) + codeInterpreterState = codeInterpreterState.copy(filePaths = updatedList) } } @@ -39,3 +59,4 @@ class PathViewModel : ViewModel() { return uris.mapNotNull { uri -> uriPathFinder.getPath(context, uri) } } } + From 3012027cada0ed2614bad3b5261e08f22699da66 Mon Sep 17 00:00:00 2001 From: JoseP3r32 <146430742+JoseP3r32@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:41:58 +0200 Subject: [PATCH 29/30] Update assistant succesfull --- .../xef/server/http/routes/AssistantRoutes.kt | 8 +- .../kotlin/com/xef/xefMobile/MainActivity.kt | 1 - .../com/xef/xefMobile/model/AssistantModel.kt | 2 +- .../com/xef/xefMobile/services/ApiService.kt | 15 ++++ .../ui/screens/menu/CreateAssistantScreen.kt | 73 ++++++++++++------- .../ui/viewmodels/AssistantViewModel.kt | 57 +++++++++++++++ 6 files changed, 127 insertions(+), 29 deletions(-) diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt index 5a8b21445..50dde17ce 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt @@ -81,7 +81,12 @@ fun Routing.assistantRoutes(logger: KLogger) { call.respond(HttpStatusCode.BadRequest, "Invalid assistant id") return@put } - val assistant = Assistant(id) + + val token = call.getToken().value + val openAI = OpenAI(Config(token = token), logRequests = true) + val assistantsApi = openAI.assistants + val assistant = Assistant(id, assistantsApi = assistantsApi) + val response = assistant.modify(request).get() logger.info { "Modified assistant: ${response.name} with id: ${response.id}" } call.respond(HttpStatusCode.OK, response) @@ -98,6 +103,7 @@ fun Routing.assistantRoutes(logger: KLogger) { } } + delete("/v1/settings/assistants/{id}") { try { val token = call.getToken() diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt index fb9e29e96..025d57305 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/MainActivity.kt @@ -16,7 +16,6 @@ class MainActivity : ComponentActivity() { authViewModel = AuthViewModel(this, ApiService()) settingsViewModel = SettingsViewModel(this) - // Log out the user when the app starts authViewModel.logout() setContent { diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt index 40fbe6095..85d109cb9 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -8,7 +8,7 @@ data class Assistant( val id: String, val name: String, @SerialName("created_at") - val createdAt: Long, // Use the correct field name from the JSON response + val createdAt: Long, val description: String?, val model: String, val instructions: String, diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index 7b3b9f5d9..96ce7840c 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -2,6 +2,7 @@ package com.xef.xefMobile.services import android.util.Log import com.server.movile.xef.android.ui.viewmodels.CreateAssistantRequest +import com.server.movile.xef.android.ui.viewmodels.ModifyAssistantRequest import com.xef.xefMobile.model.* import com.xef.xefMobile.network.client.HttpClientProvider import io.ktor.client.call.* @@ -89,4 +90,18 @@ class ApiService { throw e } } + + suspend fun updateAssistant(authToken: String, id: String, request: ModifyAssistantRequest): HttpResponse { + return try { + HttpClientProvider.client.put { + url("https://ace-asp-ghastly.ngrok-free.app/v1/settings/assistants/$id") + contentType(ContentType.Application.Json) + header(HttpHeaders.Authorization, "Bearer $authToken") + setBody(request) + } + } catch (e: Exception) { + Log.e("ApiService", "Updating assistant failed: ${e.message}", e) + throw e + } + } } diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 17ff98c8c..588b3ae5d 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -117,7 +117,7 @@ fun CreateAssistantScreen( ) { item { Text( - text = "Create Assistant", + text = if (assistantId == null) "Create Assistant" else "Update Assistant", fontSize = 24.sp, modifier = Modifier.padding(bottom = 16.dp) ) @@ -242,8 +242,7 @@ fun CreateAssistantScreen( Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.weight(1f)) { Button( onClick = { navController.navigateUp() }, - colors = - ButtonDefaults.buttonColors( + colors = ButtonDefaults.buttonColors( containerColor = customColors.buttonColor, contentColor = MaterialTheme.colorScheme.onPrimary ) @@ -254,34 +253,56 @@ fun CreateAssistantScreen( Button( onClick = { coroutineScope.launch { - viewModel.createAssistant( - name = name, - instructions = instructions, - temperature = temperature, - topP = topP, - model = selectedText, - fileSearchEnabled = fileSearchEnabled, - codeInterpreterEnabled = codeInterpreterEnabled, - onSuccess = { - coroutineScope.launch { - snackbarHostState.showSnackbar("Assistant created successfully") - navController.navigate(Screens.Assistants.screen) + if (assistantId == null) { + viewModel.createAssistant( + name = name, + instructions = instructions, + temperature = temperature, + topP = topP, + model = selectedText, + fileSearchEnabled = fileSearchEnabled, + codeInterpreterEnabled = codeInterpreterEnabled, + onSuccess = { + coroutineScope.launch { + snackbarHostState.showSnackbar("Assistant created successfully") + navController.navigate(Screens.Assistants.screen) + } + }, + onError = { errorMessage -> + Log.e("CreateAssistantScreen", errorMessage) + coroutineScope.launch { snackbarHostState.showSnackbar(errorMessage) } } - }, - onError = { errorMessage -> - Log.e("CreateAssistantScreen", errorMessage) - coroutineScope.launch { snackbarHostState.showSnackbar(errorMessage) } - } - ) + ) + } else { + viewModel.updateAssistant( + id = assistantId, + name = name, + instructions = instructions, + temperature = temperature, + topP = topP, + model = selectedText, + fileSearchEnabled = fileSearchEnabled, + codeInterpreterEnabled = codeInterpreterEnabled, + onSuccess = { + coroutineScope.launch { + snackbarHostState.showSnackbar("Assistant updated successfully") + navController.navigate(Screens.Assistants.screen) + } + }, + onError = { errorMessage -> + Log.e("CreateAssistantScreen", errorMessage) + coroutineScope.launch { snackbarHostState.showSnackbar(errorMessage) } + } + ) + } } }, - colors = - ButtonDefaults.buttonColors( + colors = ButtonDefaults.buttonColors( containerColor = customColors.buttonColor, contentColor = MaterialTheme.colorScheme.onPrimary ) ) { - Text("Create") + Text(if (assistantId == null) "Create" else "Update") } } if (assistantId != null) { @@ -304,8 +325,7 @@ fun CreateAssistantScreen( } }, modifier = Modifier.size(48.dp).clip(CircleShape), - colors = - IconButtonDefaults.iconButtonColors( + colors = IconButtonDefaults.iconButtonColors( containerColor = Color.Gray, contentColor = Color.White ) @@ -345,6 +365,7 @@ fun CreateAssistantScreen( } } + @OptIn(ExperimentalMaterial3Api::class) @Composable fun AssistantFloatField( diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index a94476153..6a04b2148 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -137,6 +137,51 @@ class AssistantViewModel( } } } + + @OptIn(InternalAPI::class) + fun updateAssistant( + id: String, + name: String, + instructions: String, + temperature: Float, + topP: Float, + model: String, + fileSearchEnabled: Boolean, + codeInterpreterEnabled: Boolean, + onSuccess: () -> Unit, + onError: (String) -> Unit + ) { + viewModelScope.launch { + try { + val token = settingsViewModel.apiKey.value ?: throw Exception("API key not found") + val tools = mutableListOf() + if (fileSearchEnabled) tools.add(Tool(type = "file_search")) + if (codeInterpreterEnabled) tools.add(Tool(type = "code_interpreter")) + + val request = ModifyAssistantRequest( + model = model, + name = name, + description = "This is an example assistant for testing purposes.", + instructions = instructions, + tools = tools, + metadata = mapOf("key1" to "value1", "key2" to "value2", "key3" to "value3"), + temperature = temperature, + top_p = topP + ) + + val response: HttpResponse = apiService.updateAssistant(authToken = token, id = id, request = request) + + if (response.status == HttpStatusCode.OK) { + fetchAssistants() + onSuccess() + } else { + onError("Failed to update assistant: ${response.status}") + } + } catch (e: Exception) { + onError("Error: ${e.message ?: "Unknown error"}") + } + } + } } @Serializable @@ -151,4 +196,16 @@ data class CreateAssistantRequest( val top_p: Float ) +@Serializable +data class ModifyAssistantRequest( + val model: String? = null, + val name: String? = null, + val description: String? = null, + val instructions: String? = null, + val tools: List? = null, + val metadata: Map? = null, + val temperature: Float? = null, + val top_p: Float? = null +) + @Serializable data class Tool(val type: String) From a63042aad6c23a04190d85acc333f71d71fbbe51 Mon Sep 17 00:00:00 2001 From: JoseP3r32 Date: Mon, 10 Jun 2024 11:43:16 +0000 Subject: [PATCH 30/30] Apply spotless formatting --- .../xef/server/http/routes/AssistantRoutes.kt | 4 +- .../com/xef/xefMobile/model/AssistantModel.kt | 3 +- .../com/xef/xefMobile/services/ApiService.kt | 6 +- .../ui/composable/FilePickerDialog.kt | 52 ++++++++++------- .../ui/screens/menu/CreateAssistantScreen.kt | 56 ++++++++++++------- .../ui/viewmodels/AssistantViewModel.kt | 26 +++++---- .../xefMobile/ui/viewmodels/PathViewModel.kt | 1 - 7 files changed, 89 insertions(+), 59 deletions(-) diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt index 50dde17ce..419efc5de 100644 --- a/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt +++ b/server/src/main/kotlin/com/xebia/functional/xef/server/http/routes/AssistantRoutes.kt @@ -103,7 +103,6 @@ fun Routing.assistantRoutes(logger: KLogger) { } } - delete("/v1/settings/assistants/{id}") { try { val token = call.getToken() @@ -114,7 +113,8 @@ fun Routing.assistantRoutes(logger: KLogger) { } val openAI = OpenAI(Config(token = token.value), logRequests = true) val assistantsApi = openAI.assistants - val response = assistantsApi.deleteAssistant(id, configure = { header("OpenAI-Beta", "assistants=v2") }) + val response = + assistantsApi.deleteAssistant(id, configure = { header("OpenAI-Beta", "assistants=v2") }) logger.info { "Deleted assistant: with id: ${response.id}" } call.respond(status = HttpStatusCode.NoContent, response) } catch (e: Exception) { diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt index 85d109cb9..9e95225d5 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/model/AssistantModel.kt @@ -7,8 +7,7 @@ import kotlinx.serialization.Serializable data class Assistant( val id: String, val name: String, - @SerialName("created_at") - val createdAt: Long, + @SerialName("created_at") val createdAt: Long, val description: String?, val model: String, val instructions: String, diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt index 96ce7840c..43129b2f8 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/services/ApiService.kt @@ -91,7 +91,11 @@ class ApiService { } } - suspend fun updateAssistant(authToken: String, id: String, request: ModifyAssistantRequest): HttpResponse { + suspend fun updateAssistant( + authToken: String, + id: String, + request: ModifyAssistantRequest + ): HttpResponse { return try { HttpClientProvider.client.put { url("https://ace-asp-ghastly.ngrok-free.app/v1/settings/assistants/$id") diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt index e9f2e4ac3..d577af7e3 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/composable/FilePickerDialog.kt @@ -31,7 +31,8 @@ fun FilePickerDialog( isForCodeInterpreter: Boolean = false ) { val viewModel: PathViewModel = viewModel() - val state = if (isForCodeInterpreter) viewModel.codeInterpreterState else viewModel.fileSearchState + val state = + if (isForCodeInterpreter) viewModel.codeInterpreterState else viewModel.fileSearchState val context = LocalContext.current val permissions = @@ -49,25 +50,23 @@ fun FilePickerDialog( var selectedFile by remember { mutableStateOf(null) } - LaunchedEffect(Unit) { - permissionState.launchMultiplePermissionRequest() - } + LaunchedEffect(Unit) { permissionState.launchMultiplePermissionRequest() } - val filePickerLauncher = rememberLauncherForActivityResult( - contract = ActivityResultContracts.OpenDocument() - ) { uri -> - uri?.let { - val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION - context.contentResolver.takePersistableUriPermission(it, takeFlags) - if (isForCodeInterpreter) { - viewModel.onCodeInterpreterPathsChange(listOf(it), context) - } else { - viewModel.onFileSearchPathsChange(listOf(it), context) + val filePickerLauncher = + rememberLauncherForActivityResult(contract = ActivityResultContracts.OpenDocument()) { uri -> + uri?.let { + val takeFlags: Int = + Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION + context.contentResolver.takePersistableUriPermission(it, takeFlags) + if (isForCodeInterpreter) { + viewModel.onCodeInterpreterPathsChange(listOf(it), context) + } else { + viewModel.onFileSearchPathsChange(listOf(it), context) + } + onFilesSelected() + selectedFile = state.filePaths.firstOrNull() } - onFilesSelected() - selectedFile = state.filePaths.firstOrNull() } - } AlertDialog( onDismissRequest = onDismissRequest, @@ -113,7 +112,11 @@ fun FilePickerDialog( permissionState.launchMultiplePermissionRequest() } }, - colors = ButtonDefaults.outlinedButtonColors(containerColor = Color.Transparent, contentColor = customColors.buttonColor) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text(text = "Browse files") } @@ -127,7 +130,11 @@ fun FilePickerDialog( } selectedFile = null }, - colors = ButtonDefaults.outlinedButtonColors(containerColor = Color.Transparent, contentColor = customColors.buttonColor) + colors = + ButtonDefaults.outlinedButtonColors( + containerColor = Color.Transparent, + contentColor = customColors.buttonColor + ) ) { Text(text = "Remove") } @@ -137,11 +144,14 @@ fun FilePickerDialog( confirmButton = { Button( onClick = { onDismissRequest() }, - colors = ButtonDefaults.buttonColors(containerColor = customColors.buttonColor, contentColor = MaterialTheme.colorScheme.onPrimary) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Done") } } ) } - diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt index 588b3ae5d..31abf0507 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/screens/menu/CreateAssistantScreen.kt @@ -62,7 +62,8 @@ fun CreateAssistantScreen( settingsViewModel: SettingsViewModel, assistantId: String? ) { - val viewModel: AssistantViewModel = viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) + val viewModel: AssistantViewModel = + viewModel(factory = AssistantViewModelFactory(authViewModel, settingsViewModel)) val snackbarHostState = remember { SnackbarHostState() } val coroutineScope = rememberCoroutineScope() @@ -75,11 +76,23 @@ fun CreateAssistantScreen( var fileSearchEnabled by remember { mutableStateOf(false) } var codeInterpreterEnabled by remember { mutableStateOf(false) } var model by remember { mutableStateOf("gpt-4-turbo") } - val list = listOf( - "gpt-4o", "gpt-4o-2024-05-13", "gpt-4", "gpt-4-vision-preview", "gpt-4-turbo-preview", - "gpt-4-2024-04-09", "gpt-4-turbo", "gpt-4-1106-preview", "gpt-4-0613", "gpt-4-0125-preview", - "gpt-4", "gpt-3.5-turbo-16K", "gpt-3.5-turbo-0125", "gpt-3.5-turbo" - ) + val list = + listOf( + "gpt-4o", + "gpt-4o-2024-05-13", + "gpt-4", + "gpt-4-vision-preview", + "gpt-4-turbo-preview", + "gpt-4-2024-04-09", + "gpt-4-turbo", + "gpt-4-1106-preview", + "gpt-4-0613", + "gpt-4-0125-preview", + "gpt-4", + "gpt-3.5-turbo-16K", + "gpt-3.5-turbo-0125", + "gpt-3.5-turbo" + ) var isExpanded by remember { mutableStateOf(false) } var selectedText by remember { mutableStateOf(list[0]) } var showFilePicker by remember { mutableStateOf(false) } @@ -109,7 +122,8 @@ fun CreateAssistantScreen( } } - Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { paddingValues -> + Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = Modifier.fillMaxSize()) { + paddingValues -> Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { LazyColumn( modifier = Modifier.padding(8.dp).fillMaxSize(), @@ -242,10 +256,11 @@ fun CreateAssistantScreen( Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.weight(1f)) { Button( onClick = { navController.navigateUp() }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text("Cancel") } @@ -297,10 +312,11 @@ fun CreateAssistantScreen( } } }, - colors = ButtonDefaults.buttonColors( - containerColor = customColors.buttonColor, - contentColor = MaterialTheme.colorScheme.onPrimary - ) + colors = + ButtonDefaults.buttonColors( + containerColor = customColors.buttonColor, + contentColor = MaterialTheme.colorScheme.onPrimary + ) ) { Text(if (assistantId == null) "Create" else "Update") } @@ -325,10 +341,11 @@ fun CreateAssistantScreen( } }, modifier = Modifier.size(48.dp).clip(CircleShape), - colors = IconButtonDefaults.iconButtonColors( - containerColor = Color.Gray, - contentColor = Color.White - ) + colors = + IconButtonDefaults.iconButtonColors( + containerColor = Color.Gray, + contentColor = Color.White + ) ) { Icon( painter = painterResource(id = R.drawable.delete_24dp), @@ -365,7 +382,6 @@ fun CreateAssistantScreen( } } - @OptIn(ExperimentalMaterial3Api::class) @Composable fun AssistantFloatField( diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt index 6a04b2148..0f946a037 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/AssistantViewModel.kt @@ -158,18 +158,20 @@ class AssistantViewModel( if (fileSearchEnabled) tools.add(Tool(type = "file_search")) if (codeInterpreterEnabled) tools.add(Tool(type = "code_interpreter")) - val request = ModifyAssistantRequest( - model = model, - name = name, - description = "This is an example assistant for testing purposes.", - instructions = instructions, - tools = tools, - metadata = mapOf("key1" to "value1", "key2" to "value2", "key3" to "value3"), - temperature = temperature, - top_p = topP - ) - - val response: HttpResponse = apiService.updateAssistant(authToken = token, id = id, request = request) + val request = + ModifyAssistantRequest( + model = model, + name = name, + description = "This is an example assistant for testing purposes.", + instructions = instructions, + tools = tools, + metadata = mapOf("key1" to "value1", "key2" to "value2", "key3" to "value3"), + temperature = temperature, + top_p = topP + ) + + val response: HttpResponse = + apiService.updateAssistant(authToken = token, id = id, request = request) if (response.status == HttpStatusCode.OK) { fetchAssistants() diff --git a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt index 1df83a8ef..64f383b17 100644 --- a/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt +++ b/server/xefMobile/composeApp/src/androidMain/kotlin/com/xef/xefMobile/ui/viewmodels/PathViewModel.kt @@ -59,4 +59,3 @@ class PathViewModel : ViewModel() { return uris.mapNotNull { uri -> uriPathFinder.getPath(context, uri) } } } -