diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-03-12 16:17:46 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-03-12 16:17:46 +0100 |
| commit | 32fe74f7a2fdb8e5a5ba861a42bb115aff8f99bb (patch) | |
| tree | 660de648aedd99dfe12603ff8fe80e567fd57987 /android/app | |
| parent | 91683410923428c3b396a42d01bf70fbb16e460d (diff) | |
| download | mullvadvpn-32fe74f7a2fdb8e5a5ba861a42bb115aff8f99bb.tar.xz mullvadvpn-32fe74f7a2fdb8e5a5ba861a42bb115aff8f99bb.zip | |
Add transition to DeviceListScreen
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt | 3 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/LoginTransition.kt | 4 |
2 files changed, 5 insertions, 2 deletions
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 99fc28fdb5..6e762bbf43 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 162dacbd90..737f369873 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)) } |