Petr U. HW_RxJava

app/build.gradle

@@ -8,7 +8,7 @@ android {
     namespace "otus.homework.reactivecats"
     defaultConfig {
         applicationId "otus.homework.reactivecats"
-        minSdkVersion 23
+        minSdkVersion 24
 
         targetSdkVersion 34
         versionCode 1
@@ -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.11.0'
 }

app/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/Theme.ReactiveCats">
         <activity android:name=".MainActivity"
             android:exported="true">

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<Fact>
+    @GET("fact")
+    fun getCatFact(): Single<Fact>
 }

app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt

@@ -5,40 +5,70 @@ 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<Result>()
     val catsLiveData: LiveData<Result> = _catsLiveData
+    private val disposable = CompositeDisposable()
 
     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
-                        )
-                    )
-                }
-            }
-
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                _catsLiveData.value = ServerError
-            }
-        })
+        disposable.add(
+            catsService.getCatFact()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                    {
+                        _catsLiveData.value = Success(it)
+                    },
+                    {
+                        _catsLiveData.value = Error(message = it.message ?: "Some error")
+                    }
+                )
+        )
+
+        disposable.add(
+            localCatFactsGenerator.generateCatFactPeriodically()
+                .subscribe({
+                    println("Fact = $it\n")
+                })
+        )
+
+        getFacts()
     }
 
-    fun getFacts() {}
+    fun getFacts() {
+        disposable.add(
+            Observable.interval(2, TimeUnit.SECONDS).doOnNext {
+                //скорее всего есть какой-то более подходящий вариант,
+                // поскольку текущая реализация не выглядит "элегантной"
+                disposable.add(
+                    catsService.getCatFact()
+                        .onErrorResumeNext(localCatFactsGenerator.generateCatFact())
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe({
+                            _catsLiveData.value = Success(it)
+                        }, {
+                            _catsLiveData.value = Error(message = it.message ?: "Some error")
+                        })
+                )
+            }.subscribe()
+        )
+    }
+
+    override fun onCleared() {
+        disposable.dispose()
+    }
 }
 
 class CatsViewModelFactory(

app/src/main/java/otus/homework/reactivecats/DiContainer.kt

@@ -2,14 +2,16 @@ package otus.homework.reactivecats
 
 import android.content.Context
 import retrofit2.Retrofit
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 
 class DiContainer {
 
     private val retrofit by lazy {
         Retrofit.Builder()
-            .baseUrl("https://cat-fact.herokuapp.com/facts/")
+            .baseUrl("https://catfact.ninja/")
             .addConverterFactory(GsonConverterFactory.create())
+            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
             .build()
     }
 

app/src/main/java/otus/homework/reactivecats/Fact.kt

@@ -3,6 +3,6 @@ package otus.homework.reactivecats
 import com.google.gson.annotations.SerializedName
 
 data class Fact(
-    @field:SerializedName("text")
+    @field:SerializedName("fact")
     val text: String
 )

app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt

@@ -3,6 +3,7 @@ package otus.homework.reactivecats
 import android.content.Context
 import io.reactivex.Flowable
 import io.reactivex.Single
+import java.util.concurrent.TimeUnit
 import kotlin.random.Random
 
 class LocalCatFactsGenerator(
@@ -15,7 +16,7 @@ class LocalCatFactsGenerator(
      * обернутую в подходящий стрим(Flowable/Single/Observable и т.п)
      */
     fun generateCatFact(): Single<Fact> {
-        return Single.never()
+        return Single.just(getRandomFact())
     }
 
     /**
@@ -24,7 +25,14 @@ class LocalCatFactsGenerator(
      * Если вновь заэмиченный Fact совпадает с предыдущим - пропускаем элемент.
      */
     fun generateCatFactPeriodically(): Flowable<Fact> {
-        val success = Fact(context.resources.getStringArray(R.array.local_cat_facts)[Random.nextInt(5)])
-        return Flowable.empty()
+        return Flowable.interval(2, TimeUnit.SECONDS)
+            .map {
+                getRandomFact()
+            }.distinctUntilChanged()
+    }
+
+    private fun getRandomFact(): Fact {
+        val facts = context.resources.getStringArray(R.array.local_cat_facts)
+        return Fact(facts[Random.nextInt(facts.size)])
     }
 }

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <debug-overrides>
+        <trust-anchors>
+            <!-- Для отладки через http proxy -->
+            <certificates src="user" />
+        </trust-anchors>
+    </debug-overrides>
+</network-security-config>