Merge branch 'release/1.2'v1.2.0

6 files changed, 107 insertions, 41 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<TopAnime>) :
     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<TopAnime>) :
         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/topanime/TopAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt
index 9e86191..b1fe2e2 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<TopAnime>? = getDataFromCache()
+        if(animeList != null ){
+            showList(view, animeList)
+        } else {
+            makeApiCall(view, base_url)
+        }
 
         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
+        if(jsonAnime == null) {
+            return null
+        } else { //else deserialize the list and return it
+            val listType: Type = object : TypeToken<List<TopAnime>>() {}.type
+            return gson.fromJson(jsonAnime, listType)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -50,11 +81,7 @@ class TopAnimePage : Fragment() {
         recyclerView.adapter = TopAnimeAdapter(animeList)
     }
 
-    fun makeApiCall(view: View, BASE_URL: String) {
-
-        val gson = GsonBuilder()
-                .setLenient()
-                .create()
+    private fun makeApiCall(view: View, BASE_URL: String) {
 
         val retrofit = Retrofit.Builder()
                 .baseUrl(BASE_URL)
@@ -67,8 +94,11 @@ class TopAnimePage : Fragment() {
         call.enqueue(object : Callback<RestTopAnimeResponse> {
             override fun onResponse(call: Call<RestTopAnimeResponse>, response: Response<RestTopAnimeResponse>) {
                 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<TopAnime>) {
+        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/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<TopManga>) :
     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<TopManga>) :
         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/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt
index e4cd20d..697ba6f 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<TopManga>? = getDataFromCache()
+        if(mangaList != null ){
+            showList(view, mangaList)
+        } else {
+            makeApiCall(view, base_url)
+        }
 
         return view
     }
 
+    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
+        if(jsonManga == null) {
+            return null
+        } else { //else deserialize the list and return it
+            val listType: Type = object : TypeToken<List<TopManga>>() {}.type
+            return gson.fromJson(jsonManga, listType)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -50,11 +80,7 @@ class TopMangaPage : Fragment() {
         recyclerView.adapter = TopMangaAdapter(mangaList)
     }
 
-    fun makeApiCall(view: View, BASE_URL: String) {
-
-        val gson = GsonBuilder()
-                .setLenient()
-                .create()
+    private fun makeApiCall(view: View, BASE_URL: String) {
 
         val retrofit = Retrofit.Builder()
                 .baseUrl(BASE_URL)
@@ -67,8 +93,11 @@ class TopMangaPage : Fragment() {
         call.enqueue(object : Callback<RestTopMangaResponse> {
             override fun onResponse(call: Call<RestTopMangaResponse>, response: Response<RestTopMangaResponse>) {
                 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<TopManga> = 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,18 @@ class TopMangaPage : Fragment() {
         })
     }
 
+    private fun saveList(mangaList: List<TopManga>) {
+        val jsonString: String = gson.toJson(mangaList)
+
+        sharedPreferences
+                ?.edit()
+                ?.putString("jsonMangaList", 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/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" />
 
         <TextView
@@ -56,6 +56,17 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@id/tv_title"/>
 
+        <TextView
+            android:id="@+id/tv_score"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/very_dark_purple"
+            android:text="@string/rv_score"
+            android:textColor="@color/slightly_desaturated_magenta"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
\ 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..0a85246 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,10 +2,6 @@
     <string name="app_name">Aniki</string>
     <string name="action_settings">Settings</string>
 
-    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
-    <string name="info">Infos about the developper of the app.</string>
-    <string name="news">News</string>
-    <string name="article">Article</string>
     <string name="top_manga">Top Manga</string>
     <string name="home">Home</string>
     <string name="home_page_label">Home Page</string>
@@ -18,20 +14,6 @@
     <string name="manga_image_content_description">Image of manga</string>
     <string name="top_anime_page_label">Top Anime Page</string>
     <string name="top_anime">Top Anime</string>
-
-    <string-array name="manga_array">
-        <item>Dragon Ball</item>
-        <item>Naruto</item>
-        <item>Fairy Tail</item>
-        <item>Shokugeki no Souma</item>
-        <item>Ajin</item>
-        <item>Komi-san no Komyushu</item>
-        <item>Hunter x Hunter</item>
-        <item>Detective Conan</item>
-        <item>Swortd Art Online</item>
-        <item>Scumbag Loser</item>
-        <item>Ana Satsujin</item>
-        <item>Samurai Deeper Kyou</item>
-    </string-array>
+    <string name="rv_score">00.00</string>
 
 </resources>
\ No newline at end of file