Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Rename fun in Callback for clarity.

Browse source
This commit is contained in:
Benoit Marty 2025-10-29 10:30:30 +01:00 • committed by Benoit Marty
parent 45b5783b23
commit 09a18ad7ca
104 changed files with 658 additions and 664 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/accountselect/api/src/main/kotlin/io/element/android/libraries/accountselect/api/AccountSelectEntryPoint.kt
View file

@ -22,7 +22,7 @@ interface AccountSelectEntryPoint : FeatureEntryPoint {
}
interface Callback : Plugin {
fun onSelectAccount(sessionId: SessionId)
fun onAccountSelected(sessionId: SessionId)
fun onCancel()
}
}

6
libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectNode.kt
View file

@ -32,8 +32,8 @@ class AccountSelectNode(
callbacks.forEach { it.onCancel() }
}
private fun onSelectAccount(sessionId: SessionId) {
callbacks.forEach { it.onSelectAccount(sessionId) }
private fun onAccountSelected(sessionId: SessionId) {
callbacks.forEach { it.onAccountSelected(sessionId) }
}
@Composable
@ -42,7 +42,7 @@ class AccountSelectNode(
AccountSelectView(
state = state,
onDismiss = ::onDismiss,
onSelectAccount = ::onSelectAccount,
onSelectAccount = ::onAccountSelected,
modifier = modifier,
)
}

2
libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPointTest.kt
View file

@ -32,7 +32,7 @@ class DefaultAccountSelectEntryPointTest {
)
}
val callback = object : AccountSelectEntryPoint.Callback {
override fun onSelectAccount(sessionId: SessionId) = lambdaError()
override fun onAccountSelected(sessionId: SessionId) = lambdaError()
override fun onCancel() = lambdaError()
}
val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))

4
libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt
View file

@ -23,7 +23,7 @@ interface MediaGalleryEntryPoint : FeatureEntryPoint {
interface Callback : Plugin {
fun onBackClick()
fun onViewInTimeline(eventId: EventId)
fun forwardEvent(eventId: EventId)
fun viewInTimeline(eventId: EventId)
fun forward(eventId: EventId)
}
}

4
libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt
View file

@ -30,8 +30,8 @@ interface MediaViewerEntryPoint : FeatureEntryPoint {
interface Callback : Plugin {
fun onDone()
fun onViewInTimeline(eventId: EventId)
fun onForwardEvent(eventId: EventId)
fun viewInTimeline(eventId: EventId)
fun forwardEvent(eventId: EventId)
}
data class Params(

12
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt
View file

@ -38,9 +38,9 @@ class MediaGalleryNode(
interface Callback : Plugin {
fun onBackClick()
fun onItemClick(item: MediaItem.Event)
fun onViewInTimeline(eventId: EventId)
fun onForward(eventId: EventId)
fun showItem(item: MediaItem.Event)
fun viewInTimeline(eventId: EventId)
fun forward(eventId: EventId)
}
private fun onBackClick() {
@ -51,19 +51,19 @@ class MediaGalleryNode(
override fun onViewInTimelineClick(eventId: EventId) {
plugins<Callback>().forEach {
it.onViewInTimeline(eventId)
it.viewInTimeline(eventId)
}
}
override fun onForwardClick(eventId: EventId) {
plugins<Callback>().forEach {
it.onForward(eventId)
it.forward(eventId)
}
}
private fun onItemClick(item: MediaItem.Event) {
plugins<Callback>().forEach {
it.onItemClick(item)
it.showItem(item)
}
}

16
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt
View file

@ -78,13 +78,13 @@ class MediaGalleryFlowNode(
private fun onViewInTimeline(eventId: EventId) {
plugins<MediaGalleryEntryPoint.Callback>().forEach {
it.onViewInTimeline(eventId)
it.viewInTimeline(eventId)
}
}
private fun forwardEvent(eventId: EventId) {
plugins<MediaGalleryEntryPoint.Callback>().forEach {
it.forwardEvent(eventId)
it.forward(eventId)
}
}
@ -96,15 +96,15 @@ class MediaGalleryFlowNode(
this@MediaGalleryFlowNode.onBackClick()
}
override fun onViewInTimeline(eventId: EventId) {
override fun viewInTimeline(eventId: EventId) {
this@MediaGalleryFlowNode.onViewInTimeline(eventId)
}
override fun onForward(eventId: EventId) {
override fun forward(eventId: EventId) {
forwardEvent(eventId)
}
override fun onItemClick(item: MediaItem.Event) {
override fun showItem(item: MediaItem.Event) {
val mode = when (item) {
is MediaItem.Audio,
is MediaItem.Voice,
@ -131,13 +131,13 @@ class MediaGalleryFlowNode(
overlay.hide()
}
override fun onViewInTimeline(eventId: EventId) {
override fun viewInTimeline(eventId: EventId) {
this@MediaGalleryFlowNode.onViewInTimeline(eventId)
}
override fun onForwardEvent(eventId: EventId) {
override fun forwardEvent(eventId: EventId) {
// Need to go to the parent because of the overlay
forwardEvent(eventId)
this@MediaGalleryFlowNode.forwardEvent(eventId)
}
}
mediaViewerEntryPoint.nodeBuilder(this, buildContext)

4
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt
View file

@ -67,13 +67,13 @@ class MediaViewerNode(
override fun onViewInTimelineClick(eventId: EventId) {
plugins<MediaViewerEntryPoint.Callback>().forEach {
it.onViewInTimeline(eventId)
it.viewInTimeline(eventId)
}
}
override fun onForwardClick(eventId: EventId) {
plugins<MediaViewerEntryPoint.Callback>().forEach {
it.onForwardEvent(eventId)
it.forwardEvent(eventId)
}
}

4
libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt
View file

@ -42,8 +42,8 @@ class DefaultMediaGalleryEntryPointTest {
}
val callback = object : MediaGalleryEntryPoint.Callback {
override fun onBackClick() = lambdaError()
override fun onViewInTimeline(eventId: EventId) = lambdaError()
override fun forwardEvent(eventId: EventId) = lambdaError()
override fun viewInTimeline(eventId: EventId) = lambdaError()
override fun forward(eventId: EventId) = lambdaError()
}
val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
.callback(callback)

8
libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt
View file

@ -71,8 +71,8 @@ class DefaultMediaViewerEntryPointTest {
}
val callback = object : MediaViewerEntryPoint.Callback {
override fun onDone() = lambdaError()
override fun onViewInTimeline(eventId: EventId) = lambdaError()
override fun onForwardEvent(eventId: EventId) = lambdaError()
override fun viewInTimeline(eventId: EventId) = lambdaError()
override fun forwardEvent(eventId: EventId) = lambdaError()
}
val params = createMediaViewerEntryPointParams()
val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
@ -115,8 +115,8 @@ class DefaultMediaViewerEntryPointTest {
}
val callback = object : MediaViewerEntryPoint.Callback {
override fun onDone() = lambdaError()
override fun onViewInTimeline(eventId: EventId) = lambdaError()
override fun onForwardEvent(eventId: EventId) = lambdaError()
override fun viewInTimeline(eventId: EventId) = lambdaError()
override fun forwardEvent(eventId: EventId) = lambdaError()
}
val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
.avatar(

4
libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectNode.kt
View file

@ -42,7 +42,7 @@ class RoomSelectNode(
callbacks.forEach { it.onCancel() }
}
private fun onSubmit(roomIds: List<RoomId>) {
private fun onRoomSelected(roomIds: List<RoomId>) {
callbacks.forEach { it.onRoomSelected(roomIds) }
}
@ -52,7 +52,7 @@ class RoomSelectNode(
RoomSelectView(
state = state,
onDismiss = ::onDismiss,
onSubmit = ::onSubmit,
onSubmit = ::onRoomSelected,
modifier = modifier
)
}

2
libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/NotificationTroubleShootEntryPoint.kt
View file

@ -22,6 +22,6 @@ interface NotificationTroubleShootEntryPoint : FeatureEntryPoint {
interface Callback : Plugin {
fun onDone()
fun openIgnoredUsers()
fun navigateToBlockedUsers()
}
}

2
libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/PushHistoryEntryPoint.kt
View file

@ -24,6 +24,6 @@ interface PushHistoryEntryPoint : FeatureEntryPoint {
interface Callback : Plugin {
fun onDone()
fun navigateTo(roomId: RoomId, eventId: EventId)
fun navigateToEvent(roomId: RoomId, eventId: EventId)
}
}

2
libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt
View file

@ -43,7 +43,7 @@ class TroubleshootNotificationsNode(
override fun openIgnoredUsers() {
plugins<NotificationTroubleShootEntryPoint.Callback>().forEach {
it.openIgnoredUsers()
it.navigateToBlockedUsers()
}
}

2
libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryNode.kt
View file

@ -39,7 +39,7 @@ class PushHistoryNode(
override fun navigateTo(roomId: RoomId, eventId: EventId) {
plugins<PushHistoryEntryPoint.Callback>().forEach {
it.navigateTo(roomId, eventId)
it.navigateToEvent(roomId, eventId)
}
}

2
libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/DefaultNotificationTroubleShootEntryPointTest.kt
View file

@ -34,7 +34,7 @@ class DefaultNotificationTroubleShootEntryPointTest {
}
val callback = object : NotificationTroubleShootEntryPoint.Callback {
override fun onDone() = lambdaError()
override fun openIgnoredUsers() = lambdaError()
override fun navigateToBlockedUsers() = lambdaError()
}
val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
.callback(callback)

2
libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/DefaultPushHistoryEntryPointTest.kt
View file

@ -46,7 +46,7 @@ class DefaultPushHistoryEntryPointTest {
}
val callback = object : PushHistoryEntryPoint.Callback {
override fun onDone() = lambdaError()
override fun navigateTo(roomId: RoomId, eventId: EventId) = lambdaError()
override fun navigateToEvent(roomId: RoomId, eventId: EventId) = lambdaError()
}
val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
.callback(callback)