From 5e5c76c7e2043bc05bf70637ccc8eb4c27165c82 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 10 Jul 2015 09:47:35 +0300
Subject: replace inline video player with a separate activity

---
 .../src/main/res/layout/activity_video_player.xml  | 30 ++++++++++++++++++++++
 .../src/main/res/menu/activity_video_player.xml    | 15 +++++++++++
 org.fox.ttrss/src/main/res/values/strings.xml      |  4 +++
 3 files changed, 49 insertions(+)
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_video_player.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/activity_video_player.xml

(limited to 'org.fox.ttrss/src/main/res')

diff --git a/org.fox.ttrss/src/main/res/layout/activity_video_player.xml b/org.fox.ttrss/src/main/res/layout/activity_video_player.xml
new file mode 100644
index 00000000..4954ae01
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_video_player.xml
@@ -0,0 +1,30 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:background="?android:colorBackground"
+    tools:context="org.fox.ttrss.VideoPlayerActivity">
+
+    <!--
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+    -->
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/toolbar">
+
+        <VideoView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:id="@+id/video_player"
+            android:transitionName="TRANSITION:ARTICLE_VIDEO_PLAYER" />
+    </FrameLayout>
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+
+</RelativeLayout>
diff --git a/org.fox.ttrss/src/main/res/menu/activity_video_player.xml b/org.fox.ttrss/src/main/res/menu/activity_video_player.xml
new file mode 100644
index 00000000..fb4da795
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/activity_video_player.xml
@@ -0,0 +1,15 @@
+<menu 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"
+    tools:context="org.fox.ttrss.VideoPlayerActivity">
+
+    <item
+        android:id="@+id/article_vid_open"
+        app:showAsAction=""
+        android:title="Open video"/>
+    <item
+        android:id="@+id/article_vid_share"
+        android:icon="@drawable/ic_share"
+        app:showAsAction="ifRoom"
+        android:title="Share video"/>
+</menu>
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 746451f8..31de7124 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -224,4 +224,8 @@
     <string name="prefs_widget_show_fresh">Show Fresh articles</string>
     <string name="prefs_widget_show_fresh_summary">Instead of total unread display amount of Fresh articles</string>
     <string name="prefs_widget">Widget</string>
+    <string name="title_activity_video_player">Video Player</string>
+
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
 </resources>
-- 
cgit v1.2.3-54-g00ecf