Task Otus-Android#2 completed

Author: PavelScherbakov

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

@@ -0,0 +1,10 @@
+package otus.homework.coroutines
+
+import retrofit2.Response
+import retrofit2.http.GET
+
+interface CatPictureService {
+    @GET("meow")
+    suspend fun getCatPicture() : Response<Picture>
+
+}

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

@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+data class CatViewModel(
+    val fact: String,
+    val pictureUrl: String,
+)

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

@@ -6,7 +6,8 @@ import java.net.SocketTimeoutException
 import kotlin.coroutines.CoroutineContext
 
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catsService: CatsService,
+    private val catPictureService: CatPictureService,
 ) {
 
     private var _catsView: ICatsView? = null
@@ -20,14 +21,42 @@ class CatsPresenter(
         }
         ) {
             try {
-                val response = catsService.getCatFact()
+                //Запускаем запросы одновременно
+                val deferredFact = async { catsService.getCatFact() }
+                val deferredPicture = async { catPictureService.getCatPicture() }
 
-                if (response.isSuccessful && response.body() != null) {
-                    Log.e("CatsPresenter", "Success!!!")
-                    _catsView?.populate(response.body()!!)
-                }
-                else {
-                    throw Exception(if (response.body() == null) "Incorrect data from server" else response.message())
+                //Ждём выполнение всех запросов
+                val responseFact = deferredFact.await()
+                val responsePicture = deferredPicture.await()
+
+                if (
+                    responseFact.isSuccessful
+                    && responseFact.body() != null
+
+                    && responsePicture.isSuccessful
+                    && responsePicture.body() != null
+                    && (responsePicture.body() as Picture).url.isNotEmpty()
+                ) {
+                    Log.e("CatsPresenter", "requests success!!!")
+                    val fact = responseFact.body() as Fact
+                    val picture = responsePicture.body() as Picture
+                    _catsView?.populate(CatViewModel(fact.text, picture.url))
+                } else {
+                    throw Exception(
+                        if (responseFact.body() == null || responsePicture.body() == null) {
+                            "Incorrect data from server"
+                        }
+                        else {
+                            if (!responseFact.isSuccessful && responsePicture.isSuccessful) {
+                                responseFact.message()
+                            }
+                            else if (responseFact.isSuccessful && !responsePicture.isSuccessful) {
+                                responsePicture.message()
+                            }
+                            else {
+                                responseFact.message() + " " + responsePicture.message()
+                            }
+                        })
                 }
             }
             //Обрабатываем определённые ошибки

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

@@ -3,9 +3,11 @@ 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,
@@ -14,6 +16,7 @@ class CatsView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
     var presenter :CatsPresenter? = null
+    private val picasso by lazy { Picasso.get() }
 
     override fun onFinishInflate() {
         super.onFinishInflate()
@@ -22,8 +25,13 @@ class CatsView @JvmOverloads constructor(
         }
     }
 
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.text
+    override fun populate(model: CatViewModel) {
+        findViewById<TextView>(R.id.fact_textView).text = model.fact
+        model.pictureUrl.let { url ->
+            picasso
+                .load(url)
+                .into(findViewById<ImageView>(R.id.picture_imageView))
+        }
     }
 
     override fun showToast(text: String) {
@@ -36,7 +44,6 @@ class CatsView @JvmOverloads constructor(
 }
 
 interface ICatsView {
-
-    fun populate(fact: Fact)
+    fun populate(model: CatViewModel)
     fun showToast(text: String)
 }

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

@@ -13,4 +13,14 @@ class DiContainer {
     }
 
     val service by lazy { retrofit.create(CatsService::class.java) }
+
+    private val retrofitPicture by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://aws.random.cat/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+    val servicePicture by lazy { retrofitPicture.create(CatPictureService::class.java) }
+
 }

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

@@ -15,7 +15,7 @@ class MainActivity : AppCompatActivity() {
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsPresenter = CatsPresenter(diContainer.service)
+        catsPresenter = CatsPresenter(diContainer.service, diContainer.servicePicture)
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
         catsPresenter.onInitComplete()

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

@@ -0,0 +1,8 @@
+package otus.homework.coroutines
+
+import com.google.gson.annotations.SerializedName
+
+data class Picture(
+    @field:SerializedName("file")
+    val url: String,
+)

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

@@ -7,16 +7,27 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/picture_imageView"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="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_constraintTop_toBottomOf="@+id/picture_imageView"
+        app:layout_constraintBottom_toTopOf="@+id/button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        tools:text="Test"/>
 
     <Button
         android:id="@+id/button"
@@ -25,6 +36,6 @@
         android:text="@string/more_facts"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
 </otus.homework.coroutines.CatsView>