Big updaterelease/3.2

Restructuring the packages and adding a Constants.kt for the api URL.
Also adding gson in Singletons.kt

4 files changed, 0 insertions, 335 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
deleted file mode 100644
index 080e4ed..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailSearchMangaController.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package xyz.adjutor.aniki.presentation.controller.manga
-
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import xyz.adjutor.aniki.presentation.Singletons
-import xyz.adjutor.aniki.presentation.model.manga.MangaResponse
-import xyz.adjutor.aniki.presentation.view.manga.DetailSearchMangaActivity
-
-class DetailSearchMangaController {
-
-    lateinit var gson: Gson
-    private lateinit var baseUrl: String //the api's base url
-    lateinit var view: DetailSearchMangaActivity
-
-    fun onStart(DetailSearchMangaActivity: DetailSearchMangaActivity, mangaId: String) {
-
-        view = DetailSearchMangaActivity
-        baseUrl = "https://api.jikan.moe/" //the api's base url
-        gson = GsonBuilder()
-            .setLenient()
-            .create()
-
-        makeApiCall(baseUrl, mangaId)
-    }
-
-    private fun makeApiCall(BASE_URL: String, mangaId: String) {
-
-        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
-                        view.showDetail(manga!!)
-
-                    } else {
-                    view.showError("API ERROR : is not successful")
-                }
-            }
-
-            override fun onFailure(call: Call<MangaResponse>, t: Throwable) {
-                view.showError("API ERROR : onFailure")
-            }
-
-        })
-    }
-
-}
\ No newline at end of file
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
deleted file mode 100644
index 9789d0c..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailTopMangaController.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package xyz.adjutor.aniki.presentation.controller.manga
-
-import android.content.Context
-import android.content.SharedPreferences
-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 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
-
-class DetailTopMangaController {
-
-    private lateinit var sharedPreferences: SharedPreferences
-    lateinit var gson: Gson
-    private lateinit var baseUrl: String //the api's base url
-    lateinit var view: DetailTopMangaActivity
-
-    fun onStart(DetailTopMangaActivity: DetailTopMangaActivity, mangaId: String) {
-
-        view = DetailTopMangaActivity
-        baseUrl = "https://api.jikan.moe/" //the api's base url
-        gson = GsonBuilder()
-            .setLenient()
-            .create()
-        sharedPreferences =
-            view.applicationContext.getSharedPreferences("sp_manga", Context.MODE_PRIVATE)
-
-        val manga: MangaResponse? = getDataFromCache(mangaId)
-        if (manga != null) {
-            view.showDetail(manga)
-        } else {
-            //taking the API's fields I want and displaying them
-            makeApiCall(baseUrl, mangaId)
-        }
-    }
-
-    private fun getDataFromCache(mangaId: String): MangaResponse? {
-        val jsonManga: String? = sharedPreferences.getString(mangaId, null)
-
-        return if (jsonManga == null) {
-            null
-        } else {
-            val type: Type = object : TypeToken<MangaResponse>() {}.type
-            gson.fromJson(jsonManga, type)
-        }
-    }
-
-    private fun makeApiCall(BASE_URL: String, mangaId: String) {
-
-        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")
-                }
-            }
-
-            override fun onFailure(call: Call<MangaResponse>, t: Throwable) {
-                view.showError("API ERROR : onFailure")
-            }
-
-        })
-    }
-
-    fun saveList(manga: MangaResponse?) {
-        val jsonString: String = gson.toJson(manga)
-
-        sharedPreferences
-            .edit()
-            .putString(manga?.mal_id.toString(), jsonString)
-            .apply()
-    }
-
-}
\ No newline at end of file
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
deleted file mode 100644
index de1edad..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/SearchMangaController.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package xyz.adjutor.aniki.presentation.controller.manga
-
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-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
-
-class SearchMangaController {
-
-    lateinit var gson: Gson
-    lateinit var baseUrl: String //the api's base url
-    lateinit var view: SearchMangaPage
-
-    fun onStart(searchMangaPage: SearchMangaPage) {
-
-        view = searchMangaPage
-        baseUrl = "https://api.jikan.moe/" //the api's base url
-        gson = GsonBuilder()
-            .setLenient()
-            .create()
-    }
-
-    //call the API and show the list
-    private fun makeApiCall(view: SearchMangaPage, BASE_URL: String, query: String) {
-
-        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 mangaList: List<SearchManga> = response.body()!!
-                            .getResults() //getting the "search" field containing our list of SearchMangas
-
-                        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<SearchMangaResponse>, t: Throwable) {
-                view.showError()
-            }
-
-        })
-    }
-
-    fun updateList(userInput: String) {
-        makeApiCall(view, baseUrl, userInput)
-    }
-
-}
\ No newline at end of file
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
deleted file mode 100644
index ea631fd..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/TopMangaController.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package xyz.adjutor.aniki.presentation.controller.manga
-
-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 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
-import java.lang.reflect.Type
-import kotlin.properties.Delegates
-
-class TopMangaController {
-
-    lateinit var sharedPreferences: SharedPreferences
-    lateinit var gson: Gson
-    lateinit var baseUrl: String //the api's base url
-    var page by Delegates.notNull<Int>()
-    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<TopManga>? = getDataFromCache()
-        if (mangaList != null) {
-            view.showList(viewTopMangaPage, mangaList)
-        } else {
-            makeApiCall(view, baseUrl, 1)
-        }
-    }
-
-    private fun makeApiCall(view: TopMangaPage, BASE_URL: String, page: Int) {
-
-        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
-
-                } else {
-                    view.showError() //a snackbar
-                }
-            }
-
-            override fun onFailure(call: Call<TopMangaResponse>, t: Throwable) {
-                view.showError()
-            }
-
-        })
-    }
-
-    private fun saveList(mangaList: List<TopManga>) {
-        val jsonString: String = gson.toJson(mangaList)
-
-        sharedPreferences
-            .edit()
-            .putString("jsonMangaList", jsonString)
-            .apply()
-    }
-
-    private fun getDataFromCache(): List<TopManga>? {
-        //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<List<TopManga>>() {}.type
-            gson.fromJson(jsonManga, listType)
-        }
-    }
-
-
-    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. (If you're actually not, refresh the list.)")
-        }
-    }
-
-    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