From dba49933a174fac84188e8d28316a30c266f9c11 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 14 Dec 2023 15:22:31 +0100
Subject: [PATCH] Rename the parameter this it can be a username or a room
 name.

---
 .../features/roomdetails/impl/RoomDetailsFlowNode.kt      | 8 ++++----
 .../android/features/roomdetails/impl/RoomDetailsNode.kt  | 6 +++---
 .../android/features/roomdetails/impl/RoomDetailsView.kt  | 2 +-
 3 files changed, 8 insertions(+), 8 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 adab05262a..2eaab295c4 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
@@ -87,7 +87,7 @@ class RoomDetailsFlowNode @AssistedInject constructor(
         data class RoomMemberDetails(val roomMemberId: UserId) : NavTarget
 
         @Parcelize
-        data class AvatarPreview(val userName: String, val avatarUrl: String) : NavTarget
+        data class AvatarPreview(val name: String, val avatarUrl: String) : NavTarget
     }
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@@ -110,8 +110,8 @@ class RoomDetailsFlowNode @AssistedInject constructor(
                         backstack.push(NavTarget.RoomNotificationSettings(showUserDefinedSettingStyle = false))
                     }
 
-                    override fun openAvatarPreview(username: String, url: String) {
-                        backstack.push(NavTarget.AvatarPreview(username, url))
+                    override fun openAvatarPreview(name: String, url: String) {
+                        backstack.push(NavTarget.AvatarPreview(name, url))
                     }
                 }
                 createNode<RoomDetailsNode>(buildContext, listOf(roomDetailsCallback))
@@ -166,7 +166,7 @@ class RoomDetailsFlowNode @AssistedInject constructor(
                 val mimeType = MimeTypes.Images
                 val input = MediaViewerNode.Inputs(
                     mediaInfo = MediaInfo(
-                        name = navTarget.userName,
+                        name = navTarget.name,
                         mimeType = mimeType,
                         formattedFileSize = "",
                         fileExtension = ""
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
index f3fa9e2645..c656aa4449 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
@@ -52,7 +52,7 @@ class RoomDetailsNode @AssistedInject constructor(
         fun openInviteMembers()
         fun editRoomDetails()
         fun openRoomNotificationSettings()
-        fun openAvatarPreview(username: String, url: String)
+        fun openAvatarPreview(name: String, url: String)
     }
 
     private val callbacks = plugins<Callback>()
@@ -111,8 +111,8 @@ class RoomDetailsNode @AssistedInject constructor(
         callbacks.forEach { it.editRoomDetails() }
     }
 
-    private fun openAvatarPreview(username: String, url: String) {
-        callbacks.forEach { it.openAvatarPreview(username, url) }
+    private fun openAvatarPreview(name: String, url: String) {
+        callbacks.forEach { it.openAvatarPreview(name, url) }
     }
 
     @Composable
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index 042ba2f71e..66455daf90 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -91,7 +91,7 @@ fun RoomDetailsView(
     openRoomMemberList: () -> Unit,
     openRoomNotificationSettings: () -> Unit,
     invitePeople: () -> Unit,
-    openAvatarPreview: (username: String, url: String) -> Unit,
+    openAvatarPreview: (name: String, url: String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     fun onShareMember() {