@@ -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);
@@ -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"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_toRightOf="@+id/your_photo"
+ android:layout_toEndOf="@+id/your_photo"
android:orientation="vertical"
- android:paddingLeft="@dimen/avatar_item_distance">
+ android:paddingStart="@dimen/avatar_item_distance">
<RelativeLayout
android:layout_width="match_parent"
@@ -65,16 +65,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/edit_muc_name_button"
+ android:layout_alignParentStart="true"
+ android:layout_toStartOf="@+id/edit_muc_name_button"
android:textAppearance="@style/TextAppearance.Conversations.Title"/>
<TextView
android:id="@+id/muc_subject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_below="@+id/muc_title"
- android:layout_toLeftOf="@+id/edit_muc_name_button"
+ android:layout_toStartOf="@+id/edit_muc_name_button"
android:textAppearance="@style/TextAppearance.Conversations.Subhead"/>
<ImageButton
@@ -100,9 +100,9 @@
android:id="@+id/muc_conference_type"
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/change_conference_button"
+ android:layout_toStartOf="@+id/change_conference_button"
android:text="@string/private_conference"
android:textAppearance="@style/TextAppearance.Conversations.Body1"
/>
@@ -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"/>
</TableRow>
</TableLayout>
+ <TextView
+ android:id="@+id/jid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:layout_marginTop="32dp"
+ android:textAppearance="@style/TextAppearance.Conversations.Caption"/>
</LinearLayout>
</android.support.v7.widget.CardView>
@@ -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"/>