From 48eb9e37f79e60b25c3946baa212d38a1a26a4be Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Fri, 11 Apr 2025 19:18:26 +0300
Subject: [PATCH 01/14] #1 CatsService refactored to suspend

---
 app/src/main/java/otus/homework/coroutines/CatsService.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsService.kt b/app/src/main/java/otus/homework/coroutines/CatsService.kt
index 479b2cfb..db865d0c 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsService.kt
@@ -1,10 +1,9 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
 import retrofit2.http.GET
 
 interface CatsService {
 
     @GET("fact")
-    fun getCatFact() : Call<Fact>
+    suspend fun getCatFact() : Fact
 }
\ No newline at end of file

From 1e15458abd8c94a38f6f158edcb580415afe50ad Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Fri, 11 Apr 2025 19:27:15 +0300
Subject: [PATCH 02/14] #1 CatsPresenter callback -> coroutine

---
 .../otus/homework/coroutines/CatsPresenter.kt | 21 ++++---------------
 .../java/otus/homework/coroutines/CatsView.kt |  7 ++++++-
 .../otus/homework/coroutines/MainActivity.kt  |  6 +++++-
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e4b05120..4e624f8a 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,28 +1,15 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
 class CatsPresenter(
     private val catsService: CatsService
 ) {
 
     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()!!)
-                }
-            }
-
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                CrashMonitor.trackWarning()
-            }
-        })
+    suspend fun onInitComplete() {
+        catsService.getCatFact().also { fact ->
+            _catsView?.populate(fact)
+        }
     }
 
     fun attachView(catsView: ICatsView) {
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index be04b2a8..d8c93d0f 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -5,6 +5,9 @@ import android.util.AttributeSet
 import android.widget.Button
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -17,7 +20,9 @@ class CatsView @JvmOverloads constructor(
     override fun onFinishInflate() {
         super.onFinishInflate()
         findViewById<Button>(R.id.button).setOnClickListener {
-            presenter?.onInitComplete()
+            findViewTreeLifecycleOwner()?.lifecycleScope?.launch {
+                presenter?.onInitComplete()
+            }
         }
     }
 
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index a9dafb3b..a492d9c7 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -2,6 +2,8 @@ package otus.homework.coroutines
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
 
@@ -18,7 +20,9 @@ class MainActivity : AppCompatActivity() {
         catsPresenter = CatsPresenter(diContainer.service)
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
+        lifecycleScope.launch {
+            catsPresenter.onInitComplete()
+        }
     }
 
     override fun onStop() {

From d921e20f6b9159ea9e14f901c39e2d16bd923a75 Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Mon, 14 Apr 2025 22:35:45 +0300
Subject: [PATCH 03/14] #1 added PresenterScope

---
 .../java/otus/homework/coroutines/CatsPresenter.kt | 14 ++++++++++----
 .../main/java/otus/homework/coroutines/CatsView.kt |  7 +------
 .../java/otus/homework/coroutines/DiContainer.kt   |  5 +++++
 .../java/otus/homework/coroutines/MainActivity.kt  | 10 +++-------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 4e624f8a..548d06bf 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,14 +1,20 @@
 package otus.homework.coroutines
 
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catsService: CatsService,
+    private val presenterScope: CoroutineScope
 ) {
 
     private var _catsView: ICatsView? = null
 
-    suspend fun onInitComplete() {
-        catsService.getCatFact().also { fact ->
-            _catsView?.populate(fact)
+    fun onInitComplete() {
+        presenterScope.launch {
+            catsService.getCatFact().also { fact ->
+                _catsView?.populate(fact)
+            }
         }
     }
 
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index d8c93d0f..be04b2a8 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -5,9 +5,6 @@ import android.util.AttributeSet
 import android.widget.Button
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.lifecycle.findViewTreeLifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.launch
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -20,9 +17,7 @@ class CatsView @JvmOverloads constructor(
     override fun onFinishInflate() {
         super.onFinishInflate()
         findViewById<Button>(R.id.button).setOnClickListener {
-            findViewTreeLifecycleOwner()?.lifecycleScope?.launch {
-                presenter?.onInitComplete()
-            }
+            presenter?.onInitComplete()
         }
     }
 
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
index 23ddc3b2..a7419d98 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -1,5 +1,8 @@
 package otus.homework.coroutines
 
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
@@ -13,4 +16,6 @@ class DiContainer {
     }
 
     val service by lazy { retrofit.create(CatsService::class.java) }
+
+    val presenterScope get() = CoroutineScope(CoroutineName("CatsCoroutine") + Dispatchers.Main)
 }
\ 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 a492d9c7..64d5403c 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -1,9 +1,7 @@
 package otus.homework.coroutines
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.launch
+import androidx.appcompat.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
 
@@ -17,12 +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, diContainer.presenterScope)
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
-        lifecycleScope.launch {
-            catsPresenter.onInitComplete()
-        }
+        catsPresenter.onInitComplete()
     }
 
     override fun onStop() {

From 8b06611a6f047a657ae5d3ff2858366c3d830362 Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Mon, 14 Apr 2025 23:07:19 +0300
Subject: [PATCH 04/14] #1 added try-catch

---
 .../otus/homework/coroutines/CatsPresenter.kt | 31 +++++++++++++++++--
 .../java/otus/homework/coroutines/CatsView.kt |  9 +++++-
 .../otus/homework/coroutines/CrashMonitor.kt  |  3 +-
 .../otus/homework/coroutines/MainActivity.kt  |  5 ++-
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 548d06bf..56265941 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,7 +1,10 @@
 package otus.homework.coroutines
 
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import java.net.SocketTimeoutException
 
 class CatsPresenter(
     private val catsService: CatsService,
@@ -9,15 +12,29 @@ class CatsPresenter(
 ) {
 
     private var _catsView: ICatsView? = null
+    private var _job: Job? = null
 
     fun onInitComplete() {
-        presenterScope.launch {
-            catsService.getCatFact().also { fact ->
-                _catsView?.populate(fact)
+        _job = presenterScope.launch {
+            try {
+                catsService.getCatFact().also { fact ->
+                    _catsView?.populate(fact)
+                }
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: SocketTimeoutException) {
+                showToast("Не удалось получить ответ от сервера")
+            } catch (e: Exception) {
+                CrashMonitor.trackWarning(e)
+                e.message?.let(::showToast)
             }
         }
     }
 
+    private fun showToast(message: String) {
+        _catsView?.showToast(message)
+    }
+
     fun attachView(catsView: ICatsView) {
         _catsView = catsView
     }
@@ -25,4 +42,12 @@ class CatsPresenter(
     fun detachView() {
         _catsView = null
     }
+
+    fun cancelCoroutine() {
+        _job?.run {
+            if (isActive) {
+                cancel()
+            }
+        }
+    }
 }
\ 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..f5c07eab 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -4,10 +4,11 @@ import android.content.Context
 import android.util.AttributeSet
 import android.widget.Button
 import android.widget.TextView
+import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 
 class CatsView @JvmOverloads constructor(
-    context: Context,
+    private val context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
@@ -24,9 +25,15 @@ class CatsView @JvmOverloads constructor(
     override fun populate(fact: Fact) {
         findViewById<TextView>(R.id.fact_textView).text = fact.fact
     }
+
+    override fun showToast(message: String) {
+        Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+    }
 }
 
 interface ICatsView {
 
     fun populate(fact: Fact)
+
+    fun showToast(message: String)
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
index 32e6b018..bbaa6766 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -5,6 +5,5 @@ object CrashMonitor {
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning() {
-    }
+    fun trackWarning(exception: Exception) {}
 }
\ 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 64d5403c..a8d9fdd7 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -23,7 +23,10 @@ class MainActivity : AppCompatActivity() {
 
     override fun onStop() {
         if (isFinishing) {
-            catsPresenter.detachView()
+            catsPresenter.apply {
+                detachView()
+                cancelCoroutine()
+            }
         }
         super.onStop()
     }

From 6a61e84d4f69520dfded2fc66168728736070fb6 Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Tue, 15 Apr 2025 08:48:07 +0300
Subject: [PATCH 05/14] #2 added ImageService

---
 .../java/otus/homework/coroutines/CatsPresenter.kt |  3 +++
 .../java/otus/homework/coroutines/DiContainer.kt   | 14 +++++++-------
 .../main/java/otus/homework/coroutines/Image.kt    | 10 ++++++++++
 .../java/otus/homework/coroutines/ImageService.kt  |  8 ++++++++
 .../java/otus/homework/coroutines/MainActivity.kt  |  5 ++++-
 5 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/Image.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/ImageService.kt

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 56265941..beb9c95b 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -17,6 +17,9 @@ class CatsPresenter(
     fun onInitComplete() {
         _job = presenterScope.launch {
             try {
+//                imageService.getCatImage().also {
+//                    println("image url ${it.url}")
+//                }
                 catsService.getCatFact().also { fact ->
                     _catsView?.populate(fact)
                 }
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
index a7419d98..b84967cf 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -8,14 +8,14 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 class DiContainer {
 
-    private val retrofit by lazy {
-        Retrofit.Builder()
-            .baseUrl("https://catfact.ninja/")
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-    }
+    private fun buildRetrofit(baseUrl: String) = Retrofit.Builder()
+        .baseUrl(baseUrl)
+        .addConverterFactory(GsonConverterFactory.create())
+        .build()
 
-    val service by lazy { retrofit.create(CatsService::class.java) }
+    val catsService by lazy { buildRetrofit("https://catfact.ninja/").create(CatsService::class.java) }
+
+    val imageService by lazy { buildRetrofit("https://api.thecatapi.com/v1/images/").create(ImageService::class.java) }
 
     val presenterScope get() = CoroutineScope(CoroutineName("CatsCoroutine") + Dispatchers.Main)
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/Image.kt b/app/src/main/java/otus/homework/coroutines/Image.kt
new file mode 100644
index 00000000..b721bb76
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/Image.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines
+
+import com.google.gson.annotations.SerializedName
+
+data class Image(
+    @field:SerializedName("id")
+    val id: String,
+    @field:SerializedName("url")
+    val url: String
+)
diff --git a/app/src/main/java/otus/homework/coroutines/ImageService.kt b/app/src/main/java/otus/homework/coroutines/ImageService.kt
new file mode 100644
index 00000000..9abb6ca2
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/ImageService.kt
@@ -0,0 +1,8 @@
+package otus.homework.coroutines
+
+import retrofit2.http.GET
+
+interface ImageService {
+    @GET("search")
+    suspend fun getCatImage(): Image
+}
\ 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 a8d9fdd7..afc60d61 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -15,7 +15,10 @@ class MainActivity : AppCompatActivity() {
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsPresenter = CatsPresenter(diContainer.service, diContainer.presenterScope)
+        catsPresenter = CatsPresenter(
+            diContainer.catsService,
+            diContainer.presenterScope
+        )
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
         catsPresenter.onInitComplete()

From f52279b672573c5aa03292615760c377ab1828a2 Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Tue, 15 Apr 2025 10:58:04 +0300
Subject: [PATCH 06/14] #2 added UI state

---
 .../otus/homework/coroutines/CatsPresenter.kt    | 16 ++++++++++------
 .../java/otus/homework/coroutines/CatsView.kt    |  9 ++++++---
 .../otus/homework/coroutines/ImageService.kt     |  2 +-
 .../otus/homework/coroutines/MainActivity.kt     |  1 +
 app/src/main/res/layout/activity_main.xml        | 14 ++++++++++++--
 app/src/main/res/values/strings.xml              |  1 +
 6 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index beb9c95b..c739fd2c 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -6,8 +6,14 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 
+data class CatsUIState(
+    val fact: Fact,
+    val image: Image
+)
+
 class CatsPresenter(
     private val catsService: CatsService,
+    private val imageService: ImageService,
     private val presenterScope: CoroutineScope
 ) {
 
@@ -17,12 +23,10 @@ class CatsPresenter(
     fun onInitComplete() {
         _job = presenterScope.launch {
             try {
-//                imageService.getCatImage().also {
-//                    println("image url ${it.url}")
-//                }
-                catsService.getCatFact().also { fact ->
-                    _catsView?.populate(fact)
-                }
+                val image = imageService.getCatImage().first()
+                val fact = catsService.getCatFact()
+
+                _catsView?.populate(CatsUIState(fact, image))
             } catch (e: CancellationException) {
                 throw e
             } catch (e: SocketTimeoutException) {
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index f5c07eab..4f87add3 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -3,9 +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(
     private val context: Context,
@@ -22,8 +24,9 @@ class CatsView @JvmOverloads constructor(
         }
     }
 
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.fact
+    override fun populate(state: CatsUIState) {
+        findViewById<TextView>(R.id.fact_textView).text = state.fact.fact
+        Picasso.get().load(state.image.url).into(findViewById<ImageView>(R.id.catImage))
     }
 
     override fun showToast(message: String) {
@@ -33,7 +36,7 @@ class CatsView @JvmOverloads constructor(
 
 interface ICatsView {
 
-    fun populate(fact: Fact)
+    fun populate(state: CatsUIState)
 
     fun showToast(message: String)
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/ImageService.kt b/app/src/main/java/otus/homework/coroutines/ImageService.kt
index 9abb6ca2..a227195c 100644
--- a/app/src/main/java/otus/homework/coroutines/ImageService.kt
+++ b/app/src/main/java/otus/homework/coroutines/ImageService.kt
@@ -4,5 +4,5 @@ import retrofit2.http.GET
 
 interface ImageService {
     @GET("search")
-    suspend fun getCatImage(): Image
+    suspend fun getCatImage(): List<Image>
 }
\ 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 afc60d61..5c808375 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -17,6 +17,7 @@ class MainActivity : AppCompatActivity() {
 
         catsPresenter = CatsPresenter(
             diContainer.catsService,
+            diContainer.imageService,
             diContainer.presenterScope
         )
         view.presenter = catsPresenter
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..69a84369 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,16 +7,26 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/catImage"
+        android:layout_width="300dp"
+        android:layout_height="300dp"
+        android:contentDescription="@string/cat_image_description"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/fact_textView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
+
     <TextView
         android:id="@+id/fact_textView"
         android:textColor="@color/black"
         android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        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/catImage" />
 
     <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..c5dc7242 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">Cat Facts </string>
     <string name="more_facts">More Facts</string>
+    <string name="cat_image_description">Random cat image</string>
 </resources>
\ No newline at end of file

From 92b8f434a211d2ae58c862b1d993bd3fa8d36399 Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Tue, 15 Apr 2025 15:23:27 +0300
Subject: [PATCH 07/14] #2 parallel api calls

---
 .../otus/homework/coroutines/CatsPresenter.kt | 19 ++++++++++-------
 .../otus/homework/coroutines/DiContainer.kt   | 21 +++++++++++++------
 .../otus/homework/coroutines/MainActivity.kt  |  2 +-
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index c739fd2c..8b8afb91 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -2,7 +2,9 @@ package otus.homework.coroutines
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 
@@ -18,15 +20,18 @@ class CatsPresenter(
 ) {
 
     private var _catsView: ICatsView? = null
-    private var _job: Job? = null
+    private var job: Job? = null
 
     fun onInitComplete() {
-        _job = presenterScope.launch {
-            try {
-                val image = imageService.getCatImage().first()
-                val fact = catsService.getCatFact()
+        job = presenterScope.async {
+            val image = async { imageService.getCatImage().first() }
+            val fact = async { catsService.getCatFact() }
 
-                _catsView?.populate(CatsUIState(fact, image))
+            _catsView?.populate(CatsUIState(fact.await(), image.await()))
+        }
+        presenterScope.launch {
+            try {
+                (job as Deferred<*>).await()
             } catch (e: CancellationException) {
                 throw e
             } catch (e: SocketTimeoutException) {
@@ -51,7 +56,7 @@ class CatsPresenter(
     }
 
     fun cancelCoroutine() {
-        _job?.run {
+        job?.run {
             if (isActive) {
                 cancel()
             }
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
index b84967cf..545845aa 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -8,14 +8,23 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 class DiContainer {
 
-    private fun buildRetrofit(baseUrl: String) = Retrofit.Builder()
-        .baseUrl(baseUrl)
-        .addConverterFactory(GsonConverterFactory.create())
-        .build()
+    private val converter by lazy { GsonConverterFactory.create() }
 
-    val catsService by lazy { buildRetrofit("https://catfact.ninja/").create(CatsService::class.java) }
+    private fun buildRetrofit(baseUrl: String) =
+        Retrofit.Builder().baseUrl(baseUrl).addConverterFactory(converter)
+            .build()
 
-    val imageService by lazy { buildRetrofit("https://api.thecatapi.com/v1/images/").create(ImageService::class.java) }
+    val catsService by lazy {
+        buildRetrofit("https://catfact.ninja/").create(
+            CatsService::class.java
+        )
+    }
+
+    val imageService by lazy {
+        buildRetrofit("https://api.thecatapi.com/v1/images/").create(
+            ImageService::class.java
+        )
+    }
 
     val presenterScope get() = CoroutineScope(CoroutineName("CatsCoroutine") + Dispatchers.Main)
 }
\ 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 5c808375..95a71948 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -29,9 +29,9 @@ class MainActivity : AppCompatActivity() {
         if (isFinishing) {
             catsPresenter.apply {
                 detachView()
-                cancelCoroutine()
             }
         }
+        catsPresenter.cancelCoroutine()
         super.onStop()
     }
 }
\ No newline at end of file

From 35bbb23b3eed394d45a657665c7ebd728ee8be5a Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Tue, 15 Apr 2025 17:00:52 +0300
Subject: [PATCH 08/14] #3 added dependency for viewModelScope

---
 app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/build.gradle b/app/build.gradle
index a414e0e8..67ea887c 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.4.0"
 }
\ No newline at end of file

From 67ac154b1a587dbb3a4ab8b0625cf7e40aa9a2fa Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Tue, 15 Apr 2025 17:02:05 +0300
Subject: [PATCH 09/14] #3 extract CatsUIState

---
 app/src/main/java/otus/homework/coroutines/CatsPresenter.kt | 5 -----
 app/src/main/java/otus/homework/coroutines/CatsUIState.kt   | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsUIState.kt

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 8b8afb91..eea85ada 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -8,11 +8,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 
-data class CatsUIState(
-    val fact: Fact,
-    val image: Image
-)
-
 class CatsPresenter(
     private val catsService: CatsService,
     private val imageService: ImageService,
diff --git a/app/src/main/java/otus/homework/coroutines/CatsUIState.kt b/app/src/main/java/otus/homework/coroutines/CatsUIState.kt
new file mode 100644
index 00000000..33451b0d
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsUIState.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+data class CatsUIState(
+    val fact: Fact,
+    val image: Image
+)
\ No newline at end of file

From 60e90186ad659cf2d2eaaed210ef097e7e41a862 Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Tue, 15 Apr 2025 18:13:53 +0300
Subject: [PATCH 10/14] #3 viewModel factory

---
 .../otus/homework/coroutines/CatsViewModel.kt | 23 +++++++++++++++++++
 .../otus/homework/coroutines/MainActivity.kt  |  8 +++++++
 2 files changed, 31 insertions(+)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt

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..c710be0e
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -0,0 +1,23 @@
+package otus.homework.coroutines
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
+
+class CatsViewModel(
+    private val catsService: CatsService,
+    private val imageService: ImageService
+) : ViewModel() {
+
+    companion object {
+        fun provideFactory(
+            catsService: CatsService,
+            imageService: ImageService
+        ): ViewModelProvider.Factory = viewModelFactory {
+            initializer {
+                CatsViewModel(catsService, imageService)
+            }
+        }
+    }
+}
\ 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 95a71948..c46aa9c2 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -2,6 +2,7 @@ package otus.homework.coroutines
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModelProvider
 
 class MainActivity : AppCompatActivity() {
 
@@ -9,6 +10,13 @@ class MainActivity : AppCompatActivity() {
 
     private val diContainer = DiContainer()
 
+    private val viewModel by lazy {
+        ViewModelProvider(
+            this,
+            CatsViewModel.provideFactory(diContainer.catsService, diContainer.imageService)
+        )[CatsViewModel::class.java]
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

From 0e28421ec7b71bc24000210ff724fc51c87bb317 Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Tue, 15 Apr 2025 18:43:19 +0300
Subject: [PATCH 11/14] #3 exception handler

---
 .../main/java/otus/homework/coroutines/CatsViewModel.kt    | 7 +++++++
 app/src/main/java/otus/homework/coroutines/CrashMonitor.kt | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index c710be0e..0897ab1c 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -4,12 +4,19 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
+import kotlinx.coroutines.CoroutineExceptionHandler
 
 class CatsViewModel(
     private val catsService: CatsService,
     private val imageService: ImageService
 ) : ViewModel() {
 
+    private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        CrashMonitor.trackWarning(throwable)
+    }
+
+
+
     companion object {
         fun provideFactory(
             catsService: CatsService,
diff --git a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
index bbaa6766..34fd74af 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -5,5 +5,5 @@ object CrashMonitor {
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning(exception: Exception) {}
+    fun trackWarning(exception: Throwable) {}
 }
\ No newline at end of file

From 80f2b1904340fa21661af91da029b889e38fc793 Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Fri, 18 Apr 2025 20:33:11 +0300
Subject: [PATCH 12/14] #3 CatsViewModel connected to MainActivity

---
 .../otus/homework/coroutines/CatsViewModel.kt | 29 +++++++++++
 .../otus/homework/coroutines/MainActivity.kt  | 48 +++++++++++--------
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index 0897ab1c..96fea251 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -2,9 +2,17 @@ package otus.homework.coroutines
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.shareIn
+import kotlinx.coroutines.launch
 
 class CatsViewModel(
     private val catsService: CatsService,
@@ -15,7 +23,28 @@ class CatsViewModel(
         CrashMonitor.trackWarning(throwable)
     }
 
+    private val _uiState = MutableStateFlow<CatsUIState?>(null)
+    val uiState = _uiState.onStart { load() }
+        .filterNotNull()
+        .shareIn(
+            viewModelScope,
+            SharingStarted.WhileSubscribed(5000),
+            replay = 1
+        )
 
+    fun load() {
+        viewModelScope.launch(exceptionHandler) {
+            val fact = async { catsService.getCatFact() }
+            val image = async { imageService.getCatImage() }
+
+            _uiState.emit(
+                CatsUIState(
+                    fact = fact.await(),
+                    image = image.await()[0]
+                )
+            )
+        }
+    }
 
     companion object {
         fun provideFactory(
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index c46aa9c2..fba56b22 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -1,45 +1,53 @@
 package otus.homework.coroutines
 
 import android.os.Bundle
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import com.squareup.picasso.Picasso
+import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
 
-    lateinit var catsPresenter: CatsPresenter
-
     private val diContainer = DiContainer()
 
+    private lateinit var fact: TextView
+    private lateinit var image: ImageView
+    private lateinit var loadButton: Button
+
     private val viewModel by lazy {
         ViewModelProvider(
-            this,
-            CatsViewModel.provideFactory(diContainer.catsService, diContainer.imageService)
+            this, CatsViewModel.provideFactory(diContainer.catsService, diContainer.imageService)
         )[CatsViewModel::class.java]
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
+        val view = layoutInflater.inflate(R.layout.activity_main, null)
         setContentView(view)
+        fact = view.findViewById(R.id.fact_textView)
+        image = view.findViewById(R.id.catImage)
+        loadButton = view.findViewById(R.id.button)
 
-        catsPresenter = CatsPresenter(
-            diContainer.catsService,
-            diContainer.imageService,
-            diContainer.presenterScope
-        )
-        view.presenter = catsPresenter
-        catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
+        configureFact()
+        setListeners()
+    }
+
+    private fun setListeners() {
+        loadButton.setOnClickListener {
+            viewModel.load()
+        }
     }
 
-    override fun onStop() {
-        if (isFinishing) {
-            catsPresenter.apply {
-                detachView()
+    private fun configureFact() {
+        lifecycleScope.launch {
+            viewModel.uiState.collect { state ->
+                fact.text = state.fact.fact
+                Picasso.get().load(state.image.url).into(image)
             }
         }
-        catsPresenter.cancelCoroutine()
-        super.onStop()
     }
 }
\ No newline at end of file

From e4243b2cb647331a4b8c4abe1f76e0964d7689af Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Fri, 18 Apr 2025 21:58:50 +0300
Subject: [PATCH 13/14] #3 Result added

---
 .../otus/homework/coroutines/CatsViewModel.kt | 19 ++++++++++++-----
 .../otus/homework/coroutines/MainActivity.kt  | 21 +++++++++++++++----
 .../java/otus/homework/coroutines/Result.kt   |  6 ++++++
 3 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/Result.kt

diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index 96fea251..fccac683 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.launch
+import java.net.SocketTimeoutException
 
 class CatsViewModel(
     private val catsService: CatsService,
@@ -20,10 +21,16 @@ class CatsViewModel(
 ) : ViewModel() {
 
     private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
-        CrashMonitor.trackWarning(throwable)
+        when(throwable) {
+            is SocketTimeoutException -> _uiState.tryEmit(Result.Error(Throwable("Не удалось получить ответ от сервера")))
+            else -> {
+                CrashMonitor.trackWarning(throwable)
+                _uiState.tryEmit(Result.Error(throwable))
+            }
+        }
     }
 
-    private val _uiState = MutableStateFlow<CatsUIState?>(null)
+    private val _uiState = MutableStateFlow<Result?>(null)
     val uiState = _uiState.onStart { load() }
         .filterNotNull()
         .shareIn(
@@ -38,9 +45,11 @@ class CatsViewModel(
             val image = async { imageService.getCatImage() }
 
             _uiState.emit(
-                CatsUIState(
-                    fact = fact.await(),
-                    image = image.await()[0]
+                Result.Success(
+                    CatsUIState(
+                        fact = fact.await(),
+                        image = image.await()[0]
+                    )
                 )
             )
         }
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index fba56b22..66181d70 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -4,11 +4,13 @@ import android.os.Bundle
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.squareup.picasso.Picasso
 import kotlinx.coroutines.launch
+import otus.homework.coroutines.Result.*
 
 class MainActivity : AppCompatActivity() {
 
@@ -32,7 +34,7 @@ class MainActivity : AppCompatActivity() {
         image = view.findViewById(R.id.catImage)
         loadButton = view.findViewById(R.id.button)
 
-        configureFact()
+        processState()
         setListeners()
     }
 
@@ -42,12 +44,23 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun configureFact() {
+    private fun processState() {
         lifecycleScope.launch {
             viewModel.uiState.collect { state ->
-                fact.text = state.fact.fact
-                Picasso.get().load(state.image.url).into(image)
+                when(state) {
+                    is Success<*> -> {
+                        (state.data as CatsUIState).also {
+                            fact.text = it.fact.fact
+                            Picasso.get().load(it.image.url).into(image)
+                        }
+                    }
+                    is Error -> showToast(state.error)
+                }
             }
         }
     }
+
+    private fun showToast(throwable: Throwable, duration: Int = Toast.LENGTH_LONG) {
+        Toast.makeText(this, throwable.message, duration).show()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/Result.kt b/app/src/main/java/otus/homework/coroutines/Result.kt
new file mode 100644
index 00000000..d08fd1b5
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/Result.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+sealed class Result{
+    data class Success<out T>(val data: T) : Result()
+    data class Error(val error: Throwable) : Result()
+}
\ No newline at end of file

From 2349c7d03190183a5241089a9380cec9afe258f5 Mon Sep 17 00:00:00 2001
From: Pavel Akashev <pavela29@gmail.com>
Date: Mon, 21 Apr 2025 03:39:28 +0300
Subject: [PATCH 14/14] #3 load on error

---
 app/src/main/java/otus/homework/coroutines/MainActivity.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index 66181d70..d933627e 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -54,7 +54,10 @@ class MainActivity : AppCompatActivity() {
                             Picasso.get().load(it.image.url).into(image)
                         }
                     }
-                    is Error -> showToast(state.error)
+                    is Error -> {
+                        showToast(state.error)
+                        viewModel.load()
+                    }
                 }
             }
         }