Merge branch 'feature/elements_detail' into developrelease/2.0

6 files changed, 215 insertions, 49 deletions

diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/DetailTopAnimeActivity.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/DetailTopAnimeActivity.kt
new file mode 100644
index 0000000..3f1d008
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/topanime/DetailTopAnimeActivity.kt
@@ -0,0 +1,172 @@
+package xyz.adjutor.aniki.topanime
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+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.anime.AnimeApi
+import xyz.adjutor.aniki.anime.RestAnimeResponse
+import java.lang.reflect.Type
+
+class DetailTopAnimeActivity : AppCompatActivity() {
+
+    private var baseUrl = "https://api.jikan.moe/"
+    var sharedPreferences: SharedPreferences? = null
+    private val gson = GsonBuilder()
+            .setLenient()
+            .create()
+
+    private val intentAnimeId = "theanimeid"
+    private val intentAnimeTitle = "theanimetitle"
+    private val intentAnimeRank = "theanimerank"
+    private val intentAnimeScore = "theanimescore"
+    private val intentAnimeImageUrl = "theanimeimageurl"
+
+    private val intentAnimeEpisodes = "theanimeepisodes"
+    private val intentAnimeStartDate = "theanimestartdate"
+    private val intentAnimeEndDate = "theanimeenddate"
+    private val intentAnimeUrl = "theanimeurl"
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_detail_top_anime)
+
+        sharedPreferences = this.getSharedPreferences("sp_anime", Context.MODE_PRIVATE)
+
+        val animeId = intent.getStringExtra(intentAnimeId)
+        val animeTitle = intent.getStringExtra(intentAnimeTitle)
+        val animeRank = intent.getStringExtra(intentAnimeRank)
+        val animeScore = intent.getStringExtra(intentAnimeScore)
+        val animeImageUrl = intent.getStringExtra(intentAnimeImageUrl)
+
+        val animeEpisodes = intent.getStringExtra(intentAnimeEpisodes)
+        val animeStartDate = intent.getStringExtra(intentAnimeStartDate)
+        val animeEndDate = intent.getStringExtra(intentAnimeEndDate)
+        val animeUrl = intent.getStringExtra(intentAnimeUrl)
+
+        val tvId: TextView = findViewById(R.id.tv_detail_id)
+        val tvTitle: TextView = findViewById(R.id.tv_detail_title)
+        val tvRank: TextView = findViewById(R.id.tv_detail_rank)
+        val tvScore: TextView = findViewById(R.id.tv_detail_score)
+        val ivImage: ImageView = findViewById(R.id.iv_detail_image)
+
+        val tvEpisodes: TextView = findViewById(R.id.tv_episodes)
+        val tvStartDate: TextView = findViewById(R.id.tv_start_date)
+        val tvEndDate: TextView = findViewById(R.id.tv_end_date)
+        val tvUrl: TextView = findViewById(R.id.tv_url)
+
+        tvId.text = animeId
+        tvTitle.text = animeTitle
+        tvRank.text = animeRank
+        tvScore.text = animeScore
+        Glide
+            .with(this)
+            .load(animeImageUrl)
+            .apply(RequestOptions().override(400))
+            .into(ivImage)
+
+        //using null as a string because it has been converted to a string before
+        tvEpisodes.text = if (animeEpisodes != "null"){
+            animeEpisodes
+        } else {
+            fieldIsNull()
+        }
+
+        tvStartDate.text = animeStartDate
+
+        tvEndDate.text = if (animeEndDate != "null"){
+            animeEndDate
+        } else {
+            fieldIsNull()
+        }
+
+        tvUrl.text = animeUrl
+
+        val anime: RestAnimeResponse? = getDataFromCache(animeId.toString())
+        if(anime != null ){
+            showDetail(anime)
+        } else {
+            //taking the API's fields I want and displaying them
+            makeApiCall(baseUrl, animeId.toString())
+        }
+
+    }
+
+    private fun getDataFromCache(animeId: String): RestAnimeResponse? {
+        val jsonAnime: String?= sharedPreferences?.getString(animeId, null)
+
+        return if(jsonAnime == null) {
+            null
+        } else {
+            val type: Type = object : TypeToken<RestAnimeResponse>() {}.type
+            gson.fromJson(jsonAnime, type)
+        }
+    }
+
+    private fun makeApiCall(BASE_URL: String, animeId: String) {
+
+        val retrofit = Retrofit.Builder()
+                .baseUrl(BASE_URL)
+                .addConverterFactory(GsonConverterFactory.create(gson))
+                .build()
+
+        val service = retrofit.create(AnimeApi::class.java)
+        val call = service.getAnimeData(animeId) //based on the id
+
+        call.enqueue(object : Callback<RestAnimeResponse> {
+            override fun onResponse(call: Call<RestAnimeResponse>, response: Response<RestAnimeResponse>) {
+                if(response.isSuccessful && response.body() != null){ //if the code returned is >= 200 and < 300 AND the the body ain't empty
+
+                    val anime = response.body() //getting the RestAnimeResponse fields
+                    saveList(anime)
+                    showDetail(anime!!)
+
+                } else {
+                    showError("API ERROR : is not successful")
+                }
+            }
+
+            override fun onFailure(call: Call<RestAnimeResponse>, t: Throwable) {
+                showError("API ERROR : onFailure")
+            }
+
+        })
+    }
+
+    private fun showDetail(anime: RestAnimeResponse) {
+        //elements from RestAnimeResponse
+        val tvSynopsis: TextView = findViewById(R.id.tv_synopsis)
+
+        tvSynopsis.text = anime.synopsis.toString()
+
+    }
+
+    fun showError(text: String) {
+        Toast.makeText(this, text, Toast.LENGTH_LONG).show()
+    }
+    private fun fieldIsNull(): String{
+        return "Unknown"
+    }
+
+    fun saveList(anime: RestAnimeResponse?) {
+        val jsonString: String = gson.toJson(anime)
+
+        sharedPreferences
+                ?.edit()
+                ?.putString(anime?.mal_id.toString(), jsonString)
+                ?.apply()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/RestTopAnimeResponse.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/RestTopAnimeResponse.kt
index c711631..0bd1354 100644
--- a/app/src/main/java/xyz/adjutor/aniki/topanime/RestTopAnimeResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/topanime/RestTopAnimeResponse.kt
@@ -4,12 +4,6 @@ import com.google.gson.annotations.SerializedName
 
 class RestTopAnimeResponse {
 
-    @SerializedName("request_hash")
-    var request_hash: String? = null
-    @SerializedName("request_cached")
-    var request_cached: Boolean? = null
-    @SerializedName("request_cached_expiry")
-    var request_cached_expiry: Int? = null
     @SerializedName("top")
     var top: List<TopAnime>? = null
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt
index a428841..1764878 100644
--- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt
@@ -2,7 +2,7 @@ package xyz.adjutor.aniki.topanime
 
 import com.google.gson.annotations.SerializedName
 
-//Content of the top field from the api of top manga
+//Content of the top field from the api of top anime
 class TopAnime{
 
     @SerializedName("mal_id")
@@ -13,16 +13,12 @@ class TopAnime{
     var title: String? = null
     @SerializedName("url")
     var url: String? = null
-    @SerializedName("type")
-    var type: String? = null
     @SerializedName("episodes")
-    var volumes: Int? = null
+    var episodes: Int? = null
     @SerializedName("start_date")
     var start_date: String? = null
     @SerializedName("end_date")
     var end_date: String? = null
-    @SerializedName("members")
-    var members: Int? = null
     @SerializedName("score")
     var score: Float? = null
     @SerializedName("image_url")
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 68a2c7b..e5a2bb5 100644
--- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt
@@ -1,23 +1,18 @@
-@file:Suppress("DEPRECATION")
-
 package xyz.adjutor.aniki.topanime
 
-import android.annotation.SuppressLint
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.os.AsyncTask
-import android.util.Log
+import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
 import xyz.adjutor.aniki.R
-import xyz.adjutor.aniki.topanime.TopAnime
-import xyz.adjutor.aniki.topanime.TopAnimeAdapter
 
-class TopAnimeAdapter(val animeList: List<TopAnime>) :
+class TopAnimeAdapter(private val animeList: List<TopAnime>) :
         RecyclerView.Adapter<TopAnimeAdapter.AnimeViewHolder>() {
 
     // Describes an item view and its place within the RecyclerView
@@ -26,7 +21,7 @@ class TopAnimeAdapter(val animeList: List<TopAnime>) :
         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)
-
+        val cardview: CardView = itemView.findViewById(R.id.cv_cardView)
     }
 
     // Returns a new ViewHolder
@@ -48,27 +43,37 @@ class TopAnimeAdapter(val animeList: List<TopAnime>) :
         holder.animeTitle.text = currentAnime.title
         holder.animeRank.text = currentAnime.rank.toString()
         holder.animeScore.text = currentAnime.score.toString()
-        DownloadImageFromInternet(holder.animeImage).execute(currentAnime.image_url)
-    }
+        val image: String = currentAnime.image_url.toString()
+        Glide
+                .with(holder.itemView.context)
+                .load(image)
+                .apply(RequestOptions().override(400))
+                .into(holder.animeImage)
 
-    @SuppressLint("StaticFieldLeak")
-    private inner class DownloadImageFromInternet(var imageView: ImageView) : AsyncTask<String, Void, Bitmap?>() {
-        override fun doInBackground(vararg urls: String): Bitmap? {
-            val imageURL = urls[0]
-            var image: Bitmap? = null
-            try {
-                val `in` = java.net.URL(imageURL).openStream()
-                image = BitmapFactory.decodeStream(`in`)
-            }
-            catch (e: Exception) {
-                Log.e("Error Message", e.message.toString())
-                e.printStackTrace()
+        //when you click on a selected cardview, some datas are sent to the other activity
+        holder.cardview.setOnClickListener {
+            val currentAnimeId = "theanimeid"
+            val currentAnimeTitle = "theanimetitle"
+            val currentAnimeRank = "theanimerank"
+            val currentAnimeScore = "theanimescore"
+            val currentAnimeImageUrl = "theanimeimageurl"
+            val currentAnimeEpisodes = "theanimeepisodes"
+            val currentAnimeStartDate = "theanimestartdate"
+            val currentAnimeEndDate = "theanimeenddate"
+            val currentAnimeUrl = "theanimeurl"
+
+            val intent: Intent = Intent(holder.itemView.context, DetailTopAnimeActivity::class.java).apply {
+                putExtra(currentAnimeId, currentAnime.mal_id.toString())
+                putExtra(currentAnimeTitle, currentAnime.title)
+                putExtra(currentAnimeRank, currentAnime.rank.toString())
+                putExtra(currentAnimeScore, currentAnime.score.toString())
+                putExtra(currentAnimeImageUrl, currentAnime.image_url.toString())
+                putExtra(currentAnimeEpisodes, currentAnime.episodes.toString())
+                putExtra(currentAnimeStartDate, currentAnime.start_date)
+                putExtra(currentAnimeEndDate, currentAnime.end_date.toString())
+                putExtra(currentAnimeUrl, currentAnime.url.toString())
             }
-            return image
-        }
-        override fun onPostExecute(result: Bitmap?) {
-            imageView.setImageBitmap(result)
+            holder.itemView.context.startActivity(intent)
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeApi.kt
index 6d8669c..bea4c63 100644
--- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeApi.kt
@@ -1,7 +1,7 @@
 package xyz.adjutor.aniki.topanime
 
-import retrofit2.http.GET
 import retrofit2.Call
+import retrofit2.http.GET
 
 interface TopAnimeApi {
 
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 b1fe2e2..f2d5e4c 100644
--- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt
@@ -20,7 +20,6 @@ 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() {
@@ -38,7 +37,7 @@ class TopAnimePage : Fragment() {
         // Inflate the layout for this fragment
         val view = inflater.inflate(R.layout.top_anime_page, container, false)
 
-        sharedPreferences = view.context.getSharedPreferences("app_aniki", Context.MODE_PRIVATE)
+        sharedPreferences = view.context.getSharedPreferences("sp_anime", Context.MODE_PRIVATE)
 
         val animeList: List<TopAnime>? = getDataFromCache()
         if(animeList != null ){
@@ -95,9 +94,9 @@ class TopAnimePage : Fragment() {
             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
+                    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
+                    showList(view, animeList) //calling the method in charge of displaying on the recyclerview
 
                 } else {
                     showError() //a snackbar
@@ -121,7 +120,7 @@ class TopAnimePage : Fragment() {
     }
 
     private fun showError() {
-        Snackbar.make(requireView(), "HA? YOU THOUGHT IT WAS AN API !? BUT IT WAS I, ERROR !", Snackbar.LENGTH_LONG)
+        Snackbar.make(requireView(), "API ERROR", Snackbar.LENGTH_LONG)
                 .setAction("Action", null).show()
     }