From 0378b8f8b02eb7db0e6c309864c610afc4212e29 Mon Sep 17 00:00:00 2001
From: Dmitrii Kaluzhin <aluminiy2713@gmail.com>
Date: Fri, 12 Dec 2025 12:14:01 +0300
Subject: [PATCH] no message

---
 app/build.gradle                              |  1 +
 .../java/otus/homework/coroutines/CatImage.kt | 14 ++++++
 .../java/otus/homework/coroutines/CatModel.kt |  6 +++
 .../otus/homework/coroutines/CatsPresenter.kt | 40 +++++++++++++--
 .../otus/homework/coroutines/CatsService.kt   |  2 +-
 .../java/otus/homework/coroutines/CatsView.kt | 17 +++++--
 .../otus/homework/coroutines/CatsViewModel.kt | 45 +++++++++++++++++
 .../otus/homework/coroutines/CrashMonitor.kt  |  2 +-
 .../otus/homework/coroutines/DiContainer.kt   | 10 ++++
 .../otus/homework/coroutines/ImageService.kt  |  9 ++++
 .../otus/homework/coroutines/MainActivity.kt  | 49 ++++++++++++++++---
 app/src/main/res/layout/activity_main.xml     | 15 ++++--
 12 files changed, 190 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatImage.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatModel.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/ImageService.kt

diff --git a/app/build.gradle b/app/build.gradle
index a414e0e8..a4c7a999 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
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..effa327d
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatImage.kt
@@ -0,0 +1,14 @@
+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,
+    @field:SerializedName("width")
+    val width: Int,
+    @field:SerializedName("height")
+    val height : Int
+)
diff --git a/app/src/main/java/otus/homework/coroutines/CatModel.kt b/app/src/main/java/otus/homework/coroutines/CatModel.kt
new file mode 100644
index 00000000..f16e4ef8
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatModel.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+data class CatModel (
+    val text: String?,
+    val imageUrl: String?
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e4b05120..69bf6c9d 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,16 +1,41 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import java.net.SocketTimeoutException
 
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catsService: CatsService,
+    private val imageService: ImageService,
+    private val onShowToast: (String?) -> Unit
 ) {
 
     private var _catsView: ICatsView? = null
+    private val presenterScope = CoroutineScope(Dispatchers.Main + CoroutineName("CatsCoroutine"))
+    private var job: Job? = null
 
     fun onInitComplete() {
+        job = presenterScope.launch {
+            try {
+                val fact = async {catsService.getCatFact()}
+                val image = async {imageService.getCatImage().firstOrNull()}
+                _catsView?.populate(CatModel(fact.await().fact, image.await()?.url))
+            }
+            catch (e: SocketTimeoutException)
+            {
+                onShowToast("Не удалось получить ответ от сервера")
+            }
+            catch (e: Exception)
+            {
+                onShowToast(e.message)
+                CrashMonitor.trackWarning(e.message)
+            }
+        }
+/*
         catsService.getCatFact().enqueue(object : Callback<Fact> {
 
             override fun onResponse(call: Call<Fact>, response: Response<Fact>) {
@@ -22,7 +47,7 @@ class CatsPresenter(
             override fun onFailure(call: Call<Fact>, t: Throwable) {
                 CrashMonitor.trackWarning()
             }
-        })
+        })*/
     }
 
     fun attachView(catsView: ICatsView) {
@@ -32,4 +57,9 @@ class CatsPresenter(
     fun detachView() {
         _catsView = null
     }
+
+    fun onStop()
+    {
+        job?.cancel()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsService.kt b/app/src/main/java/otus/homework/coroutines/CatsService.kt
index 479b2cfb..ca9e3f73 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsService.kt
@@ -6,5 +6,5 @@ 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..69ead663 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -3,8 +3,10 @@ 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 androidx.constraintlayout.widget.ConstraintLayout
+import com.squareup.picasso.Picasso
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -13,20 +15,27 @@ 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(model: CatModel) {
+        findViewById<TextView>(R.id.fact_textView).text = model.text
+        val imageview = findViewById<ImageView>(R.id.imageView)
+        Picasso.get().load(model.imageUrl).into(imageview)
     }
 }
 
 interface ICatsView {
 
-    fun populate(fact: Fact)
+    fun populate(model: CatModel)
 }
\ 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..65b533a6
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -0,0 +1,45 @@
+package otus.homework.coroutines
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import java.net.SocketTimeoutException
+
+class CatsViewModel (
+    private val catsService: CatsService,
+    private val imagesService: ImageService,
+    private val onShowToast: (String?) -> Unit
+) : ViewModel() {
+
+    private val _state = MutableStateFlow<Result>(Result.Error("Произошла ошибка при получении факта"))
+    val state: StateFlow<Result> = _state.asStateFlow()
+
+    private val handler = CoroutineExceptionHandler { _, exception ->
+        if(exception is SocketTimeoutException){
+            onShowToast("Не удалось получить ответ от сервера")
+        }else {
+            CrashMonitor.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 { imagesService.getCatImage().firstOrNull() }
+            val model = CatModel(fact.await().fact, 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()
+}
\ 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..e2dbf10e 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -5,6 +5,6 @@ object CrashMonitor {
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning() {
+    fun trackWarning(message: String?) {
     }
 }
\ 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..8788d103 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -2,6 +2,7 @@ package otus.homework.coroutines
 
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import kotlin.getValue
 
 class DiContainer {
 
@@ -12,5 +13,14 @@ class DiContainer {
             .build()
     }
 
+    private val imageRetrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://api.thecatapi.com/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
     val service by lazy { retrofit.create(CatsService::class.java) }
+
+    val imageService by lazy {imageRetrofit.create(ImageService::class.java)}
 }
\ 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..4859a8aa
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/ImageService.kt
@@ -0,0 +1,9 @@
+package otus.homework.coroutines
+
+import retrofit2.http.GET
+
+interface ImageService {
+
+    @GET("v1/images/search")
+    suspend fun getCatImage() : List<CatImage>
+}
\ 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..d2ddd23c 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -2,11 +2,13 @@ package otus.homework.coroutines
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Toast
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
 
     lateinit var catsPresenter: CatsPresenter
-
     private val diContainer = DiContainer()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -15,16 +17,51 @@ class MainActivity : AppCompatActivity() {
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsPresenter = CatsPresenter(diContainer.service)
-        view.presenter = catsPresenter
-        catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
+
+//            catsPresenter = CatsPresenter(
+//                diContainer.service,
+//                diContainer.imageService,
+//                ::onShowToast
+//            )
+//            view.presenter = catsPresenter
+//            catsPresenter.attachView(view)
+//            catsPresenter.onInitComplete()
+
+            val viewModel = CatsViewModel(
+                diContainer.service,
+                diContainer.imageService,
+                ::onShowToast
+            )
+            viewModel.onInitComplete()
+            view.viewModel = viewModel
+
+            lifecycleScope.launch {
+                viewModel.state.collect { state ->
+                    when (state) {
+                        is Result.Success<*> -> {
+                            if (state.data is CatModel)
+                                view.populate(state.data)
+                        }
+
+                        is Result.Error -> {
+                            onShowToast(state.msg)
+                        }
+                    }
+                }
+            }
     }
 
     override fun onStop() {
         if (isFinishing) {
-            catsPresenter.detachView()
+            if(::catsPresenter.isInitialized) {
+                catsPresenter.detachView()
+                catsPresenter.onStop()
+            }
         }
         super.onStop()
     }
+
+    private fun onShowToast(message: String?) {
+        Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+    }
 }
\ 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..818afcb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,16 +7,24 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/fact_textView"
+        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"
         android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
     <Button
         android:id="@+id/button"
@@ -25,6 +33,7 @@
         android:text="@string/more_facts"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
+        app:layout_constraintTop_toBottomOf="@+id/fact_textView"
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
 </otus.homework.coroutines.CatsView>
\ No newline at end of file