Merge branch 'migrate/search-viewmodel' into migrate/user-viewmodel

Author: nirvan73

shared/build.gradle.kts

@@ -206,6 +206,7 @@ kotlin {
                 }
                 implementation(libs.androidx.paging.runtime)
                 implementation(libs.androidx.paging.compose)
+                implementation(libs.androidx.startup.runtime)
             }
         }
 

shared/src/androidMain/AndroidManifest.xml

@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
+    <application>
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="org.listenbrainz.shared.ApplicationContextInitializer"
+                android:value="androidx.startup" />
+        </provider>
+    </application>
 </manifest>

shared/src/androidMain/kotlin/org/listenbrainz/shared/ApplicationContextInitializer.kt

@@ -0,0 +1,16 @@
+package org.listenbrainz.shared
+
+import android.content.Context
+import androidx.startup.Initializer
+
+internal lateinit var applicationContext: Context
+    private set
+
+internal class ApplicationContextInitializer: Initializer<Context> {
+    override fun create(context: Context): Context {
+        applicationContext = context
+        return context
+    }
+
+    override fun dependencies(): List<Class<out Initializer<*>?>?> = emptyList()
+}

shared/src/androidMain/kotlin/org/listenbrainz/shared/Platform.android.kt

@@ -10,7 +10,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import org.listenbrainz.shared.di.database.ListensSubmissionDatabase
 import org.listenbrainz.shared.model.dao.PendingListensDao
 import org.listenbrainz.shared.repository.AppPreferences
-import org.listenbrainz.shared.repository.PlatformContext
 import org.listenbrainz.shared.util.ANDROID_LOG_DIR_NAME
 import org.listenbrainz.shared.util.AndroidFileLogWriter
 import org.listenbrainz.shared.util.AndroidLogSubmitter
@@ -25,24 +24,23 @@ import org.listenbrainz.shared.service.ListensService
 import org.listenbrainz.shared.service.UserService
 import org.listenbrainz.shared.service.YouTubeApiService
 import org.listenbrainz.shared.di.database.BrainzPlayerDatabase
+import org.listenbrainz.shared.repository.PlatformContext
 import org.listenbrainz.shared.util.AndroidSongsData
 import org.listenbrainz.shared.util.SongsData
 import org.listenbrainz.shared.util.AlbumsData
 import org.listenbrainz.shared.util.AndroidAlbumsData
 
 actual fun platform() = "Android"
 
-
 actual fun provideLogger(
-    context: PlatformContext,
     buildInfo: BuildInfo
 ): Logger {
 
     val writers = mutableListOf(
         platformLogWriter()
     )
 
-    val externalFilesDir = context.getExternalFilesDir(null)
+    val externalFilesDir = applicationContext.getExternalFilesDir(null)
 
     if(externalFilesDir != null){
         val logDir = File(externalFilesDir, ANDROID_LOG_DIR_NAME).apply { mkdirs() }
@@ -58,24 +56,23 @@ actual fun provideLogger(
     )
 }
 
-actual fun provideLogSubmitter(context: PlatformContext, buildInfo: BuildInfo): LogSubmitter {
-    return AndroidLogSubmitter(context,buildInfo)
+actual fun provideLogSubmitter(buildInfo: BuildInfo): LogSubmitter {
+    return AndroidLogSubmitter(buildConfig = buildInfo)
 }
 
 
 actual fun provideRemotePlaybackHandler(
-    appContext: PlatformContext,
     youTubeApiService: YouTubeApiService
 ): RemotePlaybackHandler {
-    return AndroidRemotePlaybackHandlerImpl(appContext,youTubeApiService)
+    return AndroidRemotePlaybackHandlerImpl(youTubeApiService)
 }
 
 
-actual fun getBrainzPlayerDatabase(context: PlatformContext): RoomDatabase.Builder<BrainzPlayerDatabase> {
-    val listensDB = context.getDatabasePath("brainzplayer_database")
+actual fun getBrainzPlayerDatabase(): RoomDatabase.Builder<BrainzPlayerDatabase> {
+    val brainzPlayerDb = applicationContext.getDatabasePath("brainzplayer_database")
     return Room.databaseBuilder<BrainzPlayerDatabase>(
-        context = context,
-        name = listensDB.absolutePath
+        context = applicationContext,
+        name = brainzPlayerDb.absolutePath
     )
 }
 
@@ -84,24 +81,23 @@ actual fun provideListensRepositoryImpl(
     appPreferences: AppPreferences,
     userService: UserService,
     pendingListensDao: PendingListensDao,
-    ioDispatcher: CoroutineDispatcher,
-    appContext: PlatformContext
+    ioDispatcher: CoroutineDispatcher
 ): ListensRepository {
-    return AndroidListensRepositoryImpl(service,appPreferences,userService,pendingListensDao,ioDispatcher,appContext)
+    return AndroidListensRepositoryImpl(service,appPreferences,userService,pendingListensDao,ioDispatcher)
 }
 
-actual fun getListensSubmissionDatabase(appContext: PlatformContext): RoomDatabase.Builder<ListensSubmissionDatabase> {
-    val listensDb = appContext.getDatabasePath("listens_scrobble_database")
+actual fun getListensSubmissionDatabase(): RoomDatabase.Builder<ListensSubmissionDatabase> {
+    val listensDb = applicationContext.getDatabasePath("listens_scrobble_database")
     return Room.databaseBuilder<ListensSubmissionDatabase>(
-        context = appContext,
+        context = applicationContext,
         name = listensDb.absolutePath
     )
 }
 
-actual fun provideSongData(context: PlatformContext): SongsData {
-    return AndroidSongsData(context)
+actual fun provideSongData(): SongsData {
+    return AndroidSongsData()
 }
 
-actual fun provideAlbumsData(context: PlatformContext): AlbumsData {
-    return AndroidAlbumsData(context)
+actual fun provideAlbumsData(): AlbumsData {
+    return AndroidAlbumsData()
 }

shared/src/androidMain/kotlin/org/listenbrainz/shared/preferences/AndroidDataStoreContext.kt

@@ -6,6 +6,7 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStoreFile
 import okio.Path.Companion.toPath
+import org.listenbrainz.shared.applicationContext
 
 /**
  * Android implementation of DataStore factory.
@@ -14,8 +15,7 @@ actual fun createDataStore(
     name: String,
     migrations: List<DataMigration<Preferences>>
 ): DataStore<Preferences> {
-    val context = AndroidDataStoreContext.require()
-    val path = context.preferencesDataStoreFile(name).absolutePath
+    val path = applicationContext.preferencesDataStoreFile(name).absolutePath
     return PreferenceDataStoreFactory.createWithPath(
         produceFile = { path.toPath() },
         migrations = migrations

shared/src/androidMain/kotlin/org/listenbrainz/shared/preferences/DataStoreFactory.android.kt

@@ -6,7 +6,7 @@ import android.provider.Settings
 import androidx.datastore.core.DataMigration
 import androidx.datastore.preferences.SharedPreferencesMigration
 import androidx.datastore.preferences.core.Preferences
-import org.listenbrainz.shared.preferences.AndroidDataStoreContext
+import org.listenbrainz.shared.applicationContext
 import org.listenbrainz.shared.preferences.PreferenceKeys
 
 actual typealias PlatformContext = Context
@@ -48,18 +48,15 @@ actual fun settingsPlatformDataMigrations(
         )
     )
 
-actual fun platformInitDataStoreContext(context: PlatformContext) {
-    AndroidDataStoreContext.set(context)
-}
-
 actual fun platformPackageVersion(context: PlatformContext): String =
     try {
         context.packageManager?.getPackageInfo(context.packageName, 0)?.versionName ?: "N/A"
     } catch (e: PackageManager.NameNotFoundException) {
         "unknown"
     }
 
-actual fun platformIsNotificationServiceAllowed(context: PlatformContext): Boolean {
+actual val isNotificationServiceAllowed: Boolean get() {
+    val context = applicationContext
     val listeners =
         Settings.Secure.getString(context.contentResolver, "enabled_notification_listeners")
     return listeners != null && listeners.contains(context.packageName)

shared/src/androidMain/kotlin/org/listenbrainz/shared/repository/PlatformPreferences.android.kt

@@ -3,9 +3,9 @@ package org.listenbrainz.shared.repository.listens
 import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import kotlinx.coroutines.CoroutineDispatcher
+import org.listenbrainz.shared.applicationContext
 import org.listenbrainz.shared.model.dao.PendingListensDao
 import org.listenbrainz.shared.repository.AppPreferences
-import org.listenbrainz.shared.repository.PlatformContext
 import org.listenbrainz.shared.service.ListensService
 import org.listenbrainz.shared.service.UserService
 
@@ -14,22 +14,21 @@ class AndroidListensRepositoryImpl(
     appPreferences: AppPreferences,
     userService: UserService,
     pendingListensDao: PendingListensDao,
-    ioDispatcher: CoroutineDispatcher,
-    private val androidContext: PlatformContext
-): ListensRepositoryImpl(service,appPreferences,userService,pendingListensDao,ioDispatcher,androidContext) {
+    ioDispatcher: CoroutineDispatcher
+): ListensRepositoryImpl(service,appPreferences,userService,pendingListensDao,ioDispatcher) {
 
     override fun getPackageIcon(packageName: String): Drawable? {
         return try {
-            androidContext.packageManager.getApplicationIcon(packageName)
+            applicationContext.packageManager.getApplicationIcon(packageName)
         } catch(e:Exception){
             null
         }
     }
 
     override fun getPackageLabel(packageName: String): String {
         return try {
-            val info = androidContext.packageManager.getApplicationInfo(packageName, 0)
-            androidContext.packageManager.getApplicationLabel(info).toString()
+            val info = applicationContext.packageManager.getApplicationInfo(packageName, 0)
+            applicationContext.packageManager.getApplicationLabel(info).toString()
         } catch (e: PackageManager.NameNotFoundException) {
             packageName
         }

shared/src/androidMain/kotlin/org/listenbrainz/shared/repository/listens/AndroidListensRepositoryImpl.kt

@@ -29,6 +29,7 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.listenbrainz.shared.BuildKonfig
+import org.listenbrainz.shared.applicationContext
 import org.listenbrainz.shared.model.ListenBitmap
 import org.listenbrainz.shared.model.ResponseError
 import org.listenbrainz.shared.model.playback.SharedPlayerContext
@@ -44,8 +45,8 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
 class AndroidRemotePlaybackHandlerImpl(
-    private val appContext: PlatformContext,
     private val youtubeApiService: YouTubeApiService,
+    private val appContext: PlatformContext = applicationContext,
     private val logger: Log = Log
 ) : SharedRemotePlaybackHandlerImpl(youtubeApiService) {
 

shared/src/androidMain/kotlin/org/listenbrainz/shared/repository/remoteplayer/AndroidRemotePlaybackHandlerImpl.kt

@@ -2,11 +2,12 @@ package org.listenbrainz.shared.util
 
 import android.os.Build
 import android.provider.MediaStore
+import org.listenbrainz.shared.applicationContext
 import org.listenbrainz.shared.model.Album
 import org.listenbrainz.shared.repository.PlatformContext
 
 class AndroidAlbumsData(
-    private val context: PlatformContext
+    private val context: PlatformContext = applicationContext
 ): AlbumsData(){
     override fun albums(): List<Album> {
         val albums = mutableListOf<Album>()