Skip to content

Commit 305110a

Browse files
committed
Cleanup
1 parent ab82cf2 commit 305110a

8 files changed

Lines changed: 10 additions & 18 deletions

File tree

common/src/main/java/com/sample/tmdb/common/base/BaseViewModel.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ package com.sample.tmdb.common.base
22

33
import com.sample.tmdb.common.repository.LanguageRepository
44

5-
open class BaseViewModel<T>(private val repository: BaseRepository<T>, languageRepository: LanguageRepository) :
6-
CoreBaseViewModel<T>(languageRepository) {
5+
open class BaseViewModel<T>(
6+
private val repository: BaseRepository<T>,
7+
languageRepository: LanguageRepository? = null,
8+
) : CoreBaseViewModel<T>(languageRepository) {
79

810
override fun refresh(isUserRefresh: Boolean) {
911
execute {

common/src/main/java/com/sample/tmdb/common/base/BaseViewModelWithId.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.sample.tmdb.common.repository.LanguageRepository
55
open class BaseViewModelWithId<T, S>(
66
private val repository: BaseRepositoryWithId<T, S>,
77
private val id: S,
8-
languageRepository: LanguageRepository,
8+
languageRepository: LanguageRepository? = null,
99
) : CoreBaseViewModel<T>(languageRepository) {
1010

1111
init {

common/src/main/java/com/sample/tmdb/common/base/BaseViewModelWithInit.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.sample.tmdb.common.base
22

33
import com.sample.tmdb.common.repository.LanguageRepository
44

5-
open class BaseViewModelWithInit<T>(repository: BaseRepository<T>, languageRepository: LanguageRepository) :
5+
open class BaseViewModelWithInit<T>(repository: BaseRepository<T>, languageRepository: LanguageRepository? = null) :
66
BaseViewModel<T>(repository, languageRepository) {
77

88
init {

common/src/main/java/com/sample/tmdb/common/base/CoreBaseViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.launchIn
1414
import kotlinx.coroutines.flow.onEach
1515
import kotlinx.coroutines.flow.update
1616

17-
abstract class CoreBaseViewModel<T>(languageRepository: LanguageRepository) : ViewModel() {
17+
abstract class CoreBaseViewModel<T>(languageRepository: LanguageRepository? = null) : ViewModel() {
1818

1919
private val _state = MutableStateFlow(ViewState<T>(isLoading = true))
2020
val state = _state.asStateFlow()
@@ -29,7 +29,7 @@ abstract class CoreBaseViewModel<T>(languageRepository: LanguageRepository) : Vi
2929
private var lastLanguage: String? = null
3030

3131
init {
32-
lastLanguage = languageRepository.languageCode.value
32+
lastLanguage = languageRepository?.languageCode?.value
3333
}
3434

3535
abstract fun refresh(isUserRefresh: Boolean = false)

features/feature-detail/src/main/java/com/sample/tmdb/detail/BaseDetailViewModel.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.lifecycle.viewModelScope
55
import com.sample.tmdb.common.MainDestinations
66
import com.sample.tmdb.common.base.BaseViewModelWithId
77
import com.sample.tmdb.common.model.TMDbItem
8-
import com.sample.tmdb.common.repository.LanguageRepository
98
import com.sample.tmdb.domain.model.DetailWrapper
109
import com.sample.tmdb.domain.model.TMDbItemDetails
1110
import com.sample.tmdb.domain.repository.BaseDetailRepository
@@ -17,12 +16,10 @@ import kotlinx.coroutines.launch
1716
open class BaseDetailViewModel<T : TMDbItemDetails, R : TMDbItem>(
1817
private val bookmarkRepository: BookmarkDetailsRepository<R>,
1918
repository: BaseDetailRepository<T>,
20-
languageRepository: LanguageRepository,
2119
savedStateHandle: SavedStateHandle,
2220
) : BaseViewModelWithId<DetailWrapper, Int>(
2321
repository,
2422
savedStateHandle[MainDestinations.TMDB_ID_KEY]!!,
25-
languageRepository,
2623
) {
2724
private val _isBookmarked = MutableStateFlow(false)
2825
val isBookmarked: StateFlow<Boolean>

features/feature-detail/src/main/java/com/sample/tmdb/detail/MovieDetailViewModel.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.sample.tmdb.detail
22

33
import androidx.lifecycle.SavedStateHandle
4-
import com.sample.tmdb.common.repository.LanguageRepository
54
import com.sample.tmdb.domain.model.Movie
65
import com.sample.tmdb.domain.model.MovieDetails
76
import com.sample.tmdb.domain.repository.BaseDetailRepository
@@ -13,6 +12,5 @@ import javax.inject.Inject
1312
class MovieDetailViewModel @Inject constructor(
1413
bookmarkRepository: BookmarkDetailsRepository<Movie>,
1514
repository: BaseDetailRepository<MovieDetails>,
16-
languageRepository: LanguageRepository,
1715
savedStateHandle: SavedStateHandle,
18-
) : BaseDetailViewModel<MovieDetails, Movie>(bookmarkRepository, repository, languageRepository, savedStateHandle)
16+
) : BaseDetailViewModel<MovieDetails, Movie>(bookmarkRepository, repository, savedStateHandle)

features/feature-detail/src/main/java/com/sample/tmdb/detail/TVShowDetailViewModel.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.sample.tmdb.detail
22

33
import androidx.lifecycle.SavedStateHandle
4-
import com.sample.tmdb.common.repository.LanguageRepository
54
import com.sample.tmdb.domain.model.TVShow
65
import com.sample.tmdb.domain.model.TVShowDetails
76
import com.sample.tmdb.domain.repository.BaseDetailRepository
@@ -13,6 +12,5 @@ import javax.inject.Inject
1312
class TVShowDetailViewModel @Inject constructor(
1413
bookmarkRepository: BookmarkDetailsRepository<TVShow>,
1514
repository: BaseDetailRepository<TVShowDetails>,
16-
languageRepository: LanguageRepository,
1715
savedStateHandle: SavedStateHandle,
18-
) : BaseDetailViewModel<TVShowDetails, TVShow>(bookmarkRepository, repository, languageRepository, savedStateHandle)
16+
) : BaseDetailViewModel<TVShowDetails, TVShow>(bookmarkRepository, repository, savedStateHandle)

features/feature-person/src/main/java/com/sample/tmdb/preson/PersonViewModel.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.lifecycle.SavedStateHandle
44
import com.sample.tmdb.common.MainDestinations
55
import com.sample.tmdb.common.base.BaseRepositoryWithId
66
import com.sample.tmdb.common.base.BaseViewModelWithId
7-
import com.sample.tmdb.common.repository.LanguageRepository
87
import com.sample.tmdb.domain.model.Person
98
import dagger.hilt.android.lifecycle.HiltViewModel
109
import javax.inject.Inject
@@ -13,9 +12,7 @@ import javax.inject.Inject
1312
class PersonViewModel @Inject constructor(
1413
repository: BaseRepositoryWithId<Person, String>,
1514
savedStateHandle: SavedStateHandle,
16-
languageRepository: LanguageRepository,
1715
) : BaseViewModelWithId<Person, String>(
1816
repository,
1917
savedStateHandle[MainDestinations.TMDB_PERSON_KEY]!!,
20-
languageRepository,
2118
)

0 commit comments

Comments
 (0)