wip

Author: waldo121

app/build.gradle.kts

@@ -85,6 +85,7 @@ dependencies {
     implementation(libs.androidx.room.runtime)
     implementation(libs.vico.compose)
     implementation(libs.vico.compose.m3)
+    implementation(libs.gson)
     annotationProcessor(libs.androidx.room.compiler)
     ksp(libs.androidx.room.compiler)
     testImplementation(libs.junit)

app/src/main/java/com/waldo121/pongstats/MainActivity.kt

@@ -71,6 +71,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.MutableCreationExtras
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.lifecycle.lifecycleScope
 import com.patrykandpatrick.vico.compose.cartesian.CartesianChartHost
 import com.patrykandpatrick.vico.compose.cartesian.axis.rememberAxisTickComponent
 import com.patrykandpatrick.vico.compose.cartesian.axis.rememberBottom
@@ -95,8 +96,10 @@ import com.waldo121.pongstats.ui.theme.PingPongWood
 import com.waldo121.pongstats.ui.theme.PongStatsTheme
 import com.waldo121.pongstats.viewModel.MatchRecordViewModel
 import com.waldo121.pongstats.viewModel.StatisticsViewModel
+import com.waldo121.pongstats.util.ExportRoomDatabase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.time.LocalDate
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
@@ -137,8 +140,10 @@ class MainActivity : ComponentActivity() {
         appDatabase = MatchRecordsDatabase.getDatabase(this)
 
         lifecycleScope.launch {
-            val path = exportRoomDatabase(this@MainActivity, appDatabase)
-            Toast.makeText(this@MainActivity, "Export terminé : $path", Toast.LENGTH_LONG).show()
+            val path = ExportRoomDatabase(this@MainActivity, appDatabase)
+            withContext(Dispatchers.Main) {
+                Toast.makeText(this@MainActivity, "Export terminé : $path", Toast.LENGTH_LONG).show()
+            }
         }
 
         enableEdgeToEdge()

app/src/main/java/com/waldo121/pongstats/data/repository/MatchRecordRepository.kt

@@ -1,6 +1,5 @@
 package com.waldo121.pongstats.data.repository
 
-
 import com.waldo121.pongstats.data.local.MatchRecordsDatabase
 import com.waldo121.pongstats.data.local.entities.DoubleMatchRecordEntity
 import com.waldo121.pongstats.data.local.entities.SingleMatchRecordEntity
@@ -15,9 +14,10 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import java.sql.SQLException
 
-class MatchRecordRepository (
+class MatchRecordRepository(
     private val matchRecordLocalDatabase: MatchRecordsDatabase
 ) {
+
     @Throws(SQLException::class)
     suspend fun createSingleMatchRecord(record: SingleMatchRecord) {
         withContext(Dispatchers.IO) {
@@ -28,12 +28,9 @@ class MatchRecordRepository (
     }
 
     @Throws(SQLException::class)
-    suspend fun getAllSingleMatchRecords(): Flow<List<SingleMatchRecord>> {
-        return withContext(Dispatchers.IO) {
-            val dao = matchRecordLocalDatabase.singleMatchRecordDao()
-            return@withContext dao.getAll()
-                .map { entities: List<SingleMatchRecordEntity> -> entities.map { it.toDomain() } }
-        }
+    fun getAllSingleMatchRecords(): Flow<List<SingleMatchRecord>> {
+        return matchRecordLocalDatabase.singleMatchRecordDao().getAll()
+            .map { entities: List<SingleMatchRecordEntity> -> entities.map { it.toDomain() } }
     }
 
     @Throws(SQLException::class)
@@ -46,14 +43,9 @@ class MatchRecordRepository (
     }
 
     @Throws(SQLException::class)
-    suspend fun getAllDoubleMatchRecords(): Flow<List<DoubleMatchRecord>> {
-        return withContext(Dispatchers.IO) {
-            val dao = matchRecordLocalDatabase.doubleMatchRecordDao()
-
-            return@withContext dao.getAll()
-                .map { entities: List<DoubleMatchRecordEntity> -> entities.map { it.toDomain() } }
-
-        }
+    fun getAllDoubleMatchRecords(): Flow<List<DoubleMatchRecord>> {
+        return matchRecordLocalDatabase.doubleMatchRecordDao().getAll()
+            .map { entities: List<DoubleMatchRecordEntity> -> entities.map { it.toDomain() } }
     }
 
     fun getAllUniquePlayerNames(): Flow<List<String>> {

app/src/main/java/com/waldo121/pongstats/viewModel/PlayerProfileViewModel.kt

@@ -2,35 +2,35 @@ package com.waldo121.pongstats.viewModel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.waldo121.pongstats.data.model.DoubleMatchRecord
 import com.waldo121.pongstats.data.model.SingleMatchRecord
 import com.waldo121.pongstats.data.repository.MatchRecordRepository
 import com.waldo121.pongstats.ui.screens.PlayerStatsUi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.SharingStarted
+
+
 
 class PlayerProfileViewModel(
     private val repository: MatchRecordRepository,
     private val playerName: String
 ) : ViewModel() {
-    private val _stats = MutableStateFlow(PlayerStatsUi(0, 0,  0))
-    val stats: StateFlow<PlayerStatsUi> = _stats.asStateFlow()
-
-    init {
-        viewModelScope.launch {
-            combine(
-                repository.getAllSingleMatchRecords()
-            ) { singleMatches, doubleMatches ->
-                val single = singleMatches.filter { it.opponentName == playerName }
-                val totalWins = single.sumOf { it.numberOfWins } 
-                val totalDefeats = single.sumOf { it.numberOfDefeats } 
-                val totalMatches = totalWins + totalDefeats
-                val winRate = if (totalMatches > 0) (totalWins * 100 / totalMatches) else 0
-                PlayerStatsUi(totalWins, totalDefeats, winRate)
-            }.collect { _stats.value = it }
+        val stats: StateFlow<PlayerStatsUi> = repository.getAllSingleMatchRecords()
+        .map { singleMatches ->
+            val single = singleMatches.filter { it.opponentName == playerName }
+            val totalWins = single.sumOf { it.numberOfWins }
+            val totalDefeats = single.sumOf { it.numberOfDefeats }
+            val totalMatches = totalWins + totalDefeats
+            val winRate = if (totalMatches > 0) (totalWins * 100 / totalMatches) else 0
+            PlayerStatsUi(totalWins, totalDefeats, winRate)
         }
-    }
+        .stateIn(
+            scope = viewModelScope,
+            started = kotlinx.coroutines.flow.SharingStarted.Lazily,
+            initialValue = PlayerStatsUi(0, 0, 0)
+        )
 } 

app/src/main/java/com/waldo121/util/ExportDatabase.kt

@@ -7,17 +7,20 @@ import com.google.gson.GsonBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
+import com.waldo121.pongstats.data.local.dao.DoubleMatchRecordDao
+import com.waldo121.pongstats.data.local.dao.SingleMatchRecordDao
+import com.waldo121.pongstats.data.local.MatchRecordsDatabase
 
 // Fonction d'export complète
-suspend fun exportRoomDatabase(context: Context, db: MatchRecordsDatabase) = withContext(Dispatchers.IO) {
+suspend fun ExportRoomDatabase(context: Context, db: MatchRecordsDatabase) = withContext(Dispatchers.IO) {
     val gson = GsonBuilder().setPrettyPrinting().create()
 
     // 🔹 Récupère les données de chaque DAO
     val singleMatches = db.singleMatchRecordDao().getAll()
-    val doubleMatches = db.DoubleMatchRecordDao().getAll()
+    val doubleMatches = db.doubleMatchRecordDao().getAll()
 
     // 🔹 Mets tout dans un seul objet
-    val exportData = mapOf(
+    val exportData: Map<String, Any> = mapOf(
         "single_match_records" to singleMatches,
         "double_match_records" to doubleMatches,
     )

gradle/libs.versions.toml

@@ -12,6 +12,7 @@ navigationCompose = "2.8.9"
 room = "2.7.1"
 ksp = "2.0.0-1.0.24"
 vico = "2.2.0-alpha.1"
+gson = "2.10.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -33,6 +34,7 @@ androidx-room-runtime = { group = "androidx.room", name = "room-runtime", versio
 androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 vico-compose = { group = "com.patrykandpatrick.vico", name = "compose", version.ref = "vico" }
 vico-compose-m3 = { group = "com.patrykandpatrick.vico", name = "compose-m3", version.ref = "vico" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }