Skip to content

ДЗ ReactiveCats #210

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
AleksVira wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ДЗ ReactiveCats #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
506516b
RxJava добавлен в проект, проект переделан на Single, Flowable, и т.д.
AleksVira Oct 4, 2025
6ffbf97
Merge pull request #1 from AleksVira/homework_06
AleksVira Oct 4, 2025
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
8 changes: 5 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ plugins {
alias(libs.plugins.kotlinAndroid)
}

kotlin {
jvmToolchain(17)
}

android {
namespace 'otus.homework.reactivecats'
compileSdk 36
Expand All @@ -25,9 +29,6 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
buildFeatures {
viewBinding true
}
Expand All @@ -43,6 +44,7 @@ dependencies {
implementation libs.fragment.ktx
implementation libs.lifecycle.runtime.ktx
implementation libs.bundles.network
implementation libs.retrofit.adapter.rxjava2
implementation libs.gson
implementation libs.picasso
implementation libs.rxjava
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="otus.homework.reactivecats">

<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.ReactiveCats">
<activity android:name=".MainActivity"
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
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,11 +1,11 @@
package otus.homework.reactivecats

import retrofit2.Call
import io.reactivex.Single
import retrofit2.http.GET

interface CatsService {

//@GET("random?animal_type=cat")
@GET("fact")
fun getCatFact(): Call<Fact>
}
fun getCatFact(): Single<Fact>
}
64 changes: 39 additions & 25 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
@@ -1,58 +1,72 @@
package otus.homework.reactivecats

import android.content.Context
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 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,
context: Context
private val catsService: CatsService,
private val localCatFactsGenerator: LocalCatFactsGenerator,
private val networkErrorMessage: String,
private val defaultErrorMessage: String
) : ViewModel() {

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

private val compositeDisposable = 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
)
)
}
}
getCatFacts()
}

override fun onFailure(call: Call<Fact>, t: Throwable) {
_catsLiveData.value = ServerError
fun getCatFacts() {
val disposable = Flowable.interval(2, TimeUnit.SECONDS)
.flatMapSingle {
catsService.getCatFact()
.map<Result> { Success(it) }
.onErrorResumeNext(
localCatFactsGenerator.generateCatFact().map<Result> {
SuccessWithWarning(it, networkErrorMessage)
})
}
})
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
_catsLiveData.value = it
}, {
_catsLiveData.value = Error(it.message ?: defaultErrorMessage)
})
compositeDisposable.add(disposable)
}

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

class CatsViewModelFactory(
private val catsRepository: CatsService,
private val localCatFactsGenerator: LocalCatFactsGenerator,
private val context: Context
private val networkErrorMessage: String,
private val defaultErrorMessage: String
) :
ViewModelProvider.NewInstanceFactory() {

@Suppress("UNCHECKED_CAST")
override fun <T : ViewModel> create(modelClass: Class<T>): T =
CatsViewModel(catsRepository, localCatFactsGenerator, context) as T
CatsViewModel(catsRepository, localCatFactsGenerator, networkErrorMessage, defaultErrorMessage) as T
}

sealed class Result
data class Success(val fact: Fact) : Result()
data class SuccessWithWarning(val fact: Fact, val message: String) : Result()
data class Error(val message: String) : Result()
object ServerError : Result()
4 changes: 3 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 @@ -2,6 +2,7 @@ package otus.homework.reactivecats

import android.content.Context
import retrofit2.Retrofit
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
import retrofit2.converter.gson.GsonConverterFactory

class DiContainer {
Expand All @@ -11,10 +12,11 @@ class DiContainer {
//.baseUrl("https://cat-fact.herokuapp.com/facts/")
.baseUrl("https://catfact.ninja/")
.addConverterFactory(GsonConverterFactory.create())
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.build()
}

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

fun localCatFactsGenerator(context: Context) = LocalCatFactsGenerator(context)
}
18 changes: 14 additions & 4 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,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(
Expand All @@ -15,7 +16,11 @@ class LocalCatFactsGenerator(
* обернутую в подходящий стрим(Flowable/Single/Observable и т.п)
*/
fun generateCatFact(): Single<Fact> {
return Single.never()
return Single.fromCallable {
val facts = context.resources.getStringArray(R.array.local_cat_facts)
val randomFact = facts[Random.nextInt(facts.size)]
Fact(randomFact)
}
}

/**
Expand All @@ -24,7 +29,12 @@ 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 {
val facts = context.resources.getStringArray(R.array.local_cat_facts)
val randomFact = facts[Random.nextInt(facts.size)]
Fact(randomFact)
}
.distinctUntilChanged()
}
}
}
8 changes: 6 additions & 2 deletions app/src/main/java/otus/homework/reactivecats/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.Toast
import androidx.activity.viewModels
import androidx.lifecycle.lifecycleScope
import com.google.android.material.snackbar.Snackbar

class MainActivity : AppCompatActivity() {
Expand All @@ -14,7 +13,8 @@ class MainActivity : AppCompatActivity() {
CatsViewModelFactory(
diContainer.service,
diContainer.localCatFactsGenerator(applicationContext),
applicationContext
getString(R.string.network_error_message),
getString(R.string.default_error_text)
)
}

Expand All @@ -25,6 +25,10 @@ class MainActivity : AppCompatActivity() {
catsViewModel.catsLiveData.observe(this) { result ->
when (result) {
is Success -> view.populate(result.fact)
is SuccessWithWarning -> {
view.populate(result.fact)
Snackbar.make(view, result.message, Snackbar.LENGTH_SHORT).show()
}
is Error -> Toast.makeText(this, result.message, Toast.LENGTH_LONG).show()
ServerError -> Snackbar.make(view, "Network error", 1000).show()
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<resources>
<string name="app_name">Reactive Cats</string>
<string name="default_error_text">No cats available</string>
<string name="network_error_message">Network error. Showing local fact.</string>


<string-array name="local_cat_facts">
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/xml/network_security_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<debug-overrides>
<trust-anchors>
<!-- Trust user added CAs while debuggable only -->
<certificates src="user" />
</trust-anchors>
</debug-overrides>
</network-security-config>
17 changes: 9 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[versions]
agp = "8.11.1"
kotlin = "2.2.10"
agp = "8.13.0"
kotlin = "2.2.20"
core-ktx = "1.17.0"
appcompat = "1.7.1"
material = "1.13.0"
constraintlayout = "2.2.1"
lifecycle-livedata-ktx = "2.9.3"
lifecycle-viewmodel-ktx = "2.9.3"
lifecycle-livedata-ktx = "2.9.4"
lifecycle-viewmodel-ktx = "2.9.4"
fragment-ktx = "1.8.9"
lifecycle-runtime-ktx = "2.9.3"
gson = "2.13.1"
okhttp = "4.12.0"
lifecycle-runtime-ktx = "2.9.4"
gson = "2.13.2"
okhttp = "5.1.0"
picasso = "2.71828"
retrofit = "2.9.0"
retrofit = "3.0.0"
rxandroid = "2.1.1"
rxjava = "2.2.21"

Expand All @@ -31,6 +31,7 @@ okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-i
picasso = { module = "com.squareup.picasso:picasso", version.ref = "picasso" }
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
retrofit-adapter-rxjava2 = { group = "com.squareup.retrofit2", name = "adapter-rxjava2", version.ref = "retrofit" }
rxandroid = { module = "io.reactivex.rxjava2:rxandroid", version.ref = "rxandroid" }
rxjava = { module = "io.reactivex.rxjava2:rxjava", version.ref = "rxjava" }

Expand Down