Skip to content

Commit 178d557

Browse files
WilliamraiWilliamrai
committed
- creates a generic sealed interface for compose ui state
- updates compose view model to use simple states
1 parent 4a887df commit 178d557

File tree

4 files changed

+101
-106
lines changed

4 files changed

+101
-106
lines changed

‎app/src/main/java/org/wikipedia/language/composelanglinks/LangLinksActivity.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ class LangLinksActivity : BaseActivity() {
2626
BaseTheme {
2727
val uiState by viewModel.uiState.collectAsState()
2828
ComposeLangLinksScreen(
29-
isLoading = uiState.isLoading,
30-
langLinksItem = uiState.langLinksItems,
31-
error = uiState.error,
29+
uiState = uiState,
3230
onLanguageSelected = { item ->
3331
val pageTitle = item.pageTitle ?: return@ComposeLangLinksScreen
3432
WikipediaApp.instance.languageState

‎app/src/main/java/org/wikipedia/language/composelanglinks/LangLinksScreen.kt

+77-66
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,13 @@ import org.wikipedia.compose.components.WikiTopAppBarWithSearch
4242
import org.wikipedia.compose.components.error.ComposeWikiErrorParentView
4343
import org.wikipedia.compose.components.error.WikiErrorClickEvents
4444
import org.wikipedia.compose.theme.WikipediaTheme
45+
import org.wikipedia.util.UiState
4546

4647
@Composable
4748
fun ComposeLangLinksScreen(
4849
modifier: Modifier = Modifier,
49-
isLoading: Boolean = true,
50-
langLinksItem: List<LangLinksViewModel.LangLinksItem>,
51-
onLanguageSelected: (LangLinksViewModel.LangLinksItem) -> Unit,
52-
error: Throwable? = null,
50+
uiState: UiState<List<LangLinksItem>>,
51+
onLanguageSelected: (LangLinksItem) -> Unit,
5352
wikiErrorClickEvents: WikiErrorClickEvents? = null,
5453
onBackButtonClick: () -> Unit,
5554
onSearchQueryChange: (String) -> Unit,
@@ -77,77 +76,89 @@ fun ComposeLangLinksScreen(
7776
},
7877
containerColor = WikipediaTheme.colors.paperColor
7978
) { paddingValues ->
80-
if (error != null) {
81-
Box(
82-
modifier = modifier
83-
.fillMaxSize()
84-
.padding(paddingValues)
85-
// Add bottom padding when keyboard is visible
86-
.padding(bottom = if (isKeyboardVisible) imeHeight else 0.dp),
87-
contentAlignment = Alignment.Center
88-
) {
89-
ComposeWikiErrorParentView(
90-
modifier = Modifier
91-
.fillMaxWidth(),
92-
caught = error,
93-
errorClickEvents = wikiErrorClickEvents
94-
)
95-
}
96-
return@Scaffold
97-
}
98-
99-
if (langLinksItem.isEmpty()) {
100-
Box(
101-
modifier = modifier
102-
.fillMaxSize()
103-
.padding(paddingValues)
104-
// Add bottom padding when keyboard is visible
105-
.padding(bottom = if (isKeyboardVisible) imeHeight else 0.dp),
106-
contentAlignment = Alignment.Center
107-
) {
108-
if (isLoading) {
79+
when (uiState) {
80+
is UiState.Loading -> {
81+
Box(
82+
modifier = modifier
83+
.fillMaxSize()
84+
.padding(paddingValues)
85+
// Add bottom padding when keyboard is visible
86+
.padding(bottom = if (isKeyboardVisible) imeHeight else 0.dp),
87+
contentAlignment = Alignment.Center
88+
) {
10989
CircularProgressIndicator(
11090
color = WikipediaTheme.colors.progressiveColor
11191
)
112-
} else {
113-
SearchEmptyView(
92+
}
93+
}
94+
95+
is UiState.Error -> {
96+
Box(
97+
modifier = modifier
98+
.fillMaxSize()
99+
.padding(paddingValues)
100+
// Add bottom padding when keyboard is visible
101+
.padding(bottom = if (isKeyboardVisible) imeHeight else 0.dp),
102+
contentAlignment = Alignment.Center
103+
) {
104+
ComposeWikiErrorParentView(
114105
modifier = Modifier
115106
.fillMaxWidth(),
116-
emptyTexTitle = context.getString(R.string.langlinks_no_match)
107+
caught = uiState.throwable,
108+
errorClickEvents = wikiErrorClickEvents
117109
)
118110
}
119111
}
120-
return@Scaffold
121-
}
112+
is UiState.Success -> {
113+
val langLinksItem = uiState.data
114+
if (langLinksItem.isEmpty()) {
115+
Box(
116+
modifier = modifier
117+
.fillMaxSize()
118+
.padding(paddingValues)
119+
// Add bottom padding when keyboard is visible
120+
.padding(bottom = if (isKeyboardVisible) imeHeight else 0.dp),
121+
contentAlignment = Alignment.Center
122+
) {
123+
SearchEmptyView(
124+
modifier = Modifier
125+
.fillMaxWidth(),
126+
emptyTexTitle = context.getString(R.string.langlinks_no_match)
127+
)
128+
}
129+
return@Scaffold
130+
}
122131

123-
LazyColumn(
124-
modifier = modifier
125-
.padding(paddingValues)
126-
) {
127-
items(langLinksItem) { item ->
128-
if (item.isHeader) {
129-
ListHeader(
130-
modifier = Modifier
131-
.height(56.dp)
132-
.fillMaxWidth()
133-
.padding(horizontal = 16.dp)
134-
.padding(bottom = 4.dp),
135-
title = item.headerText,
136-
)
137-
} else {
138-
LangLinksItemView(
139-
modifier = Modifier
140-
.fillMaxWidth()
141-
.padding(16.dp)
142-
.clickable(
143-
interactionSource = remember { MutableInteractionSource() },
144-
indication = ripple(bounded = true),
145-
onClick = { onLanguageSelected(item) }
146-
),
147-
localizedLanguageName = item.localizedName,
148-
canonicalName = item.canonicalName,
149-
articleName = item.articleName
150-
)
132+
LazyColumn(
133+
modifier = modifier
134+
.padding(paddingValues)
135+
) {
136+
items(langLinksItem) { item ->
137+
if (item.isHeader) {
138+
ListHeader(
139+
modifier = Modifier
140+
.height(56.dp)
141+
.fillMaxWidth()
142+
.padding(horizontal = 16.dp)
143+
.padding(bottom = 4.dp),
144+
title = item.headerText,
145+
)
146+
} else {
147+
LangLinksItemView(
148+
modifier = Modifier
149+
.fillMaxWidth()
150+
.padding(16.dp)
151+
.clickable(
152+
interactionSource = remember { MutableInteractionSource() },
153+
indication = ripple(bounded = true),
154+
onClick = { onLanguageSelected(item) }
155+
),
156+
localizedLanguageName = item.localizedName,
157+
canonicalName = item.canonicalName,
158+
articleName = item.articleName
159+
)
160+
}
161+
}
151162
}
152163
}
153164
}

‎app/src/main/java/org/wikipedia/language/composelanglinks/LangLinksViewModel.kt

+17-37
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import kotlinx.coroutines.Dispatchers
99
import kotlinx.coroutines.async
1010
import kotlinx.coroutines.awaitAll
1111
import kotlinx.coroutines.flow.MutableStateFlow
12-
import kotlinx.coroutines.flow.StateFlow
1312
import kotlinx.coroutines.flow.asStateFlow
14-
import kotlinx.coroutines.flow.update
1513
import kotlinx.coroutines.launch
1614
import kotlinx.coroutines.withContext
1715
import org.wikipedia.Constants
@@ -25,6 +23,7 @@ import org.wikipedia.language.AppLanguageState
2523
import org.wikipedia.page.PageTitle
2624
import org.wikipedia.staticdata.MainPageNameData
2725
import org.wikipedia.util.StringUtil
26+
import org.wikipedia.util.UiState
2827

2928
class LangLinksViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
3029
private val pageTitle = savedStateHandle.get<PageTitle>(Constants.ARG_TITLE)!!
@@ -35,22 +34,18 @@ class LangLinksViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
3534
private var appLanguageEntries = listOf<PageTitle>()
3635
private var variantLangToUpdate = mutableSetOf<String>()
3736

38-
private val _uiState = MutableStateFlow(LangLinksUiState())
39-
val uiState: StateFlow<LangLinksUiState> = _uiState.asStateFlow()
37+
private val _uiState = MutableStateFlow<UiState<List<LangLinksItem>>>(UiState.Loading)
38+
val uiState = _uiState.asStateFlow()
4039
val historyEntryId = savedStateHandle.get<Long>(Constants.ARG_NUMBER) ?: -1
4140

4241
init {
4342
fetchAllData()
4443
}
4544

4645
fun fetchAllData() {
47-
_uiState.update { it.copy(isLoading = true) }
46+
_uiState.value = UiState.Loading
4847
viewModelScope.launch(CoroutineExceptionHandler { _, throwable ->
49-
_uiState.update {
50-
it.copy(
51-
error = throwable
52-
)
53-
}
48+
_uiState.value = UiState.Error(throwable)
5449
}) {
5550
val langLinksDeferred = async { fetchLangLinks() }
5651
val siteInfoDeferred = async { fetchSiteInfo() }
@@ -173,13 +168,7 @@ class LangLinksViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
173168
items.addAll(nonDuplicateEntries.map { createLangLinksItem(it) })
174169
}
175170
}
176-
177-
_uiState.update {
178-
it.copy(
179-
langLinksItems = items,
180-
isLoading = false
181-
)
182-
}
171+
_uiState.value = UiState.Success(items)
183172
}
184173

185174
private fun createLangLinksItem(pageTitle: PageTitle): LangLinksItem {
@@ -266,24 +255,15 @@ class LangLinksViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
266255
}
267256
}
268257
}
269-
270-
data class LangLinksItem(
271-
val pageTitle: PageTitle? = null,
272-
val articleName: String = "",
273-
val languageCode: String = "",
274-
val localizedName: String = "",
275-
var canonicalName: String? = null,
276-
val subtitle: String = "",
277-
val headerText: String = "",
278-
val isHeader: Boolean = false
279-
)
280-
281-
data class LangLinksUiState(
282-
val searchTerm: String = "",
283-
val isSearchActive: Boolean = false,
284-
val langLinksItems: List<LangLinksItem> = emptyList(),
285-
val filteredItems: List<LangLinksItem> = emptyList(),
286-
val isLoading: Boolean = false,
287-
val error: Throwable? = null,
288-
)
289258
}
259+
260+
data class LangLinksItem(
261+
val pageTitle: PageTitle? = null,
262+
val articleName: String = "",
263+
val languageCode: String = "",
264+
val localizedName: String = "",
265+
var canonicalName: String? = null,
266+
val subtitle: String = "",
267+
val headerText: String = "",
268+
val isHeader: Boolean = false
269+
)

‎app/src/main/java/org/wikipedia/util/Resource.kt

+6
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,9 @@ open class Resource<T> {
55
class Success<T>(val data: T) : Resource<T>()
66
class Error<T>(val throwable: Throwable) : Resource<T>()
77
}
8+
9+
sealed interface UiState<out T> {
10+
data object Loading : UiState<Nothing>
11+
data class Success<T>(val data: T) : UiState<T>
12+
data class Error(val throwable: Throwable) : UiState<Nothing>
13+
}

0 commit comments

Comments
 (0)