aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-12-12 00:52:12 -0500
committerGitHub <noreply@github.com>2017-12-12 00:52:12 -0500
commit82f9aca96493316bc62008f2b3167d34a6029b38 (patch)
tree665f2a450b7b2d9ee8f9abc35d25007c1db81ef3 /app/src/main/res
parentb90dcc04376b48d2b91fea8a5de48acbd7f885c4 (diff)
downloadfrost-82f9aca96493316bc62008f2b3167d34a6029b38.tar.gz
frost-82f9aca96493316bc62008f2b3167d34a6029b38.tar.bz2
frost-82f9aca96493316bc62008f2b3167d34a6029b38.zip
Update/intro (#550)v1.7.0
* Add edit button to intro * Update readme * Fix video error and cancellation * Update changelog * Hide invalid tab options
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/intro_image.xml11
-rw-r--r--app/src/main/res/values/ids.xml1
-rw-r--r--app/src/main/res/values/strings_errors.xml1
-rw-r--r--app/src/main/res/xml/frost_changelog.xml2
4 files changed, 14 insertions, 1 deletions
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="" />