Refactor screens to use preview parameter provider

3 files changed, 24 insertions, 28 deletions

diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreenTest.kt
index 7284a3294d..1207f2417b 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreenTest.kt
@@ -10,7 +10,7 @@ import io.mockk.verify
 import net.mullvad.mullvadvpn.compose.createEdgeToEdgeComposeExtension
 import net.mullvad.mullvadvpn.compose.data.DUMMY_CUSTOM_LISTS
 import net.mullvad.mullvadvpn.compose.setContentWithTheme
-import net.mullvad.mullvadvpn.compose.state.EditCustomListState
+import net.mullvad.mullvadvpn.compose.state.EditCustomListUiState
 import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR
 import net.mullvad.mullvadvpn.compose.test.DELETE_DROPDOWN_MENU_ITEM_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.TOP_BAR_DROPDOWN_BUTTON_TEST_TAG
@@ -33,7 +33,7 @@ class EditCustomListScreenTest {
     fun givenLoadingStateShouldShowLoadingSpinner() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme { EditCustomListScreen(state = EditCustomListState.Loading) }
+            setContentWithTheme { EditCustomListScreen(state = EditCustomListUiState.Loading) }
 
             // Assert
             onNodeWithTag(CIRCULAR_PROGRESS_INDICATOR).assertExists()
@@ -43,7 +43,7 @@ class EditCustomListScreenTest {
     fun givenNotFoundStateShouldShowNotFound() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme { EditCustomListScreen(state = EditCustomListState.NotFound) }
+            setContentWithTheme { EditCustomListScreen(state = EditCustomListUiState.NotFound) }
 
             // Assert
             onNodeWithText(NOT_FOUND_TEXT).assertExists()
@@ -57,7 +57,7 @@ class EditCustomListScreenTest {
             setContentWithTheme {
                 EditCustomListScreen(
                     state =
-                        EditCustomListState.Content(
+                        EditCustomListUiState.Content(
                             id = customList.id,
                             name = customList.name,
                             locations = customList.locations,
@@ -77,7 +77,7 @@ class EditCustomListScreenTest {
             setContentWithTheme {
                 EditCustomListScreen(
                     state =
-                        EditCustomListState.Content(
+                        EditCustomListUiState.Content(
                             id = customList.id,
                             name = customList.name,
                             locations = customList.locations,
@@ -98,7 +98,7 @@ class EditCustomListScreenTest {
             setContentWithTheme {
                 EditCustomListScreen(
                     state =
-                        EditCustomListState.Content(
+                        EditCustomListUiState.Content(
                             id = customList.id,
                             name = customList.name,
                             locations = customList.locations,
@@ -124,7 +124,7 @@ class EditCustomListScreenTest {
             setContentWithTheme {
                 EditCustomListScreen(
                     state =
-                        EditCustomListState.Content(
+                        EditCustomListUiState.Content(
                             id = customList.id,
                             name = customList.name,
                             locations = customList.locations,
@@ -149,7 +149,7 @@ class EditCustomListScreenTest {
             setContentWithTheme {
                 EditCustomListScreen(
                     state =
-                        EditCustomListState.Content(
+                        EditCustomListUiState.Content(
                             id = customList.id,
                             name = customList.name,
                             locations = customList.locations,
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreenTest.kt
index b978fc49a0..7ca3d6941e 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreenTest.kt
@@ -8,7 +8,7 @@ import io.mockk.mockk
 import io.mockk.verify
 import net.mullvad.mullvadvpn.compose.createEdgeToEdgeComposeExtension
 import net.mullvad.mullvadvpn.compose.setContentWithTheme
-import net.mullvad.mullvadvpn.compose.state.RelayFilterState
+import net.mullvad.mullvadvpn.compose.state.RelayFilterUiState
 import net.mullvad.mullvadvpn.lib.model.Ownership
 import net.mullvad.mullvadvpn.lib.model.Provider
 import net.mullvad.mullvadvpn.lib.model.ProviderId
@@ -29,7 +29,7 @@ class FilterScreenTest {
             setContentWithTheme {
                 FilterScreen(
                     state =
-                        RelayFilterState(
+                        RelayFilterUiState(
                             allProviders = DUMMY_RELAY_ALL_PROVIDERS,
                             selectedOwnership = null,
                             selectedProviders = DUMMY_SELECTED_PROVIDERS,
@@ -47,7 +47,7 @@ class FilterScreenTest {
             setContentWithTheme {
                 FilterScreen(
                     state =
-                        RelayFilterState(
+                        RelayFilterUiState(
                             allProviders = DUMMY_RELAY_ALL_PROVIDERS,
                             selectedOwnership = null,
                             selectedProviders = DUMMY_SELECTED_PROVIDERS,
@@ -65,7 +65,7 @@ class FilterScreenTest {
             setContentWithTheme {
                 FilterScreen(
                     state =
-                        RelayFilterState(
+                        RelayFilterUiState(
                             allProviders = DUMMY_RELAY_ALL_PROVIDERS,
                             selectedOwnership = Ownership.MullvadOwned,
                             selectedProviders = DUMMY_SELECTED_PROVIDERS,
@@ -83,7 +83,7 @@ class FilterScreenTest {
             setContentWithTheme {
                 FilterScreen(
                     state =
-                        RelayFilterState(
+                        RelayFilterUiState(
                             allProviders = DUMMY_RELAY_ALL_PROVIDERS,
                             selectedOwnership = Ownership.Rented,
                             selectedProviders = DUMMY_SELECTED_PROVIDERS,
@@ -101,7 +101,7 @@ class FilterScreenTest {
             setContentWithTheme {
                 FilterScreen(
                     state =
-                        RelayFilterState(
+                        RelayFilterUiState(
                             allProviders = DUMMY_RELAY_ALL_PROVIDERS,
                             selectedOwnership = null,
                             selectedProviders = DUMMY_SELECTED_PROVIDERS,
@@ -122,7 +122,7 @@ class FilterScreenTest {
             setContentWithTheme {
                 FilterScreen(
                     state =
-                        RelayFilterState(
+                        RelayFilterUiState(
                             allProviders = listOf(),
                             selectedOwnership = null,
                             selectedProviders =
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreenTest.kt
index 2cd3163e78..8d33d848f1 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreenTest.kt
@@ -16,7 +16,7 @@ import net.mullvad.mullvadvpn.compose.test.SERVER_IP_OVERRIDE_IMPORT_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.SERVER_IP_OVERRIDE_INFO_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.SERVER_IP_OVERRIDE_MORE_VERT_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.SERVER_IP_OVERRIDE_RESET_OVERRIDES_TEST_TAG
-import net.mullvad.mullvadvpn.viewmodel.ServerIpOverridesViewState
+import net.mullvad.mullvadvpn.viewmodel.ServerIpOverridesUiState
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
@@ -33,7 +33,7 @@ class ServerIpOverridesScreenTest {
     @Suppress("TestFunctionName")
     @Composable
     private fun ScreenWithDefault(
-        state: ServerIpOverridesViewState,
+        state: ServerIpOverridesUiState,
         onBackClick: () -> Unit = {},
         onInfoClick: () -> Unit = {},
         onResetOverridesClick: () -> Unit = {},
@@ -55,7 +55,7 @@ class ServerIpOverridesScreenTest {
         composeExtension.use {
             // Arrange
             setContentWithTheme {
-                ScreenWithDefault(state = ServerIpOverridesViewState.Loaded(false))
+                ScreenWithDefault(state = ServerIpOverridesUiState.Loaded(false))
             }
 
             // Assert
@@ -66,9 +66,7 @@ class ServerIpOverridesScreenTest {
     fun ensure_overrides_active_is_displayed() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme {
-                ScreenWithDefault(state = ServerIpOverridesViewState.Loaded(true))
-            }
+            setContentWithTheme { ScreenWithDefault(state = ServerIpOverridesUiState.Loaded(true)) }
 
             // Assert
             onNodeWithText("Overrides active").assertExists()
@@ -78,9 +76,7 @@ class ServerIpOverridesScreenTest {
     fun ensure_overrides_active_shows_warning_on_import() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme {
-                ScreenWithDefault(state = ServerIpOverridesViewState.Loaded(true))
-            }
+            setContentWithTheme { ScreenWithDefault(state = ServerIpOverridesUiState.Loaded(true)) }
 
             // Act
             onNodeWithTag(testTag = SERVER_IP_OVERRIDE_IMPORT_TEST_TAG).performClick()
@@ -99,7 +95,7 @@ class ServerIpOverridesScreenTest {
             val clickHandler: () -> Unit = mockk(relaxed = true)
             setContentWithTheme {
                 ScreenWithDefault(
-                    state = ServerIpOverridesViewState.Loaded(false),
+                    state = ServerIpOverridesUiState.Loaded(false),
                     onInfoClick = clickHandler,
                 )
             }
@@ -118,7 +114,7 @@ class ServerIpOverridesScreenTest {
             val clickHandler: () -> Unit = mockk(relaxed = true)
             setContentWithTheme {
                 ScreenWithDefault(
-                    state = ServerIpOverridesViewState.Loaded(true),
+                    state = ServerIpOverridesUiState.Loaded(true),
                     onResetOverridesClick = clickHandler,
                 )
             }
@@ -138,7 +134,7 @@ class ServerIpOverridesScreenTest {
             val clickHandler: () -> Unit = mockk(relaxed = true)
             setContentWithTheme {
                 ScreenWithDefault(
-                    state = ServerIpOverridesViewState.Loaded(false),
+                    state = ServerIpOverridesUiState.Loaded(false),
                     onImportByFile = clickHandler,
                 )
             }
@@ -158,7 +154,7 @@ class ServerIpOverridesScreenTest {
             val clickHandler: () -> Unit = mockk(relaxed = true)
             setContentWithTheme {
                 ScreenWithDefault(
-                    state = ServerIpOverridesViewState.Loaded(false),
+                    state = ServerIpOverridesUiState.Loaded(false),
                     onImportByText = clickHandler,
                 )
             }