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

Merge pull request #5189 from vector-im/arb/issues/4640 

#4640 : The notification badge jumps around
This commit is contained in:
Adam Brown 2022-02-11 14:18:41 +00:00 committed by GitHub
parent f1376eac82 85414fa92e
commit ea13f1c879
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4640.bugfix Normal file
View File

@ -0,0 +1 @@
Right align the notifications badge in the rooms list (and DMs) so that it's always in a consistent place on the screen.

6
library/ui-styles/src/main/res/values/colors.xml
View File

@ -58,9 +58,9 @@
<!-- Other colors, which are not in the palette -->
<attr name="vctr_unread_room_badge" format="color" />
<color name="vctr_unread_room_badge_light">#FF61708B</color>
<color name="vctr_unread_room_badge_dark">#FF61708B</color>
<color name="vctr_unread_room_badge_black">#FF61708B</color>
<color name="vctr_unread_room_badge_light">@color/palette_gray_200</color>
<color name="vctr_unread_room_badge_dark">@color/palette_gray_250</color>
<color name="vctr_unread_room_badge_black">@color/palette_gray_250</color>
<attr name="vctr_fab_label_bg" format="color" />
<color name="vctr_fab_label_bg_light">@android:color/white</color>

5
vector/src/main/res/layout/item_room.xml
View File

@ -165,7 +165,6 @@
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/roomNameView"
app:layout_constraintEnd_toStartOf="@id/roomLastEventTimeView"
app:layout_constraintStart_toEndOf="@id/roomDraftBadge"
app:layout_constraintTop_toTopOf="@id/roomNameView"
tools:background="@drawable/bg_unread_highlight"
tools:text="4"
@ -190,9 +189,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginEnd="8dp"
android:textAlignment="viewStart"
android:ellipsize="end"
android:maxLines="2"
android:textAlignment="viewStart"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/roomNameView"
@ -203,12 +202,12 @@
android:id="@+id/roomTypingView"
style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp"
android:textAlignment="viewStart"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="2"
android:textAlignment="viewStart"
android:textColor="?colorPrimary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"