[feature/droidknights#222] Session쪽 List Param을 PersistentList로 대체하기

l2hyunwoo · Aug 22, 2023 · 510b6e7 · 510b6e7
1 parent 86311ca
commit 510b6e7
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/feature/session/build.gradle.kts b/feature/session/build.gradle.kts
@@ -5,3 +5,7 @@ plugins {
 android {
     namespace = "com.droidknights.app2023.feature.session"
 }
+
+dependencies {
+    implementation(libs.kotlinx.immutable)
+}
diff --git a/...ure/session/src/main/java/com/droidknights/app2023/feature/session/SessionDetailScreen.kt b/...ure/session/src/main/java/com/droidknights/app2023/feature/session/SessionDetailScreen.kt
@@ -39,6 +39,8 @@ import com.droidknights.app2023.core.model.Room
 import com.droidknights.app2023.core.model.Session
 import com.droidknights.app2023.core.model.Speaker
 import com.droidknights.app2023.core.model.Tag
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.datetime.LocalDateTime
 
 @Composable
@@ -104,14 +106,15 @@ private fun SessionDetailContent(session: Session) {
         SessionDetailTitle(title = session.title, modifier = Modifier.padding(top = 8.dp))
         Spacer(modifier = Modifier.height(8.dp))
         SessionChips(session = session)
+            SessionOverview(content = session.content)
         if (session.content.isNotEmpty()) {
             Spacer(modifier = Modifier.height(16.dp))
             SessionOverview(content = session.content)
             Spacer(modifier = Modifier.height(56.dp))
         } else {
             Spacer(modifier = Modifier.height(40.dp))
         }
-        SessionDetailSpeaker(session.speakers)
+        SessionDetailSpeaker(session.speakers.toPersistentList())
     }
 }
 
@@ -130,7 +133,7 @@ private fun SessionDetailTitle(
 
 @Composable
 private fun SessionDetailSpeaker(
-    speakers: List<Speaker>,
+    speakers: PersistentList<Speaker>,
     modifier: Modifier = Modifier,
 ) {
     Column(modifier = modifier) {

diff --git a/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionScreen.kt b/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionScreen.kt
@@ -25,6 +25,7 @@ import com.droidknights.app2023.core.designsystem.theme.KnightsTheme
 import com.droidknights.app2023.core.model.Room
 import com.droidknights.app2023.core.model.Session
 import com.droidknights.app2023.core.ui.RoomText
+import kotlinx.collections.immutable.PersistentList
 
 @Composable
 internal fun SessionScreen(
@@ -84,7 +85,7 @@ private val SessionGroupSpace = 16.dp
 
 private fun LazyListScope.sessionItems(
     room: Room,
-    items: List<Session>,
+    items: PersistentList<Session>,
     topPadding: Dp,
     onItemClick: (Session) -> Unit,
 ) {

diff --git a/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionState.kt b/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionState.kt
@@ -14,23 +14,25 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import com.droidknights.app2023.core.model.Room
 import com.droidknights.app2023.core.model.Session
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.mapNotNull
 
 data class SessionGroup(
     val room: Room,
-    val sessions: List<Session>,
+    val sessions: PersistentList<Session>,
 )
 
 @Stable
 class SessionState(
-    private val sessions: List<Session>,
+    private val sessions: PersistentList<Session>,
     val listState: LazyListState,
     selectedRoom: Room? = sessions.map { it.room }.firstOrNull(),
 ) {
     val groups: List<SessionGroup> = sessions
         .groupBy { it.room }
-        .map { (room, sessions) -> SessionGroup(room, sessions) }
+        .map { (room, sessions) -> SessionGroup(room, sessions.toPersistentList()) }
 
     val rooms: List<Room> = sessions.map { it.room }.distinct()
 
@@ -69,7 +71,7 @@ class SessionState(
 
     companion object {
         fun Saver(
-            sessions: List<Session>,
+            sessions: PersistentList<Session>,
             listState: LazyListState,
         ): Saver<SessionState, *> = Saver(
             save = { it.selectedRoom },
@@ -86,7 +88,7 @@ class SessionState(
 
 @Composable
 internal fun rememberSessionState(
-    sessions: List<Session>,
+    sessions: PersistentList<Session>,
     listState: LazyListState = rememberLazyListState(),
 ): SessionState {
     val state = rememberSaveable(

diff --git a/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionTopAppBar.kt b/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionTopAppBar.kt
@@ -43,6 +43,8 @@ import com.droidknights.app2023.core.designsystem.theme.KnightsTheme
 import com.droidknights.app2023.core.designsystem.theme.surfaceDim
 import com.droidknights.app2023.core.model.Room
 import com.droidknights.app2023.core.ui.RoomText
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.launch
 
 @Composable
@@ -65,7 +67,7 @@ internal fun SessionTopAppBar(
             ) {
                 SessionTabRow(
                     selectedRoom = sessionState.selectedRoom,
-                    rooms = rooms,
+                    rooms = rooms.toPersistentList(),
                     onRoomSelect = { room ->
                         coroutineScope.launch {
                             sessionState.scrollTo(room)
@@ -94,7 +96,7 @@ internal fun SessionTopAppBar(
 @Composable
 private fun SessionTabRow(
     selectedRoom: Room?,
-    rooms: List<Room>,
+    rooms: PersistentList<Room>,
     onRoomSelect: (Room) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -188,7 +190,7 @@ private fun SessionTabIndicatorPreview() {
     KnightsTheme {
         SessionTabRow(
             selectedRoom = Room.TRACK2,
-            rooms = Room.values().toList(),
+            rooms = Room.values().toList().toPersistentList(),
             onRoomSelect = { },
             modifier = Modifier.size(320.dp, 48.dp),
         )

diff --git a/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionUiState.kt b/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionUiState.kt
@@ -1,7 +1,9 @@
 package com.droidknights.app2023.feature.session
 
 import com.droidknights.app2023.core.model.Session
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.persistentListOf
 
 data class SessionUiState(
-    val sessions: List<Session> = emptyList(),
+    val sessions: PersistentList<Session> = persistentListOf(),
 )
diff --git a/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionViewModel.kt b/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.droidknights.app2023.core.domain.usecase.GetSessionsUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.flow
@@ -17,6 +18,6 @@ class SessionViewModel @Inject constructor(
 ) : ViewModel() {
 
     val uiState: StateFlow<SessionUiState> = flow { emit(getSessionsUseCase()) }
-        .map { SessionUiState(it) }
+        .map { SessionUiState(it.toPersistentList()) }
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), SessionUiState())
 }