Skip to content

Commit be82c6e

Browse files
bmartybmarty
committed
Rename extension.
1 parent 864c27a commit be82c6e

File tree

15 files changed

+33
-33
lines changed

15 files changed

+33
-33
lines changed

‎features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import io.element.android.libraries.core.extensions.orEmpty
4646
import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
4747
import io.element.android.libraries.designsystem.components.avatar.Avatar
4848
import io.element.android.libraries.designsystem.components.avatar.AvatarType
49-
import io.element.android.libraries.designsystem.modifiers.onShiftF10
49+
import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
5050
import io.element.android.libraries.designsystem.preview.ElementPreview
5151
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
5252
import io.element.android.libraries.designsystem.theme.components.Button
@@ -179,7 +179,7 @@ private fun RoomSummaryScaffoldRow(
179179
indication = ripple(),
180180
interactionSource = remember { MutableInteractionSource() }
181181
)
182-
.onShiftF10 { onLongClick(room) }
182+
.onKeyboardContextMenuAction { onLongClick(room) }
183183
Row(
184184
modifier = modifier
185185
.fillMaxWidth()

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import io.element.android.features.messages.impl.timeline.model.bubble.BubbleSta
3838
import io.element.android.features.messages.impl.timeline.model.bubble.BubbleStateProvider
3939
import io.element.android.libraries.core.extensions.to01
4040
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
41-
import io.element.android.libraries.designsystem.modifiers.onShiftF10
41+
import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
4242
import io.element.android.libraries.designsystem.preview.ElementPreview
4343
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
4444
import io.element.android.libraries.designsystem.text.toDp
@@ -104,7 +104,7 @@ fun MessageEventBubble(
104104
indication = ripple(),
105105
interactionSource = interactionSource
106106
)
107-
.onShiftF10(onLongClick)
107+
.onKeyboardContextMenuAction(onLongClick)
108108
}
109109

110110
// Ignore state.isHighlighted for now, we need a design decision on it.

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageStateEventContainer.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import androidx.compose.ui.draw.clip
1919
import androidx.compose.ui.graphics.Color
2020
import androidx.compose.ui.res.stringResource
2121
import androidx.compose.ui.unit.dp
22-
import io.element.android.libraries.designsystem.modifiers.onShiftF10
22+
import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
2323
import io.element.android.libraries.designsystem.preview.ElementPreview
2424
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
2525
import io.element.android.libraries.designsystem.theme.components.Surface
@@ -48,7 +48,7 @@ fun MessageStateEventContainer(
4848
indication = ripple(),
4949
interactionSource = interactionSource
5050
)
51-
.onShiftF10(onLongClick),
51+
.onKeyboardContextMenuAction(onLongClick),
5252
color = backgroundColor,
5353
shape = shape,
5454
content = content

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import io.element.android.features.messages.impl.timeline.model.AggregatedReacti
4343
import io.element.android.features.messages.impl.timeline.model.AggregatedReactionProvider
4444
import io.element.android.features.messages.impl.timeline.model.aTimelineItemReactions
4545
import io.element.android.libraries.designsystem.icons.CompoundDrawables
46-
import io.element.android.libraries.designsystem.modifiers.onShiftF10
46+
import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
4747
import io.element.android.libraries.designsystem.preview.ElementPreview
4848
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
4949
import io.element.android.libraries.designsystem.text.toDp
@@ -108,7 +108,7 @@ fun MessagesReactionButton(
108108
onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
109109
onLongClick = onLongClick
110110
)
111-
.onShiftF10(onLongClick)
111+
.onKeyboardContextMenuAction(onLongClick)
112112
// Inner border, to highlight when selected
113113
.border(BorderStroke(1.dp, borderColor), RoundedCornerShape(corner = CornerSize(12.dp)))
114114
.background(buttonColor, RoundedCornerShape(corner = CornerSize(12.dp)))

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import io.element.android.features.roomcall.api.RoomCallState
3434
import io.element.android.features.roomcall.api.RoomCallStateProvider
3535
import io.element.android.libraries.designsystem.components.avatar.Avatar
3636
import io.element.android.libraries.designsystem.components.avatar.AvatarType
37-
import io.element.android.libraries.designsystem.modifiers.onShiftF10
37+
import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
3838
import io.element.android.libraries.designsystem.preview.ElementPreview
3939
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
4040
import io.element.android.libraries.designsystem.text.toDp
@@ -58,7 +58,7 @@ internal fun TimelineItemCallNotifyView(
5858
onLongClick = { onLongClick(event) },
5959
onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
6060
)
61-
.onShiftF10 { onLongClick(event) }
61+
.onKeyboardContextMenuAction { onLongClick(event) }
6262
.padding(12.dp),
6363
horizontalArrangement = Arrangement.spacedBy(12.dp),
6464
verticalAlignment = Alignment.CenterVertically,

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
3737
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
3838
import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionEvent
3939
import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
40-
import io.element.android.libraries.designsystem.modifiers.onShiftF10
40+
import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
4141
import io.element.android.libraries.designsystem.modifiers.subtleColorStops
4242
import io.element.android.libraries.designsystem.preview.ElementPreview
4343
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -155,7 +155,7 @@ internal fun TimelineItemRow(
155155
onLongClick = { onLongClick(timelineItem) },
156156
onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
157157
)
158-
.onShiftF10 { onLongClick(timelineItem) }
158+
.onKeyboardContextMenuAction { onLongClick(timelineItem) }
159159
} else {
160160
Modifier
161161
}

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import io.element.android.features.messages.impl.timeline.model.event.aTimelineI
4848
import io.element.android.features.messages.impl.timeline.protection.ProtectedView
4949
import io.element.android.features.messages.impl.timeline.protection.coerceRatioWhenHidingContent
5050
import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
51-
import io.element.android.libraries.designsystem.modifiers.onShiftF10
51+
import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
5252
import io.element.android.libraries.designsystem.preview.ElementPreview
5353
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
5454
import io.element.android.libraries.textcomposer.ElementRichTextEditorStyle
@@ -97,7 +97,7 @@ fun TimelineItemImageView(
9797
onClick = onContentClick,
9898
onLongClick = onLongClick,
9999
)
100-
.onShiftF10(onLongClick)
100+
.onKeyboardContextMenuAction(onLongClick)
101101
} else {
102102
Modifier
103103
}

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStickerView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
3131
import io.element.android.features.messages.impl.timeline.protection.ProtectedView
3232
import io.element.android.features.messages.impl.timeline.protection.coerceRatioWhenHidingContent
3333
import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
34-
import io.element.android.libraries.designsystem.modifiers.onShiftF10
34+
import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
3535
import io.element.android.libraries.designsystem.preview.ElementPreview
3636
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
3737
import io.element.android.libraries.matrix.ui.media.MediaRequestData
@@ -75,7 +75,7 @@ fun TimelineItemStickerView(
7575
onLongClick = onLongClick,
7676
onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
7777
)
78-
.onShiftF10(onLongClick)
78+
.onKeyboardContextMenuAction(onLongClick)
7979
} else {
8080
Modifier
8181
}

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import io.element.android.features.messages.impl.timeline.model.event.aTimelineI
5454
import io.element.android.features.messages.impl.timeline.protection.ProtectedView
5555
import io.element.android.features.messages.impl.timeline.protection.coerceRatioWhenHidingContent
5656
import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
57-
import io.element.android.libraries.designsystem.modifiers.onShiftF10
57+
import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
5858
import io.element.android.libraries.designsystem.modifiers.roundedBackground
5959
import io.element.android.libraries.designsystem.preview.ElementPreview
6060
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -111,7 +111,7 @@ fun TimelineItemVideoView(
111111
onClick = onContentClick,
112112
onLongClick = onLongClick,
113113
)
114-
.onShiftF10(onLongClick)
114+
.onKeyboardContextMenuAction(onLongClick)
115115
} else {
116116
Modifier
117117
}

‎libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Keyboard.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ import androidx.compose.ui.input.key.type
1919
* Modifier to handle Shift + F10 key events.
2020
* This is typically used to trigger context menus in desktop applications.
2121
*
22-
* @param onShiftF10Press The callback to invoke when Shift + F10 is pressed.
22+
* @param action The callback to invoke when Shift + F10 is pressed.
2323
*/
24-
fun Modifier.onShiftF10(
25-
onShiftF10Press: (() -> Unit)?,
24+
fun Modifier.onKeyboardContextMenuAction(
25+
action: (() -> Unit)?,
2626
): Modifier = then(
27-
if (onShiftF10Press == null) {
27+
if (action == null) {
2828
Modifier
2929
} else {
3030
Modifier.onKeyEvent { keyEvent ->
3131
// invoke the callback when the user presses Shift + F10
3232
if (keyEvent.type == KeyEventType.KeyUp &&
3333
keyEvent.isShiftPressed &&
3434
keyEvent.key == Key.F10) {
35-
onShiftF10Press()
35+
action()
3636
true
3737
} else {
3838
false

0 commit comments

Comments
 (0)