Skip to content

Commit 3461670

Browse files
committed
Fix formatting
1 parent 26ee111 commit 3461670

10 files changed

+220
-161
lines changed

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/bottomsheet/CustomListEntryBottomSheet.kt

+7-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ data class CustomListEntrySheetNavArgs(
3131

3232
@OptIn(ExperimentalMaterial3Api::class)
3333
@Destination<RootGraph>(
34-
navArgs = CustomListEntrySheetNavArgs::class, style = DestinationStyleBottomSheet::class)
34+
navArgs = CustomListEntrySheetNavArgs::class,
35+
style = DestinationStyleBottomSheet::class
36+
)
3537
@Composable
3638
fun CustomListEntrySheet(backNavigator: ResultBackNavigator<LocationsChanged>) {
3739
val vm = koinViewModel<CustomListEntrySheetViewModel>()
@@ -47,14 +49,16 @@ fun CustomListEntrySheet(backNavigator: ResultBackNavigator<LocationsChanged>) {
4749
HeaderCell(
4850
text =
4951
stringResource(id = R.string.remove_location_from_list, state.value.locationName),
50-
background = Color.Unspecified)
52+
background = Color.Unspecified
53+
)
5154
HorizontalDivider(color = MaterialTheme.colorScheme.onBackground)
5255

5356
IconCell(
5457
iconId = R.drawable.ic_remove,
5558
title = stringResource(id = R.string.remove_button),
5659
titleColor = MaterialTheme.colorScheme.onBackground,
5760
onClick = vm::removeLocationFromList,
58-
background = Color.Unspecified)
61+
background = Color.Unspecified
62+
)
5963
}
6064
}

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/bottomsheet/CustomListsBottomSheet.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import com.ramcosta.composedestinations.annotation.Destination
1010
import com.ramcosta.composedestinations.annotation.RootGraph
1111
import com.ramcosta.composedestinations.bottomsheet.spec.DestinationStyleBottomSheet
1212
import com.ramcosta.composedestinations.generated.destinations.CreateCustomListDestination
13-
import com.ramcosta.composedestinations.generated.destinations.CustomListsSheetDestination
1413
import com.ramcosta.composedestinations.generated.destinations.CustomListsDestination
14+
import com.ramcosta.composedestinations.generated.destinations.CustomListsSheetDestination
1515
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
1616
import net.mullvad.mullvadvpn.R
1717
import net.mullvad.mullvadvpn.compose.cell.HeaderCell

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/bottomsheet/ImportOverridesBottomSheet.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fun ImportOverridesSheet(
5252
IconCell(
5353
iconId = R.drawable.icon_upload_file,
5454
title = stringResource(id = R.string.server_ip_overrides_import_by_file),
55-
onClick = dropUnlessResumed { resultRecipient.navigateBack(true)},
55+
onClick = dropUnlessResumed { resultRecipient.navigateBack(true) },
5656
background = Color.Unspecified,
5757
modifier = Modifier.testTag(SERVER_IP_OVERRIDES_IMPORT_BY_FILE_TEST_TAG)
5858
)
@@ -76,11 +76,11 @@ fun ImportOverridesSheet(
7676
)
7777
Text(
7878
modifier =
79-
Modifier.padding(
80-
top = Dimens.smallPadding,
81-
end = Dimens.mediumPadding,
82-
bottom = Dimens.smallPadding
83-
),
79+
Modifier.padding(
80+
top = Dimens.smallPadding,
81+
end = Dimens.mediumPadding,
82+
bottom = Dimens.smallPadding
83+
),
8484
text = stringResource(R.string.import_overrides_bottom_sheet_override_warning),
8585
maxLines = 2,
8686
style = MaterialTheme.typography.bodySmall,
@@ -89,4 +89,4 @@ fun ImportOverridesSheet(
8989
}
9090
}
9191
}
92-
}
92+
}

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/bottomsheet/LocationBottomSheet.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import net.mullvad.mullvadvpn.compose.component.MullvadModalBottomSheet
2727
import net.mullvad.mullvadvpn.compose.util.CollectSideEffectWithLifecycle
2828
import net.mullvad.mullvadvpn.lib.model.GeoLocationId
2929
import net.mullvad.mullvadvpn.lib.model.RelayItem
30+
import net.mullvad.mullvadvpn.viewmodel.LocationSheetViewModel
3031
import net.mullvad.mullvadvpn.viewmodel.LocationSideEffect
3132
import net.mullvad.mullvadvpn.viewmodel.LocationUiState
32-
import net.mullvad.mullvadvpn.viewmodel.LocationSheetViewModel
3333
import org.koin.androidx.compose.koinViewModel
3434

3535
data class LocationNavArgs(val locationName: String, val id: GeoLocationId)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ fun MullvadModalBottomSheet(sheetContent: @Composable ColumnScope.() -> Unit) {
4545
Column(Modifier.fillMaxWidth()) {
4646
DragHandle(
4747
modifier = Modifier.align(CenterHorizontally),
48-
color = MaterialTheme.colorScheme.onSurface)
48+
color = MaterialTheme.colorScheme.onSurface
49+
)
4950
sheetContent()
5051
Spacer(modifier = Modifier.height(Dimens.smallPadding))
5152
Spacer(modifier = Modifier.height(paddingValues.calculateBottomPadding()))

0 commit comments

Comments
 (0)