diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index e067c6457..0efb26e81 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -46,7 +46,7 @@ - + @@ -61,9 +61,6 @@ - - - @@ -89,7 +86,6 @@ - @@ -238,28 +234,22 @@ - class - - - - - - - layout - - - - - - - xmlns:android + + xmlns:android + + ^$ + - xmlns:.* + + xmlns:.* + + ^$ + BY_NAME @@ -269,6 +259,7 @@ .*:id + http://schemas.android.com/apk/res/android @@ -279,6 +270,7 @@ .*:name + http://schemas.android.com/apk/res/android @@ -288,8 +280,9 @@ - .*:layout_width - http://schemas.android.com/apk/res/android + name + + ^$ @@ -298,8 +291,9 @@ - .*:layout_height - http://schemas.android.com/apk/res/android + style + + ^$ @@ -308,8 +302,9 @@ - .*:layout_.* - http://schemas.android.com/apk/res/android + .* + + ^$ BY_NAME @@ -320,27 +315,25 @@ .* + http://schemas.android.com/apk/res/android - BY_NAME + ANDROID_ATTRIBUTE_ORDER - .*(?<!style)$ + + .* + + .* + BY_NAME - - - - style - - - diff --git a/app/src/main/assets/web/info.html b/app/src/main/assets/web/info.html index c0c934dc7..510ef90a4 100644 --- a/app/src/main/assets/web/info.html +++ b/app/src/main/assets/web/info.html @@ -8,6 +8,12 @@ + 2.0.12 + + Fixed an issue preventing playlists from showing up + Crash fixes + I've been rebuilding Shuttle from scratch for almost a year now! DM me your Play Store email address on Discord Discord if you're interested in testing the alpha :D + 2.0.11 Fixed artwork downloading issue (no longer relying on flaky Last.FM API) diff --git a/app/src/main/assets/web/info_dark.html b/app/src/main/assets/web/info_dark.html index 998bc62b1..10c0b03d7 100644 --- a/app/src/main/assets/web/info_dark.html +++ b/app/src/main/assets/web/info_dark.html @@ -8,6 +8,12 @@ + 2.0.12 + + Fixed an issue preventing playlists from showing up + Crash fixes + I've been rebuilding Shuttle from scratch for almost a year now! DM me your Play Store email address on Discord Discord if you're interested in testing the alpha :D + 2.0.11 Fixed artwork downloading issue (no longer relying on flaky Last.FM API) diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java index dbf84fb3b..599aa9be9 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java @@ -2,6 +2,8 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; +import android.net.Uri; import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; @@ -44,6 +46,16 @@ public void onPageFinished(WebView view, String url) { ViewUtils.fadeOut(progressBar, () -> ViewUtils.fadeIn(webView, null)); } + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + if (intent.resolveActivity(context.getPackageManager()) != null) { + context.startActivity(intent); + return true; + } + return false; + } }); Aesthetic.get(context) diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index 6b64fd400..6ea7314f1 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.11" + const val versionName = "2.0.12" } \ No newline at end of file