From efd627d2fab1c26155c1cfd8446b5bf24b5c69a2 Mon Sep 17 00:00:00 2001
From: "adil.ziganshin" <adilziga@gmail.com>
Date: Mon, 20 Jan 2025 22:46:35 +0300
Subject: [PATCH 1/3] homework part 1

---
 .../otus/homework/coroutines/CatsPresenter.kt | 29 +++++++++----------
 .../otus/homework/coroutines/CatsService.kt   |  3 +-
 .../java/otus/homework/coroutines/CatsView.kt | 11 ++++++-
 .../otus/homework/coroutines/MainActivity.kt  | 10 +++++--
 .../homework/coroutines/PresenterScope.kt     | 16 ++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 48 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/PresenterScope.kt

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e4b05120..e3d693b9 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,8 +1,8 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import android.content.Context
+import android.widget.Toast
+import java.net.SocketTimeoutException
 
 class CatsPresenter(
     private val catsService: CatsService
@@ -10,19 +10,16 @@ class CatsPresenter(
 
     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(context: Context) {
+        try {
+            val response = catsService.getCatFact()
+            _catsView?.populate(response)
+        } catch (exception: SocketTimeoutException) {
+            Toast.makeText(context, context.getString(R.string.could_not_get_response_from_server),
+                Toast.LENGTH_SHORT).show()
+        } catch (exception: Exception) {
+            CrashMonitor.trackWarning()
+        }
     }
 
     fun attachView(catsView: ICatsView) {
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..5b578ad4 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.widget.Button
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
+import kotlinx.coroutines.launch
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -13,14 +14,22 @@ class CatsView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
     var presenter :CatsPresenter? = null
+    private val scope = PresenterScope()
 
     override fun onFinishInflate() {
         super.onFinishInflate()
         findViewById<Button>(R.id.button).setOnClickListener {
-            presenter?.onInitComplete()
+            scope.launch {
+                presenter?.onInitComplete(context)
+            }
         }
     }
 
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        scope.cancelJobs()
+    }
+
     override fun populate(fact: Fact) {
         findViewById<TextView>(R.id.fact_textView).text = fact.fact
     }
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index a9dafb3b..98098bc7 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -2,12 +2,13 @@ package otus.homework.coroutines
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
 
-    lateinit var catsPresenter: CatsPresenter
-
+    private lateinit var catsPresenter: CatsPresenter
     private val diContainer = DiContainer()
+    private val scope = PresenterScope()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -18,10 +19,13 @@ class MainActivity : AppCompatActivity() {
         catsPresenter = CatsPresenter(diContainer.service)
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
+        scope.launch {
+            catsPresenter.onInitComplete(this@MainActivity)
+        }
     }
 
     override fun onStop() {
+        scope.cancelJobs()
         if (isFinishing) {
             catsPresenter.detachView()
         }
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..9a47ebef
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
@@ -0,0 +1,16 @@
+package otus.homework.coroutines
+
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelChildren
+
+class PresenterScope : CoroutineScope {
+    private val job = Job()
+    override val coroutineContext = job + Dispatchers.Main + CoroutineName("CatsCoroutine")
+
+    fun cancelJobs() {
+        job.cancelChildren()
+    }
+}
\ 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..80490cba 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="could_not_get_response_from_server">Не удалось получить ответ от сервера</string>
 </resources>
\ No newline at end of file

From 0c652579500dd17245bf471174f069ccff59c26e Mon Sep 17 00:00:00 2001
From: "adil.ziganshin" <adilziga@gmail.com>
Date: Thu, 23 Jan 2025 22:50:31 +0300
Subject: [PATCH 2/3] homework part 2

---
 .../main/java/otus/homework/coroutines/Cat.kt   |  6 ++++++
 .../java/otus/homework/coroutines/CatPicture.kt | 14 ++++++++++++++
 .../otus/homework/coroutines/CatsPresenter.kt   | 12 ++++++++----
 .../otus/homework/coroutines/CatsService.kt     |  2 +-
 .../java/otus/homework/coroutines/CatsView.kt   | 17 ++++++++++++-----
 .../otus/homework/coroutines/CrashMonitor.kt    |  2 +-
 .../otus/homework/coroutines/DiContainer.kt     | 13 ++++++++++---
 .../main/java/otus/homework/coroutines/Fact.kt  |  2 +-
 .../otus/homework/coroutines/MainActivity.kt    |  7 ++++---
 .../otus/homework/coroutines/PicsService.kt     |  9 +++++++++
 .../otus/homework/coroutines/PresenterScope.kt  |  2 +-
 app/src/main/res/layout/activity_main.xml       | 10 ++++++++++
 app/src/main/res/values/strings.xml             |  1 +
 13 files changed, 78 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/Cat.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatPicture.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/PicsService.kt

diff --git a/app/src/main/java/otus/homework/coroutines/Cat.kt b/app/src/main/java/otus/homework/coroutines/Cat.kt
new file mode 100644
index 00000000..994faafe
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/Cat.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+data class Cat(
+    val fact: Fact,
+    val picture: CatPicture
+)
diff --git a/app/src/main/java/otus/homework/coroutines/CatPicture.kt b/app/src/main/java/otus/homework/coroutines/CatPicture.kt
new file mode 100644
index 00000000..aede7b19
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatPicture.kt
@@ -0,0 +1,14 @@
+package otus.homework.coroutines
+
+import com.google.gson.annotations.SerializedName
+
+data class CatPicture(
+    @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/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e3d693b9..e283965e 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,23 +1,27 @@
 package otus.homework.coroutines
 
 import android.content.Context
+import android.util.Log
 import android.widget.Toast
 import java.net.SocketTimeoutException
 
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catsService: CatsService,
+    private val picsService: PicsService
 ) {
 
     private var _catsView: ICatsView? = null
 
     suspend fun onInitComplete(context: Context) {
         try {
-            val response = catsService.getCatFact()
-            _catsView?.populate(response)
+            val cat = Cat(catsService.getCatFact(), picsService.getCatPicture()[0])
+            Log.d("onInitComplete", "cat = '$cat'")
+            _catsView?.populate(cat)
         } catch (exception: SocketTimeoutException) {
             Toast.makeText(context, context.getString(R.string.could_not_get_response_from_server),
                 Toast.LENGTH_SHORT).show()
         } catch (exception: Exception) {
+            Log.d("onInitComplete", "Exception = ${exception}")
             CrashMonitor.trackWarning()
         }
     }
@@ -29,4 +33,4 @@ class CatsPresenter(
     fun detachView() {
         _catsView = null
     }
-}
\ 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 829b930c..4f4ff549 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsService.kt
@@ -6,4 +6,4 @@ interface CatsService {
 
     @GET("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 5b578ad4..781e6275 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -2,9 +2,12 @@ package otus.homework.coroutines
 
 import android.content.Context
 import android.util.AttributeSet
+import android.util.Log
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.squareup.picasso.Picasso
 import kotlinx.coroutines.launch
 
 class CatsView @JvmOverloads constructor(
@@ -13,13 +16,14 @@ class CatsView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
-    var presenter :CatsPresenter? = null
+    var presenter: CatsPresenter? = null
     private val scope = PresenterScope()
 
     override fun onFinishInflate() {
         super.onFinishInflate()
         findViewById<Button>(R.id.button).setOnClickListener {
             scope.launch {
+                Log.d("onFinishInflate", "Presenter = '$presenter'")
                 presenter?.onInitComplete(context)
             }
         }
@@ -30,12 +34,15 @@ class CatsView @JvmOverloads constructor(
         scope.cancelJobs()
     }
 
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.fact
+    override fun populate(cat: Cat) {
+        Log.d("populate", "Got cat = '$cat'")
+        findViewById<TextView>(R.id.fact_textView).text = cat.fact.fact
+        val imageView: ImageView = findViewById(R.id.picture_imageView)
+        Picasso.get().load(cat.picture.url).into(imageView)
     }
 }
 
 interface ICatsView {
 
-    fun populate(fact: Fact)
-}
\ No newline at end of file
+    fun populate(cat: Cat)
+}
diff --git a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
index 32e6b018..0f001e6e 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -7,4 +7,4 @@ object CrashMonitor {
      */
     fun trackWarning() {
     }
-}
\ 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..f412a3dc 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -5,12 +5,19 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 class DiContainer {
 
-    private val retrofit by lazy {
+    private val factsRetrofit by lazy {
         Retrofit.Builder()
             .baseUrl("https://catfact.ninja/")
             .addConverterFactory(GsonConverterFactory.create())
             .build()
     }
+    val factsService by lazy { factsRetrofit.create(CatsService::class.java) }
 
-    val service by lazy { retrofit.create(CatsService::class.java) }
-}
\ No newline at end of file
+    private val picsRetrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://api.thecatapi.com/v1/images/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+    val picsService by lazy { picsRetrofit.create(PicsService::class.java) }
+}
diff --git a/app/src/main/java/otus/homework/coroutines/Fact.kt b/app/src/main/java/otus/homework/coroutines/Fact.kt
index 643a5a33..86f62691 100644
--- a/app/src/main/java/otus/homework/coroutines/Fact.kt
+++ b/app/src/main/java/otus/homework/coroutines/Fact.kt
@@ -7,4 +7,4 @@ data class 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/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index 98098bc7..b47ded7f 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -15,8 +15,9 @@ class MainActivity : AppCompatActivity() {
 
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
-
-        catsPresenter = CatsPresenter(diContainer.service)
+        with (diContainer) {
+            catsPresenter = CatsPresenter(factsService, picsService)
+        }
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
         scope.launch {
@@ -31,4 +32,4 @@ class MainActivity : AppCompatActivity() {
         }
         super.onStop()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/otus/homework/coroutines/PicsService.kt b/app/src/main/java/otus/homework/coroutines/PicsService.kt
new file mode 100644
index 00000000..84e0da8e
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/PicsService.kt
@@ -0,0 +1,9 @@
+package otus.homework.coroutines
+
+import retrofit2.http.GET
+
+interface PicsService {
+
+    @GET("search")
+    suspend fun getCatPicture(): List<CatPicture>
+}
diff --git a/app/src/main/java/otus/homework/coroutines/PresenterScope.kt b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
index 9a47ebef..ad1614ac 100644
--- a/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
+++ b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
@@ -13,4 +13,4 @@ class PresenterScope : CoroutineScope {
     fun cancelJobs() {
         job.cancelChildren()
     }
-}
\ 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..83708c76 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,6 +7,15 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/picture_imageView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/fact_textView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:contentDescription="@string/cat" />
+
     <TextView
         android:id="@+id/fact_textView"
         android:textColor="@color/black"
@@ -23,6 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         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" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 80490cba..a420af0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,4 +2,5 @@
     <string name="app_name">Cat Facts </string>
     <string name="more_facts">More Facts</string>
     <string name="could_not_get_response_from_server">Не удалось получить ответ от сервера</string>
+    <string name="cat">Cat</string>
 </resources>
\ No newline at end of file

From ef51937f584f8ddee14ed189d9072ebe9096bcb1 Mon Sep 17 00:00:00 2001
From: "adil.ziganshin" <adilziga@gmail.com>
Date: Fri, 24 Jan 2025 17:46:47 +0300
Subject: [PATCH 3/3] homework part 3

---
 app/build.gradle                              |  2 ++
 .../otus/homework/coroutines/CatPicture.kt    |  6 ----
 .../otus/homework/coroutines/CatsPresenter.kt | 29 +++++++++--------
 .../java/otus/homework/coroutines/CatsView.kt | 30 ++++++++++--------
 .../otus/homework/coroutines/CatsViewModel.kt | 31 +++++++++++++++++++
 .../java/otus/homework/coroutines/Fact.kt     |  3 +-
 .../otus/homework/coroutines/MainActivity.kt  | 25 ++++++++++-----
 .../homework/coroutines/PresenterScope.kt     |  4 +--
 app/src/main/res/layout/activity_main.xml     | 11 +++++++
 9 files changed, 97 insertions(+), 44 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt

diff --git a/app/build.gradle b/app/build.gradle
index a414e0e8..54f141aa 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 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
+    implementation 'androidx.fragment:fragment-ktx:1.8.5'
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatPicture.kt b/app/src/main/java/otus/homework/coroutines/CatPicture.kt
index aede7b19..0f475754 100644
--- a/app/src/main/java/otus/homework/coroutines/CatPicture.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatPicture.kt
@@ -1,14 +1,8 @@
 package otus.homework.coroutines
 
-import com.google.gson.annotations.SerializedName
-
 data class CatPicture(
-    @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/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e283965e..3289a804 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -5,27 +5,30 @@ import android.util.Log
 import android.widget.Toast
 import java.net.SocketTimeoutException
 
-class CatsPresenter(
-    private val catsService: CatsService,
-    private val picsService: PicsService
-) {
+class CatsPresenter {
 
     private var _catsView: ICatsView? = null
 
-    suspend fun onInitComplete(context: Context) {
-        try {
-            val cat = Cat(catsService.getCatFact(), picsService.getCatPicture()[0])
-            Log.d("onInitComplete", "cat = '$cat'")
-            _catsView?.populate(cat)
-        } catch (exception: SocketTimeoutException) {
+    fun showCatFactAndPicture(cat: Cat) {
+        _catsView?.populate(cat)
+    }
+
+    fun showOrLogError(exception: Throwable, context: Context) {
+        if (exception is SocketTimeoutException) {
             Toast.makeText(context, context.getString(R.string.could_not_get_response_from_server),
                 Toast.LENGTH_SHORT).show()
-        } catch (exception: Exception) {
-            Log.d("onInitComplete", "Exception = ${exception}")
-            CrashMonitor.trackWarning()
         }
     }
 
+    fun showLoading() {
+        _catsView?.showLoading()
+    }
+
+    fun setOnClickListener(onClick: () -> Unit) {
+        Log.d("CatsPresenter.setOnClickListener", "onClick = '$onClick'")
+        _catsView?.setButtonOnClickListener(onClick)
+    }
+
     fun attachView(catsView: ICatsView) {
         _catsView = catsView
     }
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index 781e6275..c5f9db78 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -5,10 +5,10 @@ import android.util.AttributeSet
 import android.util.Log
 import android.widget.Button
 import android.widget.ImageView
+import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.squareup.picasso.Picasso
-import kotlinx.coroutines.launch
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -17,32 +17,36 @@ class CatsView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
     var presenter: CatsPresenter? = null
-    private val scope = PresenterScope()
+    var onButtonClick: (() -> Unit)? = null
 
     override fun onFinishInflate() {
         super.onFinishInflate()
         findViewById<Button>(R.id.button).setOnClickListener {
-            scope.launch {
-                Log.d("onFinishInflate", "Presenter = '$presenter'")
-                presenter?.onInitComplete(context)
-            }
+            Log.d("onFinishInflate", "onClick = $onButtonClick")
+            onButtonClick?.invoke()
         }
     }
 
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        scope.cancelJobs()
-    }
-
     override fun populate(cat: Cat) {
-        Log.d("populate", "Got cat = '$cat'")
-        findViewById<TextView>(R.id.fact_textView).text = cat.fact.fact
+        findViewById<ProgressBar>(R.id.progress_bar).visibility = GONE
+        findViewById<TextView>(R.id.fact_textView).text = cat.fact.text
         val imageView: ImageView = findViewById(R.id.picture_imageView)
         Picasso.get().load(cat.picture.url).into(imageView)
     }
+
+    override fun showLoading() {
+        findViewById<ProgressBar>(R.id.progress_bar).visibility = VISIBLE
+    }
+
+    override fun setButtonOnClickListener(onClick: () -> Unit) {
+        Log.d("CatsView.setButtonOnClickListener", "onClick = '$onClick'")
+        onButtonClick = onClick
+    }
 }
 
 interface ICatsView {
 
     fun populate(cat: Cat)
+    fun showLoading()
+    fun setButtonOnClickListener(onClick: () -> Unit)
 }
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..dbe556a7
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -0,0 +1,31 @@
+package otus.homework.coroutines
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+sealed class Result {
+    data class Success(val cat: Cat): Result()
+    data class Error(val exception: Throwable): Result()
+    object Loading: Result()
+}
+
+class CatsViewModel: ViewModel() {
+    private var _uiState: MutableStateFlow<Result> = MutableStateFlow(Result.Loading)
+    val uiState: StateFlow<Result> = _uiState
+    fun getCat() {
+        val handler = CoroutineExceptionHandler { _, exception ->
+            _uiState.value = Result.Error(exception)
+            CrashMonitor.trackWarning()
+        }
+        viewModelScope.launch(handler) {
+            _uiState.value = Result.Loading
+            val di = DiContainer()
+            val cat = Cat(di.factsService.getCatFact(), di.picsService.getCatPicture()[0])
+            _uiState.value = Result.Success(cat)
+        }
+    }
+}
diff --git a/app/src/main/java/otus/homework/coroutines/Fact.kt b/app/src/main/java/otus/homework/coroutines/Fact.kt
index 86f62691..f65f97ce 100644
--- a/app/src/main/java/otus/homework/coroutines/Fact.kt
+++ b/app/src/main/java/otus/homework/coroutines/Fact.kt
@@ -4,7 +4,6 @@ import com.google.gson.annotations.SerializedName
 
 data class Fact(
 	@field:SerializedName("fact")
-	val fact: String,
-	@field:SerializedName("length")
+	val text: String,
 	val length: Int
 )
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index b47ded7f..157de58c 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -2,31 +2,40 @@ package otus.homework.coroutines
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
+import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var catsPresenter: CatsPresenter
-    private val diContainer = DiContainer()
-    private val scope = PresenterScope()
+    private val viewModel: CatsViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
+        catsPresenter = CatsPresenter()
         setContentView(view)
-        with (diContainer) {
-            catsPresenter = CatsPresenter(factsService, picsService)
+        viewModel.getCat()
+        lifecycleScope.launch {
+            viewModel.uiState.collect {
+                when (it) {
+                    is Result.Success -> catsPresenter.showCatFactAndPicture(it.cat)
+                    is Result.Error -> catsPresenter.showOrLogError(it.exception, this@MainActivity)
+                    is Result.Loading -> catsPresenter.showLoading()
+                }
+            }
         }
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
-        scope.launch {
-            catsPresenter.onInitComplete(this@MainActivity)
+        catsPresenter.setOnClickListener {
+            Log.d("MainActivity.setOnClickListener", "onClick set")
+            viewModel.getCat()
         }
     }
 
     override fun onStop() {
-        scope.cancelJobs()
         if (isFinishing) {
             catsPresenter.detachView()
         }
diff --git a/app/src/main/java/otus/homework/coroutines/PresenterScope.kt b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
index ad1614ac..86f7b24f 100644
--- a/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
+++ b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
@@ -3,11 +3,11 @@ package otus.homework.coroutines
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 
 class PresenterScope : CoroutineScope {
-    private val job = Job()
+    private val job = SupervisorJob()
     override val coroutineContext = job + Dispatchers.Main + CoroutineName("CatsCoroutine")
 
     fun cancelJobs() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 83708c76..4985dd6b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,10 +7,21 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/picture_imageView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone" />
+
     <ImageView
         android:id="@+id/picture_imageView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/fact_textView"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"