Merge branch 'release/3.1'v3.1.0

1 files changed, 13 insertions, 21 deletions

diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/SearchMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/SearchMangaController.kt
index 32e46eb..de1edad 100644
--- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/SearchMangaController.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/SearchMangaController.kt
@@ -5,9 +5,7 @@ import com.google.gson.GsonBuilder
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import xyz.adjutor.aniki.data.manga.SearchMangaApi
+import xyz.adjutor.aniki.presentation.Singletons
 import xyz.adjutor.aniki.presentation.model.manga.SearchManga
 import xyz.adjutor.aniki.presentation.model.manga.SearchMangaResponse
 import xyz.adjutor.aniki.presentation.view.manga.SearchMangaPage
@@ -30,26 +28,20 @@ class SearchMangaController {
     //call the API and show the list
     private fun makeApiCall(view: SearchMangaPage, BASE_URL: String, query: String) {
 
-        val retrofit = Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .addConverterFactory(GsonConverterFactory.create(gson))
-            .build()
+        Singletons
+            .searchMangaApi
+            .getSearchMangaData(q = query)
+            .enqueue(object : Callback<SearchMangaResponse> {
+                override fun onResponse(
+                    call: Call<SearchMangaResponse>,
+                    response: Response<SearchMangaResponse>
+                ) {
+                    if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
 
-        val service = retrofit.create(SearchMangaApi::class.java)
-        val call =
-            service.getSearchMangaData(q = query) //fate is an exemple, we'll have to replace it by the user input.
+                        val mangaList: List<SearchManga> = response.body()!!
+                            .getResults() //getting the "search" field containing our list of SearchMangas
 
-        call.enqueue(object : Callback<SearchMangaResponse> {
-            override fun onResponse(
-                call: Call<SearchMangaResponse>,
-                response: Response<SearchMangaResponse>
-            ) {
-                if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
-
-                    val mangaList: List<SearchManga> = response.body()!!
-                        .getResults() //getting the "search" field containing our list of SearchMangas
-
-                    view.showList(
+                        view.showList(
                         view.requireView(),
                         mangaList
                     ) //calling the method in charge of displaying on the recyclerview