From 2acfb294161bdfea6823734be773f445f9bde388 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 5 May 2021 17:46:58 +0200
Subject: [PATCH] Some cleanup

---
 .../epoxy/profiles/BaseProfileMatrixItem.kt   |  2 ++
 .../features/navigation/DefaultNavigator.kt   | 15 +++++++-------
 .../members/RoomMemberSummaryFilter.kt        |  7 +++----
 .../res/layout/item_profile_matrix_item.xml   | 14 ++++---------
 .../item_profile_matrix_item_progress.xml     | 20 +++++++------------
 5 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
index ccb3bea25a..9f865df372 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
@@ -17,6 +17,7 @@
 package im.vector.app.core.epoxy.profiles
 
 import android.view.View
+import androidx.annotation.CallSuper
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import im.vector.app.core.epoxy.VectorEpoxyModel
@@ -34,6 +35,7 @@ abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder> : VectorEpoxy
     var userEncryptionTrustLevel: RoomEncryptionTrustLevel? = null
     @EpoxyAttribute var clickListener: View.OnClickListener? = null
 
+    @CallSuper
     override fun bind(holder: T) {
         super.bind(holder)
         val bestName = matrixItem.getBestName()
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index c38dccd63b..27de04210a 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -284,21 +284,20 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openCreateDirectRoom(context: Context) {
-        when (val currentGroupingMethod = appStateHandler.getCurrentRoomGroupingMethod()) {
+        val intent = when (val currentGroupingMethod = appStateHandler.getCurrentRoomGroupingMethod()) {
             is RoomGroupingMethod.ByLegacyGroup -> {
-                val intent = CreateDirectRoomActivity.getIntent(context)
-                context.startActivity(intent)
+                CreateDirectRoomActivity.getIntent(context)
             }
             is RoomGroupingMethod.BySpace       -> {
                 if (currentGroupingMethod.spaceSummary != null) {
-                    val intent = SpacePeopleActivity.newIntent(context, currentGroupingMethod.spaceSummary.roomId)
-                    context.startActivity(intent)
+                    SpacePeopleActivity.newIntent(context, currentGroupingMethod.spaceSummary.roomId)
                 } else {
-                    val intent = CreateDirectRoomActivity.getIntent(context)
-                    context.startActivity(intent)
+                    CreateDirectRoomActivity.getIntent(context)
                 }
             }
-        }
+            else                                -> null
+        } ?: return
+        context.startActivity(intent)
     }
 
     override fun openInviteUsersToRoom(context: Context, roomId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
index a9e55f91c3..bd9fb7b941 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
@@ -30,11 +30,10 @@ class RoomMemberSummaryFilter @Inject constructor() : Predicate<RoomMemberSummar
             return true
         }
         // if filter is "Jo Do", it should match "John Doe"
-        return filter.split(" ").fold(true) { acc, s ->
-            acc
-                    && (roomMemberSummary.displayName?.contains(s, ignoreCase = true).orFalse()
+        return filter.split(" ").all {
+            roomMemberSummary.displayName?.contains(it, ignoreCase = true).orFalse()
                     // We should maybe exclude the domain from the userId
-                    || roomMemberSummary.userId.contains(s, ignoreCase = true))
+                    || roomMemberSummary.userId.contains(it, ignoreCase = true)
         }
     }
 }
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 29f537c315..3d9aa0e876 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -37,11 +37,10 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
-        android:drawablePadding="16dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?riotx_text_primary"
@@ -49,19 +48,17 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginStart="0dp"
+        app:layout_goneMarginEnd="80dp"
         tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
-        android:drawablePadding="16dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
@@ -69,13 +66,11 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
-        app:layout_goneMarginStart="0dp"
+        app:layout_goneMarginEnd="8dp"
         tools:text="@sample/matrix.json/data/mxid" />
 
-
     <TextView
         android:id="@+id/matrixItemPowerLevelLabel"
         android:layout_width="wrap_content"
@@ -101,5 +96,4 @@
         app:tint="?riotx_text_secondary"
         tools:ignore="MissingPrefix" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 3376d58598..55e8cecade 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -37,11 +37,10 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:drawablePadding="16dp"
+        android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?riotx_text_primary"
@@ -49,19 +48,17 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginStart="0dp"
+        app:layout_goneMarginEnd="80dp"
         tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:drawablePadding="16dp"
+        android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
@@ -69,10 +66,9 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
-        app:layout_goneMarginStart="0dp"
+        app:layout_goneMarginEnd="8dp"
         tools:text="@sample/matrix.json/data/mxid" />
 
     <ProgressBar
@@ -93,12 +89,10 @@
         android:layout_height="wrap_content"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_arrow_right"
-        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?riotx_text_secondary"
-        tools:ignore="MissingPrefix"
-        tools:visibility="visible" />
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>