update mosaic, doesnt really work rn

Author: mrf7

.editorconfig

@@ -0,0 +1,2 @@
+[*.{kt,kts}]
+ktlint_code_style = intellij_idea

.idea/misc.xml

@@ -13,14 +13,4 @@ buildscript {
         google()
         gradlePluginPortal()
     }
-    dependencies {
-        classpath("com.jakewharton.mosaic:mosaic-gradle-plugin:0.4.0")
-    }
-}
-
-//allprojects {
-//    repositories {
-//        google()
-//        mavenCentral()
-//    }
-//}
+}

build.gradle.kts

@@ -0,0 +1,2 @@
+./gradlew cli:installDist
+./cli/build/install/cli/bin/cli 

cli.sh

@@ -1,21 +1,22 @@
 plugins {
     kotlin("jvm")
-    id("com.jakewharton.mosaic")
     id("application")
+    alias(libs.plugins.compose.compiler)
 }
 
 group = "org.example"
 version = "1.0-SNAPSHOT"
 
-
 dependencies {
     implementation(project(":scryfall"))
     implementation(project(":carddb"))
     implementation(project(":collection-import"))
     implementation(libs.bundles.base)
+    implementation(libs.mosaic)
+    implementation(libs.koin.compose)
     implementation("org.jline:jline:3.22.0")
 }
 
 application {
     mainClass.set("CliKt")
-}
+}

cli/build.gradle.kts

@@ -1,24 +1,26 @@
 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
 import androidx.compose.runtime.setValue
-import com.jakewharton.mosaic.Color
-import com.jakewharton.mosaic.Column
-import com.jakewharton.mosaic.Text
+import co.touchlab.kermit.Logger
+import com.jakewharton.mosaic.layout.KeyEvent
+import com.jakewharton.mosaic.layout.onKeyEvent
+import com.jakewharton.mosaic.modifier.Modifier
 import com.jakewharton.mosaic.runMosaic
+import com.jakewharton.mosaic.ui.Color
+import com.jakewharton.mosaic.ui.Column
+import com.jakewharton.mosaic.ui.Text
 import com.mfriend.collection.CollectionImporter
 import com.mfriend.collection.CollectionImporterImpl
 import com.mfriend.db.databaseModule
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.awaitCancellation
 import models.CardDto
-import org.koin.core.KoinApplication
-import org.koin.core.context.GlobalContext.startKoin
+import org.koin.compose.KoinApplication
+import org.koin.compose.koinInject
 import org.koin.core.module.dsl.singleOf
-import org.koin.core.parameter.parametersOf
 import org.koin.dsl.bind
 import org.koin.dsl.module
 import kotlin.system.exitProcess
@@ -28,15 +30,17 @@ enum class Action(val text: String) {
     Parse("Translate CardCastle file"),
     ViewCollection("View Collection"),
     BuildCube("Build Cube"),
-    Exit("Exit")
+    Exit("Exit"),
 }
 
 suspend fun main() = runMosaic {
-    var activeAction by mutableStateOf<Action?>(null)
-    val koin = initKoin().koin
-    val viewModel: CliViewModel = koin.get { parametersOf(coroutineContext) }
+    KoinApplication(application = {
+        Logger.setLogWriters()
+        modules(scryfallModule, databaseModule, cliModule)
+    }) {
+        var activeAction by mutableStateOf<Action?>(null)
+        val viewModel: CliViewModel = koinInject()
 
-    setContent {
         when (activeAction) {
             Action.Search -> SearchCardAction(viewModel) { activeAction = null }
             Action.Parse -> Parse(viewModel) { activeAction = null }
@@ -45,10 +49,8 @@ suspend fun main() = runMosaic {
             Action.Exit -> exitProcess(0)
             null -> ActionSelection(viewModel) { activeAction = it }
         }
-    }
-    withContext(Dispatchers.IO) {
-        while (isActive) {
-            // Wait loop
+        LaunchedEffect(Unit) {
+            awaitCancellation()
         }
     }
 }
@@ -98,19 +100,22 @@ fun Collection(viewModel: CliViewModel, onComplete: Event) {
 @Composable
 fun ActionSelection(viewModel: CliViewModel, onSelect: (Action) -> Unit) {
     var selection by mutableStateOf(0)
-    Column {
-        for (action in Action.values()) {
-            Text(action.text, background = Color.White.takeIf { selection == action.ordinal })
+    Column(
+        modifier = Modifier.onKeyEvent {
+            println(it)
+            selection = when (it) {
+                KeyEvent("ArrowUp") -> (selection - 1).coerceAtLeast(0)
+                KeyEvent("ArrowDown") -> (selection + 1).coerceAtLeast(0)
+                KeyEvent("q") -> exitProcess(0)
+                else -> return@onKeyEvent false
+            }
+            true
+        },
+    ) {
+        for (action in Action.entries) {
+            Text(action.text, background = Color.White.takeIf { selection == action.ordinal } ?: Color.Unspecified)
         }
     }
-    TrackKeysFlow(
-        viewModel,
-        'q' to { exitProcess(0) },
-        upArrow = { selection = (selection - 1).coerceAtLeast(0) },
-        downArrow = { selection = (selection + 1).coerceAtMost(Action.values().size - 1) },
-        onEnter = { onSelect(Action.values()[selection]) },
-        onSpace = { onSelect(Action.values()[selection]) }
-    )
 }
 
 @Composable
@@ -129,10 +134,6 @@ fun SearchCardAction(viewModel: CliViewModel, onComplete: () -> Unit) {
     }
 }
 
-fun initKoin(): KoinApplication = startKoin {
-    modules(scryfallModule, databaseModule, cliModule)
-}
-
 private val cliModule = module {
     singleOf(::CliViewModel)
     singleOf(::CollectionImporterImpl) bind CollectionImporter::class

cli/src/main/kotlin/Cli.kt

@@ -14,28 +14,30 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.buffer
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.shareIn
-import kotlinx.coroutines.job
 import kotlinx.coroutines.yield
 import models.CardDto
 import org.jline.terminal.Terminal
 import org.jline.terminal.TerminalBuilder
-import kotlin.coroutines.CoroutineContext
 
 sealed interface KeyStroke
 enum class Thing : KeyStroke {
-    Delete, Space, Enter, UpArrow, DownArrow
+    Delete,
+    Space,
+    Enter,
+    UpArrow,
+    DownArrow,
 }
 
 class Character(code: Int) : KeyStroke {
     val letter: Char = code.toChar()
 }
+
 class CliViewModel(
     private val importer: CollectionImporter,
     private val database: DatabaseHelper,
     private val api: ScryfallApi,
-    context: CoroutineContext
 ) {
-    private val scope = CoroutineScope(context + SupervisorJob(context.job))
+    private val scope = CoroutineScope(SupervisorJob())
     val keyStrokes: SharedFlow<KeyStroke> = flow {
         val terminal: Terminal = TerminalBuilder.terminal()
         terminal.enterRawMode()
@@ -107,7 +109,5 @@ class CliViewModel(
 
     fun getCards() = database.getCards()
 
-    suspend fun searchCards(query: String): List<CardDto>? {
-        return api.searchCard(query).getOrElse { null }
-    }
-}
+    suspend fun searchCards(query: String): List<CardDto>? = api.searchCard(query).getOrElse { null }
+}

cli/src/main/kotlin/CliViewModel.kt

@@ -1,19 +1,19 @@
 [versions]
-kotlin = "2.0.0"
+kotlin = "2.1.20"
 kermit = "1.2.2"
 arrow = "1.2.4"
-koin = "3.3.3"
+koin = "4.0.3"
 ktor = "2.0.0"
 sqlDelight = "2.0.0"
-#compose = "1.6.7"
+jetbrains-compose = "1.7.3"
 
 [libraries]
 kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }
 arrow = { module = "io.arrow-kt:arrow-core", version.ref = "arrow" }
 
 koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
-
+koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin" }
 ktor-client-core = { name = "ktor-client-core", group = "io.ktor", version.ref = "ktor" }
 #ktor-client-jvm = { name = "ktor-client-jvm", group = "io.ktor", version.ref = "ktor" }
 ktor-client-okhttp = { name = "ktor-client-okhttp", group = "io.ktor", version.ref = "ktor" }
@@ -23,12 +23,12 @@ ktor-kotlinx-serialization = { name = "ktor-serialization-kotlinx-json", group =
 ktor-content-negotiation = { name = "ktor-client-content-negotiation", group = "io.ktor", version.ref = "ktor" }
 ktor-logging = { name = "ktor-client-logging", group = "io.ktor", version.ref = "ktor" }
 
-sqldelight-driver-jvm = {name = "sqlite-driver", group = "app.cash.sqldelight", version.ref = "sqlDelight"}
+sqldelight-driver-jvm = { name = "sqlite-driver", group = "app.cash.sqldelight", version.ref = "sqlDelight" }
 #sqldelight-driver-android = {name = "android-driver", group = "com.squareup.sqldelight", version.ref = "sqlDelight"}
-sqldelight-driver-native = {name = "native-driver", group = "app.cash.sqldelight", version.ref = "sqlDelight"}
-sqldelight-coroutines= {name = "coroutines-extensions", group = "app.cash.sqldelight", version.ref = "sqlDelight"}
+sqldelight-driver-native = { name = "native-driver", group = "app.cash.sqldelight", version.ref = "sqlDelight" }
+sqldelight-coroutines = { name = "coroutines-extensions", group = "app.cash.sqldelight", version.ref = "sqlDelight" }
 
-mosaic = {  module = "com.jakewharton.mosaic:mosaic-runtime", version = "0.14.0" }
+mosaic = { module = "com.jakewharton.mosaic:mosaic-runtime", version = "0.16.0" }
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

gradle/libs.versions.toml

@@ -3,9 +3,7 @@ package client
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.plugins.logging.LogLevel
-import io.ktor.client.plugins.logging.Logger
 import io.ktor.client.plugins.logging.Logging
-import io.ktor.client.plugins.logging.SIMPLE
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json