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

Merge branch 'ui' of https://github.com/oxen-io/session-android into ui

Browse Source
This commit is contained in:
ryanzhao
2021-06-30 14:55:30 +10:00
parent 956681f00a dea1aeec57
commit 79fd74a157
11 changed files with 95 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/conversation_item_footer.xml
View File

@@ -26,7 +26,7 @@
android:textAllCaps="true"
tools:text="30 mins"/>
<org.thoughtcrime.securesms.components.ExpirationTimerView
<org.thoughtcrime.securesms.conversation.v2.components.ExpirationTimerView
android:id="@+id/footer_expiration_timer"
android:layout_gravity="center_vertical|end"
android:layout_marginStart="6dp"