From 13fdfd28b10cdac6e5b901d3947ba02fa744df4b Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Fri, 19 Feb 2021 20:33:21 +0100 Subject: Adding scores to the recyclerview layout. --- .../java/xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt | 2 ++ .../java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt | 2 ++ app/src/main/res/layout/item_layout.xml | 13 ++++++++++++- app/src/main/res/values/strings.xml | 16 +--------------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt index a036c15..68a2c7b 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt @@ -24,6 +24,7 @@ class TopAnimeAdapter(val animeList: List) : class AnimeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { val animeTitle: TextView = itemView.findViewById(R.id.tv_title) val animeRank: TextView = itemView.findViewById(R.id.tv_rank) + val animeScore: TextView = itemView.findViewById(R.id.tv_score) val animeImage: ImageView = itemView.findViewById(R.id.iv_image) } @@ -46,6 +47,7 @@ class TopAnimeAdapter(val animeList: List) : val currentAnime: TopAnime = animeList[position] holder.animeTitle.text = currentAnime.title holder.animeRank.text = currentAnime.rank.toString() + holder.animeScore.text = currentAnime.score.toString() DownloadImageFromInternet(holder.animeImage).execute(currentAnime.image_url) } diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt index 18fd7a0..22872b2 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt @@ -22,6 +22,7 @@ class TopMangaAdapter(val mangaList: List) : class MangaViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { val mangaTitle: TextView = itemView.findViewById(R.id.tv_title) val mangaRank: TextView = itemView.findViewById(R.id.tv_rank) + val mangaScore: TextView = itemView.findViewById(R.id.tv_score) val mangaImage: ImageView = itemView.findViewById(R.id.iv_image) } @@ -44,6 +45,7 @@ class TopMangaAdapter(val mangaList: List) : val currentManga: TopManga = mangaList[position] holder.mangaTitle.text = currentManga.title holder.mangaRank.text = currentManga.rank.toString() + holder.mangaScore.text = currentManga.score.toString() DownloadImageFromInternet(holder.mangaImage).execute(currentManga.image_url) } diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml index 32bea24..8d7a792 100644 --- a/app/src/main/res/layout/item_layout.xml +++ b/app/src/main/res/layout/item_layout.xml @@ -26,7 +26,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - android:src="@mipmap/ic_launcher_round" + android:src="@mipmap/ic_launcher" android:contentDescription="@string/rv_image" /> + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 403a883..636de76 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,20 +18,6 @@ Image of manga Top Anime Page Top Anime - - - Dragon Ball - Naruto - Fairy Tail - Shokugeki no Souma - Ajin - Komi-san no Komyushu - Hunter x Hunter - Detective Conan - Swortd Art Online - Scumbag Loser - Ana Satsujin - Samurai Deeper Kyou - + 00.00 \ No newline at end of file -- cgit v1.2.3 From 9da1efefb4223d3616cb2cf558ead071b049a0e5 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Fri, 19 Feb 2021 20:51:01 +0100 Subject: Removing useless strings in strings.xml --- app/src/main/res/values/strings.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 636de76..0a85246 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,10 +2,6 @@ Aniki Settings - Hello second fragment. Arg: %1$s - Infos about the developper of the app. - News - Article Top Manga Home Home Page -- cgit v1.2.3 From 75803b550cc5818aadc543083d053d455879cf44 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Fri, 19 Feb 2021 22:14:43 +0100 Subject: Cache works with texts for top manga. --- .../xyz/adjutor/aniki/topmanga/TopMangaPage.kt | 57 ++++++++++++++++++---- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt index e4cd20d..0dd173c 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt @@ -1,5 +1,7 @@ package xyz.adjutor.aniki.topmanga +import android.content.Context +import android.content.SharedPreferences import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -11,15 +13,23 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.snackbar.Snackbar 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 java.lang.reflect.Type class TopMangaPage : Fragment() { + var sharedPreferences: SharedPreferences? = null + val gson = GsonBuilder() + .setLenient() + .create() + var base_url = "https://api.jikan.moe/" //the api's base url + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -27,11 +37,31 @@ class TopMangaPage : Fragment() { // Inflate the layout for this fragment val view = inflater.inflate(R.layout.top_manga_page, container, false) - makeApiCall(view, base_url) + sharedPreferences = view.context.getSharedPreferences("app_aniki", Context.MODE_PRIVATE); + + val mangaList: List? = getDataFromCache() + if(mangaList != null ){ + showList(view, mangaList) + } else { + makeApiCall(view, base_url) + } 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 + if(jsonManga == null) { + return null + } else { //else deserialize the list and return it + val listType: Type = object : TypeToken>() {}.type + return gson.fromJson(jsonManga, listType) + } + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -52,10 +82,6 @@ class TopMangaPage : Fragment() { fun makeApiCall(view: View, BASE_URL: String) { - val gson = GsonBuilder() - .setLenient() - .create() - val retrofit = Retrofit.Builder() .baseUrl(BASE_URL) .addConverterFactory(GsonConverterFactory.create(gson)) @@ -67,8 +93,11 @@ class TopMangaPage : Fragment() { 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 = response.body()!!.getResults() //getting the "top" field containing our list of TopMangas + + val mangaList: List = response.body()!!.getResults() //getting the "top" field containing our list of TopMangas + saveList(mangaList) showList(view, mangaList) // calling the method in charge of displaying on the recyclerview + } else { showError() //a snackbar } @@ -81,13 +110,21 @@ class TopMangaPage : Fragment() { }) } - private fun showError() { - Snackbar.make(requireView(), "HA? YOU THOUGHT IT WAS AN API !? BUT IT WAS I, ERROR !", Snackbar.LENGTH_LONG) + private fun saveList(mangaList: List) { + val jsonString: String = gson.toJson(mangaList) + + sharedPreferences + ?.edit() + ?.putString("jsonMangaList", jsonString) + ?.apply() + + Snackbar.make(requireView(), "KONO saveList DA !", Snackbar.LENGTH_LONG) .setAction("Action", null).show() } - companion object { - var base_url = "https://api.jikan.moe/" //the api's base url + private fun showError() { + Snackbar.make(requireView(), "HA? YOU THOUGHT IT WAS AN API !? BUT IT WAS I, ERROR !", Snackbar.LENGTH_LONG) + .setAction("Action", null).show() } } \ No newline at end of file -- cgit v1.2.3 From a331388e01da0c6b6f53e86898ddde6123094e23 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Sat, 20 Feb 2021 13:15:35 +0100 Subject: Cache for top animes Also cleaned TopMangaPage --- .../xyz/adjutor/aniki/topanime/TopAnimePage.kt | 53 ++++++++++++++++++---- .../xyz/adjutor/aniki/topmanga/TopMangaPage.kt | 5 +- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt index 9e86191..cca5402 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt @@ -1,5 +1,7 @@ package xyz.adjutor.aniki.topanime +import android.content.Context +import android.content.SharedPreferences import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -11,15 +13,24 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.snackbar.Snackbar 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.topmanga.TopManga +import java.lang.reflect.Type class TopAnimePage : Fragment() { + var sharedPreferences: SharedPreferences? = null + val gson = GsonBuilder() + .setLenient() + .create() + var base_url = "https://api.jikan.moe/" //the api's base url + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -27,11 +38,31 @@ class TopAnimePage : Fragment() { // Inflate the layout for this fragment val view = inflater.inflate(R.layout.top_anime_page, container, false) - makeApiCall(view, base_url) + sharedPreferences = view.context.getSharedPreferences("app_aniki", Context.MODE_PRIVATE) + + val animeList: List? = getDataFromCache() + if(animeList != null ){ + showList(view, animeList) + } else { + makeApiCall(view, base_url) + } return view } + private fun getDataFromCache(): List? { + //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 + if(jsonAnime == null) { + return null + } else { //else deserialize the list and return it + val listType: Type = object : TypeToken>() {}.type + return gson.fromJson(jsonAnime, listType) + } + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -52,10 +83,6 @@ class TopAnimePage : Fragment() { fun makeApiCall(view: View, BASE_URL: String) { - val gson = GsonBuilder() - .setLenient() - .create() - val retrofit = Retrofit.Builder() .baseUrl(BASE_URL) .addConverterFactory(GsonConverterFactory.create(gson)) @@ -67,8 +94,11 @@ class TopAnimePage : Fragment() { 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 animeList = 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 } @@ -81,13 +111,18 @@ class TopAnimePage : Fragment() { }) } + private fun saveList(animeList: List) { + val jsonString: String = gson.toJson(animeList) + + sharedPreferences + ?.edit() + ?.putString("jsonAnimeList", jsonString) + ?.apply() + } + private fun showError() { Snackbar.make(requireView(), "HA? YOU THOUGHT IT WAS AN API !? BUT IT WAS I, ERROR !", Snackbar.LENGTH_LONG) .setAction("Action", null).show() } - companion object { - var base_url = "https://api.jikan.moe/" //the api's base url - } - } \ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt index 0dd173c..1e52b7d 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt @@ -37,7 +37,7 @@ class TopMangaPage : Fragment() { // Inflate the layout for this fragment val view = inflater.inflate(R.layout.top_manga_page, container, false) - sharedPreferences = view.context.getSharedPreferences("app_aniki", Context.MODE_PRIVATE); + sharedPreferences = view.context.getSharedPreferences("app_aniki", Context.MODE_PRIVATE) val mangaList: List? = getDataFromCache() if(mangaList != null ){ @@ -117,9 +117,6 @@ class TopMangaPage : Fragment() { ?.edit() ?.putString("jsonMangaList", jsonString) ?.apply() - - Snackbar.make(requireView(), "KONO saveList DA !", Snackbar.LENGTH_LONG) - .setAction("Action", null).show() } private fun showError() { -- cgit v1.2.3 From d5da6cb4e9dcfb3cc9dab6aef3831913418e876c Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Sat, 20 Feb 2021 13:21:00 +0100 Subject: Minor changes --- app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt | 2 +- app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt index cca5402..b1fe2e2 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt @@ -81,7 +81,7 @@ class TopAnimePage : Fragment() { recyclerView.adapter = TopAnimeAdapter(animeList) } - fun makeApiCall(view: View, BASE_URL: String) { + private fun makeApiCall(view: View, BASE_URL: String) { val retrofit = Retrofit.Builder() .baseUrl(BASE_URL) diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt index 1e52b7d..697ba6f 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt @@ -80,7 +80,7 @@ class TopMangaPage : Fragment() { recyclerView.adapter = TopMangaAdapter(mangaList) } - fun makeApiCall(view: View, BASE_URL: String) { + private fun makeApiCall(view: View, BASE_URL: String) { val retrofit = Retrofit.Builder() .baseUrl(BASE_URL) -- cgit v1.2.3