Bump to v2.0.16

timusus · timusus · commit 02c1dcffd4ac · 2020-07-12T14:05:32.000+10:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 object Config {
 
-    const val versionName = "2.0.15"
+    const val versionName = "2.0.16"
 
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public void bindView(@NonNull SupportView view) {`
`27`	`27`	`private void setAppVersion() {`
`28`	`28`	`SupportView supportView = getView();`
`29`	`29`	`if (supportView != null) {`
`30`		`- supportView.setVersion("Shuttle Music Player");`
	`30`	`+ supportView.setVersion("Shuttle Music Player " + BuildConfig.VERSION_NAME);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -41,7 +41,7 @@ public void faqClicked() {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public void helpClicked() {`
`44`		`- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://plus.google.com/communities/112365043563095486408"));`
	`44`	`+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://discord.gg/4Z5EU7K"));`
`45`	`45`	`SupportView supportView = getView();`
`46`	`46`	`if (supportView != null) {`
`47`	`47`	`supportView.showHelp(intent);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`object Config {`
`2`	`2`
`3`		`- const val versionName = "2.0.15"`
	`3`	`+ const val versionName = "2.0.16"`
`4`	`4`
`5`	`5`	`}`