Merge pull request #10 from RLD-JL/version-1.0.6

Version 1.0.6
RLD-JL · Jun 28, 2022 · a80c656 · a80c656
2 parents 4cc9d47 + 87f543a
commit a80c656
Show file tree

Hide file tree

Showing 23 changed files with 859 additions and 423 deletions.
diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ https://www.youtube.com/watch?v=IAExKH6L5P4
 - Adds songs to favorite
 - Check your recent played
 - Check your most listened songs
+- Set close timer for the app
 - Different themes 
 - Shuffle, repeat one/all songs
 - Notification manager displayed

diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -12,20 +12,24 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.4.2")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0-rc01")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0-rc02")
     implementation("androidx.activity:activity-compose:1.4.0")
     implementation("androidx.palette:palette-ktx:1.0.0")
 
-    implementation("androidx.compose.ui:ui-util:1.2.0-rc01")
-    implementation("androidx.compose.material:material:1.2.0-rc01")
-    implementation("androidx.compose.ui:ui:1.2.0-rc01")
-    implementation("androidx.compose.animation:animation:1.2.0-rc01")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.2.0-rc01")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.2.0-rc01")
+    implementation("androidx.compose.ui:ui-util:1.2.0-rc02")
+    implementation("androidx.compose.material:material:1.2.0-rc02")
+    implementation("androidx.compose.ui:ui:1.2.0-rc02")
+    implementation("androidx.compose.animation:animation:1.2.0-rc02")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.2.0-rc02")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.2.0-rc02")
+
+    implementation ("com.google.android.exoplayer:exoplayer-core:2.18.0")
+    implementation ("com.google.android.exoplayer:extension-mediasession:2.18.0")
+    implementation ("com.google.android.exoplayer:exoplayer-ui:2.18.0")
+
+    implementation ("dev.chrisbanes.snapper:snapper:0.2.2")
+    implementation ("androidx.work:work-runtime-ktx:2.7.1")
 
-    implementation ("com.google.android.exoplayer:exoplayer-core:2.17.1")
-    implementation ("com.google.android.exoplayer:extension-mediasession:2.17.1")
-    implementation ("com.google.android.exoplayer:exoplayer-ui:2.17.1")
 
     implementation("androidx.lifecycle:lifecycle-process:2.5.0-rc02")
     implementation("io.coil-kt:coil-compose:2.1.0")
@@ -47,8 +51,8 @@ android {
         applicationId = "com.rld.justlisten.android"
         minSdk = 21
         targetSdk = 32
-        versionCode = 17
-        versionName = "1.0.5"
+        versionCode = 18
+        versionName = "1.0.6"
         vectorDrawables {
             useSupportLibrary = true
         }

diff --git a/androidApp/src/main/java/com/rld/justlisten/android/MainActivity.kt b/androidApp/src/main/java/com/rld/justlisten/android/MainActivity.kt
@@ -8,6 +8,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.work.WorkManager
 import com.rld.justlisten.android.ui.MainComposable
 import com.rld.justlisten.android.ui.theme.ColorPallet
 import com.rld.justlisten.android.ui.theme.JustListenTheme
@@ -23,8 +24,10 @@ class MainActivity : ComponentActivity() {
         val model = (application as JustListenApp).model
         val musicServiceConnection = (application as JustListenApp).musicServiceConnection
         installSplashScreen().apply {
-
         }
+        val workManager = WorkManager.getInstance(applicationContext)
+        workManager.cancelUniqueWork("SleepWorker")
+
         val settingsInfo = mutableStateOf(model.repository.getSettingsInfo())
         setContent {
             JustListenTheme(

diff --git a/androidApp/src/main/java/com/rld/justlisten/android/exoplayer/MusicSource.kt b/androidApp/src/main/java/com/rld/justlisten/android/exoplayer/MusicSource.kt
@@ -35,7 +35,7 @@ class MusicSource {
     }
 
     private fun MediaMetadataCompat.Builder.from(song: Item): MediaMetadataCompat.Builder {
-        artist = song.title
+        artist = song.user
         id = song.id
         title = song.title
         displayIconUri = song.songIconList.songImageURL480px

diff --git a/...pp/src/main/java/com/rld/justlisten/android/ui/bottombars/bottombarnav/Level1BottomBar.kt b/...pp/src/main/java/com/rld/justlisten/android/ui/bottombars/bottombarnav/Level1BottomBar.kt
@@ -56,7 +56,7 @@ fun Navigation.Level1BottomBar(
                 BottomNavigationItem(
                     icon = { if (donateSelected)Icon(painter = painterResource(id = R.drawable.ic_baseline_monetization_on_24), "Donate")
                            else Icon(painter = painterResource(id = R.drawable.ic_outline_monetization_on_24), "Donate")},
-                    label = { Text("Donate", fontSize = 10.sp) },
+                    label = { Text("Support", fontSize = 10.sp) },
                     selected = selectedTab.URI == Level1Navigation.Donation.screenIdentifier.URI,
                     onClick = { navigateByLevel1Menu(Level1Navigation.Donation) },
                     selectedContentColor = MaterialTheme.colors.primaryVariant,

diff --git a/androidApp/src/main/java/com/rld/justlisten/android/ui/libraryscreen/LibraryScreen.kt b/androidApp/src/main/java/com/rld/justlisten/android/ui/libraryscreen/LibraryScreen.kt
@@ -10,7 +10,7 @@ import com.rld.justlisten.android.ui.libraryscreen.components.FavoritePlaylist
 import com.rld.justlisten.android.ui.libraryscreen.components.MostPlayedSongs
 import com.rld.justlisten.android.ui.libraryscreen.components.PlaylistView
 import com.rld.justlisten.android.ui.libraryscreen.components.RowListOfRecentActivity
-import com.rld.justlisten.android.ui.playlistscreen.Header
+import com.rld.justlisten.android.ui.playlistscreen.components.Header
 import com.rld.justlisten.android.ui.utils.playMusicFromId
 import com.rld.justlisten.datalayer.models.PlayListModel
 import com.rld.justlisten.datalayer.models.SongIconList
@@ -25,7 +25,8 @@ fun LibraryScreen(
     onFavoritePlaylistPressed: (String, String, String, String) -> Unit,
     onMostPlaylistPressed: (String, String, String, String) -> Unit,
     onPlayListViewClicked: () -> Unit,
-    lasItemReached: (Int) -> Unit
+    lasItemReached: (Int) -> Unit,
+    isPlayerReady: Boolean
 ) {
     Box(modifier = Modifier
         .fillMaxSize()
@@ -45,7 +46,7 @@ fun LibraryScreen(
                             false
                         )
                         val item = TrackItem(playlistModel, isFavorite)
-                        playMusicFromId(musicServiceConnection, listOf(item), id, false)
+                        playMusicFromId(musicServiceConnection, listOf(item), id, isPlayerReady)
                     }
                 },
                 lasItemReached = lasItemReached,