diff options
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 52 | ||||
| -rw-r--r-- | src/main/res/layout/activity_enter_name.xml | 63 | ||||
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 67 |
3 files changed, 157 insertions, 25 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 56d108b68..163fe270a 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -42,11 +42,57 @@ android:layout_height="wrap_content" android:padding="@dimen/card_padding_regular"> + <RelativeLayout + android:id="@+id/your_name_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentTop="true" + android:layout_marginBottom="@dimen/activity_vertical_margin"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toStartOf="@+id/action_edit_your_name" + android:layout_toLeftOf="@+id/action_edit_your_name" + android:orientation="vertical"> + + <TextView + android:id="@+id/your_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_name_set_instructions" + android:textAppearance="@style/TextAppearance.Conversations.Body1.Tertiary" /> + + <TextView + android:id="@+id/your_name_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/your_name" + android:textAppearance="@style/TextAppearance.Conversations.Caption" /> + </LinearLayout> + + <ImageButton + android:id="@+id/action_edit_your_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + 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" + android:visibility="visible" /> + </RelativeLayout> + <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/avater" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" + android:layout_below="@id/your_name_box" android:layout_centerHorizontal="true" android:layout_marginBottom="@dimen/avatar_item_distance" android:adjustViewBounds="true" @@ -513,6 +559,10 @@ </TableRow> </TableLayout> + <View + android:layout_width="match_parent" + android:layout_height="8dp" /> + <RelativeLayout android:id="@+id/pgp_fingerprint_box" android:layout_width="wrap_content" diff --git a/src/main/res/layout/activity_enter_name.xml b/src/main/res/layout/activity_enter_name.xml new file mode 100644 index 000000000..cb446479d --- /dev/null +++ b/src/main/res/layout/activity_enter_name.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/instructions" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:padding="16dp" + android:text="@string/enter_your_name_instructions" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <LinearLayout + android:id="@+id/name_box" + android:layout_width="256dp" + android:layout_height="wrap_content" + android:layout_above="@+id/next" + android:layout_below="@+id/instructions" + android:layout_centerHorizontal="true" + android:orientation="vertical"> + + <EditText + android:id="@+id/name" + style="@style/Widget.Conversations.EditText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/your_name" + android:imeOptions="flagNoExtractUi" + android:longClickable="false" /> + + </LinearLayout> + + <Button + android:id="@+id/next" + style="@style/Widget.Conversations.Button.Borderless" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" + android:text="@string/next" + android:textColor="?colorAccent" /> + </RelativeLayout> + </ScrollView> + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 04198908a..d93d737e6 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -222,36 +222,55 @@ <RelativeLayout android:id="@+id/muc_info_more" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> - <TextView + <CheckBox + android:id="@+id/autojoin_checkbox" + style="@style/Widget.Conversations.CheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toStartOf="@+id/muc_info_mam" - android:layout_toLeftOf="@+id/muc_info_mam" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_mam" + android:layout_marginStart="-6dp" + android:layout_marginLeft="-6dp" + android:layout_marginTop="4dp" + android:text="@string/autojoin_groupchat" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> - <TextView - android:id="@+id/muc_info_mam" - style="?android:attr/buttonStyleSmall" - android:layout_width="wrap_content" + <RelativeLayout + android:id="@+id/mam_box" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:layout_gravity="center_horizontal" - android:background="?attr/selectableItemBackgroundBorderless" - android:padding="@dimen/image_button_padding" - android:paddingStart="4dp" - android:paddingLeft="4dp" - android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + android:layout_below="@+id/autojoin_checkbox"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toStartOf="@+id/muc_info_mam" + android:layout_toLeftOf="@+id/muc_info_mam" + android:ellipsize="end" + android:singleLine="true" + 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_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_gravity="center_horizontal" + android:background="?attr/selectableItemBackgroundBorderless" + android:padding="@dimen/image_button_padding" + android:paddingStart="4dp" + android:paddingLeft="4dp" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + </RelativeLayout> </RelativeLayout> </LinearLayout> |