From b25098c52d4922e11ce556c271c3ebb5393328fe Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 1 Jul 2019 15:24:28 +0200 Subject: [PATCH] Fix issue on invitation: restore background and composer could be opened --- .../features/home/room/detail/RoomDetailFragment.kt | 8 +++++++- vector/src/main/res/layout/fragment_room_detail.xml | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt index 081c83a6..3deda667 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt @@ -81,7 +81,10 @@ import im.vector.riotredesign.features.autocomplete.command.AutocompleteCommandP import im.vector.riotredesign.features.autocomplete.command.CommandAutocompletePolicy import im.vector.riotredesign.features.autocomplete.user.AutocompleteUserPresenter import im.vector.riotredesign.features.command.Command -import im.vector.riotredesign.features.home.* +import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotredesign.features.home.NavigateToRoomInterceptor +import im.vector.riotredesign.features.home.PermalinkHandler +import im.vector.riotredesign.features.home.getColorFromUserId import im.vector.riotredesign.features.home.room.detail.composer.TextComposerActions import im.vector.riotredesign.features.home.room.detail.composer.TextComposerView import im.vector.riotredesign.features.home.room.detail.composer.TextComposerViewModel @@ -509,6 +512,9 @@ class RoomDetailFragment : } else if (summary?.membership == Membership.INVITE && inviter != null) { inviteView.visibility = View.VISIBLE inviteView.render(inviter, VectorInviteView.Mode.LARGE) + + // Intercept click event + inviteView.setOnClickListener { } } else if (state.asyncInviter.complete) { vectorBaseActivity.finish() } diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml index ec9866d7..d1f6f76d 100644 --- a/vector/src/main/res/layout/fragment_room_detail.xml +++ b/vector/src/main/res/layout/fragment_room_detail.xml @@ -93,6 +93,7 @@ android:id="@+id/inviteView" android:layout_width="0dp" android:layout_height="wrap_content" + android:background="?riotx_background" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"