Otus-Android#2 added ImageService

Author: AkashevPavel

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

@@ -17,6 +17,9 @@ class CatsPresenter(
     fun onInitComplete() {
         _job = presenterScope.launch {
             try {
+//                imageService.getCatImage().also {
+//                    println("image url ${it.url}")
+//                }
                 catsService.getCatFact().also { fact ->
                     _catsView?.populate(fact)
                 }

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

@@ -8,14 +8,14 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 class DiContainer {
 
-    private val retrofit by lazy {
-        Retrofit.Builder()
-            .baseUrl("https://catfact.ninja/")
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-    }
+    private fun buildRetrofit(baseUrl: String) = Retrofit.Builder()
+        .baseUrl(baseUrl)
+        .addConverterFactory(GsonConverterFactory.create())
+        .build()
 
-    val service by lazy { retrofit.create(CatsService::class.java) }
+    val catsService by lazy { buildRetrofit("https://catfact.ninja/").create(CatsService::class.java) }
+
+    val imageService by lazy { buildRetrofit("https://api.thecatapi.com/v1/images/").create(ImageService::class.java) }
 
     val presenterScope get() = CoroutineScope(CoroutineName("CatsCoroutine") + Dispatchers.Main)
 }

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

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

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

@@ -0,0 +1,8 @@
+package otus.homework.coroutines
+
+import retrofit2.http.GET
+
+interface ImageService {
+    @GET("search")
+    suspend fun getCatImage(): Image
+}

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

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