From 564483548b16290fa037e78868d9137dbe5967ca Mon Sep 17 00:00:00 2001
From: Sergey Olshanov <sergrey.olshanov@umbrellait.com>
Date: Mon, 9 Oct 2023 00:55:55 +0500
Subject: [PATCH 1/2] home work has been done

---
 app/build.gradle                              | 18 +++--
 .../java/otus/homework/coroutines/CatImage.kt |  8 +++
 .../otus/homework/coroutines/CatViewModel.kt  | 67 +++++++++++++++++++
 .../otus/homework/coroutines/CatsMapper.kt    |  9 +++
 .../otus/homework/coroutines/CatsPresenter.kt | 43 +++++++++---
 .../otus/homework/coroutines/CatsService.kt   |  4 +-
 .../java/otus/homework/coroutines/CatsView.kt | 17 +++--
 .../otus/homework/coroutines/CrashMonitor.kt  |  6 +-
 .../otus/homework/coroutines/DiContainer.kt   |  8 +++
 .../java/otus/homework/coroutines/Fact.kt     | 41 +++++++-----
 .../homework/coroutines/FactAndImageModel.kt  |  6 ++
 .../homework/coroutines/ImageCatsService.kt   | 10 +++
 .../otus/homework/coroutines/MainActivity.kt  | 38 ++++++++---
 .../otus/homework/coroutines/MainFactory.kt   | 17 +++++
 .../java/otus/homework/coroutines/Result.kt   |  5 ++
 build.gradle                                  |  2 +-
 16 files changed, 244 insertions(+), 55 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatImage.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatViewModel.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsMapper.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/FactAndImageModel.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/ImageCatsService.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/MainFactory.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/Result.kt

diff --git a/app/build.gradle b/app/build.gradle
index 679dbba4..53895a1a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "otus.homework.coroutines"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -34,12 +34,16 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
+    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'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.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..b6cd1ef9
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatImage.kt
@@ -0,0 +1,8 @@
+package otus.homework.coroutines
+
+import com.google.gson.annotations.SerializedName
+
+data class CatImage(
+    @field:SerializedName("image")
+    val image: String,
+)
diff --git a/app/src/main/java/otus/homework/coroutines/CatViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatViewModel.kt
new file mode 100644
index 00000000..d61f49c5
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatViewModel.kt
@@ -0,0 +1,67 @@
+package otus.homework.coroutines
+
+import android.app.Application
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.*
+
+class CatViewModel(
+    private val catsService: CatsService,
+    private val imageCatsService: ImageCatsService,
+    private val application: Application,
+    private val catsMapper: CatsMapper
+): ViewModel() {
+
+    companion object {
+
+        private const val SOCKET_TIMEOUT_EXCEPTION = "Не удалось получить ответ от сервера"
+        private const val ERROR_MESSAGE = "Произошла ошибка"
+    }
+
+    private var _catsView: ICatsView? = null
+
+    private val errorHandler = CoroutineExceptionHandler { _, exception ->
+        CrashMonitor.trackWarning(application, exception.message ?: ERROR_MESSAGE)
+    }
+
+    fun onInitComplete() {
+        viewModelScope.launch(errorHandler) {
+            when(val responseResult = onInitCompleteResponse()) {
+                is Success -> {
+                    _catsView?.populate(responseResult.data)
+                }
+                is Error -> {
+                    CrashMonitor.trackWarning(application, responseResult.message)
+                }
+            }
+        }
+    }
+
+    private suspend fun onInitCompleteResponse(): Result<FactAndImageModel> {
+        return try {
+            val response = catsService.getCatFact()
+            val imageResponse = imageCatsService.getCatImage()
+            if ((response.isSuccessful && response.body() != null) && (imageResponse.isSuccessful && imageResponse.body() != null)) {
+                val factAndImage = catsMapper.toFactAndImage(
+                    fact = response.body()?.fact,
+                    image = imageResponse.body()?.image
+                )
+                Success(factAndImage)
+            } else {
+                Error(SOCKET_TIMEOUT_EXCEPTION)
+            }
+        } catch (e: java.net.SocketTimeoutException) {
+            Error(SOCKET_TIMEOUT_EXCEPTION)
+        } catch (e: Exception) {
+            Error(e.message ?: ERROR_MESSAGE)
+        }
+    }
+
+    fun attachView(catsView: ICatsView) {
+        _catsView = catsView
+    }
+
+    fun detachView() {
+        _catsView = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsMapper.kt b/app/src/main/java/otus/homework/coroutines/CatsMapper.kt
new file mode 100644
index 00000000..a83e6e6f
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsMapper.kt
@@ -0,0 +1,9 @@
+package otus.homework.coroutines
+
+class CatsMapper {
+
+    fun toFactAndImage(fact: String?, image: String?): FactAndImageModel = FactAndImageModel(
+        fact = fact.orEmpty(),
+        image = image.orEmpty()
+    )
+}
\ 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..16b7bf74 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,28 +1,48 @@
 package otus.homework.coroutines
 
+import android.content.Context
+import kotlinx.coroutines.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catsService: CatsService,
+    private val imageCatsService: ImageCatsService,
+    private val context: Context,
+    private val catMapper: CatsMapper
 ) {
 
+    companion object {
+
+        private const val CATS_COROUTINES = "CatsCoroutine"
+        private const val SOCKET_TIMEOUT_EXCEPTION = "Не удалось получить ответ от сервера"
+        private const val ERROR_MESSAGE = "Произошла ошибка"
+    }
+
     private var _catsView: ICatsView? = null
 
-    fun onInitComplete() {
-        catsService.getCatFact().enqueue(object : Callback<Fact> {
+    private val presenterScope = CoroutineScope(Dispatchers.Main + CoroutineName(CATS_COROUTINES))
 
-            override fun onResponse(call: Call<Fact>, response: Response<Fact>) {
-                if (response.isSuccessful && response.body() != null) {
-                    _catsView?.populate(response.body()!!)
+    fun onInitComplete() {
+        presenterScope.launch {
+            try {
+                val response = catsService.getCatFact()
+                val imageResponse = imageCatsService.getCatImage()
+                if ((response.isSuccessful && response.body() != null) && (imageResponse.isSuccessful &&
+                            imageResponse.body() != null)) {
+                    val factAndImage = catMapper.toFactAndImage(
+                        fact = response.body()?.fact,
+                        image = imageResponse.body()?.image
+                    )
+                    _catsView?.populate(factAndImage)
                 }
+            } catch (e: java.net.SocketTimeoutException) {
+                CrashMonitor.trackWarning(context, SOCKET_TIMEOUT_EXCEPTION)
+            } catch (e: Exception) {
+                CrashMonitor.trackWarning(context, e.message ?: ERROR_MESSAGE)
             }
-
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                CrashMonitor.trackWarning()
-            }
-        })
+        }
     }
 
     fun attachView(catsView: ICatsView) {
@@ -31,5 +51,6 @@ class CatsPresenter(
 
     fun detachView() {
         _catsView = null
+        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..be937729 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsService.kt
@@ -1,10 +1,10 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.GET
 
 interface CatsService {
 
     @GET("fact")
-    fun getCatFact() : Call<Fact>
+    suspend fun getCatFact() : Response<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 30ac2531..cc014247 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -2,9 +2,9 @@ package otus.homework.coroutines
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.Button
-import android.widget.TextView
+import android.widget.*
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.squareup.picasso.Picasso
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -12,21 +12,24 @@ class CatsView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
-    var presenter :CatsPresenter? = null
+    //    var presenter: CatsPresenter? = null
+    var viewModel: CatViewModel? = null
 
     override fun onFinishInflate() {
         super.onFinishInflate()
         findViewById<Button>(R.id.button).setOnClickListener {
-            presenter?.onInitComplete()
+            //            presenter?.onInitComplete()
+            viewModel?.onInitComplete()
         }
     }
 
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.text
+    override fun populate(fact: FactAndImageModel) {
+        findViewById<TextView>(R.id.fact_textView).text = fact.fact
+        Picasso.get().load(fact.image).into(findViewById<ImageView>(R.id.image))
     }
 }
 
 interface ICatsView {
 
-    fun populate(fact: Fact)
+    fun populate(fact: FactAndImageModel)
 }
\ 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..1e8b4602 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -1,10 +1,14 @@
 package otus.homework.coroutines
 
+import android.content.Context
+import android.widget.Toast
+
 object CrashMonitor {
 
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning() {
+    fun trackWarning(context: Context, message: String) {
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show()
     }
 }
\ 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..908190e4 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -12,5 +12,13 @@ class DiContainer {
             .build()
     }
 
+    private val retrofitImage by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://aws.random.cat/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
     val service by lazy { retrofit.create(CatsService::class.java) }
+    val serviceImage by lazy { retrofitImage.create(ImageCatsService::class.java) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/Fact.kt b/app/src/main/java/otus/homework/coroutines/Fact.kt
index 15c6c7ae..b8caa6d2 100644
--- a/app/src/main/java/otus/homework/coroutines/Fact.kt
+++ b/app/src/main/java/otus/homework/coroutines/Fact.kt
@@ -2,23 +2,28 @@ package otus.homework.coroutines
 
 import com.google.gson.annotations.SerializedName
 
+//data class Fact(
+//	@field:SerializedName("createdAt")
+//	val createdAt: String,
+//	@field:SerializedName("deleted")
+//	val deleted: Boolean,
+//	@field:SerializedName("_id")
+//	val id: String,
+//	@field:SerializedName("text")
+//	val text: String,
+//	@field:SerializedName("source")
+//	val source: String,
+//	@field:SerializedName("used")
+//	val used: Boolean,
+//	@field:SerializedName("type")
+//	val type: String,
+//	@field:SerializedName("user")
+//	val user: String,
+//	@field:SerializedName("updatedAt")
+//	val updatedAt: String
+//)
+
 data class Fact(
-	@field:SerializedName("createdAt")
-	val createdAt: String,
-	@field:SerializedName("deleted")
-	val deleted: Boolean,
-	@field:SerializedName("_id")
-	val id: String,
-	@field:SerializedName("text")
-	val text: String,
-	@field:SerializedName("source")
-	val source: String,
-	@field:SerializedName("used")
-	val used: Boolean,
-	@field:SerializedName("type")
-	val type: String,
-	@field:SerializedName("user")
-	val user: String,
-	@field:SerializedName("updatedAt")
-	val updatedAt: String
+	@field:SerializedName("fact")
+	val fact: String,
 )
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/FactAndImageModel.kt b/app/src/main/java/otus/homework/coroutines/FactAndImageModel.kt
new file mode 100644
index 00000000..996cbf53
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/FactAndImageModel.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+data class FactAndImageModel(
+    val fact: String,
+    val image: String
+)
diff --git a/app/src/main/java/otus/homework/coroutines/ImageCatsService.kt b/app/src/main/java/otus/homework/coroutines/ImageCatsService.kt
new file mode 100644
index 00000000..bcefb9a2
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/ImageCatsService.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines
+
+import retrofit2.Response
+import retrofit2.http.GET
+
+interface ImageCatsService {
+
+    @GET("meow")
+    suspend fun getCatImage(): Response<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..e49acdfd 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -2,28 +2,50 @@ package otus.homework.coroutines
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.lifecycle.ViewModelProvider
+import kotlinx.coroutines.*
 
 class MainActivity : AppCompatActivity() {
 
-    lateinit var catsPresenter: CatsPresenter
+    //    lateinit var catsPresenter: CatsPresenter
+    private lateinit var catViewModel: CatViewModel
 
     private val diContainer = DiContainer()
+    private val catsMapper = CatsMapper()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         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(
+        //            catsService = diContainer.service,
+        //            imageCatsService = diContainer.serviceImage,
+        //            context = applicationContext,
+        //            catMapper = catsMapper
+        //        )
+        //        view.presenter = catsPresenter
+        //        catsPresenter.attachView(view)
+        //        catsPresenter.onInitComplete()
+        catViewModel = ViewModelProvider(
+            this, MainFactory(
+                application = application,
+                imageCatsService = diContainer.serviceImage,
+                catsService = diContainer.service,
+                catMapper = catsMapper
+            )
+        )[CatViewModel::class.java]
+        view.viewModel = catViewModel
+        catViewModel.attachView(view)
+        catViewModel.onInitComplete()
     }
 
     override fun onStop() {
-        if (isFinishing) {
-            catsPresenter.detachView()
+        CoroutineScope(Dispatchers.Main).launch {
+            if (isFinishing) {
+                //                catsPresenter.detachView()
+                catViewModel.detachView()
+            }
         }
         super.onStop()
     }
diff --git a/app/src/main/java/otus/homework/coroutines/MainFactory.kt b/app/src/main/java/otus/homework/coroutines/MainFactory.kt
new file mode 100644
index 00000000..ce7a7857
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/MainFactory.kt
@@ -0,0 +1,17 @@
+package otus.homework.coroutines
+
+import android.app.Application
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+
+class MainFactory(
+    val catsService: CatsService,
+    val imageCatsService: ImageCatsService,
+    val application: Application,
+    val catMapper: CatsMapper
+): ViewModelProvider.AndroidViewModelFactory(application) {
+
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return CatViewModel(catsService, imageCatsService, application, catMapper) as T
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/Result.kt b/app/src/main/java/otus/homework/coroutines/Result.kt
new file mode 100644
index 00000000..33a84b6b
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/Result.kt
@@ -0,0 +1,5 @@
+package otus.homework.coroutines
+
+sealed class Result<out T>
+class Success<T>(val data: T) : Result<T>()
+class Error(val message: String) : Result<Nothing>()
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8ca0a2e2..cc0d1423 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.6.20"
+    ext.kotlin_version = "1.8.22"
     repositories {
         mavenCentral()
         google()

From a442342c364e1c06799a31728f3a3b805f0f6d27 Mon Sep 17 00:00:00 2001
From: Sergey Olshanov <sergrey.olshanov@umbrellait.com>
Date: Wed, 8 Nov 2023 23:36:55 +0500
Subject: [PATCH 2/2] changes after review has been added

---
 .../main/java/otus/homework/coroutines/CatImage.kt  |  4 ++--
 .../java/otus/homework/coroutines/CatViewModel.kt   | 12 ++++++++----
 .../java/otus/homework/coroutines/CatsPresenter.kt  | 13 ++++++++-----
 .../main/java/otus/homework/coroutines/CatsView.kt  |  2 +-
 .../java/otus/homework/coroutines/DiContainer.kt    |  6 +++---
 .../otus/homework/coroutines/ImageCatsService.kt    |  5 ++---
 .../java/otus/homework/coroutines/MainActivity.kt   |  8 +++-----
 app/src/main/res/layout/activity_main.xml           | 11 +++++++++--
 8 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatImage.kt b/app/src/main/java/otus/homework/coroutines/CatImage.kt
index b6cd1ef9..cce9375b 100644
--- a/app/src/main/java/otus/homework/coroutines/CatImage.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatImage.kt
@@ -3,6 +3,6 @@ package otus.homework.coroutines
 import com.google.gson.annotations.SerializedName
 
 data class CatImage(
-    @field:SerializedName("image")
-    val image: String,
+    @field:SerializedName("url")
+    val url: String
 )
diff --git a/app/src/main/java/otus/homework/coroutines/CatViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatViewModel.kt
index d61f49c5..7c816c2d 100644
--- a/app/src/main/java/otus/homework/coroutines/CatViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatViewModel.kt
@@ -16,6 +16,7 @@ class CatViewModel(
 
         private const val SOCKET_TIMEOUT_EXCEPTION = "Не удалось получить ответ от сервера"
         private const val ERROR_MESSAGE = "Произошла ошибка"
+        private const val EMPTY_URL = ""
     }
 
     private var _catsView: ICatsView? = null
@@ -39,12 +40,15 @@ class CatViewModel(
 
     private suspend fun onInitCompleteResponse(): Result<FactAndImageModel> {
         return try {
-            val response = catsService.getCatFact()
-            val imageResponse = imageCatsService.getCatImage()
-            if ((response.isSuccessful && response.body() != null) && (imageResponse.isSuccessful && imageResponse.body() != null)) {
+            val factDeferred = viewModelScope.async { catsService.getCatFact() }
+            val imageDeferred = viewModelScope.async { imageCatsService.getCatImage() }
+            val response = factDeferred.await()
+            val imageResponse = imageDeferred.await()
+
+            if ((response.isSuccessful && response.body() != null) && imageResponse.first().url != EMPTY_URL) {
                 val factAndImage = catsMapper.toFactAndImage(
                     fact = response.body()?.fact,
-                    image = imageResponse.body()?.image
+                    image = imageResponse.first().url
                 )
                 Success(factAndImage)
             } else {
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 16b7bf74..997d5b16 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -18,6 +18,7 @@ class CatsPresenter(
         private const val CATS_COROUTINES = "CatsCoroutine"
         private const val SOCKET_TIMEOUT_EXCEPTION = "Не удалось получить ответ от сервера"
         private const val ERROR_MESSAGE = "Произошла ошибка"
+        private const val EMPTY_URL = ""
     }
 
     private var _catsView: ICatsView? = null
@@ -27,13 +28,15 @@ class CatsPresenter(
     fun onInitComplete() {
         presenterScope.launch {
             try {
-                val response = catsService.getCatFact()
-                val imageResponse = imageCatsService.getCatImage()
-                if ((response.isSuccessful && response.body() != null) && (imageResponse.isSuccessful &&
-                            imageResponse.body() != null)) {
+                val factDeferred = presenterScope.async { catsService.getCatFact() }
+                val imageDeferred = presenterScope.async { imageCatsService.getCatImage() }
+                val response = factDeferred.await()
+                val imageResponse = imageDeferred.await()
+
+                if ((response.isSuccessful && response.body() != null) && imageResponse.first().url != EMPTY_URL) {
                     val factAndImage = catMapper.toFactAndImage(
                         fact = response.body()?.fact,
-                        image = imageResponse.body()?.image
+                        image = imageResponse.first().url
                     )
                     _catsView?.populate(factAndImage)
                 }
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index cc014247..a8aed984 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -25,7 +25,7 @@ class CatsView @JvmOverloads constructor(
 
     override fun populate(fact: FactAndImageModel) {
         findViewById<TextView>(R.id.fact_textView).text = fact.fact
-        Picasso.get().load(fact.image).into(findViewById<ImageView>(R.id.image))
+        Picasso.get().load(fact.image).into(findViewById<ImageView>(R.id.imageFact))
     }
 }
 
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
index 908190e4..7ae8db31 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -14,11 +14,11 @@ class DiContainer {
 
     private val retrofitImage by lazy {
         Retrofit.Builder()
-            .baseUrl("https://aws.random.cat/")
+            .baseUrl("https://api.thecatapi.com/")
             .addConverterFactory(GsonConverterFactory.create())
             .build()
     }
 
-    val service by lazy { retrofit.create(CatsService::class.java) }
-    val serviceImage by lazy { retrofitImage.create(ImageCatsService::class.java) }
+    val service: CatsService by lazy { retrofit.create(CatsService::class.java) }
+    val serviceImage: ImageCatsService by lazy { retrofitImage.create(ImageCatsService::class.java) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/ImageCatsService.kt b/app/src/main/java/otus/homework/coroutines/ImageCatsService.kt
index bcefb9a2..d0bd8d60 100644
--- a/app/src/main/java/otus/homework/coroutines/ImageCatsService.kt
+++ b/app/src/main/java/otus/homework/coroutines/ImageCatsService.kt
@@ -1,10 +1,9 @@
 package otus.homework.coroutines
 
-import retrofit2.Response
 import retrofit2.http.GET
 
 interface ImageCatsService {
 
-    @GET("meow")
-    suspend fun getCatImage(): Response<CatImage>
+    @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 e49acdfd..c2df5764 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -41,11 +41,9 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onStop() {
-        CoroutineScope(Dispatchers.Main).launch {
-            if (isFinishing) {
-                //                catsPresenter.detachView()
-                catViewModel.detachView()
-            }
+        if (isFinishing) {
+//          catsPresenter.detachView()
+            catViewModel.detachView()
         }
         super.onStop()
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..83ed9a07 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,16 +7,23 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/imageFact"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="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_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/imageFact" />
 
     <Button
         android:id="@+id/button"