From f3c14a1e5591f9d244c73bc0e53a6e042f5b9a06 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Wed, 25 Oct 2017 17:03:07 -0400
Subject: Fix/pip video (#445)

* 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
---
 app/src/main/res/layout/activity_frame_wrapper.xml |  5 ++++
 app/src/main/res/layout/view_video.xml             | 31 +++++++---------------
 app/src/main/res/xml/frost_changelog.xml           |  4 +--
 3 files changed, 17 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/res/layout/activity_frame_wrapper.xml

(limited to 'app/src/main/res')

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
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 5cc8a2c8..98441a58 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -6,7 +6,7 @@
     <item text="" />
     -->
 
-    <version title="v1.6.0" />
+    <version title="v1.6.1" />
     <item text="Add Spanish translations" />
     <item text="Add French translations" />
     <item text="Add German translations" />
@@ -14,7 +14,7 @@
     <item text="Add pip video support" />
     <item text="Add video downloader" />
     <item text="Fix bugs with parsing url queries" />
-    <item text="" />
+    <item text="Fix search update from Facebook" />
     <item text="" />
 
     <version title="v1.5.9" />
-- 
cgit v1.2.3