From 848c8bf1ba4f0f3ecf2eeae0b9be2d6a664db2b4 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Tue, 2 Mar 2021 10:46:48 +0100 Subject: Creating the APIs and the responses. --- .../aniki/manga/topmanga/DetailTopMangaActivity.kt | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt') 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..fc10e89 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,13 +18,13 @@ 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() @@ -95,7 +95,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 +105,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() {}.type + val type: Type = object : TypeToken() {}.type gson.fromJson(jsonManga, type) } } @@ -126,14 +126,14 @@ class DetailTopMangaActivity : AppCompatActivity() { val service = retrofit.create(MangaApi::class.java) val call = service.getMangaData(mangaId) //based on the id - call.enqueue(object : Callback { + call.enqueue(object : Callback { override fun onResponse( - call: Call, - response: Response + call: Call, + response: Response ) { 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 +142,15 @@ class DetailTopMangaActivity : AppCompatActivity() { } } - override fun onFailure(call: Call, t: Throwable) { + override fun onFailure(call: Call, 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 +179,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 -- cgit v1.2.3 From 7c9c60ae0e19946a59695186566d3ea1a67c4c47 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Fri, 12 Mar 2021 16:42:08 +0100 Subject: Detail for searched mangas is working. --- app/src/main/AndroidManifest.xml | 4 + .../java/xyz/adjutor/aniki/manga/MangaResponse.kt | 3 + .../manga/search/DetailSearchMangaActivity.kt | 169 +++++++++++ .../aniki/manga/search/SearchMangaAdapter.kt | 24 +- .../aniki/manga/topmanga/DetailTopMangaActivity.kt | 11 +- .../res/layout/activity_detail_search_manga.xml | 313 +++++++++++++++++++++ app/src/main/res/values/strings.xml | 1 + 7 files changed, 511 insertions(+), 14 deletions(-) create mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt create mode 100644 app/src/main/res/layout/activity_detail_search_manga.xml (limited to 'app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c24711c..4c79bd2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,6 +21,10 @@ android:name="xyz.adjutor.aniki.anime.topanime.DetailTopAnimeActivity" android:label="Details" android:theme="@style/Theme.Aniki" /> + { + override fun onResponse( + call: Call, + response: Response + ) { + 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, 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) : 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) : 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) : .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 diff --git a/app/src/main/res/layout/activity_detail_search_manga.xml b/app/src/main/res/layout/activity_detail_search_manga.xml new file mode 100644 index 0000000..75cad74 --- /dev/null +++ b/app/src/main/res/layout/activity_detail_search_manga.xml @@ -0,0 +1,313 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 c8c8ab9..0c56edc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -35,6 +35,7 @@ https://myanimelist.net/media/id/name "Episodes " 0000 + Search Manga Page Search Manga Search in the database -- cgit v1.2.3