diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt index 99fc28fdb53e..6e762bbf4365 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt @@ -44,6 +44,7 @@ import net.mullvad.mullvadvpn.compose.destinations.RemoveDeviceConfirmationDialo import net.mullvad.mullvadvpn.compose.destinations.SettingsDestination import net.mullvad.mullvadvpn.compose.state.DeviceListItemUiState import net.mullvad.mullvadvpn.compose.state.DeviceListUiState +import net.mullvad.mullvadvpn.compose.transitions.DefaultTransition import net.mullvad.mullvadvpn.lib.common.util.parseAsDateTime import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.lib.theme.Dimens @@ -164,7 +165,7 @@ private fun PreviewDeviceListLoading() { } } -@Destination +@Destination(style = DefaultTransition::class) @Composable fun DeviceList( navigator: DestinationsNavigator, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/LoginTransition.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/LoginTransition.kt index 162dacbd9066..737f369873eb 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/LoginTransition.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/LoginTransition.kt @@ -8,6 +8,7 @@ import androidx.navigation.NavBackStackEntry import com.ramcosta.composedestinations.spec.DestinationStyle import com.ramcosta.composedestinations.utils.destination import net.mullvad.mullvadvpn.compose.destinations.ConnectDestination +import net.mullvad.mullvadvpn.compose.destinations.DeviceListDestination import net.mullvad.mullvadvpn.compose.destinations.OutOfTimeDestination import net.mullvad.mullvadvpn.compose.destinations.WelcomeDestination import net.mullvad.mullvadvpn.constant.SCREEN_ANIMATION_TIME_MILLIS @@ -21,7 +22,8 @@ object LoginTransition : DestinationStyle.Animated { when (this.targetState.destination()) { is OutOfTimeDestination, is WelcomeDestination, - is ConnectDestination -> fadeOut() + is ConnectDestination, + is DeviceListDestination -> fadeOut() else -> fadeOut(snap(SCREEN_ANIMATION_TIME_MILLIS)) }