gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3451 from nextcloud/file-caption-bugfix-1

Browse Source 
File Caption Bug Fix - Bubble no longer under the user name
This commit is contained in:
Andy Scherzinger 2023-11-18 21:21:04 +01:00 committed by GitHub
commit e9c8559d61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/res/layout/item_custom_incoming_preview_message.xml
View File

@ -40,6 +40,20 @@
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:contentDescription="@string/avatar" /> android:contentDescription="@string/avatar" />
<androidx.emoji2.widget.EmojiTextView
android:id="@+id/messageAuthor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/messageUserAvatar"
android:layout_marginBottom="4dp"
android:alpha="0.6"
android:textAlignment="viewStart"
android:textColor="@color/no_emphasis_text"
android:textIsSelectable="false"
android:textSize="12sp"
tools:ignore="TextContrastCheck"
tools:text="Jane Doe" />
<com.google.android.flexbox.FlexboxLayout <com.google.android.flexbox.FlexboxLayout
android:id="@+id/incoming_preview_message_bubble" android:id="@+id/incoming_preview_message_bubble"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -47,25 +61,13 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_toEndOf="@id/messageUserAvatar" android:layout_toEndOf="@id/messageUserAvatar"
android:layout_below="@id/messageAuthor"
android:orientation="vertical" android:orientation="vertical"
app:alignContent="stretch" app:alignContent="stretch"
app:alignItems="stretch" app:alignItems="stretch"
app:flexWrap="wrap" app:flexWrap="wrap"
app:justifyContent="flex_end"> app:justifyContent="flex_end">
<androidx.emoji2.widget.EmojiTextView
android:id="@+id/messageAuthor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:alpha="0.6"
android:textAlignment="viewStart"
android:textColor="@color/no_emphasis_text"
android:textIsSelectable="false"
android:textSize="12sp"
tools:ignore="TextContrastCheck"
tools:text="Jane Doe" />
<FrameLayout <FrameLayout
android:id="@+id/preview_container" android:id="@+id/preview_container"
android:layout_width="wrap_content" android:layout_width="wrap_content"