Merge pull request #6795 from vector-im/feature/eric/toolbar-space-name

New App Layout: Space name reflected in toolbar
element-hq · Aug 17, 2022 · b6bcefb · b6bcefb
2 parents 4fedafc + 527bcf2
commit b6bcefb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/changelog.d/6795.wip b/changelog.d/6795.wip
@@ -0,0 +1 @@
+Makes toolbar switch title based on space in New App Layout
diff --git a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
@@ -268,8 +268,7 @@ class NewHomeDetailFragment @Inject constructor(
     }
 
     private fun onSpaceChange(spaceSummary: RoomSummary?) {
-        // Reimplement in next PR
-        println(spaceSummary)
+        views.collapsingToolbar.title = (spaceSummary?.displayName ?: getString(R.string.all_chats))
     }
 
     private fun setupKeysBackupBanner() {

diff --git a/vector/src/main/res/layout/fragment_new_home_detail.xml b/vector/src/main/res/layout/fragment_new_home_detail.xml
@@ -49,6 +49,7 @@
             app:layout_constraintTop_toBottomOf="@id/syncStateView">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
                 style="@style/Widget.Vector.Material3.CollapsingToolbar.Medium"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
@@ -61,7 +62,7 @@
                     android:layout_height="?attr/actionBarSize"
                     android:elevation="0dp"
                     app:layout_collapseMode="pin"
-                    app:title="@string/all_chats">
+                    tools:title="@string/all_chats">
 
                     <ImageView
                         android:id="@+id/avatar"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Makes toolbar switch title based on space in New App Layout