diff options
Diffstat (limited to 'android/app/src/main')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 2 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index e8343aba8a..fa88696cd9 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -253,7 +253,7 @@ open class MainActivity : FragmentActivity() { findViewById<ComposeView>(R.id.compose_view).apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow) setContent { - val state = changelogViewModel.changelogDialogUiState.collectAsState().value + val state = changelogViewModel.uiState.collectAsState().value if (state is ChangelogDialogUiState.Show) { AppTheme { ChangelogDialog( diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt index 1c541944d2..f6549cded6 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt @@ -10,15 +10,14 @@ class ChangelogViewModel( private val buildVersionCode: Int, private val alwaysShowChangelog: Boolean ) : ViewModel() { - private val _changelogDialogUiState = - MutableStateFlow<ChangelogDialogUiState>(ChangelogDialogUiState.Hide) - val changelogDialogUiState = _changelogDialogUiState.asStateFlow() + private val _uiState = MutableStateFlow<ChangelogDialogUiState>(ChangelogDialogUiState.Hide) + val uiState = _uiState.asStateFlow() fun refreshChangelogDialogUiState() { val shouldShowChangelogDialog = alwaysShowChangelog || changelogRepository.getVersionCodeOfMostRecentChangelogShowed() < buildVersionCode - _changelogDialogUiState.value = + _uiState.value = if (shouldShowChangelogDialog) { val changelogList = changelogRepository.getLastVersionChanges() if (changelogList.isNotEmpty()) { @@ -33,7 +32,7 @@ class ChangelogViewModel( fun dismissChangelogDialog() { changelogRepository.setVersionCodeOfMostRecentChangelogShowed(buildVersionCode) - _changelogDialogUiState.value = ChangelogDialogUiState.Hide + _uiState.value = ChangelogDialogUiState.Hide } } |