Skip to content

Commit dc181dd

Browse files
RawaRawa
committed
Align Screen and Dialog names
1 parent 4f72c77 commit dc181dd

38 files changed

+107
-114
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import net.mullvad.mullvadvpn.lib.theme.AppTheme
1515
@Preview
1616
@Composable
1717
private fun PreviewApiAccessMethodInfoDialog() {
18-
AppTheme { ApiAccessMethodInfoDialog(EmptyDestinationsNavigator) }
18+
AppTheme { ApiAccessMethodInfo(EmptyDestinationsNavigator) }
1919
}
2020

2121
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2222
@Composable
23-
fun ApiAccessMethodInfoDialog(navigator: DestinationsNavigator) {
23+
fun ApiAccessMethodInfo(navigator: DestinationsNavigator) {
2424
InfoDialog(
2525
message =
2626
buildString {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import net.mullvad.mullvadvpn.compose.component.textResource
1212

1313
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
1414
@Composable
15-
fun ContentBlockersInfoDialog(navigator: DestinationsNavigator) {
15+
fun ContentBlockersInfo(navigator: DestinationsNavigator) {
1616
InfoDialog(
1717
message =
1818
buildString {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import net.mullvad.mullvadvpn.R
1414
@Preview
1515
@Composable
1616
private fun PreviewCustomDnsInfoDialog() {
17-
CustomDnsInfoDialog(EmptyDestinationsNavigator)
17+
CustomDnsInfo(EmptyDestinationsNavigator)
1818
}
1919

2020
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2121
@Composable
22-
fun CustomDnsInfoDialog(navigator: DestinationsNavigator) {
22+
fun CustomDnsInfo(navigator: DestinationsNavigator) {
2323
InfoDialog(
2424
message = stringResource(id = R.string.settings_changes_effect_warning_content_blocker),
2525
onDismiss = dropUnlessResumed { navigator.navigateUp() }

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import net.mullvad.mullvadvpn.R
1111

1212
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
1313
@Composable
14-
fun DeviceNameInfoDialog(navigator: DestinationsNavigator) {
14+
fun DeviceNameInfo(navigator: DestinationsNavigator) {
1515
InfoDialog(
1616
message =
1717
buildString {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import net.mullvad.mullvadvpn.compose.button.PrimaryButton
1818

1919
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2020
@Composable
21-
fun DiscardChangesDialog(resultBackNavigator: ResultBackNavigator<Boolean>) {
21+
fun DiscardChanges(resultBackNavigator: ResultBackNavigator<Boolean>) {
2222
AlertDialog(
2323
onDismissRequest = dropUnlessResumed { resultBackNavigator.navigateBack() },
2424
title = { Text(text = stringResource(id = R.string.discard_changes)) },

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ data class DnsDialogNavArgs(
5858

5959
@Destination<RootGraph>(style = DestinationStyle.Dialog::class, navArgs = DnsDialogNavArgs::class)
6060
@Composable
61-
fun DnsDialog(
61+
fun Dns(
6262
resultNavigator: ResultBackNavigator<DnsDialogResult>,
6363
) {
6464
val viewModel = koinViewModel<DnsDialogViewModel>()

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import net.mullvad.mullvadvpn.compose.component.textResource
1515
@Preview
1616
@Composable
1717
private fun PreviewLocalNetworkSharingInfoDialog() {
18-
LocalNetworkSharingInfoDialog(EmptyDestinationsNavigator)
18+
LocalNetworkSharingInfo(EmptyDestinationsNavigator)
1919
}
2020

2121
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2222
@Composable
23-
fun LocalNetworkSharingInfoDialog(navigator: DestinationsNavigator) {
23+
fun LocalNetworkSharingInfo(navigator: DestinationsNavigator) {
2424
InfoDialog(
2525
message = stringResource(id = R.string.local_network_sharing_info),
2626
additionalInfo =

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import net.mullvad.mullvadvpn.R
1414
@Preview
1515
@Composable
1616
private fun PreviewMalwareInfoDialog() {
17-
MalwareInfoDialog(EmptyDestinationsNavigator)
17+
MalwareInfo(EmptyDestinationsNavigator)
1818
}
1919

2020
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2121
@Composable
22-
fun MalwareInfoDialog(navigator: DestinationsNavigator) {
22+
fun MalwareInfo(navigator: DestinationsNavigator) {
2323
InfoDialog(
2424
message = stringResource(id = R.string.malware_info),
2525
onDismiss = dropUnlessResumed { navigator.navigateUp() }

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ import org.koin.androidx.compose.koinViewModel
3838
@Preview
3939
@Composable
4040
private fun PreviewMtuDialog() {
41-
AppTheme { MtuDialog(EmptyResultBackNavigator()) }
41+
AppTheme { Mtu(EmptyResultBackNavigator()) }
4242
}
4343

4444
data class MtuNavArgs(val initialMtu: Mtu? = null)
4545

4646
@Destination<RootGraph>(style = DestinationStyle.Dialog::class, navArgs = MtuNavArgs::class)
4747
@Composable
48-
fun MtuDialog(navigator: ResultBackNavigator<Boolean>) {
48+
fun Mtu(navigator: ResultBackNavigator<Boolean>) {
4949
val viewModel = koinViewModel<MtuDialogViewModel>()
5050

5151
val uiState by viewModel.uiState.collectAsStateWithLifecycle()

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import net.mullvad.mullvadvpn.R
1414
@Preview
1515
@Composable
1616
private fun PreviewObfuscationInfoDialog() {
17-
ObfuscationInfoDialog(EmptyDestinationsNavigator)
17+
ObfuscationInfo(EmptyDestinationsNavigator)
1818
}
1919

2020
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2121
@Composable
22-
fun ObfuscationInfoDialog(navigator: DestinationsNavigator) {
22+
fun ObfuscationInfo(navigator: DestinationsNavigator) {
2323
InfoDialog(
2424
message = stringResource(id = R.string.obfuscation_info),
2525
onDismiss = dropUnlessResumed { navigator.navigateUp() }

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import net.mullvad.mullvadvpn.R
1414
@Preview
1515
@Composable
1616
private fun PreviewQuantumResistanceInfoDialog() {
17-
QuantumResistanceInfoDialog(EmptyDestinationsNavigator)
17+
QuantumResistanceInfo(EmptyDestinationsNavigator)
1818
}
1919

2020
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2121
@Composable
22-
fun QuantumResistanceInfoDialog(navigator: DestinationsNavigator) {
22+
fun QuantumResistanceInfo(navigator: DestinationsNavigator) {
2323
InfoDialog(
2424
message = stringResource(id = R.string.quantum_resistant_info_first_paragaph),
2525
additionalInfo = stringResource(id = R.string.quantum_resistant_info_second_paragaph),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
3737
private fun PreviewRemoveDeviceConfirmationDialog(
3838
@PreviewParameter(DevicePreviewParameterProvider::class) device: Device
3939
) {
40-
AppTheme { RemoveDeviceConfirmationDialog(EmptyResultBackNavigator(), device = device) }
40+
AppTheme { RemoveDeviceConfirmation(EmptyResultBackNavigator(), device = device) }
4141
}
4242

4343
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
4444
@Composable
45-
fun RemoveDeviceConfirmationDialog(navigator: ResultBackNavigator<DeviceId>, device: Device) {
45+
fun RemoveDeviceConfirmation(navigator: ResultBackNavigator<DeviceId>, device: Device) {
4646
AlertDialog(
4747
onDismissRequest = dropUnlessResumed { navigator.navigateBack() },
4848
icon = {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
2727
@Preview
2828
@Composable
2929
private fun PreviewReportProblemNoEmailDialog() {
30-
AppTheme { ReportProblemNoEmailDialog(EmptyResultBackNavigator()) }
30+
AppTheme { ReportProblemNoEmail(EmptyResultBackNavigator()) }
3131
}
3232

3333
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
3434
@Composable
35-
fun ReportProblemNoEmailDialog(resultBackNavigator: ResultBackNavigator<Boolean>) {
35+
fun ReportProblemNoEmail(resultBackNavigator: ResultBackNavigator<Boolean>) {
3636
AlertDialog(
3737
onDismissRequest = dropUnlessResumed { resultBackNavigator.navigateBack() },
3838
icon = {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import net.mullvad.mullvadvpn.R
1414
@Preview
1515
@Composable
1616
private fun PreviewServerIpOverridesInfoDialog() {
17-
ServerIpOverridesInfoDialog(EmptyDestinationsNavigator)
17+
ServerIpOverridesInfo(EmptyDestinationsNavigator)
1818
}
1919

2020
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2121
@Composable
22-
fun ServerIpOverridesInfoDialog(navigator: DestinationsNavigator) {
22+
fun ServerIpOverridesInfo(navigator: DestinationsNavigator) {
2323
InfoDialog(
2424
message =
2525
buildString {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import net.mullvad.mullvadvpn.lib.theme.AppTheme
1515
@Preview
1616
@Composable
1717
private fun PreviewUdpOverTcpPortInfoDialog() {
18-
AppTheme { UdpOverTcpPortInfoDialog(EmptyDestinationsNavigator) }
18+
AppTheme { UdpOverTcpPortInfo(EmptyDestinationsNavigator) }
1919
}
2020

2121
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2222
@Composable
23-
fun UdpOverTcpPortInfoDialog(navigator: DestinationsNavigator) {
23+
fun UdpOverTcpPortInfo(navigator: DestinationsNavigator) {
2424
InfoDialog(
2525
message = stringResource(id = R.string.udp_over_tcp_port_info),
2626
onDismiss = dropUnlessResumed { navigator.navigateUp() }

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import net.mullvad.mullvadvpn.util.inAnyOf
3939
@Composable
4040
private fun PreviewWireguardCustomPortDialog() {
4141
AppTheme {
42-
WireguardCustomPortDialog(
42+
WireguardCustomPort(
4343
WireguardCustomPortNavArgs(
4444
customPort = null,
4545
allowedPortRanges = listOf(PortRange(10..10), PortRange(40..50)),
@@ -57,7 +57,7 @@ data class WireguardCustomPortNavArgs(
5757

5858
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
5959
@Composable
60-
fun WireguardCustomPortDialog(
60+
fun WireguardCustomPort(
6161
navArg: WireguardCustomPortNavArgs,
6262
backNavigator: ResultBackNavigator<Port?>,
6363
) {

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import net.mullvad.mullvadvpn.util.asString
2020
@Composable
2121
private fun PreviewWireguardPortInfoDialog() {
2222
AppTheme {
23-
WireguardPortInfoDialog(
23+
WireguardPortInfo(
2424
EmptyDestinationsNavigator,
2525
argument = WireguardPortInfoDialogArgument(listOf(PortRange(1..2)))
2626
)
@@ -31,10 +31,7 @@ private fun PreviewWireguardPortInfoDialog() {
3131

3232
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
3333
@Composable
34-
fun WireguardPortInfoDialog(
35-
navigator: DestinationsNavigator,
36-
argument: WireguardPortInfoDialogArgument
37-
) {
34+
fun WireguardPortInfo(navigator: DestinationsNavigator, argument: WireguardPortInfoDialogArgument) {
3835
InfoDialog(
3936
message = stringResource(id = R.string.wireguard_port_info_description),
4037
additionalInfo =

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private fun PreviewVerificationPendingDialog() {
2525

2626
@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
2727
@Composable
28-
fun VerificationPendingDialog(navigator: DestinationsNavigator) {
28+
fun VerificationPending(navigator: DestinationsNavigator) {
2929
VerificationPendingDialog(onClose = dropUnlessResumed { navigator.navigateUp() })
3030
}
3131

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import androidx.lifecycle.compose.dropUnlessResumed
2828
import com.ramcosta.composedestinations.annotation.Destination
2929
import com.ramcosta.composedestinations.annotation.RootGraph
3030
import com.ramcosta.composedestinations.generated.NavGraphs
31-
import com.ramcosta.composedestinations.generated.destinations.DeviceNameInfoDialogDestination
31+
import com.ramcosta.composedestinations.generated.destinations.DeviceNameInfoDestination
3232
import com.ramcosta.composedestinations.generated.destinations.LoginDestination
3333
import com.ramcosta.composedestinations.generated.destinations.PaymentDestination
3434
import com.ramcosta.composedestinations.generated.destinations.RedeemVoucherDestination
35-
import com.ramcosta.composedestinations.generated.destinations.VerificationPendingDialogDestination
35+
import com.ramcosta.composedestinations.generated.destinations.VerificationPendingDestination
3636
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
3737
import com.ramcosta.composedestinations.result.NavResult
3838
import com.ramcosta.composedestinations.result.ResultRecipient
@@ -136,12 +136,11 @@ fun Account(
136136
},
137137
onCopyAccountNumber = vm::onCopyAccountNumber,
138138
onBackClick = dropUnlessResumed { navigator.navigateUp() },
139-
navigateToDeviceInfo =
140-
dropUnlessResumed { navigator.navigate(DeviceNameInfoDialogDestination) },
139+
navigateToDeviceInfo = dropUnlessResumed { navigator.navigate(DeviceNameInfoDestination) },
141140
onPurchaseBillingProductClick =
142141
dropUnlessResumed { productId -> navigator.navigate(PaymentDestination(productId)) },
143142
navigateToVerificationPendingDialog =
144-
dropUnlessResumed { navigator.navigate(VerificationPendingDialogDestination) }
143+
dropUnlessResumed { navigator.navigate(VerificationPendingDestination) }
145144
)
146145
}
147146

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
2222
import com.ramcosta.composedestinations.annotation.Destination
2323
import com.ramcosta.composedestinations.annotation.RootGraph
2424
import com.ramcosta.composedestinations.generated.destinations.ApiAccessMethodDetailsDestination
25-
import com.ramcosta.composedestinations.generated.destinations.ApiAccessMethodInfoDialogDestination
25+
import com.ramcosta.composedestinations.generated.destinations.ApiAccessMethodInfoDestination
2626
import com.ramcosta.composedestinations.generated.destinations.EditApiAccessMethodDestination
2727
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
2828
import net.mullvad.mullvadvpn.R
@@ -67,7 +67,7 @@ fun ApiAccessList(navigator: DestinationsNavigator) {
6767
navigator.navigate(ApiAccessMethodDetailsDestination(it.id)) { launchSingleTop = true }
6868
},
6969
onApiAccessInfoClick = {
70-
navigator.navigate(ApiAccessMethodInfoDialogDestination) { launchSingleTop = true }
70+
navigator.navigate(ApiAccessMethodInfoDestination) { launchSingleTop = true }
7171
},
7272
onBackClick = navigator::navigateUp
7373
)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
2929
import androidx.lifecycle.compose.dropUnlessResumed
3030
import com.ramcosta.composedestinations.annotation.Destination
3131
import com.ramcosta.composedestinations.annotation.RootGraph
32-
import com.ramcosta.composedestinations.generated.destinations.DiscardChangesDialogDestination
32+
import com.ramcosta.composedestinations.generated.destinations.DiscardChangesDestination
3333
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
3434
import com.ramcosta.composedestinations.result.NavResult
3535
import com.ramcosta.composedestinations.result.ResultBackNavigator
@@ -80,7 +80,7 @@ data class CustomListLocationsNavArgs(
8080
fun CustomListLocations(
8181
navigator: DestinationsNavigator,
8282
backNavigator: ResultBackNavigator<LocationsChanged>,
83-
discardChangesResultRecipient: ResultRecipient<DiscardChangesDialogDestination, Boolean>,
83+
discardChangesResultRecipient: ResultRecipient<DiscardChangesDestination, Boolean>,
8484
) {
8585
val customListsViewModel = koinViewModel<CustomListLocationsViewModel>()
8686

@@ -122,7 +122,7 @@ fun CustomListLocations(
122122
onBackClick =
123123
dropUnlessResumed {
124124
if (state.hasUnsavedChanges) {
125-
navigator.navigate(DiscardChangesDialogDestination)
125+
navigator.navigate(DiscardChangesDestination)
126126
} else {
127127
backNavigator.navigateBack()
128128
}

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import androidx.lifecycle.compose.dropUnlessResumed
3535
import com.ramcosta.composedestinations.annotation.Destination
3636
import com.ramcosta.composedestinations.annotation.RootGraph
3737
import com.ramcosta.composedestinations.generated.destinations.LoginDestination
38-
import com.ramcosta.composedestinations.generated.destinations.RemoveDeviceConfirmationDialogDestination
38+
import com.ramcosta.composedestinations.generated.destinations.RemoveDeviceConfirmationDestination
3939
import com.ramcosta.composedestinations.generated.destinations.SettingsDestination
4040
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
4141
import com.ramcosta.composedestinations.result.NavResult
@@ -108,8 +108,7 @@ data class DeviceListNavArgs(val accountNumber: AccountNumber)
108108
@Composable
109109
fun DeviceList(
110110
navigator: DestinationsNavigator,
111-
confirmRemoveResultRecipient:
112-
ResultRecipient<RemoveDeviceConfirmationDialogDestination, DeviceId>
111+
confirmRemoveResultRecipient: ResultRecipient<RemoveDeviceConfirmationDestination, DeviceId>
113112
) {
114113
val viewModel = koinViewModel<DeviceListViewModel>()
115114
val state by viewModel.uiState.collectAsStateWithLifecycle()
@@ -156,7 +155,7 @@ fun DeviceList(
156155
onTryAgainClicked = viewModel::fetchDevices,
157156
navigateToRemoveDeviceConfirmationDialog =
158157
dropUnlessResumed<Device> {
159-
navigator.navigate(RemoveDeviceConfirmationDialogDestination(it))
158+
navigator.navigate(RemoveDeviceConfirmationDestination(it))
160159
}
161160
)
162161
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
3333
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3434
import com.ramcosta.composedestinations.annotation.Destination
3535
import com.ramcosta.composedestinations.annotation.RootGraph
36-
import com.ramcosta.composedestinations.generated.destinations.DiscardChangesDialogDestination
36+
import com.ramcosta.composedestinations.generated.destinations.DiscardChangesDestination
3737
import com.ramcosta.composedestinations.generated.destinations.SaveApiAccessMethodDestination
3838
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
3939
import com.ramcosta.composedestinations.result.ResultBackNavigator
@@ -93,7 +93,7 @@ fun EditApiAccessMethod(
9393
navigator: DestinationsNavigator,
9494
backNavigator: ResultBackNavigator<Boolean>,
9595
saveApiAccessMethodResultRecipient: ResultRecipient<SaveApiAccessMethodDestination, Boolean>,
96-
discardChangesResultRecipient: ResultRecipient<DiscardChangesDialogDestination, Boolean>,
96+
discardChangesResultRecipient: ResultRecipient<DiscardChangesDestination, Boolean>,
9797
) {
9898
val viewModel = koinViewModel<EditApiAccessMethodViewModel>()
9999

@@ -179,7 +179,7 @@ fun EditApiAccessMethod(
179179
onAddMethod = viewModel::trySave,
180180
onNavigateBack = {
181181
if (state.hasChanges()) {
182-
navigator.navigate(DiscardChangesDialogDestination) { launchSingleTop = true }
182+
navigator.navigate(DiscardChangesDestination) { launchSingleTop = true }
183183
} else {
184184
navigator.navigateUp()
185185
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private fun PreviewFilterScreen() {
7070

7171
@Destination<RootGraph>(style = SlideInFromRightTransition::class)
7272
@Composable
73-
fun FilterScreen(navigator: DestinationsNavigator) {
73+
fun Filter(navigator: DestinationsNavigator) {
7474
val viewModel = koinViewModel<FilterViewModel>()
7575
val state by viewModel.uiState.collectAsStateWithLifecycle()
7676

0 commit comments

Comments
 (0)