Update project

core/common/src/androidMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.kt

@@ -0,0 +1,11 @@
+package org.michaelbel.movies.common.notify.di
+
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+import org.michaelbel.movies.common.notify.NotifyManager
+import org.michaelbel.movies.common.notify.impl.NotifyManagerImpl
+
+actual val notifyKoinModule = module {
+    singleOf(::NotifyManagerImpl) { bind<NotifyManager>() }
+}

core/common/src/androidMain/kotlin/org/michaelbel/movies/common/notify/impl/NotifyManagerImpl.kt

@@ -0,0 +1,13 @@
+package org.michaelbel.movies.common.notify.impl
+
+import android.content.Context
+import org.michaelbel.movies.common.ktx.notificationManager
+import org.michaelbel.movies.common.notify.NotifyManager
+
+internal class NotifyManagerImpl(
+    private val context: Context
+): NotifyManager {
+
+    override val areNotificationsEnabled: Boolean
+        get() = context.notificationManager.areNotificationsEnabled()
+}

core/common/src/commonMain/kotlin/org/michaelbel/movies/common/notify/NotifyManager.kt

@@ -0,0 +1,6 @@
+package org.michaelbel.movies.common.notify
+
+interface NotifyManager {
+
+    val areNotificationsEnabled: Boolean
+}

core/common/src/commonMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.kt

@@ -0,0 +1,5 @@
+package org.michaelbel.movies.common.notify.di
+
+import org.koin.core.module.Module
+
+expect val notifyKoinModule: Module

core/common/src/iosMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.kt

@@ -0,0 +1,11 @@
+package org.michaelbel.movies.common.notify.di
+
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+import org.michaelbel.movies.common.notify.NotifyManager
+import org.michaelbel.movies.common.notify.impl.NotifyManagerImpl
+
+actual val notifyKoinModule = module {
+    singleOf(::NotifyManagerImpl) { bind<NotifyManager>() }
+}

core/common/src/iosMain/kotlin/org/michaelbel/movies/common/notify/impl/NotifyManagerImpl.kt

@@ -0,0 +1,9 @@
+package org.michaelbel.movies.common.notify.impl
+
+import org.michaelbel.movies.common.notify.NotifyManager
+
+internal class NotifyManagerImpl: NotifyManager {
+
+    override val areNotificationsEnabled: Boolean
+        get() = false
+}

core/common/src/jsMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.kt

@@ -0,0 +1,11 @@
+package org.michaelbel.movies.common.notify.di
+
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+import org.michaelbel.movies.common.notify.NotifyManager
+import org.michaelbel.movies.common.notify.impl.NotifyManagerImpl
+
+actual val notifyKoinModule = module {
+    singleOf(::NotifyManagerImpl) { bind<NotifyManager>() }
+}

core/common/src/jsMain/kotlin/org/michaelbel/movies/common/notify/impl/NotifyManagerImpl.kt

@@ -0,0 +1,9 @@
+package org.michaelbel.movies.common.notify.impl
+
+import org.michaelbel.movies.common.notify.NotifyManager
+
+internal class NotifyManagerImpl: NotifyManager {
+
+    override val areNotificationsEnabled: Boolean
+        get() = false
+}

core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.kt

@@ -0,0 +1,11 @@
+package org.michaelbel.movies.common.notify.di
+
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+import org.michaelbel.movies.common.notify.NotifyManager
+import org.michaelbel.movies.common.notify.impl.NotifyManagerImpl
+
+actual val notifyKoinModule = module {
+    singleOf(::NotifyManagerImpl) { bind<NotifyManager>() }
+}

core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/notify/impl/NotifyManagerImpl.kt

@@ -0,0 +1,9 @@
+package org.michaelbel.movies.common.notify.impl
+
+import org.michaelbel.movies.common.notify.NotifyManager
+
+internal class NotifyManagerImpl: NotifyManager {
+
+    override val areNotificationsEnabled: Boolean
+        get() = false
+}

core/common/src/wasmJsMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.kt

@@ -0,0 +1,11 @@
+package org.michaelbel.movies.common.notify.di
+
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+import org.michaelbel.movies.common.notify.NotifyManager
+import org.michaelbel.movies.common.notify.impl.NotifyManagerImpl
+
+actual val notifyKoinModule = module {
+    singleOf(::NotifyManagerImpl) { bind<NotifyManager>() }
+}

core/common/src/wasmJsMain/kotlin/org/michaelbel/movies/common/notify/impl/NotifyManagerImpl.kt

@@ -0,0 +1,9 @@
+package org.michaelbel.movies.common.notify.impl
+
+import org.michaelbel.movies.common.notify.NotifyManager
+
+internal class NotifyManagerImpl: NotifyManager {
+
+    override val areNotificationsEnabled: Boolean
+        get() = false
+}

feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/IntentKtx.android.kt

@@ -0,0 +1,14 @@
+package org.michaelbel.movies.settings.ktx
+
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import org.michaelbel.movies.ui.ktx.appNotificationSettingsIntent
+
+@Composable
+actual fun openAppNotificationSettings(): () -> Unit {
+    val resultContract = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {}
+    val context = LocalContext.current
+    return { resultContract.launch(context.appNotificationSettingsIntent) }
+}

feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.android.kt

@@ -22,13 +22,13 @@ import org.koin.androidx.compose.koinViewModel
 import org.michaelbel.movies.common.MOVIES_GITHUB_URL
 import org.michaelbel.movies.common.browser.openUrl
 import org.michaelbel.movies.common.gender.GrammaticalGender
-import org.michaelbel.movies.common.ktx.notificationManager
 import org.michaelbel.movies.interactor.entity.AppLanguage
 import org.michaelbel.movies.notifications.ktx.rememberPostNotificationsPermissionHandler
 import org.michaelbel.movies.settings.SettingsViewModel
 import org.michaelbel.movies.settings.ktx.currentGrammaticalGender
 import org.michaelbel.movies.settings.ktx.iconSnackbarTextRes
 import org.michaelbel.movies.settings.ktx.isDebug
+import org.michaelbel.movies.settings.ktx.openAppNotificationSettings
 import org.michaelbel.movies.settings.ktx.requestTileService
 import org.michaelbel.movies.settings.ktx.supportSetRequestedApplicationGrammaticalGender
 import org.michaelbel.movies.settings.ktx.versionCode
@@ -53,7 +53,6 @@ import org.michaelbel.movies.settings.model.isWidgetFeatureEnabled
 import org.michaelbel.movies.ui.appicon.IconAlias
 import org.michaelbel.movies.ui.appicon.enabledIcon
 import org.michaelbel.movies.ui.appicon.setIcon
-import org.michaelbel.movies.ui.ktx.appNotificationSettingsIntent
 import org.michaelbel.movies.ui.ktx.collectAsStateCommon
 import org.michaelbel.movies.ui.ktx.displayCutoutWindowInsets
 import org.michaelbel.movies.ui.lifecycle.OnResume
@@ -74,14 +73,13 @@ fun SettingsRoute(
     val isBiometricEnabled by viewModel.isBiometricEnabled.collectAsStateCommon()
     val isScreenshotBlockEnabled by viewModel.isScreenshotBlockEnabled.collectAsStateCommon()
     val appVersionData by viewModel.appVersionData.collectAsStateCommon()
+    var areNotificationsEnabled by remember { mutableStateOf(viewModel.areNotificationsEnabled) }
+    val openAppNotificationSettings = openAppNotificationSettings()
 
     val context = LocalContext.current
     val resultContract = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {}
     val toolbarColor = MaterialTheme.colorScheme.primary.toArgb()
 
-    val notificationManager by remember { mutableStateOf(context.notificationManager) }
-    var areNotificationsEnabled by remember { mutableStateOf(notificationManager.areNotificationsEnabled()) }
-
     val scope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
     val permissionMessage = stringResource(MoviesStrings.settings_post_notifications_should_request)
@@ -94,15 +92,11 @@ fun SettingsRoute(
                 duration = SnackbarDuration.Long
             )
             if (result == SnackbarResult.ActionPerformed) {
-                resultContract.launch(context.appNotificationSettingsIntent)
+                openAppNotificationSettings()
             }
         }
     }
 
-    OnResume {
-        areNotificationsEnabled = notificationManager.areNotificationsEnabled()
-    }
-
     val currentGrammaticalGender by remember { mutableStateOf(context.currentGrammaticalGender) }
 
     val onShowSnackbar: (String) -> Unit = { message ->
@@ -172,7 +166,7 @@ fun SettingsRoute(
                 isEnabled = areNotificationsEnabled,
                 onClick = rememberPostNotificationsPermissionHandler(
                     areNotificationsEnabled = areNotificationsEnabled,
-                    onPermissionGranted = { areNotificationsEnabled = notificationManager.areNotificationsEnabled() },
+                    onPermissionGranted = { areNotificationsEnabled = viewModel.areNotificationsEnabled },
                     onPermissionDenied = onShowPermissionSnackbar
                 )
             ),
@@ -233,4 +227,8 @@ fun SettingsRoute(
         isNavigationIconVisible = false,
         modifier = modifier
     )
+
+    OnResume {
+        areNotificationsEnabled = viewModel.areNotificationsEnabled
+    }
 }

feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/SettingsViewModel.kt

@@ -13,6 +13,7 @@ import org.michaelbel.movies.common.ThemeData
 import org.michaelbel.movies.common.appearance.FeedView
 import org.michaelbel.movies.common.biometric.BiometricController2
 import org.michaelbel.movies.common.list.MovieList
+import org.michaelbel.movies.common.notify.NotifyManager
 import org.michaelbel.movies.common.theme.AppTheme
 import org.michaelbel.movies.common.version.AppVersionData
 import org.michaelbel.movies.common.viewmodel.BaseViewModel
@@ -26,15 +27,21 @@ import org.michaelbel.movies.platform.update.UpdateService
 
 class SettingsViewModel(
     biometricController: BiometricController2,
+    private val notifyManager: NotifyManager,
     private val interactor: Interactor,
     private val reviewService: ReviewService,
     private val updateService: UpdateService,
-    appService: AppService
+    private val appService: AppService
 ): BaseViewModel(), DefaultLifecycleObserver {
 
-    val isReviewFeatureEnabled = appService.flavor == Flavor.Gms
+    val isReviewFeatureEnabled: Boolean
+        get() = appService.flavor == Flavor.Gms
 
-    val isUpdateFeatureEnabled = appService.flavor == Flavor.Gms
+    val isUpdateFeatureEnabled: Boolean
+        get() = appService.flavor == Flavor.Gms
+
+    val areNotificationsEnabled: Boolean
+        get() = notifyManager.areNotificationsEnabled
 
     val themeData: StateFlow<ThemeData> = interactor.themeData
         .stateIn(

feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/di/SettingsKoinModule.kt

@@ -3,13 +3,15 @@ package org.michaelbel.movies.settings.di
 import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
 import org.michaelbel.movies.common.biometric.di.biometricKoinModule2
+import org.michaelbel.movies.common.notify.di.notifyKoinModule
 import org.michaelbel.movies.interactor.di.interactorKoinModule
 import org.michaelbel.movies.settings.SettingsViewModel
 
 val settingsKoinModule = module {
     includes(
         biometricKoinModule2,
+        notifyKoinModule,
         interactorKoinModule
     )
-    viewModel { SettingsViewModel(get(), get(), get(), get(), get()) }
+    viewModel { SettingsViewModel(get(), get(), get(), get(), get(), get()) }
 }

feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/IntentKtx.kt

@@ -0,0 +1,6 @@
+package org.michaelbel.movies.settings.ktx
+
+import androidx.compose.runtime.Composable
+
+@Composable
+expect fun openAppNotificationSettings(): () -> Unit

feature/settings-impl/src/iosMain/kotlin/org/michaelbel/movies/settings/ktx/IntentKtx.ios.kt

@@ -0,0 +1,8 @@
+package org.michaelbel.movies.settings.ktx
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun openAppNotificationSettings(): () -> Unit {
+    return {}
+}

feature/settings-impl/src/jvmMain/kotlin/org/michaelbel/movies/settings/ktx/IntentKtx.jvm.kt

@@ -0,0 +1,8 @@
+package org.michaelbel.movies.settings.ktx
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun openAppNotificationSettings(): () -> Unit {
+    return {}
+}