diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-02-04 19:07:35 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-02-04 19:07:35 +0100 |
commit | 413186ca5a84530b623dabcca18f2285a38df47c (patch) | |
tree | 359b0d0d387a193351e53f3124e8f5a3f622daf2 /src/main/res | |
parent | b9086158a6de3188cbe76b37a7d83ce3d0d4dd69 (diff) |
rework MediaViewerActivity
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/drawable-hdpi/ic_open_in_new_white_24dp.png | bin | 0 -> 312 bytes | |||
-rw-r--r-- | src/main/res/drawable-mdpi/ic_open_in_new_white_24dp.png | bin | 0 -> 292 bytes | |||
-rw-r--r-- | src/main/res/drawable-xhdpi/ic_open_in_new_white_24dp.png | bin | 0 -> 488 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxhdpi/ic_open_in_new_white_24dp.png | bin | 0 -> 546 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxxhdpi/ic_open_in_new_white_24dp.png | bin | 0 -> 1204 bytes | |||
-rw-r--r-- | src/main/res/layout/activity_media_viewer.xml | 48 | ||||
-rw-r--r-- | src/main/res/menu/media_viewer.xml | 5 |
7 files changed, 31 insertions, 22 deletions
diff --git a/src/main/res/drawable-hdpi/ic_open_in_new_white_24dp.png b/src/main/res/drawable-hdpi/ic_open_in_new_white_24dp.png Binary files differnew file mode 100644 index 000000000..c48104c3f --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_open_in_new_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_open_in_new_white_24dp.png b/src/main/res/drawable-mdpi/ic_open_in_new_white_24dp.png Binary files differnew file mode 100644 index 000000000..56aa52136 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_open_in_new_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_open_in_new_white_24dp.png b/src/main/res/drawable-xhdpi/ic_open_in_new_white_24dp.png Binary files differnew file mode 100644 index 000000000..ae0d6fc21 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_open_in_new_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_open_in_new_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_open_in_new_white_24dp.png Binary files differnew file mode 100644 index 000000000..8236c23f1 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_open_in_new_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_open_in_new_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_open_in_new_white_24dp.png Binary files differnew file mode 100644 index 000000000..e27a66906 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_open_in_new_white_24dp.png 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 diff --git a/src/main/res/menu/media_viewer.xml b/src/main/res/menu/media_viewer.xml index c3898c79b..99a62a2a1 100644 --- a/src/main/res/menu/media_viewer.xml +++ b/src/main/res/menu/media_viewer.xml @@ -2,16 +2,17 @@ <item android:id="@+id/action_share" - android:icon="?attr/icon_share" + android:icon="@drawable/ic_share_white_24dp" android:orderInCategory="10" android:title="@string/share" /> <item android:id="@+id/action_open" + android:icon="@drawable/ic_open_in_new_white_24dp" android:orderInCategory="20" android:title="@string/action_open" /> <item android:id="@+id/action_delete" - android:icon="?attr/icon_delete" + android:icon="@drawable/ic_delete_white_24dp" android:orderInCategory="30" android:title="@string/action_delete" /> </menu>
\ No newline at end of file |