diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 54 | ||||
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 46 | ||||
| -rw-r--r-- | src/main/res/layout/media.xml | 16 | ||||
| -rw-r--r-- | src/main/res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
5 files changed, 114 insertions, 6 deletions
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index dd3ff2c31..64e296c24 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -1,6 +1,5 @@ <?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"> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> <LinearLayout android:layout_width="match_parent" @@ -102,8 +101,7 @@ android:layout_marginBottom="4dp" android:layout_marginLeft="-2dp" android:layout_marginTop="4dp" - android:orientation="horizontal"> - </com.wefika.flowlayout.FlowLayout> + android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout> <TextView android:id="@+id/details_lastseen" @@ -235,6 +233,52 @@ </android.support.v7.widget.CardView> <android.support.v7.widget.CardView + android:id="@+id/media_wrapper" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin"> + + <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="wrap_content" + android:layout_marginEnd="-2dp" + android:layout_marginStart="-2dp" + android:orientation="horizontal" + android:paddingBottom="@dimen/card_padding_list" + android:paddingEnd="@dimen/card_padding_regular" + android:paddingStart="@dimen/card_padding_regular" + android:paddingTop="@dimen/card_padding_regular" /> + + <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:paddingLeft="16dp" + android:paddingRight="16dp" + android:text="@string/show_media" + android:textColor="?attr/colorAccent" /> + </LinearLayout> + </LinearLayout> + </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView android:id="@+id/keys_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -254,7 +298,7 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:padding="@dimen/card_padding_list"></LinearLayout> + android:padding="@dimen/card_padding_list" /> <LinearLayout android:layout_width="wrap_content" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 2a450f964..8a30fdcf4 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -278,6 +278,52 @@ </android.support.v7.widget.CardView> <android.support.v7.widget.CardView + android:id="@+id/media_wrapper" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin"> + + <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="wrap_content" + android:layout_marginEnd="-2dp" + android:layout_marginStart="-2dp" + android:orientation="horizontal" + android:paddingBottom="@dimen/card_padding_list" + android:paddingEnd="@dimen/card_padding_regular" + android:paddingStart="@dimen/card_padding_regular" + android:paddingTop="@dimen/card_padding_regular" /> + + <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:paddingLeft="16dp" + android:paddingRight="16dp" + android:text="@string/show_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_marginBottom="@dimen/activity_vertical_margin" diff --git a/src/main/res/layout/media.xml b/src/main/res/layout/media.xml new file mode 100644 index 000000000..f95ddeda3 --- /dev/null +++ b/src/main/res/layout/media.xml @@ -0,0 +1,16 @@ +<?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:padding="2dp"> + + <ImageView + android:id="@+id/media" + 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 diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index c420781ea..055c492d3 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -11,6 +11,7 @@ <dimen name="avatar_item_distance">16dp</dimen> <dimen name="media_preview_size">80dp</dimen> + <dimen name="media_size">64dp</dimen> <dimen name="toolbar_elevation">4dp</dimen> <dimen name="publish_avatar_top_margin">8dp</dimen> @@ -25,6 +26,6 @@ <dimen name="scan_dot_size">8dp</dimen> <dimen name="background_image_opacity">0.12</dimen> - + <dimen name="rounded_image_border">5dp</dimen> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e5261bb44..2287687fb 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -824,4 +824,5 @@ <string name="backup_channel_name">Database backup</string> <string name="app_update_channel_name">App update</string> <string name="action_group_details">Group details</string> + <string name="show_media">Show media</string> </resources> |