From aeff7a7ae330131add5d5970cf7621f52a57c1a8 Mon Sep 17 00:00:00 2001
From: IskandarRafikov <isko.85@mail.ru>
Date: Fri, 21 Feb 2025 21:27:57 +0300
Subject: [PATCH] HW-1: Coroutines

---
 app/build.gradle                              |  3 +
 .../otus/homework/coroutines/CatsPresenter.kt | 35 ---------
 .../otus/homework/coroutines/CatsService.kt   | 10 ---
 .../java/otus/homework/coroutines/CatsView.kt | 32 --------
 .../otus/homework/coroutines/CrashMonitor.kt  |  3 +-
 .../otus/homework/coroutines/DiContainer.kt   | 16 ----
 .../java/otus/homework/coroutines/Fact.kt     | 10 ---
 .../otus/homework/coroutines/MainActivity.kt  | 60 +++++++++++----
 .../java/otus/homework/coroutines/Utils.kt    |  7 ++
 .../coroutines/data/BaseRepositiory.kt        | 74 ++++++++++++++++++
 .../coroutines/data/CatFactResponse.kt        | 10 +++
 .../otus/homework/coroutines/data/CatsApi.kt  | 11 +++
 .../coroutines/data/CatsRepositoryImpl.kt     | 22 ++++++
 .../coroutines/data/NetworkService.kt         | 23 ++++++
 .../coroutines/domain/CatsInteractor.kt       | 13 ++++
 .../coroutines/domain/CatsRepository.kt       |  8 ++
 .../coroutines/presentation/CatsPresenter.kt  | 76 +++++++++++++++++++
 .../presentation/ViewModelFactory.kt          | 22 ++++++
 app/src/main/res/drawable/in_progress.xml     |  5 ++
 app/src/main/res/drawable/not_loaded.xml      |  5 ++
 app/src/main/res/layout/activity_main.xml     | 16 +++-
 app/src/main/res/values/strings.xml           |  2 +
 22 files changed, 343 insertions(+), 120 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/Fact.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/Utils.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/data/BaseRepositiory.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/data/CatFactResponse.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/data/CatsApi.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/data/CatsRepositoryImpl.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/data/NetworkService.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/domain/CatsInteractor.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/domain/CatsRepository.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/ViewModelFactory.kt
 create mode 100644 app/src/main/res/drawable/in_progress.xml
 create mode 100644 app/src/main/res/drawable/not_loaded.xml

diff --git a/app/build.gradle b/app/build.gradle
index a414e0e8..6041e4fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,4 +41,7 @@ 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.activity:activity-ktx:1.9.0"
+    implementation "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2"
 }
\ 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
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/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
index 32e6b018..49950154 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -5,6 +5,7 @@ object CrashMonitor {
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning() {
+    fun trackWarning(message: String) {
+        Utils.log { "[CrashMonitor]: $message" }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
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/Fact.kt b/app/src/main/java/otus/homework/coroutines/Fact.kt
deleted file mode 100644
index 643a5a33..00000000
--- a/app/src/main/java/otus/homework/coroutines/Fact.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package otus.homework.coroutines
-
-import com.google.gson.annotations.SerializedName
-
-data class Fact(
-	@field:SerializedName("fact")
-	val fact: String,
-	@field:SerializedName("length")
-	val length: Int
-)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index a9dafb3b..171f5f55 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -2,29 +2,63 @@ package otus.homework.coroutines
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import androidx.lifecycle.ViewModelProvider
+import kotlinx.coroutines.Job
+import otus.homework.coroutines.presentation.CatsPresenter
+import otus.homework.coroutines.presentation.ViewModelFactory
+import kotlin.coroutines.CoroutineContext
 
 class MainActivity : AppCompatActivity() {
 
-    lateinit var catsPresenter: CatsPresenter
+    private lateinit var viewModel: CatsPresenter
 
-    private val diContainer = DiContainer()
+    private val job = Job()
+    private val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val scope = CoroutineScope(coroutineContext)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
-        setContentView(view)
+        setContentView(R.layout.activity_main)
 
-        catsPresenter = CatsPresenter(diContainer.service)
-        view.presenter = catsPresenter
-        catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
-    }
+        viewModel = ViewModelProvider(this, ViewModelFactory())[CatsPresenter::class.java]
+
+        val imageView = findViewById<ImageView>(R.id.imageView)
+        val textView = findViewById<TextView>(R.id.fact_textView)
 
-    override fun onStop() {
-        if (isFinishing) {
-            catsPresenter.detachView()
+        viewModel.catFact.observe(this) { text ->
+            textView.text = text ?: getString(R.string.empty_dash)
+        }
+        viewModel.catImage.observe(this) { catImage ->
+            catImage?.into(imageView)
+        }
+        viewModel.errorHandle.observe(this) { message ->
+            message?.let { Toast.makeText(this, message, Toast.LENGTH_SHORT).show() }
         }
-        super.onStop()
+
+        findViewById<Button>(R.id.button).apply {
+            setOnClickListener {
+                scope.launch {
+                    viewModel.updateImage()
+                }
+                scope.launch {
+                    viewModel.updateFact()
+                }
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        job.cancel()
+        super.onDestroy()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/Utils.kt b/app/src/main/java/otus/homework/coroutines/Utils.kt
new file mode 100644
index 00000000..fbee6361
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/Utils.kt
@@ -0,0 +1,7 @@
+package otus.homework.coroutines
+
+object Utils {
+    inline fun log(block: () -> String) {
+        println("[Thread: ${Thread.currentThread().name}]: " + block())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/data/BaseRepositiory.kt b/app/src/main/java/otus/homework/coroutines/data/BaseRepositiory.kt
new file mode 100644
index 00000000..ea0b1eff
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/BaseRepositiory.kt
@@ -0,0 +1,74 @@
+package otus.homework.coroutines.data
+
+import com.google.gson.JsonSyntaxException
+import org.json.JSONObject
+import otus.homework.coroutines.CrashMonitor
+import otus.homework.coroutines.Utils
+import retrofit2.Response
+
+abstract class BaseRepository {
+
+    protected val network = NetworkService().createRetrofit
+
+    sealed class Result<out T : Any?> {
+        data class Success<out T : Any?>(val data: T) : Result<T>()
+        data class Error(val exception: Exception) : Result<Nothing>()
+    }
+
+    protected suspend fun <T : Any> handleApi(
+        block: suspend () -> Response<T>,
+    ): Result<T> {
+        try {
+            val response = block.invoke()
+            return when {
+                response.isSuccessful -> handleSuccess(response)
+                else -> handleError(response)
+            }
+        } catch (e: Exception) {
+            Utils.log { "[Repository]: handled error - ${e.message}" }
+            return Result.Error(e)
+        }
+    }
+
+    private fun <T : Any> handleSuccess(
+        response: Response<T>
+    ): Result<T> {
+        response.body()?.let {
+            Utils.log { "[Repository]: request is successful" }
+            return Result.Success(it)
+        }
+
+        CrashMonitor.trackWarning("[Repository]: request success - empty body")
+
+        return Result.Error(RuntimeException("Success with empty body"))
+    }
+
+    private fun <T : Any> handleError(
+        response: Response<T>
+    ): Result<T> {
+        response.errorBody()?.let { body ->
+            try {
+                val json = body.string()
+                val error = JSONObject(json)
+                val message =
+                    if (error.has("message"))
+                        error.getString("message")
+                    else
+                        "Error empty body"
+
+                CrashMonitor.trackWarning("[Repository]: request error - $message")
+
+                return Result.Error(
+                    RuntimeException(message)
+                )
+            } catch (ignored: JsonSyntaxException) {
+                Utils.log { "[Repository]: JsonSyntaxException" }
+                return Result.Error(RuntimeException("Internal json error"))
+            }
+        }
+
+        CrashMonitor.trackWarning("[Repository]: request failed - Unknown Error")
+
+        return Result.Error(RuntimeException("Unknown Error"))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/data/CatFactResponse.kt b/app/src/main/java/otus/homework/coroutines/data/CatFactResponse.kt
new file mode 100644
index 00000000..d203a3a8
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/CatFactResponse.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines.data
+
+import com.google.gson.annotations.SerializedName
+
+data class CatFactResponse(
+	@SerializedName("fact")
+	val fact: String,
+	@SerializedName("length")
+	val length: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/data/CatsApi.kt b/app/src/main/java/otus/homework/coroutines/data/CatsApi.kt
new file mode 100644
index 00000000..16afc2ab
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/CatsApi.kt
@@ -0,0 +1,11 @@
+package otus.homework.coroutines.data
+
+import kotlinx.coroutines.Deferred
+import retrofit2.Response
+import retrofit2.http.GET
+
+interface CatsApi {
+
+    @GET("fact")
+    fun getCatFact(): Deferred<Response<CatFactResponse>>
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/data/CatsRepositoryImpl.kt b/app/src/main/java/otus/homework/coroutines/data/CatsRepositoryImpl.kt
new file mode 100644
index 00000000..2ad0e245
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/CatsRepositoryImpl.kt
@@ -0,0 +1,22 @@
+package otus.homework.coroutines.data
+
+import com.squareup.picasso.Picasso
+import com.squareup.picasso.RequestCreator
+import otus.homework.coroutines.domain.CatsRepository
+
+class CatsRepositoryImpl : BaseRepository(), CatsRepository {
+
+    override suspend fun getCatFact(): String {
+        val result: Result<CatFactResponse> = handleApi {
+            network.getCatFact().await()
+        }
+        return when (result) {
+            is Result.Success -> result.data.fact
+            is Result.Error -> throw result.exception
+            }
+        }
+
+    override suspend fun getCatImage(): RequestCreator? {
+        return Picasso.get().load(NetworkService.SOURCE_CATS_IMAGES)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/data/NetworkService.kt b/app/src/main/java/otus/homework/coroutines/data/NetworkService.kt
new file mode 100644
index 00000000..44746e79
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/NetworkService.kt
@@ -0,0 +1,23 @@
+package otus.homework.coroutines.data
+
+import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class NetworkService {
+
+    companion object {
+//        const val SOURCE_CATS_IMAGES = "https://cataas.com/cat"
+        const val SOURCE_CATS_IMAGES = "https://aws.random.cat/meow"
+    }
+
+    private val retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://catfact.ninja/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .addCallAdapterFactory(CoroutineCallAdapterFactory())
+            .build()
+    }
+
+    val createRetrofit : CatsApi by lazy { retrofit.create(CatsApi::class.java) }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/domain/CatsInteractor.kt b/app/src/main/java/otus/homework/coroutines/domain/CatsInteractor.kt
new file mode 100644
index 00000000..41155eef
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/CatsInteractor.kt
@@ -0,0 +1,13 @@
+package otus.homework.coroutines.domain
+
+import com.squareup.picasso.RequestCreator
+
+class CatsInteractor(
+    private val catsRepository: CatsRepository
+) {
+    suspend fun getCatFact(): String =
+        catsRepository.getCatFact()
+
+    suspend fun getCatImage(): RequestCreator? =
+        catsRepository.getCatImage()
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/domain/CatsRepository.kt b/app/src/main/java/otus/homework/coroutines/domain/CatsRepository.kt
new file mode 100644
index 00000000..b9b6c4ee
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/CatsRepository.kt
@@ -0,0 +1,8 @@
+package otus.homework.coroutines.domain
+
+import com.squareup.picasso.RequestCreator
+
+interface CatsRepository {
+    suspend fun getCatFact(): String
+    suspend fun getCatImage(): RequestCreator?
+}
\ 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..99110f4c
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/CatsPresenter.kt
@@ -0,0 +1,76 @@
+package otus.homework.coroutines.presentation
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.squareup.picasso.RequestCreator
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import otus.homework.coroutines.Utils
+import otus.homework.coroutines.domain.CatsInteractor
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import kotlin.coroutines.CoroutineContext
+
+class CatsPresenter(
+    private val catsInteractor: CatsInteractor
+) : ViewModel() {
+    private val job = SupervisorJob()
+    private val context = job + Dispatchers.IO
+
+    private val exceptionHandler = CoroutineExceptionHandler { _, exception ->
+        val (error, message) = when (exception) {
+            is SocketTimeoutException,
+            is UnknownHostException ->
+                "Connection timed out" to "Не удалось получить ответ от сервера"
+            else ->
+                exception.message to exception.message
+        }
+
+        Utils.log { "[CatsPresenter handled error]: $error" }
+        _errorHandle.postValue(message)
+
+    }
+
+    private val coroutineContext: CoroutineContext
+        get() = context + exceptionHandler + CoroutineName("CatsCoroutine")
+
+    private val _catFact = MutableLiveData<String?>()
+    val catFact: LiveData<String?> = _catFact
+
+    private val _catImage = MutableLiveData<RequestCreator?>()
+    val catImage: LiveData<RequestCreator?> = _catImage
+
+    private val _errorHandle = MutableLiveData<String?>()
+    val errorHandle: LiveData<String?> = _errorHandle
+
+    override fun onCleared() {
+        super.onCleared()
+        job.cancel()
+    }
+
+    fun updateImage() {
+        viewModelScope.launch(coroutineContext) {
+            catsInteractor.getCatImage().let { image ->
+                if (isActive.not()) return@launch
+                Utils.log { "[CatsPresenter]: get cats image" }
+                _catImage.postValue(image)
+            }
+        }
+    }
+
+    fun updateFact() {
+        viewModelScope.launch(coroutineContext) {
+            catsInteractor.getCatFact().let { fact ->
+                if (isActive.not()) return@launch
+                Utils.log { "[CatsPresenter]: get cats fact" }
+                _catFact.postValue(fact)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/ViewModelFactory.kt b/app/src/main/java/otus/homework/coroutines/presentation/ViewModelFactory.kt
new file mode 100644
index 00000000..145dd15d
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/ViewModelFactory.kt
@@ -0,0 +1,22 @@
+package otus.homework.coroutines.presentation
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import otus.homework.coroutines.data.CatsRepositoryImpl
+import otus.homework.coroutines.domain.CatsInteractor
+
+class ViewModelFactory : ViewModelProvider.Factory {
+
+    private val catsRepository by lazy(LazyThreadSafetyMode.NONE) {
+        CatsRepositoryImpl()
+    }
+    private val catsInteractor by lazy(LazyThreadSafetyMode.NONE) {
+        CatsInteractor(catsRepository = catsRepository)
+    }
+
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return CatsPresenter(
+            catsInteractor = catsInteractor
+        ) as T
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/in_progress.xml b/app/src/main/res/drawable/in_progress.xml
new file mode 100644
index 00000000..1cf2ebc8
--- /dev/null
+++ b/app/src/main/res/drawable/in_progress.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M19,8l-4,4h3c0,3.31 -2.69,6 -6,6 -1.01,0 -1.97,-0.25 -2.8,-0.7l-1.46,1.46C8.97,19.54 10.43,20 12,20c4.42,0 8,-3.58 8,-8h3l-4,-4zM6,12c0,-3.31 2.69,-6 6,-6 1.01,0 1.97,0.25 2.8,0.7l1.46,-1.46C15.03,4.46 13.57,4 12,4c-4.42,0 -8,3.58 -8,8H1l4,4 4,-4H6z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/not_loaded.xml b/app/src/main/res/drawable/not_loaded.xml
new file mode 100644
index 00000000..ff0ddd7c
--- /dev/null
+++ b/app/src/main/res/drawable/not_loaded.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8 0,-1.85 0.63,-3.55 1.69,-4.9L16.9,18.31C15.55,19.37 13.85,20 12,20zM18.31,16.9L7.1,5.69C8.45,4.63 10.15,4 12,4c4.42,0 8,3.58 8,8 0,1.85 -0.63,3.55 -1.69,4.9z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..4963395f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<otus.homework.coroutines.CatsView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -7,6 +7,16 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/app_name"
+        app:layout_constraintBottom_toBottomOf="parent"
+        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"
@@ -16,7 +26,7 @@
         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/imageView" />
 
     <Button
         android:id="@+id/button"
@@ -27,4 +37,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
 
-</otus.homework.coroutines.CatsView>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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..84a62e87 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <resources>
     <string name="app_name">Cat Facts </string>
     <string name="more_facts">More Facts</string>
+    <string name="empty_dash">-</string>
+    <string name="timeout_connection_expired">Не удалось получить ответ от сервером</string>
 </resources>
\ No newline at end of file