From c1260dcb9b343817197f9750acdaac360d658cca Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 22 Jun 2020 17:01:15 +0200
Subject: [PATCH] Update room category as per design

---
 .../features/home/room/list/RoomCategoryItem.kt |  2 +-
 .../home/room/list/RoomSummaryController.kt     |  2 +-
 .../src/main/res/layout/item_room_category.xml  | 17 ++++++++---------
 vector/src/main/res/values/strings.xml          |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
index 130de7278c..7b14ab433c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
@@ -43,7 +43,7 @@ abstract class RoomCategoryItem : VectorEpoxyModel<RoomCategoryItem.Holder>() {
             DrawableCompat.setTint(it, tintColor)
         }
         holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State(unreadNotificationCount, showHighlighted))
-        holder.titleView.setCompoundDrawablesWithIntrinsicBounds(expandedArrowDrawable, null, null, null)
+        holder.titleView.setCompoundDrawablesWithIntrinsicBounds(null, null, expandedArrowDrawable, null)
         holder.titleView.text = title
         holder.rootView.setOnClickListener { listener?.invoke() }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
index c9724bf971..b06cb8a4bb 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
@@ -141,7 +141,7 @@ class RoomSummaryController @Inject constructor(private val stringProvider: Stri
         val showHighlighted = summaries.any { it.highlightCount > 0 }
         roomCategoryItem {
             id(titleRes)
-            title(stringProvider.getString(titleRes).toUpperCase())
+            title(stringProvider.getString(titleRes))
             expanded(isExpanded)
             unreadNotificationCount(unreadCount)
             showHighlighted(showHighlighted)
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index 38c315aff5..519fbb7131 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -4,33 +4,32 @@
     android:id="@+id/roomCategoryRootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?riotx_header_panel_background"
+    android:background="?riotx_background"
     android:clickable="true"
     android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
-    android:paddingTop="@dimen/layout_vertical_margin"
+    android:paddingStart="8dp"
+    android:paddingLeft="8dp"
+    android:paddingTop="12dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:foreground="?attr/selectableItemBackground"
     android:paddingRight="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="4dp">
 
     <im.vector.riotx.core.platform.EllipsizingTextView
         android:id="@+id/roomCategoryTitleView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:drawableStart="@drawable/ic_expand_more_white"
-        android:drawableLeft="@drawable/ic_expand_more_white"
+        tools:drawableEnd="@drawable/ic_expand_more_white"
         android:drawableTint="?riotx_text_secondary"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
         android:textSize="14sp"
+        android:textStyle="bold"
         tools:text="@string/room_participants_header_direct_chats" />
 
     <im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 931a7896eb..479a49b9b9 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -461,7 +461,7 @@
 
     <string name="room_participants_header_admin_tools">ADMIN TOOLS</string>
     <string name="room_participants_header_call">CALL</string>
-    <string name="room_participants_header_direct_chats">DIRECT CHATS</string>
+    <string name="room_participants_header_direct_chats">Direct Messages</string>
     <string name="room_participants_header_devices">SESSIONS</string>
 
     <string name="room_participants_action_invite">Invite</string>