non functional muc edit button

2 files changed, 69 insertions, 25 deletions

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 7dc1ae3e6..2c1a0e682 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -47,36 +47,79 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content">
 
-                                <android.support.text.emoji.widget.EmojiTextView
-                                    android:id="@+id/muc_title"
+                                <LinearLayout
+                                    android:id="@+id/muc_display"
                                     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" />
+                                    android:layout_alignParentStart="true"
+                                    android:layout_toStartOf="@+id/edit_muc_name_button"
+                                    android:orientation="vertical">
 
-                                <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:autoLink="web"
-                                    android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
+                                    <TextView
+                                        android:id="@+id/muc_title"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textAppearance="@style/TextAppearance.Conversations.Title" />
 
-                                <TextView
-                                    android:id="@+id/jid"
+                                    <TextView
+                                        android:id="@+id/muc_subject"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:autoLink="web"
+                                        android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
+
+                                    <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:text="@string/account_settings_example_jabber_id"
+                                        android:textAppearance="@style/TextAppearance.Conversations.Body1"
+                                        android:textIsSelectable="true"
+                                        android:visibility="gone" />
+
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:id="@+id/muc_editor"
                                     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" />
+                                    android:layout_alignParentStart="true"
+                                    android:layout_toStartOf="@+id/edit_muc_name_button"
+
+                                    android:orientation="vertical"
+                                    android:visibility="gone">
+
+                                    <android.support.design.widget.TextInputLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+                                        app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
+
+                                        <android.support.design.widget.TextInputEditText
+                                            android:id="@+id/muc_edit_title"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="wrap_content"
+                                            android:hint="@string/group_chat_name"
+                                            android:textAppearance="@style/Widget.Conversations.EditText" />
+                                    </android.support.design.widget.TextInputLayout>
+
+                                    <android.support.design.widget.TextInputLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+                                        app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
+
+                                        <android.support.design.widget.TextInputEditText
+                                            android:id="@+id/muc_edit_subject"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="wrap_content"
+                                            android:hint="@string/topic"
+                                            android:textAppearance="@style/Widget.Conversations.EditText" />
+                                    </android.support.design.widget.TextInputLayout>
+
+                                </LinearLayout>
 
                                 <ImageButton
                                     android:id="@+id/edit_muc_name_button"
@@ -101,6 +144,7 @@
                                     android:id="@+id/details_muc_avatar"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
+                                    android:layout_marginEnd="@dimen/avatar_item_distance"
                                     android:adjustViewBounds="true"
                                     android:maxHeight="384dp"
                                     android:maxWidth="384dp"
diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml
index 2cb78b165..ca26e618b 100644
--- a/src/main/res/layout/create_conference_dialog.xml
+++ b/src/main/res/layout/create_conference_dialog.xml
@@ -42,7 +42,7 @@
                 style="@style/Widget.Conversations.EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/edit_subject_hint"
+                android:hint="@string/topic"
                 android:nextFocusDown="@+id/subject"
                 android:nextFocusUp="@+id/subject" />
         </android.support.design.widget.TextInputLayout>