AGP update, dependencies update, handle nullable values from the api

Author: Avvami

app/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.devtools.ksp)
 }
 
@@ -77,6 +78,9 @@ dependencies {
     // Retrofit
     implementation(libs.retrofit)
     implementation(libs.converter.moshi)
+    implementation(libs.moshi)
+    implementation(libs.moshi.kotlin)
+    ksp(libs.moshi.kotlin.codegen)
 
     // Navigation
     implementation(libs.androidx.navigation.compose)

app/src/main/java/com/personal/weathering/aq/data/models/AqDto.kt

@@ -1,71 +1,75 @@
 package com.personal.weathering.aq.data.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 data class AqDto(
-    @field:Json(name = "current")
+    @Json(name = "current")
     val currentAq: CurrentAqDto,
-    @field:Json(name = "hourly")
+    @Json(name = "hourly")
     val hourlyAq: HourlyAqDto
 )
 
+@JsonClass(generateAdapter = true)
 data class CurrentAqDto(
     val time: String,
-    @field:Json(name = "european_aqi")
+    @Json(name = "european_aqi")
     val euAqi: Int,
-    @field:Json(name = "us_aqi")
+    @Json(name = "us_aqi")
     val usAqi: Int,
-    @field:Json(name = "pm10")
+    @Json(name = "pm10")
     val particulateMatter10: Double,
-    @field:Json(name = "pm2_5")
+    @Json(name = "pm2_5")
     val particulateMatter25: Double,
-    @field:Json(name = "carbon_monoxide")
+    @Json(name = "carbon_monoxide")
     val carbonMonoxide: Double,
-    @field:Json(name = "nitrogen_dioxide")
+    @Json(name = "nitrogen_dioxide")
     val nitrogenDioxide: Double,
-    @field:Json(name = "sulphur_dioxide")
+    @Json(name = "sulphur_dioxide")
     val sulphurDioxide: Double,
     val ozone: Double
 )
 
+@JsonClass(generateAdapter = true)
 data class HourlyAqDto(
     val time: List<String>,
-    @field:Json(name = "european_aqi")
+    @Json(name = "european_aqi")
     val euAqies: List<Int>,
-    @field:Json(name = "us_aqi")
+    @Json(name = "us_aqi")
     val usAqies: List<Int>,
-    @field:Json(name = "pm10")
+    @Json(name = "pm10")
     val particulateMatters10: List<Double>,
-    @field:Json(name = "pm2_5")
+    @Json(name = "pm2_5")
     val particulateMatters25: List<Double>,
-    @field:Json(name = "carbon_monoxide")
+    @Json(name = "carbon_monoxide")
     val carbonMonoxides: List<Double>,
-    @field:Json(name = "nitrogen_dioxide")
+    @Json(name = "nitrogen_dioxide")
     val nitrogenDioxides: List<Double>,
-    @field:Json(name = "sulphur_dioxide")
+    @Json(name = "sulphur_dioxide")
     val sulphurDioxides: List<Double>,
-    @field:Json(name = "ozone")
+    @Json(name = "ozone")
     val ozones: List<Double>,
-    @field:Json(name = "us_aqi_pm10")
+    @Json(name = "us_aqi_pm10")
     val usAqiParticulateMatters10: List<Int>,
-    @field:Json(name = "us_aqi_pm2_5")
+    @Json(name = "us_aqi_pm2_5")
     val usAqiParticulateMatters25: List<Int>,
-    @field:Json(name = "us_aqi_carbon_monoxide")
+    @Json(name = "us_aqi_carbon_monoxide")
     val usAqiCarbonMonoxides: List<Int>,
-    @field:Json(name = "us_aqi_nitrogen_dioxide")
+    @Json(name = "us_aqi_nitrogen_dioxide")
     val usAqiNitrogenDioxides: List<Int>,
-    @field:Json(name = "us_aqi_sulphur_dioxide")
+    @Json(name = "us_aqi_sulphur_dioxide")
     val usAqiSulphurDioxides: List<Int>,
-    @field:Json(name = "us_aqi_ozone")
+    @Json(name = "us_aqi_ozone")
     val usAqiOzones: List<Int>,
-    @field:Json(name = "european_aqi_pm10")
+    @Json(name = "european_aqi_pm10")
     val euAqiParticulateMatters10: List<Int>,
-    @field:Json(name = "european_aqi_pm2_5")
+    @Json(name = "european_aqi_pm2_5")
     val euAqiParticulateMatters25: List<Int>,
-    @field:Json(name = "european_aqi_nitrogen_dioxide")
+    @Json(name = "european_aqi_nitrogen_dioxide")
     val euAqiNitrogenDioxides: List<Int>,
-    @field:Json(name = "european_aqi_sulphur_dioxide")
+    @Json(name = "european_aqi_sulphur_dioxide")
     val euAqiSulphurDioxides: List<Int>,
-    @field:Json(name = "european_aqi_ozone")
+    @Json(name = "european_aqi_ozone")
     val euAqiOzones: List<Int>
 )

app/src/main/java/com/personal/weathering/core/data/models/GeocodingDto.kt

@@ -1,23 +1,26 @@
 package com.personal.weathering.core.data.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 data class GeocodingDto(
-    @field:Json(name = "address")
+    @Json(name = "address")
     val address: AddressDto?,
-    @field:Json(name = "error")
-    val error: String
+    @Json(name = "error")
+    val error: String?
 )
 
+@JsonClass(generateAdapter = true)
 data class AddressDto(
-    @field:Json(name = "city")
+    @Json(name = "city")
     val city: String?,
-    @field:Json(name = "town")
+    @Json(name = "town")
     val town: String?,
-    @field:Json(name = "village")
+    @Json(name = "village")
     val village: String?,
-    @field:Json(name = "hamlet")
+    @Json(name = "hamlet")
     val hamlet: String?,
-    @field:Json(name = "municipality")
+    @Json(name = "municipality")
     val municipality: String?
 )

app/src/main/java/com/personal/weathering/core/util/Converters.kt

@@ -0,0 +1,25 @@
+package com.personal.weathering.core.util
+
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+fun convertStringToDateTime(dateString: String?): LocalDateTime? {
+    return try {
+        dateString?.let { string ->
+            LocalDateTime.parse(string, DateTimeFormatter.ISO_DATE_TIME)
+        }
+    } catch (e: Exception) {
+        null
+    }
+}
+
+fun convertStringToDate(dateString: String?): LocalDate? {
+    return try {
+        dateString?.let { string ->
+            LocalDate.parse(string, DateTimeFormatter.ISO_DATE)
+        }
+    } catch (e: Exception) {
+        null
+    }
+}

app/src/main/java/com/personal/weathering/search/data/models/SearchDto.kt

@@ -1,25 +1,28 @@
 package com.personal.weathering.search.data.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 data class SearchDto(
-    @field:Json(name = "results")
+    @Json(name = "results")
     val searchResults: List<SearchResultDto>?
 )
 
+@JsonClass(generateAdapter = true)
 data class SearchResultDto(
-    @field:Json(name = "id")
+    @Json(name = "id")
     val id: Int,
-    @field:Json(name = "name")
+    @Json(name = "name")
     val name: String,
-    @field:Json(name = "latitude")
+    @Json(name = "latitude")
     val lat: Double,
-    @field:Json(name = "longitude")
+    @Json(name = "longitude")
     val lon: Double,
-    @field:Json(name = "country")
+    @Json(name = "country")
     val country: String?,
-    @field:Json(name = "country_code")
+    @Json(name = "country_code")
     val countryCode: String?,
-    @field:Json(name = "admin1")
+    @Json(name = "admin1")
     val adminLevel: String?,
 )