From b98357a9ba8619a25259e3af38a9f7e45b953e0b Mon Sep 17 00:00:00 2001
From: Dmitry Ryaboshapko <ryaboshapkodi@sovcombank.ru>
Date: Sun, 25 Jan 2026 14:01:57 +0300
Subject: [PATCH 1/3] =?UTF-8?q?HomeWork=20-=20=D0=A0=D0=B5=D1=84=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=83=D1=82=D0=B8=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  1 +
 .../java/otus/homework/coroutines/CatFact.kt  |  6 ++
 .../otus/homework/coroutines/CatsPresenter.kt | 55 +++++++++++-----
 .../otus/homework/coroutines/CatsService.kt   |  6 +-
 .../java/otus/homework/coroutines/CatsView.kt | 21 ++++--
 .../otus/homework/coroutines/CatsViewModel.kt | 64 +++++++++++++++++++
 .../otus/homework/coroutines/FactImage.kt     |  8 +++
 .../otus/homework/coroutines/MainActivity.kt  |  4 +-
 app/src/main/res/layout/activity_main.xml     | 19 ++++--
 app/src/main/res/values/strings.xml           |  2 +
 10 files changed, 159 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatFact.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/FactImage.kt

diff --git a/app/build.gradle b/app/build.gradle
index a414e0e8..557b196a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,4 +41,5 @@ dependencies {
     implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0"
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatFact.kt b/app/src/main/java/otus/homework/coroutines/CatFact.kt
new file mode 100644
index 00000000..481762c4
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatFact.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+data class CatFact(
+    val fact: Fact,
+    val imageUrl: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e4b05120..cc3b28f3 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,28 +1,52 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import android.content.res.Resources
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import java.net.SocketTimeoutException
 
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catsService: CatsService,
+    private val resources: Resources,
 ) {
 
     private var _catsView: ICatsView? = null
 
-    fun onInitComplete() {
-        catsService.getCatFact().enqueue(object : Callback<Fact> {
-
-            override fun onResponse(call: Call<Fact>, response: Response<Fact>) {
-                if (response.isSuccessful && response.body() != null) {
-                    _catsView?.populate(response.body()!!)
-                }
+    private val presenterScope = CoroutineScope(Dispatchers.Main + CoroutineName("CatsCoroutine"))
+    private var job: Job = Job()
+
+    fun load() {
+        job = presenterScope.launch {
+            runCatching {
+                val facts = catsService.getCatFact()
+                val imageUrl = catsService.loadImage().first().url
+
+                CatFact(
+                    fact = facts,
+                    imageUrl = imageUrl,
+                )
+            }.onFailure {
+                errorHandler(it)
+            }.onSuccess {
+                _catsView?.populate(it)
             }
+        }
+    }
 
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                CrashMonitor.trackWarning()
-            }
-        })
+    private fun errorHandler(e: Throwable) {
+        if (e is SocketTimeoutException) {
+            _catsView?.showToast(
+                resources.getString(
+                    R.string.socet_timeout_error,
+                ),
+            )
+        } else {
+            CrashMonitor.trackWarning()
+            _catsView?.showToast(e.message.orEmpty())
+        }
     }
 
     fun attachView(catsView: ICatsView) {
@@ -31,5 +55,6 @@ class CatsPresenter(
 
     fun detachView() {
         _catsView = null
+        job.cancel()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsService.kt b/app/src/main/java/otus/homework/coroutines/CatsService.kt
index 479b2cfb..14e468c6 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsService.kt
@@ -1,10 +1,12 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
 import retrofit2.http.GET
 
 interface CatsService {
 
     @GET("fact")
-    fun getCatFact() : Call<Fact>
+    suspend fun getCatFact() : Fact
+
+    @GET("https://api.thecatapi.com/v1/images/search")
+    suspend fun loadImage() : List<FactImage>
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index be04b2a8..d3e9d4ef 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -3,8 +3,11 @@ package otus.homework.coroutines
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.squareup.picasso.Picasso
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -17,16 +20,26 @@ class CatsView @JvmOverloads constructor(
     override fun onFinishInflate() {
         super.onFinishInflate()
         findViewById<Button>(R.id.button).setOnClickListener {
-            presenter?.onInitComplete()
+            presenter?.load()
         }
     }
 
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.fact
+    override fun populate(fact: CatFact) {
+        findViewById<TextView>(R.id.fact_textView).text = fact.fact.fact
+        val imageView = findViewById<ImageView>(R.id.fact_image)
+        Picasso
+            .get()
+            .load(fact.imageUrl)
+            .into(imageView)
+    }
+
+    override fun showToast(message: String) {
+        Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
     }
 }
 
 interface ICatsView {
 
-    fun populate(fact: Fact)
+    fun populate(fact: CatFact)
+    fun showToast(message: String)
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
new file mode 100644
index 00000000..ecca6ab1
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -0,0 +1,64 @@
+package otus.homework.coroutines
+
+import android.content.res.Resources
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import java.net.SocketTimeoutException
+
+class CatsViewModel(
+    private val catsService: CatsService,
+    private val resources: Resources,
+) : ViewModel() {
+
+    private val _catsFact = MutableStateFlow<Result>(Result.Success(Unit))
+    val catsFact = _catsFact.asStateFlow()
+
+    private val exceptionHandler = CoroutineExceptionHandler { _, _ ->
+        CrashMonitor.trackWarning()
+    }
+
+    fun load() {
+        viewModelScope.launch(exceptionHandler) {
+            runCatching {
+                val facts = catsService.getCatFact()
+                val imageUrl = catsService.loadImage().first().url
+
+                CatFact(
+                    fact = facts,
+                    imageUrl = imageUrl,
+                )
+            }.onFailure { error ->
+                _catsFact.update {
+                    Result.Error(errorHandler(error))
+                }
+            }.onSuccess { fact ->
+                _catsFact.update {
+                    Result.Success(fact)
+                }
+            }
+        }
+    }
+
+    private fun errorHandler(e: Throwable): String {
+        Log.d("Fact", e.message.toString())
+        return if (e is SocketTimeoutException) {
+            resources.getString(
+                R.string.socet_timeout_error,
+            )
+        } else {
+            e.message.orEmpty()
+        }
+    }
+}
+
+
+sealed interface Result {
+    data class Success<T>(val result: T) : Result
+    data class Error(val message: String) : Result
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/FactImage.kt b/app/src/main/java/otus/homework/coroutines/FactImage.kt
new file mode 100644
index 00000000..fa4194ff
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/FactImage.kt
@@ -0,0 +1,8 @@
+package otus.homework.coroutines
+
+import com.google.gson.annotations.SerializedName
+
+data class FactImage(
+	@field:SerializedName("url")
+	val url: String,
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index a9dafb3b..2099a5c3 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -15,10 +15,10 @@ class MainActivity : AppCompatActivity() {
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsPresenter = CatsPresenter(diContainer.service)
+        catsPresenter = CatsPresenter(diContainer.service, resources)
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
+        catsPresenter.load()
     }
 
     override fun onStop() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..1c286aa5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,20 +3,31 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:padding="16dp"
     android:layout_height="match_parent"
+    android:padding="16dp"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/fact_image"
+        android:layout_width="match_parent"
+        android:layout_height="260dp"
+        android:contentDescription="@null"
+        android:scaleType="centerCrop"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/fact_textView"/>
+
     <TextView
         android:id="@+id/fact_textView"
-        android:textColor="@color/black"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="@color/black"
+        android:textSize="24sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/fact_image" />
 
     <Button
         android:id="@+id/button"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6c270d5d..b0a34183 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <resources>
     <string name="app_name">Cat Facts </string>
     <string name="more_facts">More Facts</string>
+    <string name="refresh_screen">Refresh Screen</string>
+    <string name="socet_timeout_error">Не удалось получить ответ от сервером</string>
 </resources>
\ No newline at end of file

From a1523711e7f5682d937a5ef26f0ad9c108bd8a7c Mon Sep 17 00:00:00 2001
From: Dmitry Ryaboshapko <ryaboshapkodi@sovcombank.ru>
Date: Sun, 25 Jan 2026 14:12:47 +0300
Subject: [PATCH 2/3] =?UTF-8?q?HomeWork=20-=20=D0=A0=D0=B5=D1=84=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=83=D1=82=D0=B8=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/otus/homework/coroutines/CatFact.kt  |  2 +-
 .../java/otus/homework/coroutines/CatsPresenter.kt | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatFact.kt b/app/src/main/java/otus/homework/coroutines/CatFact.kt
index 481762c4..5cad3f65 100644
--- a/app/src/main/java/otus/homework/coroutines/CatFact.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatFact.kt
@@ -2,5 +2,5 @@ package otus.homework.coroutines
 
 data class CatFact(
     val fact: Fact,
-    val imageUrl: String
+    val imageUrl: String = "",
 )
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index cc3b28f3..20b12e38 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -6,6 +6,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 import java.net.SocketTimeoutException
 
 class CatsPresenter(
@@ -36,6 +39,17 @@ class CatsPresenter(
         }
     }
 
+    fun onInitComplete() {
+        job = presenterScope.launch {
+            try {
+                val facts = catsService.getCatFact()
+                _catsView?.populate(CatFact(facts))
+            } catch (e: Exception) {
+                errorHandler(e)
+            }
+        }
+    }
+
     private fun errorHandler(e: Throwable) {
         if (e is SocketTimeoutException) {
             _catsView?.showToast(

From 3b5fc96d13e3554959522ddf24bc1c4b5d1dcac3 Mon Sep 17 00:00:00 2001
From: Dmitry Ryaboshapko <ryaboshapkodi@sovcombank.ru>
Date: Sat, 31 Jan 2026 18:54:24 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/otus/homework/coroutines/CatsPresenter.kt | 6 ++++--
 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 20b12e38..fd1e69d2 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,6 +1,7 @@
 package otus.homework.coroutines
 
 import android.content.res.Resources
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -31,8 +32,9 @@ class CatsPresenter(
                     fact = facts,
                     imageUrl = imageUrl,
                 )
-            }.onFailure {
-                errorHandler(it)
+            }.onFailure { error ->
+                if (error is CancellationException) throw error
+                errorHandler(error)
             }.onSuccess {
                 _catsView?.populate(it)
             }
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index ecca6ab1..80851be9 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -4,6 +4,7 @@ import android.content.res.Resources
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -34,6 +35,7 @@ class CatsViewModel(
                     imageUrl = imageUrl,
                 )
             }.onFailure { error ->
+                if (error is CancellationException) throw error
                 _catsFact.update {
                     Result.Error(errorHandler(error))
                 }