From 02c1dcffd4acf6d120c96d7c83ee864330101e6a Mon Sep 17 00:00:00 2001
From: Tim Malseed <t.malseed@gmail.com>
Date: Sun, 12 Jul 2020 13:27:24 +1000
Subject: [PATCH] Bump to v2.0.16

---
 app/src/main/assets/web/info.html                         | 8 ++++++++
 app/src/main/assets/web/info_dark.html                    | 8 ++++++++
 .../amp_library/ui/settings/SupportPresenter.java         | 4 ++--
 app/src/main/res/values/strings.xml                       | 4 ++--
 app/src/main/res/xml/settings_support.xml                 | 4 ++--
 buildSrc/src/main/kotlin/Config.kt                        | 2 +-
 6 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/app/src/main/assets/web/info.html b/app/src/main/assets/web/info.html
index 7cd19a1d3..a1043a407 100644
--- a/app/src/main/assets/web/info.html
+++ b/app/src/main/assets/web/info.html
@@ -8,6 +8,14 @@
 </head>
 
 <body>
+    <h4>2.0.16</h4>
+<ul>
+    <li>Fixed a character encoding issue preventing artwork downloading on some devices</li>
+    <li>Updated language around including/excluding songs</li>
+    <li>Possible fix for playlist editing issues on Android 10</li>
+    <li>Shuttle is now free - Shuttle+ will be removed, so only one version of Shuttle will exist on the Play Store</li>
+    <li>Shuttle 2 is in alpha testing! DM me your Play Store email address on <a href="https://discord.gg/4Z5EU7K">Discord</a> if you're interested in testing.</li>
+</ul>
     <h4>2.0.15</h4>
 <ul>
     <li>More playlist related crash fixes</li>
diff --git a/app/src/main/assets/web/info_dark.html b/app/src/main/assets/web/info_dark.html
index a5efbcf57..c49bcc1be 100644
--- a/app/src/main/assets/web/info_dark.html
+++ b/app/src/main/assets/web/info_dark.html
@@ -8,6 +8,14 @@
 </head>
 
 <body>
+    <h4>2.0.16</h4>
+<ul>
+    <li>Fixed a character encoding issue preventing artwork downloading on some devices</li>
+    <li>Updated language around including/excluding songs</li>
+    <li>Possible fix for playlist editing issues on Android 10</li>
+    <li>Shuttle is now free - Shuttle+ will be removed, so only one version of Shuttle will exist on the Play Store</li>
+    <li>Shuttle 2 is in alpha testing! DM me your Play Store email address on <a href="https://discord.gg/4Z5EU7K">Discord</a> if you're interested in testing.</li>
+</ul>
     <h4>2.0.15</h4>
 <ul>
     <li>More playlist related crash fixes</li>
diff --git a/app/src/main/java/com/simplecity/amp_library/ui/settings/SupportPresenter.java b/app/src/main/java/com/simplecity/amp_library/ui/settings/SupportPresenter.java
index 6ce86ad0b..21e3e4b83 100644
--- a/app/src/main/java/com/simplecity/amp_library/ui/settings/SupportPresenter.java
+++ b/app/src/main/java/com/simplecity/amp_library/ui/settings/SupportPresenter.java
@@ -27,7 +27,7 @@ public void bindView(@NonNull SupportView view) {
     private void setAppVersion() {
         SupportView supportView = getView();
         if (supportView != null) {
-            supportView.setVersion("Shuttle Music Player");
+            supportView.setVersion("Shuttle Music Player " + BuildConfig.VERSION_NAME);
         }
     }
 
@@ -41,7 +41,7 @@ public void faqClicked() {
     }
 
     public void helpClicked() {
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://plus.google.com/communities/112365043563095486408"));
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://discord.gg/4Z5EU7K"));
         SupportView supportView = getView();
         if (supportView != null) {
             supportView.showHelp(intent);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3684a60e1..90502e68d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -390,8 +390,8 @@
     <string name="pref_title_version">Version</string>
     <string name="pref_title_faq">FAQ</string>
     <string name="pref_summary_faq">Have a question? Need help? Click here to view the FAQ @ www.shuttlemusicplayer.com</string>
-    <string name="pref_title_gplus">Get Help</string>
-    <string name="pref_summary_gplus">There is a very active community of Shuttle users on Google+. If you have questions or need help, this is the best place to go.</string>
+    <string name="pref_title_discord">Get Help</string>
+    <string name="pref_summary_discord">If you have questions or need help, Discord is the best place to go.</string>
     <string name="pref_title_rate">Say Thanks</string>
     <string name="pref_summary_rate">If you like Shuttle, please consider leaving a review.</string>
 
diff --git a/app/src/main/res/xml/settings_support.xml b/app/src/main/res/xml/settings_support.xml
index 098869036..b606d4acd 100644
--- a/app/src/main/res/xml/settings_support.xml
+++ b/app/src/main/res/xml/settings_support.xml
@@ -20,8 +20,8 @@
 
         <android.support.v7.preference.Preference
             android:key="pref_help"
-            android:summary="@string/pref_summary_gplus"
-            android:title="@string/pref_title_gplus"/>
+            android:summary="@string/pref_summary_discord"
+            android:title="@string/pref_title_discord"/>
 
         <android.support.v7.preference.Preference
             android:key="pref_rate"
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index befd2d19d..e89fee732 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,5 +1,5 @@
 object Config {
 
-    const val versionName = "2.0.15"
+    const val versionName = "2.0.16"
 
 }
\ No newline at end of file
