From b68343e966293c1e88e761059519dc48f7b94053 Mon Sep 17 00:00:00 2001
From: s4Ne1 <34073970+s4Ne1@users.noreply.github.com>
Date: Fri, 27 Apr 2018 23:22:36 +0200
Subject: Changed activity_muc_details.xml layout: Moved JID TextView etc. to
 upper CardView. (#197)

---
 src/main/res/layout/activity_muc_details.xml | 103 +++++++++++++--------------
 1 file changed, 51 insertions(+), 52 deletions(-)

(limited to 'src/main')

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index d5da934ba..279c4bea7 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -106,6 +106,57 @@
                                 android:src="@drawable/ic_notifications_black_24dp" />
                         </RelativeLayout>
 
+                        <RelativeLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_marginTop="2dp">
+
+                            <com.makeramen.roundedimageview.RoundedImageView
+                                    android:id="@+id/your_photo"
+                                    android:layout_width="72dp"
+                                    android:layout_height="72dp"
+                                    android:layout_alignParentEnd="false"
+                                    android:layout_alignParentLeft="true"
+                                    android:layout_alignParentRight="false"
+                                    android:padding="1dp"
+                                    app:riv_border_color="?attr/color_border"
+                                    app:riv_border_width="1dp"
+                                    app:riv_corner_radius="36dp"/>
+
+                            <LinearLayout
+                                    android:layout_width="fill_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_centerVertical="true"
+                                    android:layout_toRightOf="@+id/your_photo"
+                                    android:orientation="vertical"
+                                    android:paddingLeft="@dimen/avatar_item_distance">
+
+                                <android.support.text.emoji.widget.EmojiTextView
+                                        android:id="@+id/muc_your_nick"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:singleLine="true"
+                                        android:textAppearance="@style/TextAppearance.Conversations.Subhead"/>
+
+                                <TextView
+                                        android:id="@+id/muc_role"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:singleLine="true"
+                                        android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"/>
+                            </LinearLayout>
+
+                            <ImageButton
+                                    android:id="@+id/edit_nick_button"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:alpha="?attr/icon_alpha"
+                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:padding="@dimen/image_button_padding"
+                                    android:src="?attr/icon_edit_body"/>
+                        </RelativeLayout>
                         <TextView
                             android:id="@+id/muc_jabberid"
                             android:layout_width="wrap_content"
@@ -144,58 +195,6 @@
                         android:orientation="vertical"
                         android:padding="@dimen/card_padding_list">
 
-                        <RelativeLayout
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="32dp">
-
-                            <com.makeramen.roundedimageview.RoundedImageView
-                                android:id="@+id/your_photo"
-                                android:layout_width="72dp"
-                                android:layout_height="72dp"
-                                android:layout_alignParentEnd="false"
-                                android:layout_alignParentLeft="true"
-                                android:layout_alignParentRight="false"
-                                android:padding="1dp"
-                                app:riv_border_color="?attr/color_border"
-                                app:riv_border_width="1dp"
-                                app:riv_corner_radius="36dp" />
-
-                            <LinearLayout
-                                android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_centerVertical="true"
-                                android:layout_toRightOf="@+id/your_photo"
-                                android:orientation="vertical"
-                                android:paddingLeft="@dimen/avatar_item_distance">
-
-                                <android.support.text.emoji.widget.EmojiTextView
-                                    android:id="@+id/muc_your_nick"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:singleLine="true"
-                                    android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
-
-                                <TextView
-                                    android:id="@+id/muc_role"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:singleLine="true"
-                                    android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" />
-                            </LinearLayout>
-
-                            <ImageButton
-                                android:id="@+id/edit_nick_button"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentRight="true"
-                                android:layout_centerVertical="true"
-                                android:alpha="?attr/icon_alpha"
-                                android:background="?attr/selectableItemBackgroundBorderless"
-                                android:padding="@dimen/image_button_padding"
-                                android:src="?attr/icon_edit_body" />
-                        </RelativeLayout>
-
                         <LinearLayout
                             android:id="@+id/muc_members"
                             android:layout_width="fill_parent"
-- 
cgit v1.2.3