TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-21 06:48:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Signal 4.41.0

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-07 16:48:54 +10:00
parent 781a8500df 56c17e32f1
commit 1822e87f7c
584 changed files with 9504 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/layout/conversation_item_received.xml
View File

@@ -130,6 +130,12 @@
android:layout_height="wrap_content"
android:layout="@layout/conversation_item_received_thumbnail" />
<ViewStub
android:id="@+id/sticker_view_stub"
android:layout_width="@dimen/media_bubble_sticker_dimens"
android:layout_height="@dimen/media_bubble_sticker_dimens"
android:layout="@layout/conversation_item_received_sticker" />
<ViewStub
android:id="@+id/link_preview_stub"
android:layout_width="match_parent"
@@ -186,6 +192,19 @@
app:footer_text_color="?conversation_item_received_text_secondary_color"
app:footer_icon_color="?conversation_item_received_text_secondary_color"/>
<org.thoughtcrime.securesms.components.ConversationItemFooter
android:id="@+id/conversation_item_sticker_footer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:clipChildren="false"
android:clipToPadding="false"
android:visibility="gone"
app:footer_text_color="?conversation_sticker_footer_text_color"
app:footer_icon_color="?conversation_sticker_footer_icon_color"/>
</LinearLayout>
<org.thoughtcrime.securesms.loki.FriendRequestView