update gradle

app/build.gradle

@@ -69,10 +69,6 @@ android {
         kotlinCompilerExtensionVersion "1.5.3"
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
@@ -97,7 +93,7 @@ easylauncher {
 dependencies {
     implementation project(':domain')
 
-    implementation platform('com.google.firebase:firebase-bom:32.5.0')
+    implementation platform('com.google.firebase:firebase-bom:33.2.0')
 
     // Google
     implementation "com.google.android.material:material:$material_version"

app/src/main/java/com/nielsmasdorp/nederadio/data/stream/ApiStreamProvider.kt

@@ -0,0 +1,28 @@
+package com.nielsmasdorp.nederadio.data.stream
+
+import com.nielsmasdorp.nederadio.data.network.reponse.StreamResponse
+import com.nielsmasdorp.nederadio.domain.stream.Stream
+import com.nielsmasdorp.nederadio.domain.stream.StreamProvider
+import io.ktor.client.*
+import io.ktor.client.call.body
+import io.ktor.client.request.*
+
+/**
+ * @author Niels Masdorp (NielsMasdorp)
+ */
+class ApiStreamProvider(private val client: HttpClient) : StreamProvider {
+
+    override suspend fun getStreams(
+        isFavorite: suspend (String) -> Boolean,
+        isCurrent: suspend (String) -> Boolean
+    ): List<Stream> {
+        return client.get("/data.json")
+            .body<List<StreamResponse>>()
+            .map { stream ->
+                stream.toDomain(
+                    isCurrent = isCurrent(stream.id),
+                    isFavorite = isFavorite(stream.id)
+                )
+            }
+    }
+}

app/src/main/java/com/nielsmasdorp/nederadio/data/stream/LocalStreamProvider.kt

@@ -0,0 +1,30 @@
+package com.nielsmasdorp.nederadio.data.stream
+
+import com.nielsmasdorp.nederadio.domain.stream.Stream
+import com.nielsmasdorp.nederadio.domain.stream.StreamProvider
+
+/**
+ * @author Niels Masdorp (NielsMasdorp)
+ */
+@Suppress("Unused")
+class LocalStreamProvider : StreamProvider {
+
+    override suspend fun getStreams(
+        isFavorite: suspend (String) -> Boolean,
+        isCurrent: suspend (String) -> Boolean
+    ): List<Stream> {
+        // one could use this to provide a local list of streams if no backend needs to be used
+        // example:
+        return listOf(
+            Stream(
+                isActive = isCurrent("0"),
+                isFavorite = isFavorite("0"),
+                id = "0",
+                url = "url",
+                title = "title",
+                imageUrl = "imageUrl"
+            )
+        )
+        //   return listOf()
+    }
+}

app/src/main/java/com/nielsmasdorp/nederadio/data/stream/ApiStreamRepository.kt → app/src/main/java/com/nielsmasdorp/nederadio/data/stream/StreamRepositoryImpl.kt

@@ -2,10 +2,10 @@ package com.nielsmasdorp.nederadio.data.stream
 
 import android.content.Context
 import com.nielsmasdorp.nederadio.R
-import com.nielsmasdorp.nederadio.data.network.StreamApi
 import com.nielsmasdorp.nederadio.domain.connectivity.NetworkManager
 import com.nielsmasdorp.nederadio.domain.settings.SettingsRepository
 import com.nielsmasdorp.nederadio.domain.stream.Failure
+import com.nielsmasdorp.nederadio.domain.stream.StreamProvider
 import com.nielsmasdorp.nederadio.domain.stream.StreamRepository
 import com.nielsmasdorp.nederadio.domain.stream.Streams
 import com.nielsmasdorp.nederadio.util.toFailure
@@ -19,10 +19,10 @@ import kotlinx.coroutines.launch
  * @author Niels Masdorp (NielsMasdorp)
  * loads streams from API
  */
-class ApiStreamRepository(
+class StreamRepositoryImpl(
     private val context: Context,
     private val networkManager: NetworkManager,
-    private val streamApi: StreamApi,
+    private val streamProvider: StreamProvider,
     private val settingsRepository: SettingsRepository,
 ) : StreamRepository {
 
@@ -42,6 +42,7 @@ class ApiStreamRepository(
                             stream.copy(isFavorite = favorites.contains(stream.id))
                         }
                     )
+
                     else -> streamsFlow.value
                 }
             }
@@ -65,6 +66,7 @@ class ApiStreamRepository(
                     }
                 }
             )
+
             else -> streamsFlow.value
         }
     }
@@ -79,6 +81,7 @@ class ApiStreamRepository(
                     }
                 )
             }
+
             else -> streamsFlow.value
         }
     }
@@ -94,13 +97,12 @@ class ApiStreamRepository(
                 )
             } else {
                 try {
-                    val streams = streamApi.getStreams()
-                        .map {
-                            it.toDomain(
-                                isCurrent = settingsRepository.getLastPlayedId() == it.id,
-                                isFavorite = settingsRepository.isFavorite(id = it.id)
-                            )
-                        }
+                    val currentId = settingsRepository.getLastPlayedId()
+                    val favoriteIds = settingsRepository.getFavorites()
+                    val streams = streamProvider.getStreams(
+                        isCurrent = { id -> currentId == id },
+                        isFavorite = { id -> favoriteIds.contains(id) }
+                    )
                     streamsFlow.value = Streams.Success(streams = streams)
                 } catch (ex: Exception) {
                     streamsFlow.value =

app/src/main/java/com/nielsmasdorp/nederadio/di/Koin.kt

@@ -5,11 +5,11 @@ import android.net.ConnectivityManager
 import androidx.media3.common.util.UnstableApi
 import com.nielsmasdorp.nederadio.data.equalizer.AndroidEqualizerManager
 import com.nielsmasdorp.nederadio.data.network.AndroidNetworkManager
-import com.nielsmasdorp.nederadio.data.network.StreamApi
 import com.nielsmasdorp.nederadio.data.network.ktorHttpClient
 import com.nielsmasdorp.nederadio.data.settings.SharedPreferencesSettingsRepository
 import com.nielsmasdorp.nederadio.data.stream.AndroidStreamManager
-import com.nielsmasdorp.nederadio.data.stream.ApiStreamRepository
+import com.nielsmasdorp.nederadio.data.stream.ApiStreamProvider
+import com.nielsmasdorp.nederadio.data.stream.StreamRepositoryImpl
 import com.nielsmasdorp.nederadio.domain.connectivity.NetworkManager
 import com.nielsmasdorp.nederadio.domain.equalizer.EqualizerManager
 import com.nielsmasdorp.nederadio.domain.equalizer.GetEqualizerSettings
@@ -30,7 +30,7 @@ import org.koin.dsl.module
  */
 @UnstableApi
 val streamModule = module {
-    single<StreamRepository> { ApiStreamRepository(androidContext(), get(), get(), get()) }
+    single<StreamRepository> { StreamRepositoryImpl(androidContext(), get(), get(), get()) }
     single { GetAllStreams(repository = get()) }
     single { GetSuccessfulStreams(getAllStreams = get()) }
     single { GetActiveStream(repository = get()) }
@@ -48,6 +48,8 @@ val streamModule = module {
             streamLibrary = get()
         )
     }
+    single<StreamProvider> { ApiStreamProvider(client = ktorHttpClient) }
+    // single<StreamProvider> { LocalStreamProvider() }
 }
 
 val settingsModule = module {
@@ -70,7 +72,6 @@ val equalizerModule = module {
 val networkModule = module {
     single { androidApplication().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager }
     single<NetworkManager> { AndroidNetworkManager(connectivityManager = get()) }
-    single { StreamApi(client = ktorHttpClient) }
 }
 
 val uiModule = module {

app/src/main/java/com/nielsmasdorp/nederadio/playback/StreamService.kt

@@ -80,7 +80,7 @@ class StreamService :
         initialize()
     }
 
-    override fun onTaskRemoved(rootIntent: Intent) {
+    override fun onTaskRemoved(rootIntent: Intent?) {
         super.onTaskRemoved(rootIntent)
         teardown()
         stopSelf()

app/src/main/java/com/nielsmasdorp/nederadio/ui/extension/ViewExtensions.kt

@@ -1,15 +1,18 @@
 package com.nielsmasdorp.nederadio.ui.extension
 
 import android.content.res.ColorStateList
+import androidx.annotation.OptIn
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.view.children
+import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.PlayerControlView
 
 /**
  * @author Niels Masdorp (NielsMasdorp)
  *
  * Set colors for the relevant controls
  */
+@OptIn(UnstableApi::class)
 fun PlayerControlView.setColors(playPauseColor: Int) {
     children.first().findViewWithTag<AppCompatImageView>("playPause")?.apply {
         backgroundTintList = ColorStateList.valueOf(playPauseColor)

build.gradle

@@ -16,7 +16,7 @@ buildscript {
     ext.kotlinx_guava_version = '1.6.4'
 
     //androidx
-    ext.androidx_media3_version = '1.3.1'
+    ext.androidx_media3_version = '1.4.1'
     ext.androidx_compose_version = '1.5.4'
     ext.androidx_compose_material3_version = '1.2.1'
 
@@ -53,19 +53,21 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath "com.google.firebase:firebase-appdistribution-gradle:$app_distribution_plugin_version"
     }
 }
 
+
+
 plugins {
     id "io.gitlab.arturbosch.detekt" version "$detekt_version"
 }
 
 detekt {
-    input = files(collectSourceDirs())
+    source = files(collectSourceDirs())
     parallel = true
     autoCorrect = true
     config = files("${rootProject.projectDir}/config/detekt/detekt.yml")
@@ -142,12 +144,14 @@ allprojects {
                     "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
                     "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
                     "-opt-in=androidx.compose.runtime.ExperimentalComposeApi",
-                    "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi"
+                    "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
             ]
+            jvmTarget = JavaVersion.VERSION_17
         }
     }
+
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.getBuildDirectory()
 }

domain/src/main/java/com/nielsmasdorp/nederadio/domain/stream/StreamProvider.kt

@@ -0,0 +1,17 @@
+package com.nielsmasdorp.nederadio.domain.stream
+
+/**
+ * @author Niels Masdorp (NielsMasdorp)
+ */
+interface StreamProvider {
+
+    /**
+     * @return a list of [Stream] to be used by the app
+     * @param isCurrent whether a [Stream] id belongs to the current stream that is being loaded
+     * @param isFavorite whether a [Stream] id belongs to a favorite stream
+     */
+    suspend fun getStreams(
+        isFavorite: suspend (String) -> Boolean,
+        isCurrent: suspend (String) -> Boolean
+    ): List<Stream>
+}

gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip