fix(UiState): change UI State problem (#11)

Author: Theo-lbg

app/src/main/java/com/xpeho/xpeapp/data/dateConverter/DateTypeAdapter.kt

@@ -10,8 +10,8 @@ import java.util.Locale
 class DateTypeAdapter : JsonSerializer<Date>, JsonDeserializer<Date> {
     // Format for input dates
     private val inputFormats = listOf(
+        SimpleDateFormat("yyyy-MM-dd", Locale.FRENCH),
         SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.FRENCH),
-        SimpleDateFormat("yyyy-MM-dd", Locale.FRENCH)
     )
     // Format for output dates
     private val outputFormat = SimpleDateFormat("dd/MM/yyyy", Locale.FRENCH)
@@ -28,7 +28,7 @@ class DateTypeAdapter : JsonSerializer<Date>, JsonDeserializer<Date> {
                     return format.parse(dateStr)
                 } catch (e: ParseException) {
                     // Ignore and try the next format
-                    println(e.message)
+                    println("Failed to parse date: $e")
                 }
             }
         }

app/src/main/java/com/xpeho/xpeapp/ui/page/AgendaPage.kt

@@ -10,44 +10,38 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.xpeho.xpeapp.R
+import com.xpeho.xpeapp.ui.components.AppLoader
 import com.xpeho.xpeapp.ui.components.CustomDialog
 import com.xpeho.xpeapp.ui.components.agenda.AgendaBirthdayItem
 import com.xpeho.xpeapp.ui.components.agenda.AgendaCardList
 import com.xpeho.xpeapp.ui.components.agenda.AgendaEventItem
 import com.xpeho.xpeapp.ui.components.layout.Title
 import com.xpeho.xpeapp.ui.sendAnalyticsEvent
 import com.xpeho.xpeapp.ui.uiState.AgendaUiState
-import com.xpeho.xpeapp.ui.uiState.QvstUiState
 import com.xpeho.xpeapp.ui.viewModel.agenda.AgendaViewModel
-import com.xpeho.xpeapp.ui.viewModel.viewModelFactory
 
 @Composable
-fun AgendaPage() {
-    val agendaViewModel = viewModel<AgendaViewModel>(
-        factory = viewModelFactory {
-            AgendaViewModel()
-        }
-    )
+fun AgendaPage(agendaViewModel : AgendaViewModel = viewModel()) {
+    val agendaState = agendaViewModel.state
 
     sendAnalyticsEvent("agenda_page")
 
-    LaunchedEffect(Unit) {
-        agendaViewModel.updateState()
-    }
-
     LazyColumn(
         modifier = Modifier
             .padding(horizontal = 24.dp, vertical = 10.dp)
-            .fillMaxSize(),
+            .fillMaxSize()
     ) {
-        when (agendaViewModel.state) {
+        item {
+            Title(label = "Agenda")
+        }
+
+        when (agendaState) {
             is AgendaUiState.SUCCESS -> {
+                val state = agendaState
+                val events = state.agendaEvent.map { AgendaEventItem(it) }
+                val birthdays = state.agendaBirthday.map { AgendaBirthdayItem(it) }
+                val items = (events + birthdays).sortedBy { it.date }
                 item {
-                    Title(label = "Agenda")
-                    val state = agendaViewModel.state as AgendaUiState.SUCCESS
-                    val events = state.agendaEvent.map { AgendaEventItem(it) }
-                    val birthdays = state.agendaBirthday.map { AgendaBirthdayItem(it) }
-                    val items = (events + birthdays).sortedBy { it.date }
                     AgendaCardList(
                         items = items,
                         eventsTypes = state.agendaEventType,
@@ -65,6 +59,15 @@ fun AgendaPage() {
                     }
                 }
             }
+
+            is AgendaUiState.LOADING -> {
+                item {
+                    LaunchedEffect(Unit) {
+                        agendaViewModel.updateState()
+                    }
+                    AppLoader()
+                }
+            }
         }
     }
 }

app/src/main/java/com/xpeho/xpeapp/ui/viewModel/agenda/AgendaViewModel.kt

@@ -6,16 +6,13 @@ import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.xpeho.xpeapp.XpeApp
-import com.xpeho.xpeapp.data.model.agenda.AgendaBirthday
-import com.xpeho.xpeapp.data.model.agenda.AgendaEvent
-import com.xpeho.xpeapp.data.model.agenda.AgendaEventType
 import com.xpeho.xpeapp.ui.uiState.AgendaUiState
 
 import kotlinx.coroutines.launch
 
 class AgendaViewModel : ViewModel() {
 
-    var state: AgendaUiState by mutableStateOf(AgendaUiState.EMPTY)
+    var state: AgendaUiState by mutableStateOf(AgendaUiState.LOADING)
 
     private fun getAllEvents(page: String = "") {
         viewModelScope.launch {
@@ -24,12 +21,8 @@ class AgendaViewModel : ViewModel() {
 
             // Update state
             state = if (result != null) {
-                if (result.isEmpty()) {
-                    AgendaUiState.EMPTY
-                } else {
-                    val currentState = state as? AgendaUiState.SUCCESS ?: AgendaUiState.SUCCESS()
-                    currentState.copy(agendaEvent = result)
-                }
+                val currentState = state as? AgendaUiState.SUCCESS ?: AgendaUiState.SUCCESS()
+                currentState.copy(agendaEvent = result)
             } else {
                 AgendaUiState.ERROR("Erreur de chargement de tous les événements")
             }
@@ -43,12 +36,8 @@ class AgendaViewModel : ViewModel() {
 
             // Update state
             state = if (result != null) {
-                if (result.isEmpty()) {
-                    AgendaUiState.EMPTY
-                } else {
-                    val currentState = state as? AgendaUiState.SUCCESS ?: AgendaUiState.SUCCESS()
-                    currentState.copy(agendaEventType = result)
-                }
+                val currentState = state as? AgendaUiState.SUCCESS ?: AgendaUiState.SUCCESS()
+                currentState.copy(agendaEventType = result)
             } else {
                 AgendaUiState.ERROR("Erreur de chargement de tous les types d'événements")
             }
@@ -62,12 +51,8 @@ class AgendaViewModel : ViewModel() {
 
             // Update state
             state = if (result != null) {
-                if (result.isEmpty()) {
-                    AgendaUiState.EMPTY
-                } else {
-                    val currentState = state as? AgendaUiState.SUCCESS ?: AgendaUiState.SUCCESS()
-                    currentState.copy(agendaBirthday = result)
-                }
+                val currentState = state as? AgendaUiState.SUCCESS ?: AgendaUiState.SUCCESS()
+                currentState.copy(agendaBirthday = result)
             } else {
                 AgendaUiState.ERROR("Erreur de chargement de tous les anniversaires")
             }