HW2

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.2.0"
 }

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=".MainActivity2"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+sealed class ApiResult<out T: Any> {
+    data class Success<out T: Any>(val data: T) : ApiResult<T>()
+    data class Error(val error: Throwable) : ApiResult<Nothing>()
+}

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

@@ -0,0 +1,3 @@
+package otus.homework.coroutines
+
+class CatapiImage : ArrayList<CatapiImageItem>()

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

@@ -0,0 +1,8 @@
+package otus.homework.coroutines
+
+data class CatapiImageItem(
+    val height: Int,
+    val id: String,
+    val url: String,
+    val width: Int
+)

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

@@ -1,10 +1,13 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
 import retrofit2.http.GET
+import retrofit2.http.Url
 
 interface CatsService {
 
     @GET("fact")
-    fun getCatFact() : Call<Fact>
+    suspend fun getCatFact() : Fact
+
+    @GET
+    suspend fun getImg(@Url url:String = "https://api.thecatapi.com/v1/images/search") : CatapiImage
 }

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

@@ -3,30 +3,14 @@ package otus.homework.coroutines
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.squareup.picasso.Picasso
 
 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)
-}
+) : ConstraintLayout(context, attrs, defStyleAttr){}

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

@@ -0,0 +1,46 @@
+package otus.homework.coroutines
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.launch
+import java.net.SocketTimeoutException
+
+class CatsViewModel(
+    private val catsService: CatsService
+) : ViewModel() {
+
+    private val _liveData = MutableLiveData<ApiResult<Content>>()
+    val liveData: LiveData<ApiResult<Content>> = _liveData
+
+    val context = CoroutineExceptionHandler { _, throwable ->
+        CrashMonitor.trackWarning(throwable.message.toString())
+    } + SupervisorJob()
+
+    init {
+        populate()
+    }
+
+    fun populate() {
+        viewModelScope.launch(context) {
+            val resultFact = async { catsService.getCatFact() }
+            val resultImg = async { catsService.getImg() }
+            try {
+                val content = Content(resultImg.await(), resultFact.await())
+                _liveData.value = ApiResult.Success(content)
+            } catch (_: CancellationException) {
+            } catch (e: SocketTimeoutException) {
+                _liveData.value =
+                    ApiResult.Error(Throwable("Не удалось получить ответ от сервером"))
+            } catch (e: Exception) {
+                _liveData.value = ApiResult.Error(Throwable(e.message))
+            }
+        }
+    }
+}

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

@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+data class Content(
+    val catapiImage: CatapiImage,
+    val fact: Fact,
+)

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

@@ -1,10 +1,13 @@
 package otus.homework.coroutines
 
+import android.util.Log
+
 object CrashMonitor {
 
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning() {
+    fun trackWarning(msg: String) {
+        Log.e("CrashMonitor", msg)
     }
 }

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

@@ -0,0 +1,50 @@
+package otus.homework.coroutines
+
+import android.os.Bundle
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.squareup.picasso.Picasso
+
+class MainActivity2 : AppCompatActivity() {
+
+
+    private val diContainer = DiContainer()
+    val viewModel by lazy(LazyThreadSafetyMode.NONE) {
+        ViewModelProvider(this,
+            object : ViewModelProvider.Factory {
+                override fun <T : ViewModel> create(modelClass: Class<T>): T {
+                    return CatsViewModel(diContainer.service) as T
+                }
+            }
+        )[CatsViewModel::class.java]
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val view = layoutInflater.inflate(R.layout.activity_main, null)
+        setContentView(view)
+
+        findViewById<Button>(R.id.button).setOnClickListener {
+            viewModel.populate()
+        }
+
+        viewModel.liveData.observe(this) { result ->
+            when (result){
+                is ApiResult.Error ->
+                    Toast.makeText(this, result.error.message, Toast.LENGTH_LONG).show()
+                is ApiResult.Success -> {
+                    Picasso.get().load(result.data.catapiImage[0].url)
+                        .into(findViewById<ImageView>(R.id.fact_imgView))
+                    findViewById<TextView>(R.id.fact_textView).text = result.data.fact.fact
+                }
+            }
+        }
+
+    }
+
+}

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

@@ -0,0 +1,4 @@
+package otus.homework.coroutines
+
+class PresentationMopdel {
+}

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

@@ -0,0 +1,10 @@
+package otus.homework.coroutines
+
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlin.coroutines.CoroutineContext
+
+class PresenterScope(override val coroutineContext: CoroutineContext = CoroutineName("CatsCoroutine") + Dispatchers.Main) : CoroutineScope {
+}

app/src/main/res/layout/activity_main.xml

@@ -5,7 +5,27 @@
     android:layout_width="match_parent"
     android:padding="16dp"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".MainActivity2">
+
+    <ImageView
+        android:id="@+id/fact_imgView"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:scaleType="fitXY"
+        app:layout_constraintBottom_toTopOf="@+id/fact_textView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/fact_imgView"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:scaleType="fitXY"
+        app:layout_constraintBottom_toTopOf="@+id/fact_textView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/fact_textView"

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