sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed order of users and media in muc details

This commit is contained in:
Daniel Gultsch 2019-01-27 10:32:27 +01:00
parent b532f5ed1f
commit 2f3ccb5f90
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
View File

@ -137,7 +137,7 @@ public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHol
cancelPotentialWork(attachment, holder.binding.media); cancelPotentialWork(attachment, holder.binding.media);
renderPreview(activity, 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) { public void setAttachments(List<Attachment> attachments) {

43
src/main/res/layout/activity_muc_details.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -220,7 +219,7 @@
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:id="@+id/media_wrapper" android:id="@+id/users_wrapper"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin"
@ -234,7 +233,7 @@
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/media" android:id="@+id/users"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
@ -252,14 +251,25 @@
android:layout_gravity="end"> android:layout_gravity="end">
<Button <Button
android:id="@+id/show_media" android:id="@+id/invite"
style="@style/Widget.Conversations.Button.Borderless" style="@style/Widget.Conversations.Button.Borderless"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="0dp" android:minWidth="0dp"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:text="@string/view_media" android:text="@string/invite"
android:textColor="?attr/colorAccent" />
<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:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/view_users"
android:textColor="?attr/colorAccent" /> android:textColor="?attr/colorAccent" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -358,9 +368,8 @@
android:textAppearance="@style/TextAppearance.Conversations.Caption"/> android:textAppearance="@style/TextAppearance.Conversations.Caption"/>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:id="@+id/users_wrapper" android:id="@+id/media_wrapper"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin"
@ -374,7 +383,7 @@
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/users" android:id="@+id/media"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
@ -392,29 +401,19 @@
android:layout_gravity="end"> android:layout_gravity="end">
<Button <Button
android:id="@+id/invite" android:id="@+id/show_media"
style="@style/Widget.Conversations.Button.Borderless" style="@style/Widget.Conversations.Button.Borderless"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="0dp" android:minWidth="0dp"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:text="@string/invite" android:text="@string/view_media"
android:textColor="?attr/colorAccent" />
<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:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/view_users"
android:textColor="?attr/colorAccent" /> android:textColor="?attr/colorAccent" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

3
src/main/res/layout/media.xml
View File

@ -3,7 +3,8 @@
<eu.siacs.conversations.ui.widget.SquareFrameLayout <eu.siacs.conversations.ui.widget.SquareFrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="2dp"> android:padding="2dp"
android:background="?selectableItemBackground">
<ImageView <ImageView
android:id="@+id/media" android:id="@+id/media"
android:layout_width="match_parent" android:layout_width="match_parent"