From c27a4cff9fbe73f8d46101294b7fbf47031ac296 Mon Sep 17 00:00:00 2001
From: Daria Boytsova <daria.boytsova.db@gmail.com>
Date: Mon, 1 Dec 2025 23:00:11 +0100
Subject: [PATCH 1/2] Homework corutines done

---
 .../java/otus/homework/coroutines/CatDataModel.kt   |  3 +++
 .../java/otus/homework/coroutines/CatsViewModel.kt  |  4 ++++
 app/src/main/java/otus/homework/coroutines/Image.kt | 10 ++++++++++
 .../java/otus/homework/coroutines/ImageService.kt   | 13 +++++++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatDataModel.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
 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/CatDataModel.kt b/app/src/main/java/otus/homework/coroutines/CatDataModel.kt
new file mode 100644
index 00000000..3feb5d40
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatDataModel.kt
@@ -0,0 +1,3 @@
+package otus.homework.coroutines
+
+data class CatDataModel()
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..468b470e
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -0,0 +1,4 @@
+package otus.homework.coroutines
+
+class CatsViewModel {
+}
\ 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..643a5a33
--- /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 Fact(
+	@field:SerializedName("fact")
+	val fact: String,
+	@field:SerializedName("length")
+	val length: Int
+)
\ 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
new file mode 100644
index 00000000..46e9944e
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/ImageService.kt
@@ -0,0 +1,13 @@
+package otus.homework.coroutines
+
+import retrofit2.Response
+import retrofit2.http.GET
+
+interface CatsService {
+
+    @GET("fact")
+    suspend fun getCatFact() : Response<Fact>
+
+    @GET ("v1/images/search")
+    suspend fun getImage() : Response<Image>
+}
\ No newline at end of file

From d1a62cba7058b8d92dca09c4bb906f1a7adde0c6 Mon Sep 17 00:00:00 2001
From: Daria Boytsova <daria.boytsova.db@gmail.com>
Date: Mon, 1 Dec 2025 23:02:32 +0100
Subject: [PATCH 2/2] Now done

---
 app/build.gradle                              |  2 +
 .../otus/homework/coroutines/CatDataModel.kt  |  5 ++-
 .../otus/homework/coroutines/CatsPresenter.kt | 42 ++++++++++++-------
 .../otus/homework/coroutines/CatsService.kt   |  5 +--
 .../java/otus/homework/coroutines/CatsView.kt | 24 +++++++++--
 .../otus/homework/coroutines/CatsViewModel.kt | 42 ++++++++++++++++++-
 .../otus/homework/coroutines/CrashMonitor.kt  |  3 +-
 .../otus/homework/coroutines/DiContainer.kt   | 11 ++++-
 .../java/otus/homework/coroutines/Image.kt    | 17 +++++---
 .../otus/homework/coroutines/ImageService.kt  | 10 ++---
 .../otus/homework/coroutines/MainActivity.kt  |  6 ++-
 app/src/main/res/layout/activity_main.xml     | 18 ++++++--
 12 files changed, 141 insertions(+), 44 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a414e0e8..b744f125 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,4 +41,6 @@ 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 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatDataModel.kt b/app/src/main/java/otus/homework/coroutines/CatDataModel.kt
index 3feb5d40..200ca653 100644
--- a/app/src/main/java/otus/homework/coroutines/CatDataModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatDataModel.kt
@@ -1,3 +1,6 @@
 package otus.homework.coroutines
 
-data class CatDataModel()
+data class CatDataModel(
+    val fact: Fact,
+    val imageUrl: String?
+)
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e4b05120..1a15b9f2 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,30 +1,40 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import kotlinx.coroutines.*
+import otus.homework.coroutines.CrashMonitor.trackWarning
+import java.net.SocketTimeoutException
 
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catsService: CatsService,
+    private val imageService: ImageService,
 ) {
 
     private var _catsView: ICatsView? = null
+    private val scopeCats = CoroutineScope(Dispatchers.Main + CoroutineName("CatsCoroutine"))
+
 
     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()!!)
-                }
-            }
+        scopeCats.launch {
+            try {
+                val responseFact = async {catsService.getCatFact()}
+                val responseImage = async {imageService.getImage().firstOrNull()}
+
+                _catsView?.populate(CatDataModel(responseFact.await(), responseImage.await()?.url))
+
 
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                CrashMonitor.trackWarning()
+            } catch (e: SocketTimeoutException) {
+                val error = e.message ?: "Не удалось получить ответ от сервера"
+                _catsView?.showToast(error)
+            } catch (e: Exception) {
+                val errorMessage = e.message ?: "Unknown error"
+                trackWarning(errorMessage)
+                _catsView?.showToast(errorMessage)
             }
-        })
+        }
     }
 
+
     fun attachView(catsView: ICatsView) {
         _catsView = catsView
     }
@@ -32,4 +42,8 @@ class CatsPresenter(
     fun detachView() {
         _catsView = null
     }
-}
\ No newline at end of file
+
+    fun onStop() {
+        scopeCats.cancel()
+    }
+}
diff --git a/app/src/main/java/otus/homework/coroutines/CatsService.kt b/app/src/main/java/otus/homework/coroutines/CatsService.kt
index 479b2cfb..8d847f32 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>
-}
\ No newline at end of file
+    suspend fun getCatFact() : Fact
+}
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index be04b2a8..65805d8d 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -4,7 +4,10 @@ import android.content.Context
 import android.util.AttributeSet
 import android.widget.Button
 import android.widget.TextView
+import android.widget.ImageView
+import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.squareup.picasso.Picasso
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -13,20 +16,33 @@ class CatsView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
     var presenter :CatsPresenter? = null
+    var viewModel: CatsViewModel? = null
 
     override fun onFinishInflate() {
         super.onFinishInflate()
         findViewById<Button>(R.id.button).setOnClickListener {
             presenter?.onInitComplete()
+            if (presenter != null) {
+                presenter?.onInitComplete()
+            } else {
+                viewModel?.onInitComplete()
+            }
         }
     }
 
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.fact
+    override fun populate(data: CatDataModel) {
+        findViewById<TextView>(R.id.fact_textView).text = data.fact.fact
+        val imageView = findViewById<ImageView>(R.id.imageContainer)
+        Picasso.get().load(data.imageUrl).into(imageView)
+    }
+
+    override fun showToast(message: String?) {
+        Toast.makeText(context, message ?: "Неизвестная ошибка", Toast.LENGTH_LONG).show()
     }
 }
 
 interface ICatsView {
 
-    fun populate(fact: Fact)
-}
\ No newline at end of file
+    fun populate(data: CatDataModel)
+    fun showToast(message: String?)
+}
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index 468b470e..02c8bff6 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -1,4 +1,42 @@
 package otus.homework.coroutines
 
-class CatsViewModel {
-}
\ No newline at end of file
+import kotlinx.coroutines.*
+import otus.homework.coroutines.CrashMonitor.trackWarning
+import java.net.SocketTimeoutException
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+
+
+class CatsViewModel(
+    private val catsService: CatsService,
+    private val imageService: ImageService,
+    private val onShowToast: (String?) -> Unit
+) : ViewModel() {
+
+    private val _state = MutableStateFlow<Result>(Result.Error("No fact found"))
+
+    private val handler = CoroutineExceptionHandler { _, exception ->
+        if(exception is SocketTimeoutException){
+            onShowToast("Не удалось получить ответ от сервера")
+        }else {
+            trackWarning("CoroutineExceptionHandler got $exception")
+            onShowToast(exception.message)
+        }
+        _state.value = Result.Error(exception.message)
+    }
+
+    fun onInitComplete() {
+        viewModelScope.launch (handler){
+            val fact = async { catsService.getCatFact() }
+            val image = async { imageService.getImage().firstOrNull() }
+            val model = CatDataModel(fact.await(), image.await()?.url)
+            _state.value = Result.Success(model)
+        }
+    }
+}
+
+sealed class Result {
+    data class Success<T>(val data: T) : Result()
+    data class Error(val msg: String?) : Result()
+}
diff --git a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
index 32e6b018..40b650af 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -5,6 +5,7 @@ object CrashMonitor {
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning() {
+    fun trackWarning(message: String?) {
+        println("CrashMonitor: $message")
     }
 }
\ 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..70513383 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -12,5 +12,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) }
-}
\ No newline at end of file
+
+    val serviceImage by lazy { retrofitImage.create(ImageService::class.java) }
+}
diff --git a/app/src/main/java/otus/homework/coroutines/Image.kt b/app/src/main/java/otus/homework/coroutines/Image.kt
index 643a5a33..a450ee81 100644
--- a/app/src/main/java/otus/homework/coroutines/Image.kt
+++ b/app/src/main/java/otus/homework/coroutines/Image.kt
@@ -2,9 +2,14 @@ package otus.homework.coroutines
 
 import com.google.gson.annotations.SerializedName
 
-data class Fact(
-	@field:SerializedName("fact")
-	val fact: String,
-	@field:SerializedName("length")
-	val length: Int
-)
\ No newline at end of file
+data class Image(
+	@field:SerializedName("id")
+	val id: String,
+	@field:SerializedName("url")
+	val url: String,
+	@field:SerializedName("width")
+	val width: Int,
+	@field:SerializedName("height")
+	val height: Int
+
+	)
\ 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 46e9944e..a243c35b 100644
--- a/app/src/main/java/otus/homework/coroutines/ImageService.kt
+++ b/app/src/main/java/otus/homework/coroutines/ImageService.kt
@@ -1,13 +1,9 @@
 package otus.homework.coroutines
 
-import retrofit2.Response
 import retrofit2.http.GET
 
-interface CatsService {
-
-    @GET("fact")
-    suspend fun getCatFact() : Response<Fact>
+interface ImageService {
 
     @GET ("v1/images/search")
-    suspend fun getImage() : Response<Image>
-}
\ No newline at end of file
+    suspend fun getImage() : List<Image>
+}
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index a9dafb3b..2b0faece 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)
+        catsPresenter = CatsPresenter(
+            diContainer.service,
+            imageService = diContainer.serviceImage
+        )
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
         catsPresenter.onInitComplete()
@@ -24,6 +27,7 @@ class MainActivity : AppCompatActivity() {
     override fun onStop() {
         if (isFinishing) {
             catsPresenter.detachView()
+            catsPresenter.onStop()
         }
         super.onStop()
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..329f56d0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -13,18 +13,28 @@
         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" />
 
+    <ImageView
+        app:layout_constraintTop_toBottomOf="@+id/fact_textView"
+        android:id="@+id/imageContainer"
+        android:layout_width="342dp"
+        android:layout_height="257dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
     <Button
         android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="148dp"
+        android:layout_height="51dp"
         android:text="@string/more_facts"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
+        app:layout_constraintTop_toBottomOf="@+id/imageContainer" />
 
 </otus.homework.coroutines.CatsView>
\ No newline at end of file