Skip to content

Commit 840f5bf

Browse files
RawaRawa
committed
Bump to K2
1 parent bed092a commit 840f5bf

File tree

69 files changed

+687
-443
lines changed

Some content is hidden

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

69 files changed

+687
-443
lines changed

‎android/app/build.gradle.kts

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ plugins {
1313
id(Dependencies.Plugin.kotlinParcelizeId)
1414
id(Dependencies.Plugin.ksp) version Versions.Plugin.ksp
1515
id(Dependencies.Plugin.junit5) version Versions.Plugin.junit5
16+
id(Dependencies.Plugin.composeCompiler) version Versions.kotlin
1617
}
1718

1819
val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath
@@ -127,8 +128,6 @@ android {
127128
buildConfig = true
128129
}
129130

130-
composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion }
131-
132131
compileOptions {
133132
sourceCompatibility = JavaVersion.VERSION_17
134133
targetCompatibility = JavaVersion.VERSION_17
@@ -244,6 +243,8 @@ android {
244243
project.tasks.assemble.dependsOn("ensureValidVersionCode")
245244
}
246245

246+
composeCompiler { enableStrongSkippingMode = true }
247+
247248
androidComponents {
248249
beforeVariants { variantBuilder ->
249250
variantBuilder.enable =

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ApiAccessMethodInfoDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
44
import androidx.compose.ui.res.stringResource
55
import androidx.compose.ui.tooling.preview.Preview
66
import com.ramcosta.composedestinations.annotation.Destination
7+
import com.ramcosta.composedestinations.annotation.RootGraph
78
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
89
import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
910
import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -17,7 +18,7 @@ private fun PreviewApiAccessMethodInfoDialog() {
1718
AppTheme { ApiAccessMethodInfoDialog(EmptyDestinationsNavigator) }
1819
}
1920

20-
@Destination(style = DestinationStyle.Dialog::class)
21+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2122
@Composable
2223
fun ApiAccessMethodInfoDialog(navigator: DestinationsNavigator) {
2324
InfoDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import androidx.compose.ui.text.style.TextAlign
1818
import androidx.compose.ui.tooling.preview.Preview
1919
import androidx.navigation.NavController
2020
import com.ramcosta.composedestinations.annotation.Destination
21+
import com.ramcosta.composedestinations.annotation.RootGraph
2122
import com.ramcosta.composedestinations.spec.DestinationStyle
2223
import net.mullvad.mullvadvpn.R
2324
import net.mullvad.mullvadvpn.compose.button.PrimaryButton
@@ -27,7 +28,7 @@ import net.mullvad.mullvadvpn.viewmodel.Changelog
2728
import net.mullvad.mullvadvpn.viewmodel.ChangelogViewModel
2829
import org.koin.androidx.compose.koinViewModel
2930

30-
@Destination(style = DestinationStyle.Dialog::class)
31+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
3132
@Composable
3233
fun Changelog(navController: NavController, changeLog: Changelog) {
3334
val viewModel = koinViewModel<ChangelogViewModel>()

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ import androidx.compose.runtime.Composable
44
import androidx.compose.ui.res.stringResource
55
import androidx.lifecycle.compose.dropUnlessResumed
66
import com.ramcosta.composedestinations.annotation.Destination
7+
import com.ramcosta.composedestinations.annotation.RootGraph
78
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
89
import com.ramcosta.composedestinations.spec.DestinationStyle
910
import net.mullvad.mullvadvpn.R
1011
import net.mullvad.mullvadvpn.compose.component.textResource
1112

12-
@Destination(style = DestinationStyle.Dialog::class)
13+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
1314
@Composable
1415
fun ContentBlockersInfoDialog(navigator: DestinationsNavigator) {
1516
InfoDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CreateCustomListDialog.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ import androidx.compose.ui.tooling.preview.Preview
1616
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1717
import androidx.lifecycle.compose.dropUnlessResumed
1818
import com.ramcosta.composedestinations.annotation.Destination
19+
import com.ramcosta.composedestinations.annotation.RootGraph
20+
import com.ramcosta.composedestinations.generated.destinations.CustomListLocationsDestination
1921
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
2022
import com.ramcosta.composedestinations.result.ResultBackNavigator
2123
import com.ramcosta.composedestinations.spec.DestinationStyle
2224
import net.mullvad.mullvadvpn.R
2325
import net.mullvad.mullvadvpn.compose.button.PrimaryButton
2426
import net.mullvad.mullvadvpn.compose.communication.Created
2527
import net.mullvad.mullvadvpn.compose.component.CustomListNameTextField
26-
import net.mullvad.mullvadvpn.compose.destinations.CustomListLocationsDestination
2728
import net.mullvad.mullvadvpn.compose.state.CreateCustomListUiState
2829
import net.mullvad.mullvadvpn.compose.test.CREATE_CUSTOM_LIST_DIALOG_INPUT_TEST_TAG
2930
import net.mullvad.mullvadvpn.lib.model.CustomListAlreadyExists
@@ -55,7 +56,7 @@ private fun PreviewCreateCustomListDialogError() {
5556
}
5657

5758
@Composable
58-
@Destination(style = DestinationStyle.Dialog::class)
59+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
5960
fun CreateCustomList(
6061
navigator: DestinationsNavigator,
6162
backNavigator: ResultBackNavigator<Created>,

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomDnsInfoDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.ui.res.stringResource
55
import androidx.compose.ui.tooling.preview.Preview
66
import androidx.lifecycle.compose.dropUnlessResumed
77
import com.ramcosta.composedestinations.annotation.Destination
8+
import com.ramcosta.composedestinations.annotation.RootGraph
89
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
910
import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
1011
import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -16,7 +17,7 @@ private fun PreviewCustomDnsInfoDialog() {
1617
CustomDnsInfoDialog(EmptyDestinationsNavigator)
1718
}
1819

19-
@Destination(style = DestinationStyle.Dialog::class)
20+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2021
@Composable
2122
fun CustomDnsInfoDialog(navigator: DestinationsNavigator) {
2223
InfoDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteApiAccessMethodConfirmationDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.ui.res.stringResource
55
import androidx.compose.ui.tooling.preview.Preview
66
import androidx.lifecycle.compose.collectAsStateWithLifecycle
77
import com.ramcosta.composedestinations.annotation.Destination
8+
import com.ramcosta.composedestinations.annotation.RootGraph
89
import com.ramcosta.composedestinations.result.ResultBackNavigator
910
import com.ramcosta.composedestinations.spec.DestinationStyle
1011
import net.mullvad.mullvadvpn.R
@@ -24,7 +25,7 @@ private fun PreviewDeleteApiAccessMethodConfirmationDialog() {
2425
}
2526

2627
@Composable
27-
@Destination(style = DestinationStyle.Dialog::class)
28+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2829
fun DeleteApiAccessMethodConfirmation(
2930
navigator: ResultBackNavigator<Boolean>,
3031
apiAccessMethodId: ApiAccessMethodId

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteCustomListConfirmationDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.ui.tooling.preview.Preview
66
import androidx.lifecycle.compose.collectAsStateWithLifecycle
77
import androidx.lifecycle.compose.dropUnlessResumed
88
import com.ramcosta.composedestinations.annotation.Destination
9+
import com.ramcosta.composedestinations.annotation.RootGraph
910
import com.ramcosta.composedestinations.result.ResultBackNavigator
1011
import com.ramcosta.composedestinations.spec.DestinationStyle
1112
import net.mullvad.mullvadvpn.R
@@ -32,7 +33,7 @@ private fun PreviewRemoveDeviceConfirmationDialog() {
3233
}
3334

3435
@Composable
35-
@Destination(style = DestinationStyle.Dialog::class)
36+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
3637
fun DeleteCustomList(
3738
navigator: ResultBackNavigator<Deleted>,
3839
customListId: CustomListId,

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceNameInfoDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import androidx.compose.runtime.Composable
44
import androidx.compose.ui.res.stringResource
55
import androidx.lifecycle.compose.dropUnlessResumed
66
import com.ramcosta.composedestinations.annotation.Destination
7+
import com.ramcosta.composedestinations.annotation.RootGraph
78
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
89
import com.ramcosta.composedestinations.spec.DestinationStyle
910
import net.mullvad.mullvadvpn.R
1011

11-
@Destination(style = DestinationStyle.Dialog::class)
12+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
1213
@Composable
1314
fun DeviceNameInfoDialog(navigator: DestinationsNavigator) {
1415
InfoDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DiscardChangesDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ import androidx.compose.ui.focus.focusRequester
1010
import androidx.compose.ui.res.stringResource
1111
import androidx.lifecycle.compose.dropUnlessResumed
1212
import com.ramcosta.composedestinations.annotation.Destination
13+
import com.ramcosta.composedestinations.annotation.RootGraph
1314
import com.ramcosta.composedestinations.result.ResultBackNavigator
1415
import com.ramcosta.composedestinations.spec.DestinationStyle
1516
import net.mullvad.mullvadvpn.R
1617
import net.mullvad.mullvadvpn.compose.button.PrimaryButton
1718

18-
@Destination(style = DestinationStyle.Dialog::class)
19+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
1920
@Composable
2021
fun DiscardChangesDialog(resultBackNavigator: ResultBackNavigator<Boolean>) {
2122
AlertDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import androidx.compose.ui.tooling.preview.Preview
1616
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1717
import androidx.lifecycle.compose.dropUnlessResumed
1818
import com.ramcosta.composedestinations.annotation.Destination
19+
import com.ramcosta.composedestinations.annotation.RootGraph
1920
import com.ramcosta.composedestinations.result.ResultBackNavigator
2021
import com.ramcosta.composedestinations.spec.DestinationStyle
2122
import net.mullvad.mullvadvpn.R
@@ -51,7 +52,7 @@ private fun PreviewDnsDialogEditAllowLanDisabled() {
5152
AppTheme { DnsDialog(DnsDialogViewState("192.168.1.1", null, true, false, 0), {}, {}, {}, {}) }
5253
}
5354

54-
@Destination(style = DestinationStyle.Dialog::class)
55+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
5556
@Composable
5657
fun DnsDialog(
5758
resultNavigator: ResultBackNavigator<DnsDialogResult>,

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/EditCustomListNameDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.ui.tooling.preview.Preview
1515
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1616
import androidx.lifecycle.compose.dropUnlessResumed
1717
import com.ramcosta.composedestinations.annotation.Destination
18+
import com.ramcosta.composedestinations.annotation.RootGraph
1819
import com.ramcosta.composedestinations.result.ResultBackNavigator
1920
import com.ramcosta.composedestinations.spec.DestinationStyle
2021
import net.mullvad.mullvadvpn.R
@@ -43,7 +44,7 @@ private fun PreviewEditCustomListNameDialog() {
4344
}
4445

4546
@Composable
46-
@Destination(style = DestinationStyle.Dialog::class)
47+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
4748
fun EditCustomListName(
4849
backNavigator: ResultBackNavigator<Renamed>,
4950
customListId: CustomListId,

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/LocalNetworkSharingInfoDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.ui.res.stringResource
55
import androidx.compose.ui.tooling.preview.Preview
66
import androidx.lifecycle.compose.dropUnlessResumed
77
import com.ramcosta.composedestinations.annotation.Destination
8+
import com.ramcosta.composedestinations.annotation.RootGraph
89
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
910
import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
1011
import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -17,7 +18,7 @@ private fun PreviewLocalNetworkSharingInfoDialog() {
1718
LocalNetworkSharingInfoDialog(EmptyDestinationsNavigator)
1819
}
1920

20-
@Destination(style = DestinationStyle.Dialog::class)
21+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2122
@Composable
2223
fun LocalNetworkSharingInfoDialog(navigator: DestinationsNavigator) {
2324
InfoDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MalwareInfoDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.ui.res.stringResource
55
import androidx.compose.ui.tooling.preview.Preview
66
import androidx.lifecycle.compose.dropUnlessResumed
77
import com.ramcosta.composedestinations.annotation.Destination
8+
import com.ramcosta.composedestinations.annotation.RootGraph
89
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
910
import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
1011
import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -16,7 +17,7 @@ private fun PreviewMalwareInfoDialog() {
1617
MalwareInfoDialog(EmptyDestinationsNavigator)
1718
}
1819

19-
@Destination(style = DestinationStyle.Dialog::class)
20+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2021
@Composable
2122
fun MalwareInfoDialog(navigator: DestinationsNavigator) {
2223
InfoDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.ui.tooling.preview.Preview
1515
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1616
import androidx.lifecycle.compose.dropUnlessResumed
1717
import com.ramcosta.composedestinations.annotation.Destination
18+
import com.ramcosta.composedestinations.annotation.RootGraph
1819
import com.ramcosta.composedestinations.result.EmptyResultBackNavigator
1920
import com.ramcosta.composedestinations.result.ResultBackNavigator
2021
import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -41,7 +42,7 @@ private fun PreviewMtuDialog() {
4142
AppTheme { MtuDialog(mtuInitial = Mtu(1234), EmptyResultBackNavigator()) }
4243
}
4344

44-
@Destination(style = DestinationStyle.Dialog::class)
45+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
4546
@Composable
4647
fun MtuDialog(mtuInitial: Mtu?, navigator: ResultBackNavigator<Boolean>) {
4748
val viewModel = koinViewModel<MtuDialogViewModel>(parameters = { parametersOf(mtuInitial) })

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ObfuscationInfoDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.ui.res.stringResource
55
import androidx.compose.ui.tooling.preview.Preview
66
import androidx.lifecycle.compose.dropUnlessResumed
77
import com.ramcosta.composedestinations.annotation.Destination
8+
import com.ramcosta.composedestinations.annotation.RootGraph
89
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
910
import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
1011
import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -16,7 +17,7 @@ private fun PreviewObfuscationInfoDialog() {
1617
ObfuscationInfoDialog(EmptyDestinationsNavigator)
1718
}
1819

19-
@Destination(style = DestinationStyle.Dialog::class)
20+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2021
@Composable
2122
fun ObfuscationInfoDialog(navigator: DestinationsNavigator) {
2223
InfoDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/QuantumResistanceInfoDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.ui.res.stringResource
55
import androidx.compose.ui.tooling.preview.Preview
66
import androidx.lifecycle.compose.dropUnlessResumed
77
import com.ramcosta.composedestinations.annotation.Destination
8+
import com.ramcosta.composedestinations.annotation.RootGraph
89
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
910
import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
1011
import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -16,7 +17,7 @@ private fun PreviewQuantumResistanceInfoDialog() {
1617
QuantumResistanceInfoDialog(EmptyDestinationsNavigator)
1718
}
1819

19-
@Destination(style = DestinationStyle.Dialog::class)
20+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2021
@Composable
2122
fun QuantumResistanceInfoDialog(navigator: DestinationsNavigator) {
2223
InfoDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.compose.ui.window.DialogProperties
2626
import androidx.compose.ui.window.SecureFlagPolicy
2727
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2828
import com.ramcosta.composedestinations.annotation.Destination
29+
import com.ramcosta.composedestinations.annotation.RootGraph
2930
import com.ramcosta.composedestinations.result.ResultBackNavigator
3031
import com.ramcosta.composedestinations.spec.DestinationStyle
3132
import net.mullvad.mullvadvpn.BuildConfig
@@ -104,7 +105,7 @@ private fun PreviewRedeemVoucherDialogSuccess() {
104105
}
105106
}
106107

107-
@Destination(style = DestinationStyle.Dialog::class)
108+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
108109
@Composable
109110
fun RedeemVoucher(resultBackNavigator: ResultBackNavigator<Boolean>) {
110111
val vm = koinViewModel<VoucherDialogViewModel>()

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RemoveDeviceConfirmationDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
1717
import androidx.compose.ui.unit.sp
1818
import androidx.lifecycle.compose.dropUnlessResumed
1919
import com.ramcosta.composedestinations.annotation.Destination
20+
import com.ramcosta.composedestinations.annotation.RootGraph
2021
import com.ramcosta.composedestinations.result.EmptyResultBackNavigator
2122
import com.ramcosta.composedestinations.result.ResultBackNavigator
2223
import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -39,7 +40,7 @@ private fun PreviewRemoveDeviceConfirmationDialog(
3940
AppTheme { RemoveDeviceConfirmationDialog(EmptyResultBackNavigator(), device = device) }
4041
}
4142

42-
@Destination(style = DestinationStyle.Dialog::class)
43+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
4344
@Composable
4445
fun RemoveDeviceConfirmationDialog(navigator: ResultBackNavigator<DeviceId>, device: Device) {
4546
AlertDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.compose.ui.res.stringResource
1414
import androidx.compose.ui.tooling.preview.Preview
1515
import androidx.lifecycle.compose.dropUnlessResumed
1616
import com.ramcosta.composedestinations.annotation.Destination
17+
import com.ramcosta.composedestinations.annotation.RootGraph
1718
import com.ramcosta.composedestinations.result.EmptyResultBackNavigator
1819
import com.ramcosta.composedestinations.result.ResultBackNavigator
1920
import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -29,7 +30,7 @@ private fun PreviewReportProblemNoEmailDialog() {
2930
AppTheme { ReportProblemNoEmailDialog(EmptyResultBackNavigator()) }
3031
}
3132

32-
@Destination(style = DestinationStyle.Dialog::class)
33+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
3334
@Composable
3435
fun ReportProblemNoEmailDialog(resultBackNavigator: ResultBackNavigator<Boolean>) {
3536
AlertDialog(

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ResetServerIpOverridesConfirmationDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import androidx.compose.ui.res.stringResource
1111
import androidx.compose.ui.tooling.preview.Preview
1212
import androidx.lifecycle.compose.dropUnlessResumed
1313
import com.ramcosta.composedestinations.annotation.Destination
14+
import com.ramcosta.composedestinations.annotation.RootGraph
1415
import com.ramcosta.composedestinations.result.ResultBackNavigator
1516
import com.ramcosta.composedestinations.spec.DestinationStyle
1617
import net.mullvad.mullvadvpn.R
@@ -30,7 +31,7 @@ private fun PreviewResetServerIpOverridesConfirmationDialog() {
3031
AppTheme { ResetServerIpOverridesConfirmationDialog({}, {}) }
3132
}
3233

33-
@Destination(style = DestinationStyle.Dialog::class)
34+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
3435
@Composable
3536
fun ResetServerIpOverridesConfirmation(resultBackNavigator: ResultBackNavigator<Boolean>) {
3637
val vm: ResetServerIpOverridesConfirmationViewModel = koinViewModel()

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/SaveApiAccessMethodDialog.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.ui.tooling.preview.Preview
1515
import androidx.compose.ui.tooling.preview.PreviewParameter
1616
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1717
import com.ramcosta.composedestinations.annotation.Destination
18+
import com.ramcosta.composedestinations.annotation.RootGraph
1819
import com.ramcosta.composedestinations.result.ResultBackNavigator
1920
import com.ramcosta.composedestinations.spec.DestinationStyle
2021
import net.mullvad.mullvadvpn.R
@@ -45,7 +46,7 @@ private fun PreviewSaveApiAccessMethodDialog(
4546
AppTheme { SaveApiAccessMethodDialog(state = state) }
4647
}
4748

48-
@Destination(style = DestinationStyle.Dialog::class)
49+
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
4950
@Composable
5051
fun SaveApiAccessMethod(
5152
backNavigator: ResultBackNavigator<Boolean>,

0 commit comments

Comments
 (0)