Remove default values from NotificationSettings

JetBrains · Feb 11, 2025 · 0895106 · 0895106
1 parent 36d8a65
commit 0895106
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 23 deletions.
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/ConferenceService.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/ConferenceService.kt
@@ -142,17 +142,14 @@ class ConferenceService(
     fun requestNotificationPermissions() {
         scope.launch {
             storage.setNotificationsAllowed(true)
-            storage.setNotificationSettings(NotificationSettings())  // Set default values (all true)
             notificationManager.requestPermission()
         }
     }
 
     fun getNotificationSettings(): Flow<NotificationSettings> = storage.getNotificationSettings()
 
-    fun setNotificationSettings(settings: NotificationSettings) {
-        scope.launch {
-            storage.setNotificationSettings(settings)
-        }
+    suspend fun setNotificationSettings(settings: NotificationSettings) {
+        storage.setNotificationSettings(settings)
     }
 
     /**

diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/Model.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/Model.kt
@@ -100,7 +100,7 @@ class NewsItem(
 
 @Serializable
 data class NotificationSettings(
-    val scheduleUpdates: Boolean = true,
-    val kotlinConfNews: Boolean = true,
-    val jetbrainsNews: Boolean = true,
+    val scheduleUpdates: Boolean,
+    val kotlinConfNews: Boolean,
+    val jetbrainsNews: Boolean,
 )
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/SettingsScreen.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/SettingsScreen.kt
@@ -142,14 +142,15 @@ private fun SettingsScreenImpl(
 
             Divider(thickness = 1.dp, color = KotlinConfTheme.colors.strokePale)
 
-            val notificationSettings by viewModel.notificationSettings.collectAsStateWithLifecycle()
-            NotificationSettings(
-                notificationSettings = notificationSettings,
-                onChangeSettings = { newSettings ->
-                    viewModel.setNotificationSettings(newSettings)
-                    onNotificationSettingsChange(newSettings)
-                }
-            )
+            val notificationSettings = viewModel.notificationSettings.collectAsStateWithLifecycle().value
+            if (notificationSettings != null)
+                NotificationSettings(
+                    notificationSettings = notificationSettings,
+                    onChangeSettings = { newSettings ->
+                        viewModel.setNotificationSettings(newSettings)
+                        onNotificationSettingsChange(newSettings)
+                    }
+                )
         }
     }
 }

diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/SettingsViewModel.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/SettingsViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
 import org.jetbrains.kotlinconf.ConferenceService
 import org.jetbrains.kotlinconf.NotificationSettings
 import org.jetbrains.kotlinconf.Theme
@@ -15,14 +16,16 @@ class SettingsViewModel(
     val theme: StateFlow<Theme> = service.getTheme()
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), Theme.SYSTEM)
 
-    val notificationSettings: StateFlow<NotificationSettings> = service.getNotificationSettings()
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), NotificationSettings())
+    val notificationSettings: StateFlow<NotificationSettings?> = service.getNotificationSettings()
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null)
 
     fun setTheme(theme: Theme) {
         service.setTheme(theme)
     }
 
     fun setNotificationSettings(settings: NotificationSettings) {
-        service.setNotificationSettings(settings)
+        viewModelScope.launch {
+            service.setNotificationSettings(settings)
+        }
     }
 }
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/StartNotificationsViewModel.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/StartNotificationsViewModel.kt
@@ -5,17 +5,20 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
 import org.jetbrains.kotlinconf.ConferenceService
 import org.jetbrains.kotlinconf.NotificationSettings
 
 class StartNotificationsViewModel(
     private val service: ConferenceService,
 ) : ViewModel() {
     val notificationSettings: StateFlow<NotificationSettings> = service.getNotificationSettings()
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), NotificationSettings())
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), NotificationSettings(true, true, true))
 
     fun setNotificationSettings(settings: NotificationSettings) {
-        service.setNotificationSettings(settings)
+        viewModelScope.launch {
+            service.setNotificationSettings(settings)
+        }
     }
 
     fun requestNotificationPermissions() {

diff --git a/...ed/src/commonMain/kotlin/org/jetbrains/kotlinconf/storage/MultiplatformSettingsStorage.kt b/...ed/src/commonMain/kotlin/org/jetbrains/kotlinconf/storage/MultiplatformSettingsStorage.kt
@@ -53,8 +53,7 @@ class MultiplatformSettingsStorage(context: ApplicationContext) : ApplicationSto
 
     override fun getNotificationSettings(): Flow<NotificationSettings> =
         settings.getStringOrNullFlow(Keys.NOTIFICATION_SETTINGS)
-            .map { it?.let { Json.decodeFromString<NotificationSettings>(it) } ?: NotificationSettings() }
-
+            .map { it?.let { Json.decodeFromString<NotificationSettings>(it) } ?: NotificationSettings(true, true, true) }
     override suspend fun setNotificationSettings(value: NotificationSettings) = settings.set(
         Keys.NOTIFICATION_SETTINGS,
         Json.encodeToString(value)