From 82f9aca96493316bc62008f2b3167d34a6029b38 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 12 Dec 2017 00:52:12 -0500
Subject: Update/intro (#550)

* Add edit button to intro

* Update readme

* Fix video error and cancellation

* Update changelog

* Hide invalid tab options
---
 app/src/main/res/layout/intro_image.xml    | 11 +++++++++++
 app/src/main/res/values/ids.xml            |  1 +
 app/src/main/res/values/strings_errors.xml |  1 +
 app/src/main/res/xml/frost_changelog.xml   |  2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

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

diff --git a/app/src/main/res/layout/intro_image.xml b/app/src/main/res/layout/intro_image.xml
index 5b1e317d..8bdf4c90 100644
--- a/app/src/main/res/layout/intro_image.xml
+++ b/app/src/main/res/layout/intro_image.xml
@@ -30,6 +30,17 @@
         app:layout_constraintTop_toBottomOf="@id/intro_title"
         tools:layout_editor_absoluteX="112dp" />
 
+    <ImageView
+        android:id="@id/intro_button"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:padding="12dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/intro_image"
+        app:layout_constraintEnd_toEndOf="@id/intro_image"
+        app:layout_constraintStart_toStartOf="@id/intro_image"
+        app:layout_constraintTop_toTopOf="@id/intro_image" />
+
     <TextView
         android:id="@id/intro_desc"
         style="@style/IntroSubTitle"
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 0aaeeab8..a8433207 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -8,6 +8,7 @@
     <item name="intro_phone_screen" type="id" />
     <item name="intro_title" type="id" />
     <item name="intro_image" type="id" />
+    <item name="intro_button" type="id" />
     <item name="intro_desc" type="id" />
 
     <!--Extra menu ids; see OverlayContext-->
diff --git a/app/src/main/res/values/strings_errors.xml b/app/src/main/res/values/strings_errors.xml
index 173ed58e..cc51699a 100644
--- a/app/src/main/res/values/strings_errors.xml
+++ b/app/src/main/res/values/strings_errors.xml
@@ -7,4 +7,5 @@
     <string name="no_download_manager">No Download Manager</string>
     <string name="no_download_manager_desc">The download manager is not enabled. Would you like to enable it to allow downloads?</string>
     <string name="error_generic">An error occurred.</string>
+    <string name="video_load_failed">Failed to load video</string>
 </resources>
\ 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 26c9c020..7c61b789 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -11,7 +11,7 @@
     <item text="Optimize scripts" />
     <item text="Add more theme components" />
     <item text="Fixed issue with deleting posts" />
-    <item text="" />
+    <item text="Automatically close video player if url cannot be loaded" />
     <item text="" />
     <item text="" />
     <item text="" />
-- 
cgit v1.2.3