From f30eb4af8a45753f655efd309ccb808fbf49d7c9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 May 2021 18:17:58 +0200
Subject: [PATCH] Add checked mark on the current item

---
 .../roomdirectory/picker/RoomDirectoryItem.kt |  7 ++++++
 .../picker/RoomDirectoryPickerController.kt   |  3 ++-
 .../picker/RoomDirectoryPickerFragment.kt     |  5 ++++
 .../main/res/layout/item_room_directory.xml   | 25 ++++++++++++++++---
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt
index 7b2e329b6a..7cf8e538ac 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt
@@ -16,10 +16,12 @@
 
 package im.vector.app.features.roomdirectory.picker
 
+import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
@@ -43,6 +45,9 @@ abstract class RoomDirectoryItem : VectorEpoxyModel<RoomDirectoryItem.Holder>()
     @EpoxyAttribute
     var includeAllNetworks: Boolean = false
 
+    @EpoxyAttribute
+    var checked: Boolean = false
+
     @EpoxyAttribute
     var globalListener: (() -> Unit)? = null
 
@@ -63,6 +68,7 @@ abstract class RoomDirectoryItem : VectorEpoxyModel<RoomDirectoryItem.Holder>()
 
         holder.nameView.text = directoryName
         holder.descriptionView.setTextOrHide(directoryDescription)
+        holder.checkedView.isVisible = checked
     }
 
     class Holder : VectorEpoxyHolder() {
@@ -71,5 +77,6 @@ abstract class RoomDirectoryItem : VectorEpoxyModel<RoomDirectoryItem.Holder>()
         val avatarView by bind<ImageView>(R.id.itemRoomDirectoryAvatar)
         val nameView by bind<TextView>(R.id.itemRoomDirectoryName)
         val descriptionView by bind<TextView>(R.id.itemRoomDirectoryDescription)
+        val checkedView by bind<View>(R.id.itemRoomDirectoryChecked)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
index 4f9d1d0394..c3f461cb46 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
@@ -39,6 +39,7 @@ class RoomDirectoryPickerController @Inject constructor(
         private val roomDirectoryListCreator: RoomDirectoryListCreator
 ) : TypedEpoxyController<RoomDirectoryPickerViewState>() {
 
+    var currentRoomDirectoryData: RoomDirectoryData? = null
     var callback: Callback? = null
 
     private val dividerColor = colorProvider.getColorFromAttribute(R.attr.vctr_list_divider_color)
@@ -105,7 +106,7 @@ class RoomDirectoryPickerController @Inject constructor(
                 }
                 directoryAvatarUrl(roomDirectoryData.avatarUrl)
                 includeAllNetworks(roomDirectoryData.includeAllNetworks)
-
+                checked(roomDirectoryData == host.currentRoomDirectoryData)
                 globalListener {
                     host.callback?.onRoomDirectoryClicked(roomDirectoryData)
                 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
index 7643503d5e..701e8632c4 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
@@ -64,6 +64,11 @@ class RoomDirectoryPickerFragment @Inject constructor(val roomDirectoryPickerVie
 
         sharedActionViewModel = activityViewModelProvider.get(RoomDirectorySharedActionViewModel::class.java)
         setupRecyclerView()
+
+        // Give the current data to our controller. There maybe a better way to do that...
+        withState(viewModel) {
+            roomDirectoryPickerController.currentRoomDirectoryData = it.roomDirectoryData
+        }
     }
 
     override fun onDestroyView() {
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index f7bd3344e4..19a457ec37 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -30,7 +30,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
@@ -38,10 +38,11 @@
         android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryDescription"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/itemRoomDirectoryChecked"
         app:layout_constraintStart_toEndOf="@id/itemRoomDirectoryAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
+        app:layout_goneMarginEnd="@dimen/layout_horizontal_margin"
         tools:text="@tools:sample/lorem/random" />
 
     <TextView
@@ -49,7 +50,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
@@ -57,10 +58,26 @@
         android:textSize="14sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/itemRoomDirectoryChecked"
         app:layout_constraintStart_toEndOf="@id/itemRoomDirectoryAvatar"
         app:layout_constraintTop_toBottomOf="@id/itemRoomDirectoryName"
+        app:layout_goneMarginEnd="@dimen/layout_horizontal_margin"
         tools:text="@string/directory_server_native_rooms"
         tools:visibility="visible" />
 
+    <ImageView
+        android:id="@+id/itemRoomDirectoryChecked"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:contentDescription="@string/avatar"
+        android:padding="8dp"
+        android:src="@drawable/ic_check_on"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file