fix blink favorite icon

core/common/src/commonMain/kotlin/io/github/droidkaigi/confsched/compose/ComposeEffectErrorHandler.kt

@@ -5,7 +5,9 @@ import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.ProvidedValue
 import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.currentComposer
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.staticCompositionLocalOf
 import io.github.takahirom.rin.produceRetainedState
 import kotlinx.coroutines.CancellationException
@@ -57,6 +59,28 @@ fun SafeLaunchedEffect(key: Any?, block: suspend CoroutineScope.() -> Unit) {
     }
 }
 
+@Composable
+fun <T : R, R> StateFlow<T>.safeCollectAsState(
+    context: CoroutineContext = EmptyCoroutineContext,
+): State<R> {
+    val composeEffectErrorHandler = LocalComposeEffectErrorHandler.current
+    return produceState(value, this, context) {
+        try {
+            if (context == EmptyCoroutineContext) {
+                collect { value = it }
+            } else {
+                withContext(context) {
+                    collect { value = it }
+                }
+            }
+        } catch (e: CancellationException) {
+            throw e
+        } catch (e: Throwable) {
+            composeEffectErrorHandler.emit(e)
+        }
+    }
+}
+
 @Composable
 fun <T : R, R> Flow<T>.safeCollectAsRetainedState(
     initial: R,

core/data/src/commonMain/kotlin/io/github/droidkaigi/confsched/data/sessions/DefaultSessionsRepository.kt

@@ -10,14 +10,14 @@ import androidx.compose.runtime.setValue
 import co.touchlab.kermit.Logger
 import io.github.droidkaigi.confsched.compose.SafeLaunchedEffect
 import io.github.droidkaigi.confsched.compose.safeCollectAsRetainedState
+import io.github.droidkaigi.confsched.compose.safeCollectAsState
 import io.github.droidkaigi.confsched.data.sessions.response.SessionsAllResponse
 import io.github.droidkaigi.confsched.data.user.UserDataStore
 import io.github.droidkaigi.confsched.model.DroidKaigi2024Day
 import io.github.droidkaigi.confsched.model.SessionsRepository
 import io.github.droidkaigi.confsched.model.Timetable
 import io.github.droidkaigi.confsched.model.TimetableItem
 import io.github.droidkaigi.confsched.model.TimetableItemId
-import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
@@ -44,7 +44,7 @@ public class DefaultSessionsRepository(
                 refreshSessionData()
                 emitAll(sessionCacheDataStore.getTimetableStream())
             },
-            userDataStore.getFavoriteSessionStream(),
+            userDataStore.getFavoriteSessionStream,
         ) { timetable, favorites ->
             timetable.copy(bookmarks = favorites)
         }
@@ -110,8 +110,8 @@ public class DefaultSessionsRepository(
             }
         }.safeCollectAsRetainedState(Timetable())
         val favoriteSessions by remember {
-            userDataStore.getFavoriteSessionStream()
-        }.safeCollectAsRetainedState(persistentSetOf())
+            userDataStore.getFavoriteSessionStream
+        }.safeCollectAsState()
 
         Logger.d { "DefaultSessionsRepository timetable() count=${timetable.timetableItems.size}" }
         return timetable.copy(bookmarks = favoriteSessions)

core/data/src/commonMain/kotlin/io/github/droidkaigi/confsched/data/user/UserDataStore.kt

@@ -8,21 +8,28 @@ import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.stringPreferencesKey
 import io.github.droidkaigi.confsched.model.TimetableItemId
 import kotlinx.collections.immutable.PersistentSet
+import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toPersistentSet
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
 
 public class UserDataStore(private val dataStore: DataStore<Preferences>) {
 
     private val mutableIdToken = MutableStateFlow<String?>(null)
     public val idToken: StateFlow<String?> = mutableIdToken
 
-    public fun getFavoriteSessionStream(): Flow<PersistentSet<TimetableItemId>> {
-        return dataStore.data
+    private val singletonCoroutineScope: CoroutineScope = CoroutineScope(Job())
+
+    public val getFavoriteSessionStream: StateFlow<PersistentSet<TimetableItemId>> =
+        dataStore.data
             .catch { exception ->
                 if (exception is IOException) {
                     emit(emptyPreferences())
@@ -34,11 +41,14 @@ public class UserDataStore(private val dataStore: DataStore<Preferences>) {
                 (preferences[KEY_FAVORITE_SESSION_IDS]?.split(",") ?: listOf())
                     .map { TimetableItemId(it) }
                     .toPersistentSet()
-            }
-    }
+            }.stateIn(
+                scope = singletonCoroutineScope,
+                started = SharingStarted.WhileSubscribed(5_000),
+                initialValue = persistentSetOf()
+            )
 
     public suspend fun toggleFavorite(id: TimetableItemId) {
-        val updatedFavorites = getFavoriteSessionStream().first().toMutableSet()
+        val updatedFavorites = getFavoriteSessionStream.first().toMutableSet()
 
         if (updatedFavorites.contains(id)) {
             updatedFavorites.remove(id)