Skip to content

Commit 2c1199c

Browse files
committed
- Minor code refactoring at Constants.kt, LocationCoordinatesUseCase.kt, PermissionHandler.kt, ResourceProvider.kt, WeatherForecastMapper.kt.
1 parent 2f53881 commit 2c1199c

5 files changed

Lines changed: 12 additions & 6 deletions

File tree

app/src/main/java/com/asad/weatherapp/data/mapper/WeatherForecastMapper.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import com.asad.weatherapp.domain.model.forecast.WeatherCondition
66
import com.asad.weatherapp.domain.model.forecast.WeatherForecastModel
77
import com.asad.weatherapp.domain.model.forecast.WeatherForecastTimeSlotModel
88
import com.asad.weatherapp.domain.model.forecast.WeatherType
9+
import com.asad.weatherapp.utils.CLOUDS
10+
import com.asad.weatherapp.utils.RAIN
911
import com.asad.weatherapp.utils.getDayName
1012
import javax.inject.Inject
1113

@@ -44,8 +46,8 @@ class WeatherForecastMapper @Inject constructor() :
4446

4547
private fun mapToWeatherType(type: String): WeatherType =
4648
when {
47-
type.equals("Rain", ignoreCase = true) -> WeatherType.RAINY
48-
type.equals("Clouds", ignoreCase = true) -> WeatherType.CLOUDY
49+
type.equals(RAIN, ignoreCase = true) -> WeatherType.RAINY
50+
type.equals(CLOUDS, ignoreCase = true) -> WeatherType.CLOUDY
4951
else -> WeatherType.SUNNY
5052
}
5153

app/src/main/java/com/asad/weatherapp/domain/usecase/LocationCoordinatesUseCase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.asad.weatherapp.domain.repository.LocationCoordinatesRepository
55
import javax.inject.Inject
66

77
class LocationCoordinatesUseCase @Inject constructor(
8-
val locationCoordinatesRepository: LocationCoordinatesRepository
8+
private val locationCoordinatesRepository: LocationCoordinatesRepository
99
) {
1010
suspend operator fun invoke(): Result<LocationCoordinates> = locationCoordinatesRepository.getCurrentLocation()
1111
}

app/src/main/java/com/asad/weatherapp/ui/components/PermissionHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ fun PermissionHandler(
129129
}
130130

131131
@Composable
132-
fun PermissionDeniedUI(
132+
private fun PermissionDeniedUI(
133133
onTapAgain: () -> Unit = {},
134134
) {
135135
Box(

app/src/main/java/com/asad/weatherapp/utils/Constants.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ package com.asad.weatherapp.utils
33

44
const val LATITUDE = "lat"
55
const val LONGITUDE = "lon"
6-
const val APP_ID = "appid"
6+
const val APP_ID = "appid"
7+
const val RAIN = "Rain"
8+
const val CLOUDS = "Clouds"
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.asad.weatherapp.utils
22

3+
import androidx.annotation.StringRes
4+
35
interface ResourceProvider {
4-
fun getString(resId: Int, vararg args: Any): String
6+
fun getString(@StringRes resId: Int, vararg args: Any): String
57
}

0 commit comments

Comments
 (0)