diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:17:22 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:17:22 +0200 |
| commit | 5ec8a55ba51aa60862ec77eecb017257105fac80 (patch) | |
| tree | 5988834eb4dd0ce1af72b61dd3d8e29b1d044b83 /src/main/res | |
| parent | b6025f3506ee5adf5ccf42cefd9c3ff57d9ff1a1 (diff) | |
| parent | 679ac2ea21709d3a4b0e80bdebe740beceac274d (diff) | |
Merge branch 'refs/heads/internal-Image/Video-Viewer'
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_fullscreen_message.xml | 20 | ||||
| -rw-r--r-- | src/main/res/values/ids.xml | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_fullscreen_message.xml new file mode 100644 index 000000000..183513196 --- /dev/null +++ b/src/main/res/layout/activity_fullscreen_message.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:background="@android:color/black"> + + <uk.co.senab.photoview.PhotoView + android:id="@id/message_image_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:adjustViewBounds="true" + android:visibility="gone" /> + + <com.github.rtoshiro.view.video.FullscreenVideoLayout + android:id="@id/message_video_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/values/ids.xml b/src/main/res/values/ids.xml index 76c3940b0..75f75673b 100644 --- a/src/main/res/values/ids.xml +++ b/src/main/res/values/ids.xml @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <item name="snackbar_location_message" type="id" /> + <item name="message_image_view" type="id" /> + <item name="message_video_view" type="id" /> </resources>
\ No newline at end of file |