From 1bc431198eb97187a448b2d8ff8733204c78b14e Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 16 Mar 2021 20:09:42 +0100 Subject: [PATCH 1/4] Timeline: fix ripple on text item --- .../main/res/layout/item_timeline_event_text_message_stub.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml index 7bdd0dd1e3..42cf24d027 100644 --- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml +++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:addStatesFromChildren="true" android:orientation="vertical"> Date: Tue, 16 Mar 2021 16:44:55 +0100 Subject: [PATCH 2/4] Timeline: fix separators background --- .../main/res/layout/item_timeline_event_day_separator.xml | 8 +++----- vector/src/main/res/layout/item_timeline_read_marker.xml | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml index 74cc63e5be..ca9d84f698 100644 --- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml +++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml @@ -3,7 +3,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?riotx_background" android:padding="8dp"> + android:background="?riotx_list_bottom_sheet_divider_color" /> diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml index e76ffa3d5c..e7471823f2 100644 --- a/vector/src/main/res/layout/item_timeline_read_marker.xml +++ b/vector/src/main/res/layout/item_timeline_read_marker.xml @@ -2,7 +2,6 @@ From 616a46294ce62c1896130a3898c36091cdf80db0 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 16 Mar 2021 20:14:20 +0100 Subject: [PATCH 3/4] Update CHANGES --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 98c7a0351a..1115f41142 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,7 @@ Bugfix 🐛: - Ensure message are decrypted in the room list after a clear cache - Regression: Video will not play upon tap, but only after swipe #2928 - Cross signing now works with servers with an explicit port in the servername + - Timeline : Fix ripple effect on text item and fix background color of separators. Translations 🗣: - From 174e938b5be404e25a68f1a748a67aa6c008f4e1 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 17 Mar 2021 11:44:22 +0100 Subject: [PATCH 4/4] Fix padding layout --- .../src/main/res/layout/item_timeline_event_day_separator.xml | 3 ++- vector/src/main/res/layout/item_timeline_read_marker.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml index ca9d84f698..a721864e5b 100644 --- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml +++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml @@ -19,7 +19,8 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:background="?android:attr/windowBackground" - android:paddingHorizontal="24dp" + android:paddingStart="24dp" + android:paddingEnd="24dp" android:textColor="?riotx_header_panel_text_secondary" android:textSize="15sp" tools:text="@tools:sample/date/day_of_week" /> diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml index e7471823f2..5ce388c90b 100644 --- a/vector/src/main/res/layout/item_timeline_read_marker.xml +++ b/vector/src/main/res/layout/item_timeline_read_marker.xml @@ -18,7 +18,8 @@ android:layout_gravity="center" android:background="?android:attr/windowBackground" android:fontFamily="sans-serif-medium" - android:paddingHorizontal="16dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:text="@string/timeline_unread_messages" android:textColor="@color/notification_accent_color" android:textSize="15sp" />