From f0fb6698e4bbf747fabda10acc00dfc66dc0b886 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 10 Dec 2024 08:51:43 +0100 Subject: [PATCH] Rename onDone to onBackClick. --- .../features/roomdetails/impl/RoomDetailsFlowNode.kt | 2 +- .../libraries/mediaviewer/api/MediaGalleryEntryPoint.kt | 2 +- .../mediaviewer/impl/gallery/MediaGalleryNode.kt | 8 ++++---- .../mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt index cf1443fc8b..f89953263c 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt @@ -243,7 +243,7 @@ class RoomDetailsFlowNode @AssistedInject constructor( } is NavTarget.MediaGallery -> { val callback = object : MediaGalleryEntryPoint.Callback { - override fun onDone() { + override fun onBackClick() { backstack.pop() } diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt index e8b438b642..a26bb18915 100644 --- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt +++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt @@ -22,7 +22,7 @@ interface MediaGalleryEntryPoint : FeatureEntryPoint { } interface Callback : Plugin { - fun onDone() + fun onBackClick() fun onViewInTimeline(eventId: EventId) } } diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt index 4ec91570ef..ccea1a130e 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt @@ -31,14 +31,14 @@ class MediaGalleryNode @AssistedInject constructor( ) interface Callback : Plugin { - fun onDone() + fun onBackClick() fun onItemClick(item: MediaItem.Event) fun onViewInTimeline(eventId: EventId) } - private fun onDone() { + private fun onBackClick() { plugins().forEach { - it.onDone() + it.onBackClick() } } @@ -59,7 +59,7 @@ class MediaGalleryNode @AssistedInject constructor( val state = presenter.present() MediaGalleryView( state = state, - onBackClick = ::onDone, + onBackClick = ::onBackClick, onItemClick = ::onItemClick, modifier = modifier, ) diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt index 1476cef64a..4f5272b01b 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt @@ -67,9 +67,9 @@ class MediaGalleryRootNode @AssistedInject constructor( ) : NavTarget } - private fun onDone() { + private fun onBackClick() { plugins().forEach { - it.onDone() + it.onBackClick() } } @@ -83,8 +83,8 @@ class MediaGalleryRootNode @AssistedInject constructor( return when (navTarget) { NavTarget.Root -> { val callback = object : MediaGalleryNode.Callback { - override fun onDone() { - this@MediaGalleryRootNode.onDone() + override fun onBackClick() { + this@MediaGalleryRootNode.onBackClick() } override fun onViewInTimeline(eventId: EventId) {