Skip to content

Commit 69f8c67

Browse files
committed
Refactor connect into feature module
1 parent a08d2f2 commit 69f8c67

File tree

67 files changed

+271
-499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+271
-499
lines changed

android/app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ dependencies {
397397
implementation(projects.lib.feature.customlist.impl)
398398
implementation(projects.lib.feature.daita.impl)
399399
implementation(projects.lib.feature.filter.impl)
400+
implementation(projects.lib.feature.home.impl)
400401
implementation(projects.lib.feature.login.impl)
401402
implementation(projects.lib.feature.managedevices.impl)
402403
implementation(projects.lib.feature.multihop.impl)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ExternalActionButton.kt

Lines changed: 0 additions & 74 deletions
This file was deleted.

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadSegmentedButton.kt

Lines changed: 0 additions & 121 deletions
This file was deleted.

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/SelectObfuscationCellPreviewParameterProvider.kt

Lines changed: 0 additions & 23 deletions
This file was deleted.

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ShadowsocksSettingsUiStatePreviewParameterProvider.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/MullvadApp.kt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package net.mullvad.mullvadvpn.compose.screen
22

3-
import androidx.compose.animation.AnimatedVisibilityScope
43
import androidx.compose.animation.ExperimentalSharedTransitionApi
54
import androidx.compose.animation.SharedTransitionLayout
6-
import androidx.compose.animation.SharedTransitionScope
75
import androidx.compose.foundation.layout.fillMaxSize
86
import androidx.compose.runtime.Composable
97
import androidx.compose.runtime.CompositionLocalProvider
108
import androidx.compose.runtime.DisposableEffect
119
import androidx.compose.runtime.LaunchedEffect
12-
import androidx.compose.runtime.compositionLocalOf
1310
import androidx.compose.ui.ExperimentalComposeUiApi
1411
import androidx.compose.ui.Modifier
1512
import androidx.compose.ui.semantics.semantics
@@ -48,6 +45,12 @@ import com.ramcosta.composedestinations.generated.daita.destinations.DaitaDirect
4845
import com.ramcosta.composedestinations.generated.daita.destinations.DaitaDirectOnlyInfoDestination
4946
import com.ramcosta.composedestinations.generated.destinations.NoDaemonDestination
5047
import com.ramcosta.composedestinations.generated.filter.destinations.FilterDestination
48+
import com.ramcosta.composedestinations.generated.home.destinations.Android16UpgradeWarningInfoDestination
49+
import com.ramcosta.composedestinations.generated.home.destinations.ConnectDestination
50+
import com.ramcosta.composedestinations.generated.home.destinations.DeviceNameInfoDestination
51+
import com.ramcosta.composedestinations.generated.home.destinations.DeviceRevokedDestination
52+
import com.ramcosta.composedestinations.generated.home.destinations.OutOfTimeDestination
53+
import com.ramcosta.composedestinations.generated.home.destinations.WelcomeDestination
5154
import com.ramcosta.composedestinations.generated.login.destinations.ApiUnreachableInfoDestination
5255
import com.ramcosta.composedestinations.generated.login.destinations.CreateAccountConfirmationDestination
5356
import com.ramcosta.composedestinations.generated.login.destinations.DeviceListDestination
@@ -82,19 +85,17 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator
8285
import com.ramcosta.composedestinations.navigation.dependency
8386
import com.ramcosta.composedestinations.rememberNavHostEngine
8487
import com.ramcosta.composedestinations.utils.rememberDestinationsNavigator
88+
import net.mullvad.mullvadvpn.common.compose.LocalSharedTransitionScope
8589
import net.mullvad.mullvadvpn.common.compose.accessibilityDataSensitive
8690
import net.mullvad.mullvadvpn.util.BackstackObserver
8791
import net.mullvad.mullvadvpn.viewmodel.DaemonScreenEvent
8892
import net.mullvad.mullvadvpn.viewmodel.MullvadAppViewModel
8993
import org.koin.androidx.compose.koinViewModel
9094

91-
val LocalNavAnimatedVisibilityScope = compositionLocalOf<AnimatedVisibilityScope?> { null }
92-
@OptIn(ExperimentalSharedTransitionApi::class)
93-
val LocalSharedTransitionScope = compositionLocalOf<SharedTransitionScope?> { null }
94-
9595
@NavHostGraph
9696
annotation class MainGraph {
9797
@ExternalDestination<AccountDestination>
98+
@ExternalDestination<Android16UpgradeWarningInfoDestination>
9899
@ExternalDestination<AntiCensorshipSettingsDestination>
99100
@ExternalDestination<ApiAccessListDestination>
100101
@ExternalDestination<ApiAccessMethodDetailsDestination>
@@ -104,6 +105,7 @@ annotation class MainGraph {
104105
@ExternalDestination<AppearanceDestination>
105106
@ExternalDestination<AutoConnectAndLockdownModeDestination>
106107
@ExternalDestination<ChangelogDestination>
108+
@ExternalDestination<ConnectDestination>
107109
@ExternalDestination<ConnectOnStartupInfoDestination>
108110
@ExternalDestination<ContentBlockersInfoDestination>
109111
@ExternalDestination<CreateAccountConfirmationDestination>
@@ -119,6 +121,8 @@ annotation class MainGraph {
119121
@ExternalDestination<DeleteCustomListDestination>
120122
@ExternalDestination<DeviceIpInfoDestination>
121123
@ExternalDestination<DeviceListDestination>
124+
@ExternalDestination<DeviceNameInfoDestination>
125+
@ExternalDestination<DeviceRevokedDestination>
122126
@ExternalDestination<DiscardApiAccessChangesDestination>
123127
@ExternalDestination<DiscardChangesDestination>
124128
@ExternalDestination<DnsDestination>
@@ -136,6 +140,7 @@ annotation class MainGraph {
136140
@ExternalDestination<MtuDestination>
137141
@ExternalDestination<MultihopDestination>
138142
@ExternalDestination<NotificationSettingsDestination>
143+
@ExternalDestination<OutOfTimeDestination>
139144
@ExternalDestination<QuantumResistanceInfoDestination>
140145
@ExternalDestination<RedeemVoucherDestination>
141146
@ExternalDestination<RemoveDeviceConfirmationDestination>
@@ -151,6 +156,7 @@ annotation class MainGraph {
151156
@ExternalDestination<VerificationPendingDestination>
152157
@ExternalDestination<ViewLogsDestination>
153158
@ExternalDestination<VpnSettingsDestination>
159+
@ExternalDestination<WelcomeDestination>
154160
companion object Includes
155161
}
156162

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplashScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import androidx.compose.ui.res.stringResource
1919
import androidx.compose.ui.tooling.preview.Preview
2020
import com.ramcosta.composedestinations.annotation.Destination
2121
import com.ramcosta.composedestinations.generated.NavGraphs
22-
import com.ramcosta.composedestinations.generated.destinations.ConnectDestination
23-
import com.ramcosta.composedestinations.generated.destinations.DeviceRevokedDestination
24-
import com.ramcosta.composedestinations.generated.destinations.OutOfTimeDestination
2522
import com.ramcosta.composedestinations.generated.destinations.PrivacyDisclaimerDestination
23+
import com.ramcosta.composedestinations.generated.home.destinations.ConnectDestination
24+
import com.ramcosta.composedestinations.generated.home.destinations.DeviceRevokedDestination
25+
import com.ramcosta.composedestinations.generated.home.destinations.OutOfTimeDestination
2626
import com.ramcosta.composedestinations.generated.login.destinations.LoginDestination
2727
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
2828
import net.mullvad.mullvadvpn.R

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/ConnectNotificationState.kt

Lines changed: 0 additions & 1 deletion
This file was deleted.

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/ShadowsocksSettingsUiState.kt

Lines changed: 0 additions & 11 deletions
This file was deleted.

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Navigation.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)