From ff453808578f6a3be78fb93496e4b33dfa0d8fce Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Mon, 26 Jun 2023 19:35:58 -0600 Subject: [PATCH 1/4] build: downgrade navigation to 2.5.0 Temporarily band-aids #492. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5c4648215..efe210373 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { kotlin_version = '1.8.22' - navigation_version = "2.6.0" + navigation_version = "2.5.0" hilt_version = '2.46.1' } From f8fbcac4826a2ae9f3a262072f762d0f914baff6 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Mon, 3 Jul 2023 20:34:25 -0600 Subject: [PATCH 2/4] ui: fix queue sheet not being scrollable Fix an issue where the recent BackportBottomSheetBehavior update would break queue sheet scrolling, as the queue sheet would be set to invisible and prevent the findScrollingChild helper from being able to locate it. Fix this by removing that visibility check in the first place. --- CHANGELOG.md | 13 +++++++++++++ .../bottomsheet/BackportBottomSheetBehavior.java | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2063c3684..788f25287 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## dev + +#### What's New +- Menus have been refreshed with a cleaner look + +#### What's Fixed +- Fixed issue where one could not navigate to settings after navigating +elsewhere +- Fixed the queue list being non-scrollable in certain cases + +#### Dev/Meta +- Unified navigation graph + ## 3.1.3 #### What's New diff --git a/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java b/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java index ab55a48dc..214f6ac62 100644 --- a/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java +++ b/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java @@ -1671,9 +1671,8 @@ public class BackportBottomSheetBehavior extends CoordinatorLayo @Nullable @VisibleForTesting View findScrollingChild(View view) { - if (view.getVisibility() != View.VISIBLE) { - return null; - } + // MODIFICATION: Remove visibility check that broke nested scrolling in the queue sheet + // due to it being set to invisible when completely hidden if (ViewCompat.isNestedScrollingEnabled(view)) { return view; } From 87bb47cec398c3a6a75f1f2080ce05a1ef02e891 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 4 Jul 2023 15:09:47 -0600 Subject: [PATCH 3/4] music: index negative replaygain tags Caused by an absurd error stemming from absurd helper function naming. --- CHANGELOG.md | 10 ++-------- .../org/oxycblt/auxio/music/cache/CacheDatabase.kt | 2 +- .../java/org/oxycblt/auxio/music/metadata/TagWorker.kt | 5 ++++- app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 788f25287..37c8fb7d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,16 +2,10 @@ ## dev -#### What's New -- Menus have been refreshed with a cleaner look - #### What's Fixed -- Fixed issue where one could not navigate to settings after navigating -elsewhere +- Fixed issue where one could not navigate to settings after navigating elsewhere - Fixed the queue list being non-scrollable in certain cases - -#### Dev/Meta -- Unified navigation graph +- Fixed negative ReplayGain adjustments not being applied ## 3.1.3 diff --git a/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt b/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt index 7d1ac68d1..b1a19d52a 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt @@ -32,7 +32,7 @@ import org.oxycblt.auxio.music.info.Date import org.oxycblt.auxio.music.metadata.correctWhitespace import org.oxycblt.auxio.music.metadata.splitEscaped -@Database(entities = [CachedSong::class], version = 32, exportSchema = false) +@Database(entities = [CachedSong::class], version = 34, exportSchema = false) abstract class CacheDatabase : RoomDatabase() { abstract fun cachedSongsDao(): CachedSongsDao } diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt index fae02585e..f7757f079 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt @@ -314,7 +314,10 @@ private class TagWorkerImpl( * @return A parsed adjustment float, or null if the adjustment had invalid formatting. */ private fun List.parseReplayGainAdjustment() = - first().replace(REPLAYGAIN_ADJUSTMENT_FILTER_REGEX, "").toFloatOrNull()?.nonZeroOrNull() + first() + .replace(REPLAYGAIN_ADJUSTMENT_FILTER_REGEX, "") + .toFloatOrNull() + ?.nonZeroOrNull() private companion object { val COMPILATION_ALBUM_ARTISTS = listOf("Various Artists") diff --git a/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt index 3ad2f8eb1..de542ef9b 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt @@ -55,7 +55,7 @@ fun Long.nonZeroOrNull() = if (this > 0) this else null * * @return The same number if it's non-zero, null otherwise. */ -fun Float.nonZeroOrNull() = if (this > 0) this else null +fun Float.nonZeroOrNull() = if (this != 0f) this else null /** * Aliases a check to ensure a given value is in a specified range. From 9aafcda5990e63daf085c6557785c03432fd9fd5 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 4 Jul 2023 21:54:37 -0600 Subject: [PATCH 4/4] build: bump to 3.1.4 Bump Auxio to version 3.1.4 (34). --- CHANGELOG.md | 2 +- README.md | 4 ++-- app/build.gradle | 4 ++-- .../main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt | 5 +---- fastlane/metadata/android/en-US/changelogs/34.txt | 3 +++ 5 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/34.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 37c8fb7d3..622ef7876 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## dev +## 3.1.4 #### What's Fixed - Fixed issue where one could not navigate to settings after navigating elsewhere diff --git a/README.md b/README.md index 79a600389..012eae415 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@

Auxio

A simple, rational music player for android.

- - Latest Version + + Latest Version Releases diff --git a/app/build.gradle b/app/build.gradle index 0a14a0b74..a6c58436a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ android { defaultConfig { applicationId namespace - versionName "3.1.3" - versionCode 33 + versionName "3.1.4" + versionCode 34 minSdk 24 targetSdk 34 diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt index f7757f079..fae02585e 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt @@ -314,10 +314,7 @@ private class TagWorkerImpl( * @return A parsed adjustment float, or null if the adjustment had invalid formatting. */ private fun List.parseReplayGainAdjustment() = - first() - .replace(REPLAYGAIN_ADJUSTMENT_FILTER_REGEX, "") - .toFloatOrNull() - ?.nonZeroOrNull() + first().replace(REPLAYGAIN_ADJUSTMENT_FILTER_REGEX, "").toFloatOrNull()?.nonZeroOrNull() private companion object { val COMPILATION_ALBUM_ARTISTS = listOf("Various Artists") diff --git a/fastlane/metadata/android/en-US/changelogs/34.txt b/fastlane/metadata/android/en-US/changelogs/34.txt new file mode 100644 index 000000000..64a1da8b4 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/34.txt @@ -0,0 +1,3 @@ +Auxio 3.1.0 introduces playlisting functionality, with more features coming soon. +This release fixes several critial UI issues identified in the previous version. +For more information, see https://github.com/OxygenCobalt/Auxio/releases/tag/v3.1.4. \ No newline at end of file