add year as parameter

Author: joreilly

composeApp/build.gradle.kts

@@ -54,7 +54,10 @@ kotlin {
             implementation(compose.foundation)
             implementation(compose.material3)
             implementation(compose.ui)
+            implementation(compose.components.resources)
+            implementation(compose.components.uiToolingPreview)
 
+            
             implementation(libs.koin.core)
             implementation(libs.koin.compose)
 
@@ -87,6 +90,14 @@ kotlin {
         appleMain.dependencies {
             implementation(libs.ktor.client.darwin)
         }
+
+
+        val desktopTest by getting
+
+        // Adds the desktop test dependency
+        desktopTest.dependencies {
+            implementation(compose.desktop.currentOs)
+        }
     }
 }
 

composeApp/src/androidMain/kotlin/dev/johnoreilly/climatetrace/MainActivity.kt

@@ -77,4 +77,3 @@ class CountryListScreen : Screen {
     }
 }
 
-

composeApp/src/commonMain/kotlin/App.kt

@@ -3,9 +3,11 @@ import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.navigator.Navigator
 import dev.johnoreilly.climatetrace.di.commonModule
 import dev.johnoreilly.climatetrace.ui.ClimateTraceScreen
+import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.koin.compose.KoinApplication
 
 
+@Preview
 @Composable
 fun App() {
     KoinApplication(application = {

composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/remote/ClimateTraceApi.kt

@@ -74,7 +74,7 @@ class ClimateTraceApi(
     suspend fun fetchAssets() = client.get("$baseUrl/assets").body<AssetsResult>()
 
     suspend fun fetchCountryAssets(countryCode: String) = client.get("$baseUrl/assets?countries=$countryCode").body<AssetsResult>()
-    suspend fun fetchCountryEmissionsInfo(countryCode: String) = client.get("$baseUrl/country/emissions?since=2022&to=2022&countries=$countryCode").body<List<CountryEmissionsInfo>>()
+    suspend fun fetchCountryEmissionsInfo(countryCode: String, year: String) = client.get("$baseUrl/country/emissions?since=$year&to=$year&countries=$countryCode").body<List<CountryEmissionsInfo>>()
 
     suspend fun fetchCountryAssetEmissionsInfo(countryCode: String) = client.get("$baseUrl/assets/emissions?countries=$countryCode").body<Map<String, List<CountryAssetEmissionsInfo>>>()[countryCode]
 }

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

@@ -110,6 +110,7 @@ class ClimateTraceScreen: Screen {
                     Spacer(modifier = Modifier.width(1.dp).fillMaxWidth())
                     CountryInfoDetailedView(
                         country = selectedCountry,
+                        year = viewModel.year,
                         countryEmissionInfo = countryEmissionInfo,
                         countryAssetEmissionsList = countryAssetEmissions,
                         isLoading = isLoadingCountryDetails
@@ -135,6 +136,7 @@ class ClimateTraceScreen: Screen {
                 Box(Modifier.fillMaxHeight()) {
                     CountryInfoDetailedView(
                         country = viewModel.selectedCountry.value,
+                        year = viewModel.year,
                         countryEmissionInfo = countryEmissionInfo,
                         countryAssetEmissionsList = countryAssetEmissions,
                         isLoading = isLoadingCountryDetails
@@ -287,4 +289,3 @@ fun CountryRow(
 }
 
 
-

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

@@ -50,6 +50,7 @@ data class CountryEmissionsScreen(val country: Country) : Screen {
             Column(Modifier.padding(it)) {
                 CountryInfoDetailedView(
                         country,
+                        viewModel.year,
                         countryEmissionInfo,
                         countryAssetEmissions,
                         isLoadingCountryDetails

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

@@ -24,6 +24,7 @@ import dev.johnoreilly.climatetrace.remote.CountryEmissionsInfo
 @Composable
 fun CountryInfoDetailedView(
     country: Country?,
+    year: String,
     countryEmissionInfo: CountryEmissionsInfo?,
     countryAssetEmissionsList: List<CountryAssetEmissionsInfo>?,
     isLoading: Boolean
@@ -77,7 +78,7 @@ fun CountryInfoDetailedView(
                         val co2 = (countryEmissionInfo.emissions.co2 / 1_000_000).toInt()
                         val percentage = (countryEmissionInfo.emissions.co2 / countryEmissionInfo.worldEmissions.co2).toPercent(2)
 
-                        Text(text = "co2 = $co2 Million Tonnes (2022)")
+                        Text(text = "co2 = $co2 Million Tonnes ($year)")
                         Text(text = "rank = ${countryEmissionInfo.rank} ($percentage)")
 
                         Spacer(modifier = Modifier.size(16.dp))

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

@@ -16,6 +16,8 @@ import org.koin.core.component.inject
 open class ClimateTraceViewModel : KMMViewModel(), KoinComponent {
     private val climateTraceApi: ClimateTraceApi by inject()
 
+    var year: String = "2022"
+
     private val _countryList = MutableStateFlow<List<Country>>(viewModelScope, emptyList())
     @NativeCoroutinesState
     val countryList = _countryList.asStateFlow()
@@ -44,7 +46,7 @@ open class ClimateTraceViewModel : KMMViewModel(), KoinComponent {
         selectedCountry.value = country
         isLoadingCountryDetails.value = true
         viewModelScope.coroutineScope.launch {
-            countryEmissionInfo.value = climateTraceApi.fetchCountryEmissionsInfo(country.alpha3).firstOrNull()
+            countryEmissionInfo.value = climateTraceApi.fetchCountryEmissionsInfo(country.alpha3, year).firstOrNull()
             countryAssetEmissions.value = climateTraceApi.fetchCountryAssetEmissionsInfo(country.alpha3)
             isLoadingCountryDetails.value = false
         }

composeApp/src/iosMain/kotlin/MainViewController.kt

@@ -23,7 +23,7 @@ fun CountryListViewController(onCountryClicked: (country: Country) -> Unit) = Co
 }
 
 
-fun CountryInfoDetailedViewController(country: Country) = ComposeUIViewController {
+fun CountryInfoDetailedViewController(country: Country, year: String) = ComposeUIViewController {
     val viewModel = koinInject<ClimateTraceViewModel>()
     val countryEmissionInfo by viewModel.countryEmissionInfo.collectAsState()
     val countryAssetEmissions by viewModel.countryAssetEmissions.collectAsState()
@@ -33,5 +33,5 @@ fun CountryInfoDetailedViewController(country: Country) = ComposeUIViewControlle
         viewModel.fetchCountryDetails(country)
     }
 
-    CountryInfoDetailedView(country, countryEmissionInfo, countryAssetEmissions, isLoadingCountryDetails)
+    CountryInfoDetailedView(country, year, countryEmissionInfo, countryAssetEmissions, isLoadingCountryDetails)
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME