From 20749e04cb9388b444bdbf7274cecc36e1bfc397 Mon Sep 17 00:00:00 2001 From: Maxime Naturel Date: Wed, 9 Feb 2022 11:26:55 +0100 Subject: [PATCH] Fix coding style --- .../home/room/list/RoomListSectionBuilderSpace.kt | 5 ++++- vector/src/main/res/layout/item_room_category.xml | 10 ++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt index d3922843ac..6726243996 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt @@ -397,7 +397,10 @@ class RoomListSectionBuilderSpace( .launchIn(viewModelScope) val itemCountFlow = livePagedList.asFlow() - .flatMapLatest { session.getRoomCountFlow(roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())) } + .flatMapLatest { + val queryParams = roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId()) + session.getRoomCountFlow(queryParams) + } sections.add( RoomsSection( diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml index a09bec7883..14b9c0fb84 100644 --- a/vector/src/main/res/layout/item_room_category.xml +++ b/vector/src/main/res/layout/item_room_category.xml @@ -23,7 +23,6 @@ android:maxLines="1" android:textAllCaps="true" android:textColor="?vctr_content_primary" - android:textStyle="normal" app:layout_constraintEnd_toStartOf="@id/roomCategoryCounterView" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="packed" @@ -43,12 +42,11 @@ android:gravity="center_vertical" android:maxLines="1" android:textColor="?vctr_content_secondary" - android:textStyle="normal" app:drawableTint="?vctr_content_secondary" - app:layout_constraintBottom_toBottomOf="@+id/roomCategoryTitleView" + app:layout_constraintBottom_toBottomOf="@id/roomCategoryTitleView" app:layout_constraintEnd_toStartOf="@id/roomCategoryUnreadCounterBadgeView" app:layout_constraintStart_toEndOf="@id/roomCategoryTitleView" - app:layout_constraintTop_toTopOf="@+id/roomCategoryTitleView" + app:layout_constraintTop_toTopOf="@id/roomCategoryTitleView" app:layout_constraintWidth="wrap_content_constrained" tools:drawableEnd="@drawable/ic_expand_more" tools:text="14" /> @@ -63,9 +61,9 @@ android:minHeight="16dp" android:paddingHorizontal="4dp" android:textColor="?colorOnError" - app:layout_constraintBottom_toBottomOf="@+id/roomCategoryTitleView" + app:layout_constraintBottom_toBottomOf="@id/roomCategoryTitleView" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/roomCategoryTitleView" + app:layout_constraintTop_toTopOf="@id/roomCategoryTitleView" tools:background="@drawable/bg_unread_highlight" tools:text="24" />