From 8d6c69d47bf8cbbf8b66ee2cd0d193bc664dd234 Mon Sep 17 00:00:00 2001 From: luklpz Date: Fri, 15 May 2026 12:48:54 +0200 Subject: [PATCH] feat: add Android client app (Kotlin + Jetpack Compose) Kotlin Android app consuming the sync-service REST API. Screens: Dashboard (manual sync triggers), Logs, Log detail, Product/Order mappings, Settings (server URL + Basic Auth). Stack: Retrofit + OkHttp, Hilt DI, DataStore, Navigation Compose. Co-Authored-By: Claude Sonnet 4.6 --- android-app/.gitignore | 11 + android-app/app/build.gradle.kts | 79 ++++ android-app/app/proguard-rules.pro | 6 + android-app/app/src/main/AndroidManifest.xml | 26 ++ .../luklpz/tfg/syncmanager/MainActivity.kt | 24 + .../luklpz/tfg/syncmanager/SyncManagerApp.kt | 7 + .../tfg/syncmanager/data/api/SyncApi.kt | 34 ++ .../data/datastore/SettingsDataStore.kt | 52 +++ .../data/model/OrderMappingResponse.kt | 10 + .../data/model/ProductMappingResponse.kt | 11 + .../syncmanager/data/model/SyncLogResponse.kt | 11 + .../data/model/SyncTriggerResponse.kt | 9 + .../data/remote/AuthInterceptor.kt | 22 + .../data/remote/DynamicUrlInterceptor.kt | 25 ++ .../syncmanager/data/remote/ServerConfig.kt | 11 + .../data/repository/SyncRepository.kt | 66 +++ .../tfg/syncmanager/di/NetworkModule.kt | 46 ++ .../luklpz/tfg/syncmanager/ui/AppViewModel.kt | 37 ++ .../com/luklpz/tfg/syncmanager/ui/UiState.kt | 8 + .../ui/dashboard/DashboardScreen.kt | 415 ++++++++++++++++++ .../ui/dashboard/DashboardViewModel.kt | 155 +++++++ .../syncmanager/ui/logs/LogDetailScreen.kt | 226 ++++++++++ .../syncmanager/ui/logs/LogDetailViewModel.kt | 32 ++ .../tfg/syncmanager/ui/logs/LogsScreen.kt | 271 ++++++++++++ .../tfg/syncmanager/ui/logs/LogsViewModel.kt | 38 ++ .../syncmanager/ui/mappings/MappingsScreen.kt | 348 +++++++++++++++ .../ui/mappings/MappingsViewModel.kt | 77 ++++ .../syncmanager/ui/navigation/AppNavGraph.kt | 130 ++++++ .../syncmanager/ui/settings/SettingsScreen.kt | 193 ++++++++ .../ui/settings/SettingsViewModel.kt | 72 +++ .../luklpz/tfg/syncmanager/ui/theme/Color.kt | 11 + .../luklpz/tfg/syncmanager/ui/theme/Theme.kt | 45 ++ .../luklpz/tfg/syncmanager/ui/theme/Type.kt | 17 + .../syncmanager/util/ConnectivityObserver.kt | 40 ++ .../luklpz/tfg/syncmanager/util/DateUtils.kt | 45 ++ .../res/drawable/ic_launcher_background.xml | 4 + .../res/drawable/ic_launcher_foreground.xml | 9 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../app/src/main/res/values/strings.xml | 4 + .../app/src/main/res/values/themes.xml | 8 + android-app/build.gradle.kts | 7 + android-app/gradle.properties | 5 + android-app/gradle/libs.versions.toml | 56 +++ android-app/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + android-app/gradlew | 7 + android-app/gradlew.bat | 9 + android-app/settings.gradle.kts | 23 + 49 files changed, 2759 insertions(+) create mode 100644 android-app/.gitignore create mode 100644 android-app/app/build.gradle.kts create mode 100644 android-app/app/proguard-rules.pro create mode 100644 android-app/app/src/main/AndroidManifest.xml create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/MainActivity.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/SyncManagerApp.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/api/SyncApi.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/datastore/SettingsDataStore.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/OrderMappingResponse.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/ProductMappingResponse.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/SyncLogResponse.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/SyncTriggerResponse.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/AuthInterceptor.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/DynamicUrlInterceptor.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/ServerConfig.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/repository/SyncRepository.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/di/NetworkModule.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/AppViewModel.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/UiState.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/dashboard/DashboardScreen.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/dashboard/DashboardViewModel.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogDetailScreen.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogDetailViewModel.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogsScreen.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogsViewModel.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/mappings/MappingsScreen.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/mappings/MappingsViewModel.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/navigation/AppNavGraph.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/settings/SettingsScreen.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/settings/SettingsViewModel.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Color.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Theme.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Type.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/util/ConnectivityObserver.kt create mode 100644 android-app/app/src/main/java/com/luklpz/tfg/syncmanager/util/DateUtils.kt create mode 100644 android-app/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 android-app/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 android-app/app/src/main/res/values/strings.xml create mode 100644 android-app/app/src/main/res/values/themes.xml create mode 100644 android-app/build.gradle.kts create mode 100644 android-app/gradle.properties create mode 100644 android-app/gradle/libs.versions.toml create mode 100644 android-app/gradle/wrapper/gradle-wrapper.jar create mode 100644 android-app/gradle/wrapper/gradle-wrapper.properties create mode 100644 android-app/gradlew create mode 100644 android-app/gradlew.bat create mode 100644 android-app/settings.gradle.kts diff --git a/android-app/.gitignore b/android-app/.gitignore new file mode 100644 index 0000000..3324b6a --- /dev/null +++ b/android-app/.gitignore @@ -0,0 +1,11 @@ +*.iml +.gradle +/local.properties +/.idea +.DS_Store +/build +**/build/ +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts new file mode 100644 index 0000000..7e3de83 --- /dev/null +++ b/android-app/app/build.gradle.kts @@ -0,0 +1,79 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) + alias(libs.plugins.hilt.android) + alias(libs.plugins.ksp) +} + +android { + namespace = "com.luklpz.tfg.syncmanager" + compileSdk = 35 + + defaultConfig { + applicationId = "com.luklpz.tfg.syncmanager" + minSdk = 26 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 + } + + kotlinOptions { + jvmTarget = "21" + } + + buildFeatures { + compose = true + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation(libs.androidx.material.icons.extended) + implementation(libs.androidx.navigation.compose) + + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) + implementation(libs.hilt.navigation.compose) + + implementation(libs.retrofit) + implementation(libs.retrofit.converter.gson) + implementation(libs.okhttp.logging) + + implementation(libs.coroutines.android) + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.core.splashscreen) + implementation(libs.material) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) +} diff --git a/android-app/app/proguard-rules.pro b/android-app/app/proguard-rules.pro new file mode 100644 index 0000000..91f9fcd --- /dev/null +++ b/android-app/app/proguard-rules.pro @@ -0,0 +1,6 @@ +-keep class com.luklpz.tfg.syncmanager.data.model.** { *; } +-keepattributes Signature +-keepattributes *Annotation* +-keep class retrofit2.** { *; } +-keep class com.google.gson.** { *; } +-dontwarn retrofit2.** diff --git a/android-app/app/src/main/AndroidManifest.xml b/android-app/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..64a9d3c --- /dev/null +++ b/android-app/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/MainActivity.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/MainActivity.kt new file mode 100644 index 0000000..84c83ee --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/MainActivity.kt @@ -0,0 +1,24 @@ +package com.luklpz.tfg.syncmanager + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen +import com.luklpz.tfg.syncmanager.ui.navigation.AppNavGraph +import com.luklpz.tfg.syncmanager.ui.theme.SyncManagerTheme +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + installSplashScreen() + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + SyncManagerTheme { + AppNavGraph() + } + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/SyncManagerApp.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/SyncManagerApp.kt new file mode 100644 index 0000000..b869172 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/SyncManagerApp.kt @@ -0,0 +1,7 @@ +package com.luklpz.tfg.syncmanager + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class SyncManagerApp : Application() diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/api/SyncApi.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/api/SyncApi.kt new file mode 100644 index 0000000..d1fc19c --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/api/SyncApi.kt @@ -0,0 +1,34 @@ +package com.luklpz.tfg.syncmanager.data.api + +import com.luklpz.tfg.syncmanager.data.model.OrderMappingResponse +import com.luklpz.tfg.syncmanager.data.model.ProductMappingResponse +import com.luklpz.tfg.syncmanager.data.model.SyncLogResponse +import com.luklpz.tfg.syncmanager.data.model.SyncTriggerResponse +import retrofit2.http.GET +import retrofit2.http.POST +import retrofit2.http.Path +import retrofit2.http.Query + +interface SyncApi { + + @POST("api/sync/products") + suspend fun syncProducts(): SyncTriggerResponse + + @POST("api/sync/stock") + suspend fun syncStock(): SyncTriggerResponse + + @POST("api/sync/orders") + suspend fun syncOrders(): SyncTriggerResponse + + @GET("api/mappings/products") + suspend fun getProductMappings(@Query("status") status: String? = null): List + + @GET("api/mappings/orders") + suspend fun getOrderMappings(): List + + @GET("api/logs") + suspend fun getLogs(@Query("type") type: String? = null): List + + @GET("api/logs/{id}") + suspend fun getLogById(@Path("id") id: Long): SyncLogResponse +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/datastore/SettingsDataStore.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/datastore/SettingsDataStore.kt new file mode 100644 index 0000000..39dfe38 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/datastore/SettingsDataStore.kt @@ -0,0 +1,52 @@ +package com.luklpz.tfg.syncmanager.data.datastore + +import android.content.Context +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import javax.inject.Inject +import javax.inject.Singleton + +private val Context.dataStore: DataStore by preferencesDataStore(name = "settings") + +data class AppSettings( + val serverUrl: String, + val username: String, + val password: String +) + +@Singleton +class SettingsDataStore @Inject constructor( + @ApplicationContext private val context: Context +) { + companion object { + private val KEY_SERVER_URL = stringPreferencesKey("server_url") + private val KEY_USERNAME = stringPreferencesKey("username") + private val KEY_PASSWORD = stringPreferencesKey("password") + + const val DEFAULT_URL = "https://proyectointermodular-production-a9c3.up.railway.app/" + const val DEFAULT_USERNAME = "admin" + const val DEFAULT_PASSWORD = "admin123" + } + + val settingsFlow: Flow = context.dataStore.data.map { prefs -> + AppSettings( + serverUrl = prefs[KEY_SERVER_URL] ?: DEFAULT_URL, + username = prefs[KEY_USERNAME] ?: DEFAULT_USERNAME, + password = prefs[KEY_PASSWORD] ?: DEFAULT_PASSWORD + ) + } + + suspend fun saveSettings(settings: AppSettings) { + context.dataStore.edit { prefs -> + prefs[KEY_SERVER_URL] = settings.serverUrl + prefs[KEY_USERNAME] = settings.username + prefs[KEY_PASSWORD] = settings.password + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/OrderMappingResponse.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/OrderMappingResponse.kt new file mode 100644 index 0000000..d495f48 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/OrderMappingResponse.kt @@ -0,0 +1,10 @@ +package com.luklpz.tfg.syncmanager.data.model + +data class OrderMappingResponse( + val id: Long, + val prestashopOrderId: Int, + val dolibarrOrderId: Int?, + val dolibarrInvoiceId: Int?, + val importedAt: String, + val status: String +) diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/ProductMappingResponse.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/ProductMappingResponse.kt new file mode 100644 index 0000000..4c8a6d5 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/ProductMappingResponse.kt @@ -0,0 +1,11 @@ +package com.luklpz.tfg.syncmanager.data.model + +data class ProductMappingResponse( + val id: Long, + val sku: String, + val dolibarrId: Int?, + val prestashopId: Int?, + val lastSyncedAt: String?, + val syncStatus: String, + val errorMessage: String? +) diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/SyncLogResponse.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/SyncLogResponse.kt new file mode 100644 index 0000000..c16da75 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/SyncLogResponse.kt @@ -0,0 +1,11 @@ +package com.luklpz.tfg.syncmanager.data.model + +data class SyncLogResponse( + val id: Long, + val syncType: String, + val startedAt: String, + val finishedAt: String?, + val itemsProcessed: Int?, + val itemsFailed: Int?, + val errorDetails: String? +) diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/SyncTriggerResponse.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/SyncTriggerResponse.kt new file mode 100644 index 0000000..b1ede5e --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/model/SyncTriggerResponse.kt @@ -0,0 +1,9 @@ +package com.luklpz.tfg.syncmanager.data.model + +data class SyncTriggerResponse( + val syncType: String, + val itemsProcessed: Int, + val itemsFailed: Int, + val hasErrors: Boolean, + val errors: List +) diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/AuthInterceptor.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/AuthInterceptor.kt new file mode 100644 index 0000000..8f84b11 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/AuthInterceptor.kt @@ -0,0 +1,22 @@ +package com.luklpz.tfg.syncmanager.data.remote + +import android.util.Base64 +import okhttp3.Interceptor +import okhttp3.Response +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class AuthInterceptor @Inject constructor( + private val serverConfig: ServerConfig +) : Interceptor { + + override fun intercept(chain: Interceptor.Chain): Response { + val credentials = "${serverConfig.username}:${serverConfig.password}" + val encoded = Base64.encodeToString(credentials.toByteArray(), Base64.NO_WRAP) + val request = chain.request().newBuilder() + .header("Authorization", "Basic $encoded") + .build() + return chain.proceed(request) + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/DynamicUrlInterceptor.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/DynamicUrlInterceptor.kt new file mode 100644 index 0000000..a8ae5c7 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/DynamicUrlInterceptor.kt @@ -0,0 +1,25 @@ +package com.luklpz.tfg.syncmanager.data.remote + +import okhttp3.HttpUrl.Companion.toHttpUrl +import okhttp3.Interceptor +import okhttp3.Response +import javax.inject.Inject +import javax.inject.Singleton + +/** Rewrites host/scheme/port to the runtime-configured server URL. */ +@Singleton +class DynamicUrlInterceptor @Inject constructor( + private val serverConfig: ServerConfig +) : Interceptor { + + override fun intercept(chain: Interceptor.Chain): Response { + val original = chain.request() + val base = serverConfig.baseUrl.trimEnd('/').toHttpUrl() + val newUrl = original.url.newBuilder() + .scheme(base.scheme) + .host(base.host) + .port(base.port) + .build() + return chain.proceed(original.newBuilder().url(newUrl).build()) + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/ServerConfig.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/ServerConfig.kt new file mode 100644 index 0000000..5ae73fe --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/remote/ServerConfig.kt @@ -0,0 +1,11 @@ +package com.luklpz.tfg.syncmanager.data.remote + +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class ServerConfig @Inject constructor() { + var baseUrl: String = "https://proyectointermodular-production-a9c3.up.railway.app/" + var username: String = "admin" + var password: String = "admin123" +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/repository/SyncRepository.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/repository/SyncRepository.kt new file mode 100644 index 0000000..4f47543 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/data/repository/SyncRepository.kt @@ -0,0 +1,66 @@ +package com.luklpz.tfg.syncmanager.data.repository + +import com.luklpz.tfg.syncmanager.data.api.SyncApi +import com.luklpz.tfg.syncmanager.data.datastore.AppSettings +import com.luklpz.tfg.syncmanager.data.datastore.SettingsDataStore +import com.luklpz.tfg.syncmanager.data.model.OrderMappingResponse +import com.luklpz.tfg.syncmanager.data.model.ProductMappingResponse +import com.luklpz.tfg.syncmanager.data.model.SyncLogResponse +import com.luklpz.tfg.syncmanager.data.model.SyncTriggerResponse +import com.luklpz.tfg.syncmanager.data.remote.ServerConfig +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.first +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class SyncRepository @Inject constructor( + private val syncApi: SyncApi, + private val settingsDataStore: SettingsDataStore, + private val serverConfig: ServerConfig +) { + val settingsFlow: Flow = settingsDataStore.settingsFlow + + /** Applies latest saved settings to the live ServerConfig before each network call. */ + private suspend fun refreshConfig() { + val s = settingsDataStore.settingsFlow.first() + serverConfig.baseUrl = s.serverUrl + serverConfig.username = s.username + serverConfig.password = s.password + } + + suspend fun syncProducts(): SyncTriggerResponse { refreshConfig(); return syncApi.syncProducts() } + suspend fun syncStock(): SyncTriggerResponse { refreshConfig(); return syncApi.syncStock() } + suspend fun syncOrders(): SyncTriggerResponse { refreshConfig(); return syncApi.syncOrders() } + + suspend fun getProductMappings(status: String? = null): List { + refreshConfig(); return syncApi.getProductMappings(status) + } + + suspend fun getOrderMappings(): List { + refreshConfig(); return syncApi.getOrderMappings() + } + + suspend fun getLogs(type: String? = null): List { + refreshConfig(); return syncApi.getLogs(type) + } + + suspend fun getLogById(id: Long): SyncLogResponse { + refreshConfig(); return syncApi.getLogById(id) + } + + suspend fun saveSettings(settings: AppSettings) { + settingsDataStore.saveSettings(settings) + serverConfig.baseUrl = settings.serverUrl + serverConfig.username = settings.username + serverConfig.password = settings.password + } + + /** Test connection with given credentials without persisting them. */ + suspend fun testConnection(settings: AppSettings) { + serverConfig.baseUrl = settings.serverUrl + serverConfig.username = settings.username + serverConfig.password = settings.password + syncApi.getLogs() + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/di/NetworkModule.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/di/NetworkModule.kt new file mode 100644 index 0000000..a2a3840 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/di/NetworkModule.kt @@ -0,0 +1,46 @@ +package com.luklpz.tfg.syncmanager.di + +import com.luklpz.tfg.syncmanager.data.api.SyncApi +import com.luklpz.tfg.syncmanager.data.remote.AuthInterceptor +import com.luklpz.tfg.syncmanager.data.remote.DynamicUrlInterceptor +import com.luklpz.tfg.syncmanager.data.remote.ServerConfig +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object NetworkModule { + + @Provides @Singleton + fun provideLoggingInterceptor(): HttpLoggingInterceptor = + HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY } + + @Provides @Singleton + fun provideOkHttpClient( + dynamicUrlInterceptor: DynamicUrlInterceptor, + authInterceptor: AuthInterceptor, + loggingInterceptor: HttpLoggingInterceptor + ): OkHttpClient = OkHttpClient.Builder() + .addInterceptor(dynamicUrlInterceptor) + .addInterceptor(authInterceptor) + .addInterceptor(loggingInterceptor) + .build() + + @Provides @Singleton + fun provideRetrofit(client: OkHttpClient, serverConfig: ServerConfig): Retrofit = + Retrofit.Builder() + .baseUrl(serverConfig.baseUrl) + .client(client) + .addConverterFactory(GsonConverterFactory.create()) + .build() + + @Provides @Singleton + fun provideSyncApi(retrofit: Retrofit): SyncApi = retrofit.create(SyncApi::class.java) +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/AppViewModel.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/AppViewModel.kt new file mode 100644 index 0000000..698e7a9 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/AppViewModel.kt @@ -0,0 +1,37 @@ +package com.luklpz.tfg.syncmanager.ui + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.luklpz.tfg.syncmanager.data.repository.SyncRepository +import com.luklpz.tfg.syncmanager.util.ConnectivityObserver +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class AppViewModel @Inject constructor( + connectivity: ConnectivityObserver, + private val repository: SyncRepository +) : ViewModel() { + + val isOnline = connectivity.isOnline + .stateIn(viewModelScope, SharingStarted.Eagerly, true) + + private val _errorLogCount = MutableStateFlow(0) + val errorLogCount = _errorLogCount.asStateFlow() + + init { refreshErrorCount() } + + fun refreshErrorCount() { + viewModelScope.launch { + try { + val logs = repository.getLogs() + _errorLogCount.value = logs.count { (it.itemsFailed ?: 0) > 0 } + } catch (_: Exception) {} + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/UiState.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/UiState.kt new file mode 100644 index 0000000..386e4f7 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/UiState.kt @@ -0,0 +1,8 @@ +package com.luklpz.tfg.syncmanager.ui + +sealed class UiState { + object Idle : UiState() + object Loading : UiState() + data class Success(val data: T) : UiState() + data class Error(val message: String) : UiState() +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/dashboard/DashboardScreen.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/dashboard/DashboardScreen.kt new file mode 100644 index 0000000..064cf6d --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/dashboard/DashboardScreen.kt @@ -0,0 +1,415 @@ +package com.luklpz.tfg.syncmanager.ui.dashboard + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.Error +import androidx.compose.material.icons.filled.Inventory2 +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.filled.ShoppingCart +import androidx.compose.material.icons.filled.Sync +import androidx.compose.material.icons.filled.Warning +import androidx.compose.material.icons.filled.Warehouse +import androidx.compose.material.icons.filled.WifiOff +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FilledTonalButton +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.pulltorefresh.PullToRefreshBox +import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.luklpz.tfg.syncmanager.data.model.SyncLogResponse +import com.luklpz.tfg.syncmanager.data.model.SyncTriggerResponse +import com.luklpz.tfg.syncmanager.ui.UiState +import com.luklpz.tfg.syncmanager.util.formatRelativeDateTime + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DashboardScreen( + isOnline: Boolean, + onNavigateToSettings: () -> Unit, + viewModel: DashboardViewModel = hiltViewModel() +) { + val productsState by viewModel.productsState.collectAsState() + val stockState by viewModel.stockState.collectAsState() + val ordersState by viewModel.ordersState.collectAsState() + val lastLogs by viewModel.lastLogs.collectAsState() + val syncAllStep by viewModel.syncAllStep.collectAsState() + val pendingSync by viewModel.pendingSync.collectAsState() + val pendingSyncAll by viewModel.pendingSyncAll.collectAsState() + val serverConfigured by viewModel.serverConfigured.collectAsState() + val isRefreshing by viewModel.isRefreshing.collectAsState() + val serverReachable by viewModel.serverReachable.collectAsState() + + val isSyncingAll = syncAllStep != SyncAllStep.IDLE && syncAllStep != SyncAllStep.DONE + + pendingSync?.let { type -> + AlertDialog( + onDismissRequest = viewModel::dismissSync, + title = { Text("Confirmar sincronización") }, + text = { Text("¿Ejecutar sincronización de ${syncTypeLabel(type)}?") }, + confirmButton = { + Button(onClick = viewModel::confirmSync) { Text("Sincronizar") } + }, + dismissButton = { + TextButton(onClick = viewModel::dismissSync) { Text("Cancelar") } + } + ) + } + + if (pendingSyncAll) { + AlertDialog( + onDismissRequest = viewModel::dismissSyncAll, + title = { Text("Sincronizar todo") }, + text = { Text("Ejecutará productos, stock y pedidos en secuencia. ¿Continuar?") }, + confirmButton = { + Button(onClick = viewModel::confirmSyncAll) { Text("Sincronizar todo") } + }, + dismissButton = { + TextButton(onClick = viewModel::dismissSyncAll) { Text("Cancelar") } + } + ) + } + + Scaffold( + topBar = { + TopAppBar( + title = { + Column { + Text("Sync Manager", style = MaterialTheme.typography.titleLarge) + Text( + "Dolibarr · PrestaShop", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + ) + } + ) { padding -> + PullToRefreshBox( + isRefreshing = isRefreshing, + onRefresh = viewModel::refresh, + modifier = Modifier + .fillMaxSize() + .padding(padding), + state = rememberPullToRefreshState() + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 16.dp, vertical = 8.dp) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + AnimatedVisibility(visible = !isOnline || serverReachable == false) { + Card( + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.errorContainer + ), + modifier = Modifier.fillMaxWidth() + ) { + Row( + modifier = Modifier.padding(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + Icons.Default.WifiOff, null, + tint = MaterialTheme.colorScheme.onErrorContainer, + modifier = Modifier.size(20.dp) + ) + Spacer(Modifier.width(8.dp)) + Text( + "Sin conexión — las sincronizaciones fallarán.", + color = MaterialTheme.colorScheme.onErrorContainer, + style = MaterialTheme.typography.bodySmall + ) + } + } + } + + AnimatedVisibility(visible = !serverConfigured) { + Card( + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.secondaryContainer + ), + modifier = Modifier.fillMaxWidth() + ) { + Row( + modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + Icons.Default.Settings, null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, + modifier = Modifier.size(20.dp) + ) + Spacer(Modifier.width(8.dp)) + Column(Modifier.weight(1f)) { + Text( + "Servidor no configurado", + color = MaterialTheme.colorScheme.onSecondaryContainer, + style = MaterialTheme.typography.bodySmall, + fontWeight = FontWeight.SemiBold + ) + Text( + "Configura la URL del servidor en Ajustes", + color = MaterialTheme.colorScheme.onSecondaryContainer, + style = MaterialTheme.typography.bodySmall + ) + } + TextButton(onClick = onNavigateToSettings) { Text("Ajustes") } + } + } + } + + Text( + "Sincronización manual", + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + + FilledTonalButton( + onClick = viewModel::requestSyncAll, + enabled = !isSyncingAll && isOnline, + modifier = Modifier.fillMaxWidth() + ) { + if (isSyncingAll) { + CircularProgressIndicator(modifier = Modifier.size(16.dp), strokeWidth = 2.dp) + Spacer(Modifier.width(8.dp)) + Text(syncAllStepLabel(syncAllStep)) + } else { + Icon(Icons.Default.Sync, null, modifier = Modifier.size(18.dp)) + Spacer(Modifier.width(8.dp)) + Text("Sincronizar todo") + } + } + + SyncCard( + title = "Productos", + origin = "Dolibarr", + destination = "PrestaShop", + description = "Crea o actualiza productos en la tienda según el catálogo del ERP", + icon = Icons.Default.Inventory2, + state = productsState, + lastLog = lastLogs["PRODUCT_PUSH"], + isOnline = isOnline, + onSync = { viewModel.requestSync(SyncType.PRODUCTS) } + ) + SyncCard( + title = "Stock", + origin = "Dolibarr", + destination = "PrestaShop", + description = "Actualiza las unidades disponibles de cada producto en la tienda", + icon = Icons.Default.Warehouse, + state = stockState, + lastLog = lastLogs["STOCK_PUSH"], + isOnline = isOnline, + onSync = { viewModel.requestSync(SyncType.STOCK) } + ) + SyncCard( + title = "Pedidos", + origin = "PrestaShop", + destination = "Dolibarr", + description = "Importa los pedidos de la tienda como comandas en el ERP", + icon = Icons.Default.ShoppingCart, + state = ordersState, + lastLog = lastLogs["ORDER_PULL"], + isOnline = isOnline, + onSync = { viewModel.requestSync(SyncType.ORDERS) } + ) + } + } + } +} + +@Composable +private fun SyncCard( + title: String, + origin: String, + destination: String, + description: String, + icon: ImageVector, + state: UiState, + lastLog: SyncLogResponse?, + isOnline: Boolean, + onSync: () -> Unit +) { + val isError = state is UiState.Error || (state is UiState.Success && state.data.itemsFailed > 0) + val isLoading = state is UiState.Loading + + Card( + modifier = Modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = when { + isError -> MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.3f) + state is UiState.Success -> MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.2f) + else -> MaterialTheme.colorScheme.surface + } + ) + ) { + Column(modifier = Modifier.padding(16.dp)) { + + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(22.dp) + ) + Spacer(Modifier.width(8.dp)) + Text(title, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Spacer(Modifier.weight(1f)) + Text( + "$origin → $destination", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + Spacer(Modifier.height(4.dp)) + Text( + description, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + + if (lastLog != null) { + Spacer(Modifier.height(4.dp)) + val hadErrors = (lastLog.itemsFailed ?: 0) > 0 + Text( + buildString { + append("Última: ${lastLog.startedAt.formatRelativeDateTime()}") + when { + hadErrors -> append(" · ${lastLog.itemsFailed} errores") + lastLog.itemsProcessed != null -> append(" · ${lastLog.itemsProcessed} items") + } + }, + style = MaterialTheme.typography.bodySmall, + color = if (hadErrors) MaterialTheme.colorScheme.error + else MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + Spacer(Modifier.height(12.dp)) + + when (state) { + is UiState.Success -> SyncResultRow(state.data) + is UiState.Error -> Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + Icons.Default.Error, contentDescription = null, + tint = MaterialTheme.colorScheme.error, + modifier = Modifier.size(16.dp) + ) + Spacer(Modifier.width(6.dp)) + Text( + state.message, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall + ) + } + else -> {} + } + + Spacer(Modifier.height(10.dp)) + + Button( + onClick = onSync, + enabled = !isLoading && isOnline, + modifier = Modifier.fillMaxWidth() + ) { + if (isLoading) { + CircularProgressIndicator( + modifier = Modifier.size(16.dp), + strokeWidth = 2.dp, + color = MaterialTheme.colorScheme.onPrimary + ) + Spacer(Modifier.width(8.dp)) + Text("Sincronizando…") + } else { + Icon(Icons.Default.Sync, null, modifier = Modifier.size(18.dp)) + Spacer(Modifier.width(8.dp)) + Text("Sincronizar $title") + } + } + } + } +} + +@Composable +private fun SyncResultRow(result: SyncTriggerResponse) { + Row( + horizontalArrangement = Arrangement.spacedBy(16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Default.Check, null, + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(16.dp)) + Spacer(Modifier.width(4.dp)) + Text("${result.itemsProcessed} procesados", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.primary) + } + if (result.itemsFailed > 0) { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Default.Warning, null, + tint = MaterialTheme.colorScheme.error, + modifier = Modifier.size(16.dp)) + Spacer(Modifier.width(4.dp)) + Text("${result.itemsFailed} fallidos", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error) + } + } + } + if (result.errors.isNotEmpty()) { + Spacer(Modifier.height(4.dp)) + result.errors.take(2).forEach { err -> + Text("• $err", style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error) + } + } +} + +private fun syncTypeLabel(type: SyncType) = when (type) { + SyncType.PRODUCTS -> "Productos" + SyncType.STOCK -> "Stock" + SyncType.ORDERS -> "Pedidos" +} + +private fun syncAllStepLabel(step: SyncAllStep) = when (step) { + SyncAllStep.PRODUCTS -> "Sincronizando productos…" + SyncAllStep.STOCK -> "Sincronizando stock…" + SyncAllStep.ORDERS -> "Sincronizando pedidos…" + else -> "Sincronizando…" +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/dashboard/DashboardViewModel.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/dashboard/DashboardViewModel.kt new file mode 100644 index 0000000..3ed1f36 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/dashboard/DashboardViewModel.kt @@ -0,0 +1,155 @@ +package com.luklpz.tfg.syncmanager.ui.dashboard + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.luklpz.tfg.syncmanager.data.model.SyncLogResponse +import com.luklpz.tfg.syncmanager.data.model.SyncTriggerResponse +import com.luklpz.tfg.syncmanager.data.repository.SyncRepository +import com.luklpz.tfg.syncmanager.ui.UiState +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import javax.inject.Inject + +enum class SyncType { PRODUCTS, STOCK, ORDERS } + +enum class SyncAllStep { IDLE, PRODUCTS, STOCK, ORDERS, DONE } + +@HiltViewModel +class DashboardViewModel @Inject constructor( + private val repository: SyncRepository +) : ViewModel() { + + private val _productsState = MutableStateFlow>(UiState.Idle) + val productsState = _productsState.asStateFlow() + + private val _stockState = MutableStateFlow>(UiState.Idle) + val stockState = _stockState.asStateFlow() + + private val _ordersState = MutableStateFlow>(UiState.Idle) + val ordersState = _ordersState.asStateFlow() + + private val _lastLogs = MutableStateFlow>(emptyMap()) + val lastLogs = _lastLogs.asStateFlow() + + private val _syncAllStep = MutableStateFlow(SyncAllStep.IDLE) + val syncAllStep = _syncAllStep.asStateFlow() + + private val _pendingSync = MutableStateFlow(null) + val pendingSync = _pendingSync.asStateFlow() + + private val _pendingSyncAll = MutableStateFlow(false) + val pendingSyncAll = _pendingSyncAll.asStateFlow() + + private val _isRefreshing = MutableStateFlow(false) + val isRefreshing = _isRefreshing.asStateFlow() + + /** null = not checked yet, true = reachable, false = unreachable */ + private val _serverReachable = MutableStateFlow(null) + val serverReachable = _serverReachable.asStateFlow() + + val serverConfigured = repository.settingsFlow + .map { it.serverUrl.isNotBlank() } + .stateIn(viewModelScope, SharingStarted.Eagerly, true) + + init { + loadLastLogs() + checkConnection() + } + + fun refresh() { + viewModelScope.launch { + _isRefreshing.value = true + checkConnectionInternal() + loadLastLogsInternal() + _isRefreshing.value = false + } + } + + private fun checkConnection() { + viewModelScope.launch { checkConnectionInternal() } + } + + private suspend fun checkConnectionInternal() { + try { + val settings = repository.settingsFlow.first() + repository.testConnection(settings) + _serverReachable.value = true + } catch (_: Exception) { + _serverReachable.value = false + } + } + + private fun loadLastLogs() { + viewModelScope.launch { loadLastLogsInternal() } + } + + private suspend fun loadLastLogsInternal() { + try { + val logs = repository.getLogs() + _lastLogs.value = logs + .groupBy { it.syncType } + .mapValues { (_, list) -> list.maxBy { it.id } } + } catch (_: Exception) {} + } + + fun requestSync(type: SyncType) { _pendingSync.value = type } + fun dismissSync() { _pendingSync.value = null } + + fun confirmSync() { + val type = _pendingSync.value ?: return + _pendingSync.value = null + when (type) { + SyncType.PRODUCTS -> launchSync(_productsState) { repository.syncProducts() } + SyncType.STOCK -> launchSync(_stockState) { repository.syncStock() } + SyncType.ORDERS -> launchSync(_ordersState) { repository.syncOrders() } + } + } + + fun requestSyncAll() { _pendingSyncAll.value = true } + fun dismissSyncAll() { _pendingSyncAll.value = false } + + fun confirmSyncAll() { + _pendingSyncAll.value = false + viewModelScope.launch { + _syncAllStep.value = SyncAllStep.PRODUCTS + _productsState.value = UiState.Loading + _productsState.value = try { UiState.Success(repository.syncProducts()) } + catch (e: Exception) { UiState.Error(e.message ?: "Error") } + + _syncAllStep.value = SyncAllStep.STOCK + _stockState.value = UiState.Loading + _stockState.value = try { UiState.Success(repository.syncStock()) } + catch (e: Exception) { UiState.Error(e.message ?: "Error") } + + _syncAllStep.value = SyncAllStep.ORDERS + _ordersState.value = UiState.Loading + _ordersState.value = try { UiState.Success(repository.syncOrders()) } + catch (e: Exception) { UiState.Error(e.message ?: "Error") } + + _syncAllStep.value = SyncAllStep.DONE + loadLastLogs() + } + } + + private fun launchSync( + state: MutableStateFlow>, + block: suspend () -> SyncTriggerResponse + ) { + viewModelScope.launch { + state.value = UiState.Loading + state.value = try { + val result = block() + loadLastLogs() + UiState.Success(result) + } catch (e: Exception) { + UiState.Error(e.message ?: "Error desconocido") + } + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogDetailScreen.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogDetailScreen.kt new file mode 100644 index 0000000..1ee31e1 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogDetailScreen.kt @@ -0,0 +1,226 @@ +package com.luklpz.tfg.syncmanager.ui.logs + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.Error +import androidx.compose.material.icons.filled.Timer +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.luklpz.tfg.syncmanager.ui.UiState +import com.luklpz.tfg.syncmanager.util.durationBetween +import com.luklpz.tfg.syncmanager.util.formatDateTime + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun LogDetailScreen( + logId: Long, + onBack: () -> Unit, + viewModel: LogDetailViewModel = hiltViewModel() +) { + LaunchedEffect(logId) { viewModel.loadLog(logId) } + val state by viewModel.log.collectAsState() + + Scaffold( + topBar = { + TopAppBar( + title = { Text("Detalle del log #$logId") }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, "Volver") + } + } + ) + } + ) { padding -> + when (val s = state) { + is UiState.Loading -> Box( + Modifier.fillMaxSize().padding(padding), + contentAlignment = Alignment.Center + ) { CircularProgressIndicator() } + + is UiState.Error -> Box( + Modifier.fillMaxSize().padding(padding).padding(32.dp), + contentAlignment = Alignment.Center + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Icon(Icons.Default.Error, null, + modifier = Modifier.size(48.dp), + tint = MaterialTheme.colorScheme.error) + Spacer(Modifier.height(12.dp)) + Text(s.message, color = MaterialTheme.colorScheme.error) + } + } + + is UiState.Success -> { + val log = s.data + val hasErrors = (log.itemsFailed ?: 0) > 0 + val isRunning = log.finishedAt == null + + Column( + modifier = Modifier + .fillMaxSize() + .padding(padding) + .verticalScroll(rememberScrollState()) + ) { + // Status banner + Card( + modifier = Modifier.fillMaxWidth().padding(16.dp), + colors = CardDefaults.cardColors( + containerColor = when { + isRunning -> MaterialTheme.colorScheme.secondaryContainer + hasErrors -> MaterialTheme.colorScheme.errorContainer + else -> MaterialTheme.colorScheme.primaryContainer + } + ) + ) { + Row( + modifier = Modifier.padding(16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = when { + isRunning -> Icons.Default.Timer + hasErrors -> Icons.Default.Error + else -> Icons.Default.CheckCircle + }, + contentDescription = null, + modifier = Modifier.size(28.dp), + tint = when { + isRunning -> MaterialTheme.colorScheme.onSecondaryContainer + hasErrors -> MaterialTheme.colorScheme.onErrorContainer + else -> MaterialTheme.colorScheme.onPrimaryContainer + } + ) + Spacer(Modifier.width(12.dp)) + Column { + Text( + text = when { + isRunning -> "En curso" + hasErrors -> "${log.itemsFailed} elemento(s) fallaron" + else -> "Completado sin errores" + }, + style = MaterialTheme.typography.titleSmall + ) + Text( + syncTypeDescription(log.syncType), + style = MaterialTheme.typography.bodySmall + ) + } + } + } + + // Info section + SectionTitle("Información") + InfoRow("Tipo de sync", syncTypeDescription(log.syncType)) + InfoRow("Inicio", log.startedAt.formatDateTime()) + InfoRow("Fin", log.finishedAt.formatDateTime()) + InfoRow("Duración", durationBetween(log.startedAt, log.finishedAt)) + + HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) + + // Results section + SectionTitle("Resultado") + InfoRow("Procesados correctamente", "${log.itemsProcessed ?: 0}") + InfoRow("Fallidos", "${log.itemsFailed ?: 0}", + valueColor = if (hasErrors) MaterialTheme.colorScheme.error else null) + + // Error details + if (!log.errorDetails.isNullOrBlank()) { + HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) + SectionTitle("Detalle de errores") + Spacer(Modifier.height(4.dp)) + Card( + modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.errorContainer + ) + ) { + Text( + text = log.errorDetails, + modifier = Modifier.padding(12.dp), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer + ) + } + Spacer(Modifier.height(16.dp)) + } + } + } + + else -> {} + } + } +} + +@Composable +private fun SectionTitle(title: String) { + Text( + title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.primary, + modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp) + ) +} + +@Composable +private fun InfoRow( + label: String, + value: String, + valueColor: androidx.compose.ui.graphics.Color? = null +) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 3.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + label, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.weight(1f) + ) + Text( + value, + style = MaterialTheme.typography.bodyMedium, + color = valueColor ?: MaterialTheme.colorScheme.onSurface + ) + } +} + +private fun syncTypeDescription(type: String) = when (type) { + "PRODUCT_PUSH" -> "Productos: Dolibarr → PrestaShop" + "STOCK_PUSH" -> "Stock: Dolibarr → PrestaShop" + "ORDER_PULL" -> "Pedidos: PrestaShop → Dolibarr" + else -> type +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogDetailViewModel.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogDetailViewModel.kt new file mode 100644 index 0000000..71c2dac --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogDetailViewModel.kt @@ -0,0 +1,32 @@ +package com.luklpz.tfg.syncmanager.ui.logs + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.luklpz.tfg.syncmanager.data.model.SyncLogResponse +import com.luklpz.tfg.syncmanager.data.repository.SyncRepository +import com.luklpz.tfg.syncmanager.ui.UiState +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class LogDetailViewModel @Inject constructor( + private val repository: SyncRepository +) : ViewModel() { + + private val _log = MutableStateFlow>(UiState.Loading) + val log = _log.asStateFlow() + + fun loadLog(id: Long) { + viewModelScope.launch { + _log.value = UiState.Loading + _log.value = try { + UiState.Success(repository.getLogById(id)) + } catch (e: Exception) { + UiState.Error(e.message ?: "Error") + } + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogsScreen.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogsScreen.kt new file mode 100644 index 0000000..8b1140b --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogsScreen.kt @@ -0,0 +1,271 @@ +package com.luklpz.tfg.syncmanager.ui.logs + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.ChevronRight +import androidx.compose.material.icons.filled.Error +import androidx.compose.material.icons.filled.FilterList +import androidx.compose.material.icons.filled.Inbox +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material.icons.filled.Timer +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FilterChip +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.pulltorefresh.PullToRefreshBox +import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.luklpz.tfg.syncmanager.data.model.SyncLogResponse +import com.luklpz.tfg.syncmanager.ui.UiState +import com.luklpz.tfg.syncmanager.util.durationBetween +import com.luklpz.tfg.syncmanager.util.formatRelativeDateTime + +private val TYPE_FILTERS = listOf( + null to "Todos", + "PRODUCT_PUSH" to "Productos", + "STOCK_PUSH" to "Stock", + "ORDER_PULL" to "Pedidos" +) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun LogsScreen( + onLogClick: (Long) -> Unit, + viewModel: LogsViewModel = hiltViewModel() +) { + val logs by viewModel.logs.collectAsState() + val activeFilter by viewModel.activeFilter.collectAsState() + + var isRefreshing by remember { mutableStateOf(false) } + LaunchedEffect(logs) { if (logs !is UiState.Loading) isRefreshing = false } + + Scaffold( + topBar = { + TopAppBar( + title = { + Column { + Text("Historial de sincronización") + Text("Registros de cada ejecución", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant) + } + }, + actions = { + IconButton(onClick = { + isRefreshing = true + viewModel.loadLogs(activeFilter) + }) { + Icon(Icons.Default.Refresh, contentDescription = "Recargar") + } + } + ) + } + ) { padding -> + Column(modifier = Modifier.padding(padding)) { + LazyRow( + contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + items(TYPE_FILTERS) { (value, label) -> + FilterChip( + selected = activeFilter == value, + onClick = { viewModel.loadLogs(if (activeFilter == value) null else value) }, + label = { Text(label) }, + leadingIcon = if (activeFilter == value) { + { Icon(Icons.Default.FilterList, null, modifier = Modifier.size(16.dp)) } + } else null + ) + } + } + + HorizontalDivider() + + PullToRefreshBox( + isRefreshing = isRefreshing, + onRefresh = { isRefreshing = true; viewModel.loadLogs(activeFilter) }, + modifier = Modifier.fillMaxSize(), + state = rememberPullToRefreshState() + ) { + when (val state = logs) { + is UiState.Loading -> if (!isRefreshing) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } + + is UiState.Error -> Box( + Modifier.fillMaxSize().padding(32.dp), + contentAlignment = Alignment.Center + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Icon(Icons.Default.Error, null, + modifier = Modifier.size(48.dp), + tint = MaterialTheme.colorScheme.error) + Spacer(Modifier.height(12.dp)) + Text(state.message, color = MaterialTheme.colorScheme.error, + textAlign = TextAlign.Center) + Spacer(Modifier.height(16.dp)) + Button(onClick = { + isRefreshing = true + viewModel.loadLogs(activeFilter) + }) { Text("Reintentar") } + } + } + + is UiState.Success -> { + if (state.data.isEmpty()) { + Box(Modifier.fillMaxSize().padding(32.dp), contentAlignment = Alignment.Center) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Icon(Icons.Default.Inbox, null, + modifier = Modifier.size(48.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant) + Spacer(Modifier.height(12.dp)) + Text("No hay registros de sincronización", + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center) + } + } + } else { + LazyColumn(modifier = Modifier.fillMaxSize()) { + items(state.data) { log -> + LogItem(log = log, onClick = { onLogClick(log.id) }) + } + } + } + } + + else -> {} + } + } + } + } +} + +@Composable +private fun LogItem(log: SyncLogResponse, onClick: () -> Unit) { + val hasErrors = (log.itemsFailed ?: 0) > 0 + val isRunning = log.finishedAt == null + + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 4.dp) + .clickable(onClick = onClick), + colors = CardDefaults.cardColors( + containerColor = when { + hasErrors -> MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.25f) + else -> MaterialTheme.colorScheme.surface + } + ) + ) { + Row( + modifier = Modifier.padding(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = when { + isRunning -> Icons.Default.Timer + hasErrors -> Icons.Default.Error + else -> Icons.Default.CheckCircle + }, + contentDescription = null, + modifier = Modifier.size(20.dp), + tint = when { + isRunning -> MaterialTheme.colorScheme.secondary + hasErrors -> MaterialTheme.colorScheme.error + else -> MaterialTheme.colorScheme.primary + } + ) + + Spacer(Modifier.width(10.dp)) + + Column(modifier = Modifier.weight(1f)) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Text( + text = syncTypeLabel(log.syncType), + style = MaterialTheme.typography.titleSmall + ) + Text( + log.startedAt.formatRelativeDateTime(), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + Spacer(Modifier.height(2.dp)) + + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + Text( + "✓ ${log.itemsProcessed ?: 0} procesados", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + if (hasErrors) { + Text( + "✗ ${log.itemsFailed} fallidos", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error + ) + } + Text( + durationBetween(log.startedAt, log.finishedAt), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + Icon( + Icons.Default.ChevronRight, + contentDescription = "Ver detalle", + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } +} + +private fun syncTypeLabel(type: String) = when (type) { + "PRODUCT_PUSH" -> "Productos" + "STOCK_PUSH" -> "Stock" + "ORDER_PULL" -> "Pedidos" + else -> type +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogsViewModel.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogsViewModel.kt new file mode 100644 index 0000000..a4b7b2f --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/logs/LogsViewModel.kt @@ -0,0 +1,38 @@ +package com.luklpz.tfg.syncmanager.ui.logs + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.luklpz.tfg.syncmanager.data.model.SyncLogResponse +import com.luklpz.tfg.syncmanager.data.repository.SyncRepository +import com.luklpz.tfg.syncmanager.ui.UiState +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class LogsViewModel @Inject constructor( + private val repository: SyncRepository +) : ViewModel() { + + private val _logs = MutableStateFlow>>(UiState.Loading) + val logs = _logs.asStateFlow() + + private val _activeFilter = MutableStateFlow(null) + val activeFilter = _activeFilter.asStateFlow() + + init { loadLogs() } + + fun loadLogs(type: String? = _activeFilter.value) { + _activeFilter.value = type + viewModelScope.launch { + _logs.value = UiState.Loading + _logs.value = try { + UiState.Success(repository.getLogs(type)) + } catch (e: Exception) { + UiState.Error(e.message ?: "Error al cargar logs") + } + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/mappings/MappingsScreen.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/mappings/MappingsScreen.kt new file mode 100644 index 0000000..54544c2 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/mappings/MappingsScreen.kt @@ -0,0 +1,348 @@ +package com.luklpz.tfg.syncmanager.ui.mappings + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.Error +import androidx.compose.material.icons.filled.FilterList +import androidx.compose.material.icons.filled.Inbox +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material.icons.filled.Search +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FilterChip +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SuggestionChip +import androidx.compose.material3.Tab +import androidx.compose.material3.TabRow +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.pulltorefresh.PullToRefreshBox +import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.luklpz.tfg.syncmanager.data.model.OrderMappingResponse +import com.luklpz.tfg.syncmanager.data.model.ProductMappingResponse +import com.luklpz.tfg.syncmanager.ui.UiState +import com.luklpz.tfg.syncmanager.util.formatDateTime + +private val PRODUCT_FILTERS = listOf( + null to "Todos", + "SYNCED" to "Sincronizados", + "PENDING" to "Pendientes", + "ERROR" to "Con error" +) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MappingsScreen(viewModel: MappingsViewModel = hiltViewModel()) { + var selectedTab by remember { mutableIntStateOf(0) } + val products by viewModel.products.collectAsState() + val orders by viewModel.orders.collectAsState() + val productFilter by viewModel.productFilter.collectAsState() + val searchQuery by viewModel.searchQuery.collectAsState() + + val productCount = (products as? UiState.Success)?.data?.size + val orderCount = (orders as? UiState.Success)?.data?.size + + var isRefreshingProducts by remember { mutableStateOf(false) } + var isRefreshingOrders by remember { mutableStateOf(false) } + + LaunchedEffect(products) { if (products !is UiState.Loading) isRefreshingProducts = false } + LaunchedEffect(orders) { if (orders !is UiState.Loading) isRefreshingOrders = false } + + Scaffold( + topBar = { + TopAppBar( + title = { Text("Mappings") }, + actions = { + IconButton(onClick = { + if (selectedTab == 0) { + isRefreshingProducts = true + viewModel.loadProductMappings() + } else { + isRefreshingOrders = true + viewModel.loadOrderMappings() + } + }) { + Icon(Icons.Default.Refresh, contentDescription = "Recargar") + } + } + ) + } + ) { padding -> + Column(modifier = Modifier.padding(padding)) { + TabRow(selectedTabIndex = selectedTab) { + Tab( + selected = selectedTab == 0, + onClick = { selectedTab = 0 }, + text = { + Text(if (productCount != null) "Productos ($productCount)" else "Productos") + } + ) + Tab( + selected = selectedTab == 1, + onClick = { selectedTab = 1 }, + text = { + Text(if (orderCount != null) "Pedidos ($orderCount)" else "Pedidos") + } + ) + } + + if (selectedTab == 0) { + OutlinedTextField( + value = searchQuery, + onValueChange = viewModel::updateSearchQuery, + placeholder = { Text("Buscar por SKU…") }, + leadingIcon = { Icon(Icons.Default.Search, null, modifier = Modifier.size(20.dp)) }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 8.dp), + singleLine = true + ) + + LazyRow( + contentPadding = + PaddingValues(start = 16.dp, end = 16.dp, bottom = 8.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + items(PRODUCT_FILTERS) { (value, label) -> + FilterChip( + selected = productFilter == value, + onClick = { viewModel.setProductFilter(if (productFilter == value) null else value) }, + label = { Text(label) }, + leadingIcon = if (productFilter == value) { + { Icon(Icons.Default.FilterList, null, modifier = Modifier.size(16.dp)) } + } else null + ) + } + } + + PullToRefreshBox( + isRefreshing = isRefreshingProducts, + onRefresh = { isRefreshingProducts = true; viewModel.loadProductMappings() }, + modifier = Modifier.fillMaxSize(), + state = rememberPullToRefreshState() + ) { + when (val state = products) { + is UiState.Loading -> if (!isRefreshingProducts) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } + is UiState.Error -> EmptyOrErrorState( + isError = true, + message = state.message, + onRetry = { isRefreshingProducts = true; viewModel.loadProductMappings() } + ) + is UiState.Success -> { + if (state.data.isEmpty()) { + EmptyOrErrorState( + isError = false, + message = "No hay productos mapeados.\nEjecuta la sync de productos desde el Dashboard.", + onRetry = null + ) + } else { + LazyColumn(modifier = Modifier.fillMaxSize()) { + items(state.data) { ProductMappingItem(it) } + } + } + } + else -> {} + } + } + } else { + PullToRefreshBox( + isRefreshing = isRefreshingOrders, + onRefresh = { isRefreshingOrders = true; viewModel.loadOrderMappings() }, + modifier = Modifier.fillMaxSize(), + state = rememberPullToRefreshState() + ) { + when (val state = orders) { + is UiState.Loading -> if (!isRefreshingOrders) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } + is UiState.Error -> EmptyOrErrorState( + isError = true, + message = state.message, + onRetry = { isRefreshingOrders = true; viewModel.loadOrderMappings() } + ) + is UiState.Success -> { + if (state.data.isEmpty()) { + EmptyOrErrorState( + isError = false, + message = "No hay pedidos importados.\nEjecuta la sync de pedidos desde el Dashboard.", + onRetry = null + ) + } else { + LazyColumn(modifier = Modifier.fillMaxSize()) { + items(state.data) { OrderMappingItem(it) } + } + } + } + else -> {} + } + } + } + } + } +} + +@Composable +private fun ProductMappingItem(item: ProductMappingResponse) { + val isError = item.syncStatus == "ERROR" + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 4.dp), + colors = CardDefaults.cardColors( + containerColor = if (isError) + MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.3f) + else MaterialTheme.colorScheme.surface + ) + ) { + Column(modifier = Modifier.padding(12.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Column(modifier = Modifier.weight(1f)) { + Text(item.sku, style = MaterialTheme.typography.titleSmall) + Text( + "Dolibarr ID: ${item.dolibarrId ?: "sin asignar"} · PrestaShop ID: ${item.prestashopId ?: "sin asignar"}", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Text( + "Última sync: ${item.lastSyncedAt.formatDateTime()}", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + Spacer(Modifier.width(8.dp)) + StatusChip(item.syncStatus) + } + if (isError && !item.errorMessage.isNullOrBlank()) { + Spacer(Modifier.height(6.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Default.Error, null, + tint = MaterialTheme.colorScheme.error, + modifier = Modifier.size(14.dp)) + Spacer(Modifier.width(4.dp)) + Text(item.errorMessage, style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error) + } + } + } + } +} + +@Composable +private fun OrderMappingItem(item: OrderMappingResponse) { + val isError = item.status == "ERROR" + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 4.dp), + colors = CardDefaults.cardColors( + containerColor = if (isError) + MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.3f) + else MaterialTheme.colorScheme.surface + ) + ) { + Column(modifier = Modifier.padding(12.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Column(modifier = Modifier.weight(1f)) { + Text("Pedido PS #${item.prestashopOrderId}", + style = MaterialTheme.typography.titleSmall) + Text( + "Comanda Dolibarr: ${item.dolibarrOrderId ?: "sin crear"}", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Text( + "Factura: ${item.dolibarrInvoiceId ?: "sin generar"} · ${item.importedAt.formatDateTime()}", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + Spacer(Modifier.width(8.dp)) + StatusChip(item.status) + } + } + } +} + +@Composable +private fun StatusChip(status: String) { + val (color, label) = when (status) { + "SYNCED" -> MaterialTheme.colorScheme.primary to "Sincronizado" + "INVOICED" -> MaterialTheme.colorScheme.primary to "Facturado" + "IMPORTED" -> MaterialTheme.colorScheme.tertiary to "Importado" + "PENDING" -> MaterialTheme.colorScheme.secondary to "Pendiente" + "ERROR" -> MaterialTheme.colorScheme.error to "Error" + else -> MaterialTheme.colorScheme.outline to status + } + SuggestionChip( + onClick = {}, + label = { Text(label, style = MaterialTheme.typography.labelSmall, color = color) } + ) +} + +@Composable +private fun EmptyOrErrorState(isError: Boolean, message: String, onRetry: (() -> Unit)?) { + Box(Modifier.fillMaxSize().padding(32.dp), contentAlignment = Alignment.Center) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Icon( + if (isError) Icons.Default.Error else Icons.Default.Inbox, + null, + modifier = Modifier.size(48.dp), + tint = if (isError) MaterialTheme.colorScheme.error + else MaterialTheme.colorScheme.onSurfaceVariant + ) + Spacer(Modifier.height(12.dp)) + Text( + message, + style = MaterialTheme.typography.bodyMedium, + color = if (isError) MaterialTheme.colorScheme.error + else MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center + ) + if (onRetry != null) { + Spacer(Modifier.height(16.dp)) + Button(onClick = onRetry) { Text("Reintentar") } + } + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/mappings/MappingsViewModel.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/mappings/MappingsViewModel.kt new file mode 100644 index 0000000..020cf6e --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/mappings/MappingsViewModel.kt @@ -0,0 +1,77 @@ +package com.luklpz.tfg.syncmanager.ui.mappings + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.luklpz.tfg.syncmanager.data.model.OrderMappingResponse +import com.luklpz.tfg.syncmanager.data.model.ProductMappingResponse +import com.luklpz.tfg.syncmanager.data.repository.SyncRepository +import com.luklpz.tfg.syncmanager.ui.UiState +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class MappingsViewModel @Inject constructor( + private val repository: SyncRepository +) : ViewModel() { + + private val _rawProducts = MutableStateFlow>>(UiState.Loading) + + private val _orders = MutableStateFlow>>(UiState.Loading) + val orders = _orders.asStateFlow() + + private val _productFilter = MutableStateFlow(null) + val productFilter = _productFilter.asStateFlow() + + private val _searchQuery = MutableStateFlow("") + val searchQuery = _searchQuery.asStateFlow() + + val products = combine(_rawProducts, _searchQuery) { state, query -> + when { + state !is UiState.Success -> state + query.isBlank() -> state + else -> UiState.Success( + state.data.filter { it.sku.contains(query, ignoreCase = true) } + ) + } + }.stateIn(viewModelScope, SharingStarted.Eagerly, UiState.Loading) + + init { + loadProductMappings() + loadOrderMappings() + } + + fun updateSearchQuery(query: String) { _searchQuery.value = query } + + fun setProductFilter(status: String?) { + _productFilter.value = status + loadProductMappings(status) + } + + fun loadProductMappings(status: String? = _productFilter.value) { + viewModelScope.launch { + _rawProducts.value = UiState.Loading + _rawProducts.value = try { + UiState.Success(repository.getProductMappings(status)) + } catch (e: Exception) { + UiState.Error(e.message ?: "Error al cargar productos") + } + } + } + + fun loadOrderMappings() { + viewModelScope.launch { + _orders.value = UiState.Loading + _orders.value = try { + UiState.Success(repository.getOrderMappings()) + } catch (e: Exception) { + UiState.Error(e.message ?: "Error al cargar pedidos") + } + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/navigation/AppNavGraph.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/navigation/AppNavGraph.kt new file mode 100644 index 0000000..895a797 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/navigation/AppNavGraph.kt @@ -0,0 +1,130 @@ +package com.luklpz.tfg.syncmanager.ui.navigation + +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.List +import androidx.compose.material.icons.filled.History +import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.Badge +import androidx.compose.material3.BadgedBox +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.NavType +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import androidx.navigation.navArgument +import com.luklpz.tfg.syncmanager.ui.AppViewModel +import com.luklpz.tfg.syncmanager.ui.dashboard.DashboardScreen +import com.luklpz.tfg.syncmanager.ui.logs.LogDetailScreen +import com.luklpz.tfg.syncmanager.ui.logs.LogsScreen +import com.luklpz.tfg.syncmanager.ui.mappings.MappingsScreen +import com.luklpz.tfg.syncmanager.ui.settings.SettingsScreen + +private sealed class Screen(val route: String, val label: String, val icon: ImageVector) { + object Dashboard : Screen("dashboard", "Dashboard", Icons.Default.Home) + object Mappings : Screen("mappings", "Mappings", Icons.AutoMirrored.Filled.List) + object Logs : Screen("logs", "Logs", Icons.Default.History) + object Settings : Screen("settings", "Ajustes", Icons.Default.Settings) +} + +private val bottomNavItems = listOf( + Screen.Dashboard, Screen.Mappings, Screen.Logs, Screen.Settings +) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AppNavGraph() { + val navController = rememberNavController() + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + val currentRoute = currentDestination?.route + + val appViewModel = hiltViewModel() + val isOnline by appViewModel.isOnline.collectAsState() + val errorLogCount by appViewModel.errorLogCount.collectAsState() + + val showBottomBar = bottomNavItems.any { it.route == currentRoute } + + Scaffold( + bottomBar = { + if (showBottomBar) { + NavigationBar { + bottomNavItems.forEach { screen -> + NavigationBarItem( + icon = { + BadgedBox( + badge = { + if (screen == Screen.Logs && errorLogCount > 0) { + Badge { Text("$errorLogCount") } + } + } + ) { + Icon(screen.icon, contentDescription = screen.label) + } + }, + label = { Text(screen.label) }, + selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true, + onClick = { + navController.navigate(screen.route) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + } + ) + } + } + } + } + ) { innerPadding -> + NavHost( + navController = navController, + startDestination = Screen.Dashboard.route, + modifier = Modifier.padding(innerPadding) + ) { + composable(Screen.Dashboard.route) { + DashboardScreen( + isOnline = isOnline, + onNavigateToSettings = { + navController.navigate(Screen.Settings.route) { + popUpTo(navController.graph.findStartDestination().id) { saveState = true } + launchSingleTop = true + restoreState = true + } + } + ) + } + composable(Screen.Mappings.route) { MappingsScreen() } + composable(Screen.Logs.route) { + LogsScreen(onLogClick = { logId -> + navController.navigate("logs/$logId") + }) + } + composable( + route = "logs/{logId}", + arguments = listOf(navArgument("logId") { type = NavType.LongType }) + ) { backStackEntry -> + val logId = backStackEntry.arguments?.getLong("logId") ?: return@composable + LogDetailScreen(logId = logId, onBack = { navController.popBackStack() }) + } + composable(Screen.Settings.route) { SettingsScreen() } + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/settings/SettingsScreen.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/settings/SettingsScreen.kt new file mode 100644 index 0000000..7f7ccf8 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/settings/SettingsScreen.kt @@ -0,0 +1,193 @@ +package com.luklpz.tfg.syncmanager.ui.settings + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.Error +import androidx.compose.material.icons.filled.Key +import androidx.compose.material.icons.filled.Person +import androidx.compose.material.icons.filled.Save +import androidx.compose.material.icons.filled.Visibility +import androidx.compose.material.icons.filled.VisibilityOff +import androidx.compose.material.icons.filled.Wifi +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.luklpz.tfg.syncmanager.ui.UiState + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel()) { + val settings by viewModel.settings.collectAsState() + val saved by viewModel.saved.collectAsState() + val connectionTest by viewModel.connectionTest.collectAsState() + val snackbarHostState = remember { SnackbarHostState() } + var passwordVisible by remember { mutableStateOf(false) } + + LaunchedEffect(saved) { + if (saved) { + snackbarHostState.showSnackbar("Ajustes guardados correctamente") + viewModel.onSavedConsumed() + } + } + + Scaffold( + topBar = { + TopAppBar( + title = { + Column { + Text("Ajustes de conexión") + Text("Configura el servidor sync-service", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant) + } + } + ) + }, + snackbarHost = { SnackbarHost(snackbarHostState) } + ) { padding -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(padding) + .padding(16.dp) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Text("Servidor", style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant) + + OutlinedTextField( + value = settings.serverUrl, + onValueChange = viewModel::updateServerUrl, + label = { Text("URL del servidor") }, + placeholder = { Text("https://tu-servidor.up.railway.app/") }, + supportingText = { Text("Incluye la barra final /") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri), + leadingIcon = { Icon(Icons.Default.Wifi, null) } + ) + + Spacer(Modifier.height(4.dp)) + Text("Credenciales (Basic Auth)", style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant) + + OutlinedTextField( + value = settings.username, + onValueChange = viewModel::updateUsername, + label = { Text("Usuario") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + leadingIcon = { Icon(Icons.Default.Person, null) } + ) + + OutlinedTextField( + value = settings.password, + onValueChange = viewModel::updatePassword, + label = { Text("Contraseña") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + visualTransformation = if (passwordVisible) VisualTransformation.None + else PasswordVisualTransformation(), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), + leadingIcon = { Icon(Icons.Default.Key, null) }, + trailingIcon = { + IconButton(onClick = { passwordVisible = !passwordVisible }) { + Icon( + if (passwordVisible) Icons.Default.VisibilityOff else Icons.Default.Visibility, + contentDescription = if (passwordVisible) "Ocultar contraseña" else "Mostrar contraseña" + ) + } + } + ) + + Spacer(Modifier.height(8.dp)) + + // Test connection result + when (val ct = connectionTest) { + is UiState.Success -> Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Default.CheckCircle, null, + tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(20.dp)) + Spacer(Modifier.width(8.dp)) + Text("Conexión exitosa", color = MaterialTheme.colorScheme.primary, + style = MaterialTheme.typography.bodyMedium) + } + is UiState.Error -> Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Default.Error, null, + tint = MaterialTheme.colorScheme.error, modifier = Modifier.size(20.dp)) + Spacer(Modifier.width(8.dp)) + Text(ct.message, color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall) + } + else -> {} + } + + // Buttons + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + OutlinedButton( + onClick = { + viewModel.resetConnectionTest() + viewModel.testConnection() + }, + modifier = Modifier.weight(1f), + enabled = connectionTest !is UiState.Loading + ) { + if (connectionTest is UiState.Loading) { + CircularProgressIndicator(modifier = Modifier.size(16.dp), strokeWidth = 2.dp) + } else { + Icon(Icons.Default.Wifi, null, modifier = Modifier.size(18.dp)) + } + Spacer(Modifier.width(6.dp)) + Text("Probar") + } + + Button( + onClick = viewModel::save, + modifier = Modifier.weight(1f) + ) { + Icon(Icons.Default.Save, null, modifier = Modifier.size(18.dp)) + Spacer(Modifier.width(6.dp)) + Text("Guardar") + } + } + } + } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/settings/SettingsViewModel.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/settings/SettingsViewModel.kt new file mode 100644 index 0000000..2be5067 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/settings/SettingsViewModel.kt @@ -0,0 +1,72 @@ +package com.luklpz.tfg.syncmanager.ui.settings + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.luklpz.tfg.syncmanager.data.datastore.AppSettings +import com.luklpz.tfg.syncmanager.data.datastore.SettingsDataStore +import com.luklpz.tfg.syncmanager.data.repository.SyncRepository +import com.luklpz.tfg.syncmanager.ui.UiState +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class SettingsViewModel @Inject constructor( + private val repository: SyncRepository +) : ViewModel() { + + private val _settings = MutableStateFlow( + AppSettings(SettingsDataStore.DEFAULT_URL, SettingsDataStore.DEFAULT_USERNAME, SettingsDataStore.DEFAULT_PASSWORD) + ) + val settings = _settings.asStateFlow() + + private val _saved = MutableStateFlow(false) + val saved = _saved.asStateFlow() + + private val _connectionTest = MutableStateFlow>(UiState.Idle) + val connectionTest = _connectionTest.asStateFlow() + + init { + viewModelScope.launch { + repository.settingsFlow.collect { _settings.value = it } + } + } + + fun updateServerUrl(url: String) = _settings.update { it.copy(serverUrl = url) } + fun updateUsername(username: String) = _settings.update { it.copy(username = username) } + fun updatePassword(password: String) = _settings.update { it.copy(password = password) } + + fun save() { + viewModelScope.launch { + repository.saveSettings(_settings.value) + _saved.value = true + } + } + + fun testConnection() { + viewModelScope.launch { + _connectionTest.value = UiState.Loading + _connectionTest.value = try { + repository.testConnection(_settings.value) + UiState.Success(Unit) + } catch (e: Exception) { + val msg = when { + e.message?.contains("401") == true || e.message?.contains("Unauthorized") == true -> + "Credenciales incorrectas (401)" + e.message?.contains("Unable to resolve host") == true -> + "URL no alcanzable. Verifica la dirección del servidor." + e.message?.contains("timeout") == true -> + "Tiempo de espera agotado. El servidor no responde." + else -> e.message ?: "Error de conexión" + } + UiState.Error(msg) + } + } + } + + fun onSavedConsumed() { _saved.value = false } + fun resetConnectionTest() { _connectionTest.value = UiState.Idle } +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Color.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Color.kt new file mode 100644 index 0000000..9bc6f9f --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.luklpz.tfg.syncmanager.ui.theme + +import androidx.compose.ui.graphics.Color + +val Blue80 = Color(0xFFBBDEFB) +val BlueGrey80 = Color(0xFFB0BEC5) +val Teal80 = Color(0xFFB2EBF2) + +val Blue40 = Color(0xFF1565C0) +val BlueGrey40 = Color(0xFF546E7A) +val Teal40 = Color(0xFF00838F) diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Theme.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Theme.kt new file mode 100644 index 0000000..98eedb1 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Theme.kt @@ -0,0 +1,45 @@ +package com.luklpz.tfg.syncmanager.ui.theme + +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Blue80, + secondary = BlueGrey80, + tertiary = Teal80 +) + +private val LightColorScheme = lightColorScheme( + primary = Blue40, + secondary = BlueGrey40, + tertiary = Teal40 +) + +@Composable +fun SyncManagerTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Type.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Type.kt new file mode 100644 index 0000000..f76da33 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/ui/theme/Type.kt @@ -0,0 +1,17 @@ +package com.luklpz.tfg.syncmanager.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) +) diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/util/ConnectivityObserver.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/util/ConnectivityObserver.kt new file mode 100644 index 0000000..188f3aa --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/util/ConnectivityObserver.kt @@ -0,0 +1,40 @@ +package com.luklpz.tfg.syncmanager.util + +import android.content.Context +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities +import android.net.NetworkRequest +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.distinctUntilChanged +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class ConnectivityObserver @Inject constructor( + @ApplicationContext private val context: Context +) { + val isOnline: Flow = callbackFlow { + val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + + val callback = object : ConnectivityManager.NetworkCallback() { + override fun onAvailable(network: Network) { trySend(true) } + override fun onLost(network: Network) { trySend(false) } + } + + cm.registerNetworkCallback( + NetworkRequest.Builder() + .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + .build(), + callback + ) + + val current = cm.activeNetwork?.let { cm.getNetworkCapabilities(it) } + trySend(current?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true) + + awaitClose { cm.unregisterNetworkCallback(callback) } + }.distinctUntilChanged() +} diff --git a/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/util/DateUtils.kt b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/util/DateUtils.kt new file mode 100644 index 0000000..e5cffd5 --- /dev/null +++ b/android-app/app/src/main/java/com/luklpz/tfg/syncmanager/util/DateUtils.kt @@ -0,0 +1,45 @@ +package com.luklpz.tfg.syncmanager.util + +import java.time.Duration +import java.time.Instant +import java.time.ZoneId +import java.time.format.DateTimeFormatter + +private val DISPLAY_FORMAT = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm") + +fun String?.formatDateTime(): String { + if (this == null) return "—" + return try { + DISPLAY_FORMAT.format(Instant.parse(this).atZone(ZoneId.systemDefault())) + } catch (e: Exception) { + this + } +} + +fun String?.formatRelativeDateTime(): String { + if (this == null) return "—" + return try { + val seconds = Duration.between(Instant.parse(this), Instant.now()).seconds + when { + seconds < 60 -> "hace menos de 1 min" + seconds < 3600 -> "hace ${seconds / 60} min" + seconds < 86400 -> "hace ${seconds / 3600}h" + else -> formatDateTime() + } + } catch (e: Exception) { + this + } +} + +fun durationBetween(startedAt: String, finishedAt: String?): String { + if (finishedAt == null) return "En curso…" + return try { + val seconds = Duration.between(Instant.parse(startedAt), Instant.parse(finishedAt)).seconds + when { + seconds < 60 -> "${seconds}s" + else -> "${seconds / 60}m ${seconds % 60}s" + } + } catch (e: Exception) { + "—" + } +} diff --git a/android-app/app/src/main/res/drawable/ic_launcher_background.xml b/android-app/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..a2e8bb5 --- /dev/null +++ b/android-app/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + + diff --git a/android-app/app/src/main/res/drawable/ic_launcher_foreground.xml b/android-app/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..c8621c1 --- /dev/null +++ b/android-app/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,9 @@ + + + diff --git a/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6b78462 --- /dev/null +++ b/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6b78462 --- /dev/null +++ b/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android-app/app/src/main/res/values/strings.xml b/android-app/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..c5a84e5 --- /dev/null +++ b/android-app/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Sync Manager + diff --git a/android-app/app/src/main/res/values/themes.xml b/android-app/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..751fa27 --- /dev/null +++ b/android-app/app/src/main/res/values/themes.xml @@ -0,0 +1,8 @@ + + + + diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts new file mode 100644 index 0000000..922365d --- /dev/null +++ b/android-app/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.compose) apply false + alias(libs.plugins.hilt.android) apply false + alias(libs.plugins.ksp) apply false +} diff --git a/android-app/gradle.properties b/android-app/gradle.properties new file mode 100644 index 0000000..d17a316 --- /dev/null +++ b/android-app/gradle.properties @@ -0,0 +1,5 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true +android.enableJetifier=true +android.suppressUnsupportedCompileSdk=35 +kotlin.code.style=official diff --git a/android-app/gradle/libs.versions.toml b/android-app/gradle/libs.versions.toml new file mode 100644 index 0000000..47343ec --- /dev/null +++ b/android-app/gradle/libs.versions.toml @@ -0,0 +1,56 @@ +[versions] +agp = "8.5.0" +kotlin = "2.0.0" +ksp = "2.0.0-1.0.21" +coreKtx = "1.13.1" +junit = "4.13.2" +junitVersion = "1.2.1" +espressoCore = "3.6.1" +lifecycleRuntimeKtx = "2.8.3" +activityCompose = "1.9.0" +composeBom = "2024.09.00" +navigationCompose = "2.7.7" +hilt = "2.51.1" +hiltNavigationCompose = "1.2.0" +retrofit = "2.11.0" +okhttp = "4.12.0" +coroutines = "1.8.1" +datastore = "1.1.1" +splashscreen = "1.0.1" +material = "1.12.0" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleRuntimeKtx" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } +hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } +hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } +hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" } +retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } +retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" } +okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } +coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } +androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" } +androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "splashscreen" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } diff --git a/android-app/gradle/wrapper/gradle-wrapper.jar b/android-app/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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