Skip to content

Commit 34b8bcf

Browse files
committed
Update project
1 parent f9d66fd commit 34b8bcf

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/DetailsViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class DetailsViewModel(
2929
private val movieId: MovieId = savedStateHandle.require("movieId")
3030

3131
private val _detailsState = MutableStateFlow<ScreenState>(ScreenState.Loading)
32-
val detailsState = _detailsState.asStateFlow()
32+
val detailsState: StateFlow<ScreenState> get() = _detailsState.asStateFlow()
3333

3434
val networkStatus: StateFlow<NetworkStatus> = networkManager.status
3535
.stateIn(

feature/details-impl/src/iosMain/kotlin/org/michaelbel/movies/details/DetailsViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.michaelbel.movies.details
33
import androidx.lifecycle.SavedStateHandle
44
import androidx.lifecycle.viewModelScope
55
import kotlinx.coroutines.flow.MutableStateFlow
6+
import kotlinx.coroutines.flow.StateFlow
67
import kotlinx.coroutines.flow.asStateFlow
78
import kotlinx.coroutines.launch
89
import org.michaelbel.movies.common.viewmodel.BaseViewModel
@@ -20,7 +21,7 @@ class DetailsViewModel(
2021
private val movieId: MovieId = savedStateHandle["movieId"] ?: 0
2122

2223
private val _detailsState = MutableStateFlow<ScreenState>(ScreenState.Loading)
23-
val detailsState = _detailsState.asStateFlow()
24+
val detailsState: StateFlow<ScreenState> get() = _detailsState.asStateFlow()
2425

2526
init {
2627
println("movieList=$movieList, movieId=$movieId")

feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/DetailsViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.michaelbel.movies.details
33
import androidx.lifecycle.SavedStateHandle
44
import androidx.lifecycle.viewModelScope
55
import kotlinx.coroutines.flow.MutableStateFlow
6+
import kotlinx.coroutines.flow.StateFlow
67
import kotlinx.coroutines.flow.asStateFlow
78
import kotlinx.coroutines.launch
89
import org.michaelbel.movies.common.ktx.require
@@ -21,7 +22,7 @@ class DetailsViewModel(
2122
private val movieId: MovieId = savedStateHandle.require("movieId")
2223

2324
private val _detailsState = MutableStateFlow<ScreenState>(ScreenState.Loading)
24-
val detailsState = _detailsState.asStateFlow()
25+
val detailsState: StateFlow<ScreenState> get() = _detailsState.asStateFlow()
2526

2627
init {
2728
println("movieList=$movieList, movieId=$movieId")

feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/FeedViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class FeedViewModel(
7676
.cachedIn(this)
7777

7878
private var _notificationsPermissionRequired: MutableStateFlow<Boolean> = MutableStateFlow(false)
79-
val notificationsPermissionRequired: StateFlow<Boolean> = _notificationsPermissionRequired.asStateFlow()
79+
val notificationsPermissionRequired: StateFlow<Boolean> get() = _notificationsPermissionRequired.asStateFlow()
8080

8181
var isAuthFailureSnackbarShowed: Boolean by mutableStateOf(false)
8282

feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class GalleryViewModel(
4040
)
4141

4242
private val _workInfoFlow: MutableStateFlow<WorkInfo?> = MutableStateFlow(null)
43-
val workInfoFlow: StateFlow<WorkInfo?> = _workInfoFlow.asStateFlow()
43+
val workInfoFlow: StateFlow<WorkInfo?> get() = _workInfoFlow.asStateFlow()
4444

4545
init {
4646
loadMovieImages(movieId.toInt())

feature/main-impl/src/androidMain/kotlin/org/michaelbel/movies/main/MainViewModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ class MainViewModel(
3939
): BaseViewModel() {
4040

4141
private val _authenticateFlow = Channel<Unit>(Channel.BUFFERED)
42-
val authenticateFlow: Flow<Unit> = _authenticateFlow.receiveAsFlow()
42+
val authenticateFlow: Flow<Unit> get() = _authenticateFlow.receiveAsFlow()
4343

4444
private val _cancelFlow = Channel<Unit>(Channel.BUFFERED)
45-
val cancelFlow: Flow<Unit> = _cancelFlow.receiveAsFlow()
45+
val cancelFlow: Flow<Unit> get() = _cancelFlow.receiveAsFlow()
4646

4747
private val _splashLoading = MutableStateFlow(true)
48-
val splashLoading: StateFlow<Boolean> = _splashLoading.asStateFlow()
48+
val splashLoading: StateFlow<Boolean> get() = _splashLoading.asStateFlow()
4949

5050
val themeData: StateFlow<ThemeData> = interactor.themeData
5151
.stateIn(

feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/SearchViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ class SearchViewModel(
6161
)
6262

6363
private val _query: MutableStateFlow<String> = MutableStateFlow("")
64-
private val query: StateFlow<String> = _query.asStateFlow()
64+
private val query: StateFlow<String> get() = _query.asStateFlow()
6565

6666
val isSearchActive: StateFlow<Boolean> = interactor.isSearchActive
6767

6868
val pagingDataFlow: Flow<PagingData<MoviePojo>> = query
69-
.flatMapLatest { query -> movieBlockingInteractor.moviesPagingData(query) }
69+
.flatMapLatest(movieBlockingInteractor::moviesPagingData)
7070
.cachedIn(this)
7171

7272
init {

0 commit comments

Comments
 (0)