Paint status bar after screen transition animation end

3 files changed, 20 insertions, 6 deletions

diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
index e616f67449..5d3e229a8b 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
@@ -35,7 +35,8 @@ class AccountScreenTest {
                         accountNumber = DUMMY_ACCOUNT_NUMBER,
                         accountExpiry = null
                     ),
-                viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow()
+                viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -60,6 +61,7 @@ class AccountScreenTest {
                         accountExpiry = null
                     ),
                 viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onManageAccountClick = mockedClickHandler
             )
         }
@@ -85,6 +87,7 @@ class AccountScreenTest {
                         accountExpiry = null
                     ),
                 viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onRedeemVoucherClick = mockedClickHandler
             )
         }
@@ -110,6 +113,7 @@ class AccountScreenTest {
                         accountExpiry = null
                     ),
                 viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onLogoutClick = mockedClickHandler
             )
         }
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt
index c7992edf34..4844177b45 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt
@@ -8,6 +8,7 @@ import io.mockk.MockKAnnotations
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import net.mullvad.mullvadvpn.compose.state.SelectLocationUiState
 import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
@@ -37,7 +38,8 @@ class SelectLocationScreenTest {
         composeTestRule.setContent {
             SelectLocationScreen(
                 uiState = SelectLocationUiState.Loading,
-                uiCloseAction = MutableSharedFlow()
+                uiCloseAction = MutableSharedFlow(),
+                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -55,7 +57,8 @@ class SelectLocationScreenTest {
                         countries = DUMMY_RELAY_COUNTRIES,
                         selectedRelay = null
                     ),
-                uiCloseAction = MutableSharedFlow()
+                uiCloseAction = MutableSharedFlow(),
+                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -85,7 +88,8 @@ class SelectLocationScreenTest {
                                 },
                             selectedRelay = DUMMY_RELAY_COUNTRIES[0].cities[0].relays[0]
                         ),
-                    uiCloseAction = MutableSharedFlow()
+                    uiCloseAction = MutableSharedFlow(),
+                    enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
                 )
             }
         }
@@ -114,6 +118,7 @@ class SelectLocationScreenTest {
                             selectedRelay = null
                         ),
                     uiCloseAction = MutableSharedFlow(),
+                    enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                     onSearchTermInput = mockedSearchTermInput
                 )
             }
@@ -138,6 +143,7 @@ class SelectLocationScreenTest {
                     uiState =
                         SelectLocationUiState.NoSearchResultFound(searchTerm = mockSearchString),
                     uiCloseAction = MutableSharedFlow(),
+                    enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                     onSearchTermInput = mockedSearchTermInput
                 )
             }
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt
index 5ed9ac1c8a..6a163dbbb0 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt
@@ -4,6 +4,8 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import io.mockk.MockKAnnotations
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import net.mullvad.mullvadvpn.compose.state.SettingsUiState
 import org.junit.Before
 import org.junit.Rule
@@ -24,7 +26,8 @@ class SettingsScreenTest {
         composeTestRule.setContent {
             SettingsScreen(
                 uiState =
-                    SettingsUiState(appVersion = "", isLoggedIn = true, isUpdateAvailable = true)
+                    SettingsUiState(appVersion = "", isLoggedIn = true, isUpdateAvailable = true),
+                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
         // Assert
@@ -42,7 +45,8 @@ class SettingsScreenTest {
         composeTestRule.setContent {
             SettingsScreen(
                 uiState =
-                    SettingsUiState(appVersion = "", isLoggedIn = false, isUpdateAvailable = true)
+                    SettingsUiState(appVersion = "", isLoggedIn = false, isUpdateAvailable = true),
+                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
         // Assert