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

Do some renaming, since it can now also be room avatar.

Browse source
This commit is contained in:
Benoit Marty 2023-12-14 15:13:10 +01:00
parent e4ba9c1d5a
commit cbd045aa94
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
View file

@ -34,7 +34,7 @@ import io.element.android.features.roomdetails.impl.edit.RoomDetailsEditNode
import io.element.android.features.roomdetails.impl.invite.RoomInviteMembersNode import io.element.android.features.roomdetails.impl.invite.RoomInviteMembersNode
import io.element.android.features.roomdetails.impl.members.RoomMemberListNode import io.element.android.features.roomdetails.impl.members.RoomMemberListNode
import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsNode import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsNode
import io.element.android.features.roomdetails.impl.members.details.avatar.RoomMemberAvatarPreviewNode import io.element.android.features.roomdetails.impl.members.details.avatar.AvatarPreviewNode
import io.element.android.features.roomdetails.impl.notificationsettings.RoomNotificationSettingsNode import io.element.android.features.roomdetails.impl.notificationsettings.RoomNotificationSettingsNode
import io.element.android.libraries.architecture.BackstackNode import io.element.android.libraries.architecture.BackstackNode
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
@ -87,7 +87,7 @@ class RoomDetailsFlowNode @AssistedInject constructor(
data class RoomMemberDetails(val roomMemberId: UserId) : NavTarget data class RoomMemberDetails(val roomMemberId: UserId) : NavTarget
@Parcelize @Parcelize
data class MemberAvatarPreview(val userName: String, val avatarUrl: String) : NavTarget data class AvatarPreview(val userName: String, val avatarUrl: String) : NavTarget
} }
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node { override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@ -111,7 +111,7 @@ class RoomDetailsFlowNode @AssistedInject constructor(
} }
override fun openAvatarPreview(username: String, url: String) { override fun openAvatarPreview(username: String, url: String) {
backstack.push(NavTarget.MemberAvatarPreview(username, url)) backstack.push(NavTarget.AvatarPreview(username, url))
} }
} }
createNode<RoomDetailsNode>(buildContext, listOf(roomDetailsCallback)) createNode<RoomDetailsNode>(buildContext, listOf(roomDetailsCallback))
@ -151,7 +151,7 @@ class RoomDetailsFlowNode @AssistedInject constructor(
is NavTarget.RoomMemberDetails -> { is NavTarget.RoomMemberDetails -> {
val callback = object : RoomMemberDetailsNode.Callback { val callback = object : RoomMemberDetailsNode.Callback {
override fun openAvatarPreview(username: String, avatarUrl: String) { override fun openAvatarPreview(username: String, avatarUrl: String) {
backstack.push(NavTarget.MemberAvatarPreview(username, avatarUrl)) backstack.push(NavTarget.AvatarPreview(username, avatarUrl))
} }
override fun onStartDM(roomId: RoomId) { override fun onStartDM(roomId: RoomId) {
@ -161,7 +161,7 @@ class RoomDetailsFlowNode @AssistedInject constructor(
val plugins = listOf(RoomMemberDetailsNode.RoomMemberDetailsInput(navTarget.roomMemberId), callback) val plugins = listOf(RoomMemberDetailsNode.RoomMemberDetailsInput(navTarget.roomMemberId), callback)
createNode<RoomMemberDetailsNode>(buildContext, plugins) createNode<RoomMemberDetailsNode>(buildContext, plugins)
} }
is NavTarget.MemberAvatarPreview -> { is NavTarget.AvatarPreview -> {
// We need to fake the MimeType here for the viewer to work. // We need to fake the MimeType here for the viewer to work.
val mimeType = MimeTypes.Images val mimeType = MimeTypes.Images
val input = MediaViewerNode.Inputs( val input = MediaViewerNode.Inputs(
@ -176,7 +176,7 @@ class RoomDetailsFlowNode @AssistedInject constructor(
canDownload = false, canDownload = false,
canShare = false, canShare = false,
) )
createNode<RoomMemberAvatarPreviewNode>(buildContext, listOf(input)) createNode<AvatarPreviewNode>(buildContext, listOf(input))
} }
} }
} }

2
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/avatar/RoomMemberAvatarPreviewNode.kt → features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/avatar/AvatarPreviewNode.kt
View file

@ -26,7 +26,7 @@ import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerNode
import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerPresenter import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerPresenter
@ContributesNode(RoomScope::class) @ContributesNode(RoomScope::class)
class RoomMemberAvatarPreviewNode @AssistedInject constructor( class AvatarPreviewNode @AssistedInject constructor(
@Assisted buildContext: BuildContext, @Assisted buildContext: BuildContext,
@Assisted plugins: List<Plugin>, @Assisted plugins: List<Plugin>,
presenterFactory: MediaViewerPresenter.Factory, presenterFactory: MediaViewerPresenter.Factory,