Skip to content

Commit 2b0efdc

Browse files
sds100sds100
committed
chore: upgrade compose BOM and navigation libraries
1 parent 95d22d0 commit 2b0efdc

12 files changed

Lines changed: 85 additions & 107 deletions

‎base/src/main/java/io/github/sds100/keymapper/base/actions/ActionOptionsBottomSheet.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@ import androidx.compose.material3.MaterialTheme
2424
import androidx.compose.material3.ModalBottomSheet
2525
import androidx.compose.material3.OutlinedButton
2626
import androidx.compose.material3.SheetState
27-
import androidx.compose.material3.SheetValue.Expanded
2827
import androidx.compose.material3.Text
2928
import androidx.compose.runtime.Composable
3029
import androidx.compose.runtime.rememberCoroutineScope
3130
import androidx.compose.ui.Alignment
3231
import androidx.compose.ui.Modifier
3332
import androidx.compose.ui.platform.LocalContext
34-
import androidx.compose.ui.platform.LocalDensity
3533
import androidx.compose.ui.platform.LocalUriHandler
3634
import androidx.compose.ui.res.stringResource
3735
import androidx.compose.ui.text.style.TextAlign
@@ -413,8 +411,8 @@ private fun Preview() {
413411
KeyMapperTheme {
414412
val sheetState = SheetState(
415413
skipPartiallyExpanded = true,
416-
density = LocalDensity.current,
417-
initialValue = Expanded,
414+
positionalThreshold = { 0f },
415+
velocityThreshold = { 0f },
418416
)
419417

420418
ActionOptionsBottomSheet(
@@ -472,8 +470,8 @@ private fun PreviewNoEditButton() {
472470
KeyMapperTheme {
473471
val sheetState = SheetState(
474472
skipPartiallyExpanded = true,
475-
density = LocalDensity.current,
476-
initialValue = Expanded,
473+
positionalThreshold = { 0f },
474+
velocityThreshold = { 0f },
477475
)
478476

479477
ActionOptionsBottomSheet(

‎base/src/main/java/io/github/sds100/keymapper/base/actions/FlashlightActionBottomSheet.kt‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import androidx.compose.material3.MaterialTheme
3131
import androidx.compose.material3.ModalBottomSheet
3232
import androidx.compose.material3.OutlinedButton
3333
import androidx.compose.material3.SheetState
34-
import androidx.compose.material3.SheetValue
3534
import androidx.compose.material3.Slider
3635
import androidx.compose.material3.Text
3736
import androidx.compose.material3.TextButton
@@ -41,7 +40,6 @@ import androidx.compose.runtime.remember
4140
import androidx.compose.runtime.rememberCoroutineScope
4241
import androidx.compose.ui.Alignment
4342
import androidx.compose.ui.Modifier
44-
import androidx.compose.ui.platform.LocalDensity
4543
import androidx.compose.ui.res.stringResource
4644
import androidx.compose.ui.text.style.TextAlign
4745
import androidx.compose.ui.tooling.preview.Preview
@@ -461,8 +459,8 @@ private fun PreviewBothLenses() {
461459
KeyMapperTheme {
462460
val sheetState = SheetState(
463461
skipPartiallyExpanded = true,
464-
density = LocalDensity.current,
465-
initialValue = SheetValue.Expanded,
462+
positionalThreshold = { 0f },
463+
velocityThreshold = { 0f },
466464
)
467465

468466
EnableFlashlightActionBottomSheet(
@@ -497,8 +495,8 @@ private fun PreviewOnlyBackLens() {
497495
KeyMapperTheme {
498496
val sheetState = SheetState(
499497
skipPartiallyExpanded = true,
500-
density = LocalDensity.current,
501-
initialValue = SheetValue.Expanded,
498+
positionalThreshold = { 0f },
499+
velocityThreshold = { 0f },
502500
)
503501

504502
EnableFlashlightActionBottomSheet(
@@ -528,8 +526,8 @@ private fun PreviewOnlyBackLensChangeStrength() {
528526
KeyMapperTheme {
529527
val sheetState = SheetState(
530528
skipPartiallyExpanded = true,
531-
density = LocalDensity.current,
532-
initialValue = SheetValue.Expanded,
529+
positionalThreshold = { 0f },
530+
velocityThreshold = { 0f },
533531
)
534532

535533
ChangeFlashlightStrengthActionBottomSheet(
@@ -557,8 +555,8 @@ private fun PreviewUnsupportedAndroidVersion() {
557555
KeyMapperTheme {
558556
val sheetState = SheetState(
559557
skipPartiallyExpanded = true,
560-
density = LocalDensity.current,
561-
initialValue = SheetValue.Expanded,
558+
positionalThreshold = { 0f },
559+
velocityThreshold = { 0f },
562560
)
563561

564562
EnableFlashlightActionBottomSheet(

‎base/src/main/java/io/github/sds100/keymapper/base/actions/HttpRequestBottomSheet.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import androidx.compose.material3.ModalBottomSheet
1919
import androidx.compose.material3.OutlinedButton
2020
import androidx.compose.material3.OutlinedTextField
2121
import androidx.compose.material3.SheetState
22-
import androidx.compose.material3.SheetValue
2322
import androidx.compose.material3.Text
2423
import androidx.compose.material3.rememberModalBottomSheetState
2524
import androidx.compose.runtime.Composable
@@ -30,7 +29,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
3029
import androidx.compose.runtime.setValue
3130
import androidx.compose.ui.Alignment
3231
import androidx.compose.ui.Modifier
33-
import androidx.compose.ui.platform.LocalDensity
3432
import androidx.compose.ui.res.stringResource
3533
import androidx.compose.ui.text.input.KeyboardCapitalization
3634
import androidx.compose.ui.text.input.KeyboardType
@@ -299,8 +297,8 @@ private fun PreviewEmpty() {
299297
KeyMapperTheme {
300298
val sheetState = SheetState(
301299
skipPartiallyExpanded = true,
302-
density = LocalDensity.current,
303-
initialValue = SheetValue.Expanded,
300+
positionalThreshold = { 0f },
301+
velocityThreshold = { 0f },
304302
)
305303
HttpRequestBottomSheet(
306304
sheetState = sheetState,
@@ -323,8 +321,8 @@ private fun PreviewFilled() {
323321
KeyMapperTheme {
324322
val sheetState = SheetState(
325323
skipPartiallyExpanded = true,
326-
density = LocalDensity.current,
327-
initialValue = SheetValue.Expanded,
324+
positionalThreshold = { 0f },
325+
velocityThreshold = { 0f },
328326
)
329327
HttpRequestBottomSheet(
330328
sheetState = sheetState,

‎base/src/main/java/io/github/sds100/keymapper/base/actions/ModifySettingActionBottomSheet.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ import androidx.compose.material3.ModalBottomSheet
1616
import androidx.compose.material3.OutlinedButton
1717
import androidx.compose.material3.OutlinedTextField
1818
import androidx.compose.material3.SheetState
19-
import androidx.compose.material3.SheetValue
2019
import androidx.compose.material3.Text
2120
import androidx.compose.material3.rememberModalBottomSheetState
2221
import androidx.compose.runtime.Composable
2322
import androidx.compose.runtime.rememberCoroutineScope
2423
import androidx.compose.ui.Alignment
2524
import androidx.compose.ui.Modifier
26-
import androidx.compose.ui.platform.LocalDensity
2725
import androidx.compose.ui.res.stringResource
2826
import androidx.compose.ui.text.font.FontFamily
2927
import androidx.compose.ui.text.style.TextAlign
@@ -183,8 +181,8 @@ private fun Preview() {
183181
KeyMapperTheme {
184182
val sheetState = SheetState(
185183
skipPartiallyExpanded = true,
186-
density = LocalDensity.current,
187-
initialValue = SheetValue.Expanded,
184+
positionalThreshold = { 0f },
185+
velocityThreshold = { 0f },
188186
)
189187

190188
ModifySettingActionBottomSheet(

‎base/src/main/java/io/github/sds100/keymapper/base/actions/SmsActionBottomSheet.kt‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.compose.material3.ModalBottomSheet
2020
import androidx.compose.material3.OutlinedButton
2121
import androidx.compose.material3.OutlinedTextField
2222
import androidx.compose.material3.SheetState
23-
import androidx.compose.material3.SheetValue
2423
import androidx.compose.material3.Text
2524
import androidx.compose.material3.rememberModalBottomSheetState
2625
import androidx.compose.runtime.Composable
@@ -32,7 +31,6 @@ import androidx.compose.runtime.setValue
3231
import androidx.compose.ui.Alignment
3332
import androidx.compose.ui.Modifier
3433
import androidx.compose.ui.platform.LocalContext
35-
import androidx.compose.ui.platform.LocalDensity
3634
import androidx.compose.ui.res.stringResource
3735
import androidx.compose.ui.text.input.KeyboardCapitalization
3836
import androidx.compose.ui.text.input.KeyboardType
@@ -334,8 +332,8 @@ private fun Preview() {
334332
KeyMapperTheme {
335333
val sheetState = SheetState(
336334
skipPartiallyExpanded = true,
337-
density = LocalDensity.current,
338-
initialValue = SheetValue.Expanded,
335+
positionalThreshold = { 0f },
336+
velocityThreshold = { 0f },
339337
)
340338

341339
SmsActionBottomSheet(
@@ -357,8 +355,8 @@ private fun PreviewTestError() {
357355
KeyMapperTheme {
358356
val sheetState = SheetState(
359357
skipPartiallyExpanded = true,
360-
density = LocalDensity.current,
361-
initialValue = SheetValue.Expanded,
358+
positionalThreshold = { 0f },
359+
velocityThreshold = { 0f },
362360
)
363361

364362
SmsActionBottomSheet(
@@ -380,8 +378,8 @@ private fun PreviewTestSuccess() {
380378
KeyMapperTheme {
381379
val sheetState = SheetState(
382380
skipPartiallyExpanded = true,
383-
density = LocalDensity.current,
384-
initialValue = SheetValue.Expanded,
381+
positionalThreshold = { 0f },
382+
velocityThreshold = { 0f },
385383
)
386384

387385
SmsActionBottomSheet(
@@ -403,8 +401,8 @@ private fun PreviewEmpty() {
403401
KeyMapperTheme {
404402
val sheetState = SheetState(
405403
skipPartiallyExpanded = true,
406-
density = LocalDensity.current,
407-
initialValue = SheetValue.Expanded,
404+
positionalThreshold = { 0f },
405+
velocityThreshold = { 0f },
408406
)
409407

410408
SmsActionBottomSheet(

‎base/src/main/java/io/github/sds100/keymapper/base/actions/VolumeActionBottomSheet.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import androidx.compose.material3.MaterialTheme
1919
import androidx.compose.material3.ModalBottomSheet
2020
import androidx.compose.material3.OutlinedButton
2121
import androidx.compose.material3.SheetState
22-
import androidx.compose.material3.SheetValue
2322
import androidx.compose.material3.Text
2423
import androidx.compose.material3.rememberModalBottomSheetState
2524
import androidx.compose.runtime.Composable
@@ -30,7 +29,6 @@ import androidx.compose.runtime.rememberCoroutineScope
3029
import androidx.compose.runtime.setValue
3130
import androidx.compose.ui.Alignment
3231
import androidx.compose.ui.Modifier
33-
import androidx.compose.ui.platform.LocalDensity
3432
import androidx.compose.ui.res.stringResource
3533
import androidx.compose.ui.text.style.TextAlign
3634
import androidx.compose.ui.tooling.preview.Preview
@@ -208,8 +206,8 @@ private fun PreviewVolumeActionBottomSheet() {
208206
KeyMapperTheme {
209207
val sheetState = SheetState(
210208
skipPartiallyExpanded = true,
211-
density = LocalDensity.current,
212-
initialValue = SheetValue.Expanded,
209+
positionalThreshold = { 0f },
210+
velocityThreshold = { 0f },
213211
)
214212

215213
var state by remember {
@@ -240,8 +238,8 @@ private fun PreviewVolumeActionBottomSheetDefaultStream() {
240238
KeyMapperTheme {
241239
val sheetState = SheetState(
242240
skipPartiallyExpanded = true,
243-
density = LocalDensity.current,
244-
initialValue = SheetValue.Expanded,
241+
positionalThreshold = { 0f },
242+
velocityThreshold = { 0f },
245243
)
246244

247245
var state by remember {

‎base/src/main/java/io/github/sds100/keymapper/base/actions/keyevent/FixKeyEventActionBottomSheet.kt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@ import androidx.compose.material3.ModalBottomSheet
2929
import androidx.compose.material3.OutlinedCard
3030
import androidx.compose.material3.RadioButton
3131
import androidx.compose.material3.SheetState
32-
import androidx.compose.material3.SheetValue
3332
import androidx.compose.material3.Text
3433
import androidx.compose.runtime.Composable
3534
import androidx.compose.ui.Alignment
3635
import androidx.compose.ui.Modifier
3736
import androidx.compose.ui.graphics.vector.ImageVector
38-
import androidx.compose.ui.platform.LocalDensity
3937
import androidx.compose.ui.res.stringResource
4038
import androidx.compose.ui.text.Placeholder
4139
import androidx.compose.ui.text.PlaceholderVerticalAlign
@@ -307,8 +305,8 @@ private fun InputMethodPreview() {
307305
KeyMapperTheme {
308306
val sheetState = SheetState(
309307
skipPartiallyExpanded = true,
310-
density = LocalDensity.current,
311-
initialValue = SheetValue.Expanded,
308+
positionalThreshold = { 0f },
309+
velocityThreshold = { 0f },
312310
)
313311

314312
FixKeyEventActionBottomSheet(
@@ -332,8 +330,8 @@ private fun ProModePreview() {
332330
KeyMapperTheme {
333331
val sheetState = SheetState(
334332
skipPartiallyExpanded = true,
335-
density = LocalDensity.current,
336-
initialValue = SheetValue.Expanded,
333+
positionalThreshold = { 0f },
334+
velocityThreshold = { 0f },
337335
)
338336

339337
FixKeyEventActionBottomSheet(
@@ -353,8 +351,8 @@ private fun ProModeUnsupportedPreview() {
353351
KeyMapperTheme {
354352
val sheetState = SheetState(
355353
skipPartiallyExpanded = true,
356-
density = LocalDensity.current,
357-
initialValue = SheetValue.Expanded,
354+
positionalThreshold = { 0f },
355+
velocityThreshold = { 0f },
358356
)
359357

360358
FixKeyEventActionBottomSheet(

‎base/src/main/java/io/github/sds100/keymapper/base/constraints/TimeConstraintBottomSheet.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import androidx.compose.material3.MaterialTheme
2121
import androidx.compose.material3.ModalBottomSheet
2222
import androidx.compose.material3.OutlinedButton
2323
import androidx.compose.material3.SheetState
24-
import androidx.compose.material3.SheetValue
2524
import androidx.compose.material3.Text
2625
import androidx.compose.material3.TextButton
2726
import androidx.compose.material3.TimePicker
@@ -36,7 +35,6 @@ import androidx.compose.runtime.rememberCoroutineScope
3635
import androidx.compose.runtime.setValue
3736
import androidx.compose.ui.Alignment
3837
import androidx.compose.ui.Modifier
39-
import androidx.compose.ui.platform.LocalDensity
4038
import androidx.compose.ui.res.stringResource
4139
import androidx.compose.ui.text.style.TextAlign
4240
import androidx.compose.ui.tooling.preview.Preview
@@ -275,8 +273,8 @@ private fun Preview() {
275273
KeyMapperTheme {
276274
val sheetState = SheetState(
277275
skipPartiallyExpanded = true,
278-
density = LocalDensity.current,
279-
initialValue = SheetValue.Expanded,
276+
positionalThreshold = { 0f },
277+
velocityThreshold = { 0f },
280278
)
281279

282280
TimeConstraintBottomSheet(

‎base/src/main/java/io/github/sds100/keymapper/base/trigger/TriggerDiscoverBottomSheet.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ import androidx.compose.material3.ExperimentalMaterial3Api
99
import androidx.compose.material3.ModalBottomSheet
1010
import androidx.compose.material3.OutlinedButton
1111
import androidx.compose.material3.SheetState
12-
import androidx.compose.material3.SheetValue
1312
import androidx.compose.material3.Text
1413
import androidx.compose.runtime.Composable
1514
import androidx.compose.runtime.rememberCoroutineScope
1615
import androidx.compose.ui.Modifier
17-
import androidx.compose.ui.platform.LocalDensity
1816
import androidx.compose.ui.res.stringResource
1917
import androidx.compose.ui.tooling.preview.Preview
2018
import androidx.compose.ui.unit.dp
@@ -68,8 +66,8 @@ private fun PreviewNoKeyRecordedComplete() {
6866
KeyMapperTheme {
6967
val sheetState = SheetState(
7068
skipPartiallyExpanded = true,
71-
density = LocalDensity.current,
72-
initialValue = SheetValue.Expanded,
69+
positionalThreshold = { 0f },
70+
velocityThreshold = { 0f },
7371
)
7472

7573
TriggerDiscoverBottomSheet(

0 commit comments

Comments
 (0)