bugfix & stability: Improved by a little the searching page and also …

…the track, playlist and added albums support.
BobbyESP · Apr 4, 2023 · 1acb6e6 · 1acb6e6
1 parent f0a7456
commit 1acb6e6
Show file tree

Hide file tree

Showing 18 changed files with 501 additions and 253 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -71,7 +71,7 @@ android {
         applicationId = "com.bobbyesp.spowlo"
         minSdk = 26
         targetSdk = 33
-        versionCode = 10201
+        versionCode = 10300
 
         versionName = currentVersion.toVersionName().run {
             if (!splitApks) "$this-(F-Droid)"
@@ -246,7 +246,7 @@ dependencies {
 //    implementation(libs.exoplayer.extension.mediasession)
 
     implementation(libs.customtabs)
-    implementation(libs.shimmer)
+   // implementation(libs.shimmer)
 
     debugImplementation(libs.crash.handler)
 

diff --git a/app/src/main/java/com/bobbyesp/spowlo/App.kt b/app/src/main/java/com/bobbyesp/spowlo/App.kt
@@ -103,6 +103,7 @@ class App : Application() {
             }
 
             override fun onServiceDisconnected(arg0: ComponentName) {
+
             }
         }
 

diff --git a/app/src/main/java/com/bobbyesp/spowlo/ui/components/songs/metadata_viewer/TrackComponent.kt b/app/src/main/java/com/bobbyesp/spowlo/ui/components/songs/metadata_viewer/TrackComponent.kt
@@ -78,7 +78,7 @@ fun TrackComponent(
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.Center
             ) {
-                if(isPlaylist){
+                if(isPlaylist && imageUrl.isNotEmpty()) {
                     AsyncImageImpl(
                         modifier = Modifier
                             .size(40.dp)

diff --git a/app/src/main/java/com/bobbyesp/spowlo/ui/dialogs/bottomsheets/DownloaderBottomSheet.kt b/app/src/main/java/com/bobbyesp/spowlo/ui/dialogs/bottomsheets/DownloaderBottomSheet.kt
@@ -361,6 +361,28 @@ fun DownloaderBottomSheet(
                             .fillMaxWidth()
                             .padding(6.dp)
                     ) {
+                        DrawerSheetSubtitle(text = stringResource(id = R.string.general))
+                        Row(
+                            modifier = Modifier
+                                .horizontalScroll(rememberScrollState())
+                                .fillMaxWidth()
+                                .clip(RoundedCornerShape(6.dp))
+                                .background(
+                                    color = MaterialTheme.colorScheme.surfaceVariant
+                                ),
+                        ) {
+                            AudioFilterChip(label = stringResource(id = R.string.use_cache),
+                                animated = true,
+                                selected = useCaching,
+                                onClick = {
+                                    useCaching = !useCaching
+                                    scope.launch {
+                                        settings.updateValue(USE_CACHING, useCaching)
+                                    }
+                                })
+
+                        }
+
                         DrawerSheetSubtitle(text = stringResource(id = R.string.experimental_features))
                         Row(
                             modifier = Modifier
@@ -389,17 +411,6 @@ fun DownloaderBottomSheet(
                                         settings.updateValue(GEO_BYPASS, useGeoBypass)
                                     }
                                 })
-
-                            AudioFilterChip(label = stringResource(id = R.string.use_cache),
-                                animated = true,
-                                selected = useCaching,
-                                onClick = {
-                                    useCaching = !useCaching
-                                    scope.launch {
-                                        settings.updateValue(USE_CACHING, useCaching)
-                                    }
-                                })
-
                             AudioFilterChip(label = stringResource(id = R.string.dont_filter_results),
                                 selected = dontFilter,
                                 animated = true,
@@ -514,7 +525,7 @@ fun DownloaderBottomSheet(
 object BottomSheetPages {
     val MAIN = getString(R.string.audio)
     val SECONDARY = "secondary"
-    val TERTIARY = getString(R.string.experimental_features)
+    val TERTIARY = getString(R.string.downloader)
 }
 
 //GET STRING FROM APP.CONTEXT GIVEN A r.string ID

diff --git a/...byesp/spowlo/ui/pages/common/ErrorPage.kt → .../spowlo/ui/pages/commonPages/ErrorPage.kt b/...byesp/spowlo/ui/pages/common/ErrorPage.kt → .../spowlo/ui/pages/commonPages/ErrorPage.kt
@@ -1,4 +1,4 @@
-package com.bobbyesp.spowlo.ui.pages.common
+package com.bobbyesp.spowlo.ui.pages.commonPages
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column

diff --git a/...esp/spowlo/ui/pages/common/LoadingPage.kt → ...powlo/ui/pages/commonPages/LoadingPage.kt b/...esp/spowlo/ui/pages/common/LoadingPage.kt → ...powlo/ui/pages/commonPages/LoadingPage.kt
@@ -1,4 +1,4 @@
-package com.bobbyesp.spowlo.ui.pages.common
+package com.bobbyesp.spowlo.ui.pages.commonPages
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

diff --git a/...wlo/ui/pages/common/NotImplementedPage.kt → ...i/pages/commonPages/NotImplementedPage.kt b/...wlo/ui/pages/common/NotImplementedPage.kt → ...i/pages/commonPages/NotImplementedPage.kt
@@ -1,4 +1,4 @@
-package com.bobbyesp.spowlo.ui.pages.common
+package com.bobbyesp.spowlo.ui.pages.commonPages
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement