diff options
Diffstat (limited to 'app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga')
4 files changed, 55 insertions, 84 deletions
diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailSearchMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailSearchMangaController.kt index a874976..080e4ed 100644 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailSearchMangaController.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailSearchMangaController.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.MangaApi +import xyz.adjutor.aniki.presentation.Singletons import xyz.adjutor.aniki.presentation.model.manga.MangaResponse import xyz.adjutor.aniki.presentation.view.manga.DetailSearchMangaActivity @@ -30,25 +28,20 @@ class DetailSearchMangaController { private fun makeApiCall(BASE_URL: String, mangaId: String) { - val retrofit = Retrofit.Builder() - .baseUrl(BASE_URL) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build() + Singletons + .mangaApi + .getMangaData(mangaId) //based on the id + .enqueue(object : Callback<MangaResponse> { + override fun onResponse( + call: Call<MangaResponse>, + response: Response<MangaResponse> + ) { + 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(MangaApi::class.java) - val call = service.getMangaData(mangaId) //based on the id + val manga = response.body() //getting the MangaResponse fields + view.showDetail(manga!!) - call.enqueue(object : Callback<MangaResponse> { - override fun onResponse( - call: Call<MangaResponse>, - response: Response<MangaResponse> - ) { - if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty - - val manga = response.body() //getting the MangaResponse fields - view.showDetail(manga!!) - - } else { + } else { view.showError("API ERROR : is not successful") } } diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailTopMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailTopMangaController.kt index 807421c..9789d0c 100644 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailTopMangaController.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailTopMangaController.kt @@ -8,9 +8,7 @@ import com.google.gson.reflect.TypeToken import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory -import xyz.adjutor.aniki.data.manga.MangaApi +import xyz.adjutor.aniki.presentation.Singletons import xyz.adjutor.aniki.presentation.model.manga.MangaResponse import xyz.adjutor.aniki.presentation.view.manga.DetailTopMangaActivity import java.lang.reflect.Type @@ -54,24 +52,19 @@ class DetailTopMangaController { private fun makeApiCall(BASE_URL: String, mangaId: String) { - val retrofit = Retrofit.Builder() - .baseUrl(BASE_URL) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build() - - val service = retrofit.create(MangaApi::class.java) - val call = service.getMangaData(mangaId) //based on the id - - call.enqueue(object : Callback<MangaResponse> { - override fun onResponse( - call: Call<MangaResponse>, - response: Response<MangaResponse> - ) { - if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty - - val manga = response.body() //getting the MangaResponse fields - saveList(manga) - view.showDetail(manga!!) + Singletons + .mangaApi + .getMangaData(mangaId) //based on the id + .enqueue(object : Callback<MangaResponse> { + override fun onResponse( + call: Call<MangaResponse>, + response: Response<MangaResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val manga = response.body() //getting the MangaResponse fields + saveList(manga) + view.showDetail(manga!!) } else { view.showError("API ERROR : is not successful") 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 diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/TopMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/TopMangaController.kt index 845e750..ea631fd 100644 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/TopMangaController.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/TopMangaController.kt @@ -9,9 +9,7 @@ import com.google.gson.reflect.TypeToken import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory -import xyz.adjutor.aniki.data.manga.TopMangaApi +import xyz.adjutor.aniki.presentation.Singletons import xyz.adjutor.aniki.presentation.model.manga.TopManga import xyz.adjutor.aniki.presentation.model.manga.TopMangaResponse import xyz.adjutor.aniki.presentation.view.manga.TopMangaPage @@ -48,25 +46,20 @@ class TopMangaController { private fun makeApiCall(view: TopMangaPage, BASE_URL: String, page: Int) { - val retrofit = Retrofit.Builder() - .baseUrl(BASE_URL) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build() - - val service = retrofit.create(TopMangaApi::class.java) - val call = service.getTopMangaData(page) - - call.enqueue(object : Callback<TopMangaResponse> { - override fun onResponse( - call: Call<TopMangaResponse>, - response: Response<TopMangaResponse> - ) { - if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty - - val mangaList: List<TopManga> = response.body()!! - .getResults() //getting the "top" field containing our list of TopMangas - saveList(mangaList) - view.showList( + Singletons + .topMangaApi + .getTopMangaData(page) + .enqueue(object : Callback<TopMangaResponse> { + override fun onResponse( + call: Call<TopMangaResponse>, + response: Response<TopMangaResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val mangaList: List<TopManga> = response.body()!! + .getResults() //getting the "top" field containing our list of TopMangas + saveList(mangaList) + view.showList( view.requireView(), mangaList ) //calling the method in charge of displaying on the recyclerview |