Skip to content

Commit a4c566c

Browse files
committed
fix!: convert compose properties to extension functions
1 parent b785e3a commit a4c566c

19 files changed

+41
-41
lines changed

commons/src/main/kotlin/org/fossify/commons/compose/alert_dialog/AlertDialogsExtensions.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@ val dialogContainerColor
3636
}
3737
}
3838

39-
val Modifier.dialogBackgroundShapeAndBorder: Modifier
40-
@ReadOnlyComposable
41-
@Composable get() = this
42-
.fillMaxWidth()
43-
.background(dialogContainerColor, dialogShape)
44-
.dialogBorder
39+
@Composable
40+
@ReadOnlyComposable
41+
fun Modifier.dialogBackgroundShapeAndBorder(): Modifier = this
42+
.fillMaxWidth()
43+
.background(dialogContainerColor, dialogShape)
44+
.dialogBorder()
4545

4646
val dialogShape = Shapes.extraLarge
4747

4848
val dialogElevation = 0.dp
4949

5050
val dialogTextColor @Composable @ReadOnlyComposable get() = SimpleTheme.colorScheme.onSurface
5151

52-
val Modifier.dialogBorder: Modifier
53-
@ReadOnlyComposable
54-
@Composable get() =
55-
when (LocalTheme.current) {
56-
is Theme.BlackAndWhite -> this.border(1.dp, light_grey_stroke, dialogShape)
57-
else -> this
58-
}
52+
@Composable
53+
@ReadOnlyComposable
54+
fun Modifier.dialogBorder(): Modifier =
55+
when (LocalTheme.current) {
56+
is Theme.BlackAndWhite -> this.border(1.dp, light_grey_stroke, dialogShape)
57+
else -> this
58+
}
5959

6060
@Composable
6161
fun DialogSurface(
@@ -64,7 +64,7 @@ fun DialogSurface(
6464
) {
6565
Surface(
6666
modifier = modifier
67-
.dialogBorder,
67+
.dialogBorder(),
6868
shape = dialogShape,
6969
color = dialogContainerColor,
7070
tonalElevation = dialogElevation,

commons/src/main/kotlin/org/fossify/commons/compose/bottom_sheet/BottomSheetDialogsExtensions.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ val bottomSheetDialogShape = Shapes.extraLarge.copy(
2222
bottomStart = CornerSize(0f)
2323
)
2424

25-
val Modifier.bottomSheetDialogBorder: Modifier
26-
@ReadOnlyComposable
27-
@Composable get() =
28-
when (LocalTheme.current) {
29-
is Theme.BlackAndWhite -> this.border(2.dp, light_grey_stroke, bottomSheetDialogShape)
30-
else -> this
31-
}
25+
@Composable
26+
@ReadOnlyComposable
27+
fun Modifier.bottomSheetDialogBorder(): Modifier =
28+
when (LocalTheme.current) {
29+
is Theme.BlackAndWhite -> this.border(2.dp, light_grey_stroke, bottomSheetDialogShape)
30+
else -> this
31+
}
3232

3333
@Composable
3434
fun BottomSheetSpacerEdgeToEdge() {
@@ -43,7 +43,7 @@ fun BottomSheetColumnDialogSurface(
4343
Surface(
4444
modifier = modifier
4545
.fillMaxSize()
46-
.bottomSheetDialogBorder,
46+
.bottomSheetDialogBorder(),
4747
shape = bottomSheetDialogShape,
4848
color = dialogContainerColor,
4949
tonalElevation = dialogElevation,
@@ -62,7 +62,7 @@ fun BottomSheetBoxDialogSurface(
6262
Surface(
6363
modifier = modifier
6464
.fillMaxSize()
65-
.bottomSheetDialogBorder,
65+
.bottomSheetDialogBorder(),
6666
shape = bottomSheetDialogShape,
6767
color = dialogContainerColor,
6868
tonalElevation = dialogElevation,
@@ -81,7 +81,7 @@ fun BottomSheetDialogSurface(
8181
Surface(
8282
modifier = modifier
8383
.fillMaxSize()
84-
.bottomSheetDialogBorder,
84+
.bottomSheetDialogBorder(),
8585
shape = bottomSheetDialogShape,
8686
color = dialogContainerColor,
8787
tonalElevation = dialogElevation,

commons/src/main/kotlin/org/fossify/commons/compose/menus/ActionMenu.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ fun ActionMenu(
144144
DropdownMenu(
145145
modifier = Modifier
146146
.background(dialogContainerColor)
147-
.dialogBorder,
147+
.dialogBorder(),
148148
expanded = isMenuVisible,
149149
onDismissRequest = { onMenuToggle(false) },
150150
) {

commons/src/main/kotlin/org/fossify/commons/dialogs/AddBlockedNumberDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fun AddOrEditBlockedNumberAlertDialog(
4242
AlertDialog(
4343
containerColor = dialogContainerColor,
4444
modifier = modifier
45-
.dialogBorder,
45+
.dialogBorder(),
4646
onDismissRequest = alertDialogState::hide,
4747
confirmButton = {
4848
TextButton(onClick = {

commons/src/main/kotlin/org/fossify/commons/dialogs/AppSideloadedDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fun AppSideLoadedAlertDialog(
7070
AlertDialog(
7171
containerColor = dialogContainerColor,
7272
modifier = modifier
73-
.dialogBorder,
73+
.dialogBorder(),
7474
onDismissRequest = alertDialogState::hide,
7575
confirmButton = {
7676
TextButton(onClick = {

commons/src/main/kotlin/org/fossify/commons/dialogs/CallConfirmationDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fun CallConfirmationAlertDialog(
6868
androidx.compose.material3.AlertDialog(
6969
containerColor = dialogContainerColor,
7070
modifier = modifier
71-
.dialogBorder,
71+
.dialogBorder(),
7272
onDismissRequest = {
7373
alertDialogState.hide()
7474
callback()

commons/src/main/kotlin/org/fossify/commons/dialogs/ColorPickerDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ fun ColorPickerAlertDialog(
159159

160160
AlertDialog(
161161
modifier = modifier
162-
.dialogBorder,
162+
.dialogBorder(),
163163
onDismissRequest = alertDialogState::hide,
164164
properties = DialogProperties(usePlatformDefaultWidth = false)
165165
) {

commons/src/main/kotlin/org/fossify/commons/dialogs/ConfirmationAdvancedDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fun ConfirmationAdvancedAlertDialog(
7373
androidx.compose.material3.AlertDialog(
7474
containerColor = dialogContainerColor,
7575
modifier = modifier
76-
.dialogBorder,
76+
.dialogBorder(),
7777
properties = DialogProperties(dismissOnClickOutside = cancelOnTouchOutside),
7878
onDismissRequest = {
7979
alertDialogState.hide()

commons/src/main/kotlin/org/fossify/commons/dialogs/ConfirmationDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fun ConfirmationAlertDialog(
8080
androidx.compose.material3.AlertDialog(
8181
containerColor = dialogContainerColor,
8282
modifier = modifier
83-
.dialogBorder,
83+
.dialogBorder(),
8484
properties = DialogProperties(dismissOnClickOutside = cancelOnTouchOutside),
8585
onDismissRequest = {
8686
alertDialogState.hide()

commons/src/main/kotlin/org/fossify/commons/dialogs/CreateNewFolderDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ fun CreateNewFolderAlertDialog(
118118
var title by remember { mutableStateOf("") }
119119

120120
AlertDialog(
121-
modifier = modifier.dialogBorder,
121+
modifier = modifier.dialogBorder(),
122122
shape = dialogShape,
123123
containerColor = dialogContainerColor,
124124
tonalElevation = dialogElevation,

0 commit comments

Comments
 (0)