From f606eb2e33c0c757492e1715be9d6bacc2f61c70 Mon Sep 17 00:00:00 2001 From: Cilly Leang Date: Thu, 5 Feb 2026 01:11:37 +1100 Subject: [PATCH] refactor: delete some starter app stuff --- .../kotlin/moe/lava/neon/core/Platform.android.kt | 9 --------- .../commonMain/kotlin/moe/lava/neon/core/Platform.kt | 7 ------- .../jvmMain/kotlin/moe/lava/neon/core/Platform.jvm.kt | 7 ------- ui/src/commonMain/kotlin/moe/lava/neon/ui/Greeting.kt | 11 ----------- .../kotlin/moe/lava/neon/ui/screens/Sample.kt | 7 ++----- 5 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 core/src/androidMain/kotlin/moe/lava/neon/core/Platform.android.kt delete mode 100644 core/src/commonMain/kotlin/moe/lava/neon/core/Platform.kt delete mode 100644 core/src/jvmMain/kotlin/moe/lava/neon/core/Platform.jvm.kt delete mode 100644 ui/src/commonMain/kotlin/moe/lava/neon/ui/Greeting.kt diff --git a/core/src/androidMain/kotlin/moe/lava/neon/core/Platform.android.kt b/core/src/androidMain/kotlin/moe/lava/neon/core/Platform.android.kt deleted file mode 100644 index 544fc61..0000000 --- a/core/src/androidMain/kotlin/moe/lava/neon/core/Platform.android.kt +++ /dev/null @@ -1,9 +0,0 @@ -package moe.lava.neon.core - -import android.os.Build - -class AndroidPlatform : Platform { - override val name: String = "Android ${Build.VERSION.SDK_INT}" -} - -actual fun getPlatform(): Platform = AndroidPlatform() diff --git a/core/src/commonMain/kotlin/moe/lava/neon/core/Platform.kt b/core/src/commonMain/kotlin/moe/lava/neon/core/Platform.kt deleted file mode 100644 index aae09e6..0000000 --- a/core/src/commonMain/kotlin/moe/lava/neon/core/Platform.kt +++ /dev/null @@ -1,7 +0,0 @@ -package moe.lava.neon.core - -interface Platform { - val name: String -} - -expect fun getPlatform(): Platform diff --git a/core/src/jvmMain/kotlin/moe/lava/neon/core/Platform.jvm.kt b/core/src/jvmMain/kotlin/moe/lava/neon/core/Platform.jvm.kt deleted file mode 100644 index 509cf56..0000000 --- a/core/src/jvmMain/kotlin/moe/lava/neon/core/Platform.jvm.kt +++ /dev/null @@ -1,7 +0,0 @@ -package moe.lava.neon.core - -class JVMPlatform : Platform { - override val name: String = "Java ${System.getProperty("java.version")}" -} - -actual fun getPlatform(): Platform = JVMPlatform() diff --git a/ui/src/commonMain/kotlin/moe/lava/neon/ui/Greeting.kt b/ui/src/commonMain/kotlin/moe/lava/neon/ui/Greeting.kt deleted file mode 100644 index 63612da..0000000 --- a/ui/src/commonMain/kotlin/moe/lava/neon/ui/Greeting.kt +++ /dev/null @@ -1,11 +0,0 @@ -package moe.lava.neon.ui - -import moe.lava.neon.core.getPlatform - -class Greeting { - private val platform = getPlatform() - - fun greet(): String { - return "Hello, ${platform.name}!" - } -} diff --git a/ui/src/commonMain/kotlin/moe/lava/neon/ui/screens/Sample.kt b/ui/src/commonMain/kotlin/moe/lava/neon/ui/screens/Sample.kt index 56f4151..73467fc 100644 --- a/ui/src/commonMain/kotlin/moe/lava/neon/ui/screens/Sample.kt +++ b/ui/src/commonMain/kotlin/moe/lava/neon/ui/screens/Sample.kt @@ -25,7 +25,6 @@ import moe.lava.neon.core.repository.AuthRepository import moe.lava.neon.core.repository.GatewayRepository import moe.lava.neon.resources.Res import moe.lava.neon.resources.compose_multiplatform -import moe.lava.neon.ui.Greeting import org.jetbrains.compose.resources.painterResource import org.koin.compose.viewmodel.koinViewModel @@ -53,14 +52,12 @@ fun Sample( Text("Click me (bottom!") } AnimatedVisibility(showContent) { - val greeting = remember { Greeting().greet() } Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally, ) { Image(painterResource(Res.drawable.compose_multiplatform), null) - Text("Compose: $greeting") - Text("Passed token: ${viewModel.token?.slice(0..10)}...") + Text("Logged in: ${viewModel.loggedIn}") } } Button(onClick = { @@ -87,7 +84,7 @@ class SampleViewModel( private val gateway: GatewayRepository, ) : ViewModel() { private val logger = Logger.withTag("neon.ui.screens/Sample") - val token get() = auth.token + val loggedIn by auth::loggedIn fun connect() { viewModelScope.launch {