diff options
author | Allan Wang <me@allanwang.ca> | 2017-11-12 02:48:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-12 02:48:36 -0500 |
commit | 2b51bc4bfa86863ed14b550fe3281840587ab038 (patch) | |
tree | 0fd7276e326ed0901b1af980d07d57f3bbb7d7eb /app/src/main/res/layout | |
parent | ec7fdc2521463d0a773bb9d0be454f3b2a60eee3 (diff) | |
download | frost-2b51bc4bfa86863ed14b550fe3281840587ab038.tar.gz frost-2b51bc4bfa86863ed14b550fe3281840587ab038.tar.bz2 frost-2b51bc4bfa86863ed14b550fe3281840587ab038.zip |
enhancement/video-player (#480)v1.6.3
* Add toolbar visibility toggle and draw it over viewer
* Set contract bindings once available
* Fix video url param error and prepare progressanimator
* Add gif support and better transitions
* Interface a lot of things
* Reorder back press
* Clean up files and fix selector
* Add gif support
* Redraw bounds when necessary
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/activity_frame_wrapper.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_selector.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/layout/view_video.xml | 11 |
3 files changed, 9 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 index 585789ef..e51d3391 100644 --- a/app/src/main/res/layout/activity_frame_wrapper.xml +++ b/app/src/main/res/layout/activity_frame_wrapper.xml @@ -2,4 +2,5 @@ <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 + android:layout_height="match_parent" + android:fitsSystemWindows="true" />
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_selector.xml b/app/src/main/res/layout/activity_selector.xml index a5f90aab..d9625731 100644 --- a/app/src/main/res/layout/activity_selector.xml +++ b/app/src/main/res/layout/activity_selector.xml @@ -2,9 +2,9 @@ <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/container" android:paddingBottom="@dimen/kau_activity_vertical_margin" android:paddingEnd="@dimen/kau_activity_horizontal_margin" android:paddingStart="@dimen/kau_activity_horizontal_margin" @@ -17,7 +17,6 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/kau_activity_vertical_margin" android:text="@string/select_facebook_account" - android:textColor="@android:color/white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -32,21 +31,10 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/text_select_account" app:layout_constraintVertical_bias="0.3" tools:layout_editor_absoluteX="0dp" tools:layout_editor_absoluteY="0dp" /> - <!--<android.support.v7.widget.AppCompatTextView--> - <!--android:layout_width="wrap_content"--> - <!--android:layout_height="wrap_content"--> - <!--android:layout_gravity="center_horizontal"--> - <!--android:text="@string/select_facebook_account"--> - <!--app:layout_constraintEnd_toEndOf="parent"--> - <!--app:layout_constraintHorizontal_bias="0.5"--> - <!--app:layout_constraintStart_toStartOf="parent"--> - <!--app:layout_constraintTop_toBottomOf="@userId/selector_recycler"--> - <!--tools:layout_editor_absoluteX="8dp"--> - <!--tools:layout_editor_absoluteY="0dp" />--> </android.support.constraint.ConstraintLayout>
\ 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 b8226ff2..ca256477 100644 --- a/app/src/main/res/layout/view_video.xml +++ b/app/src/main/res/layout/view_video.xml @@ -14,16 +14,10 @@ android:layout_height="match_parent" android:clickable="false" /> - <android.support.v7.widget.Toolbar - android:id="@+id/video_toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" /> - <com.pitchedapps.frost.views.FrostVideoView android:id="@+id/video" 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:useDefaultControls="true" @@ -38,5 +32,10 @@ </com.pitchedapps.frost.views.FrostVideoView> + <android.support.v7.widget.Toolbar + android:id="@+id/video_toolbar" + android:layout_width="match_parent" + android:background="@drawable/exomedia_default_controls_interactive_background" + android:layout_height="?attr/actionBarSize" /> </merge>
\ No newline at end of file |