TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-08 00:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source
This commit is contained in:
0x330a
2023-09-28 14:01:58 +10:00
parent 698b853716 e124d442ef
commit 443ddfa370
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/res/layout/view_visible_message_content.xml
View File

@@ -36,15 +36,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<include layout="@layout/view_voice_message"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:visibility="gone"
android:id="@+id/voiceMessageView"
android:layout_width="160dp"
android:layout_height="36dp"/>
<include layout="@layout/view_open_group_invitation"
tools:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
@@ -75,6 +66,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<include layout="@layout/view_voice_message"
app:layout_constraintTop_toBottomOf="@id/quoteView"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:visibility="gone"
android:id="@+id/voiceMessageView"
android:layout_width="160dp"
android:layout_height="36dp"/>
<include layout="@layout/view_link_preview"
app:layout_constraintTop_toBottomOf="@+id/quoteView"
app:layout_constraintStart_toStartOf="parent"