feat: refactor ZeWeatherService to use DI

zeapp/android/src/main/java/de/berlindroid/zeapp/zedi/ApiModule.kt

@@ -8,6 +8,7 @@ import de.berlindroid.zeapp.zeservices.ZePassApi
 import de.berlindroid.zeapp.zeservices.ZePassService
 import de.berlindroid.zeapp.zeservices.ZeUserApi
 import de.berlindroid.zeapp.zeservices.ZeUserService
+import de.berlindroid.zeapp.zeservices.ZeWeatherApi
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -19,6 +20,7 @@ data class ZeServerBaseUrl(
 )
 
 private val BASE_URL = ZeServerBaseUrl("https://zebadge.app/api/")
+private val METEO_URL = ZeServerBaseUrl("https://api.open-meteo.com")
 
 @InstallIn(ViewModelComponent::class)
 @Module
@@ -75,4 +77,14 @@ object ApiModule {
             .create(
                 ZeUserService::class.java,
             )
+
+    @Provides
+    fun provideZeWeatherApi(
+        json: Json,
+    ): ZeWeatherApi =
+        Retrofit.Builder()
+            .baseUrl(METEO_URL.value)
+            .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+            .build()
+            .create(ZeWeatherApi::class.java)
 }

zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZeWeatherApi.kt

@@ -0,0 +1,26 @@
+package de.berlindroid.zeapp.zeservices
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import retrofit2.http.GET
+
+interface ZeWeatherApi {
+
+    @Serializable
+    data class Weather(
+        @SerialName(value = "hourly")
+        val hourly: Hourly,
+    )
+
+    @Serializable
+    data class Hourly(
+        @SerialName(value = "time")
+        val time: List<String>,
+
+        @SerialName(value = "temperature_2m")
+        val temperature: List<Double>,
+    )
+
+    @GET("v1/forecast?latitude=52.5244&longitude=13.4105&hourly=temperature_2m&forecast_days=16")
+    suspend fun getWeather(): Weather
+}

zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZeWeatherService.kt

@@ -1,69 +1,38 @@
 package de.berlindroid.zeapp.zeservices
 
 import de.berlindroid.zeapp.zemodels.WeatherData
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import okhttp3.MediaType.Companion.toMediaType
-import retrofit2.Retrofit
-import retrofit2.converter.kotlinx.serialization.asConverterFactory
-import retrofit2.http.GET
-
-internal suspend fun fetchWeather(date: String): WeatherData {
-    try {
-        val weather = weatherApiService.getWeather()
-
-        val tempIndex = weather.hourly.time.indexOfFirst {
-            it.contains("${date}T12:00")
-        }
-        if (tempIndex == -1) {
+import javax.inject.Inject
+
+
+/**
+ * Service to fetch the weather data from the API by the provided date
+ */
+class ZeWeatherService @Inject constructor(private val zeWeatherApi: ZeWeatherApi) {
+
+    internal suspend fun fetchWeather(date: String): WeatherData {
+        try {
+            val weather = zeWeatherApi.getWeather()
+
+            val tempIndex = weather.hourly.time.indexOfFirst {
+                it.contains("${date}T12:00")
+            }
+            if (tempIndex == -1) {
+                return WeatherData(
+                    day = null,
+                    temperature = -1.0,
+                )
+            }
+            val temperature = weather.hourly.temperature[tempIndex]
+            val day = weather.hourly.time[tempIndex]
+            return WeatherData(
+                day = day,
+                temperature = temperature,
+            )
+        } catch (e: Exception) {
             return WeatherData(
                 day = null,
-                temperature = -1.0,
+                temperature = -42.0,
             )
         }
-        val temperature = weather.hourly.temperature[tempIndex]
-        val day = weather.hourly.time[tempIndex]
-        return WeatherData(
-            day = day,
-            temperature = temperature,
-        )
-    } catch (e: Exception) {
-        return WeatherData(
-            day = null,
-            temperature = -42.0,
-        )
     }
 }
-
-private val json = Json {
-    ignoreUnknownKeys = true
-}
-
-private val retrofit = Retrofit.Builder()
-    .baseUrl("https://api.open-meteo.com")
-    .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
-    .build()
-
-private val weatherApiService = retrofit.create(WeatherApi::class.java)
-
-private interface WeatherApi {
-
-    @Serializable
-    data class Weather(
-        @SerialName(value = "hourly")
-        val hourly: Hourly,
-    )
-
-    @Serializable
-    data class Hourly(
-        @SerialName(value = "time")
-        val time: List<String>,
-
-        @SerialName(value = "temperature_2m")
-        val temperature: List<Double>,
-    )
-
-    @GET("v1/forecast?latitude=52.5244&longitude=13.4105&hourly=temperature_2m&forecast_days=16")
-    suspend fun getWeather(): Weather
-}

zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeWeatherEditorDialog.kt

@@ -35,7 +35,6 @@ import de.berlindroid.zeapp.zebits.composableToBitmap
 import de.berlindroid.zeapp.zebits.isBinary
 import de.berlindroid.zeapp.zemodels.WeatherData
 import de.berlindroid.zeapp.zemodels.ZeConfiguration
-import de.berlindroid.zeapp.zeservices.fetchWeather
 import de.berlindroid.zeapp.zeui.zepages.WeatherPage
 import de.berlindroid.zeapp.zeui.zetheme.ZeBlack
 import de.berlindroid.zeapp.zeui.zetheme.ZeWhite
@@ -59,6 +58,7 @@ fun WeatherEditorDialog(
     dismissed: () -> Unit = {},
     accepted: (config: ZeConfiguration.Weather) -> Unit,
     updateMessage: (String) -> Unit,
+    onFetchWeatherClick: suspend (String) -> WeatherData,
 ) {
     val activity = LocalContext.current as Activity
 
@@ -200,9 +200,8 @@ fun WeatherEditorDialog(
                 item {
                     Button(
                         onClick = {
-                            // Fix this please :)
                             scope.launch {
-                                weatherData = fetchWeather(date)
+                                weatherData = onFetchWeatherClick(date)
                                 redrawComposableImage()
                             }
                         },

zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/SelectedEditor.kt

@@ -74,6 +74,7 @@ internal fun SelectedEditor(
                 dismissed = { vm.slotConfigured(null, null) },
                 accepted = { newConfig -> vm.slotConfigured(editor.slot, newConfig) },
                 updateMessage = vm::showMessage,
+                onFetchWeatherClick = vm::fetchWeather,
             )
 
             is ZeConfiguration.Quote -> RandomQuotesEditorDialog(

zeapp/android/src/main/java/de/berlindroid/zeapp/zevm/ZeBadgeViewModel.kt

@@ -19,6 +19,7 @@ import de.berlindroid.zeapp.zeservices.ZeBadgeManager
 import de.berlindroid.zeapp.zeservices.ZeClipboardService
 import de.berlindroid.zeapp.zeservices.ZeImageProviderService
 import de.berlindroid.zeapp.zeservices.ZePreferencesService
+import de.berlindroid.zeapp.zeservices.ZeWeatherService
 import de.berlindroid.zeapp.zeui.pixelManipulation
 import de.berlindroid.zeapp.zeui.simulator.ZeSimulatorButtonAction
 import de.berlindroid.zekompanion.ditherFloydSteinberg
@@ -47,6 +48,7 @@ class ZeBadgeViewModel @Inject constructor(
     private val badgeManager: ZeBadgeManager,
     private val preferencesService: ZePreferencesService,
     private val clipboardService: ZeClipboardService,
+    private val weatherService: ZeWeatherService,
     private val getTemplateConfigurations: GetTemplateConfigurations,
 ) : ViewModel() {
 
@@ -533,6 +535,8 @@ class ZeBadgeViewModel @Inject constructor(
         }
     }
 
+    suspend fun fetchWeather(date: String) = weatherService.fetchWeather(date)
+
     private fun getInitialUIState(): ZeBadgeUiState =
         ZeBadgeUiState(
             message = "",