rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/bma/improve_perf

Browse Source
This commit is contained in:
Benoit Marty 2021-03-17 18:10:14 +01:00 committed by GitHub
commit bab01ea309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -9,6 +9,7 @@ Improvements 🙌:
Bugfix 🐛: Bugfix 🐛:
- Fix regression in UpdateTrustWorker (introduced in 1.1.2) - Fix regression in UpdateTrustWorker (introduced in 1.1.2)
- Timeline : Fix ripple effect on text item and fix background color of separators.
Translations 🗣: Translations 🗣:
- -

9
vector/src/main/res/layout/item_timeline_event_day_separator.xml
View File

@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?riotx_background"
android:padding="8dp"> android:padding="8dp">
<View <View
@ -12,16 +11,16 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="?riotx_header_panel_background" /> android:background="?riotx_list_bottom_sheet_divider_color" />
<TextView <TextView
android:id="@+id/itemDayTextView" android:id="@+id/itemDayTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="?riotx_background" android:background="?android:attr/windowBackground"
android:paddingStart="32dp" android:paddingStart="24dp"
android:paddingEnd="32dp" android:paddingEnd="24dp"
android:textColor="?riotx_header_panel_text_secondary" android:textColor="?riotx_header_panel_text_secondary"
android:textSize="15sp" android:textSize="15sp"
tools:text="@tools:sample/date/day_of_week" /> tools:text="@tools:sample/date/day_of_week" />

1
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
View File

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:addStatesFromChildren="true"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

7
vector/src/main/res/layout/item_timeline_read_marker.xml
View File

@ -2,7 +2,6 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?riotx_background"
android:padding="8dp"> android:padding="8dp">
<View <View
@ -17,10 +16,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="?riotx_background" android:background="?android:attr/windowBackground"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:paddingStart="8dp" android:paddingStart="16dp"
android:paddingEnd="8dp" android:paddingEnd="16dp"
android:text="@string/timeline_unread_messages" android:text="@string/timeline_unread_messages"
android:textColor="@color/notification_accent_color" android:textColor="@color/notification_accent_color"
android:textSize="15sp" /> android:textSize="15sp" />