Visible offline 2.0

app/src/main/java/com/dd3boh/outertune/MainActivity.kt

@@ -314,7 +314,7 @@ class MainActivity : ComponentActivity() {
 
         setContent {
             val connectivityObserver = NetworkConnectivityObserver(this)
-            val isInternetConnected by connectivityObserver.networkStatus.collectAsState(false)
+            val isNetworkConnected by connectivityObserver.networkStatus.collectAsState(false)
 
             val enableDynamicTheme by rememberPreference(DynamicThemeKey, defaultValue = true)
             val darkTheme by rememberEnumPreference(DarkModeKey, defaultValue = DarkMode.AUTO)
@@ -692,7 +692,7 @@ class MainActivity : ComponentActivity() {
                         LocalDownloadUtil provides downloadUtil,
                         LocalShimmerTheme provides ShimmerTheme,
                         LocalSyncUtils provides syncUtils,
-                        LocalIsInternetConnected provides isInternetConnected
+                        LocalIsNetworkConnected provides isNetworkConnected
                     ) {
                         Scaffold(
                             topBar = {
@@ -1269,4 +1269,4 @@ val LocalPlayerConnection = staticCompositionLocalOf<PlayerConnection?> { error(
 val LocalPlayerAwareWindowInsets = compositionLocalOf<WindowInsets> { error("No WindowInsets provided") }
 val LocalDownloadUtil = staticCompositionLocalOf<DownloadUtil> { error("No DownloadUtil provided") }
 val LocalSyncUtils = staticCompositionLocalOf<SyncUtils> { error("No SyncUtils provided") }
-val LocalIsInternetConnected = staticCompositionLocalOf<Boolean> { error("No Network Status provided") }
+val LocalIsNetworkConnected = staticCompositionLocalOf<Boolean> { error("No Network Status provided") }

app/src/main/java/com/dd3boh/outertune/db/daos/ArtistsDao.kt

@@ -113,7 +113,7 @@ interface ArtistsDao {
             ArtistSortType.PLAY_TIME -> "SUM(totalPlayTime) ASC"
         }
 
-        val where = when (filter){
+        val where = when (filter) {
             ArtistFilter.DOWNLOADED -> "song.dateDownload IS NOT NULL"
             ArtistFilter.LIBRARY -> "song.inLibrary IS NOT NULL"
             ArtistFilter.LIKED -> "artist.bookmarkedAt IS NOT NULL"

app/src/main/java/com/dd3boh/outertune/extensions/SongsExt.kt

@@ -0,0 +1,10 @@
+package com.dd3boh.outertune.extensions
+
+import com.dd3boh.outertune.db.entities.Song
+
+fun List<Song>.getAvailableSongs(isInternetConnected: Boolean): List<Song> {
+    if (isInternetConnected) {
+        return this
+    }
+    return filter { it.song.isAvailableOffline() }
+}

app/src/main/java/com/dd3boh/outertune/playback/DownloadUtil.kt

@@ -134,15 +134,15 @@ class DownloadUtil @Inject constructor(
         songs.forEach { song -> downloadSong(song.id, song.title) }
     }
 
-    fun download(song: MediaMetadata){
+    fun download(song: MediaMetadata) {
         downloadSong(song.id, song.title)
     }
 
-    fun download(song: SongEntity){
+    fun download(song: SongEntity) {
         downloadSong(song.id, song.title)
     }
 
-    private fun downloadSong(id: String, title: String){
+    private fun downloadSong(id: String, title: String) {
         val downloadRequest = DownloadRequest.Builder(id, id.toUri())
             .setCustomCacheKey(id)
             .setData(title.toByteArray())
@@ -154,19 +154,19 @@ class DownloadUtil @Inject constructor(
             false)
     }
 
-    fun resumeDownloadsOnStart(){
+    fun resumeDownloadsOnStart() {
         DownloadService.sendResumeDownloads(
             context,
             ExoDownloadService::class.java,
             false)
     }
 
-    fun autoDownloadIfLiked(songs: List<SongEntity>){
+    fun autoDownloadIfLiked(songs: List<SongEntity>) {
         songs.forEach { song -> autoDownloadIfLiked(song) }
     }
 
-    fun autoDownloadIfLiked(song: SongEntity){
-        if (!song.liked || song.dateDownload != null){
+    fun autoDownloadIfLiked(song: SongEntity) {
+        if (!song.liked || song.dateDownload != null) {
             return
         }
 
@@ -199,7 +199,7 @@ class DownloadUtil @Inject constructor(
                     }
 
                     CoroutineScope(Dispatchers.IO).launch {
-                        if (download.state == Download.STATE_COMPLETED){
+                        if (download.state == Download.STATE_COMPLETED) {
                             val updateTime = Instant.ofEpochMilli(download.updateTimeMs).atZone(ZoneOffset.UTC).toLocalDateTime()
                             database.updateDownloadStatus(download.request.id, updateTime)
                         }

app/src/main/java/com/dd3boh/outertune/ui/component/AnchorDraggable.kt

@@ -166,7 +166,10 @@ fun SwipeToQueueBox(
 
                     coroutineScope.launch {
                         snackbarHostState.showSnackbar(
-                            message = context.getString(R.string.song_added_to_queue, item.mediaMetadata.title),
+                            message = context.getString(
+                                R.string.song_added_to_queue,
+                                item.mediaMetadata.title
+                            ),
                             duration = SnackbarDuration.Short
                         )
                     }
@@ -178,9 +181,9 @@ fun SwipeToQueueBox(
         )
     }
 
-    if (!enabled){
+    if (!enabled) {
         Box { content() }
-    }
+    } 
     else {
          LaunchedEffect(state.currentValue) {
             if (state.currentValue == DragAnchors.Start && !state.isAnimationRunning) {
@@ -215,5 +218,4 @@ fun SwipeToQueueBox(
             }
         )
     }
-
 }