From 1bbec918cb1a84c621ff56b3a4f7687fd79da916 Mon Sep 17 00:00:00 2001 From: AlinaSheyanova Date: Sun, 4 May 2025 19:37:56 +0200 Subject: [PATCH] homework 1 (RxJava) --- app/build.gradle | 1 + .../otus/homework/reactivecats/CatsService.kt | 4 +- .../homework/reactivecats/CatsViewModel.kt | 50 +++++++++++-------- .../otus/homework/reactivecats/DiContainer.kt | 3 ++ .../reactivecats/LocalCatFactsGenerator.kt | 12 +++-- 5 files changed, 43 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 71df92dd..1f8bb5f4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,4 +46,5 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0' implementation "io.reactivex.rxjava2:rxjava:2.2.21" implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' + implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0' } \ No newline at end of file diff --git a/app/src/main/java/otus/homework/reactivecats/CatsService.kt b/app/src/main/java/otus/homework/reactivecats/CatsService.kt index c79be483..17d1e38e 100644 --- a/app/src/main/java/otus/homework/reactivecats/CatsService.kt +++ b/app/src/main/java/otus/homework/reactivecats/CatsService.kt @@ -1,10 +1,10 @@ package otus.homework.reactivecats -import retrofit2.Call +import io.reactivex.Single import retrofit2.http.GET interface CatsService { @GET("random?animal_type=cat") - fun getCatFact(): Call + fun getCatFact(): Single } \ No newline at end of file diff --git a/app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt b/app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt index d62eaf97..05c2ef1e 100644 --- a/app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt +++ b/app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt @@ -5,40 +5,50 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response +import io.reactivex.Observable +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.schedulers.Schedulers +import java.util.concurrent.TimeUnit class CatsViewModel( - catsService: CatsService, - localCatFactsGenerator: LocalCatFactsGenerator, + private val catsService: CatsService, + private val localCatFactsGenerator: LocalCatFactsGenerator, context: Context ) : ViewModel() { private val _catsLiveData = MutableLiveData() val catsLiveData: LiveData = _catsLiveData + private val disposable = CompositeDisposable() + private val defaultErrorMessage = context.resources.getString(R.string.default_error_text) init { - catsService.getCatFact().enqueue(object : Callback { - override fun onResponse(call: Call, response: Response) { - if (response.isSuccessful && response.body() != null) { - _catsLiveData.value = Success(response.body()!!) - } else { - _catsLiveData.value = Error( - response.errorBody()?.string() ?: context.getString( - R.string.default_error_text - ) - ) - } + Observable.interval(2, TimeUnit.SECONDS) + .subscribe { + getFacts() } + .let { disposable.add(it) } + } - override fun onFailure(call: Call, t: Throwable) { - _catsLiveData.value = ServerError + private fun getFacts() { + catsService.getCatFact() + .subscribeOn(Schedulers.io()) + .onErrorResumeNext { + localCatFactsGenerator.generateCatFact() } - }) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe({ + response -> _catsLiveData.value = Success(response) + }, { + error -> _catsLiveData.value = Error(error.message ?: defaultErrorMessage) + }) + .let { disposable.add(it)} } - fun getFacts() {} + override fun onCleared() { + disposable.clear() + super.onCleared() + } } class CatsViewModelFactory( diff --git a/app/src/main/java/otus/homework/reactivecats/DiContainer.kt b/app/src/main/java/otus/homework/reactivecats/DiContainer.kt index dfbb9a2b..9163961f 100644 --- a/app/src/main/java/otus/homework/reactivecats/DiContainer.kt +++ b/app/src/main/java/otus/homework/reactivecats/DiContainer.kt @@ -2,6 +2,8 @@ package otus.homework.reactivecats import android.content.Context import retrofit2.Retrofit +import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory + import retrofit2.converter.gson.GsonConverterFactory class DiContainer { @@ -10,6 +12,7 @@ class DiContainer { Retrofit.Builder() .baseUrl("https://cat-fact.herokuapp.com/facts/") .addConverterFactory(GsonConverterFactory.create()) + .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) .build() } diff --git a/app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt b/app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt index 4481062e..98c7c15c 100644 --- a/app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt +++ b/app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt @@ -3,19 +3,19 @@ package otus.homework.reactivecats import android.content.Context import io.reactivex.Flowable import io.reactivex.Single -import kotlin.random.Random +import java.util.concurrent.TimeUnit class LocalCatFactsGenerator( private val context: Context ) { - + private val localFactsArray = context.resources.getStringArray(R.array.local_cat_facts) /** * Реализуйте функцию otus.homework.reactivecats.LocalCatFactsGenerator#generateCatFact так, * чтобы она возвращала Fact со случайной строкой из массива строк R.array.local_cat_facts * обернутую в подходящий стрим(Flowable/Single/Observable и т.п) */ fun generateCatFact(): Single { - return Single.never() + return Single.just(Fact(text = localFactsArray.random())) } /** @@ -24,7 +24,9 @@ class LocalCatFactsGenerator( * Если вновь заэмиченный Fact совпадает с предыдущим - пропускаем элемент. */ fun generateCatFactPeriodically(): Flowable { - val success = Fact(context.resources.getStringArray(R.array.local_cat_facts)[Random.nextInt(5)]) - return Flowable.empty() + return Flowable + .interval(2000L, TimeUnit.MILLISECONDS) + .map { Fact(text = localFactsArray.random()) } + .distinctUntilChanged() } } \ No newline at end of file