TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 10:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'loki/dev' into action-bar-back-buttons

Browse Source
This commit is contained in:
Anton Chekulaev 2020-09-18 16:55:03 +10:00
commit 14e810ef55
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/message_details_header.xml
View File

@ -155,6 +155,7 @@
<View <View
android:id="@+id/separator" android:id="@+id/separator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_height="1px" android:layout_height="1px"
android:background="?android:dividerHorizontal" /> android:background="?android:dividerHorizontal" />

2
src/org/thoughtcrime/securesms/loki/views/UserView.kt
View File

@ -90,7 +90,7 @@ class UserView : LinearLayout {
actionIndicatorImageView.setImageResource(R.drawable.ic_baseline_edit_24) actionIndicatorImageView.setImageResource(R.drawable.ic_baseline_edit_24)
profilePictureView.glide = glide profilePictureView.glide = glide
profilePictureView.update() profilePictureView.update()
nameTextView.text = getUserDisplayName(address) nameTextView.text = if (user.isGroupRecipient) user.name else getUserDisplayName(address)
when (actionIndicator) { when (actionIndicator) {
ActionIndicator.None -> { ActionIndicator.None -> {
actionIndicatorImageView.visibility = View.GONE actionIndicatorImageView.visibility = View.GONE