Otus-Android#2 Добавлен к запросу фактов запрос рандомных картинок с https://api.thecatapi.com/v1/images/search

Author: firkatdavletov

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

@@ -11,7 +11,8 @@ import java.net.SocketTimeoutException
 import kotlin.coroutines.CoroutineContext
 
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catsService: CatsService,
+    private val imageService: ImageService
 ): CoroutineScope {
     private val job = Job()
     override val coroutineContext: CoroutineContext = CoroutineName("CatsCoroutine") + job
@@ -22,8 +23,10 @@ class CatsPresenter(
         launch {
             try {
                 val fact = catsService.getCatFact()
+                val image = imageService.getRandomImage()
+                val model = FactPresentationModel(fact, image.first())
                 withContext(Dispatchers.Main) {
-                    _catsView?.populate(fact)
+                    _catsView?.populate(model)
                 }
             } catch (e: Exception) {
                 when (e) {
@@ -35,7 +38,6 @@ class CatsPresenter(
                     }
                 }
             }
-
         }
     }
 

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,
@@ -22,8 +24,9 @@ class CatsView @JvmOverloads constructor(
         }
     }
 
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.fact
+    override fun populate(factPresentationModel: FactPresentationModel) {
+        findViewById<TextView>(R.id.fact_textView).text = factPresentationModel.fact.fact
+        Picasso.get().load(factPresentationModel.imageEntity.url).into(findViewById<ImageView>(R.id.fact_imageView))
     }
 
     override fun onError(textResId: Int) {
@@ -32,7 +35,6 @@ class CatsView @JvmOverloads constructor(
 }
 
 interface ICatsView {
-
-    fun populate(fact: Fact)
+    fun populate(factPresentationModel: FactPresentationModel)
     fun onError(textResId: Int)
 }

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

@@ -12,5 +12,14 @@ class DiContainer {
             .build()
     }
 
+    private val imageServiceBuilder by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://api.thecatapi.com/v1/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
     val service by lazy { retrofit.create(CatsService::class.java) }
+
+    val imageService by lazy { imageServiceBuilder.create(ImageService::class.java) }
 }

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

@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+data class FactPresentationModel (
+    val fact: Fact,
+    val imageEntity: ImageEntity
+)

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

@@ -0,0 +1,14 @@
+package otus.homework.coroutines
+
+import com.google.gson.annotations.SerializedName
+
+data class ImageEntity (
+    @field:SerializedName("id")
+    val id: String,
+    @field:SerializedName("url")
+    val url: String,
+    @field:SerializedName("width")
+    val width: Int,
+    @field:SerializedName("height")
+    val height: Int
+)

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

@@ -0,0 +1,9 @@
+package otus.homework.coroutines
+
+import retrofit2.http.GET
+
+interface ImageService {
+
+    @GET("images/search")
+    suspend fun getRandomImage(): List<ImageEntity>
+}

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.imageService)
         view.presenter = catsPresenter
         catsPresenter.attachView(view)
         catsPresenter.onInitComplete()

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

@@ -7,6 +7,15 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/fact_imageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/image_description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/fact_textView"/>
+
     <TextView
         android:id="@+id/fact_textView"
         android:textColor="@color/black"
@@ -16,7 +25,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fact_textView"/>
 
     <Button
         android:id="@+id/button"

app/src/main/res/values/strings.xml

@@ -2,4 +2,5 @@
     <string name="app_name">Cat Facts </string>
     <string name="more_facts">More Facts</string>
     <string name="connection_error_message">Не удалось получить ответ от сервером</string>
+    <string name="image_description">image</string>
 </resources>