Merge pull request #1224 from joreilly/compose_desktop_updates

compose/coil multiplatform refactoring

androidApp/src/main/java/dev/johnoreilly/confetti/ConfettiApplication.kt

@@ -4,8 +4,6 @@ import android.app.Application
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.work.WorkManager
-import coil.ImageLoader
-import coil.ImageLoaderFactory
 import com.google.firebase.FirebaseApp
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.crashlytics.setCustomKeys
@@ -22,7 +20,7 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.androidx.workmanager.koin.workManagerFactory
 
-class ConfettiApplication : Application(), ImageLoaderFactory {
+class ConfettiApplication : Application() {
 
     private val isFirebaseInstalled
         get() = try {
@@ -32,8 +30,6 @@ class ConfettiApplication : Application(), ImageLoaderFactory {
             false
         }
 
-    override fun newImageLoader(): ImageLoader = get()
-
     override fun onCreate() {
         super.onCreate()
 

androidApp/src/main/java/dev/johnoreilly/confetti/sessiondetails/SessionDetailsView.kt

@@ -44,9 +44,8 @@ import org.koin.compose.koinInject
 import java.time.format.DateTimeFormatter
 
 @Composable
-fun SessionDetailsRoute(
-    component: SessionDetailsComponent,
-) {
+fun SessionDetailsRoute(component: SessionDetailsComponent) {
+
     val user by koinInject<Authentication>().currentUser.collectAsStateWithLifecycle()
     val uiState by component.uiState.subscribeAsState()
     val isBookmarked by component.isBookmarked.collectAsStateWithLifecycle()

androidApp/src/main/java/dev/johnoreilly/confetti/sessions/SessionsRoute.kt

@@ -12,6 +12,7 @@ import com.arkivanov.decompose.extensions.compose.jetpack.subscribeAsState
 import dev.johnoreilly.confetti.decompose.SessionsComponent
 import dev.johnoreilly.confetti.decompose.SessionsUiState
 import dev.johnoreilly.confetti.ui.HomeScaffold
+import dev.johnoreilly.confetti.ui.SessionListGridView
 import dev.johnoreilly.confetti.ui.isExpanded
 import kotlinx.coroutines.flow.receiveAsFlow
 

androidApp/src/main/java/dev/johnoreilly/confetti/ui/ConfettiApp.kt

@@ -7,7 +7,6 @@ import com.arkivanov.decompose.extensions.compose.jetpack.stack.animation.fade
 import com.arkivanov.decompose.extensions.compose.jetpack.stack.animation.stackAnimation
 import dev.johnoreilly.confetti.decompose.AppComponent
 import dev.johnoreilly.confetti.decompose.AppComponent.Child
-import dev.johnoreilly.confetti.conferences.ConferencesRoute
 
 @Composable
 fun ConfettiApp(
@@ -20,7 +19,7 @@ fun ConfettiApp(
     ) {
         when (val child = it.instance) {
             is Child.Loading -> LoadingView()
-            is Child.Conferences -> ConferencesRoute(child.component)
+            is Child.Conferences -> ConferenceListView(child.component)
             is Child.Conference -> ConferenceRoute(child.component, windowSizeClass)
         }
     }

androidApp/src/main/java/dev/johnoreilly/confetti/ui/HomeRoute.kt

@@ -20,6 +20,7 @@ import androidx.compose.material.icons.outlined.Person
 import androidx.compose.material.icons.outlined.Place
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -183,7 +184,7 @@ private fun Children(
 @Composable
 private fun BottomBar(component: HomeComponent) {
     Column {
-        Divider()
+        HorizontalDivider()
         NavigationBar(
             contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
             tonalElevation = 0.dp,

compose-desktop/build.gradle.kts

@@ -16,6 +16,9 @@ dependencies {
     implementation(compose.material3)
     implementation(compose.components.resources)
 
+    implementation("com.arkivanov.decompose:decompose:2.2.2-compose-experimental")
+    implementation("com.arkivanov.decompose:extensions-compose-jetbrains:2.2.2-compose-experimental")
+
     implementation("com.mikepenz:multiplatform-markdown-renderer-m3:0.13.0")
     implementation("com.mikepenz:multiplatform-markdown-renderer-jvm:0.13.0")
     implementation(project(":shared"))

compose-desktop/src/main/kotlin/GeminiQueryView.kt

@@ -18,6 +18,7 @@ import androidx.compose.material3.ShapeDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -28,43 +29,41 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
-import com.apollographql.apollo3.cache.normalized.FetchPolicy
 import com.mikepenz.markdown.m3.Markdown
-import dev.johnoreilly.confetti.ConfettiRepository
 import dev.johnoreilly.confetti.GeminiApi
-import dev.johnoreilly.confetti.GetConferencesQuery
-import dev.johnoreilly.confetti.fragment.SessionDetails
+import dev.johnoreilly.confetti.decompose.RecommendationsComponent
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 
 @Composable
-fun GeminiQueryView(conference: GetConferencesQuery.Conference) {
-    val geminiApi = remember { GeminiApi() }
-    var query by remember { mutableStateOf("") }
-    var queryResponse by remember { mutableStateOf("") }
-
-    val keyboardController = LocalSoftwareKeyboardController.current
-    var showProgress by remember { mutableStateOf(false) }
-
-    val repository = koin.get<ConfettiRepository>()
-    val sessionList = remember { mutableStateOf<List<SessionDetails>?>(emptyList()) }
+fun GeminiQueryView(component: RecommendationsComponent) {
+    val sessionList by component.sessions.collectAsState(emptyList())
     var conferenceInfo by remember { mutableStateOf("") }
-    val coroutineScope = rememberCoroutineScope()
-
-    LaunchedEffect(conference) {
-        val conferenceData = repository.conferenceData(conference.id, FetchPolicy.CacheFirst)
-        sessionList.value = conferenceData.data?.sessions?.nodes?.map { it.sessionDetails }
 
+    LaunchedEffect(component) {
         conferenceInfo = "Speakers, Session ID, Title, Start Time, Description,\n"
-        sessionList.value?.forEach { session ->
+        sessionList.forEach { session ->
             session.sessionDescription?.let {
                 val speakers = session.speakers.joinToString(" ") { it.speakerDetails.name }
                 conferenceInfo += "${speakers}, ${session.id}, ${session.title}, ${session.startsAt}, ${session.sessionDescription}, \n"
             }
         }
     }
 
+    RecommendationsView(conferenceInfo)
+}
+
+
+@Composable
+fun RecommendationsView(conferenceInfo: String) {
+    val geminiApi = remember { GeminiApi() }
+    var query by remember { mutableStateOf("") }
+    var queryResponse by remember { mutableStateOf("") }
+
+    val keyboardController = LocalSoftwareKeyboardController.current
+    var showProgress by remember { mutableStateOf(false) }
+    val coroutineScope = rememberCoroutineScope()
 
     Column(Modifier.padding(16.dp).verticalScroll(rememberScrollState())) {
         OutlinedTextField(
@@ -115,4 +114,4 @@ fun GeminiQueryView(conference: GetConferencesQuery.Conference) {
             Markdown(queryResponse)
         }
     }
-}
+}