generate the ToolCard.State directly in the LessonsLayout

Author: frett

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

@@ -19,7 +19,8 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import java.util.Locale
 import org.cru.godtools.R
 import org.cru.godtools.ui.tools.LessonToolCard
-import org.cru.godtools.ui.tools.ToolCardEvent
+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
@@ -38,17 +39,19 @@ internal fun LessonsLayout(viewModel: LessonsViewModel = viewModel(), onEvent: (
         }
 
         items(lessons, { it }, { "lesson" }) { lesson ->
-            LessonToolCard(
-                lesson,
-                selectedLanguage = selectedLanguage,
-                onEvent = {
-                    when (it) {
-                        is ToolCardEvent.OpenTool, is ToolCardEvent.Click -> {
-                            viewModel.recordOpenLessonInAnalytics(it.tool)
-                            onEvent(DashboardLessonsEvent.OpenLesson(it.tool, it.lang1))
-                        }
+            lateinit var state: ToolCard.State
+            state = toolViewModels[lesson].toState(language = selectedLanguage) {
+                when (it) {
+                    ToolCard.Event.Click -> {
+                        viewModel.recordOpenLessonInAnalytics(lesson)
+                        onEvent(DashboardLessonsEvent.OpenLesson(lesson, state.translation?.languageCode))
                     }
-                },
+                    else -> TODO()
+                }
+            }
+
+            LessonToolCard(
+                state,
                 modifier = Modifier
                     .animateItem()
                     .padding(top = 16.dp)

app/src/main/kotlin/org/cru/godtools/ui/tools/LessonToolCard.kt

@@ -14,27 +14,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import org.ccci.gto.android.common.androidx.compose.ui.draw.invisibleIf
 import org.cru.godtools.base.ui.util.ProvideLayoutDirectionFromLocale
-import org.cru.godtools.model.Language
-
-@Composable
-fun LessonToolCard(
-    toolCode: String,
-    modifier: Modifier = Modifier,
-    selectedLanguage: Language? = null,
-    viewModel: ToolViewModels.ToolViewModel = toolViewModels[toolCode],
-    onEvent: (ToolCardEvent) -> Unit = {},
-) {
-    lateinit var state: ToolCard.State
-    state = viewModel.toState(language = selectedLanguage) {
-        when (it) {
-            ToolCard.Event.Click ->
-                onEvent(ToolCardEvent.Click(state.tool?.code, state.translation?.languageCode))
-            else -> TODO()
-        }
-    }
-
-    LessonToolCard(state = state, modifier = modifier)
-}
 
 @Composable
 fun LessonToolCard(state: ToolCard.State, modifier: Modifier = Modifier) {

app/src/main/kotlin/org/cru/godtools/ui/tools/ToolCardComponents.kt

@@ -23,7 +23,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
-import java.util.Locale
 import org.ccci.gto.android.common.androidx.compose.foundation.text.minLinesHeight
 import org.cru.godtools.base.ui.theme.GodToolsTheme
 import org.cru.godtools.base.ui.util.getCategory
@@ -58,11 +57,6 @@ private val toolCardInfoLabelColor: Color @Composable get() {
 }
 private val toolCardInfoLabelStyle @Composable get() = MaterialTheme.typography.labelSmall
 
-sealed class ToolCardEvent(val tool: String?, val lang1: Locale? = null) {
-    class Click(tool: String?, lang1: Locale? = null) : ToolCardEvent(tool, lang1)
-    class OpenTool(tool: String?, lang1: Locale?) : ToolCardEvent(tool, lang1)
-}
-
 @Composable
 internal fun ToolBanner(state: ToolCard.State, modifier: Modifier = Modifier) = AsyncImage(
     model = state.banner,