string to res

Author: Vera Sokolova

app/src/main/java/otus/homework/coroutines/CatViewModel.kt

@@ -1,8 +1,8 @@
 package otus.homework.coroutines
 
+import android.content.res.Resources
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineExceptionHandler
@@ -26,7 +26,7 @@ class CatViewModel(
     private val handler = CoroutineExceptionHandler { _, throwable ->
         when (throwable) {
             is SocketTimeoutException -> {
-                catModel.value = Result.Error(Throwable("Не удалось получить ответ от сервера"))
+                catModel.value = Result.Error(Throwable(Resources.getSystem().getString(R.string.error_connection)))
             }
             is CancellationException -> {
                 throw throwable

app/src/main/java/otus/homework/coroutines/CatsFactService.kt

@@ -8,4 +8,8 @@ interface CatsFactService {
 
     @GET("fact")
     suspend fun getCatFact() : Response<Fact>
+
+    companion object {
+        const val BASE_URL = "https://catfact.ninja/"
+    }
 }

app/src/main/java/otus/homework/coroutines/CatsPresenter.kt

@@ -32,7 +32,7 @@ class CatsPresenter(
                 } catch (e: Exception) {
                     when (e) {
                         is SocketTimeoutException -> {
-                            _catsView?.showToast("Не удалось получить ответ от сервера")
+                            _catsView?.showToast(R.string.error_connection)
                         }
                         is CancellationException ->  {
                             throw e

app/src/main/java/otus/homework/coroutines/CatsView.kt

@@ -6,6 +6,7 @@ import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.squareup.picasso.Picasso
 import otus.homework.coroutines.model.CatModel
@@ -33,13 +34,18 @@ class CatsView @JvmOverloads constructor(
         Picasso.get().load(catModel.imageUrl).into(imageView)
     }
 
-    override fun showToast(message: String) {
-        Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+    override fun showToast(messageRes: Int) {
+        Toast.makeText(context, messageRes, Toast.LENGTH_SHORT).show()
+    }
+
+    override fun showToast(messageRes: String) {
+        Toast.makeText(context, messageRes, Toast.LENGTH_SHORT).show()
     }
 }
 
 interface ICatsView {
 
     fun populate(catModel: CatModel)
-    fun showToast(message: String)
+    fun showToast(@StringRes messageRes: Int)
+    fun showToast(messageRes: String)
 }

app/src/main/java/otus/homework/coroutines/DiContainer.kt

@@ -29,7 +29,7 @@ class DiContainer {
     private val retrofitCatFact by lazy {
         Retrofit.Builder()
             .client(okHttpClient)
-            .baseUrl("https://catfact.ninja/")
+            .baseUrl(CatsFactService.BASE_URL)
             .addConverterFactory(GsonConverterFactory.create())
             .build()
     }

app/src/main/java/otus/homework/coroutines/PresenterScope.kt

@@ -9,5 +9,9 @@ import kotlin.coroutines.CoroutineContext
 class PresenterScope : CoroutineScope {
 
     override val coroutineContext: CoroutineContext
-        get() = Job() + Dispatchers.Main + CoroutineName("CatsCoroutine")
+        get() = Job() + Dispatchers.Main + CoroutineName(CATS_COROUTINE)
+
+    companion object {
+        const val CATS_COROUTINE = "CatsCoroutine"
+    }
 }

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="error_connection">"Не удалось получить ответ от сервера"</string>
 </resources>