Skip to content

Commit c6d2e37

Browse files
authored
Merge pull request #77 from joreilly/cleanup
cleanup
2 parents c183894 + 5224d3c commit c6d2e37

File tree

5 files changed

+4
-14
lines changed

5 files changed

+4
-14
lines changed

composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/ui/ChartNode.kt

-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import androidx.compose.ui.graphics.Color
77
sealed class ChartNode {
88

99
abstract val name: String
10-
1110
abstract val value: Double
12-
1311
abstract val percentage: Double
1412

1513
@Stable

composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/ui/CountryInfoDetailedView.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fun CountryInfoDetailedView(
9494
Spacer(modifier = Modifier.size(16.dp))
9595
Column(horizontalAlignment = Alignment.CenterHorizontally) {
9696
Text(
97-
"Corrupted data! \n Try again sometime",
97+
"Invalid data",
9898
style = MaterialTheme.typography.titleMedium.copy(color = Color.Red),
9999
textAlign = TextAlign.Center
100100
)

composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/viewmodel/ClimateTraceViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ open class ClimateTraceViewModel : KMMViewModel(), KoinComponent {
1818
private val climateTraceApi: ClimateTraceApi by inject()
1919
private val climateTraceRepository: ClimateTraceRepository by inject()
2020

21-
var year: String = "2022"
21+
var year: String = "2022" // TODO make this configurable
2222

2323
private val _countryList = MutableStateFlow<List<Country>>(viewModelScope, emptyList())
2424
@NativeCoroutinesState

composeApp/src/wasmJsMain/kotlin/dev/johnoreilly/climatetrace/di/Koin.wasmjs.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.johnoreilly.climatetrace.di
1+
package dev.johnoreilly.climatetrace.di
22

33
import dev.johnoreilly.climatetrace.remote.Country
44
import io.github.xxfast.kstore.KStore

gradle/libs.versions.toml

+1-9
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,18 @@ android-compileSdk = "34"
44
android-minSdk = "24"
55
android-targetSdk = "34"
66
androidx-activityCompose = "1.9.0"
7-
androidx-appcompat = "1.6.1"
8-
androidx-constraintlayout = "2.1.4"
9-
androidx-core-ktx = "1.13.0"
10-
androidx-espresso-core = "3.5.1"
11-
androidx-material = "1.11.0"
12-
androidx-test-junit = "1.1.5"
137
compose = "1.6.6"
148
compose-plugin = "1.6.10-beta03"
159
composeWindowSize = "0.5.0"
1610
harawata-appdirs = "1.2.1"
17-
imageLoader = "1.7.8"
18-
junit = "4.13.2"
1911
koalaplot = "0.5.3"
2012
koin = "3.6.0-alpha3"
2113
koinCompose = "1.2.0-alpha3"
2214
kotlin = "2.0.0-RC2"
2315
kotlinx-coroutines = "1.8.0"
2416
kmpNativeCoroutines = "1.0.0-ALPHA-28-kotlin-2.0.0-RC1"
2517
kmmViewModel = "1.0.0-ALPHA-20-kotlin-2.0.0-RC1"
26-
ksp = "2.0.0-RC1-1.0.20"
18+
ksp = "2.0.0-RC2-1.0.20"
2719
kstore = "0.8.0-SNAPSHOT"
2820
ktor = "3.0.0-wasm2"
2921
treemapChart = "0.1.1"

0 commit comments

Comments
 (0)