diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-04-02 23:53:12 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-04-02 23:53:12 +0200 |
| commit | f131584b0d8eadddf8840135f8d5dea064a11b96 (patch) | |
| tree | d74a02e61b3acd65e55c0f0ebe653afbc3004e69 /src/main/res | |
| parent | 4572bc579715653848135d479fd7506a8ebf3e74 (diff) | |
show new fab in ShowFullscreenMessageActivity
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_fullscreen_message.xml | 49 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 4 |
2 files changed, 24 insertions, 29 deletions
diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_fullscreen_message.xml index bc6eeb850..c1a1bc619 100644 --- a/src/main/res/layout/activity_fullscreen_message.xml +++ b/src/main/res/layout/activity_fullscreen_message.xml @@ -2,37 +2,36 @@ <RelativeLayout 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"> - - <com.github.chrisbanes.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" /> + android:background="@android:color/black" + android:orientation="vertical"> <FrameLayout + android:id="@+id/frameLayout" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:id="@+id/frameLayout"> + android:layout_alignParentTop="true"> + + <com.github.chrisbanes.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" /> - <ImageButton - android:layout_margin="15dp" - android:layout_width="40dp" - android:layout_height="40dp" - android:src="@drawable/ic_share_white_24dp" - android:background="@drawable/circle" - android:id="@+id/imageButton" - android:layout_gravity="right|top" /> + <android.support.design.widget.FloatingActionButton + android:id="@+id/fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|top" + android:layout_margin="16dp" + android:src="?attr/icon_share" /> </FrameLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 8a7113b16..eb2038a69 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -78,10 +78,6 @@ <item name="TextSizeHeadline">18sp</item> </style> - <style name="ConversationsTheme.NoActionBar.FullScreen" parent="Theme.AppCompat.Light.NoActionBar"> - <item name="android:windowFullscreen">true</item> - </style> - <style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light"> <item name="android:windowNoTitle">true</item> <item name="android:windowActionBar">false</item> |