Fix swapped group title & avatar on rtl layout.

Fixes #12612
fork-5.53.8
Ahmad Alturki 2022-05-25 10:33:53 +03:00 zatwierdzone przez Alex Hart
rodzic 5dba1067d6
commit 3ec55b24f8
1 zmienionych plików z 40 dodań i 33 usunięć

Wyświetl plik

@ -27,45 +27,52 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_arrow_left_24"> app:navigationIcon="@drawable/ic_arrow_left_24">
<FrameLayout <LinearLayout
android:id="@+id/toolbar_avatar_container"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="16dp" android:gravity="start">
android:alpha="0"
android:translationY="56dp"
tools:alpha="1"
tools:translationY="0dp">
<org.thoughtcrime.securesms.components.AvatarImageView <FrameLayout
android:id="@+id/toolbar_avatar" android:id="@+id/toolbar_avatar_container"
android:layout_width="36dp" android:layout_width="wrap_content"
android:layout_height="36dp" android:layout_height="wrap_content"
app:fallbackImageSize="small" /> android:alpha="0"
android:translationY="56dp"
tools:alpha="1"
tools:translationY="0dp">
<org.thoughtcrime.securesms.badges.BadgeImageView <org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/toolbar_badge" android:id="@+id/toolbar_avatar"
android:layout_width="16dp" android:layout_width="36dp"
android:layout_height="16dp" android:layout_height="36dp"
android:layout_marginStart="20dp" app:fallbackImageSize="small" />
android:layout_marginTop="23dp"
app:badge_size="small" />
</FrameLayout> <org.thoughtcrime.securesms.badges.BadgeImageView
android:id="@+id/toolbar_badge"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="20dp"
android:layout_marginTop="23dp"
app:badge_size="small" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView </FrameLayout>
android:id="@+id/toolbar_title"
android:layout_width="wrap_content" <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:layout_height="wrap_content" android:id="@+id/toolbar_title"
android:alpha="0" android:layout_width="wrap_content"
android:ellipsize="end" android:layout_height="match_parent"
android:gravity="center_vertical" android:layout_marginStart="16dp"
android:maxLines="1" android:alpha="0"
android:textAppearance="@style/Signal.Text.Title" android:ellipsize="end"
android:translationY="56dp" android:gravity="center_vertical"
tools:alpha="1" android:maxLines="1"
tools:text="Miles Morales" android:textAppearance="@style/Signal.Text.Title"
tools:translationY="0dp" /> android:translationY="56dp"
tools:alpha="1"
tools:text="Miles Morales"
tools:translationY="0dp" />
</LinearLayout>
</org.thoughtcrime.securesms.util.views.DarkOverflowToolbar> </org.thoughtcrime.securesms.util.views.DarkOverflowToolbar>