Merge pull request #68 from odaridavid/fix-location-bugs

Fix crashlytics non fatal bug cause of language + minor improvements

README.md

@@ -26,7 +26,7 @@ In your `local.properties` you will need to add your Open Weather API key and co
 ```properties
 OPEN_WEATHER_API_KEY = YOUR KEY
 OPEN_WEATHER_BASE_URL=https://api.openweathermap.org
-OPEN_WEATHER_ICONS_URL= http://openweathermap.org/img/wn/
+OPEN_WEATHER_ICONS_URL= https://openweathermap.org/img/wn/
 ```
 
 Check for one under  [`Api Keys`](https://home.openweathermap.org/api_keys)

app/build.gradle.kts

@@ -195,6 +195,9 @@ dependencies {
     // Chucker
     debugImplementation(libs.chucker.debug)
     releaseImplementation(libs.chucker.release)
+
+    // Memory Leak Detection
+    debugImplementation(libs.leakcanary)
 }
 
 kapt {

app/src/main/java/com/github/odaridavid/weatherapp/MainViewModel.kt

@@ -2,6 +2,7 @@ package com.github.odaridavid.weatherapp
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.github.odaridavid.weatherapp.core.api.Logger
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
 import com.github.odaridavid.weatherapp.core.model.DefaultLocation
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -13,7 +14,8 @@ import javax.inject.Inject
 
 @HiltViewModel
 class MainViewModel @Inject constructor(
-    private val settingsRepository: SettingsRepository
+    private val settingsRepository: SettingsRepository,
+    private val logger: Logger
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(MainViewState())
@@ -37,6 +39,9 @@ class MainViewModel @Inject constructor(
                 }
                 setState { copy(defaultLocation = defaultLocation) }
             }
+            is MainViewIntent.LogException -> {
+               logger.logException(mainViewIntent.throwable)
+            }
         }
     }
 
@@ -51,7 +56,7 @@ class MainViewModel @Inject constructor(
 data class MainViewState(
     val isPermissionGranted: Boolean = false,
     val isLocationSettingEnabled: Boolean = false,
-    val defaultLocation: DefaultLocation? = null
+    val defaultLocation: DefaultLocation? = DefaultLocation(longitude = 0.0, latitude = 0.0)
 )
 
 sealed class MainViewIntent {
@@ -62,4 +67,6 @@ sealed class MainViewIntent {
 
     data class ReceiveLocation(val latitude: Double, val longitude: Double) : MainViewIntent()
 
+    data class LogException(val throwable: Throwable) : MainViewIntent()
+
 }

app/src/main/java/com/github/odaridavid/weatherapp/data/settings/DefaultSettingsRepository.kt

@@ -43,9 +43,9 @@ class DefaultSettingsRepository @Inject constructor(
         "Version : ${BuildConfig.VERSION_NAME}-${BuildConfig.BUILD_TYPE}"
 
     override fun getAvailableLanguages(): List<String> =
-        SupportedLanguage.values().map { it.languageName }
+        SupportedLanguage.entries.map { it.languageName }
 
-    override fun getAvailableUnits(): List<String> = Units.values().map { it.value }
+    override fun getAvailableUnits(): List<String> = Units.entries.map { it.value }
 
     override suspend fun setDefaultLocation(defaultLocation: DefaultLocation) {
         set(key = PREF_LAT_LNG, value = "${defaultLocation.latitude}/${defaultLocation.longitude}")

app/src/main/java/com/github/odaridavid/weatherapp/data/weather/remote/Mappers.kt

@@ -87,8 +87,8 @@ private fun getDate(utcInMillis: Long, formatPattern: String): String {
 
 fun mapResponseCodeToThrowable(code: Int): Throwable = when (code) {
     HttpURLConnection.HTTP_UNAUTHORIZED -> UnauthorizedException("Unauthorized access : $code")
-    in 400..499 -> ClientException("Client error : $code")
-    in 500..600 -> ServerException("Server error : $code")
+    in CLIENT_ERRORS -> ClientException("Client error : $code")
+    in SERVER_ERRORS -> ServerException("Server error : $code")
     else -> GenericException("Generic error : $code")
 }
 
@@ -102,3 +102,6 @@ fun mapThrowableToErrorType(throwable: Throwable): ErrorType {
     }
     return errorType
 }
+
+private val SERVER_ERRORS = 500..600
+private val CLIENT_ERRORS = 400..499

app/src/main/java/com/github/odaridavid/weatherapp/ui/AppNavGraph.kt

@@ -26,8 +26,6 @@ fun WeatherAppScreensConfig(
                 .collectAsState()
                 .value
 
-            homeViewModel.processIntent(HomeScreenIntent.LoadWeatherData)
-
             HomeScreen(
                 state = state,
                 onSettingClicked = { navController.navigate(Destinations.SETTINGS.route) },

app/src/main/java/com/github/odaridavid/weatherapp/ui/MainActivity.kt

@@ -98,6 +98,8 @@ class MainActivity : ComponentActivity() {
                                 )
                             )
                         }
+                    }.addOnFailureListener { exception ->
+                        mainViewModel.processIntent(MainViewIntent.LogException(throwable = exception))
                     }
                 WeatherAppScreensConfig(navController = rememberNavController())
             }

app/src/main/java/com/github/odaridavid/weatherapp/ui/home/HomeViewModel.kt

@@ -41,6 +41,7 @@ class HomeViewModel @Inject constructor(
                         defaultLocation = defaultLocation
                     )
                 }
+                processIntent(HomeScreenIntent.LoadWeatherData)
             }
         }
     }

app/src/test/java/com/github/odaridavid/weatherapp/HomeViewModelIntegrationTest.kt

@@ -1,6 +1,7 @@
 package com.github.odaridavid.weatherapp
 
 import app.cash.turbine.test
+import com.github.odaridavid.weatherapp.core.Result
 import com.github.odaridavid.weatherapp.core.api.Logger
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
 import com.github.odaridavid.weatherapp.core.api.WeatherRepository
@@ -125,7 +126,11 @@ class HomeViewModelIntegrationTest {
 
     @Test
     fun `when we init the screen, then update the state`() = runBlocking {
-        val weatherRepository = createWeatherRepository()
+        val weatherRepository = mockk<WeatherRepository>() {
+            coEvery { fetchWeatherData(any(), any(), any()) } returns Result.Success(
+                fakeSuccessMappedWeatherResponse
+            )
+        }
 
         val viewModel = createViewModel(weatherRepository = weatherRepository)
 
@@ -136,8 +141,8 @@ class HomeViewModelIntegrationTest {
             ),
             locationName = "-",
             language = "English",
-            weather = null,
-            isLoading = true,
+            weather = fakeSuccessMappedWeatherResponse,
+            isLoading = false,
             errorMessageId = null
         )
 
@@ -150,7 +155,11 @@ class HomeViewModelIntegrationTest {
 
     @Test
     fun `when we receive a city name, the state is updated with it`() = runTest {
-        val weatherRepository = mockk<WeatherRepository>()
+        val weatherRepository = mockk<WeatherRepository>() {
+            coEvery { fetchWeatherData(any(), any(), any()) } returns Result.Success(
+                fakeSuccessMappedWeatherResponse
+            )
+        }
 
         val viewModel = createViewModel(
             weatherRepository = weatherRepository
@@ -163,8 +172,8 @@ class HomeViewModelIntegrationTest {
             ),
             locationName = "Paradise",
             language = "English",
-            weather = null,
-            isLoading = true,
+            weather = fakeSuccessMappedWeatherResponse,
+            isLoading = false,
             errorMessageId = null
         )
 

gradle/libs.versions.toml

@@ -39,6 +39,7 @@ play-services-location = "21.1.0"
 retrofit = "2.9.0"
 truth = "1.4.2"
 turbine = "1.0.0"
+leakcanary = "3.0-alpha-1"
 
 [libraries]
 activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
@@ -88,6 +89,7 @@ playservices-location = { module = "com.google.android.gms:play-services-locatio
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 truth = { module = "com.google.truth:truth", version.ref = "truth" }
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
+leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }
 
 [plugins]
 com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }