Skip to content

Commit cb83c19

Browse files
committed
fix: update on screen setup
1 parent f4a8dae commit cb83c19

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

app/src/main/java/to/bitkit/ui/settings/LanguageSettingsScreen.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.padding
55
import androidx.compose.foundation.lazy.LazyColumn
66
import androidx.compose.foundation.lazy.items
77
import androidx.compose.runtime.Composable
8+
import androidx.compose.runtime.LaunchedEffect
89
import androidx.compose.runtime.getValue
910
import androidx.compose.ui.Modifier
1011
import androidx.compose.ui.tooling.preview.Preview
@@ -32,6 +33,8 @@ fun LanguageSettingsScreen(
3233
) {
3334
val uiState by viewmodel.uiState.collectAsStateWithLifecycle()
3435

36+
LaunchedEffect(Unit) { viewmodel.fetchLanguageInfo() }
37+
3538
Content(
3639
uiState = uiState,
3740
onCloseClick = onCloseClick,

app/src/main/java/to/bitkit/ui/settings/general/GeneralSettingsScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fun GeneralSettingsScreen(
5050
val quickPayIntroSeen by settings.quickPayIntroSeen.collectAsStateWithLifecycle()
5151
val languageUiState by languageViewModel.uiState.collectAsStateWithLifecycle()
5252

53-
LaunchedEffect(Unit) { languageViewModel.fetchSelectedLanguage() }
53+
LaunchedEffect(Unit) { languageViewModel.fetchLanguageInfo() }
5454

5555
GeneralSettingsContent(
5656
selectedCurrency = currencies.selectedCurrency,

app/src/main/java/to/bitkit/viewmodels/LanguageViewModel.kt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ class LanguageViewModel @Inject constructor(
2222

2323
init {
2424
viewModelScope.launch {
25-
loadInitialLanguage()
25+
fetchLanguageInfo()
2626
}
2727
}
2828

29-
private fun loadInitialLanguage() {
29+
fun fetchLanguageInfo() {
3030
val currentLanguage = appLocaleManager.getCurrentLanguage()
3131

3232
_uiState.update {
@@ -41,16 +41,6 @@ class LanguageViewModel @Inject constructor(
4141
appLocaleManager.changeLanguage(language)
4242
_uiState.update { it.copy(selectedLanguage = language) }
4343
}
44-
45-
fun fetchSelectedLanguage() {
46-
val currentLanguage = appLocaleManager.getCurrentLanguage()
47-
48-
_uiState.update {
49-
it.copy(
50-
selectedLanguage = currentLanguage,
51-
)
52-
}
53-
}
5444
}
5545

5646
data class LanguageUiState(

0 commit comments

Comments
 (0)