diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt index 5696142c..ebefc78e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt @@ -62,6 +62,7 @@ class BookInfoModel @Inject constructor( val state = _state.asStateFlow() private var eventJob = SupervisorJob() + private var resetJob: Job? = null private var updateJob: Job? = null private var snackBarJob: Job? = null @@ -785,7 +786,9 @@ class BookInfoModel @Inject constructor( } eventJob.cancel() + resetJob?.cancel() eventJob.join() + resetJob?.join() eventJob = SupervisorJob() _state.update { @@ -807,10 +810,11 @@ class BookInfoModel @Inject constructor( } fun resetScreen() { - viewModelScope.launch(Dispatchers.Main) { + resetJob = viewModelScope.launch(Dispatchers.Main) { eventJob.cancel() eventJob = SupervisorJob() + yield() _state.update { BookInfoState() } } } diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt index e410948d..d2e0d43c 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt @@ -61,6 +61,7 @@ class ReaderModel @Inject constructor( val state = _state.asStateFlow() private var eventJob = SupervisorJob() + private var resetJob: Job? = null private var scrollJob: Job? = null private var updateJob: Job? = null @@ -564,7 +565,9 @@ class ReaderModel @Inject constructor( } eventJob.cancel() + resetJob?.cancel() eventJob.join() + resetJob?.join() eventJob = SupervisorJob() _state.update { @@ -687,10 +690,11 @@ class ReaderModel @Inject constructor( } fun resetScreen() { - viewModelScope.launch(Dispatchers.Main) { + resetJob = viewModelScope.launch(Dispatchers.Main) { eventJob.cancel() eventJob = SupervisorJob() + yield() _state.update { ReaderState() } } }