From e2168e13b82918602db8cd3ba73f538d6553ea4c Mon Sep 17 00:00:00 2001
From: Petr <petr.urvaev@simbirsoft.com>
Date: Sun, 19 Jan 2025 11:54:25 +0400
Subject: [PATCH 1/8] =?UTF-8?q?###=20=D0=9F=D0=B5=D1=80=D0=B5=D0=B9=D1=82?=
 =?UTF-8?q?=D0=B8=20=D1=81=20=D0=BA=D0=BE=D0=BB=D0=BB=D0=B1=D0=B5=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D1=81=D0=B0=D1=81=D0=BF=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B4=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=B8=20=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                              |  3 +-
 app/src/main/AndroidManifest.xml              |  7 +++-
 .../otus/homework/coroutines/CatsPresenter.kt | 41 +++++++++++++------
 .../otus/homework/coroutines/CatsService.kt   |  3 +-
 .../java/otus/homework/coroutines/CatsView.kt | 21 +++++++++-
 .../otus/homework/coroutines/CrashMonitor.kt  | 11 ++++-
 .../otus/homework/coroutines/DiContainer.kt   |  6 +++
 .../coroutines/IUserMessageHandler.kt         | 10 +++++
 .../otus/homework/coroutines/MainActivity2.kt | 34 +++++++++++++++
 .../homework/coroutines/PresenterScope.kt     | 21 ++++++++++
 app/src/main/res/layout/activity_main.xml     |  9 ++++
 app/src/main/res/layout/activity_main2.xml    | 10 +++++
 app/src/main/res/values/strings.xml           |  4 ++
 .../main/res/xml/network_security_config.xml  |  9 ++++
 14 files changed, 170 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/IUserMessageHandler.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/MainActivity2.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/PresenterScope.kt
 create mode 100644 app/src/main/res/layout/activity_main2.xml
 create mode 100644 app/src/main/res/xml/network_security_config.xml

diff --git a/app/build.gradle b/app/build.gradle
index a414e0e8..8e029959 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdkVersion 34
     defaultConfig {
         applicationId "otus.homework.coroutines"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 34
         versionCode 1
         versionName "1.0"
@@ -33,6 +33,7 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe34985b..8ffb859f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,10 +7,15 @@
         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.Coroutines">
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity2"
+            android:exported="false" />
+        <activity
+            android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e4b05120..e828121c 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,28 +1,41 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.net.SocketTimeoutException
+import kotlin.coroutines.cancellation.CancellationException
 
 class CatsPresenter(
     private val catsService: CatsService
 ) {
 
     private var _catsView: ICatsView? = null
+    private val presenterScope = PresenterScope(CoroutineName("CatsCoroutine"))
+    private var workJob: Job? = 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()!!)
+        if (workJob?.isActive == true) {
+            _catsView?.handle(R.string.cats_wait_next_fact)
+            return
+        }
+        workJob = presenterScope.launch {
+            try {
+                val fact = withContext(Dispatchers.IO) {
+                    catsService.getCatFact()
                 }
+                _catsView?.populate(fact)
+            } catch (timeOutException: SocketTimeoutException) {
+                _catsView?.handle(R.string.app_request_timeout)
+            } catch (_: CancellationException) {
+            } catch (t: Throwable) {
+                CrashMonitor.trackError(t)
+                _catsView?.handle(t.message.toString())
             }
-
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                CrashMonitor.trackWarning()
-            }
-        })
+        }
     }
 
     fun attachView(catsView: ICatsView) {
@@ -31,5 +44,7 @@ class CatsPresenter(
 
     fun detachView() {
         _catsView = null
+        CrashMonitor.trackWarning("Stop detachView")
+        presenterScope.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..829b930c 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
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index be04b2a8..09babe4d 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -1,10 +1,16 @@
 package otus.homework.coroutines
 
 import android.content.Context
+import android.content.Intent
 import android.util.AttributeSet
 import android.widget.Button
 import android.widget.TextView
+import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat.startActivity
+import androidx.core.os.bundleOf
+
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -19,14 +25,27 @@ class CatsView @JvmOverloads constructor(
         findViewById<Button>(R.id.button).setOnClickListener {
             presenter?.onInitComplete()
         }
+        findViewById<Button>(R.id.button2).setOnClickListener {
+            // для проверки отмены корутин
+            val switchActivityIntent = Intent(context, MainActivity2::class.java)
+            startActivity(context, switchActivityIntent, bundleOf())
+        }
     }
 
     override fun populate(fact: Fact) {
         findViewById<TextView>(R.id.fact_textView).text = fact.fact
     }
+
+    override fun handle(@StringRes resId: Int) {
+        handle(context.getString(resId))
+    }
+
+    override fun handle(msg: String) {
+        Toast.makeText(context, msg, Toast.LENGTH_LONG).show()
+    }
 }
 
-interface ICatsView {
+interface ICatsView: IUserMessageHandler {
 
     fun populate(fact: Fact)
 }
\ 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..0fcc15a6 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -1,10 +1,19 @@
 package otus.homework.coroutines
 
+import android.util.Log
+
 object CrashMonitor {
 
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning() {
+    fun trackWarning(msg: String) {
+        Log.w(MONITOR_TAG, msg)
+    }
+
+    fun trackError(t: Throwable? = null, msg: String? = null) {
+        Log.e(MONITOR_TAG, msg, t)
     }
+
+    private const val MONITOR_TAG = "OHC_CrashMonitor"
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
index 23ddc3b2..7231a9e6 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -1,13 +1,19 @@
 package otus.homework.coroutines
 
+import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.TimeUnit
 
 class DiContainer {
 
     private val retrofit by lazy {
         Retrofit.Builder()
             .baseUrl("https://catfact.ninja/")
+            .client(OkHttpClient.Builder().apply {
+                //для проверки работы при SocketTimeoutException
+                readTimeout(5, TimeUnit.SECONDS)
+            }.build())
             .addConverterFactory(GsonConverterFactory.create())
             .build()
     }
diff --git a/app/src/main/java/otus/homework/coroutines/IUserMessageHandler.kt b/app/src/main/java/otus/homework/coroutines/IUserMessageHandler.kt
new file mode 100644
index 00000000..7d9731d7
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/IUserMessageHandler.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines
+
+import androidx.annotation.StringRes
+
+interface IUserMessageHandler {
+
+    fun handle(@StringRes resId: Int)
+
+    fun handle(msg: String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity2.kt b/app/src/main/java/otus/homework/coroutines/MainActivity2.kt
new file mode 100644
index 00000000..bacffe37
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity2.kt
@@ -0,0 +1,34 @@
+package otus.homework.coroutines
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+//Для проверки-тестирования остановки корутин
+class MainActivity2 : AppCompatActivity() {
+    lateinit var catsPresenter: CatsPresenter
+
+    private val diContainer = DiContainer()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_main2)
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+        catsPresenter = CatsPresenter(diContainer.service)
+        catsPresenter.onInitComplete()
+    }
+
+    override fun onStop() {
+        if (isFinishing) {
+            catsPresenter.detachView()
+        }
+        super.onStop()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/PresenterScope.kt b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
new file mode 100644
index 00000000..ae98cb43
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
@@ -0,0 +1,21 @@
+package otus.homework.coroutines
+
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlin.coroutines.CoroutineContext
+
+class PresenterScope(coroutineContext: CoroutineContext) : CoroutineScope {
+    override val coroutineContext: CoroutineContext = CoroutineName("PresenterCoroutine") +
+            Dispatchers.Main +
+            SupervisorJob() +
+            CoroutineExceptionHandler { coroutineContext, throwable ->
+                CrashMonitor.trackError(
+                    throwable,
+                    "Handled by CoroutineExceptionHandler $coroutineContext"
+                )
+            } +
+            coroutineContext
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..ad49f9d9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -27,4 +27,13 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
 
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cats_next_activity"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button" />
+
 </otus.homework.coroutines.CatsView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml
new file mode 100644
index 00000000..de99ca3d
--- /dev/null
+++ b/app/src/main/res/layout/activity_main2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity2">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6c270d5d..835608b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,8 @@
 <resources>
     <string name="app_name">Cat Facts </string>
+    <string name="app_unknown_error">"Что-то пошло не так"</string>
+    <string name="app_request_timeout">"Не удалось получить ответ от сервером"</string>
     <string name="more_facts">More Facts</string>
+    <string name="cats_wait_next_fact">"Подождите немного. Идет получение нового факта"</string>
+    <string name="cats_next_activity">"Next Activity"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 00000000..2e8fae1b
--- /dev/null
+++ b/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>
\ No newline at end of file

From a38dd1a84ca613bcf3fd422dc17306ac2a235e98 Mon Sep 17 00:00:00 2001
From: Petr <petr.urvaev@simbirsoft.com>
Date: Sun, 19 Jan 2025 12:42:26 +0400
Subject: [PATCH 2/8] =?UTF-8?q?###=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BA=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D1=83=20=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=20=D1=80=D0=B0=D0=BD=D0=B4=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BA=20=D1=81=20https://api.thecatapi.com/v1/images/search?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/otus/homework/coroutines/CatImage.kt | 10 ++++++++
 .../homework/coroutines/CatImageService.kt    | 11 +++++++++
 .../otus/homework/coroutines/CatsPresenter.kt | 24 +++++++++++++++----
 .../java/otus/homework/coroutines/CatsView.kt | 13 ++++++----
 .../otus/homework/coroutines/DiContainer.kt   |  9 +++++++
 .../otus/homework/coroutines/MainActivity.kt  |  2 +-
 .../otus/homework/coroutines/MainActivity2.kt |  2 +-
 app/src/main/res/layout/activity_main.xml     | 10 +++++++-
 8 files changed, 70 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatImage.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatImageService.kt

diff --git a/app/src/main/java/otus/homework/coroutines/CatImage.kt b/app/src/main/java/otus/homework/coroutines/CatImage.kt
new file mode 100644
index 00000000..9bd16e84
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatImage.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines
+
+import com.google.gson.annotations.SerializedName
+
+data class CatImage(
+    @field:SerializedName("id")
+    val id: String,
+    @field:SerializedName("url")
+    val url: String,
+)
diff --git a/app/src/main/java/otus/homework/coroutines/CatImageService.kt b/app/src/main/java/otus/homework/coroutines/CatImageService.kt
new file mode 100644
index 00000000..27a08f4d
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatImageService.kt
@@ -0,0 +1,11 @@
+package otus.homework.coroutines
+
+import retrofit2.http.GET
+
+private const val VERSION_API = "v1/"
+
+interface CatImageService {
+
+    @GET("${VERSION_API}images/search")
+    suspend fun getRandomImages(): List<CatImage>
+}
\ 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 e828121c..98abed92 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.CoroutineName
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -10,13 +12,15 @@ import java.net.SocketTimeoutException
 import kotlin.coroutines.cancellation.CancellationException
 
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catsService: CatsService,
+    private val catImageService: CatImageService,
 ) {
 
     private var _catsView: ICatsView? = null
     private val presenterScope = PresenterScope(CoroutineName("CatsCoroutine"))
     private var workJob: Job? = null
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     fun onInitComplete() {
         if (workJob?.isActive == true) {
             _catsView?.handle(R.string.cats_wait_next_fact)
@@ -24,10 +28,22 @@ class CatsPresenter(
         }
         workJob = presenterScope.launch {
             try {
-                val fact = withContext(Dispatchers.IO) {
-                    catsService.getCatFact()
+                withContext(Dispatchers.IO) {
+                    val factDeferred = async {
+                        catsService.getCatFact()
+                    }
+                    val imageDeferred = async {
+                        catImageService.getRandomImages()
+                    }
+                    factDeferred.await()
+                    imageDeferred.await()
+                    withContext(Dispatchers.Main) {
+                        _catsView?.populate(
+                            factDeferred.getCompleted(),
+                            imageDeferred.getCompleted()
+                        )
+                    }
                 }
-                _catsView?.populate(fact)
             } catch (timeOutException: SocketTimeoutException) {
                 _catsView?.handle(R.string.app_request_timeout)
             } catch (_: CancellationException) {
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index 09babe4d..02f0af8a 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -4,12 +4,14 @@ import android.content.Context
 import android.content.Intent
 import android.util.AttributeSet
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat.startActivity
 import androidx.core.os.bundleOf
+import com.squareup.picasso.Picasso
 
 
 class CatsView @JvmOverloads constructor(
@@ -18,7 +20,7 @@ class CatsView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
-    var presenter :CatsPresenter? = null
+    var presenter: CatsPresenter? = null
 
     override fun onFinishInflate() {
         super.onFinishInflate()
@@ -32,8 +34,11 @@ class CatsView @JvmOverloads constructor(
         }
     }
 
-    override fun populate(fact: Fact) {
+    override fun populate(fact: Fact, images: List<CatImage>) {
         findViewById<TextView>(R.id.fact_textView).text = fact.fact
+        images.firstOrNull()?.let {
+            Picasso.get().load(it.url).into(findViewById<ImageView>(R.id.cat_image))
+        }
     }
 
     override fun handle(@StringRes resId: Int) {
@@ -45,7 +50,7 @@ class CatsView @JvmOverloads constructor(
     }
 }
 
-interface ICatsView: IUserMessageHandler {
+interface ICatsView : IUserMessageHandler {
 
-    fun populate(fact: Fact)
+    fun populate(fact: Fact, images: List<CatImage>)
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
index 7231a9e6..cb543ee9 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -18,5 +18,14 @@ class DiContainer {
             .build()
     }
 
+    private val retrofitImage by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://api.thecatapi.com/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
     val service by lazy { retrofit.create(CatsService::class.java) }
+
+    val imageServise by lazy { retrofitImage.create(CatImageService::class.java) }
 }
\ 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..d224ac44 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -15,7 +15,7 @@ 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.imageServise)
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
         catsPresenter.onInitComplete()
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity2.kt b/app/src/main/java/otus/homework/coroutines/MainActivity2.kt
index bacffe37..1c3b0730 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity2.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity2.kt
@@ -21,7 +21,7 @@ class MainActivity2 : AppCompatActivity() {
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
             insets
         }
-        catsPresenter = CatsPresenter(diContainer.service)
+        catsPresenter = CatsPresenter(diContainer.service, diContainer.imageServise)
         catsPresenter.onInitComplete()
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ad49f9d9..a4e1991a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,6 +7,14 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/cat_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/fact_textView"
         android:textColor="@color/black"
@@ -16,7 +24,7 @@
         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/cat_image" />
 
     <Button
         android:id="@+id/button"

From 0fd04706d6456e639455020237af7cc404a08b97 Mon Sep 17 00:00:00 2001
From: Petr <petr.urvaev@simbirsoft.com>
Date: Sun, 19 Jan 2025 14:07:43 +0400
Subject: [PATCH 3/8] =?UTF-8?q?###=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BA=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D1=83=20=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=20=D1=80=D0=B0=D0=BD=D0=B4=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BA=20=D1=81=20https://api.thecatapi.com/v1/images/search?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  1 +
 .../otus/homework/coroutines/CatsPresenter.kt | 14 ++--
 .../java/otus/homework/coroutines/CatsView.kt | 34 +++++++++-
 .../otus/homework/coroutines/CatsViewModel.kt | 67 +++++++++++++++++++
 .../otus/homework/coroutines/MainActivity.kt  |  5 +-
 5 files changed, 113 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt

diff --git a/app/build.gradle b/app/build.gradle
index 8e029959..c848f005 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,6 +34,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 98abed92..e1cec407 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -11,17 +11,23 @@ import kotlinx.coroutines.withContext
 import java.net.SocketTimeoutException
 import kotlin.coroutines.cancellation.CancellationException
 
+interface ICatsPresenter {
+    fun onInitComplete()
+    fun attachView(catsView: ICatsView)
+    fun detachView()
+}
+
 class CatsPresenter(
     private val catsService: CatsService,
     private val catImageService: CatImageService,
-) {
+): ICatsPresenter {
 
     private var _catsView: ICatsView? = null
     private val presenterScope = PresenterScope(CoroutineName("CatsCoroutine"))
     private var workJob: Job? = null
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    fun onInitComplete() {
+    override fun onInitComplete() {
         if (workJob?.isActive == true) {
             _catsView?.handle(R.string.cats_wait_next_fact)
             return
@@ -54,11 +60,11 @@ class CatsPresenter(
         }
     }
 
-    fun attachView(catsView: ICatsView) {
+    override fun attachView(catsView: ICatsView) {
         _catsView = catsView
     }
 
-    fun detachView() {
+    override fun detachView() {
         _catsView = null
         CrashMonitor.trackWarning("Stop detachView")
         presenterScope.cancel()
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index 02f0af8a..8a60c9ba 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -20,7 +20,7 @@ class CatsView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
-    var presenter: CatsPresenter? = null
+    var presenter: ICatsPresenter? = null
 
     override fun onFinishInflate() {
         super.onFinishInflate()
@@ -41,6 +41,19 @@ class CatsView @JvmOverloads constructor(
         }
     }
 
+    override fun populate(result: Result<CatData>) {
+        when (result) {
+            is Result.Success -> populate(result.data.fact, result.data.images)
+            is Result.Error -> {
+                when {
+                    result.errorResId != null -> handle(result.errorResId)
+                    result.errorMsg != null -> handle(result.errorMsg)
+                    else -> handle(R.string.app_unknown_error)
+                }
+            }
+        }
+    }
+
     override fun handle(@StringRes resId: Int) {
         handle(context.getString(resId))
     }
@@ -53,4 +66,21 @@ class CatsView @JvmOverloads constructor(
 interface ICatsView : IUserMessageHandler {
 
     fun populate(fact: Fact, images: List<CatImage>)
-}
\ No newline at end of file
+
+    fun populate(result: Result<CatData>)
+}
+
+sealed class Result<out T> {
+
+    class Success<out T>(val data: T) : Result<T>()
+
+    class Error(
+        @StringRes val errorResId: Int? = null,
+        val errorMsg: String? = null
+    ) : Result<Nothing>()
+}
+
+data class CatData(
+    val fact: Fact,
+    val images: List<CatImage>,
+)
\ 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..a2f39431
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -0,0 +1,67 @@
+package otus.homework.coroutines
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.net.SocketTimeoutException
+import kotlin.coroutines.cancellation.CancellationException
+
+class CatsViewModel(
+    private val catsService: CatsService,
+    private val catImageService: CatImageService,
+) : ViewModel(), ICatsPresenter {
+
+    private var _catsView: ICatsView? = null
+    private var workJob: Job? = null
+    private val scopeExceptionHandler = CoroutineExceptionHandler { coroutineContext, throwable ->
+        val error = when (throwable) {
+            is SocketTimeoutException -> Result.Error(errorResId = R.string.app_request_timeout)
+            is CancellationException -> null
+            else -> Result.Error(errorMsg = throwable.message.toString())
+        }
+        error?.let { e ->
+            _catsView?.populate(e)
+            CrashMonitor.trackError(
+                throwable, "Handled by VMCoroutineExceptionHandler $coroutineContext"
+            )
+        }
+    }
+
+    override fun onInitComplete() {
+        if (workJob?.isActive == true) {
+            _catsView?.handle(R.string.cats_wait_next_fact)
+            return
+        }
+        workJob = viewModelScope.launch(scopeExceptionHandler) {
+            withContext(Dispatchers.IO) {
+                val factDeferred = async {
+                    catsService.getCatFact()
+                }
+                val imageDeferred = async {
+                    catImageService.getRandomImages()
+                }
+                withContext(Dispatchers.Main) {
+                    _catsView?.populate(
+                        factDeferred.await(),
+                        imageDeferred.await()
+                    )
+                }
+            }
+        }
+    }
+
+    override fun attachView(catsView: ICatsView) {
+        _catsView = catsView
+    }
+
+    override fun detachView() {
+        _catsView = null
+        workJob?.cancel()
+        workJob = null
+    }
+}
\ 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 d224ac44..6d93df00 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -5,7 +5,7 @@ import android.os.Bundle
 
 class MainActivity : AppCompatActivity() {
 
-    lateinit var catsPresenter: CatsPresenter
+    lateinit var catsPresenter: ICatsPresenter
 
     private val diContainer = DiContainer()
 
@@ -15,7 +15,8 @@ class MainActivity : AppCompatActivity() {
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsPresenter = CatsPresenter(diContainer.service, diContainer.imageServise)
+       // catsPresenter = CatsPresenter(diContainer.service, diContainer.imageServise)
+        catsPresenter = CatsViewModel(diContainer.service, diContainer.imageServise)
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
         catsPresenter.onInitComplete()

From b20d28d65f943d0d325c85d3337a34334c0cc30d Mon Sep 17 00:00:00 2001
From: Petr <petr.urvaev@simbirsoft.com>
Date: Sun, 19 Jan 2025 14:07:43 +0400
Subject: [PATCH 4/8] =?UTF-8?q?###=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20ViewModel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  1 +
 .../otus/homework/coroutines/CatsPresenter.kt | 14 ++--
 .../java/otus/homework/coroutines/CatsView.kt | 34 +++++++++-
 .../otus/homework/coroutines/CatsViewModel.kt | 67 +++++++++++++++++++
 .../otus/homework/coroutines/MainActivity.kt  |  5 +-
 5 files changed, 113 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt

diff --git a/app/build.gradle b/app/build.gradle
index 8e029959..c848f005 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,6 +34,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 98abed92..e1cec407 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -11,17 +11,23 @@ import kotlinx.coroutines.withContext
 import java.net.SocketTimeoutException
 import kotlin.coroutines.cancellation.CancellationException
 
+interface ICatsPresenter {
+    fun onInitComplete()
+    fun attachView(catsView: ICatsView)
+    fun detachView()
+}
+
 class CatsPresenter(
     private val catsService: CatsService,
     private val catImageService: CatImageService,
-) {
+): ICatsPresenter {
 
     private var _catsView: ICatsView? = null
     private val presenterScope = PresenterScope(CoroutineName("CatsCoroutine"))
     private var workJob: Job? = null
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    fun onInitComplete() {
+    override fun onInitComplete() {
         if (workJob?.isActive == true) {
             _catsView?.handle(R.string.cats_wait_next_fact)
             return
@@ -54,11 +60,11 @@ class CatsPresenter(
         }
     }
 
-    fun attachView(catsView: ICatsView) {
+    override fun attachView(catsView: ICatsView) {
         _catsView = catsView
     }
 
-    fun detachView() {
+    override fun detachView() {
         _catsView = null
         CrashMonitor.trackWarning("Stop detachView")
         presenterScope.cancel()
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index 02f0af8a..8a60c9ba 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -20,7 +20,7 @@ class CatsView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
-    var presenter: CatsPresenter? = null
+    var presenter: ICatsPresenter? = null
 
     override fun onFinishInflate() {
         super.onFinishInflate()
@@ -41,6 +41,19 @@ class CatsView @JvmOverloads constructor(
         }
     }
 
+    override fun populate(result: Result<CatData>) {
+        when (result) {
+            is Result.Success -> populate(result.data.fact, result.data.images)
+            is Result.Error -> {
+                when {
+                    result.errorResId != null -> handle(result.errorResId)
+                    result.errorMsg != null -> handle(result.errorMsg)
+                    else -> handle(R.string.app_unknown_error)
+                }
+            }
+        }
+    }
+
     override fun handle(@StringRes resId: Int) {
         handle(context.getString(resId))
     }
@@ -53,4 +66,21 @@ class CatsView @JvmOverloads constructor(
 interface ICatsView : IUserMessageHandler {
 
     fun populate(fact: Fact, images: List<CatImage>)
-}
\ No newline at end of file
+
+    fun populate(result: Result<CatData>)
+}
+
+sealed class Result<out T> {
+
+    class Success<out T>(val data: T) : Result<T>()
+
+    class Error(
+        @StringRes val errorResId: Int? = null,
+        val errorMsg: String? = null
+    ) : Result<Nothing>()
+}
+
+data class CatData(
+    val fact: Fact,
+    val images: List<CatImage>,
+)
\ 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..a2f39431
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -0,0 +1,67 @@
+package otus.homework.coroutines
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.net.SocketTimeoutException
+import kotlin.coroutines.cancellation.CancellationException
+
+class CatsViewModel(
+    private val catsService: CatsService,
+    private val catImageService: CatImageService,
+) : ViewModel(), ICatsPresenter {
+
+    private var _catsView: ICatsView? = null
+    private var workJob: Job? = null
+    private val scopeExceptionHandler = CoroutineExceptionHandler { coroutineContext, throwable ->
+        val error = when (throwable) {
+            is SocketTimeoutException -> Result.Error(errorResId = R.string.app_request_timeout)
+            is CancellationException -> null
+            else -> Result.Error(errorMsg = throwable.message.toString())
+        }
+        error?.let { e ->
+            _catsView?.populate(e)
+            CrashMonitor.trackError(
+                throwable, "Handled by VMCoroutineExceptionHandler $coroutineContext"
+            )
+        }
+    }
+
+    override fun onInitComplete() {
+        if (workJob?.isActive == true) {
+            _catsView?.handle(R.string.cats_wait_next_fact)
+            return
+        }
+        workJob = viewModelScope.launch(scopeExceptionHandler) {
+            withContext(Dispatchers.IO) {
+                val factDeferred = async {
+                    catsService.getCatFact()
+                }
+                val imageDeferred = async {
+                    catImageService.getRandomImages()
+                }
+                withContext(Dispatchers.Main) {
+                    _catsView?.populate(
+                        factDeferred.await(),
+                        imageDeferred.await()
+                    )
+                }
+            }
+        }
+    }
+
+    override fun attachView(catsView: ICatsView) {
+        _catsView = catsView
+    }
+
+    override fun detachView() {
+        _catsView = null
+        workJob?.cancel()
+        workJob = null
+    }
+}
\ 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 d224ac44..6d93df00 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -5,7 +5,7 @@ import android.os.Bundle
 
 class MainActivity : AppCompatActivity() {
 
-    lateinit var catsPresenter: CatsPresenter
+    lateinit var catsPresenter: ICatsPresenter
 
     private val diContainer = DiContainer()
 
@@ -15,7 +15,8 @@ class MainActivity : AppCompatActivity() {
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsPresenter = CatsPresenter(diContainer.service, diContainer.imageServise)
+       // catsPresenter = CatsPresenter(diContainer.service, diContainer.imageServise)
+        catsPresenter = CatsViewModel(diContainer.service, diContainer.imageServise)
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
         catsPresenter.onInitComplete()

From a49598daa76c71a133da2b802830f251e387ea8b Mon Sep 17 00:00:00 2001
From: Petr <petr.urvaev@simbirsoft.com>
Date: Sun, 19 Jan 2025 15:16:13 +0400
Subject: [PATCH 5/8] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
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 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e1cec407..c68025b0 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -41,12 +41,10 @@ class CatsPresenter(
                     val imageDeferred = async {
                         catImageService.getRandomImages()
                     }
-                    factDeferred.await()
-                    imageDeferred.await()
                     withContext(Dispatchers.Main) {
                         _catsView?.populate(
-                            factDeferred.getCompleted(),
-                            imageDeferred.getCompleted()
+                            factDeferred.await(),
+                            imageDeferred.await()
                         )
                     }
                 }

From f58627e6c8171e32261f3a819a0a086645476431 Mon Sep 17 00:00:00 2001
From: Petr <petr.urvaev@simbirsoft.com>
Date: Sun, 19 Jan 2025 15:16:25 +0400
Subject: [PATCH 6/8] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/otus/homework/coroutines/CatsPresenter.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index c68025b0..90e4b2b5 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -26,7 +26,6 @@ class CatsPresenter(
     private val presenterScope = PresenterScope(CoroutineName("CatsCoroutine"))
     private var workJob: Job? = null
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     override fun onInitComplete() {
         if (workJob?.isActive == true) {
             _catsView?.handle(R.string.cats_wait_next_fact)

From a45c0b2b4586ebdc0b78bec64b159748c893b58f Mon Sep 17 00:00:00 2001
From: Petr <petr.urvaev@simbirsoft.com>
Date: Sun, 19 Jan 2025 16:10:02 +0400
Subject: [PATCH 7/8] =?UTF-8?q?=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F=20=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D1=80=D1=83=D1=82=D0=B8=D0=BD=20=D0=B2=D0=BE=20ViewModel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index a2f39431..2ed6c2d5 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -6,6 +6,7 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.net.SocketTimeoutException
@@ -61,7 +62,6 @@ class CatsViewModel(
 
     override fun detachView() {
         _catsView = null
-        workJob?.cancel()
-        workJob = null
+        viewModelScope.cancel()
     }
 }
\ No newline at end of file

From b97e29a3ae79a0ad400d211b5cb4f5f5589b57f7 Mon Sep 17 00:00:00 2001
From: Petr <petr.urvaev@simbirsoft.com>
Date: Thu, 23 Jan 2025 22:51:23 +0400
Subject: [PATCH 8/8] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20Result.Success=20=D0=B2?=
 =?UTF-8?q?=D0=BE=20ViewModel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/otus/homework/coroutines/CatsViewModel.kt   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index 2ed6c2d5..36c6babd 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -48,8 +48,12 @@ class CatsViewModel(
                 }
                 withContext(Dispatchers.Main) {
                     _catsView?.populate(
-                        factDeferred.await(),
-                        imageDeferred.await()
+                        Result.Success(
+                            CatData(
+                                factDeferred.await(),
+                                imageDeferred.await()
+                            )
+                        )
                     )
                 }
             }