WIP: set room avatar and slight redesign of group details

*show jid in group details (in advanced mode)

1 files changed, 268 insertions, 206 deletions

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index ac668c70e..015cc2a44 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -34,169 +34,201 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:orientation="vertical"
-                        android:padding="@dimen/card_padding_regular">
+                        android:orientation="vertical">
 
-                        <android.support.text.emoji.widget.EmojiTextView
-                            android:id="@+id/conference_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:paddingBottom="5dp"
-                            android:text="@string/conference_subject"
-                            android:textAlignment="center"
-                            android:textAppearance="@style/TextAppearance.Conversations.Title"
-                            android:textIsSelectable="false"
-                            android:textStyle="bold" />
-
-                        <com.makeramen.roundedimageview.RoundedImageView
-                            android:id="@+id/details_muc_avatar"
-                            android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:adjustViewBounds="true"
-                            android:maxHeight="384dp"
-                            android:maxWidth="384dp"
-                            android:padding="1dp"
-                            android:scaleType="centerCrop"
-                            app:riv_border_color="?attr/color_border"
-                            app:riv_border_width="1dp"
-                            app:riv_corner_radius="@dimen/rounded_image_border"/>
-
-                        <RelativeLayout
-                            android:id="@+id/muc_settings"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content">
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            android:padding="@dimen/card_padding_regular">
 
-                            <TextView
-                                android:id="@+id/muc_conference_type"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentLeft="true"
-                                android:layout_centerVertical="true"
-                                android:layout_toLeftOf="@+id/change_conference_button"
-                                android:text="@string/private_conference"
-                                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-
-                            <ImageButton
-                                android:id="@+id/change_conference_button"
-                                style="?android:attr/buttonStyleSmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentRight="true"
-                                android:layout_centerVertical="true"
-                                android:layout_gravity="center_horizontal"
-                                android:alpha="?attr/icon_alpha"
-                                android:background="?attr/selectableItemBackgroundBorderless"
-                                android:padding="@dimen/image_button_padding"
-                                android:src="?attr/icon_settings" />
-                        </RelativeLayout>
+                            <RelativeLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
 
-                        <RelativeLayout
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content">
+                                <android.support.text.emoji.widget.EmojiTextView
+                                    android:id="@+id/muc_title"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentLeft="true"
+                                    android:layout_toLeftOf="@+id/edit_muc_name_button"
+                                    android:singleLine="true"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Title" />
 
-                            <TextView
-                                android:id="@+id/notification_status_text"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentLeft="true"
-                                android:layout_centerVertical="true"
-                                android:layout_toLeftOf="@+id/notification_status_button"
-                                android:text="@string/notify_on_all_messages"
-                                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-
-                            <ImageButton
-                                android:id="@+id/notification_status_button"
-                                style="?android:attr/buttonStyleSmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentRight="true"
-                                android:layout_centerVertical="true"
-                                android:layout_gravity="center_horizontal"
-                                android:alpha="?attr/icon_alpha"
-                                android:background="?attr/selectableItemBackgroundBorderless"
-                                android:padding="@dimen/image_button_padding"
-                                android:src="@drawable/ic_notifications_black_24dp" />
-                        </RelativeLayout>
+                                <android.support.text.emoji.widget.EmojiTextView
+                                    android:id="@+id/muc_subject"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentLeft="true"
+                                    android:layout_below="@+id/muc_title"
+                                    android:layout_toLeftOf="@+id/edit_muc_name_button"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
 
-                        <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="@dimen/rounded_image_border" />
-
-                            <LinearLayout
-                                android:layout_width="fill_parent"
+                                <TextView
+                                    android:id="@+id/jid"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentLeft="true"
+                                    android:layout_below="@+id/muc_subject"
+                                    android:layout_toLeftOf="@+id/edit_muc_name_button"
+                                    android:text="@string/account_settings_example_jabber_id"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"
+                                    android:textIsSelectable="true"
+                                    android:visibility="gone" />
+
+                                <ImageButton
+                                    android:id="@+id/edit_muc_name_button"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_alignParentTop="true"
+                                    android:alpha="?attr/icon_alpha"
+                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:padding="@dimen/image_button_padding"
+                                    android:src="?attr/icon_edit_body" />
+                            </RelativeLayout>
+
+                            <RelativeLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_centerVertical="true"
-                                android:layout_toRightOf="@+id/your_photo"
+                                android:gravity="center_horizontal"
                                 android:orientation="vertical"
-                                android:paddingLeft="@dimen/avatar_item_distance">
+                                android:paddingTop="@dimen/card_padding_regular">
 
-                                <android.support.text.emoji.widget.EmojiTextView
-                                    android:id="@+id/muc_your_nick"
+                                <com.makeramen.roundedimageview.RoundedImageView
+                                    android:id="@+id/details_muc_avatar"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:singleLine="true"
-                                    android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
+                                    android:adjustViewBounds="true"
+                                    android:maxHeight="384dp"
+                                    android:maxWidth="384dp"
+                                    android:padding="1dp"
+                                    android:scaleType="centerCrop"
+                                    app:riv_border_color="?attr/color_border"
+                                    app:riv_border_width="1dp"
+                                    app:riv_corner_radius="@dimen/rounded_image_border" />
+                            </RelativeLayout>
+
+                            <RelativeLayout
+                                android:id="@+id/muc_settings"
+                                android:layout_width="fill_parent"
+                                android:layout_height="wrap_content">
+
+                                <TextView
+                                    android:id="@+id/muc_conference_type"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentLeft="true"
+                                    android:layout_centerVertical="true"
+                                    android:layout_toLeftOf="@+id/change_conference_button"
+                                    android:text="@string/private_conference"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+                                <ImageButton
+                                    android:id="@+id/change_conference_button"
+                                    style="?android:attr/buttonStyleSmall"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:layout_gravity="center_horizontal"
+                                    android:alpha="?attr/icon_alpha"
+                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:padding="@dimen/image_button_padding"
+                                    android:src="?attr/icon_settings" />
+                            </RelativeLayout>
+
+                            <RelativeLayout
+                                android:layout_width="fill_parent"
+                                android:layout_height="wrap_content">
 
                                 <TextView
-                                    android:id="@+id/muc_role"
+                                    android:id="@+id/notification_status_text"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
+                                    android:layout_alignParentLeft="true"
+                                    android:layout_centerVertical="true"
+                                    android:layout_toLeftOf="@+id/notification_status_button"
+                                    android:text="@string/notify_on_all_messages"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+                                <ImageButton
+                                    android:id="@+id/notification_status_button"
+                                    style="?android:attr/buttonStyleSmall"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:layout_gravity="center_horizontal"
+                                    android:alpha="?attr/icon_alpha"
+                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:padding="@dimen/image_button_padding"
+                                    android:src="@drawable/ic_notifications_black_24dp" />
+                            </RelativeLayout>
+
+                            <RelativeLayout
+                                android:id="@+id/muc_info_more"
+                                android:layout_width="fill_parent"
+                                android:layout_height="wrap_content">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentLeft="true"
+                                    android:layout_centerVertical="true"
+                                    android:layout_toLeftOf="@+id/muc_info_mam"
+                                    android:ellipsize="end"
                                     android:singleLine="true"
-                                    android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" />
-                            </LinearLayout>
+                                    android:text="@string/server_info_mam"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+                                <TextView
+                                    android:id="@+id/muc_info_mam"
+                                    style="?android:attr/buttonStyleSmall"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:layout_gravity="center_horizontal"
+                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:padding="@dimen/image_button_padding"
+                                    android:paddingLeft="4dp"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+                            </RelativeLayout>
+
+                        </LinearLayout>
 
-                            <ImageButton
-                                android:id="@+id/edit_nick_button"
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:padding="@dimen/card_padding_list">
+
+                            <Button
+                                android:id="@+id/destroy"
+                                style="?android:attr/buttonStyleSmall"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="24dp"
+                                android:text="@string/destroy_muc" />
+
+                            <TextView
+                                android:id="@+id/details_account"
                                 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"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="16dp"
-                            android:text="@string/account_settings_example_jabber_id"
-                            android:textAppearance="@style/TextAppearance.Conversations.Title"
-                            android:textIsSelectable="true"
-                            android:visibility="gone" />
-
-                        <TextView
-                            android:id="@+id/details_account"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:layout_marginTop="32dp"
-                            android:text="@string/using_account"
-                            android:textAppearance="@style/TextAppearance.Conversations.Caption"
-                            android:visibility="gone" />
+                                android:layout_gravity="right"
+                                android:layout_marginTop="24dp"
+                                android:text="@string/using_account"
+                                android:textAppearance="@style/TextAppearance.Conversations.Caption"
+                                android:visibility="visible" />
+                        </LinearLayout>
                     </LinearLayout>
                 </android.support.v7.widget.CardView>
 
                 <android.support.v7.widget.CardView
-                    android:id="@+id/muc_more_details"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
@@ -207,67 +239,105 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:padding="@dimen/card_padding_list">
+                        android:orientation="vertical">
 
                         <LinearLayout
-                            android:id="@+id/muc_members"
-                            android:layout_width="fill_parent"
-                            android:layout_height="0dp"
-                            android:layout_weight="1"
-                            android:divider="?android:dividerHorizontal"
-                            android:orientation="vertical"
-                            android:showDividers="middle"></LinearLayout>
-
-                        <Button
-                            android:id="@+id/invite"
-                            style="?android:attr/buttonStyleSmall"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="24dp"
-                            android:text="@string/invite_contact" />
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            android:padding="@dimen/card_padding_regular">
+
+                            <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="@dimen/rounded_image_border" />
+
+                                <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>
 
-                        <Button
-                            android:id="@+id/leave_muc"
-                            style="?android:attr/buttonStyleSmall"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="24dp"
-                            android:text="@string/action_end_conversation_muc" />
+                            android:orientation="vertical"
+                            android:padding="@dimen/card_padding_list">
 
-                        <Button
-                            android:id="@+id/add_contact_button"
-                            style="?android:attr/buttonStyleSmall"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="24dp"
-                            android:text="@string/add_to_contact_list" />
+                            <Button
+                                android:id="@+id/leave_muc"
+                                style="?android:attr/buttonStyleSmall"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="24dp"
+                                android:text="@string/action_end_conversation_muc" />
 
-                        <Button
-                            android:id="@+id/destroy"
-                            style="?android:attr/buttonStyleSmall"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="24dp"
-                            android:text="@string/destroy_muc" />
+                            <Button
+                                android:id="@+id/add_contact_button"
+                                style="?android:attr/buttonStyleSmall"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="24dp"
+                                android:text="@string/add_to_contact_list" />
+
+                        </LinearLayout>
                     </LinearLayout>
                 </android.support.v7.widget.CardView>
 
                 <android.support.v7.widget.CardView
-                    android:id="@+id/muc_info_more"
-                    android:layout_width="fill_parent"
+                    android:id="@+id/muc_more_details"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-
+                    android:orientation="vertical">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -275,33 +345,25 @@
                         android:orientation="vertical"
                         android:padding="@dimen/card_padding_list">
 
-                        <TableLayout
+                        <Button
+                            android:id="@+id/invite"
+                            style="?android:attr/buttonStyleSmall"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:stretchColumns="1">
-
-                            <TableRow
-                                android:layout_width="fill_parent"
-                                android:layout_height="match_parent">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:ellipsize="end"
-                                    android:singleLine="true"
-                                    android:text="@string/server_info_mam"
-                                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginBottom="24dp"
+                            android:text="@string/invite_contact" />
 
-                                <TextView
-                                    android:id="@+id/muc_info_mam"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
-                                    android:paddingLeft="4dp"
-                                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-                            </TableRow>
-                        </TableLayout>
+                        <LinearLayout
+                            android:id="@+id/muc_members"
+                            android:layout_width="fill_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:divider="?android:dividerHorizontal"
+                            android:orientation="vertical"
+                            android:showDividers="middle"></LinearLayout>
                     </LinearLayout>
+
                 </android.support.v7.widget.CardView>
             </LinearLayout>
         </ScrollView>