diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/layout/account_row.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 38 | ||||
| -rw-r--r-- | src/main/res/layout/activity_muc_users.xml | 33 | ||||
| -rw-r--r-- | src/main/res/layout/contact.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/user_preview.xml | 17 |
5 files changed, 83 insertions, 9 deletions
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index f99f6c0dd..e3f3d99e1 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -5,7 +5,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:selectableItemBackground" + android:background="?selectableItemBackground" android:paddingStart="8dp" android:paddingLeft="8dp" android:paddingTop="8dp" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index c29d78c26..b8da6f213 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -463,8 +463,8 @@ </android.support.v7.widget.CardView> <android.support.v7.widget.CardView - android:id="@+id/muc_more_details" - android:layout_width="match_parent" + android:id="@+id/users_wrapper" + android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" @@ -489,16 +489,40 @@ android:layout_marginBottom="24dp" android:text="@string/invite_contact" /> - <LinearLayout - android:id="@+id/muc_members" + <android.support.v7.widget.RecyclerView + android:id="@+id/users" android:layout_width="fill_parent" android:layout_height="0dp" + android:layout_marginStart="-2dp" + android:layout_marginEnd="-2dp" android:layout_weight="1" android:divider="?android:dividerHorizontal" - android:orientation="vertical" - android:showDividers="middle" /> - </LinearLayout> + android:orientation="horizontal" + android:paddingStart="@dimen/card_padding_regular" + android:paddingTop="@dimen/card_padding_regular" + android:paddingEnd="@dimen/card_padding_regular" + android:paddingBottom="@dimen/card_padding_list" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="end" + android:orientation="horizontal"> + <Button + android:id="@+id/show_users" + style="@style/Widget.Conversations.Button.Borderless" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minWidth="0dp" + android:paddingStart="16dp" + android:paddingLeft="16dp" + android:paddingEnd="16dp" + android:paddingRight="16dp" + android:text="@string/view_users" + android:textColor="?attr/colorAccent" /> + </LinearLayout> + </LinearLayout> </android.support.v7.widget.CardView> </LinearLayout> </ScrollView> diff --git a/src/main/res/layout/activity_muc_users.xml b/src/main/res/layout/activity_muc_users.xml new file mode 100644 index 000000000..d6bdf8435 --- /dev/null +++ b/src/main/res/layout/activity_muc_users.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="?attr/color_background_tertiary" + android:orientation="vertical"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + + <android.support.design.widget.CoordinatorLayout + android:id="@+id/coordinator" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/color_background_tertiary"> + + <android.support.v7.widget.RecyclerView + android:id="@+id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/color_background_tertiary" + android:orientation="vertical" + app:layoutManager="android.support.v7.widget.LinearLayoutManager" /> + </android.support.design.widget.CoordinatorLayout> + + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index d7d8956ec..e5b71d743 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -5,7 +5,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/list_item_background" + android:background="?selectableItemBackground" android:padding="@dimen/list_padding"> <com.makeramen.roundedimageview.RoundedImageView diff --git a/src/main/res/layout/user_preview.xml b/src/main/res/layout/user_preview.xml new file mode 100644 index 000000000..ecc05e623 --- /dev/null +++ b/src/main/res/layout/user_preview.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> + + <de.pixart.messenger.ui.widget.SquareFrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?selectableItemBackground" + android:padding="2dp"> + + <ImageView + android:id="@+id/avatar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/black54" + android:scaleType="centerInside" /> + </de.pixart.messenger.ui.widget.SquareFrameLayout> +</layout>
\ No newline at end of file |