aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/xyz/adjutor/aniki/manga
diff options
context:
space:
mode:
authorClyhtsuriva <aimeric@adjutor.xyz>2021-03-14 13:10:10 +0100
committerClyhtsuriva <aimeric@adjutor.xyz>2021-03-14 13:10:10 +0100
commitdd4ea618de112f527fb96f1aaec7efef75ba9fce (patch)
tree53cac7d8c627f02dfef171a0388da49864c50887 /app/src/main/java/xyz/adjutor/aniki/manga
parentf9f079eea806454d49d6088089511d72e1c28f86 (diff)
parent1d70485121c604300ae371468f2f3c6fbdca395c (diff)
Merge branch 'feature/search' into develop
Diffstat (limited to 'app/src/main/java/xyz/adjutor/aniki/manga')
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt2
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt (renamed from app/src/main/java/xyz/adjutor/aniki/manga/RestMangaResponse.kt)5
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt169
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/search/SearchManga.kt34
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt83
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaApi.kt12
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt120
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaResponse.kt13
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt45
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaAdapter.kt1
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt2
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt19
-rw-r--r--app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaResponse.kt (renamed from app/src/main/java/xyz/adjutor/aniki/manga/topmanga/RestTopMangaResponse.kt)6
13 files changed, 475 insertions, 36 deletions
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt
index 419d510..f1b51a4 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt
@@ -7,6 +7,6 @@ import retrofit2.http.Path
interface MangaApi {
@GET("v3/manga/{id}")
- fun getMangaData(@Path("id") id: String): Call<RestMangaResponse>
+ fun getMangaData(@Path("id") id: String): Call<MangaResponse>
} \ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/RestMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt
index 10df7a5..263b93c 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/RestMangaResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt
@@ -2,7 +2,7 @@ package xyz.adjutor.aniki.manga
import com.google.gson.annotations.SerializedName
-class RestMangaResponse { //only kept the infos I didn't have and that were interesting to me.
+class MangaResponse { //only kept the infos I didn't have and that were interesting to me.
@SerializedName("mal_id")
var mal_id: Int? = null
@@ -13,6 +13,9 @@ class RestMangaResponse { //only kept the infos I didn't have and that were inte
@SerializedName("synopsis")
var synopsis: String? = null
+ @SerializedName("rank")
+ var rank: Int? = null //added for the search feature (detail)
+
@SerializedName("background")
var background: String? = null //a bit of background story about the manga
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt
new file mode 100644
index 0000000..4ae01f8
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt
@@ -0,0 +1,169 @@
+package xyz.adjutor.aniki.manga.search
+
+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 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.MangaResponse
+
+class DetailSearchMangaActivity : AppCompatActivity() {
+
+ private var baseUrl = "https://api.jikan.moe/"
+ private val gson = GsonBuilder()
+ .setLenient()
+ .create()
+
+ //used in the list
+ private val intentMangaImageUrl = "themangaimageurl"
+ private val intentMangaTitle = "themangatitle"
+ private val intentMangaScore = "themangascore"
+
+ //only used for the detail
+ private val intentMangaId = "themangaid"
+ private val intentMangaUrl = "themangaurl"
+ private val intentMangaChapters = "themangachapters"
+ private val intentMangaVolumes = "themangavolumes"
+ private val intentMangaStartDate = "themangastartdate"
+ private val intentMangaEndDate = "themangaenddate"
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_detail_search_manga)
+
+ val mangaImageUrl = intent.getStringExtra(intentMangaImageUrl)
+ val mangaTitle = intent.getStringExtra(intentMangaTitle)
+ val mangaScore = intent.getStringExtra(intentMangaScore)
+
+ val mangaId = intent.getStringExtra(intentMangaId)
+ val mangaUrl = intent.getStringExtra(intentMangaUrl)
+ val mangaChapters = intent.getStringExtra(intentMangaChapters)
+ val mangaVolumes = intent.getStringExtra(intentMangaVolumes)
+ val mangaStartDate = intent.getStringExtra(intentMangaStartDate)
+ val mangaEndDate = intent.getStringExtra(intentMangaEndDate)
+
+
+ val ivImage: ImageView = findViewById(R.id.iv_detail_image)
+ val tvTitle: TextView = findViewById(R.id.tv_detail_title)
+ val tvScore: TextView = findViewById(R.id.tv_detail_score)
+
+ val tvId: TextView = findViewById(R.id.tv_detail_id)
+ val tvUrl: TextView = findViewById(R.id.tv_url)
+ val tvChapters: TextView = findViewById(R.id.tv_chapters)
+ 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)
+
+ Glide
+ .with(this)
+ .load(mangaImageUrl)
+ .apply(RequestOptions().override(400))
+ .into(ivImage)
+ tvTitle.text = mangaTitle
+ tvScore.text = mangaScore
+
+
+ tvId.text = mangaId
+ tvUrl.text = mangaUrl
+
+ //using null as a string because it has been converted to a string before
+ tvChapters.text = if (mangaChapters != "null") {
+ mangaChapters
+ } else {
+ fieldIsNull()
+ }
+
+ tvVolumes.text = if (mangaVolumes != "null") {
+ mangaVolumes
+ } else {
+ fieldIsNull()
+ }
+
+ tvStartDate.text = splitDate(mangaStartDate!!)
+
+ tvEndDate.text = if (mangaEndDate != "null") {
+ splitDate(mangaEndDate!!)
+ } else {
+ fieldIsNull()
+ }
+
+ makeApiCall(baseUrl, mangaId.toString())
+
+ }
+
+ private fun splitDate(mangaDate: String): CharSequence {
+ val delimiter = "T"
+ return mangaDate
+ .split(delimiter) //split between the date and the time
+ .toTypedArray()[0] //convert it to an array and take the first string
+
+ }
+
+ 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<MangaResponse> {
+ override fun onResponse(
+ call: Call<MangaResponse>,
+ response: Response<MangaResponse>
+ ) {
+ 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 MangaResponse fields
+ showDetail(manga!!)
+
+ } else {
+ showError("API ERROR : is not successful")
+ }
+ }
+
+ override fun onFailure(call: Call<MangaResponse>, t: Throwable) {
+ showError("API ERROR : onFailure")
+ }
+
+ })
+ }
+
+ private fun showDetail(manga: MangaResponse) {
+ //elements from MangaResponse
+ val tvSynopsis: TextView = findViewById(R.id.tv_synopsis)
+ val tvRank: TextView = findViewById(R.id.tv_detail_rank)
+ val tvBackground: TextView = findViewById(R.id.tv_background)
+
+ tvSynopsis.text = manga.synopsis.toString()
+
+ tvRank.text = manga.rank.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"
+ }
+} \ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchManga.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchManga.kt
new file mode 100644
index 0000000..518a0a6
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchManga.kt
@@ -0,0 +1,34 @@
+package xyz.adjutor.aniki.manga.search
+
+import com.google.gson.annotations.SerializedName
+
+class SearchManga {
+
+ @SerializedName("mal_id")
+ var mal_id: Int? = null
+
+ @SerializedName("url")
+ var url: String? = null
+
+ @SerializedName("image_url")
+ var image_url: String? = null
+
+ @SerializedName("title")
+ var title: String? = null
+
+ @SerializedName("chapters")
+ var chapters: Int? = null
+
+ @SerializedName("volumes")
+ var volumes: Int? = null
+
+ @SerializedName("score")
+ var score: Float? = null
+
+ @SerializedName("start_date") //we'll maybe remove this later
+ var start_date: String? = null
+
+ @SerializedName("end_date") //we'll maybe remove this later
+ var end_date: String? = null
+
+} \ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt
new file mode 100644
index 0000000..fb95c9c
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt
@@ -0,0 +1,83 @@
+package xyz.adjutor.aniki.manga.search
+
+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 SearchMangaAdapter(private val mangaList: List<SearchManga>) :
+ RecyclerView.Adapter<SearchMangaAdapter.MangaViewHolder>() {
+
+ // Describes an item view and its place within the RecyclerView
+ 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)
+ val cardview: CardView = itemView.findViewById(R.id.cv_cardView)
+ }
+
+ // Returns a new ViewHolder
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MangaViewHolder {
+ val view = LayoutInflater.from(parent.context)
+ .inflate(R.layout.item_layout, parent, false)
+
+ return MangaViewHolder(view)
+ }
+
+ // Returns size of data list
+ override fun getItemCount(): Int {
+ return mangaList.size
+ }
+
+ // Displays data at a certain position
+ override fun onBindViewHolder(holder: MangaViewHolder, position: Int) {
+ val currentManga: SearchManga = mangaList[position]
+ holder.mangaTitle.text = currentManga.title
+ holder.mangaRank.text = "" //the rank isn't supplied by this API
+ holder.mangaScore.text = currentManga.score.toString()
+ val image: String = currentManga.image_url.toString()
+ Glide
+ .with(holder.itemView.context)
+ .load(image)
+ .apply(RequestOptions().override(400))
+ .into(holder.mangaImage)
+
+ //when you click on a selected cardview, some datas are sent to the other activity
+ holder.cardview.setOnClickListener {
+ val currentMangaId = "themangaid"
+ val currentMangaUrl = "themangaurl"
+ val currentMangaImageUrl = "themangaimageurl"
+ val currentMangaTitle = "themangatitle"
+ val currentMangaChapters = "themangachapters"
+ val currentMangaVolumes = "themangavolumes"
+ val currentMangaScore = "themangascore"
+ val currentMangaStartDate = "themangastartdate"
+ val currentMangaEndDate = "themangaenddate"
+
+ //intent is used to pass data to another activity
+
+ val intent: Intent =
+ Intent(holder.itemView.context, DetailSearchMangaActivity::class.java).apply {
+ putExtra(currentMangaId, currentManga.mal_id.toString())
+ putExtra(currentMangaUrl, currentManga.url.toString())
+ putExtra(currentMangaImageUrl, currentManga.image_url.toString())
+ putExtra(currentMangaTitle, currentManga.title)
+ putExtra(currentMangaChapters, currentManga.chapters.toString())
+ putExtra(currentMangaVolumes, currentManga.volumes.toString())
+ putExtra(currentMangaScore, currentManga.score.toString())
+ putExtra(currentMangaStartDate, currentManga.start_date)
+ putExtra(currentMangaEndDate, currentManga.end_date.toString())
+ }
+ holder.itemView.context.startActivity(intent)
+ }
+
+ }
+} \ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaApi.kt
new file mode 100644
index 0000000..6f3e63d
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaApi.kt
@@ -0,0 +1,12 @@
+package xyz.adjutor.aniki.manga.search
+
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface SearchMangaApi {
+
+ @GET("v3/search/manga")
+ fun getSearchMangaData(@Query("q") q: String): Call<SearchMangaResponse>
+
+} \ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
new file mode 100644
index 0000000..f79db36
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
@@ -0,0 +1,120 @@
+package xyz.adjutor.aniki.manga.search
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
+import android.widget.Button
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.textfield.TextInputEditText
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import xyz.adjutor.aniki.MainActivity
+import xyz.adjutor.aniki.R
+
+class SearchMangaPage : Fragment() {
+
+ val gson: Gson = GsonBuilder()
+ .setLenient()
+ .create()
+ private var baseUrl = "https://api.jikan.moe/" //the api's base url
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ // Inflate the layout for this fragment
+
+ return inflater.inflate(R.layout.search_manga_page, container, false)
+ }
+
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ //button to return to the home page
+ view.findViewById<Button>(R.id.button_home).setOnClickListener {
+ findNavController().navigate(R.id.action_SearchMangaPage_to_HomePage)
+ }
+
+ view.findViewById<Button>(R.id.button_query).setOnClickListener{
+ val userInput = view.findViewById<TextInputEditText>(R.id.tiet_query).text.toString()
+ hideKeyboard()
+ makeApiCall(view, baseUrl, userInput)
+ }
+ }
+
+ private fun hideKeyboard() {
+ val activity = activity as MainActivity
+
+ val view = activity.currentFocus
+ if (view != null) {
+ val imm = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+ imm.hideSoftInputFromWindow(view.windowToken, 0)
+ }
+ }
+
+
+ //display the recyclerview
+ fun showList(view: View, mangaList: List<SearchManga>) {
+ val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
+ recyclerView.setHasFixedSize(true)
+ recyclerView.layoutManager = LinearLayoutManager(view.context)
+ recyclerView.adapter = SearchMangaAdapter(mangaList)
+ (recyclerView.adapter as SearchMangaAdapter).notifyDataSetChanged()
+ }
+
+ private fun makeApiCall(view: View, BASE_URL: String, query: String) {
+
+ val retrofit = Retrofit.Builder()
+ .baseUrl(BASE_URL)
+ .addConverterFactory(GsonConverterFactory.create(gson))
+ .build()
+
+ val service = retrofit.create(SearchMangaApi::class.java)
+ val call = service.getSearchMangaData(q = query) //fate is an exemple, we'll have to replace it by the user input.
+
+ call.enqueue(object : Callback<SearchMangaResponse> {
+ override fun onResponse(
+ call: Call<SearchMangaResponse>,
+ response: Response<SearchMangaResponse>
+ ) {
+ if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
+
+ val mangaList: List<SearchManga> = response.body()!!
+ .getResults() //getting the "search" field containing our list of SearchMangas
+
+ showList(
+ view,
+ mangaList
+ ) //calling the method in charge of displaying on the recyclerview
+
+ } else {
+ showError() //a snackbar
+ }
+ }
+
+ override fun onFailure(call: Call<SearchMangaResponse>, t: Throwable) {
+ showError()
+ }
+
+ })
+ }
+
+ private fun showError() {
+ Snackbar.make(requireView(), "API ERROR : Verify your internet connection or your query.", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show()
+ }
+
+} \ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaResponse.kt
new file mode 100644
index 0000000..7721258
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaResponse.kt
@@ -0,0 +1,13 @@
+package xyz.adjutor.aniki.manga.search
+
+import com.google.gson.annotations.SerializedName
+
+class SearchMangaResponse { //only kept the infos I didn't have and that were interesting to me.
+
+ @SerializedName("results")
+ private lateinit var results: List<SearchManga>
+
+ fun getResults(): List<SearchManga> {
+ return results
+ }
+}
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt
index c7b6317..6d89437 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt
@@ -18,23 +18,25 @@ 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 xyz.adjutor.aniki.manga.MangaResponse
import java.lang.reflect.Type
class DetailTopMangaActivity : AppCompatActivity() {
private var baseUrl = "https://api.jikan.moe/"
- var sharedPreferences: SharedPreferences? = null
+ private lateinit var sharedPreferences: SharedPreferences
private val gson = GsonBuilder()
.setLenient()
.create()
- private val intentMangaId = "themangaid"
+ //used in the list
private val intentMangaTitle = "themangatitle"
private val intentMangaRank = "themangarank"
private val intentMangaScore = "themangascore"
private val intentMangaImageUrl = "themangaimageurl"
+ //only used for the detail
+ private val intentMangaId = "themangaid"
private val intentMangaVolumes = "themangavolumes"
private val intentMangaStartDate = "themangastartdate"
private val intentMangaEndDate = "themangaenddate"
@@ -46,29 +48,28 @@ class DetailTopMangaActivity : AppCompatActivity() {
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 mangaId = intent.getStringExtra(intentMangaId)
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 tvId: TextView = findViewById(R.id.tv_detail_id)
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
@@ -78,6 +79,8 @@ class DetailTopMangaActivity : AppCompatActivity() {
.apply(RequestOptions().override(400))
.into(ivImage)
+ tvId.text = mangaId
+
//using null as a string because it has been converted to a string before
tvVolumes.text = if (mangaVolumes != "null") {
mangaVolumes
@@ -95,7 +98,7 @@ class DetailTopMangaActivity : AppCompatActivity() {
tvUrl.text = mangaUrl
- val manga: RestMangaResponse? = getDataFromCache(mangaId.toString())
+ val manga: MangaResponse? = getDataFromCache(mangaId.toString())
if (manga != null) {
showDetail(manga)
} else {
@@ -105,13 +108,13 @@ class DetailTopMangaActivity : AppCompatActivity() {
}
- private fun getDataFromCache(mangaId: String): RestMangaResponse? {
- val jsonManga: String? = sharedPreferences?.getString(mangaId, null)
+ private fun getDataFromCache(mangaId: String): MangaResponse? {
+ val jsonManga: String? = sharedPreferences.getString(mangaId, null)
return if (jsonManga == null) {
null
} else {
- val type: Type = object : TypeToken<RestMangaResponse>() {}.type
+ val type: Type = object : TypeToken<MangaResponse>() {}.type
gson.fromJson(jsonManga, type)
}
}
@@ -126,14 +129,14 @@ class DetailTopMangaActivity : AppCompatActivity() {
val service = retrofit.create(MangaApi::class.java)
val call = service.getMangaData(mangaId) //based on the id
- call.enqueue(object : Callback<RestMangaResponse> {
+ call.enqueue(object : Callback<MangaResponse> {
override fun onResponse(
- call: Call<RestMangaResponse>,
- response: Response<RestMangaResponse>
+ call: Call<MangaResponse>,
+ response: Response<MangaResponse>
) {
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
+ val manga = response.body() //getting the MangaResponse fields
saveList(manga)
showDetail(manga!!)
@@ -142,15 +145,15 @@ class DetailTopMangaActivity : AppCompatActivity() {
}
}
- override fun onFailure(call: Call<RestMangaResponse>, t: Throwable) {
+ override fun onFailure(call: Call<MangaResponse>, t: Throwable) {
showError("API ERROR : onFailure")
}
})
}
- private fun showDetail(manga: RestMangaResponse) {
- //elements from RestMangaResponse
+ private fun showDetail(manga: MangaResponse) {
+ //elements from MangaResponse
val tvChapters: TextView = findViewById(R.id.tv_chapters)
val tvSynopsis: TextView = findViewById(R.id.tv_synopsis)
val tvBackground: TextView = findViewById(R.id.tv_background)
@@ -179,12 +182,12 @@ class DetailTopMangaActivity : AppCompatActivity() {
return "Unknown"
}
- fun saveList(manga: RestMangaResponse?) {
+ fun saveList(manga: MangaResponse?) {
val jsonString: String = gson.toJson(manga)
sharedPreferences
- ?.edit()
- ?.putString(manga?.mal_id.toString(), jsonString)
- ?.apply()
+ .edit()
+ .putString(manga?.mal_id.toString(), jsonString)
+ .apply()
}
} \ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaAdapter.kt
index 626f34e..d0c56f7 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaAdapter.kt
@@ -62,6 +62,7 @@ class TopMangaAdapter(private val mangaList: List<TopManga>) :
val currentMangaEndDate = "themangaenddate"
val currentMangaUrl = "themangaurl"
+ //intent is used to pass data to another activity
val intent: Intent =
Intent(holder.itemView.context, DetailTopMangaActivity::class.java).apply {
putExtra(currentMangaId, currentManga.mal_id.toString())
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt
index 278c3e1..629fe02 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt
@@ -6,6 +6,6 @@ import retrofit2.http.GET
interface TopMangaApi {
@GET("v3/top/manga")
- fun getTopMangaData(): Call<RestTopMangaResponse>
+ fun getTopMangaData(): Call<TopMangaResponse>
} \ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt
index ce9b1c6..b35bcdd 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt
@@ -26,7 +26,7 @@ import java.lang.reflect.Type
class TopMangaPage : Fragment() {
- var sharedPreferences: SharedPreferences? = null
+ private lateinit var sharedPreferences: SharedPreferences
val gson: Gson = GsonBuilder()
.setLenient()
.create()
@@ -53,7 +53,7 @@ class TopMangaPage : Fragment() {
private fun getDataFromCache(): List<TopManga>? {
//the value of the mangaList json, if nothing is found, return null
- val jsonManga: String? = sharedPreferences?.getString("jsonMangaList", null)
+ val jsonManga: String? = sharedPreferences.getString("jsonMangaList", null)
//if it's null, well, return null
return if (jsonManga == null) {
@@ -92,6 +92,7 @@ class TopMangaPage : Fragment() {
recyclerView.setHasFixedSize(true)
recyclerView.layoutManager = LinearLayoutManager(view.context)
recyclerView.adapter = TopMangaAdapter(mangaList)
+ (recyclerView.adapter as TopMangaAdapter).notifyDataSetChanged()
}
private fun makeApiCall(view: View, BASE_URL: String) {
@@ -104,10 +105,10 @@ class TopMangaPage : Fragment() {
val service = retrofit.create(TopMangaApi::class.java)
val call = service.getTopMangaData()
- call.enqueue(object : Callback<RestTopMangaResponse> {
+ call.enqueue(object : Callback<TopMangaResponse> {
override fun onResponse(
- call: Call<RestTopMangaResponse>,
- response: Response<RestTopMangaResponse>
+ call: Call<TopMangaResponse>,
+ response: Response<TopMangaResponse>
) {
if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
@@ -124,7 +125,7 @@ class TopMangaPage : Fragment() {
}
}
- override fun onFailure(call: Call<RestTopMangaResponse>, t: Throwable) {
+ override fun onFailure(call: Call<TopMangaResponse>, t: Throwable) {
showError()
}
@@ -135,9 +136,9 @@ class TopMangaPage : Fragment() {
val jsonString: String = gson.toJson(mangaList)
sharedPreferences
- ?.edit()
- ?.putString("jsonMangaList", jsonString)
- ?.apply()
+ .edit()
+ .putString("jsonMangaList", jsonString)
+ .apply()
}
private fun showError() {
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/RestTopMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaResponse.kt
index 87c5cfb..8577050 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/RestTopMangaResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaResponse.kt
@@ -2,12 +2,12 @@ package xyz.adjutor.aniki.manga.topmanga
import com.google.gson.annotations.SerializedName
-class RestTopMangaResponse {
+class TopMangaResponse {
@SerializedName("top")
- var top: List<TopManga>? = null
+ private lateinit var top: List<TopManga>
fun getResults(): List<TopManga> {
- return top!!
+ return top
}
} \ No newline at end of file