diff options
| author | Albin <albin@mullvad.net> | 2023-02-09 08:01:12 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-02-09 12:03:58 +0100 |
| commit | c91a332ab1aa79c9a9d01fee854ca2a54ad8c3fe (patch) | |
| tree | dec005f2fa1201db018d35f7291b8ed7d2b8f251 | |
| parent | ebaa207a6e9238e67596a0fe3eddb1f2abba375d (diff) | |
| download | mullvadvpn-c91a332ab1aa79c9a9d01fee854ca2a54ad8c3fe.tar.xz mullvadvpn-c91a332ab1aa79c9a9d01fee854ca2a54ad8c3fe.zip | |
Move welcome fragment to fragment package
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 1 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt | 1 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt (renamed from android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt) | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index 41621f5017..efee348261 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -42,6 +42,7 @@ import net.mullvad.mullvadvpn.ui.fragment.ConnectFragment import net.mullvad.mullvadvpn.ui.fragment.DeviceRevokedFragment import net.mullvad.mullvadvpn.ui.fragment.LaunchFragment import net.mullvad.mullvadvpn.ui.fragment.OutOfTimeFragment +import net.mullvad.mullvadvpn.ui.fragment.WelcomeFragment import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager import net.mullvad.mullvadvpn.util.SdkUtils.isNotificationPermissionGranted import net.mullvad.mullvadvpn.util.UNKNOWN_STATE_DEBOUNCE_DELAY_MILLISECONDS diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt index 2d64b465b8..c1b4633692 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt @@ -18,7 +18,6 @@ import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.model.TunnelState import net.mullvad.mullvadvpn.repository.AccountRepository -import net.mullvad.mullvadvpn.ui.POLL_INTERVAL import net.mullvad.mullvadvpn.ui.extension.openAccountPageInBrowser import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt index a3dc5e4105..e049afc7e5 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.ui +package net.mullvad.mullvadvpn.ui.fragment import android.content.ClipData import android.content.ClipboardManager @@ -23,8 +23,6 @@ import net.mullvad.mullvadvpn.model.TunnelState import net.mullvad.mullvadvpn.repository.AccountRepository import net.mullvad.mullvadvpn.repository.DeviceRepository import net.mullvad.mullvadvpn.ui.extension.openAccountPageInBrowser -import net.mullvad.mullvadvpn.ui.fragment.BaseFragment -import net.mullvad.mullvadvpn.ui.fragment.ConnectFragment import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState import net.mullvad.mullvadvpn.ui.serviceconnection.authTokenCache |