Merge branch 'master' into dev

CHANGELOG.md

@@ -1,12 +1,10 @@
 # Changelog
 
-## dev
-
-## What's Fixed
-- Fixed inconsistent corner radius on widget cover art
-
-## What's Improved
-- Added ability to click on the playback bar to exit the queue view
+#### What's Fixed
+- Fixed inconsistent corner radius on widget
+- Fixed crash that would occur due to intelligent sort name functionality
+- Fixed crashing on music loading failures that should route to an error
+screen
 
 ## 3.0.4
 

README.md

@@ -2,8 +2,8 @@
 <h1 align="center"><b>Auxio</b></h1>
 <h4 align="center">A simple, rational music player for android.</h4>
 <p align="center">
-    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v3.0.4">
-        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.0.4&color=64B5F6&style=flat">
+    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v3.0.5">
+        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.0.5&color=64B5F6&style=flat">
     </a>
     <a href="https://github.com/oxygencobalt/Auxio/releases/">
         <img alt="Releases" src="https://img.shields.io/github/downloads/OxygenCobalt/Auxio/total.svg?color=4B95DE&style=flat">

app/build.gradle

@@ -20,8 +20,8 @@ android {
 
     defaultConfig {
         applicationId namespace
-        versionName "3.0.4"
-        versionCode 28
+        versionName "3.0.5"
+        versionCode 29
 
         minSdk 21
         targetSdk 33

app/src/main/java/org/oxycblt/auxio/music/Music.kt

@@ -355,7 +355,7 @@ class SortName(name: String, musicSettings: MusicSettings) : Comparable<SortName
     init {
         var sortName = name
         if (musicSettings.intelligentSorting) {
-            sortName = sortName.replace(leadingPunctuation, "")
+            sortName = sortName.replace(LEADING_PUNCTUATION_REGEX, "")
 
             sortName =
                 sortName.run {
@@ -367,8 +367,7 @@ class SortName(name: String, musicSettings: MusicSettings) : Comparable<SortName
                     }
                 }
 
-            // Zero pad all numbers to six digits for better sorting
-            sortName = sortName.replace(consecutiveDigits) { it.value.padStart(6, '0') }
+            sortName = sortName.replace(CONSECUTIVE_DIGITS_REGEX) { it.value.padStart(6, '0') }
         }
 
         collationKey = COLLATOR.getCollationKey(sortName)
@@ -393,8 +392,8 @@ class SortName(name: String, musicSettings: MusicSettings) : Comparable<SortName
 
     private companion object {
         val COLLATOR: Collator = Collator.getInstance().apply { strength = Collator.PRIMARY }
-        val leadingPunctuation: Regex = Regex("""^\p{Punct}+""")
-        val consecutiveDigits: Regex = Regex("""\d+""")
+        val LEADING_PUNCTUATION_REGEX = Regex("[\\p{Punct}+]")
+        val CONSECUTIVE_DIGITS_REGEX = Regex("\\d+")
     }
 }
 

fastlane/metadata/android/en-US/changelogs/29.txt

@@ -0,0 +1,3 @@
+Auxio 3.0.0 massively improves the music library experience, with a new advanced music loader, a new unified artist model, and a new selection system that makes enqueueing music much simpler.
+This release fixes critical issues.
+For more information, see https://github.com/OxygenCobalt/Auxio/releases/tag/v3.0.5.