From 9dccc398b481121ef7b9c4bcbb572cafbfee8eb3 Mon Sep 17 00:00:00 2001 From: NIkita Fedrunov Date: Wed, 2 Feb 2022 10:45:43 +0100 Subject: [PATCH 1/3] space and room card layout changed in explore rooms, space invite dialog, room invite dialog --- .../features/matrixto/SpaceCardRenderer.kt | 5 ++- .../spaces/explore/SpaceDirectoryFragment.kt | 2 +- .../spaces/invite/SpaceInviteBottomSheet.kt | 2 +- .../fragment_matrix_to_room_space_card.xml | 31 ++++++++++++------- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt index c56481d3f2..2f71089a39 100644 --- a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt @@ -41,7 +41,8 @@ class SpaceCardRenderer @Inject constructor( fun render(spaceSummary: RoomSummary?, peopleYouKnow: List, matrixLinkCallback: TimelineEventController.UrlClickCallback?, - inCard: FragmentMatrixToRoomSpaceCardBinding) { + inCard: FragmentMatrixToRoomSpaceCardBinding, + showDescription: Boolean) { if (spaceSummary == null) { inCard.matrixToCardContentVisibility.isVisible = false inCard.matrixToCardButtonLoading.isVisible = true @@ -70,6 +71,8 @@ class SpaceCardRenderer @Inject constructor( inCard.matrixToMemberPills.isVisible = false } + inCard.matrixToCardDescText.isVisible = showDescription + renderPeopleYouKnow(inCard, peopleYouKnow.map { it.toMatrixItem() }) } inCard.matrixToCardDescText.movementMethod = createLinkMovementMethod(object : TimelineEventController.UrlClickCallback { diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt index bbf6ac79ca..955fedd7dc 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt @@ -170,7 +170,7 @@ class SpaceDirectoryFragment @Inject constructor( ?: getString(R.string.space_explore_activity_title) } - spaceCardRenderer.render(state.currentRootSummary, emptyList(), this, views.spaceCard) + spaceCardRenderer.render(state.currentRootSummary, emptyList(), this, views.spaceCard, showDescription = false) views.addOrCreateChatRoomButton.isVisible = state.canAddRooms } diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt index 815175c977..91cb6194b1 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt @@ -118,7 +118,7 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment @@ -19,11 +19,9 @@ android:layout_width="60dp" android:layout_height="60dp" android:layout_marginTop="20dp" - android:importantForAccessibility="no" android:elevation="4dp" + android:importantForAccessibility="no" android:transitionName="profile" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:src="@sample/room_round_avatars" /> @@ -31,21 +29,23 @@ + + + app:layout_constraintTop_toBottomOf="@id/header_barrier"> Date: Wed, 2 Feb 2022 10:51:25 +0100 Subject: [PATCH 2/3] changelog added --- changelog.d/4304.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4304.misc diff --git a/changelog.d/4304.misc b/changelog.d/4304.misc new file mode 100644 index 0000000000..7fb6f2ecb0 --- /dev/null +++ b/changelog.d/4304.misc @@ -0,0 +1 @@ +Changed layout for space card and room card used at "explore room" screen and space/room invite dialogs \ No newline at end of file From c64c204878aa4ef360a918a5347cb96562967653 Mon Sep 17 00:00:00 2001 From: NIkita Fedrunov Date: Wed, 2 Feb 2022 15:19:48 +0100 Subject: [PATCH 3/3] code quality changes --- .../main/res/layout/fragment_matrix_to_room_space_card.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml index 5df0f5720e..9f9bd2f58f 100644 --- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml +++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml @@ -67,7 +67,7 @@ android:importantForAccessibility="no" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/matrixToAccessText" - app:layout_constraintStart_toStartOf="@+id/matrixToCardNameText" + app:layout_constraintStart_toStartOf="@id/matrixToCardNameText" app:layout_constraintTop_toTopOf="@id/matrixToAccessText" app:tint="?vctr_content_secondary" tools:ignore="MissingPrefix" @@ -92,7 +92,7 @@ tools:visibility="visible" /> + app:layout_constraintTop_toBottomOf="@id/matrixToHeaderBarrier">