Merge branch 'release/2.0'v2.0.0

6 files changed, 226 insertions, 43 deletions

diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt
new file mode 100644
index 0000000..2b1fac4
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt
@@ -0,0 +1,186 @@
+package xyz.adjutor.aniki.topmanga
+
+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.manga.MangaApi
+import xyz.adjutor.aniki.manga.RestMangaResponse
+import java.lang.reflect.Type
+
+class DetailTopMangaActivity : AppCompatActivity() {
+
+    private var baseUrl = "https://api.jikan.moe/"
+    var sharedPreferences: SharedPreferences? = null
+    private val gson = GsonBuilder()
+            .setLenient()
+            .create()
+
+    private val intentMangaId = "themangaid"
+    private val intentMangaTitle = "themangatitle"
+    private val intentMangaRank = "themangarank"
+    private val intentMangaScore = "themangascore"
+    private val intentMangaImageUrl = "themangaimageurl"
+
+    private val intentMangaVolumes = "themangavolumes"
+    private val intentMangaStartDate = "themangastartdate"
+    private val intentMangaEndDate = "themangaenddate"
+    private val intentMangaUrl = "themangaurl"
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_detail_top_manga)
+
+        sharedPreferences = this.getSharedPreferences("sp_manga", Context.MODE_PRIVATE)
+
+        val mangaId = intent.getStringExtra(intentMangaId)
+        val mangaTitle = intent.getStringExtra(intentMangaTitle)
+        val mangaRank = intent.getStringExtra(intentMangaRank)
+        val mangaScore = intent.getStringExtra(intentMangaScore)
+        val mangaImageUrl = intent.getStringExtra(intentMangaImageUrl)
+
+        val mangaVolumes = intent.getStringExtra(intentMangaVolumes)
+        val mangaStartDate = intent.getStringExtra(intentMangaStartDate)
+        val mangaEndDate = intent.getStringExtra(intentMangaEndDate)
+        val mangaUrl = intent.getStringExtra(intentMangaUrl)
+
+        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 tvVolumes: TextView = findViewById(R.id.tv_volumes)
+        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 = mangaId
+        tvTitle.text = mangaTitle
+        tvRank.text = mangaRank
+        tvScore.text = mangaScore
+        Glide
+            .with(this)
+            .load(mangaImageUrl)
+            .apply(RequestOptions().override(400))
+            .into(ivImage)
+
+        //using null as a string because it has been converted to a string before
+        tvVolumes.text = if (mangaVolumes != "null"){
+            mangaVolumes
+        } else {
+            fieldIsNull()
+        }
+
+        tvStartDate.text = mangaStartDate
+
+        tvEndDate.text = if (mangaEndDate != "null"){
+            mangaEndDate
+        } else {
+            fieldIsNull()
+        }
+
+        tvUrl.text = mangaUrl
+
+        val manga: RestMangaResponse? = getDataFromCache(mangaId.toString())
+        if(manga != null ){
+            showDetail(manga)
+        } else {
+            //taking the API's fields I want and displaying them
+            makeApiCall(baseUrl, mangaId.toString())
+        }
+
+    }
+
+    private fun getDataFromCache(mangaId: String): RestMangaResponse? {
+        val jsonManga: String?= sharedPreferences?.getString(mangaId, null)
+
+        return if(jsonManga == null) {
+            null
+        } else {
+            val type: Type = object : TypeToken<RestMangaResponse>() {}.type
+            gson.fromJson(jsonManga, type)
+        }
+    }
+
+    private fun makeApiCall(BASE_URL: String, mangaId: String) {
+
+        val retrofit = Retrofit.Builder()
+                .baseUrl(BASE_URL)
+                .addConverterFactory(GsonConverterFactory.create(gson))
+                .build()
+
+        val service = retrofit.create(MangaApi::class.java)
+        val call = service.getMangaData(mangaId) //based on the id
+
+        call.enqueue(object : Callback<RestMangaResponse> {
+            override fun onResponse(call: Call<RestMangaResponse>, response: Response<RestMangaResponse>) {
+                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 RestMangaResponse fields
+                    saveList(manga)
+                    showDetail(manga!!)
+
+                } else {
+                    showError("API ERROR : is not successful")
+                }
+            }
+
+            override fun onFailure(call: Call<RestMangaResponse>, t: Throwable) {
+                showError("API ERROR : onFailure")
+            }
+
+        })
+    }
+
+    private fun showDetail(manga: RestMangaResponse) {
+        //elements from RestMangaResponse
+        val tvChapters: TextView = findViewById(R.id.tv_chapters)
+        val tvSynopsis: TextView = findViewById(R.id.tv_synopsis)
+        val tvBackground: TextView = findViewById(R.id.tv_background)
+
+        tvChapters.text = if (manga.chapters != null){
+            manga.chapters.toString()
+        } else {
+            fieldIsNull()
+        }
+
+        tvSynopsis.text = manga.synopsis.toString()
+
+        tvBackground.text = if (manga.background != null){
+            manga.background.toString()
+        } else {
+            fieldIsNull()
+        }
+
+    }
+
+    fun showError(text: String) {
+        Toast.makeText(this, text, Toast.LENGTH_LONG).show()
+    }
+    private fun fieldIsNull(): String{
+        return "Unknown"
+    }
+
+    fun saveList(manga: RestMangaResponse?) {
+        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/topmanga/RestTopMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/RestTopMangaResponse.kt
index 897e8a2..dc7827a 100644
--- a/app/src/main/java/xyz/adjutor/aniki/topmanga/RestTopMangaResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/RestTopMangaResponse.kt
@@ -4,12 +4,6 @@ import com.google.gson.annotations.SerializedName
 
 class RestTopMangaResponse {
 
-    @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<TopManga>? = null
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopManga.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopManga.kt
index edf561d..05f4692 100644
--- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopManga.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopManga.kt
@@ -13,16 +13,12 @@ class TopManga{
     var title: String? = null
     @SerializedName("url")
     var url: String? = null
-    @SerializedName("type")
-    var type: String? = null
     @SerializedName("volumes")
     var volumes: 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/topmanga/TopMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt
index 22872b2..0396b3d 100644
--- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt
@@ -1,21 +1,18 @@
-@file:Suppress("DEPRECATION")
-
 package xyz.adjutor.aniki.topmanga
 
-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
 
-class TopMangaAdapter(val mangaList: List<TopManga>) :
+class TopMangaAdapter(private val mangaList: List<TopManga>) :
         RecyclerView.Adapter<TopMangaAdapter.MangaViewHolder>() {
 
     // Describes an item view and its place within the RecyclerView
@@ -24,7 +21,7 @@ class TopMangaAdapter(val mangaList: List<TopManga>) :
         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)
-
+        val cardview: CardView = itemView.findViewById(R.id.cv_cardView)
     }
 
     // Returns a new ViewHolder
@@ -46,27 +43,37 @@ class TopMangaAdapter(val mangaList: List<TopManga>) :
         holder.mangaTitle.text = currentManga.title
         holder.mangaRank.text = currentManga.rank.toString()
         holder.mangaScore.text = currentManga.score.toString()
-        DownloadImageFromInternet(holder.mangaImage).execute(currentManga.image_url)
-    }
+        val image: String = currentManga.image_url.toString()
+        Glide
+                .with(holder.itemView.context)
+                .load(image)
+                .apply(RequestOptions().override(400))
+                .into(holder.mangaImage)
 
-    @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 currentMangaId = "themangaid"
+            val currentMangaTitle = "themangatitle"
+            val currentMangaRank = "themangarank"
+            val currentMangaScore = "themangascore"
+            val currentMangaImageUrl = "themangaimageurl"
+            val currentMangaVolumes = "themangavolumes"
+            val currentMangaStartDate = "themangastartdate"
+            val currentMangaEndDate = "themangaenddate"
+            val currentMangaUrl = "themangaurl"
+
+            val intent: Intent = Intent(holder.itemView.context, DetailTopMangaActivity::class.java).apply {
+                putExtra(currentMangaId, currentManga.mal_id.toString())
+                putExtra(currentMangaTitle, currentManga.title)
+                putExtra(currentMangaRank, currentManga.rank.toString())
+                putExtra(currentMangaScore, currentManga.score.toString())
+                putExtra(currentMangaImageUrl, currentManga.image_url.toString())
+                putExtra(currentMangaVolumes, currentManga.volumes.toString())
+                putExtra(currentMangaStartDate, currentManga.start_date)
+                putExtra(currentMangaEndDate, currentManga.end_date.toString())
+                putExtra(currentMangaUrl, currentManga.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/topmanga/TopMangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaApi.kt
index 69c4cdd..e8231b0 100644
--- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaApi.kt
@@ -1,7 +1,7 @@
 package xyz.adjutor.aniki.topmanga
 
-import retrofit2.http.GET
 import retrofit2.Call
+import retrofit2.http.GET
 
 interface TopMangaApi {
 
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 697ba6f..f99cd9a 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("sp_manga", Context.MODE_PRIVATE)
 
         val mangaList: List<TopManga>? = getDataFromCache()
         if(mangaList != null ){
@@ -96,7 +96,7 @@ class TopMangaPage : Fragment() {
 
                     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
+                    showList(view, mangaList) //calling the method in charge of displaying on the recyclerview
 
                 } else {
                     showError() //a snackbar
@@ -120,7 +120,7 @@ class TopMangaPage : 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()
     }