diff --git a/app/src/main/java/com/example/gocoronago/base/RetrofitInstance.kt b/app/src/main/java/com/example/gocoronago/base/RetrofitInstance.kt index c9d2df5..3b2de27 100644 --- a/app/src/main/java/com/example/gocoronago/base/RetrofitInstance.kt +++ b/app/src/main/java/com/example/gocoronago/base/RetrofitInstance.kt @@ -7,7 +7,7 @@ object RetrofitInstance { fun createInstance(): Retrofit { return Retrofit.Builder() - .baseUrl("https://api.covid19api.com") + .baseUrl("https://disease.sh/v3/covid-19/") .addConverterFactory(GsonConverterFactory.create()) .build() } diff --git a/app/src/main/java/com/example/gocoronago/homepage/models/WorldwideData.kt b/app/src/main/java/com/example/gocoronago/homepage/models/WorldwideData.kt new file mode 100644 index 0000000..8559a81 --- /dev/null +++ b/app/src/main/java/com/example/gocoronago/homepage/models/WorldwideData.kt @@ -0,0 +1,49 @@ +package com.example.gocoronago.homepage.models + + +import com.google.gson.annotations.SerializedName +import androidx.annotation.Keep + +@Keep +data class WorldwideData( + @SerializedName("active") + var active: Double?, // 0 + @SerializedName("activePerOneMillion") + var activePerOneMillion: Double?, // 0 + @SerializedName("affectedCountries") + var affectedCountries: Double?, // 0 + @SerializedName("cases") + var cases: Double?, // 0 + @SerializedName("casesPerOneMillion") + var casesPerOneMillion: Double?, // 0 + @SerializedName("critical") + var critical: Double?, // 0 + @SerializedName("criticalPerOneMillion") + var criticalPerOneMillion: Double?, // 0 + @SerializedName("deaths") + var deaths: Double?, // 0 + @SerializedName("deathsPerOneMillion") + var deathsPerOneMillion: Double?, // 0 + @SerializedName("oneCasePerPeople") + var oneCasePerPeople: Double?, // 0 + @SerializedName("oneDeathPerPeople") + var oneDeathPerPeople: Double?, // 0 + @SerializedName("oneTestPerPeople") + var oneTestPerPeople: Double?, // 0 + @SerializedName("population") + var population: Double?, // 0 + @SerializedName("recovered") + var recovered: Double?, // 0 + @SerializedName("recoveredPerOneMillion") + var recoveredPerOneMillion: Double?, // 0 + @SerializedName("tests") + var tests: Double?, // 0 + @SerializedName("testsPerOneMillion") + var testsPerOneMillion: Double?, // 0 + @SerializedName("todayCases") + var todayCases: Double?, // 0 + @SerializedName("todayRecovered") + var todayRecovered: Double?, // 0 + @SerializedName("updated") + var updated: Double? // 0 +) \ No newline at end of file diff --git a/app/src/main/java/com/example/gocoronago/ui/main/MainInterface.kt b/app/src/main/java/com/example/gocoronago/ui/main/MainInterface.kt index 9196ecc..6f5c8e2 100644 --- a/app/src/main/java/com/example/gocoronago/ui/main/MainInterface.kt +++ b/app/src/main/java/com/example/gocoronago/ui/main/MainInterface.kt @@ -1,9 +1,9 @@ package com.example.gocoronago.ui.main -import com.example.gocoronago.homepage.Summary +import com.example.gocoronago.homepage.models.WorldwideData import retrofit2.http.GET interface MainInterface { - @GET("summary") - suspend fun getSummary(): Summary + @GET("all") + suspend fun getSummary(): WorldwideData } \ No newline at end of file diff --git a/app/src/main/java/com/example/gocoronago/ui/main/MainRepo.kt b/app/src/main/java/com/example/gocoronago/ui/main/MainRepo.kt index 6ea3524..8bbad9c 100644 --- a/app/src/main/java/com/example/gocoronago/ui/main/MainRepo.kt +++ b/app/src/main/java/com/example/gocoronago/ui/main/MainRepo.kt @@ -1,12 +1,12 @@ package com.example.gocoronago.ui.main -import com.example.gocoronago.homepage.Summary import com.example.gocoronago.base.BaseRepo +import com.example.gocoronago.homepage.models.WorldwideData class MainRepo : BaseRepo() { private val service = retrofit.create(MainInterface::class.java) - suspend fun getCovidSummary(): Summary { + suspend fun getCovidSummary(): WorldwideData { return service.getSummary() } } \ No newline at end of file