Merge pull request #1213 from joreilly/room_order

fix room order in session list
joreilly · Mar 29, 2024 · bc7e347 · bc7e347
2 parents c153c1e + 63e4413
commit bc7e347
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/androidApp/src/main/java/dev/johnoreilly/confetti/sessions/SessionListView.kt b/androidApp/src/main/java/dev/johnoreilly/confetti/sessions/SessionListView.kt
@@ -138,11 +138,14 @@ fun SessionListView(
                     ) {
                         LazyColumn(state = listState) {
                             sessions.forEach { (startTime, sessions) ->
+
                                 stickyHeader {
                                     ConfettiHeaderAndroid(icon = Icons.Filled.AccessTime, text = startTime)
                                 }
 
-                                items(sessions) { session ->
+                                val sortedSessions =
+                                    sessions.sortedBy { session -> uiState.rooms.indexOfFirst { it.name == session.room?.name } }
+                                items(sortedSessions) { session ->
                                     SessionItemView(
                                         session = session,
                                         sessionSelected = sessionSelected,

diff --git a/androidApp/src/main/java/dev/johnoreilly/confetti/ui/HomeScaffold.kt b/androidApp/src/main/java/dev/johnoreilly/confetti/ui/HomeScaffold.kt
@@ -16,12 +16,9 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import dev.johnoreilly.confetti.ui.component.ConfettiBackground
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -42,7 +39,7 @@ fun HomeScaffold(
                         Text(
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .padding(horizontal = 32.dp),
+                                .padding(horizontal = 8.dp),
                             maxLines = 2,
                             textAlign = TextAlign.Center,
                             text = title ?: "",

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -4,7 +4,7 @@ default_platform :android
 
 platform :android do
 
-    androidVersionNum = 228
+    androidVersionNum = 230
     wearVersionNum = 325
 
     before_all do

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,9 +14,9 @@ decompose = "2.2.2"
 essenty = "1.3.0"
 googleid = "1.1.0"
 horologist = "0.6.6"
-image-loader = "1.7.7"
+image-loader = "1.7.8"
 io-coil-kt = "2.6.0"
-kmp-nativecoroutines = "1.0.0-ALPHA-24"
+kmp-nativecoroutines = "1.0.0-ALPHA-25"
 kmm-viewmodel = "1.0.0-ALPHA-20"
 koin-android = "3.5.3"
 koin-android-compose = "3.5.3"