Align changelog ui state property name

mullvad · Sep 29, 2023 · f9d2d87 · f9d2d87
1 parent 29e0239
commit f9d2d87
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/...d/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt b/...d/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt
@@ -31,7 +31,7 @@ class ChangelogDialogTest {
     @Test
     fun testShowChangeLogWhenNeeded() {
         // Arrange
-        every { mockedViewModel.changelogDialogUiState } returns
+        every { mockedViewModel.uiState } returns
             MutableStateFlow(ChangelogDialogUiState.Show(listOf(CHANGELOG_ITEM)))
         every { mockedViewModel.dismissChangelogDialog() } just Runs
 

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
@@ -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
@@ -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
     }
 }
 

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt
@@ -40,14 +40,12 @@ class ChangelogViewModelTest {
     @Test
     fun testInitialState() = runBlockingTest {
         // Arrange, Act, Assert
-        viewModel.changelogDialogUiState.test {
-            Assert.assertEquals(ChangelogDialogUiState.Hide, awaitItem())
-        }
+        viewModel.uiState.test { Assert.assertEquals(ChangelogDialogUiState.Hide, awaitItem()) }
     }
 
     @Test
     fun testShowAndDismissChangelogDialog() = runBlockingTest {
-        viewModel.changelogDialogUiState.test {
+        viewModel.uiState.test {
             // Arrange
             val fakeList = listOf("test")
             every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns
@@ -70,7 +68,7 @@ class ChangelogViewModelTest {
 
     @Test
     fun testShowCaseChangelogWithEmptyListDialog() = runBlockingTest {
-        viewModel.changelogDialogUiState.test {
+        viewModel.uiState.test {
             // Arrange
             val fakeEmptyList = emptyList<String>()
             every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns

diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTests.kt
@@ -35,8 +35,7 @@ class ViewModelTests {
                 "toastMessages",
                 "uiCloseAction",
                 "enterTransitionEndAction",
-                "accountToken",
-                "changelogDialogUiState"
+                "accountToken"
             )
     }
 }