From ad49b4513ce6206f76238919286e02f0b3e0009e Mon Sep 17 00:00:00 2001 From: ericdecanini Date: Mon, 5 Sep 2022 18:07:22 +0200 Subject: [PATCH] Fixes recents background color not matching app bar --- .../room/list/home/recent/RecentRoomCarouselController.kt | 6 ++++++ vector/src/main/res/layout/item_recent_room.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt index ebec912779..608a2f3484 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt @@ -23,6 +23,8 @@ import com.airbnb.epoxy.CarouselModelBuilder import com.airbnb.epoxy.EpoxyController import com.airbnb.epoxy.EpoxyModel import com.airbnb.epoxy.carousel +import com.google.android.material.color.MaterialColors +import im.vector.app.R import im.vector.app.features.home.AvatarRenderer import im.vector.app.features.home.room.list.RoomListListener import org.matrix.android.sdk.api.session.room.model.RoomSummary @@ -66,6 +68,10 @@ class RecentRoomCarouselController @Inject constructor( 0, host.itemSpacing) ) + onBind { _, view, _ -> + val colorSurface = MaterialColors.getColor(view, R.attr.colorSurface) + view.setBackgroundColor(colorSurface) + } withModelsFrom(data) { roomSummary -> val onClick = host.listener?.let { it::onRoomClicked } val onLongClick = host.listener?.let { it::onRoomLongClicked } diff --git a/vector/src/main/res/layout/item_recent_room.xml b/vector/src/main/res/layout/item_recent_room.xml index 8e17707ff3..56ed3c40c0 100644 --- a/vector/src/main/res/layout/item_recent_room.xml +++ b/vector/src/main/res/layout/item_recent_room.xml @@ -5,7 +5,7 @@ android:id="@+id/recentRoot" android:layout_width="60dp" android:layout_height="wrap_content" - android:background="?android:colorBackground" + android:background="?colorSurface" android:clickable="true" android:focusable="true" android:foreground="?attr/selectableItemBackground"