From c81f70d538766286d335477701492481fc0fb4f9 Mon Sep 17 00:00:00 2001
From: Denis Sh <dshebut@rambler.ru>
Date: Mon, 10 Mar 2025 15:23:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=97=20=E2=84=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  1 +
 app/src/main/AndroidManifest.xml              |  2 +-
 .../otus/homework/coroutines/CatsPresenter.kt | 35 ----------
 .../otus/homework/coroutines/CatsService.kt   | 10 ---
 .../java/otus/homework/coroutines/CatsView.kt | 32 ---------
 .../otus/homework/coroutines/DiContainer.kt   | 16 -----
 .../otus/homework/coroutines/MainActivity.kt  | 30 --------
 .../data/network/CatsImageService.kt          |  9 +++
 .../coroutines/data/network/CatsService.kt    | 10 +++
 .../homework/coroutines/di/DiContainer.kt     | 28 ++++++++
 .../coroutines/model/CatImageModel.kt         | 14 ++++
 .../homework/coroutines/{ => model}/Fact.kt   |  6 +-
 .../coroutines/presentation/CatsFactState.kt  | 15 ++++
 .../coroutines/presentation/CatsPresenter.kt  | 68 +++++++++++++++++++
 .../coroutines/presentation/CatsView.kt       | 64 +++++++++++++++++
 .../coroutines/presentation/CatsViewModel.kt  | 61 +++++++++++++++++
 .../coroutines/presentation/MainActivity.kt   | 60 ++++++++++++++++
 .../coroutines/{ => utils}/CrashMonitor.kt    |  2 +-
 .../otus/homework/coroutines/utils/Result.kt  |  8 +++
 app/src/main/res/layout/activity_main.xml     | 32 +++++++--
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 22 files changed, 370 insertions(+), 135 deletions(-)
 delete mode 100644 app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
 delete mode 100644 app/src/main/java/otus/homework/coroutines/CatsService.kt
 delete mode 100644 app/src/main/java/otus/homework/coroutines/CatsView.kt
 delete mode 100644 app/src/main/java/otus/homework/coroutines/DiContainer.kt
 delete mode 100644 app/src/main/java/otus/homework/coroutines/MainActivity.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/data/network/CatsImageService.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/data/network/CatsService.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/di/DiContainer.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/model/CatImageModel.kt
 rename app/src/main/java/otus/homework/coroutines/{ => model}/Fact.kt (63%)
 create mode 100644 app/src/main/java/otus/homework/coroutines/presentation/CatsFactState.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/presentation/CatsPresenter.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/presentation/CatsViewModel.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt
 rename app/src/main/java/otus/homework/coroutines/{ => utils}/CrashMonitor.kt (75%)
 create mode 100644 app/src/main/java/otus/homework/coroutines/utils/Result.kt

diff --git a/app/build.gradle b/app/build.gradle
index a414e0e8..a48927d1 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.8.7")
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe34985b..fa531f7d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Coroutines">
-        <activity android:name=".MainActivity"
+        <activity android:name=".presentation.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
deleted file mode 100644
index e4b05120..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package otus.homework.coroutines
-
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class CatsPresenter(
-    private val catsService: CatsService
-) {
-
-    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()
-            }
-        })
-    }
-
-    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/CatsService.kt b/app/src/main/java/otus/homework/coroutines/CatsService.kt
deleted file mode 100644
index 479b2cfb..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-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
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
deleted file mode 100644
index be04b2a8..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package otus.homework.coroutines
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.Button
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-
-class CatsView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
-
-    var presenter :CatsPresenter? = null
-
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-        findViewById<Button>(R.id.button).setOnClickListener {
-            presenter?.onInitComplete()
-        }
-    }
-
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.fact
-    }
-}
-
-interface ICatsView {
-
-    fun populate(fact: Fact)
-}
\ 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
deleted file mode 100644
index 23ddc3b2..00000000
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package otus.homework.coroutines
-
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class DiContainer {
-
-    private val retrofit by lazy {
-        Retrofit.Builder()
-            .baseUrl("https://catfact.ninja/")
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-    }
-
-    val service by lazy { retrofit.create(CatsService::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
deleted file mode 100644
index a9dafb3b..00000000
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package otus.homework.coroutines
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
-
-    lateinit var catsPresenter: CatsPresenter
-
-    private val diContainer = DiContainer()
-
-    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()
-    }
-
-    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/data/network/CatsImageService.kt b/app/src/main/java/otus/homework/coroutines/data/network/CatsImageService.kt
new file mode 100644
index 00000000..3a5c1183
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/network/CatsImageService.kt
@@ -0,0 +1,9 @@
+package otus.homework.coroutines.data.network
+
+import otus.homework.coroutines.model.CatImageModel
+import retrofit2.http.GET
+
+interface CatsImageService {
+    @GET("images/search")
+    suspend fun getCatImage(): List<CatImageModel>
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/data/network/CatsService.kt b/app/src/main/java/otus/homework/coroutines/data/network/CatsService.kt
new file mode 100644
index 00000000..16d3a568
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/network/CatsService.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines.data.network
+
+import otus.homework.coroutines.model.Fact
+import retrofit2.http.GET
+
+interface CatsService {
+
+    @GET("fact")
+    suspend fun getCatFact() : Fact
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/di/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/di/DiContainer.kt
new file mode 100644
index 00000000..3c408d61
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/di/DiContainer.kt
@@ -0,0 +1,28 @@
+package otus.homework.coroutines.di
+
+import otus.homework.coroutines.data.network.CatsImageService
+import otus.homework.coroutines.data.network.CatsService
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class DiContainer {
+
+    private val retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://catfact.ninja/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+    private val imageServiceRetrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://api.thecatapi.com/v1/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+    val service: CatsService by lazy { retrofit.create(CatsService::class.java) }
+    val catsImageService: CatsImageService by lazy {
+        imageServiceRetrofit.create(CatsImageService::class.java)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/model/CatImageModel.kt b/app/src/main/java/otus/homework/coroutines/model/CatImageModel.kt
new file mode 100644
index 00000000..6c658cae
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/model/CatImageModel.kt
@@ -0,0 +1,14 @@
+package otus.homework.coroutines.model
+
+import com.google.gson.annotations.SerializedName
+
+data class CatImageModel(
+    @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/Fact.kt b/app/src/main/java/otus/homework/coroutines/model/Fact.kt
similarity index 63%
rename from app/src/main/java/otus/homework/coroutines/Fact.kt
rename to app/src/main/java/otus/homework/coroutines/model/Fact.kt
index 643a5a33..5020f826 100644
--- a/app/src/main/java/otus/homework/coroutines/Fact.kt
+++ b/app/src/main/java/otus/homework/coroutines/model/Fact.kt
@@ -1,10 +1,10 @@
-package otus.homework.coroutines
+package otus.homework.coroutines.model
 
 import com.google.gson.annotations.SerializedName
 
 data class Fact(
 	@field:SerializedName("fact")
-	val fact: String,
+	val fact: String?,
 	@field:SerializedName("length")
-	val length: Int
+	val length: Int?,
 )
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/CatsFactState.kt b/app/src/main/java/otus/homework/coroutines/presentation/CatsFactState.kt
new file mode 100644
index 00000000..a601bfb0
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/CatsFactState.kt
@@ -0,0 +1,15 @@
+package otus.homework.coroutines.presentation
+
+data class CatsFactState(
+    val fact: String,
+    val factLength: Int,
+    val imageUrl: String,
+) {
+    companion object {
+        val INIT = CatsFactState(
+            fact = "",
+            factLength = 0,
+            imageUrl = "",
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/presentation/CatsPresenter.kt
new file mode 100644
index 00000000..0dae99bb
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/CatsPresenter.kt
@@ -0,0 +1,68 @@
+package otus.homework.coroutines.presentation
+
+import android.content.Context
+import android.widget.Toast
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import otus.homework.coroutines.data.network.CatsImageService
+import otus.homework.coroutines.data.network.CatsService
+import otus.homework.coroutines.R
+import otus.homework.coroutines.utils.CrashMonitor
+import java.net.SocketTimeoutException
+
+class CatsPresenter(
+    private val catsImageService: CatsImageService,
+    private val catsService: CatsService,
+    private val applicationContext: Context,
+) {
+
+    private val presenterScope = CoroutineScope(Dispatchers.Main + CoroutineName("CatsCoroutine"))
+    private var fetchJob: Job? = null
+
+    private var _catsView: ICatsView? = null
+
+    fun onInitComplete() {
+        fetchJob = presenterScope.launch {
+            try {
+                val fact = catsService.getCatFact()
+                val image = catsImageService.getCatImage()
+//                _catsView?.render(
+//                    CatsFactState(
+//                        fact = fact.fact.orEmpty(),
+//                        factLength = fact.length ?: 0,
+//                        imageUrl = image[0].url.orEmpty(),
+//                        isLoading = false
+//                    )
+//                )
+            } catch (e: SocketTimeoutException) {
+                Toast.makeText(
+                    applicationContext,
+                    applicationContext.getString(R.string.connection_timeout_error),
+                    Toast.LENGTH_LONG
+                ).show()
+            } catch (e: Exception) {
+                CrashMonitor.trackWarning()
+                Toast.makeText(
+                    applicationContext,
+                    e.message,
+                    Toast.LENGTH_LONG
+                ).show()
+            }
+        }
+    }
+
+    fun attachView(catsView: ICatsView) {
+        _catsView = catsView
+    }
+
+    fun detachView() {
+        _catsView = null
+    }
+
+    fun onStop() {
+        fetchJob?.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt b/app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt
new file mode 100644
index 00000000..c3f08133
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt
@@ -0,0 +1,64 @@
+package otus.homework.coroutines.presentation
+
+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
+import otus.homework.coroutines.R
+import otus.homework.coroutines.utils.Result
+
+class CatsView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
+
+    //var presenter: CatsPresenter? = null
+    private var onRefresh: (() -> Unit)? = null
+
+    fun setRefreshListener(l: () -> Unit) {
+        onRefresh = l
+    }
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        findViewById<Button>(R.id.button).setOnClickListener {
+            onRefresh?.invoke()
+        }
+    }
+
+    override fun render(state: Result) {
+        when (state) {
+            is Result.Loading -> {
+                findViewById<Button>(R.id.button).isEnabled = false
+            }
+
+            is Result.Error -> {
+                val errorMessage = findViewById<TextView>(R.id.error_textView)
+                errorMessage.visibility = VISIBLE
+                errorMessage.text = state.message
+                findViewById<Button>(R.id.button).isEnabled = true
+            }
+
+            is Result.Success<*> -> {
+                val data = (state.data as? CatsFactState)
+                findViewById<TextView>(R.id.fact_textView).text = data?.fact
+                if (data?.imageUrl?.isNotEmpty() == true) {
+                    Picasso.get()
+                        .load(data.imageUrl)
+                        .into(findViewById<ImageView>(R.id.cat_imageView))
+                }
+                findViewById<Button>(R.id.button).isEnabled = true
+                findViewById<TextView>(R.id.error_textView).visibility = GONE
+            }
+        }
+    }
+}
+
+interface ICatsView {
+
+    fun render(state: Result)
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/presentation/CatsViewModel.kt
new file mode 100644
index 00000000..bad1dc4b
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/CatsViewModel.kt
@@ -0,0 +1,61 @@
+package otus.homework.coroutines.presentation
+
+import android.content.Context
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import otus.homework.coroutines.data.network.CatsImageService
+import otus.homework.coroutines.data.network.CatsService
+import otus.homework.coroutines.utils.CrashMonitor
+import otus.homework.coroutines.utils.Result
+
+class CatsViewModel : ViewModel() {
+    private lateinit var catsImageService: CatsImageService
+    private lateinit var catsService: CatsService
+    private lateinit var applicationContext: Context
+
+    private val _state = MutableStateFlow<Result>(Result.Success(CatsFactState.INIT))
+    val state: StateFlow<Result> = _state
+
+    private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        CrashMonitor.trackWarning()
+        _state.update { Result.Error(throwable.message.orEmpty()) }
+    }
+
+    fun fetchCats() {
+        viewModelScope.launch(Dispatchers.IO + exceptionHandler) {
+            _state.update { Result.Loading }
+            val fact = catsService.getCatFact()
+            val images = catsImageService.getCatImage()
+
+            _state.update {
+                Result.Success(
+                    data = CatsFactState(
+                        fact = fact.fact.orEmpty(),
+                        factLength = fact.length ?: 0,
+                        imageUrl = images.getOrNull(0)?.url.orEmpty(),
+                    )
+                )
+            }
+        }
+    }
+
+    fun onCreate(
+        catsImageService: CatsImageService,
+        catsService: CatsService,
+        applicationContext: Context,
+    ) {
+        this.catsService = catsService
+        this.catsImageService = catsImageService
+        this.applicationContext = applicationContext
+    }
+
+    fun onRefresh() {
+        fetchCats()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt
new file mode 100644
index 00000000..93dcf7bd
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt
@@ -0,0 +1,60 @@
+package otus.homework.coroutines.presentation
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModelProvider
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import otus.homework.coroutines.R
+import otus.homework.coroutines.di.DiContainer
+
+class MainActivity : AppCompatActivity() {
+
+    //private lateinit var catsPresenter: CatsPresenter
+
+    private val scope = MainScope()
+    private val catsViewModel by lazy {
+        ViewModelProvider(this)[CatsViewModel::class.java]
+    }
+
+    private val diContainer = DiContainer()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
+        view.setRefreshListener {
+            catsViewModel.onRefresh()
+        }
+        setContentView(view)
+        catsViewModel.onCreate(
+            catsService = diContainer.service,
+            catsImageService = diContainer.catsImageService,
+            applicationContext = applicationContext
+        )
+        catsViewModel.fetchCats()
+
+        scope.launch {
+            catsViewModel.state.collectLatest { newState ->
+                view.render(newState)
+            }
+        }
+
+//        catsPresenter = CatsPresenter(
+//            catsImageService = diContainer.catsImageService,
+//            catsService = diContainer.service,
+//            applicationContext = applicationContext,
+//        )
+        //view.presenter = catsPresenter
+        //catsPresenter.attachView(view)
+        //catsPresenter.onInitComplete()
+    }
+
+//    override fun onStop() {
+//        if (isFinishing) {
+//            catsPresenter.detachView()
+//            catsPresenter.onStop()
+//        }
+//        super.onStop()
+//    }
+}
\ 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/utils/CrashMonitor.kt
similarity index 75%
rename from app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
rename to app/src/main/java/otus/homework/coroutines/utils/CrashMonitor.kt
index 32e6b018..a8c9ed2e 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/utils/CrashMonitor.kt
@@ -1,4 +1,4 @@
-package otus.homework.coroutines
+package otus.homework.coroutines.utils
 
 object CrashMonitor {
 
diff --git a/app/src/main/java/otus/homework/coroutines/utils/Result.kt b/app/src/main/java/otus/homework/coroutines/utils/Result.kt
new file mode 100644
index 00000000..d7bb70ea
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/utils/Result.kt
@@ -0,0 +1,8 @@
+package otus.homework.coroutines.utils
+
+
+sealed class Result {
+    data class Success<T>(val data: T): Result()
+    data class Error(val message: String): Result()
+    object Loading: Result()
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..e589b052 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<otus.homework.coroutines.CatsView xmlns:android="http://schemas.android.com/apk/res/android"
+<otus.homework.coroutines.presentation.CatsView 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:layout_width="match_parent"
     android:padding="16dp"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".presentation.MainActivity">
+
+    <ImageView
+        android:id="@+id/cat_imageView"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:layout_editor_absoluteY="16dp" />
 
     <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"
+        android:textColor="@color/black"
+        android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/cat_imageView" />
 
     <Button
         android:id="@+id/button"
@@ -27,4 +34,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
 
-</otus.homework.coroutines.CatsView>
\ No newline at end of file
+    <TextView
+        android:id="@+id/error_textView"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:textColor="@color/red"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button" />
+
+
+</otus.homework.coroutines.presentation.CatsView>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127d..28fc0b5c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,5 +6,6 @@
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
+    <color name="red">#F44336</color>
     <color name="white">#FFFFFFFF</color>
 </resources>
\ 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..9585a9a0 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="connection_timeout_error">Не удалось получить ответ от сервера</string>
 </resources>
\ No newline at end of file