Skip to content

Commit 8f7bad0

Browse files
quanda-0562quanda-0562
committed
add items Fragment, ViewModel
1 parent 052e1e7 commit 8f7bad0

File tree

16 files changed

+398
-121
lines changed

16 files changed

+398
-121
lines changed

‎app/src/main/java/com/example/moviedb/compose/ui/home/HomeScreen.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ fun HomeScreen(
4040
navController: NavController,
4141
viewModel: PopularMovieViewModel = hiltViewModel()
4242
) {
43-
val movieList by viewModel.itemList.collectAsState(listOf())
44-
val refreshing by viewModel.isRefreshing.collectAsState(false)
45-
val pullRefreshState = rememberPullRefreshState(refreshing, { viewModel.doRefresh() })
43+
val itemListUiState by viewModel.itemsUiState.collectAsState()
44+
val pullRefreshState =
45+
rememberPullRefreshState(itemListUiState.isRefreshing, { viewModel.doRefresh() })
4646
val scrollState = rememberLazyGridState()
4747
val endOfListReached by remember {
4848
derivedStateOf {
@@ -65,7 +65,7 @@ fun HomeScreen(
6565
state = scrollState,
6666
) {
6767
items(
68-
items = movieList,
68+
items = itemListUiState.items,
6969
key = { movie: Movie -> movie.id },
7070
itemContent = { movie ->
7171
ItemMovie(
@@ -79,7 +79,7 @@ fun HomeScreen(
7979
}
8080

8181
PullRefreshIndicator(
82-
refreshing = refreshing,
82+
refreshing = itemListUiState.isRefreshing,
8383
state = pullRefreshState,
8484
modifier = Modifier.align(Alignment.TopCenter)
8585
)

‎app/src/main/java/com/example/moviedb/ui/base/BaseActivity.kt‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,8 @@ abstract class BaseActivity<ViewBinding : ViewDataBinding, ViewModel : BaseViewM
4545
lifecycleScope.launch {
4646
repeatOnLifecycle(Lifecycle.State.STARTED) {
4747
viewModel.uiState.collectLatest { uiState ->
48-
when (uiState) {
49-
is UiState.Loading -> {
50-
handleLoading(isLoading = true)
51-
}
52-
53-
is UiState.Error -> {
54-
handleLoading(isLoading = false)
55-
handleError(uiState.errorType)
56-
}
57-
58-
else -> {
59-
handleLoading(isLoading = false)
60-
}
61-
}
48+
handleLoading(uiState.isLoading)
49+
handleError(errorType = uiState.errorType)
6250
}
6351
}
6452
}
@@ -68,10 +56,11 @@ abstract class BaseActivity<ViewBinding : ViewDataBinding, ViewModel : BaseViewM
6856
* override this if not use loading dialog (example progress bar)
6957
*/
7058
protected open fun handleLoading(isLoading: Boolean) {
71-
if (isLoading) showLoadingDialog() else dismissLLoadingDialog()
59+
if (isLoading) showLoadingDialog()
60+
else dismissLLoadingDialog()
7261
}
7362

74-
protected fun handleError(errorType: ErrorType) {
63+
protected fun handleError(errorType: ErrorType?) {
7564
when (errorType) {
7665
ErrorType.NoInternetConnection -> {
7766
handleErrorMessage(getString(R.string.no_internet_connection))
@@ -96,16 +85,23 @@ abstract class BaseActivity<ViewBinding : ViewDataBinding, ViewModel : BaseViewM
9685
is ErrorType.UnknownError -> {
9786
handleErrorMessage(getString(R.string.unknown_error))
9887
}
88+
89+
else -> {
90+
dismissShowingDialog()
91+
}
9992
}
10093
}
10194

10295
protected open fun handleErrorMessage(message: String?) {
103-
if (message.isNullOrBlank()) return
104-
dismissLLoadingDialog()
105-
showDialog(
106-
message = message,
107-
firstText = getString(R.string.ok)
108-
)
96+
if (message.isNullOrBlank().not()) {
97+
showDialog(
98+
message = message,
99+
firstText = getString(R.string.ok),
100+
dismissListener = {
101+
viewModel.hideError()
102+
}
103+
)
104+
}
109105
}
110106

111107
override fun onStart() {

‎app/src/main/java/com/example/moviedb/ui/base/BaseBottomSheetDialogFragment.kt‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,8 @@ abstract class BaseBottomSheetDialogFragment<ViewBinding : ViewDataBinding, View
5757
lifecycleScope.launch {
5858
repeatOnLifecycle(Lifecycle.State.STARTED) {
5959
viewModel.uiState.collectLatest { uiState ->
60-
when (uiState) {
61-
is UiState.Loading -> {
62-
handleLoading(isLoading = true)
63-
}
64-
65-
is UiState.Error -> {
66-
handleLoading(isLoading = false)
67-
handleError(uiState.errorType)
68-
}
69-
70-
else -> {
71-
handleLoading(isLoading = false)
72-
}
73-
}
60+
handleLoading(uiState.isLoading)
61+
handleError(errorType = uiState.errorType)
7462
}
7563
}
7664
}
@@ -84,7 +72,7 @@ abstract class BaseBottomSheetDialogFragment<ViewBinding : ViewDataBinding, View
8472
else baseActivity.dismissLLoadingDialog()
8573
}
8674

87-
protected fun handleError(errorType: ErrorType) {
75+
protected fun handleError(errorType: ErrorType?) {
8876
when (errorType) {
8977
ErrorType.NoInternetConnection -> {
9078
handleErrorMessage(getString(R.string.no_internet_connection))
@@ -109,16 +97,23 @@ abstract class BaseBottomSheetDialogFragment<ViewBinding : ViewDataBinding, View
10997
is ErrorType.UnknownError -> {
11098
handleErrorMessage(getString(R.string.unknown_error))
11199
}
100+
101+
else -> {
102+
baseActivity.dismissShowingDialog()
103+
}
112104
}
113105
}
114106

115107
protected open fun handleErrorMessage(message: String?) {
116-
if (message.isNullOrBlank()) return
117-
baseActivity.dismissLLoadingDialog()
118-
baseActivity.showDialog(
119-
message = message,
120-
firstText = getString(R.string.ok)
121-
)
108+
if (message.isNullOrBlank().not()) {
109+
baseActivity.showDialog(
110+
message = message,
111+
firstText = getString(R.string.ok),
112+
dismissListener = {
113+
viewModel.hideError()
114+
}
115+
)
116+
}
122117
}
123118

124119
override fun onStart() {

‎app/src/main/java/com/example/moviedb/ui/base/BaseDialogFragment.kt‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,8 @@ abstract class BaseDialogFragment<ViewBinding : ViewDataBinding, ViewModel : Bas
5656
lifecycleScope.launch {
5757
repeatOnLifecycle(Lifecycle.State.STARTED) {
5858
viewModel.uiState.collectLatest { uiState ->
59-
when (uiState) {
60-
is UiState.Loading -> {
61-
handleLoading(isLoading = true)
62-
}
63-
64-
is UiState.Error -> {
65-
handleLoading(isLoading = false)
66-
handleError(uiState.errorType)
67-
}
68-
69-
else -> {
70-
handleLoading(isLoading = false)
71-
}
72-
}
59+
handleLoading(uiState.isLoading)
60+
handleError(errorType = uiState.errorType)
7361
}
7462
}
7563
}
@@ -83,7 +71,7 @@ abstract class BaseDialogFragment<ViewBinding : ViewDataBinding, ViewModel : Bas
8371
else baseActivity.dismissLLoadingDialog()
8472
}
8573

86-
protected fun handleError(errorType: ErrorType) {
74+
protected fun handleError(errorType: ErrorType?) {
8775
when (errorType) {
8876
ErrorType.NoInternetConnection -> {
8977
handleErrorMessage(getString(R.string.no_internet_connection))
@@ -108,16 +96,23 @@ abstract class BaseDialogFragment<ViewBinding : ViewDataBinding, ViewModel : Bas
10896
is ErrorType.UnknownError -> {
10997
handleErrorMessage(getString(R.string.unknown_error))
11098
}
99+
100+
else -> {
101+
baseActivity.dismissShowingDialog()
102+
}
111103
}
112104
}
113105

114106
protected open fun handleErrorMessage(message: String?) {
115-
if (message.isNullOrBlank()) return
116-
baseActivity.dismissLLoadingDialog()
117-
baseActivity.showDialog(
118-
message = message,
119-
firstText = getString(R.string.ok)
120-
)
107+
if (message.isNullOrBlank().not()) {
108+
baseActivity.showDialog(
109+
message = message,
110+
firstText = getString(R.string.ok),
111+
dismissListener = {
112+
viewModel.hideError()
113+
}
114+
)
115+
}
121116
}
122117

123118
override fun onStart() {

‎app/src/main/java/com/example/moviedb/ui/base/BaseFragment.kt‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,8 @@ abstract class BaseFragment<ViewBinding : ViewDataBinding, ViewModel : BaseViewM
5757
lifecycleScope.launch {
5858
repeatOnLifecycle(Lifecycle.State.STARTED) {
5959
viewModel.uiState.collectLatest { uiState ->
60-
when (uiState) {
61-
is UiState.Loading -> {
62-
handleLoading(isLoading = true)
63-
}
64-
65-
is UiState.Error -> {
66-
handleLoading(isLoading = false)
67-
handleError(uiState.errorType)
68-
}
69-
70-
else -> {
71-
handleLoading(isLoading = false)
72-
}
73-
}
60+
handleLoading(uiState.isLoading)
61+
handleError(errorType = uiState.errorType)
7462
}
7563
}
7664
}
@@ -84,7 +72,7 @@ abstract class BaseFragment<ViewBinding : ViewDataBinding, ViewModel : BaseViewM
8472
else baseActivity.dismissLLoadingDialog()
8573
}
8674

87-
protected fun handleError(errorType: ErrorType) {
75+
protected fun handleError(errorType: ErrorType?) {
8876
when (errorType) {
8977
ErrorType.NoInternetConnection -> {
9078
handleErrorMessage(getString(R.string.no_internet_connection))
@@ -109,16 +97,23 @@ abstract class BaseFragment<ViewBinding : ViewDataBinding, ViewModel : BaseViewM
10997
is ErrorType.UnknownError -> {
11098
handleErrorMessage(getString(R.string.unknown_error))
11199
}
100+
101+
else -> {
102+
baseActivity.dismissShowingDialog()
103+
}
112104
}
113105
}
114106

115107
protected open fun handleErrorMessage(message: String?) {
116-
if (message.isNullOrBlank()) return
117-
baseActivity.dismissLLoadingDialog()
118-
baseActivity.showDialog(
119-
message = message,
120-
firstText = getString(R.string.ok)
121-
)
108+
if (message.isNullOrBlank().not()) {
109+
baseActivity.showDialog(
110+
message = message,
111+
firstText = getString(R.string.ok),
112+
dismissListener = {
113+
viewModel.hideError()
114+
}
115+
)
116+
}
122117
}
123118

124119
override fun onStart() {

‎app/src/main/java/com/example/moviedb/ui/base/BaseViewModel.kt‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import com.example.moviedb.data.remote.toBaseException
66
import com.example.moviedb.data.repository.UserRepository
77
import kotlinx.coroutines.CoroutineExceptionHandler
88
import kotlinx.coroutines.flow.MutableStateFlow
9+
import kotlinx.coroutines.flow.StateFlow
10+
import kotlinx.coroutines.flow.update
911
import kotlinx.coroutines.launch
1012
import kotlinx.coroutines.plus
1113
import java.net.ConnectException
@@ -15,7 +17,8 @@ import java.net.UnknownHostException
1517
import javax.inject.Inject
1618

1719
open class BaseViewModel : ViewModel() {
18-
val uiState = MutableStateFlow<UiState>(UiState.Success)
20+
private val _uiState = MutableStateFlow(UiState())
21+
val uiState: StateFlow<UiState> = _uiState
1922

2023
@Inject
2124
lateinit var userRepo: UserRepository
@@ -30,15 +33,11 @@ open class BaseViewModel : ViewModel() {
3033
}
3134
protected val viewModelScopeExceptionHandler by lazy { viewModelScope + exceptionHandler }
3235

33-
fun showSuccess() {
34-
uiState.value = UiState.Success
35-
}
36-
3736
/**
3837
* handle throwable when load fail
3938
*/
40-
protected open suspend fun onError(throwable: Throwable) {
41-
val errorType: ErrorType = when (throwable) {
39+
protected fun toErrorType(throwable: Throwable): ErrorType {
40+
return when (throwable) {
4241
// case no internet connection
4342
is UnknownHostException -> {
4443
ErrorType.NoInternetConnection
@@ -70,16 +69,34 @@ open class BaseViewModel : ViewModel() {
7069
}
7170
}
7271
}
73-
uiState.value = UiState.Error(errorType)
7472
}
7573

76-
fun showError(throwable: Throwable) {
77-
uiState.value = UiState.Error(ErrorType.UnknownError(throwable))
74+
protected open fun onError(throwable: Throwable) {
75+
_uiState.update {
76+
it.copy(
77+
isLoading = false,
78+
errorType = toErrorType(throwable)
79+
)
80+
}
81+
}
82+
83+
open fun hideError() {
84+
_uiState.update {
85+
it.copy(errorType = null)
86+
}
7887
}
7988

8089
fun showLoading() {
81-
uiState.value = UiState.Loading
90+
_uiState.update {
91+
it.copy(isLoading = true, errorType = null)
92+
}
93+
}
94+
95+
fun hideLoading() {
96+
_uiState.update {
97+
it.copy(isLoading = false)
98+
}
8299
}
83100

84-
fun isLoading() = uiState.value == UiState.Loading
101+
fun isLoading() = uiState.value.isLoading
85102
}

‎app/src/main/java/com/example/moviedb/ui/base/UiState.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.example.moviedb.ui.base
22

3-
sealed class UiState {
4-
object Success : UiState()
5-
object Loading : UiState()
6-
class Error(val errorType: ErrorType) : UiState()
7-
}
3+
data class UiState(
4+
val isLoading: Boolean = false,
5+
val errorType: ErrorType? = null
6+
)
87

98
sealed class ErrorType {
109
object NoInternetConnection : ErrorType()

0 commit comments

Comments
 (0)