Otus-Android#2 added UI state

Author: AkashevPavel

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

@@ -6,8 +6,14 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 
+data class CatsUIState(
+    val fact: Fact,
+    val image: Image
+)
+
 class CatsPresenter(
     private val catsService: CatsService,
+    private val imageService: ImageService,
     private val presenterScope: CoroutineScope
 ) {
 
@@ -17,12 +23,10 @@ class CatsPresenter(
     fun onInitComplete() {
         _job = presenterScope.launch {
             try {
-//                imageService.getCatImage().also {
-//                    println("image url ${it.url}")
-//                }
-                catsService.getCatFact().also { fact ->
-                    _catsView?.populate(fact)
-                }
+                val image = imageService.getCatImage().first()
+                val fact = catsService.getCatFact()
+
+                _catsView?.populate(CatsUIState(fact, image))
             } catch (e: CancellationException) {
                 throw e
             } catch (e: SocketTimeoutException) {

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(
     private val 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(state: CatsUIState) {
+        findViewById<TextView>(R.id.fact_textView).text = state.fact.fact
+        Picasso.get().load(state.image.url).into(findViewById<ImageView>(R.id.catImage))
     }
 
     override fun showToast(message: String) {
@@ -33,7 +36,7 @@ class CatsView @JvmOverloads constructor(
 
 interface ICatsView {
 
-    fun populate(fact: Fact)
+    fun populate(state: CatsUIState)
 
     fun showToast(message: String)
 }

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

@@ -4,5 +4,5 @@ import retrofit2.http.GET
 
 interface ImageService {
     @GET("search")
-    suspend fun getCatImage(): Image
+    suspend fun getCatImage(): List<Image>
 }

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

@@ -17,6 +17,7 @@ class MainActivity : AppCompatActivity() {
 
         catsPresenter = CatsPresenter(
             diContainer.catsService,
+            diContainer.imageService,
             diContainer.presenterScope
         )
         view.presenter = catsPresenter

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

@@ -7,16 +7,26 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/catImage"
+        android:layout_width="300dp"
+        android:layout_height="300dp"
+        android:contentDescription="@string/cat_image_description"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/fact_textView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="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_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/catImage" />
 
     <Button
         android:id="@+id/button"

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="cat_image_description">Random cat image</string>
 </resources>