1 files changed, 28 insertions, 20 deletions

diff --git a/src/main/res/layout/activity_media_viewer.xml b/src/main/res/layout/activity_media_viewer.xml
index 42db37b86..463145662 100644
--- a/src/main/res/layout/activity_media_viewer.xml
+++ b/src/main/res/layout/activity_media_viewer.xml
@@ -1,44 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/black"
-    android:orientation="vertical">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <FrameLayout
-        android:id="@+id/frameLayout"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true">
+        android:background="@android:color/black"
+        android:orientation="vertical">
 
         <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-            android:id="@id/message_image_view"
+            android:id="@+id/messageImageView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:adjustViewBounds="true"
             android:visibility="gone" />
 
         <pl.droidsonroids.gif.GifImageView
-            android:id="@id/message_gif_view"
+            android:id="@+id/messageGifView"
             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:id="@+id/messageVideoView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
 
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/fab"
+        <com.leinardi.android.speeddial.SpeedDialOverlayLayout
+            android:id="@+id/overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/tab_layout"
+            android:background="?color_background_overlay" />
+
+        <com.leinardi.android.speeddial.SpeedDialView
+            android:id="@+id/speed_dial"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right|top"
-            android:layout_margin="16dp"
-            android:src="@drawable/ic_menu_white_24dp" />
-    </FrameLayout>
-</RelativeLayout>
\ No newline at end of file
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            app:backgroundTint="?attr/colorAccent"
+            app:sdMainFabClosedBackgroundColor="?attr/colorAccent"
+            app:sdMainFabClosedSrc="@drawable/ic_menu_white_24dp"
+            app:sdMainFabOpenedBackgroundColor="?attr/colorAccent"
+            app:sdMainFabOpenedSrc="@drawable/ic_close_white_24dp"
+            app:sdOverlayLayout="@id/overlay" />
+    </RelativeLayout>
+</layout>
\ No newline at end of file