Adding FeedViewModel.

.editorconfig

@@ -1,14 +1,14 @@
 root = true
 
 [*.{kt,kts}]
-max_line_length = 120
+max_line_length = 140
 indent_size = 4
 insert_final_newline = true
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
 ktlint_function_naming_ignore_when_annotated_with = Composable
 ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 1
-ktlint_standard_property-naming = disabled
-ktlint_standard_max-line-length = disabled
+ktlint_standard_chain-method-continuation = disabled
+ktlint_standard_function-expression-body = disabled
 ktlint_standard_multiline-expression-wrapping = disabled
 ktlint_standard_string-template-indent = disabled

android/app/build.gradle.kts

@@ -57,7 +57,6 @@ dependencies {
     implementation(libs.accompanist.systemuicontroller)
     implementation(libs.activity.compose)
     implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.koin.android)
     implementation(libs.ui.graphics)
 

gradle/libs.versions.toml

@@ -28,7 +28,7 @@ kotlinxDatetime = "0.6.1"
 kotlinxSerialization = "1.7.3"
 ktlint = "1.0.1"
 ktor = "3.0.1"
-lifecycle = "2.8.7"
+lifecycle = "2.8.4"
 material = "1.12.0"
 minSdk = "23"
 okio = "3.9.1"
@@ -54,8 +54,7 @@ androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
 androidx-glance = { module = "androidx.glance:glance", version.ref = "glance" }
 androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "glance" }
-androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
-androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
+androidx-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycle" }
 androidx-palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "palette" }
 androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test" }

shared/app/build.gradle.kts

@@ -36,6 +36,7 @@ kotlin {
                 implementation(compose.runtime)
                 implementation(compose.foundation)
                 implementation(compose.material3)
+                implementation(libs.androidx.lifecycle.viewmodel)
                 implementation(libs.koin.core)
                 implementation(libs.slack.circuit)
             }

shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/feed/FeedPresenter.kt

@@ -90,7 +90,7 @@ class FeedPresenter(
         }
     }
 
-    private fun observePastWeeksMatches() =
+    private fun observePastWeeksMatches(): Flow<List<MatchDetailDisplayModel>> =
         getPastWeeksMatchesUseCase
             .invoke()
             .map { matchList ->

shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/feed/FeedUiState.kt

@@ -0,0 +1,26 @@
+package com.adammcneilly.pocketleague.shared.app.feed
+
+import com.adammcneilly.pocketleague.core.displaymodels.EventGroupDisplayModel
+import com.adammcneilly.pocketleague.core.displaymodels.MatchDetailDisplayModel
+
+data class FeedUiState(
+    val recentMatches: List<MatchDetailDisplayModel>,
+    val ongoingEvents: List<EventGroupDisplayModel>,
+    val upcomingEvents: List<EventGroupDisplayModel>,
+) {
+    companion object {
+        private const val PLACEHOLDER_LIST_COUNT = 3
+
+        fun placeholderState(): FeedUiState {
+            val recentMatches = List(PLACEHOLDER_LIST_COUNT) {
+                MatchDetailDisplayModel.placeholder
+            }
+
+            return FeedUiState(
+                recentMatches = recentMatches,
+                ongoingEvents = EventGroupDisplayModel.placeholder,
+                upcomingEvents = EventGroupDisplayModel.placeholder,
+            )
+        }
+    }
+}

shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/feed/FeedViewModel.kt

@@ -0,0 +1,99 @@
+package com.adammcneilly.pocketleague.shared.app.feed
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.adammcneilly.pocketleague.core.datetime.TimeProvider
+import com.adammcneilly.pocketleague.core.displaymodels.EventGroupDisplayModel
+import com.adammcneilly.pocketleague.core.displaymodels.toDetailDisplayModel
+import com.adammcneilly.pocketleague.core.displaymodels.toSummaryDisplayModel
+import com.adammcneilly.pocketleague.core.models.Event
+import com.adammcneilly.pocketleague.data.event.api.EventListRequest
+import com.adammcneilly.pocketleague.data.event.api.EventRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+class FeedViewModel(
+    private val getPastWeeksMatchesUseCase: GetPastWeeksMatchesUseCase,
+    private val eventRepository: EventRepository,
+    private val timeProvider: TimeProvider,
+) : ViewModel() {
+    private val mutableState = MutableStateFlow(FeedUiState.placeholderState())
+    val state = mutableState.asStateFlow()
+
+    init {
+        observePastWeeksMatches()
+        observeOngoingEvents()
+        observeUpcomingEvents()
+    }
+
+    private fun observePastWeeksMatches() {
+        val matchFlow = getPastWeeksMatchesUseCase
+            .invoke()
+            .map { matchList ->
+                matchList.map { match ->
+                    match.toDetailDisplayModel(timeProvider)
+                }
+            }
+
+        viewModelScope.launch {
+            matchFlow.collect { matchList ->
+                mutableState.update { currentState ->
+                    currentState.copy(
+                        recentMatches = matchList,
+                    )
+                }
+            }
+        }
+    }
+
+    private fun observeOngoingEvents() {
+        val request = EventListRequest.OnDate(
+            dateUtc = timeProvider.now(),
+        )
+
+        val eventFlow = eventListRequestFlow(request)
+
+        viewModelScope.launch {
+            eventFlow.collect { eventList ->
+                mutableState.update { currentState ->
+                    currentState.copy(
+                        ongoingEvents = eventList,
+                    )
+                }
+            }
+        }
+    }
+
+    private fun observeUpcomingEvents() {
+        val request = EventListRequest.AfterDate(
+            dateUtc = timeProvider.now(),
+        )
+
+        val eventFlow = eventListRequestFlow(request)
+
+        viewModelScope.launch {
+            eventFlow.collect { eventList ->
+                mutableState.update { currentState ->
+                    currentState.copy(
+                        ongoingEvents = eventList,
+                    )
+                }
+            }
+        }
+    }
+
+    private fun eventListRequestFlow(
+        request: EventListRequest,
+    ): Flow<List<EventGroupDisplayModel>> {
+        return eventRepository
+            .stream(request)
+            .map { eventList ->
+                eventList.map(Event::toSummaryDisplayModel)
+            }
+            .map(EventGroupDisplayModel.Companion::mapFromEventList)
+    }
+}