aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_contact_details.xml1
-rw-r--r--src/main/res/layout/activity_muc_details.xml133
-rw-r--r--src/main/res/layout/media.xml1
3 files changed, 72 insertions, 63 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 15:15:29 +0000