use Circuit to render the dashboard lessons UI

Author: frett

app/src/main/kotlin/org/cru/godtools/ui/dashboard/DashboardLayout.kt

@@ -58,8 +58,7 @@ import org.cru.godtools.model.Tool
 import org.cru.godtools.shared.analytics.AnalyticsScreenNames
 import org.cru.godtools.ui.dashboard.home.AllFavoritesScreen
 import org.cru.godtools.ui.dashboard.home.HomeScreen
-import org.cru.godtools.ui.dashboard.lessons.DashboardLessonsEvent
-import org.cru.godtools.ui.dashboard.lessons.LessonsLayout
+import org.cru.godtools.ui.dashboard.lessons.LessonsScreen
 import org.cru.godtools.ui.dashboard.tools.ToolsScreen
 import org.cru.godtools.ui.drawer.DrawerMenuLayout
 import org.cru.godtools.ui.tooldetails.ToolDetailsScreen
@@ -68,7 +67,6 @@ internal sealed interface DashboardEvent {
     class OpenIntent(val intent: Intent) : DashboardEvent
     open class OpenTool(val tool: String?, val type: Tool.Type?, val lang1: Locale?, val lang2: Locale? = null) :
         DashboardEvent
-    class OpenLesson(lesson: String?, lang: Locale?) : OpenTool(lesson, Tool.Type.LESSON, lang)
     class OpenToolDetails(val tool: String?, val lang: Locale? = null) : DashboardEvent
 }
 
@@ -120,20 +118,13 @@ internal fun DashboardLayout(onEvent: (DashboardEvent) -> Unit, viewModel: Dashb
                 Crossfade(currentPage, label = "Main Content Crossfade") { page ->
                     saveableStateHolder.SaveableStateProvider(page) {
                         when (page) {
-                            Page.LESSONS -> LessonsLayout(
-                                onEvent = {
-                                    when (it) {
-                                        is DashboardLessonsEvent.OpenLesson ->
-                                            onEvent(DashboardEvent.OpenLesson(it.lesson, it.lang))
-                                    }
-                                },
-                            )
-
+                            Page.LESSONS,
                             Page.HOME,
                             Page.FAVORITE_TOOLS,
                             Page.ALL_TOOLS -> {
                                 CircuitContent(
                                     screen = when (page) {
+                                        Page.LESSONS -> LessonsScreen
                                         Page.HOME -> HomeScreen
                                         Page.FAVORITE_TOOLS -> AllFavoritesScreen
                                         Page.ALL_TOOLS -> ToolsScreen

app/src/main/kotlin/org/cru/godtools/ui/dashboard/lessons/LessonsLayout.kt

@@ -9,70 +9,17 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.key
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import java.util.Locale
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
+import com.slack.circuit.codegen.annotations.CircuitInject
+import dagger.hilt.components.SingletonComponent
 import org.cru.godtools.R
-import org.cru.godtools.ui.dashboard.filters.FilterMenu
 import org.cru.godtools.ui.tools.LessonToolCard
-import org.cru.godtools.ui.tools.ToolCard
-import org.cru.godtools.ui.tools.toolViewModels
-
-internal sealed interface DashboardLessonsEvent {
-    class OpenLesson(val lesson: String?, val lang: Locale?) : DashboardLessonsEvent
-}
-
-@Composable
-internal fun LessonsLayout(viewModel: LessonsViewModel = viewModel(), onEvent: (DashboardLessonsEvent) -> Unit = {}) {
-    val languageFilter = FilterMenu.UiState(
-        menuExpanded = rememberSaveable { mutableStateOf(false) },
-        query = rememberSaveable { mutableStateOf("") },
-        items = viewModel.filteredLanguages.collectAsState(persistentListOf()).value,
-        selectedItem = viewModel.selectedLanguage.collectAsState().value,
-        eventSink = {
-            when (it) {
-                is FilterMenu.Event.SelectItem -> it.item?.let { viewModel.updateSelectedLanguage(it) }
-            }
-        }
-    )
-    LaunchedEffect(languageFilter.query.value) { viewModel.query.value = languageFilter.query.value }
-
-    val state = LessonsScreen.UiState(
-        languageFilter = languageFilter,
-        lessons = viewModel.lessons.collectAsState().value
-            .map { lesson ->
-                key(lesson) {
-                    lateinit var state: ToolCard.State
-                    state = toolViewModels[lesson].toState(language = languageFilter.selectedItem) {
-                        when (it) {
-                            ToolCard.Event.Click -> {
-                                viewModel.recordOpenLessonInAnalytics(lesson)
-                                onEvent(DashboardLessonsEvent.OpenLesson(lesson, state.translation?.languageCode))
-                            }
-
-                            else -> TODO()
-                        }
-                    }
-                    state
-                }
-            }
-            .toImmutableList()
-    )
-
-    LessonsLayout(state)
-}
 
 @Composable
+@CircuitInject(LessonsScreen::class, SingletonComponent::class)
 internal fun LessonsLayout(state: LessonsScreen.UiState, modifier: Modifier = Modifier) {
     LazyColumn(contentPadding = PaddingValues(16.dp), modifier = modifier) {
         item("header", "header") {