diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-01-27 15:37:20 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-01-27 15:37:20 +0100 |
commit | 6286dd6e112a94f6bc975008ea62d38833aec625 (patch) | |
tree | b36b974cd4ab9005db8aebd049b308937de37ea1 /src/main | |
parent | 019f0f5e589c34c996dfb886d13f8deb0f43dc10 (diff) |
changed order of users and media in muc details
Diffstat (limited to 'src/main')
5 files changed, 74 insertions, 65 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java index 8f8bd87d9..7fc150aa7 100644 --- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java @@ -528,7 +528,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp account = contact.getAccount().getJid().asBareJid().toString(); } binding.detailsAccount.setText(getString(R.string.using_account, account)); - AvatarWorkerTask.loadAvatar(contact, binding.detailsContactBadge, Config.AVATAR_SIZE); + AvatarWorkerTask.loadAvatar(contact, binding.detailsContactBadge, R.dimen.avatar_big); binding.detailsContactBadge.setOnClickListener(this.onBadgeClick); if (xmppConnectionService.multipleAccounts()) { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java index 50460c0f1..e8968bbac 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java @@ -138,7 +138,7 @@ public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHol cancelPotentialWork(attachment, holder.binding.media); renderPreview(activity, attachment, holder.binding.media); } - holder.binding.media.setOnClickListener(v -> ViewUtil.view(activity, attachment)); + holder.binding.getRoot().setOnClickListener(v -> ViewUtil.view(activity, attachment)); } public void setAttachments(List<Attachment> attachments) { diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 50dbda53d..ceb773e8b 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -308,6 +308,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginTop="8dp" + android:layout_gravity="end" android:orientation="horizontal"> <Button diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index b8da6f213..b9163eb33 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -306,57 +306,6 @@ </android.support.v7.widget.CardView> <android.support.v7.widget.CardView - android:id="@+id/media_wrapper" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin" - card_view:cardBackgroundColor="?attr/color_background_secondary"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <android.support.v7.widget.RecyclerView - android:id="@+id/media" - android:layout_width="match_parent" - android:layout_height="100dp" - android:layout_marginStart="-2dp" - android:layout_marginEnd="-2dp" - 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_media" - 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_media" - android:textColor="?attr/colorAccent" /> - </LinearLayout> - </LinearLayout> - </android.support.v7.widget.CardView> - - <android.support.v7.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" @@ -464,7 +413,7 @@ <android.support.v7.widget.CardView android:id="@+id/users_wrapper" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" @@ -477,17 +426,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="@dimen/card_padding_list"> - - <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_marginBottom="24dp" - android:text="@string/invite_contact" /> + android:orientation="vertical"> <android.support.v7.widget.RecyclerView android:id="@+id/users" @@ -510,6 +449,21 @@ android:orientation="horizontal"> <Button + android:id="@+id/invite" + style="@style/Widget.Conversations.Button.Borderless" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:minWidth="0dp" + android:paddingStart="16dp" + android:paddingLeft="16dp" + android:paddingEnd="16dp" + android:paddingRight="16dp" + android:text="@string/invite_contact" + android:textColor="?attr/colorAccent" /> + + <Button android:id="@+id/show_users" style="@style/Widget.Conversations.Button.Borderless" android:layout_width="wrap_content" @@ -524,6 +478,59 @@ </LinearLayout> </LinearLayout> </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView + android:id="@+id/media_wrapper" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + card_view:cardBackgroundColor="?attr/color_background_secondary"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <android.support.v7.widget.RecyclerView + android:id="@+id/media" + 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="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_media" + 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_media" + android:textColor="?attr/colorAccent" /> + </LinearLayout> + </LinearLayout> + </android.support.v7.widget.CardView> </LinearLayout> </ScrollView> </LinearLayout> diff --git a/src/main/res/layout/media.xml b/src/main/res/layout/media.xml index f95ddeda3..345641762 100644 --- a/src/main/res/layout/media.xml +++ b/src/main/res/layout/media.xml @@ -4,6 +4,7 @@ <de.pixart.messenger.ui.widget.SquareFrameLayout android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?selectableItemBackground" android:padding="2dp"> <ImageView |