diff options
| author | Allan Wang <me@allanwang.ca> | 2017-10-25 17:03:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-25 17:03:07 -0400 |
| commit | f3c14a1e5591f9d244c73bc0e53a6e042f5b9a06 (patch) | |
| tree | df4dfd3fa4694344cfdfb08a18b119062e1ac781 /app/src/main/res/layout | |
| parent | e04487f5b1a4c6a5999db8d9746a07919ae9a333 (diff) | |
| download | frost-f3c14a1e5591f9d244c73bc0e53a6e042f5b9a06.tar.gz frost-f3c14a1e5591f9d244c73bc0e53a6e042f5b9a06.tar.bz2 frost-f3c14a1e5591f9d244c73bc0e53a6e042f5b9a06.zip | |
Fix/pip video (#445)v1.6.1
* Test frame wrapper
* Update padding bounds
* Clear toolbar on hide
* Optimize
* Update changelog
* Disable toolbar rather than remove it
* Improve controls and fix toolbar issue
* Optimize
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_frame_wrapper.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_video.xml | 31 |
2 files changed, 15 insertions, 21 deletions
diff --git a/app/src/main/res/layout/activity_frame_wrapper.xml b/app/src/main/res/layout/activity_frame_wrapper.xml new file mode 100644 index 00000000..585789ef --- /dev/null +++ b/app/src/main/res/layout/activity_frame_wrapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/frame_wrapper" + android:layout_width="match_parent" + android:layout_height="match_parent" />
\ No newline at end of file diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml index e8782459..b8226ff2 100644 --- a/app/src/main/res/layout/view_video.xml +++ b/app/src/main/res/layout/view_video.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/video_container" android:layout_width="match_parent" @@ -10,33 +10,22 @@ <View android:id="@+id/video_background" - android:layout_width="0dp" - android:layout_height="0dp" - android:clickable="false" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clickable="false" /> <android.support.v7.widget.Toolbar android:id="@+id/video_toolbar" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" /> <com.pitchedapps.frost.views.FrostVideoView android:id="@+id/video" - android:layout_width="0dp" - android:layout_height="0dp" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="?attr/actionBarSize" android:background="@android:color/transparent" android:theme="@style/FrostTheme.Video" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/video_toolbar" app:useDefaultControls="true" app:useTextureViewBacking="true"> @@ -50,4 +39,4 @@ </com.pitchedapps.frost.views.FrostVideoView> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</merge>
\ No newline at end of file |