Skip to content

done #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nazarovNV wants to merge 1 commit into
base: master
Choose a base branch
from
Open

done #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,8 @@ 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 "io.reactivex.rxjava2:rxjava:2.2.21"
implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
implementation "com.squareup.retrofit2:adapter-rxjava2:2.9.0"
}
6 changes: 3 additions & 3 deletions app/src/main/java/otus/homework/reactivecats/CatsService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Fact>
}
fun getCatFact(): Single<Fact>
}
54 changes: 31 additions & 23 deletions app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,48 @@ 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.Flowable
import java.util.concurrent.TimeUnit

import io.reactivex.disposables.CompositeDisposable
import io.reactivex.schedulers.Schedulers
import io.reactivex.android.schedulers.AndroidSchedulers

class CatsViewModel(
catsService: CatsService,
localCatFactsGenerator: LocalCatFactsGenerator,
context: Context
private val catsService: CatsService,
private val localCatFactsGenerator: LocalCatFactsGenerator,
private val context: Context
) : ViewModel() {

private val disposables = CompositeDisposable()

private val _catsLiveData = MutableLiveData<Result>()
val catsLiveData: LiveData<Result> = _catsLiveData

init {
catsService.getCatFact().enqueue(object : Callback<Fact> {
override fun onResponse(call: Call<Fact>, response: Response<Fact>) {
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
)
)
}
}
getFacts()
}

override fun onFailure(call: Call<Fact>, t: Throwable) {
_catsLiveData.value = ServerError
fun getFacts() {
val subscription = Flowable.interval(2, TimeUnit.SECONDS)
.flatMapSingle { catsService.getCatFact()
.onErrorResumeNext {
localCatFactsGenerator.generateCatFact()
}
}
})
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{ fact -> _catsLiveData.value = Success(fact) },
{ error -> _catsLiveData.value = Error(error.message ?: context.getString(R.string.default_error_text)) }
)
disposables.add(subscription)
}

fun getFacts() {}
override fun onCleared() {
super.onCleared()
disposables.clear()
}
}

class CatsViewModelFactory(
Expand All @@ -55,4 +63,4 @@ class CatsViewModelFactory(
sealed class Result
data class Success(val fact: Fact) : Result()
data class Error(val message: String) : Result()
object ServerError : Result()
object ServerError : Result()
5 changes: 4 additions & 1 deletion app/src/main/java/otus/homework/reactivecats/DiContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@ import android.content.Context
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory

import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory

class DiContainer {

private val retrofit by lazy {
Retrofit.Builder()
.baseUrl("https://cat-fact.herokuapp.com/facts/")
.addConverterFactory(GsonConverterFactory.create())
.addCallAdapterFactory(RxJava2CallAdapterFactory.create()) // 🎯 Добавляем адаптер RxJava
.build()
}

val service by lazy { retrofit.create(CatsService::class.java) }

fun localCatFactsGenerator(context: Context) = LocalCatFactsGenerator(context)
}
}
25 changes: 11 additions & 14 deletions app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,25 @@ package otus.homework.reactivecats
import android.content.Context
import io.reactivex.Flowable
import io.reactivex.Single
import io.reactivex.schedulers.Schedulers
import java.util.concurrent.TimeUnit
import kotlin.random.Random

class LocalCatFactsGenerator(
private val context: Context
) {

/**
* Реализуйте функцию otus.homework.reactivecats.LocalCatFactsGenerator#generateCatFact так,
* чтобы она возвращала Fact со случайной строкой из массива строк R.array.local_cat_facts
* обернутую в подходящий стрим(Flowable/Single/Observable и т.п)
*/
fun generateCatFact(): Single<Fact> {
return Single.never()
val factsArray = context.resources.getStringArray(R.array.local_cat_facts)
val randomFact = factsArray[Random.nextInt(factsArray.size)]
return Single.just(Fact(randomFact))
}

/**
* Реализуйте функцию otus.homework.reactivecats.LocalCatFactsGenerator#generateCatFactPeriodically так,
* чтобы она эмитила Fact со случайной строкой из массива строк R.array.local_cat_facts каждые 2000 миллисекунд.
* Если вновь заэмиченный Fact совпадает с предыдущим - пропускаем элемент.
*/
fun generateCatFactPeriodically(): Flowable<Fact> {
val success = Fact(context.resources.getStringArray(R.array.local_cat_facts)[Random.nextInt(5)])
return Flowable.empty()
val factsArray = context.resources.getStringArray(R.array.local_cat_facts)
return Flowable.interval(2, TimeUnit.SECONDS, Schedulers.computation())
.map { factsArray[Random.nextInt(factsArray.size)] }
.distinctUntilChanged()
.map { Fact(it) }
}
}
}