Merge pull request #500 from OxygenCobalt/3.1.4-cherrypick

Version 3.1.4
OxygenCobalt · Jul 5, 2023 · c348f1e · c348f1e
2 parents e7d391b + 9aafcda
commit c348f1e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.1.4
+
+#### 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
+- Fixed negative ReplayGain adjustments not being applied
+
 ## 3.1.3
 
 #### What's New

diff --git a/README.md b/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.1.3">
-        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.1.3&color=64B5F6&style=flat">
+    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v3.1.4">
+        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.1.4&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">

diff --git 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/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java b/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java
@@ -1671,9 +1671,8 @@ MaterialBottomContainerBackHelper getBackHelper() {
   @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;
     }

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
@@ -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/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.

diff --git 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'
     }
 

diff --git a/fastlane/metadata/android/en-US/changelogs/34.txt 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.