Apps notifications permission request added, now playing service tuned

Author: hotmule

app-android/src/main/AndroidManifest.xml

@@ -45,18 +45,18 @@
 
         </activity>
 
-        <!--service
+        <service
+            android:name="ru.hotmule.lastik.feature.now.playing.NowPlayingService"
+            android:label="Now playing"
             android:exported="false"
-            android:name=".feature.now_playing.NowPlayingService"
-            android:label="@string/now_playing"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
 
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
             </intent-filter>
 
-        </service-->
+        </service>
 
     </application>
 
-</manifest>
+</manifest>

app-android/src/main/java/ru/hotmule/lastik/App.kt

@@ -1,14 +1,10 @@
 package ru.hotmule.lastik
 
-import Lastik.R
 import android.app.Application
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.content.Context
-import android.content.Intent
-import android.os.Build
-import org.kodein.di.*
-import ru.hotmule.lastik.feature.now_playing.NowPlayingService
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.bindInstance
 import ru.hotmule.lastik.feature.root.rootComponentModule
 
 class App : Application(), DIAware {
@@ -19,22 +15,4 @@ class App : Application(), DIAware {
 
         bindInstance<Context> { this@App }
     }
-
-    override fun onCreate() {
-        super.onCreate()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            (getSystemService(NOTIFICATION_SERVICE) as NotificationManager).createNotificationChannel(
-                NotificationChannel(
-                    getString(R.string.scrobbler_notification_channel_id),
-                    getString(R.string.scrobbler_notification_channel_name),
-                    NotificationManager.IMPORTANCE_DEFAULT
-                )
-            )
-        }
-
-        startService(
-            Intent(this, NowPlayingService::class.java)
-        )
-    }
-}
+}

data-sdk/build.gradle.kts

@@ -4,7 +4,12 @@ plugins {
 
 kotlin {
     sourceSets {
-        named("commonMain") {
+        androidMain {
+            dependencies {
+                implementation(libs.androidx.core)
+            }
+        }
+        commonMain {
             dependencies {
                 implementation(projects.utils)
                 implementation(libs.coil.core)
@@ -16,4 +21,4 @@ kotlin {
             }
         }
     }
-}
+}

data-sdk/src/androidMain/kotlin/ru/hotmule/lastik/data/sdk/permission/PermissionManager.kt

@@ -0,0 +1,28 @@
+package ru.hotmule.lastik.data.sdk.permission
+
+import android.content.Context
+import android.content.Intent
+import android.provider.Settings
+import androidx.core.app.NotificationManagerCompat
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.instance
+
+actual class PermissionManager actual constructor(override val di: DI) : DIAware {
+
+    private val context: Context by instance()
+
+    actual fun isNotificationsAccessGranted(): Boolean {
+        return NotificationManagerCompat
+            .getEnabledListenerPackages(context)
+            .contains(context.packageName)
+    }
+
+    actual fun requestNotificationsAccess() {
+        context.startActivity(
+            Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS).apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            }
+        )
+    }
+}

data-sdk/src/commonMain/kotlin/ru/hotmule/lastik/data/sdk/module.kt

@@ -1,12 +1,16 @@
 package ru.hotmule.lastik.data.sdk
 
-import org.kodein.di.*
+import org.kodein.di.DI
+import org.kodein.di.bindSingleton
+import org.kodein.di.instance
+import ru.hotmule.lastik.data.sdk.permission.PermissionManager
 import ru.hotmule.lastik.data.sdk.packages.PackageManager
 import ru.hotmule.lastik.data.sdk.prefs.PrefsStore
 import ru.hotmule.lastik.data.sdk.prefs.SettingsFactory
 
 val sdkDataModule = DI.Module("sdkData") {
+    bindSingleton { PermissionManager(di) }
     bindSingleton { PackageManager(di) }
     bindSingleton { SettingsFactory(di) }
     bindSingleton { PrefsStore(instance()) }
-}
+}

data-sdk/src/commonMain/kotlin/ru/hotmule/lastik/data/sdk/permission/PermissionManager.kt

@@ -0,0 +1,11 @@
+package ru.hotmule.lastik.data.sdk.permission
+
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+
+expect class PermissionManager(di: DI): DIAware {
+
+    fun isNotificationsAccessGranted(): Boolean
+
+    fun requestNotificationsAccess()
+}

data-sdk/src/desktopMain/kotlin/ru/hotmule/lastik/data/sdk/permission/PermissionManager.kt

@@ -0,0 +1,13 @@
+package ru.hotmule.lastik.data.sdk.permission
+
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+
+actual class PermissionManager actual constructor(override val di: DI) : DIAware {
+
+    actual fun isNotificationsAccessGranted(): Boolean = false
+
+    actual fun requestNotificationsAccess() {
+        println("Notifications access requested")
+    }
+}

feature-library/src/commonMain/kotlin/ru/hotmule/lastik/feature/library/LibraryComponent.kt

@@ -2,7 +2,7 @@ package ru.hotmule.lastik.feature.library
 
 import com.arkivanov.decompose.router.stack.ChildStack
 import com.arkivanov.decompose.value.Value
-import ru.hotmule.lastik.feature.app.NowPlayingComponent
+import ru.hotmule.lastik.feature.now.playing.NowPlayingComponent
 import ru.hotmule.lastik.feature.main.MainComponent
 import ru.hotmule.lastik.feature.top.TopComponent
 import ru.hotmule.lastik.feature.profile.ProfileComponent

feature-library/src/commonMain/kotlin/ru/hotmule/lastik/feature/library/LibraryComponentImpl.kt

@@ -12,7 +12,7 @@ import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.factory
 import org.kodein.di.instance
-import ru.hotmule.lastik.feature.app.NowPlayingComponent
+import ru.hotmule.lastik.feature.now.playing.NowPlayingComponent
 import ru.hotmule.lastik.feature.library.LibraryComponent.Child
 import ru.hotmule.lastik.feature.main.MainComponent
 import ru.hotmule.lastik.feature.top.TopComponent

feature-library/src/commonMain/kotlin/ru/hotmule/lastik/feature/library/module.kt

@@ -3,7 +3,7 @@ package ru.hotmule.lastik.feature.library
 import com.arkivanov.decompose.ComponentContext
 import org.kodein.di.DI
 import org.kodein.di.bindFactory
-import ru.hotmule.lastik.feature.app.nowPlayingComponentModule
+import ru.hotmule.lastik.feature.now.playing.nowPlayingComponentModule
 import ru.hotmule.lastik.feature.main.mainComponentModule
 import ru.hotmule.lastik.feature.top.topComponentModule
 import ru.hotmule.lastik.feature.profile.profileComponentModule

feature-now-playing/src/androidMain/kotlin/ru/hotmule/lastik/feature/now_playing/NowPlayingService.kt renamed to feature-now-playing/src/androidMain/kotlin/ru/hotmule/lastik/feature/now/playing/NowPlayingService.kt

@@ -1,35 +1,24 @@
-package ru.hotmule.lastik.feature.now_playing
+package ru.hotmule.lastik.feature.now.playing
 
-import Lastik.R
 import android.content.ComponentName
 import android.content.Intent
-import android.graphics.Bitmap
 import android.media.MediaMetadata
 import android.media.session.MediaController
 import android.media.session.MediaSessionManager
 import android.media.session.PlaybackState
 import android.service.notification.NotificationListenerService
-import androidx.core.app.NotificationCompat
 import androidx.core.content.getSystemService
 import coil3.asImage
-import coil3.toBitmap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
-import ru.hotmule.lastik.feature.app.NowPlayingComponent
-import ru.hotmule.lastik.feature.app.NowPlayingComponent.*
 import ru.hotmule.lastik.utils.AppCoroutineDispatcher
 
 class NowPlayingService : NotificationListenerService(), DIAware {
 
-    companion object {
-        private const val SCROBBLE_NOTIFICATION_ID = 1
-    }
-
     override val di: DI by closestDI()
 
     private val nowPlayingComponent by instance<NowPlayingComponent>()
@@ -39,9 +28,7 @@ class NowPlayingService : NotificationListenerService(), DIAware {
 
     override fun onCreate() {
         super.onCreate()
-
         catchPlayers()
-        provideNowPlaying()
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int = START_STICKY
@@ -100,7 +87,7 @@ class NowPlayingService : NotificationListenerService(), DIAware {
     ) {
         nowPlayingComponent.onTrackDetected(
             packageName = packageName,
-            track = Track(
+            track = NowPlayingComponent.Track(
                 metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST),
                 metadata?.getString(MediaMetadata.METADATA_KEY_ALBUM),
                 metadata?.getString(MediaMetadata.METADATA_KEY_TITLE),
@@ -110,33 +97,4 @@ class NowPlayingService : NotificationListenerService(), DIAware {
             )
         )
     }
-
-    private fun provideNowPlaying() {
-
-        serviceScope.launch {
-            nowPlayingComponent.model.collect {
-
-                if (it.isPlaying) {
-                    startForeground(
-                        SCROBBLE_NOTIFICATION_ID,
-                        nowPlayingNotification(it.track, it.artist, it.art?.toBitmap())
-                    )
-                } else {
-                    stopForeground(true)
-                }
-            }
-        }
-    }
-
-    private fun nowPlayingNotification(
-        track: String,
-        artist: String,
-        art: Bitmap?,
-    ) = NotificationCompat.Builder(this, getString(R.string.scrobbler_notification_channel_id))
-            .setContentTitle(track)
-            .setContentText(artist)
-            .setSmallIcon(R.drawable.ic_now_playing)
-            .setLargeIcon(art)
-            .setOngoing(true)
-            .build()
-}
+}

feature-now-playing/src/androidMain/res/drawable/ic_now_playing.xml

@@ -1,4 +1,4 @@
-package ru.hotmule.lastik.feature.app
+package ru.hotmule.lastik.feature.now.playing
 
 import coil3.Image
 import kotlinx.coroutines.flow.Flow
@@ -32,4 +32,4 @@ interface NowPlayingComponent {
         packageName: String,
         track: Track
     )
-}
+}

feature-now-playing/src/androidMain/res/values/strings.xml

@@ -1,13 +1,12 @@
-package ru.hotmule.lastik.feature.app
+package ru.hotmule.lastik.feature.now.playing
 
 import com.arkivanov.mvikotlin.extensions.coroutines.states
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.kodein.di.DirectDI
 import org.kodein.di.instance
-import ru.hotmule.lastik.feature.app.NowPlayingComponent.*
-import ru.hotmule.lastik.feature.app.store.NowPlayingStore.*
-import ru.hotmule.lastik.feature.app.store.NowPlayingStoreFactory
+import ru.hotmule.lastik.feature.now.playing.store.NowPlayingStore
+import ru.hotmule.lastik.feature.now.playing.store.NowPlayingStoreFactory
 
 internal class NowPlayingComponentImpl(directDi: DirectDI) : NowPlayingComponent {
 
@@ -18,8 +17,8 @@ internal class NowPlayingComponentImpl(directDi: DirectDI) : NowPlayingComponent
         db = directDi.instance()
     ).create()
 
-    override val model: Flow<Model> = store.states.map {
-        Model(
+    override val model: Flow<NowPlayingComponent.Model> = store.states.map {
+        NowPlayingComponent.Model(
             isPlaying = it.isPlaying,
             track = it.track?.name ?: "UNKNOWN",
             artist = it.track?.albumArtist ?: it.track?.artist ?: "UNKNOWN",
@@ -28,10 +27,10 @@ internal class NowPlayingComponentImpl(directDi: DirectDI) : NowPlayingComponent
     }
 
     override fun onPlayStateChanged(packageName: String, isPlaying: Boolean) {
-        store.accept(Intent.CheckPlayState(packageName, isPlaying))
+        store.accept(NowPlayingStore.Intent.CheckPlayState(packageName, isPlaying))
     }
 
-    override fun onTrackDetected(packageName: String, track: Track) {
-        store.accept(Intent.CheckDetectedTrack(packageName, track))
+    override fun onTrackDetected(packageName: String, track: NowPlayingComponent.Track) {
+        store.accept(NowPlayingStore.Intent.CheckDetectedTrack(packageName, track))
     }
-}
+}

feature-now-playing/src/commonMain/kotlin/ru/hotmule/lastik/feature/app/store/NowPlayingStore.kt

@@ -1,9 +1,9 @@
-package ru.hotmule.lastik.feature.app
+package ru.hotmule.lastik.feature.now.playing
 
 import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 
 val nowPlayingComponentModule = DI.Module("nowPlayingComponent") {
 
     bindSingleton { NowPlayingComponentImpl(directDI) }
-}
+}