From c2ca9066c6fd760bd6ef5d2f8f0530a89bfa7b66 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 24 Oct 2017 23:29:55 -0400
Subject: WIP: Feature/pip video 2 (#405)

* Add dependency

* Test new video view

* Add initial video bindings

* Implement drag to dismiss

* Begin initial integration

* Fix typo

* Fix up url formatter

* Update changelog

* Create first fully integrated video build

* Update translations

* Update translations 2
---
 app/src/main/res/layout/view_video.xml          | 53 +++++++++++++++++++++++++
 app/src/main/res/menu/menu_video.xml            | 15 +++++++
 app/src/main/res/values-de/strings_download.xml |  1 +
 app/src/main/res/values-es/strings_download.xml |  1 +
 app/src/main/res/values-fr/strings_download.xml |  1 +
 app/src/main/res/values/strings.xml             |  3 ++
 app/src/main/res/values/strings_download.xml    |  1 +
 app/src/main/res/values/styles.xml              |  7 ++++
 app/src/main/res/xml/frost_changelog.xml        | 22 ++++++----
 9 files changed, 97 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/layout/view_video.xml
 create mode 100644 app/src/main/res/menu/menu_video.xml

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

diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
new file mode 100644
index 00000000..e8782459
--- /dev/null
+++ b/app/src/main/res/layout/view_video.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent"
+    android:clickable="false"
+    android:theme="@style/FrostTheme.Video">
+
+    <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.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" />
+
+    <com.pitchedapps.frost.views.FrostVideoView
+        android:id="@+id/video"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        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">
+
+        <ImageView
+            android:id="@+id/video_restart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:foregroundGravity="center" />
+
+    </com.pitchedapps.frost.views.FrostVideoView>
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_video.xml b/app/src/main/res/menu/menu_video.xml
new file mode 100644
index 00000000..955a03ee
--- /dev/null
+++ b/app/src/main/res/menu/menu_video.xml
@@ -0,0 +1,15 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_pip"
+        android:orderInCategory="100"
+        android:title="@string/pip"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/action_download"
+        android:orderInCategory="200"
+        android:title="@string/download"
+        app:showAsAction="ifRoom" />
+</menu>
+
diff --git a/app/src/main/res/values-de/strings_download.xml b/app/src/main/res/values-de/strings_download.xml
index 77c1b68c..862049f5 100644
--- a/app/src/main/res/values-de/strings_download.xml
+++ b/app/src/main/res/values-de/strings_download.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="pick_image">Foto auswählen</string>
+  <string name="download">Downloaden</string>
   <string name="downloading">Downloade…</string>
   <string name="image_download_success">Foto heruntergeladen</string>
   <string name="image_download_fail">Fehler beim Download des Fotos</string>
diff --git a/app/src/main/res/values-es/strings_download.xml b/app/src/main/res/values-es/strings_download.xml
index c15378f4..4890b870 100644
--- a/app/src/main/res/values-es/strings_download.xml
+++ b/app/src/main/res/values-es/strings_download.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="pick_image">Seleccionar imagen</string>
+  <string name="download">Descargar</string>
   <string name="downloading">Descargando…</string>
   <string name="image_download_success">Imagen descargada</string>
   <string name="image_download_fail">Descarga de imagen fallida</string>
diff --git a/app/src/main/res/values-fr/strings_download.xml b/app/src/main/res/values-fr/strings_download.xml
index 3480ad1f..146d71e7 100644
--- a/app/src/main/res/values-fr/strings_download.xml
+++ b/app/src/main/res/values-fr/strings_download.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="pick_image">Sélectionner une image</string>
+  <string name="download">Télécharger</string>
   <string name="downloading">Téléchargement…</string>
   <string name="image_download_success">Image téléchargée</string>
   <string name="image_download_fail">Échec du téléchargement de l\'image</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82aa82f1..4c9b7285 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,4 +59,7 @@
 
     <string name="top_bar">Top Bar</string>
     <string name="bottom_bar">Bottom Bar</string>
+
+    <string name="pip" translatable="false">PIP</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings_download.xml b/app/src/main/res/values/strings_download.xml
index ef166508..c0cb8cd4 100644
--- a/app/src/main/res/values/strings_download.xml
+++ b/app/src/main/res/values/strings_download.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="pick_image">Pick Image</string>
+    <string name="download">Download</string>
     <string name="downloading">Downloading…</string>
     <string name="image_download_success">Image downloaded</string>
     <string name="image_download_fail">Image failed to download</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b91710d2..ab893b3a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,6 +41,13 @@
         <item name="android:windowAnimationStyle">@style/KauFadeInFadeOut</item>
     </style>
 
+    <style name="FrostTheme.Video" parent="FrostTheme.Overlay.Fade">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+
     <style name="FrostTheme.Settings" parent="FrostTheme">
         <item name="android:windowAnimationStyle">@style/KauSlideInFadeOut</item>
     </style>
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index b46889c2..5cc8a2c8 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -5,14 +5,22 @@
     <version title="v" />
     <item text="" />
     -->
-	
-	<version title="Translations are opened!" />
-    <item text="If you want to have Frost in your language, please consider helping translate it. Link is in settings." />
-	
-	<version title="v1.5.9" />
+
+    <version title="v1.6.0" />
+    <item text="Add Spanish translations" />
+    <item text="Add French translations" />
+    <item text="Add German translations" />
+    <item text="Check permissions before attempting upload or download" />
+    <item text="Add pip video support" />
+    <item text="Add video downloader" />
+    <item text="Fix bugs with parsing url queries" />
+    <item text="" />
+    <item text="" />
+
+    <version title="v1.5.9" />
     <item text="Add notification support for Android O" />
-	
-	<version title="v1.5.8" />
+
+    <version title="v1.5.8" />
     <item text="Fix theme for newer comments layout" />
     <item text="Revert media picker to use system default" />
 
-- 
cgit v1.2.3