Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix story group replies layout in RTL.

Browse Source
This commit is contained in:
Cody Henthorne
2023-08-31 15:09:15 -04:00
committed by Nicholas Tinsley
parent a3e36d2453
commit 153d3ad388
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/res/layout/stories_group_text_reply_item.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
tools:viewBindingIgnore="true"
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"
@@ -10,7 +9,8 @@
android:clipToPadding="false" android:clipToPadding="false"
android:paddingHorizontal="8dp" android:paddingHorizontal="8dp"
android:paddingTop="6dp" android:paddingTop="6dp"
android:paddingBottom="6dp"> android:paddingBottom="6dp"
tools:viewBindingIgnore="true">
<org.thoughtcrime.securesms.components.AvatarImageView <org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/avatar" android:id="@+id/avatar"
@@ -18,22 +18,14 @@
android:layout_height="28dp" android:layout_height="28dp"
app:fallbackImageSize="small" app:fallbackImageSize="small"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
tools:src="@tools:sample/avatars" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/bubble_start_barrier"
android:layout_width="1dp"
android:layout_height="1dp"
app:barrierDirection="end"
app:barrierMargin="8dp"
app:constraint_referenced_ids="avatar" />
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
android:id="@+id/bubble_end_barrier" android:id="@+id/bubble_end_barrier"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="1dp" android:layout_height="1dp"
app:barrierDirection="end" app:barrierDirection="end"
app:barrierMargin="12dp"
app:constraint_referenced_ids="viewed_at,viewed_at_below,delivery_status,name,body" /> app:constraint_referenced_ids="viewed_at,viewed_at_below,delivery_status,name,body" />
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
@@ -41,8 +33,7 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="1dp" android:layout_height="1dp"
app:barrierDirection="start" app:barrierDirection="start"
app:barrierMargin="-8dp" app:constraint_referenced_ids="alert_view" />
app:constraint_referenced_ids="alert_view,spacer" />
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
android:id="@+id/viewed_at_end_barrier" android:id="@+id/viewed_at_end_barrier"
@@ -64,10 +55,11 @@
android:id="@+id/bubble" android:id="@+id/bubble"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_surface_variant_18" android:background="@drawable/rounded_rectangle_surface_variant_18"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/bubble_end_barrier" app:layout_constraintEnd_toEndOf="@+id/bubble_end_barrier"
app:layout_constraintStart_toStartOf="@+id/bubble_start_barrier" app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<org.thoughtcrime.securesms.components.FromTextView <org.thoughtcrime.securesms.components.FromTextView
@@ -81,7 +73,7 @@
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/message_content_end_barrier" app:layout_constraintEnd_toEndOf="@+id/message_content_end_barrier"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="@+id/bubble_start_barrier" app:layout_constraintStart_toStartOf="@+id/bubble"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="Miles Morales" /> tools:text="Miles Morales" />
@@ -91,17 +83,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginTop="1dp" android:layout_marginTop="1dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="1dp" android:layout_marginBottom="1dp"
android:textAppearance="@style/Signal.Text.Body" android:textAppearance="@style/Signal.Text.Body"
app:emoji_renderSpoilers="true" app:emoji_renderSpoilers="true"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/viewed_at_below" app:layout_constraintBottom_toTopOf="@id/viewed_at_below"
app:layout_constraintEnd_toEndOf="@+id/message_content_end_barrier" app:layout_constraintEnd_toStartOf="@+id/viewed_at"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="@+id/bubble_start_barrier" app:layout_constraintStart_toStartOf="@+id/bubble"
app:layout_constraintTop_toBottomOf="@id/name" app:layout_constraintTop_toBottomOf="@id/name"
app:layout_constrainedWidth="true"
app:layout_goneMarginBottom="7dp" app:layout_goneMarginBottom="7dp"
app:layout_goneMarginEnd="12dp"
app:measureLastLine="true" app:measureLastLine="true"
tools:text="This is a very long message that is supposed to properly wrap when it hits the end." /> tools:text="This is a very long message that is supposed to properly wrap when it hits the end." />
@@ -110,11 +102,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:textAppearance="@style/Signal.Text.Caption" android:textAppearance="@style/Signal.Text.Caption"
android:textColor="@color/transparent_white_60" android:textColor="@color/transparent_white_60"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/message_content_end_barrier"
app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toEndOf="@id/body" app:layout_constraintStart_toEndOf="@id/body"
tools:text="15m" tools:text="15m"
@@ -126,6 +120,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:textAppearance="@style/Signal.Text.Caption" android:textAppearance="@style/Signal.Text.Caption"
android:textColor="@color/transparent_white_60" android:textColor="@color/transparent_white_60"
@@ -134,7 +129,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/message_content_end_barrier" app:layout_constraintEnd_toEndOf="@+id/message_content_end_barrier"
app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toStartOf="@+id/bubble_start_barrier" app:layout_constraintStart_toStartOf="@+id/bubble"
tools:text="Not sent, tap for details" tools:text="Not sent, tap for details"
tools:textColor="@color/signal_text_secondary" /> tools:textColor="@color/signal_text_secondary" />
@@ -156,22 +151,22 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
app:layout_goneMarginEnd="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/reaction" app:layout_constraintEnd_toStartOf="@+id/reaction"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@+id/bubble_end_barrier" app:layout_constraintStart_toEndOf="@+id/bubble_end_barrier"
tools:visibility="gone" /> app:layout_goneMarginEnd="0dp"
tools:visibility="visible" />
<Space <Space
android:id="@+id/spacer" android:id="@+id/spacer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_goneMarginEnd="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/reaction" app:layout_constraintEnd_toStartOf="@+id/reaction"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@+id/bubble_end_barrier" /> app:layout_constraintStart_toEndOf="@+id/bubble_end_barrier"
app:layout_goneMarginEnd="0dp" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView <org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/reaction" android:id="@+id/reaction"