Merge pull request #65 from percy-g2/main

Fix crash and add null safety to emissions info.

Author: joreilly

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

@@ -43,11 +43,11 @@ data class CountryEmissionsInfo(
 @Serializable
 data class CountryAssetEmissionsInfo(
     @SerialName("Country")
-    val country: String,
+    val country: String? = null,
     @SerialName("Emissions")
-    val emissions: Float,
+    val emissions: Float = 0f,
     @SerialName("Sector")
-    val sector: String
+    val sector: String? = null
 )
 
 

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

@@ -31,7 +31,6 @@ import by.overpass.treemapchart.compose.TreemapChart
 import by.overpass.treemapchart.core.tree.Tree
 import by.overpass.treemapchart.core.tree.tree
 import dev.johnoreilly.climatetrace.remote.CountryAssetEmissionsInfo
-import dev.johnoreilly.climatetrace.ui.ChartNode
 import io.github.koalaplot.core.util.generateHueColorPalette
 import io.github.koalaplot.core.util.toString
 import kotlinx.coroutines.Dispatchers
@@ -132,15 +131,17 @@ suspend fun buildAssetTree(assetEmissionInfoList: List<CountryAssetEmissionsInfo
             .sortedByDescending(CountryAssetEmissionsInfo::emissions)
             .take(10)
             .forEachIndexed { index, assetEmissionInfo ->
-                val productPercentage = assetEmissionInfo.emissions / total
-                node(
-                    ChartNode.Leaf(
-                        name = assetEmissionInfo.sector,
-                        value = assetEmissionInfo.emissions.toDouble(),
-                        percentage = productPercentage,
-                        color = colors[index]
-                    ),
-                )
+                assetEmissionInfo.sector?.let {
+                    val productPercentage = assetEmissionInfo.emissions / total
+                    node(
+                        ChartNode.Leaf(
+                            name = assetEmissionInfo.sector,
+                            value = assetEmissionInfo.emissions.toDouble(),
+                            percentage = productPercentage,
+                            color = colors[index]
+                        ),
+                    )
+                }
             }
 
     }

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

@@ -15,6 +15,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import dev.johnoreilly.climatetrace.remote.Country
@@ -83,10 +84,22 @@ fun CountryInfoDetailedView(
 
                         Spacer(modifier = Modifier.size(16.dp))
 
-                        CountryAssetEmissionsInfoTreeMapChart(countryAssetEmissionsList)
-                        Spacer(modifier = Modifier.size(16.dp))
+                        val filteredCountryAssetEmissionsList = countryAssetEmissionsList.filter { it.sector != null }
+                        if (filteredCountryAssetEmissionsList.isNotEmpty()) {
+                            CountryAssetEmissionsInfoTreeMapChart(countryAssetEmissionsList)
+                            Spacer(modifier = Modifier.size(16.dp))
 
-                        SectorEmissionsPieChart(countryAssetEmissionsList)
+                            SectorEmissionsPieChart(countryAssetEmissionsList)
+                        } else {
+                            Spacer(modifier = Modifier.size(16.dp))
+                            Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                                Text(
+                                    "Corrupted data! \n Try again sometime",
+                                    style = MaterialTheme.typography.titleMedium.copy(color = Color.Red),
+                                    textAlign = TextAlign.Center
+                                )
+                            }
+                        }
                     }
                 }
             }

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

@@ -38,7 +38,7 @@ fun SectorEmissionsPieChart(
         .sortedByDescending { it.emissions }
         .take(10)
     val values = filteredEmissionsList.map { it.emissions / 1_000_000 }
-    val labels = filteredEmissionsList.map { it.sector }
+    val labels = filteredEmissionsList.mapNotNull { it.sector }
     val total = values.sum()
     val colors = generateHueColorPalette(values.size)