From 251afac13cd2731d9be660047501ac6f32d6e067 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Tue, 13 Apr 2021 15:39:45 +0200 Subject: MVC implemented to TopMangaPage --- .../presentation/controller/TopMangaController.kt | 114 +++++++++++++++++- .../aniki/presentation/view/manga/TopMangaPage.kt | 130 +++------------------ 2 files changed, 123 insertions(+), 121 deletions(-) (limited to 'app/src/main/java/xyz') diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/TopMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/TopMangaController.kt index cfee062..8eaa31d 100644 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/TopMangaController.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/TopMangaController.kt @@ -1,29 +1,131 @@ package xyz.adjutor.aniki.presentation.controller +import android.content.Context +import android.content.SharedPreferences +import android.view.View +import com.google.gson.Gson +import com.google.gson.GsonBuilder +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.model.manga.TopManga +import xyz.adjutor.aniki.presentation.model.manga.TopMangaResponse +import xyz.adjutor.aniki.presentation.view.manga.TopMangaPage +import java.lang.reflect.Type +import kotlin.properties.Delegates + class TopMangaController { - fun TopMangaController() { + lateinit var sharedPreferences: SharedPreferences + lateinit var gson: Gson + lateinit var baseUrl: String //the api's base url + var page by Delegates.notNull() + lateinit var view: TopMangaPage + + fun onStart(topMangaPage: TopMangaPage, viewTopMangaPage: View) { + + view = topMangaPage + baseUrl = "https://api.jikan.moe/" //the api's base url + page = 1 + gson = GsonBuilder() + .setLenient() + .create() + sharedPreferences = + viewTopMangaPage.context.getSharedPreferences("sp_manga", Context.MODE_PRIVATE) + + val mangaList: List? = getDataFromCache() + if (mangaList != null) { + view.showList(viewTopMangaPage, mangaList) + } else { + makeApiCall(view, baseUrl, 1) + } } - fun onStart() { + 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 { + override fun onResponse( + call: Call, + response: Response + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val mangaList: List = 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 + + } else { + view.showError() //a snackbar + } + } + + override fun onFailure(call: Call, t: Throwable) { + view.showError() + } + + }) } - fun onButtonTopMangaClick() { + private fun saveList(mangaList: List) { + val jsonString: String = gson.toJson(mangaList) + sharedPreferences + .edit() + .putString("jsonMangaList", jsonString) + .apply() } - fun onButtonTopAnimeClick() { + private fun getDataFromCache(): List? { + //the value of the mangaList json, if nothing is found, return null + val jsonManga: String? = sharedPreferences.getString("jsonMangaList", null) + //if it's null, well, return null + return if (jsonManga == null) { + null + } else { //else deserialize the list and return it + val listType: Type = object : TypeToken>() {}.type + gson.fromJson(jsonManga, listType) + } } - fun onButtonSearchMangaClick() { + fun onButtonPrevClick() { + if (page > 1) { // if we're not on the first page, because we can't go back if we're on the first one. + page -= 1 + makeApiCall(view, baseUrl, page) + view.showText("Page $page has been loaded.") + } else { + view.showText("You're already on page 1.") + } } - fun onButtonSearchAnimeClick() { + fun onButtonNextClick() { + page += 1 + makeApiCall(view, baseUrl, page) + view.showText("Page $page has been loaded.") + } + fun updateList() { + makeApiCall(view, baseUrl, 1) + view.showText("Data refreshed") + page = 1 } } \ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaPage.kt index 943019d..2a05904 100644 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaPage.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaPage.kt @@ -1,7 +1,5 @@ package xyz.adjutor.aniki.presentation.view.manga -import android.content.Context -import android.content.SharedPreferences import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -13,32 +11,15 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.google.android.material.snackbar.Snackbar -import com.google.gson.Gson -import com.google.gson.GsonBuilder -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.R -import xyz.adjutor.aniki.data.manga.TopMangaApi import xyz.adjutor.aniki.presentation.controller.TopMangaController import xyz.adjutor.aniki.presentation.model.manga.TopManga -import xyz.adjutor.aniki.presentation.model.manga.TopMangaResponse -import java.lang.reflect.Type -import kotlin.properties.Delegates //view class TopMangaPage : Fragment() { lateinit var controller: TopMangaController - private lateinit var sharedPreferences: SharedPreferences - lateinit var gson: Gson - private lateinit var baseUrl: String //the api's base url - private var page by Delegates.notNull() - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -46,40 +27,13 @@ class TopMangaPage : Fragment() { // Inflate the layout for this fragment val view = inflater.inflate(R.layout.top_manga_page, container, false) - //controller.onStart() - - gson = GsonBuilder() - .setLenient() - .create() - baseUrl = "https://api.jikan.moe/" //the api's base url - page = 1 - - sharedPreferences = view.context.getSharedPreferences("sp_manga", Context.MODE_PRIVATE) - - val mangaList: List? = getDataFromCache() - if (mangaList != null) { - showList(view, mangaList) - } else { - makeApiCall(view, baseUrl, 1) - } + controller = TopMangaController() + controller.onStart(this, view) return view } - private fun getDataFromCache(): List? { - //the value of the mangaList json, if nothing is found, return null - val jsonManga: String? = sharedPreferences.getString("jsonMangaList", null) - - //if it's null, well, return null - return if (jsonManga == null) { - null - } else { //else deserialize the list and return it - val listType: Type = object : TypeToken>() {}.type - gson.fromJson(jsonManga, listType) - } - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -88,34 +42,16 @@ class TopMangaPage : Fragment() { findNavController().navigate(R.id.action_TopMangaPage_to_HomePage) } view.findViewById