From 4880df35550d233b8002c81b64637d32146605d1 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 30 Sep 2021 11:56:07 +0200
Subject: [PATCH 1/2] Change call to action in filter room when space selected

---
 changelog.d/3048.bugfix                               |  1 +
 .../home/room/filtered/FilteredRoomFooterItem.kt      | 11 +++++++++++
 .../home/room/list/RoomListFooterController.kt        |  2 ++
 .../src/main/res/layout/item_room_filter_footer.xml   |  2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/3048.bugfix

diff --git a/changelog.d/3048.bugfix b/changelog.d/3048.bugfix
new file mode 100644
index 0000000000..81fbe7b65e
--- /dev/null
+++ b/changelog.d/3048.bugfix
@@ -0,0 +1 @@
+Room filter no results bad CTA in space mode when a space selected
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
index 5e45004579..4c163f2f56 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.home.room.filtered
 
 import android.widget.Button
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
@@ -33,11 +34,21 @@ abstract class FilteredRoomFooterItem : VectorEpoxyModel<FilteredRoomFooterItem.
     @EpoxyAttribute
     var currentFilter: String = ""
 
+    @EpoxyAttribute
+    var inSpace: Boolean = false
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.createRoomButton.onClick { listener?.createRoom(currentFilter) }
         holder.createDirectChat.onClick { listener?.createDirectChat() }
         holder.openRoomDirectory.onClick { listener?.openRoomDirectory(currentFilter) }
+
+        holder.openRoomDirectory.setText(
+                if (inSpace) R.string.space_explore_activity_title else R.string.room_filtering_footer_open_room_directory
+        )
+
+        // The explore space screen will have a shortcut to create
+        holder.createRoomButton.isVisible = !inSpace
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt
index 22cd0ae639..00d59f4c37 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt
@@ -24,6 +24,7 @@ import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.home.room.filtered.FilteredRoomFooterItem
 import im.vector.app.features.home.room.filtered.filteredRoomFooterItem
+import im.vector.app.space
 import javax.inject.Inject
 
 class RoomListFooterController @Inject constructor(
@@ -41,6 +42,7 @@ class RoomListFooterController @Inject constructor(
                     id("filter_footer")
                     listener(host.listener)
                     currentFilter(data.roomFilter)
+                    inSpace(data.currentRoomGrouping.invoke()?.space() != null)
                 }
             }
             else                         -> {
diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index 8df6c53032..91790b3811 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -12,6 +12,7 @@
         android:layout_gravity="center"
         android:layout_marginTop="56dp"
         android:text="@string/room_filtering_footer_title"
+        android:layout_marginBottom="@dimen/layout_vertical_margin"
         android:textColor="?vctr_content_secondary" />
 
     <Button
@@ -20,7 +21,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginTop="@dimen/layout_vertical_margin"
         android:text="@string/room_filtering_footer_create_new_room" />
 
     <Button

From f6b672546791e56e9618e2b6ba195bd202b48320 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 4 Oct 2021 09:44:53 +0200
Subject: [PATCH 2/2] Text is always set at runtime now.

---
 vector/src/main/res/layout/item_room_filter_footer.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index 91790b3811..e727f56f41 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
@@ -11,8 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginTop="56dp"
-        android:text="@string/room_filtering_footer_title"
         android:layout_marginBottom="@dimen/layout_vertical_margin"
+        android:text="@string/room_filtering_footer_title"
         android:textColor="?vctr_content_secondary" />
 
     <Button
@@ -31,6 +32,7 @@
         android:layout_gravity="center"
         android:text="@string/room_filtering_footer_create_new_direct_message" />
 
+    <!-- Note: can also be used to open the SpaceExploreActivity-->
     <Button
         android:id="@+id/roomFilterFooterOpenRoomDirectory"
         style="@style/Widget.Vector.Button.Text"
@@ -38,6 +40,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginBottom="@dimen/layout_vertical_margin"
-        android:text="@string/room_filtering_footer_open_room_directory" />
+        tools:text="@string/room_filtering_footer_open_room_directory" />
 
 </LinearLayout>
\ No newline at end of file