Skip to content

fix logout bug #7

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

Open
evanadwyer-pronoid-software wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −1
Open

fix logout bug #7

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
5 changes: 5 additions & 0 deletions ...presentation/src/main/java/com/plcoding/run/presentation/run_overview/RunOverviewEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.plcoding.run.presentation.run_overview

sealed interface RunOverviewEvent {
data object OnLogout : RunOverviewEvent
}
8 changes: 7 additions & 1 deletion ...resentation/src/main/java/com/plcoding/run/presentation/run_overview/RunOverviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import com.plcoding.core.presentation.designsystem.components.RuniqueFloatingAct
import com.plcoding.core.presentation.designsystem.components.RuniqueScaffold
import com.plcoding.core.presentation.designsystem.components.RuniqueToolbar
import com.plcoding.core.presentation.designsystem.components.util.DropDownItem
import com.plcoding.core.presentation.ui.ObserveAsEvents
import com.plcoding.run.presentation.R
import com.plcoding.run.presentation.run_overview.components.RunListItem
import org.koin.androidx.compose.koinViewModel
Expand All @@ -40,13 +41,18 @@ fun RunOverviewScreenRoot(
onAnalyticsClick: () -> Unit,
viewModel: RunOverviewViewModel = koinViewModel(),
) {
ObserveAsEvents(flow = viewModel.events) { event ->
when (event) {
RunOverviewEvent.OnLogout -> onLogoutClick()
}
}

RunOverviewScreen(
state = viewModel.state,
onAction = { action ->
when(action) {
RunOverviewAction.OnAnalyticsClick -> onAnalyticsClick()
RunOverviewAction.OnStartClick -> onStartRunClick()
RunOverviewAction.OnLogoutClick -> onLogoutClick()
else -> Unit
}
viewModel.onAction(action)
Expand Down
6 changes: 6 additions & 0 deletions ...entation/src/main/java/com/plcoding/run/presentation/run_overview/RunOverviewViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ import com.plcoding.core.domain.run.RunRepository
import com.plcoding.core.domain.run.SyncRunScheduler
import com.plcoding.run.presentation.run_overview.mapper.toRunUi
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.launch
import kotlin.time.Duration.Companion.minutes

Expand All @@ -25,6 +27,9 @@ class RunOverviewViewModel(
var state by mutableStateOf(RunOverviewState())
private set

private val eventChannel = Channel<RunOverviewEvent>()
val events = eventChannel.receiveAsFlow()

init {
viewModelScope.launch {
syncRunScheduler.scheduleSync(
Expand Down Expand Up @@ -62,6 +67,7 @@ class RunOverviewViewModel(
runRepository.deleteAllRuns()
runRepository.logout()
sessionStorage.set(null)
eventChannel.send(RunOverviewEvent.OnLogout)
}
}
}