diff options
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/layout/create_conference_dialog.xml | 73 | ||||
-rw-r--r-- | src/main/res/layout/enter_jid_dialog.xml | 65 | ||||
-rw-r--r-- | src/main/res/layout/join_conference_dialog.xml | 79 |
3 files changed, 113 insertions, 104 deletions
diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml index 0b83d1d84..36dfae0fe 100644 --- a/src/main/res/layout/create_conference_dialog.xml +++ b/src/main/res/layout/create_conference_dialog.xml @@ -1,43 +1,46 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingBottom="?attr/dialog_vertical_padding" - android:paddingLeft="?attr/dialog_horizontal_padding" - android:paddingRight="?attr/dialog_horizontal_padding" - android:paddingTop="?attr/dialog_vertical_padding"> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> - <TextView - android:id="@+id/your_account" - style="@style/InputLabel" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/your_account" - android:visibility="gone" /> + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="?attr/dialog_vertical_padding" + android:paddingLeft="?attr/dialog_horizontal_padding" + android:paddingRight="?attr/dialog_horizontal_padding" + android:paddingTop="?attr/dialog_vertical_padding"> - <Spinner - android:id="@+id/account" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:visibility="gone" /> + <TextView + android:id="@+id/your_account" + style="@style/InputLabel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/your_account" + android:visibility="gone" /> - <View - android:layout_width="0dp" - android:layout_height="0dp" - android:focusable="true" - android:focusableInTouchMode="true" /> + <Spinner + android:id="@+id/account" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> - <android.support.design.widget.TextInputLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:focusable="true" + android:focusableInTouchMode="true" /> - <android.support.design.widget.TextInputEditText - android:id="@+id/subject" + <android.support.design.widget.TextInputLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/edit_subject_hint" - android:nextFocusDown="@+id/subject" - android:nextFocusUp="@+id/subject" /> - </android.support.design.widget.TextInputLayout> -</LinearLayout>
\ No newline at end of file + android:layout_height="wrap_content"> + + <android.support.design.widget.TextInputEditText + android:id="@+id/subject" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/edit_subject_hint" + android:nextFocusDown="@+id/subject" + android:nextFocusUp="@+id/subject" /> + </android.support.design.widget.TextInputLayout> + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml index a5d8f4a96..dff8f3459 100644 --- a/src/main/res/layout/enter_jid_dialog.xml +++ b/src/main/res/layout/enter_jid_dialog.xml @@ -1,38 +1,41 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingBottom="?attr/dialog_vertical_padding" - android:paddingLeft="?attr/dialog_horizontal_padding" - android:paddingRight="?attr/dialog_horizontal_padding" - android:paddingTop="?attr/dialog_vertical_padding"> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> - <TextView - android:id="@+id/your_account" - style="@style/InputLabel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/your_account" - android:visibility="gone" /> - - <Spinner - android:id="@+id/account" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:visibility="gone" /> - - <android.support.design.widget.TextInputLayout - android:id="@+id/account_jid_layout" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/account_settings_jabber_id"> + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="?attr/dialog_vertical_padding" + android:paddingLeft="?attr/dialog_horizontal_padding" + android:paddingRight="?attr/dialog_horizontal_padding" + android:paddingTop="?attr/dialog_vertical_padding"> + + <TextView + android:id="@+id/your_account" + style="@style/InputLabel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/your_account" + android:visibility="gone" /> - <AutoCompleteTextView - android:id="@+id/jid" + <Spinner + android:id="@+id/account" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:inputType="textEmailAddress" /> - </android.support.design.widget.TextInputLayout> + android:visibility="gone" /> + + <android.support.design.widget.TextInputLayout + android:id="@+id/account_jid_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/account_settings_jabber_id"> + + <AutoCompleteTextView + android:id="@+id/jid" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textEmailAddress" /> + </android.support.design.widget.TextInputLayout> -</LinearLayout>
\ No newline at end of file + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml index 5916586e5..edf16221f 100644 --- a/src/main/res/layout/join_conference_dialog.xml +++ b/src/main/res/layout/join_conference_dialog.xml @@ -1,46 +1,49 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingBottom="8dp" - android:paddingLeft="24dp" - android:paddingRight="24dp" - android:paddingTop="16dp"> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> - <TextView - android:id="@+id/your_account" - style="@style/InputLabel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/your_account" - android:visibility="gone" /> - - <Spinner - android:id="@+id/account" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:visibility="gone" /> - - <android.support.design.widget.TextInputLayout - android:id="@+id/account_jid_layout" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/conference_address"> + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="8dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="16dp"> + + <TextView + android:id="@+id/your_account" + style="@style/InputLabel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/your_account" + android:visibility="gone" /> - <AutoCompleteTextView - android:id="@+id/jid" + <Spinner + android:id="@+id/account" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:inputType="textEmailAddress" /> - </android.support.design.widget.TextInputLayout> + android:visibility="gone" /> - <CheckBox - android:id="@+id/bookmark" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:checked="true" - android:text="@string/save_as_bookmark" /> + <android.support.design.widget.TextInputLayout + android:id="@+id/account_jid_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/conference_address"> + + <AutoCompleteTextView + android:id="@+id/jid" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textEmailAddress" /> + </android.support.design.widget.TextInputLayout> + + <CheckBox + android:id="@+id/bookmark" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:checked="true" + android:text="@string/save_as_bookmark" /> -</LinearLayout>
\ No newline at end of file + </LinearLayout> +</layout>
\ No newline at end of file |