diff options
| author | saber safavi <saber.safavi@codic.se> | 2023-03-17 15:15:49 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-03-20 16:21:29 +0100 |
| commit | 66258560b3aaf35c42b8fbcc74aa0aa03471e80b (patch) | |
| tree | d64d53aceb9334be6b22d1260a4582adb6cf9f54 | |
| parent | 50b3928560e0d8e40bd595e0357ba0be72340196 (diff) | |
| download | mullvadvpn-66258560b3aaf35c42b8fbcc74aa0aa03471e80b.tar.xz mullvadvpn-66258560b3aaf35c42b8fbcc74aa0aa03471e80b.zip | |
Move device removal dialog to dialog package
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt (renamed from android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Dialog.kt) | 4 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Dialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt index edfcebac67..228487e3cc 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Dialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.compose.component +package net.mullvad.mullvadvpn.compose.dialog import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column @@ -25,6 +25,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import net.mullvad.mullvadvpn.R +import net.mullvad.mullvadvpn.compose.component.HtmlText +import net.mullvad.mullvadvpn.compose.component.textResource import net.mullvad.mullvadvpn.model.Device import net.mullvad.mullvadvpn.util.capitalizeFirstCharOfEachWord import net.mullvad.mullvadvpn.viewmodel.DeviceListViewModel 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 99218a8837..d0fb48348e 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 @@ -30,7 +30,7 @@ import androidx.constraintlayout.compose.Dimension import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.ActionButton import net.mullvad.mullvadvpn.compose.component.ListItem -import net.mullvad.mullvadvpn.compose.component.ShowDeviceRemovalDialog +import net.mullvad.mullvadvpn.compose.dialog.ShowDeviceRemovalDialog import net.mullvad.mullvadvpn.util.capitalizeFirstCharOfEachWord import net.mullvad.mullvadvpn.viewmodel.DeviceListViewModel |