mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix bad layout of group story text replies.

fork-5.53.8
Alex Hart 2022-04-04 14:41:41 -03:00 zatwierdzone przez Cody Henthorne
rodzic 477698f917
commit 102d58502a
2 zmienionych plików z 77 dodań i 71 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
Wyświetl plik

@ -10,6 +10,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.widget.TextView;
import androidx.annotation.NonNull;
@ -100,6 +101,10 @@ public class EmojiProvider {
}
static @Nullable Drawable getEmojiDrawable(@NonNull Context context, @Nullable CharSequence emoji, boolean jumboEmoji) {
if (TextUtils.isEmpty(emoji)) {
return null;
}
EmojiDrawInfo drawInfo = EmojiSource.getLatest().getEmojiTree().getEmoji(emoji, 0, emoji.length());
return getEmojiDrawable(context, drawInfo, null, jumboEmoji);
}

143
app/src/main/res/layout/stories_group_text_reply_item.xml
Wyświetl plik

@ -6,21 +6,10 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:background="@drawable/selectable_list_item_background"
android:clipToPadding="false"
android:paddingHorizontal="8dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:clipToPadding="false">
<View
android:id="@+id/bubble"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_secondary_18"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/text_barrier"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="parent" />
android:paddingBottom="6dp">
<org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/avatar"
@ -30,73 +19,85 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<org.thoughtcrime.securesms.components.FromTextView
android:id="@+id/name"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="7dp"
android:textAppearance="@style/TextAppearance.Signal.Subtitle.Bold"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="parent"
tools:text="Miles Morales" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginBottom="7dp"
android:maxWidth="242dp"
android:textAppearance="@style/Signal.Text.Body"
app:measureLastLine="true"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_secondary_18"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toBottomOf="@id/name"
tools:text="Cool poster" />
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/viewed_at"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="5dp"
android:textAppearance="@style/Signal.Text.Caption"
android:textColor="@color/transparent_white_60"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/bubble"
app:layout_constraintEnd_toEndOf="@id/bubble"
app:layout_constraintStart_toEndOf="@id/body"
tools:text="15m" />
<org.thoughtcrime.securesms.components.FromTextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="7dp"
android:textAppearance="@style/TextAppearance.Signal.Subtitle.Bold"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Miles Morales" />
<TextView
android:id="@+id/viewed_at_below"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="5dp"
android:textAppearance="@style/Signal.Text.Caption"
android:textColor="@color/transparent_white_60"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/bubble"
app:layout_constraintEnd_toEndOf="@id/bubble"
app:layout_constraintTop_toBottomOf="@id/body"
tools:text="15m" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="1dp"
android:textAppearance="@style/Signal.Text.Body"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/viewed_at_below"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/name"
app:layout_goneMarginBottom="7dp"
app:measureLastLine="true"
tools:text="This is a very long message that is supposed to properly wrap when it hits the end." />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/text_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="end"
app:barrierMargin="6dp"
app:constraint_referenced_ids="name, body, viewed_at" />
<TextView
android:id="@+id/viewed_at"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="5dp"
android:textAppearance="@style/Signal.Text.Caption"
android:textColor="@color/transparent_white_60"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toEndOf="@id/body"
tools:text="15m"
tools:textColor="@color/signal_text_secondary"
tools:visibility="visible" />
<TextView
android:id="@+id/viewed_at_below"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="5dp"
android:textAppearance="@style/Signal.Text.Caption"
android:textColor="@color/transparent_white_60"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/bubble"
app:layout_constraintEnd_toEndOf="@id/bubble"
tools:text="15m"
tools:textColor="@color/signal_text_secondary" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>