From a043ee6db656c0c748526b0afaf3da31d0fb76b8 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 18 Jun 2018 15:05:31 +0200 Subject: [PATCH] show jid in group details --- .../ui/ConferenceDetailsActivity.java | 3 +- src/main/res/layout/activity_muc_details.xml | 41 +++++++++++-------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 35ef2327c..b67a132f5 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -531,6 +531,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers account = mConversation.getAccount().getJid().asBareJid().toString(); } this.binding.detailsAccount.setText(getString(R.string.using_account, account)); + this.binding.jid.setText(mConversation.getJid().asBareJid().toEscapedString()); this.binding.yourPhoto.setImageBitmap(avatarService().get(mConversation, getPixel(72))); this.binding.mucTitle.setText(mucOptions.getName()); this.binding.mucSubject.setText(mucOptions.getSubject()); @@ -554,7 +555,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers if (self.getAffiliation().ranks(MucOptions.Affiliation.OWNER)) { this.binding.changeConferenceButton.setVisibility(View.VISIBLE); } else { - this.binding.changeConferenceButton.setVisibility(View.GONE); + this.binding.changeConferenceButton.setVisibility(View.INVISIBLE); } } else { this.binding.mucMoreDetails.setVisibility(View.GONE); diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 34e42fe89..fa2dfc53c 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -45,16 +45,16 @@ android:id="@+id/your_photo" android:layout_width="72dp" android:layout_height="72dp" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" app:riv_corner_radius="2dp"/> + android:paddingStart="@dimen/avatar_item_distance"> @@ -112,7 +112,7 @@ style="?android:attr/buttonStyleSmall" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_gravity="center_horizontal" android:alpha="?attr/icon_alpha" @@ -145,12 +145,19 @@ android:id="@+id/muc_info_mam" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" + android:layout_gravity="end" + android:paddingStart="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1"/> + @@ -197,7 +204,7 @@ android:id="@+id/edit_nick_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:alpha="?attr/icon_alpha" android:background="?attr/selectableItemBackgroundBorderless" @@ -213,9 +220,9 @@ android:id="@+id/notification_status_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/notification_status_button" + android:layout_toStartOf="@+id/notification_status_button" android:text="@string/notify_on_all_messages" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> @@ -225,7 +232,7 @@ style="?android:attr/buttonStyleSmall" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_gravity="center_horizontal" android:alpha="?attr/icon_alpha" @@ -238,7 +245,7 @@ android:id="@+id/details_account" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="end" android:layout_marginTop="32dp" android:text="@string/using_account" android:textAppearance="@style/TextAppearance.Conversations.Caption"/>