aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorClyhtsuriva <aimeric@adjutor.xyz>2021-05-04 15:00:16 +0200
committerClyhtsuriva <aimeric@adjutor.xyz>2021-05-04 15:00:16 +0200
commit1ab9e165dcb9b3c49322a6ce3734c16c80364795 (patch)
treead31156a0d1f229041eeacaf38e63687923a332e /app
parent124b99a26cf427782c244eda19435ef4d23d01e6 (diff)
Added the arch onto topanime
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/presentation/controller/MainController.kt29
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/presentation/controller/TopAnimeController.kt131
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/presentation/controller/TopMangaController.kt2
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/presentation/view/HomePage.kt3
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimePage.kt127
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaPage.kt1
6 files changed, 151 insertions, 142 deletions
diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/MainController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/MainController.kt
deleted file mode 100644
index 133f84b..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/MainController.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package xyz.adjutor.aniki.presentation.controller
-
-class MainController {
-
- fun MainController() {
-
- }
-
- fun onStart() {
-
- }
-
- fun onButtonTopMangaClick() {
-
- }
-
- fun onButtonTopAnimeClick() {
-
- }
-
- fun onButtonSearchMangaClick() {
-
- }
-
- fun onButtonSearchAnimeClick() {
-
- }
-
-} \ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/TopAnimeController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/TopAnimeController.kt
new file mode 100644
index 0000000..36026ec
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/TopAnimeController.kt
@@ -0,0 +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.anime.TopAnimeApi
+import xyz.adjutor.aniki.presentation.model.anime.TopAnime
+import xyz.adjutor.aniki.presentation.model.anime.TopAnimeResponse
+import xyz.adjutor.aniki.presentation.view.anime.TopAnimePage
+import java.lang.reflect.Type
+import kotlin.properties.Delegates
+
+class TopAnimeController {
+
+ 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: TopAnimePage
+
+ fun onStart(topAnimePage: TopAnimePage, viewTopAnimePage: View) {
+
+ view = topAnimePage
+ baseUrl = "https://api.jikan.moe/" //the api's base url
+ page = 1
+ gson = GsonBuilder()
+ .setLenient()
+ .create()
+ sharedPreferences =
+ viewTopAnimePage.context.getSharedPreferences("sp_anime", Context.MODE_PRIVATE)
+
+
+ val animeList: List<TopAnime>? = getDataFromCache()
+ if (animeList != null) {
+ view.showList(viewTopAnimePage, animeList)
+ } else {
+ makeApiCall(view, baseUrl, 1)
+ }
+ }
+
+ fun makeApiCall(view: TopAnimePage, BASE_URL: String, page: Int) {
+
+ val retrofit = Retrofit.Builder()
+ .baseUrl(BASE_URL)
+ .addConverterFactory(GsonConverterFactory.create(gson))
+ .build()
+
+ val service = retrofit.create(TopAnimeApi::class.java)
+ val call = service.getTopAnimeData(page)
+
+ call.enqueue(object : Callback<TopAnimeResponse> {
+ override fun onResponse(
+ call: Call<TopAnimeResponse>,
+ response: Response<TopAnimeResponse>
+ ) {
+ if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
+
+ val animeList: List<TopAnime> = response.body()!!
+ .getResults() //getting the "top" field containing our list of TopAnimes
+ saveList(animeList)
+ view.showList(
+ view.requireView(),
+ animeList
+ ) //calling the method in charge of displaying on the recyclerview
+
+ } else {
+ view.showError() //a snackbar
+ }
+ }
+
+ override fun onFailure(call: Call<TopAnimeResponse>, t: Throwable) {
+ view.showError()
+ }
+
+ })
+ }
+
+ private fun saveList(animeList: List<TopAnime>) {
+ val jsonString: String = gson.toJson(animeList)
+
+ sharedPreferences
+ .edit()
+ .putString("jsonAnimeList", jsonString)
+ .apply()
+ }
+
+ private fun getDataFromCache(): List<TopAnime>? {
+ //the value of the animeList json, if nothing is found, return null
+ val jsonAnime: String? = sharedPreferences.getString("jsonAnimeList", null)
+
+ //if it's null, well, return null
+ return if (jsonAnime == null) {
+ null
+ } else { //else deserialize the list and return it
+ val listType: Type = object : TypeToken<List<TopAnime>>() {}.type
+ gson.fromJson(jsonAnime, 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
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 8eaa31d..3fa1c2c 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
@@ -112,7 +112,7 @@ class TopMangaController {
makeApiCall(view, baseUrl, page)
view.showText("Page $page has been loaded.")
} else {
- view.showText("You're already on page 1.")
+ view.showText("You're already on page 1. (If you're actually not, refresh the list.)")
}
}
diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/HomePage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/HomePage.kt
index d740dba..f2abca1 100644
--- a/app/src/main/java/xyz/adjutor/aniki/presentation/view/HomePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/HomePage.kt
@@ -8,12 +8,9 @@ import android.widget.Button
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import xyz.adjutor.aniki.R
-import xyz.adjutor.aniki.presentation.controller.MainController
class HomePage : Fragment() {
- lateinit var controller: MainController
-
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimePage.kt
index 66197d7..40df41c 100644
--- a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimePage.kt
@@ -1,7 +1,5 @@
package xyz.adjutor.aniki.presentation.view.anime
-import android.content.Context
-import android.content.SharedPreferences
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@@ -13,28 +11,14 @@ 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.anime.TopAnimeApi
+import xyz.adjutor.aniki.presentation.controller.TopAnimeController
import xyz.adjutor.aniki.presentation.model.anime.TopAnime
-import xyz.adjutor.aniki.presentation.model.anime.TopAnimeResponse
-import java.lang.reflect.Type
+//view
class TopAnimePage : Fragment() {
- private lateinit var sharedPreferences: SharedPreferences
- val gson: Gson = GsonBuilder()
- .setLenient()
- .create()
- var baseUrl = "https://api.jikan.moe/" //the api's base url
- var page: Int = 1
+ lateinit var controller: TopAnimeController
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
@@ -43,32 +27,13 @@ class TopAnimePage : Fragment() {
// Inflate the layout for this fragment
val view = inflater.inflate(R.layout.top_anime_page, container, false)
- sharedPreferences = view.context.getSharedPreferences("sp_anime", Context.MODE_PRIVATE)
-
- val animeList: List<TopAnime>? = getDataFromCache()
- if (animeList != null) {
- showList(view, animeList)
- } else {
- makeApiCall(view, baseUrl, 1)
- }
+ controller = TopAnimeController()
+ controller.onStart(this, view)
return view
}
- private fun getDataFromCache(): List<TopAnime>? {
- //the value of the animeList json, if nothing is found, return null
- val jsonAnime: String? = sharedPreferences.getString("jsonAnimeList", null)
-
- //if it's null, well, return null
- return if (jsonAnime == null) {
- null
- } else { //else deserialize the list and return it
- val listType: Type = object : TypeToken<List<TopAnime>>() {}.type
- gson.fromJson(jsonAnime, listType)
- }
- }
-
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
@@ -77,33 +42,16 @@ class TopAnimePage : Fragment() {
findNavController().navigate(R.id.action_TopAnimePage_to_HomePage)
}
view.findViewById<Button>(R.id.button_prev).setOnClickListener {
- if (page > 1) {
- page -= 1
- makeApiCall(view, baseUrl, page)
- Snackbar.make(requireView(), "Page $page has been loaded.", Snackbar.LENGTH_SHORT)
- .setAction("Action", null).show()
- } else {
- Snackbar.make(requireView(), "You're already on page 1.", Snackbar.LENGTH_SHORT)
- .setAction("Action", null).show()
- }
+ controller.onButtonPrevClick()
}
view.findViewById<Button>(R.id.button_next).setOnClickListener {
- page += 1
- makeApiCall(view, baseUrl, page)
- Snackbar.make(requireView(), "Page $page has been loaded.", Snackbar.LENGTH_SHORT)
- .setAction("Action", null).show()
- }
-
- fun updateList() {
- makeApiCall(view, baseUrl, 1)
- Snackbar.make(requireView(), "Data refreshed", Snackbar.LENGTH_SHORT)
- .setAction("Action", null).show()
+ controller.onButtonNextClick()
}
+ //refresh when swiping down at the top of the page
val swipeRefresh: SwipeRefreshLayout = view.findViewById(R.id.swiperefresh)
swipeRefresh.setOnRefreshListener {
- updateList()
- page = 1
+ controller.updateList()
swipeRefresh.isRefreshing = false
}
@@ -118,53 +66,7 @@ class TopAnimePage : Fragment() {
(recyclerView.adapter as TopAnimeAdapter).notifyDataSetChanged()
}
- private fun makeApiCall(view: View, BASE_URL: String, page: Int) {
-
- val retrofit = Retrofit.Builder()
- .baseUrl(BASE_URL)
- .addConverterFactory(GsonConverterFactory.create(gson))
- .build()
-
- val service = retrofit.create(TopAnimeApi::class.java)
- val call = service.getTopAnimeData(page)
-
- call.enqueue(object : Callback<TopAnimeResponse> {
- override fun onResponse(
- call: Call<TopAnimeResponse>,
- response: Response<TopAnimeResponse>
- ) {
- if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
-
- val animeList: List<TopAnime> = response.body()!!
- .getResults() //getting the "top" field containing our list of TopAnimes
- saveList(animeList)
- showList(
- view,
- animeList
- ) //calling the method in charge of displaying on the recyclerview
-
- } else {
- showError() //a snackbar
- }
- }
-
- override fun onFailure(call: Call<TopAnimeResponse>, t: Throwable) {
- showError()
- }
-
- })
- }
-
- private fun saveList(animeList: List<TopAnime>) {
- val jsonString: String = gson.toJson(animeList)
-
- sharedPreferences
- .edit()
- .putString("jsonAnimeList", jsonString)
- .apply()
- }
-
- private fun showError() {
+ fun showError() {
Snackbar.make(
requireView(),
"API ERROR : Verify your internet connection.",
@@ -173,4 +75,13 @@ class TopAnimePage : Fragment() {
.setAction("Action", null).show()
}
+ fun showText(text: String) {
+ Snackbar.make(
+ requireView(),
+ text,
+ Snackbar.LENGTH_SHORT
+ )
+ .setAction("Action", null).show()
+ }
+
} \ 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 2a05904..32fa1b1 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
@@ -66,7 +66,6 @@ class TopMangaPage : Fragment() {
(recyclerView.adapter as TopMangaAdapter).notifyDataSetChanged()
}
-
fun showError() {
Snackbar.make(
requireView(),