Hw3 weather app mvvm

app/build.gradle

@@ -20,9 +20,11 @@ android {
     }
 
     buildFeatures {
-        viewBinding = true
+        viewBinding true
+        dataBinding true
     }
 
+
     buildTypes {
         release {
             minifyEnabled false
@@ -40,6 +42,7 @@ android {
 
 dependencies {
     implementation 'com.google.android.gms:play-services-location:19.0.1'
+
     def room_version = "2.4.2"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
@@ -48,7 +51,11 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1"
+
+    def lifecycle = "2.4.1"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
 
     //SwipeRefreshLayout
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -59,23 +66,28 @@ dependencies {
     //Coil
     implementation "io.coil-kt:coil:1.1.1"
 
+    def viewBinding = "1.5.3"
+    implementation "com.github.kirich1409:viewbindingpropertydelegate:$viewBinding"
+    // To use only without reflection variants of viewBinding
+    implementation "com.github.kirich1409:viewbindingpropertydelegate-noreflection:$viewBinding"
+
     def navigation = "2.4.1"
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation"
     implementation "androidx.navigation:navigation-runtime-ktx:$navigation"
 
-
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
+    def coroutines = "1.6.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     // region Network
     def retrofit = "2.9.0"
-    implementation "com.squareup.retrofit2:retrofit:${retrofit}"
-    implementation "com.squareup.retrofit2:converter-gson:${retrofit}"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit"
 
     def okhttp = "4.9.3"
-    implementation "com.squareup.okhttp3:okhttp:${okhttp}"
-    debugImplementation "com.squareup.okhttp3:logging-interceptor:${okhttp}"
+    implementation "com.squareup.okhttp3:okhttp:$okhttp"
+    debugImplementation "com.squareup.okhttp3:logging-interceptor:$okhttp"
     // endregion
 
     testImplementation 'junit:junit:4.13.2'

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application

app/src/main/java/ru/itis/karakurik/androidLab2/data/api/mapper/WeatherIconUrlMapper.kt

@@ -1,7 +1,11 @@
 package ru.itis.karakurik.androidLab2.data.api.mapper
 
 class WeatherIconUrlMapper {
-    fun map(iconId: String): String {
+    fun mapToLargeIcon(iconId: String): String {
         return "http://openweathermap.org/img/wn/${iconId}@2x.png"
     }
+
+    fun mapToSmallIcon(iconId: String): String {
+        return "http://openweathermap.org/img/wn/${iconId}.png"
+    }
 }

app/src/main/java/ru/itis/karakurik/androidLab2/data/api/mapper/WeatherMapper.kt

@@ -20,7 +20,7 @@ class WeatherMapper(
         windDeg = windDegMapper.map(weatherResponse.wind.deg),
         windSpeed = weatherResponse.wind.speed,
         pressure = weatherResponse.main.pressure,
-        iconUrl = weatherIconUrlMapper.map(weatherResponse.weather[0].icon)
+        iconUrl = weatherIconUrlMapper.mapToLargeIcon(weatherResponse.weather[0].icon)
     )
 
     fun map(city: City) : Weather = Weather(
@@ -35,6 +35,6 @@ class WeatherMapper(
         windDeg = windDegMapper.map(city.wind.deg),
         windSpeed = city.wind.speed,
         pressure = city.main.pressure,
-        iconUrl = weatherIconUrlMapper.map(city.weather[0].icon)
+        iconUrl = weatherIconUrlMapper.mapToLargeIcon(city.weather[0].icon)
     )
 }

app/src/main/java/ru/itis/karakurik/androidLab2/di/DiContainer.kt

@@ -1,5 +1,6 @@
 package ru.itis.karakurik.androidLab2.di
 
+import kotlinx.coroutines.Dispatchers
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
@@ -14,6 +15,8 @@ import ru.itis.karakurik.androidLab2.di.interceptors.LangInterceptor
 import ru.itis.karakurik.androidLab2.di.interceptors.UnitsInterceptor
 import ru.itis.karakurik.androidLab2.domain.repository.WeatherRepository
 import ru.itis.karakurik.androidLab2.domain.repository.WeatherRepositoryImpl
+import ru.itis.karakurik.androidLab2.domain.usecase.GetWeatherListUseCase
+import ru.itis.karakurik.androidLab2.domain.usecase.GetWeatherUseCase
 
 private const val BASE_URL = "https://api.openweathermap.org/data/2.5/"
 
@@ -53,7 +56,7 @@ object DiContainer {
         WeatherIconUrlMapper()
     }
 
-    val weatherMapper: WeatherMapper by lazy {
+    private val weatherMapper: WeatherMapper by lazy {
         WeatherMapper(
             windDegMapper,
             weatherIconUrlMapper
@@ -66,4 +69,12 @@ object DiContainer {
             weatherMapper
         )
     }
+
+    val getWeatherUseCase: GetWeatherUseCase by lazy {
+        GetWeatherUseCase(weatherRepository, Dispatchers.Default)
+    }
+
+    val getWeatherListUseCase: GetWeatherListUseCase by lazy {
+        GetWeatherListUseCase(weatherRepository, Dispatchers.Default)
+    }
 }

app/src/main/java/ru/itis/karakurik/androidLab2/domain/repository/WeatherRepositoryImpl.kt

@@ -1,5 +1,6 @@
 package ru.itis.karakurik.androidLab2.domain.repository
 
+import ru.itis.karakurik.androidLab2.BuildConfig
 import ru.itis.karakurik.androidLab2.data.api.Api
 import ru.itis.karakurik.androidLab2.data.api.mapper.WeatherMapper
 import ru.itis.karakurik.androidLab2.domain.entity.Weather

app/src/main/java/ru/itis/karakurik/androidLab2/domain/usecase/GetWeathersUseCase.kt → app/src/main/java/ru/itis/karakurik/androidLab2/domain/usecase/GetWeatherListUseCase.kt

@@ -6,7 +6,7 @@ import kotlinx.coroutines.withContext
 import ru.itis.karakurik.androidLab2.domain.entity.Weather
 import ru.itis.karakurik.androidLab2.domain.repository.WeatherRepository
 
-class GetWeathersUseCase(
+class GetWeatherListUseCase(
     private val weatherRepository: WeatherRepository,
     private val dispatcher: CoroutineDispatcher = Dispatchers.Main
 ) {

app/src/main/java/ru/itis/karakurik/androidLab2/extentions/ActivityExt.kt

@@ -3,6 +3,9 @@ package ru.itis.karakurik.androidLab2.extentions
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
+import androidx.recyclerview.widget.LinearSmoothScroller
+
+import androidx.recyclerview.widget.RecyclerView
 
 fun AppCompatActivity.findController (id: Int) : NavController {
     return (supportFragmentManager.findFragmentById(id) as NavHostFragment).navController

app/src/main/java/ru/itis/karakurik/androidLab2/presentation/MainViewModel.kt

@@ -0,0 +1,62 @@
+package ru.itis.karakurik.androidLab2.presentation
+
+import Event
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.launch
+import ru.itis.karakurik.androidLab2.domain.entity.Weather
+import ru.itis.karakurik.androidLab2.domain.usecase.GetWeatherListUseCase
+import ru.itis.karakurik.androidLab2.domain.usecase.GetWeatherUseCase
+
+class MainViewModel(
+    private val getWeatherUseCase: GetWeatherUseCase,
+    private val getWeatherListUseCase: GetWeatherListUseCase
+) : ViewModel() {
+
+    private val _weather: MutableLiveData<Result<Weather>> = MutableLiveData()
+    val weather: LiveData<Result<Weather>> = _weather
+
+    private val _weatherList: MutableLiveData<Result<List<Weather>>> = MutableLiveData()
+    val weatherList: LiveData<Result<List<Weather>>> = _weatherList
+
+    private val _cityId: MutableLiveData<Event<Result<Int>>> = MutableLiveData()
+    val cityId: LiveData<Event<Result<Int>>> = _cityId
+
+    fun onGetWeather(cityId : Int) {
+        viewModelScope.launch {
+            kotlin.runCatching {
+                getWeatherUseCase(cityId)
+            }.onSuccess {
+                _weather.value = Result.success(it)
+            }.onFailure {
+                _weather.value = Result.failure(it)
+            }
+        }
+    }
+
+    fun onGetWeatherList(lat: Double, lon: Double, cnt: Int) {
+        viewModelScope.launch {
+            kotlin.runCatching {
+                getWeatherListUseCase(lat, lon, cnt)
+            }.onSuccess {
+                _weatherList.value = Result.success(it)
+            }.onFailure {
+                _weatherList.value = Result.failure(it)
+            }
+        }
+    }
+
+    fun onGetCityId(cityName: String) {
+        viewModelScope.launch {
+            kotlin.runCatching {
+                getWeatherUseCase(cityName).id
+            }.onSuccess {
+                _cityId.value = Event(Result.success(it))
+            }.onFailure {
+                _cityId.value = Event(Result.failure(it))
+            }
+        }
+    }
+}

app/src/main/java/ru/itis/karakurik/androidLab2/presentation/activities/MainActivity.kt

@@ -3,24 +3,22 @@ package ru.itis.karakurik.androidLab2.presentation.activities
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
+import by.kirich1409.viewbindingdelegate.viewBinding
+import ru.itis.karakurik.androidLab2.R
 import ru.itis.karakurik.androidLab2.databinding.ActivityMainBinding
 import ru.itis.karakurik.androidLab2.extentions.findController
 
-class MainActivity : AppCompatActivity() {
-    private var binding: ActivityMainBinding? = null
+class MainActivity : AppCompatActivity(R.layout.activity_main) {
+    private val binding by viewBinding(ActivityMainBinding::bind)
     private var controller: NavController? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityMainBinding.inflate(layoutInflater).also {
-            setContentView(it.root)
-        }
-        controller = binding?.navHostFragmentMain?.id?.let { findController(it) }
+        controller = binding.navHostFragmentMain.id.let { findController(it) }
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        binding = null
         controller = null
     }
 }