diff options
Diffstat (limited to 'app/src/main/java/xyz/adjutor/aniki')
4 files changed, 193 insertions, 14 deletions
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt index 9b75aec..263b93c 100644 --- a/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt +++ b/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt @@ -13,6 +13,9 @@ class MangaResponse { //only kept the infos I didn't have and that were interest @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/SearchMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt index 13b2446..79f8cb3 100644 --- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt +++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt @@ -1,10 +1,12 @@ 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 @@ -19,7 +21,7 @@ class SearchMangaAdapter(private val mangaList: List<SearchManga>) : 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) + val cardview: CardView = itemView.findViewById(R.id.cv_cardView) } // Returns a new ViewHolder @@ -39,7 +41,7 @@ class SearchMangaAdapter(private val mangaList: List<SearchManga>) : override fun onBindViewHolder(holder: MangaViewHolder, position: Int) { val currentManga: SearchManga = mangaList[position] holder.mangaTitle.text = currentManga.title - holder.mangaRank.text = "" //the rank isnt supplied by this API + 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 @@ -48,33 +50,35 @@ class SearchMangaAdapter(private val mangaList: List<SearchManga>) : .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 currentMangaTitle = "themangatitle" - val currentMangaScore = "themangascore" + val currentMangaUrl = "themangaurl" val currentMangaImageUrl = "themangaimageurl" + val currentMangaTitle = "themangatitle" + val currentMangaChapters = "themangachapters" val currentMangaVolumes = "themangavolumes" + val currentMangaScore = "themangascore" val currentMangaStartDate = "themangastartdate" val currentMangaEndDate = "themangaenddate" - val currentMangaUrl = "themangaurl" //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(currentMangaTitle, currentManga.title) - putExtra(currentMangaScore, currentManga.score.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()) - putExtra(currentMangaUrl, currentManga.url.toString()) } holder.itemView.context.startActivity(intent) } - */ + } }
\ No newline at end of file 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 fc10e89..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 @@ -29,12 +29,14 @@ class DetailTopMangaActivity : AppCompatActivity() { .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 |