Skip to content

fix(agendaViewModel): update state methods to specify time period for… #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Theo-lbg merged 1 commit into from
May 26, 2025
Merged

fix(agendaViewModel): update state methods to specify time period for… #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions app/src/main/java/com/xpeho/xpeapp/ui/page/AgendaPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
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
Expand Down Expand Up @@ -62,14 +59,14 @@ fun AgendaPage(agendaViewModel : AgendaViewModel = viewModel()) {
item {
NoContentPlaceHolder()
LaunchedEffect(Unit) {
agendaViewModel.updateState()
agendaViewModel.updateStateForMonth()
}
}
}
is AgendaUiState.LOADING -> {
item {
LaunchedEffect(Unit) {
agendaViewModel.updateState()
agendaViewModel.updateStateForMonth()
}
AppLoader()
}
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/xpeho/xpeapp/ui/page/HomePage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import androidx.navigation.NavController
import com.xpeho.xpeapp.R
import com.xpeho.xpeapp.XpeApp
import com.xpeho.xpeapp.data.FeatureFlippingEnum
import com.xpeho.xpeapp.data.entity.QvstCampaignEntity
import com.xpeho.xpeapp.domain.FeatureFlippingState
import com.xpeho.xpeapp.ui.components.CustomDialog
import com.xpeho.xpeapp.ui.components.agenda.AgendaBirthdayItem
Expand Down Expand Up @@ -187,7 +186,7 @@ fun HomePage(navigationController: NavController) {
is AgendaUiState.ERROR -> {
item {
LaunchedEffect(Unit) {
agendaViewModel.updateState()
agendaViewModel.updateStateForWeek()
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/xpeho/xpeapp/ui/viewModel/agenda/AgendaViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ class AgendaViewModel : ViewModel() {
state = AgendaUiState.EMPTY
}

fun updateState() {
fun updateStateForMonth() {
resetState()
getAllEvents()
getAllEvents("month")
getAllEventsTypes()
getAllBirthdays()
getAllBirthdays("month")
}

fun updateStateForWeek() {
Expand Down
Loading