Update the providers

2020-10-06 18:11:53 +02:00
parent bd4869540b
commit 1644fb7682
20 changed files with 587 additions and 146 deletions
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/network/WeatherNetworkApi.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/network/WeatherNetworkApi.kt
@ -13,12 +13,11 @@ import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
-import com.tommasoberlose.anotherwidget.network.repository.WeatherGovRepository
+import com.tommasoberlose.anotherwidget.network.repository.*
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import java.lang.Exception
@ -32,6 +31,11 @@ class WeatherNetworkApi(val context: Context) {
            when (Constants.WeatherProvider.fromInt(Preferences.weatherProvider)) {
                Constants.WeatherProvider.OPEN_WEATHER -> useOpenWeatherMap(context)
                Constants.WeatherProvider.WEATHER_GOV -> useWeatherGov(context)
+                Constants.WeatherProvider.WEATHER_BIT -> useWeatherBitProvider(context)
+                Constants.WeatherProvider.WEATHER_API -> useWeatherApiProvider(context)
+                Constants.WeatherProvider.HERE -> useHereProvider(context)
+                Constants.WeatherProvider.ACCUWEATHER -> useAccuweatherProvider(context)
+                Constants.WeatherProvider.YR -> useYrProvider(context)
            }
        } else {
            WeatherHelper.removeWeather(
@ -41,8 +45,8 @@ class WeatherNetworkApi(val context: Context) {
    }

    private fun useOpenWeatherMap(context: Context) {
-        if (Preferences.weatherProviderApi != "" ) {
-            val helper = OpenWeatherMapHelper(Preferences.weatherProviderApi)
+        if (Preferences.weatherProviderApiOpen != "" ) {
+            val helper = OpenWeatherMapHelper(Preferences.weatherProviderApiOpen)
            helper.setUnits(if (Preferences.weatherTempUnit == "F") Units.IMPERIAL else Units.METRIC)
            helper.getCurrentWeatherByGeoCoordinates(Preferences.customLocationLat.toDouble(), Preferences.customLocationLon.toDouble(), object :
                CurrentWeatherCallback {
@ -118,21 +122,163 @@ class WeatherNetworkApi(val context: Context) {
                            }
                        }
                    } catch(ex: Exception) {
-
                    }
                }
                is NetworkResponse.ServerError -> {
                    if (pointsResponse.body?.containsKey("status") == true && (pointsResponse.body?.get("status") as Double).toInt() == 404) {
                        Preferences.weatherProviderError = ""
                        Preferences.weatherProviderLocationError = context.getString(R.string.weather_provider_error_wrong_location)
-
-                        WeatherHelper.removeWeather(
-                            context
-                        )
                    }
+
+                    WeatherHelper.removeWeather(
+                        context
+                    )
                }
            }

        }
    }
+
+    private fun useHereProvider(context: Context) {
+        CoroutineScope(Dispatchers.IO).launch {
+            val repository = HereRepository()
+
+            when (val response = repository.getWeather()) {
+                is NetworkResponse.Success -> {
+                    try {
+                        Log.d("ciao - here", response.body.toString())
+                    } catch(ex: Exception) {
+                    }
+                }
+                is NetworkResponse.ServerError -> {
+                    WeatherHelper.removeWeather(
+                        context
+                    )
+                }
+            }
+        }
+    }
+
+    private fun useWeatherBitProvider(context: Context) {
+        CoroutineScope(Dispatchers.IO).launch {
+            val repository = WeatherbitRepository()
+
+            when (val response = repository.getWeather()) {
+                is NetworkResponse.Success -> {
+                    try {
+                        val data = response.body["data"] as List<LinkedTreeMap<String, Any>>?
+                        data?.first()?.let {
+                            val temp = it["temp"] as Double
+                            val weatherInfo = it["weather"] as LinkedTreeMap<String, Any>
+                            val iconCode = weatherInfo["icon"] as String
+
+                            Preferences.weatherTemp = temp.toFloat()
+                            Preferences.weatherIcon = WeatherHelper.getWeatherBitIcon(iconCode)
+                            Preferences.weatherRealTempUnit = Preferences.weatherTempUnit
+                            MainWidget.updateWidget(context)
+
+                            EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
+                        }
+                    } catch(ex: Exception) {
+                    }
+                }
+                is NetworkResponse.ServerError -> {
+                    when (response.code) {
+                        403 -> {
+                            Preferences.weatherProviderError = context.getString(R.string.weather_provider_error_invalid_key)
+                        }
+                    }
+                    WeatherHelper.removeWeather(
+                        context
+                    )
+                }
+            }
+        }
+    }
+
+    private fun useWeatherApiProvider(context: Context) {
+        CoroutineScope(Dispatchers.IO).launch {
+            val repository = WeatherApiRepository()
+
+            when (val response = repository.getWeather()) {
+                is NetworkResponse.Success -> {
+                    try {
+                        val current = response.body["current"] as LinkedTreeMap<String, Any>?
+                        current?.let {
+                            val tempC = current["temp_c"] as Double
+                            val tempF = current["temp_f"] as Double
+                            val isDay = current["is_day"] as Double
+                            val condition = current["condition"] as LinkedTreeMap<String, Any>
+                            val iconCode = condition["code"] as Double
+
+                            Preferences.weatherTemp = if (Preferences.weatherTempUnit == "F") tempF.toFloat() else tempC.toFloat()
+                            Preferences.weatherIcon = WeatherHelper.getWeatherApiIcon(iconCode.toInt(), isDay.toInt() == 1)
+                            Preferences.weatherRealTempUnit = Preferences.weatherTempUnit
+                            MainWidget.updateWidget(context)
+
+                            EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
+                        }
+                    } catch(ex: Exception) {
+                        Log.d("ciao", ex.localizedMessage)
+                    }
+                }
+                is NetworkResponse.ServerError -> {
+                    when (response.code) {
+                        401 -> {
+                            Preferences.weatherProviderError = context.getString(R.string.weather_provider_error_invalid_key)
+                        }
+                        403 -> {
+                            Preferences.weatherProviderError = context.getString(R.string.weather_provider_error_expired_key)
+                        }
+                    }
+
+                    WeatherHelper.removeWeather(
+                        context
+                    )
+                }
+            }
+        }
+    }
+
+    private fun useAccuweatherProvider(context: Context) {
+        CoroutineScope(Dispatchers.IO).launch {
+            val repository = AccuweatherRepository()
+
+//            when (val response = repository.getWeather()) {
+//                is NetworkResponse.Success -> {
+//                    try {
+//                        Log.d("ciao", response.body.toString())
+//                    } catch(ex: Exception) {
+//
+//                    }
+//                }
+//                is NetworkResponse.ServerError -> {
+//                    WeatherHelper.removeWeather(
+//                        context
+//                    )
+//                }
+//            }
+        }
+    }
+
+    private fun useYrProvider(context: Context) {
+        CoroutineScope(Dispatchers.IO).launch {
+            val repository = YrRepository()
+
+            when (val response = repository.getWeather()) {
+                is NetworkResponse.Success -> {
+                    try {
+                        Log.d("ciao - yr", response.body.toString())
+                    } catch(ex: Exception) {
+
+                    }
+                }
+                is NetworkResponse.ServerError -> {
+                    WeatherHelper.removeWeather(
+                        context
+                    )
+                }
+            }
+        }
+    }
 }
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/network/api/ApiServices.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/network/api/ApiServices.kt
@ -0,0 +1,74 @@
+package com.tommasoberlose.anotherwidget.network.api
+
+import com.haroldadmin.cnradapter.NetworkResponse
+import retrofit2.http.*
+
+object ApiServices {
+    interface WeatherGovApiService {
+        @Headers("User-Agent: (Another Widget, tommaso.berlose@gmail.com)")
+        @GET("points/{latitude},{longitude}")
+        suspend fun getGridPoints(
+            @Path("latitude") latitude: String,
+            @Path("longitude") longitude: String
+        ): NetworkResponse<HashMap<String, Any>, HashMap<String, Any>>
+
+        @Headers("User-Agent: (Another Widget, tommaso.berlose@gmail.com)")
+        @GET("gridpoints/{gridId}/{gridX},{gridY}/forecast")
+        suspend fun getWeather(
+            @Path("gridId") gridId: String,
+            @Path("gridX") gridX: Int,
+            @Path("gridY") gridY: Int,
+            @Query("units") unit: String
+        ): NetworkResponse<HashMap<String, Any>, HashMap<String, Any>>
+    }
+
+    interface WeatherBitService {
+        @GET("current")
+        suspend fun getWeather(
+            @Query("key") key: String,
+            @Query("lat") lat: String,
+            @Query("lon") lon: String,
+            @Query("units") units: String,
+        ): NetworkResponse<HashMap<String, Any>, HashMap<String, Any>>
+    }
+
+    interface WeatherApiService {
+        @Headers("Accept: application/json")
+        @GET("current.json")
+        suspend fun getWeather(
+            @Query("key") key: String,
+            @Query("q") location: String,
+        ): NetworkResponse<HashMap<String, Any>, HashMap<String, Any>>
+    }
+
+    interface HereService {
+        @GET("report.json")
+        suspend fun getWeather(
+            @Query("apiKey") apiKey: String,
+            @Query("latitude") latitude: String,
+            @Query("longitude") longitude: String,
+            @Query("product") product: String,
+            @Query("oneobservation") oneobservation: Boolean,
+            @Query("metric") metric: Boolean,
+        ): NetworkResponse<HashMap<String, Any>, HashMap<String, Any>>
+    }
+
+    interface AccuweatherService {
+        @GET("")
+        suspend fun getWeather(
+            @Path("gridId") gridId: String,
+            @Path("gridX") gridX: Int,
+            @Path("gridY") gridY: Int,
+            @Query("units") unit: String
+        ): NetworkResponse<HashMap<String, Any>, HashMap<String, Any>>
+    }
+
+    interface YrService {
+        @Headers("User-Agent: AnotherWidget")
+        @GET("compact.json")
+        suspend fun getWeather(
+            @Query("lat") lat: String,
+            @Query("lon") lon: String,
+        ): NetworkResponse<HashMap<String, Any>, HashMap<String, Any>>
+    }
+}
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/network/api/WeatherGovApiService.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/network/api/WeatherGovApiService.kt
@ -1,13 +0,0 @@
-package com.tommasoberlose.anotherwidget.network.api
-
-import com.haroldadmin.cnradapter.NetworkResponse
-import retrofit2.http.*
-
-interface WeatherGovApiService {
-    @GET("points/{latitude},{longitude}")
-    suspend fun getGridPoints(@Path("latitude") latitude: String, @Path("longitude") longitude: String): NetworkResponse<HashMap<String, Any>, HashMap<String, Any>>
-
-    @Headers("User-Agent: (Another Widget, tommaso.berlose@gmail.com)")
-    @GET("gridpoints/{gridId}/{gridX},{gridY}/forecast")
-    suspend fun getWeather(@Path("gridId") gridId: String, @Path("gridX") gridX: Int, @Path("gridY") gridY: Int, @Query("units") unit: String): NetworkResponse<HashMap<String, Any>, HashMap<String, Any>>
-}
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/AccuweatherRepository.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/AccuweatherRepository.kt
@ -0,0 +1,25 @@
+package com.tommasoberlose.anotherwidget.network.repository
+
+import com.haroldadmin.cnradapter.NetworkResponseAdapterFactory
+import com.tommasoberlose.anotherwidget.network.api.ApiServices
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class AccuweatherRepository {
+
+    /* ACCUWEATHER */
+    private val apiServiceAccu: ApiServices.AccuweatherService = getRetrofit().create(ApiServices.AccuweatherService::class.java)
+    suspend fun getWeather(): Nothing = TODO()
+
+    companion object {
+        private const val BASE_URL_ACCU = ""
+
+        private fun getRetrofit(): Retrofit {
+            return Retrofit.Builder()
+                .baseUrl(BASE_URL_ACCU)
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(NetworkResponseAdapterFactory())
+                .build()
+        }
+    }
+}
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/HereRepository.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/HereRepository.kt
@ -0,0 +1,26 @@
+package com.tommasoberlose.anotherwidget.network.repository
+
+import com.haroldadmin.cnradapter.NetworkResponseAdapterFactory
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.network.api.ApiServices
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class HereRepository {
+
+    /* HERE */
+    private val apiServiceHere: ApiServices.HereService = getRetrofit().create(ApiServices.HereService::class.java)
+    suspend fun getWeather() = apiServiceHere.getWeather(Preferences.weatherProviderApiHere, Preferences.customLocationLat, Preferences.customLocationLon, "observation", true, Preferences.weatherTempUnit != "F")
+
+    companion object {
+        private const val BASE_URL_HERE = "https://weather.ls.hereapi.com/weather/1.0/"
+
+        private fun getRetrofit(): Retrofit {
+            return Retrofit.Builder()
+                .baseUrl(BASE_URL_HERE)
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(NetworkResponseAdapterFactory())
+                .build()
+        }
+    }
+}
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/WeatherApiRepository.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/WeatherApiRepository.kt
@ -0,0 +1,26 @@
+package com.tommasoberlose.anotherwidget.network.repository
+
+import com.haroldadmin.cnradapter.NetworkResponseAdapterFactory
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.network.api.ApiServices
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class WeatherApiRepository {
+
+    /* WEATHER API*/
+    private val apiServiceApi: ApiServices.WeatherApiService = getRetrofit().create(ApiServices.WeatherApiService::class.java)
+    suspend fun getWeather() = apiServiceApi.getWeather(Preferences.weatherProviderApiWeatherApi, "${Preferences.customLocationLat},${Preferences.customLocationLon}")
+
+    companion object {
+        private const val BASE_URL_API = "http://api.weatherapi.com/v1/"
+
+        private fun getRetrofit(): Retrofit {
+            return Retrofit.Builder()
+                .baseUrl(BASE_URL_API)
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(NetworkResponseAdapterFactory())
+                .build()
+        }
+    }
+}
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/WeatherGovRepository.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/WeatherGovRepository.kt
@ -1,22 +1,23 @@
 package com.tommasoberlose.anotherwidget.network.repository

 import com.haroldadmin.cnradapter.NetworkResponseAdapterFactory
-import com.tommasoberlose.anotherwidget.network.api.WeatherGovApiService
+import com.tommasoberlose.anotherwidget.network.api.ApiServices
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory

 class WeatherGovRepository {

-    private val apiService: WeatherGovApiService = getRetrofit().create(WeatherGovApiService::class.java)
-
-    suspend fun getGridPoints(latitude: String, longitude: String) = apiService.getGridPoints(latitude, longitude)
-    suspend fun getWeather(gridId: String, gridX: Double, gridY: Double, unit: String) = apiService.getWeather(gridId, gridX.toInt(), gridY.toInt(), unit)
+    /* WEATHER GOV*/
+    private val apiServiceGov: ApiServices.WeatherGovApiService = getRetrofit().create(ApiServices.WeatherGovApiService::class.java)
+    suspend fun getGridPoints(latitude: String, longitude: String) = apiServiceGov.getGridPoints(latitude, longitude)
+    suspend fun getWeather(gridId: String, gridX: Double, gridY: Double, unit: String) = apiServiceGov.getWeather(gridId, gridX.toInt(), gridY.toInt(), unit)

    companion object {
-        private const val BASE_URL = "https://api.weather.gov/"
+        private const val BASE_URL_GOV = "https://api.weather.gov/"
+
        private fun getRetrofit(): Retrofit {
            return Retrofit.Builder()
-                .baseUrl(BASE_URL)
+                .baseUrl(BASE_URL_GOV)
                .addConverterFactory(GsonConverterFactory.create())
                .addCallAdapterFactory(NetworkResponseAdapterFactory())
                .build()
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/WeatherbitRepository.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/WeatherbitRepository.kt
@ -0,0 +1,26 @@
+package com.tommasoberlose.anotherwidget.network.repository
+
+import com.haroldadmin.cnradapter.NetworkResponseAdapterFactory
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.network.api.ApiServices
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class WeatherbitRepository {
+
+    /* BIT */
+    private val apiServiceBit: ApiServices.WeatherBitService = getRetrofit().create(ApiServices.WeatherBitService::class.java)
+    suspend fun getWeather() = apiServiceBit.getWeather(Preferences.weatherProviderApiWeatherBit, Preferences.customLocationLat, Preferences.customLocationLon, if (Preferences.weatherTempUnit == "F") "I" else "M")
+
+    companion object {
+        private const val BASE_URL_BIT = "https://api.weatherbit.io/v2.0/"
+
+        private fun getRetrofit(): Retrofit {
+            return Retrofit.Builder()
+                .baseUrl(BASE_URL_BIT)
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(NetworkResponseAdapterFactory())
+                .build()
+        }
+    }
+}
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/YrRepository.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/network/repository/YrRepository.kt
@ -0,0 +1,26 @@
+package com.tommasoberlose.anotherwidget.network.repository
+
+import com.haroldadmin.cnradapter.NetworkResponseAdapterFactory
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.network.api.ApiServices
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class YrRepository {
+
+    /* YR */
+    private val apiServiceYr: ApiServices.YrService = getRetrofit().create(ApiServices.YrService::class.java)
+    suspend fun getWeather() = apiServiceYr.getWeather(Preferences.customLocationLat, Preferences.customLocationLon)
+
+    companion object {
+        private const val BASE_URL_YR = "https://api.met.no/weatherapi/locationforecast/2.0/"
+
+        private fun getRetrofit(): Retrofit {
+            return Retrofit.Builder()
+                .baseUrl(BASE_URL_YR)
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(NetworkResponseAdapterFactory())
+                .build()
+        }
+    }
+}