From 7c8476a2128f6c4494eaa2d0a363d8cbe3261ba6 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Sat, 20 Feb 2021 18:56:42 +0100 Subject: Beginning the manga api part. --- app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt') 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..3576e7b 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") -- cgit v1.2.3 From 8201603b4f6a7216f466d4a839421415d3e0f6dc Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Sun, 21 Feb 2021 18:05:34 +0100 Subject: Only keeping useful infos from api responses --- app/src/main/java/xyz/adjutor/aniki/manga/Manga.kt | 21 ++------------------- .../adjutor/aniki/topanime/RestTopAnimeResponse.kt | 6 ------ .../java/xyz/adjutor/aniki/topanime/TopAnime.kt | 6 ------ .../adjutor/aniki/topmanga/RestTopMangaResponse.kt | 6 ------ .../java/xyz/adjutor/aniki/topmanga/TopManga.kt | 6 ------ 5 files changed, 2 insertions(+), 43 deletions(-) (limited to 'app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt') diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/Manga.kt b/app/src/main/java/xyz/adjutor/aniki/manga/Manga.kt index 43944c3..baba9f5 100644 --- a/app/src/main/java/xyz/adjutor/aniki/manga/Manga.kt +++ b/app/src/main/java/xyz/adjutor/aniki/manga/Manga.kt @@ -2,30 +2,13 @@ package xyz.adjutor.aniki.manga import com.google.gson.annotations.SerializedName -//Content of the top field from the api of manga -class Manga{ +class Manga{ //only kept the infos I didnt have and that were interresting to me. - @SerializedName("url") - var url: String? = null - @SerializedName("title") - var title: String? = null - @SerializedName("rank") - var rank: Int? = null - @SerializedName("volumes") - var volumes: Int? = null @SerializedName("chapters") var chapters: Int? = null - @SerializedName("start_date") - var start_date: String? = null - @SerializedName("end_date") - var end_date: String? = null - @SerializedName("score") - var score: Float? = null - @SerializedName("image_url") - var image_url: String? = null @SerializedName("synopsis") var synopsis: String? = null @SerializedName("background") - var background: String? = null + var background: String? = null //a bit of background story about the manga } 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? = 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 3576e7b..e063ad1 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt @@ -11,18 +11,12 @@ class TopAnime{ var rank: Int? = null @SerializedName("title") var title: String? = null - @SerializedName("url") - var url: String? = null - @SerializedName("type") - var type: String? = null @SerializedName("episodes") 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/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? = 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..0f73dd4 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopManga.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopManga.kt @@ -11,18 +11,12 @@ class TopManga{ var rank: Int? = null @SerializedName("title") 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") -- cgit v1.2.3 From e79bf68553676c9be09f4616aadcd522149c506e Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Mon, 22 Feb 2021 19:51:27 +0100 Subject: Detail is now working for animes --- app/src/main/AndroidManifest.xml | 4 + .../main/java/xyz/adjutor/aniki/anime/AnimeApi.kt | 2 +- .../aniki/topanime/DetailTopAnimeActivity.kt | 179 +++++++++++++ .../java/xyz/adjutor/aniki/topanime/TopAnime.kt | 4 +- .../xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt | 43 ++- .../xyz/adjutor/aniki/topanime/TopAnimePage.kt | 6 +- .../aniki/topmanga/DetailTopMangaActivity.kt | 2 +- .../xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt | 6 +- .../xyz/adjutor/aniki/topmanga/TopMangaPage.kt | 2 +- .../main/res/layout/activity_detail_top_anime.xml | 287 +++++++++++++++++++++ app/src/main/res/values/strings.xml | 2 + 11 files changed, 518 insertions(+), 19 deletions(-) create mode 100644 app/src/main/java/xyz/adjutor/aniki/topanime/DetailTopAnimeActivity.kt create mode 100644 app/src/main/res/layout/activity_detail_top_anime.xml (limited to 'app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5316b25..09802b7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,6 +17,10 @@ android:name=".topmanga.DetailTopMangaActivity" android:label="Details" android:theme="@style/Theme.Aniki" /> + + fun getAnimeData(@Path("id") id: String): Call } \ No newline at end of file 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..383c73e --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/topanime/DetailTopAnimeActivity.kt @@ -0,0 +1,179 @@ +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() {}.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 { + 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 anime = response.body() //getting the RestAnimeResponse fields + saveList(anime) + showDetail(anime!!) + + } else { + showError("API ERROR : is not successful") + } + } + + override fun onFailure(call: Call, t: Throwable) { + showError("API ERROR : onFailure") + } + + }) + } + + private fun showDetail(anime: RestAnimeResponse) { + //elements from RestAnimeResponse + val tvSynopsis: TextView = findViewById(R.id.tv_synopsis) + val tvBackground: TextView = findViewById(R.id.tv_background) + + tvSynopsis.text = anime.synopsis.toString() + + tvBackground.text = if (anime.background != null){ + anime.background.toString() + } else { + fieldIsNull() + } + + } + + 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/TopAnime.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt index e063ad1..1764878 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt @@ -11,8 +11,10 @@ class TopAnime{ var rank: Int? = null @SerializedName("title") var title: String? = null + @SerializedName("url") + var url: String? = null @SerializedName("episodes") - var volumes: Int? = null + var episodes: Int? = null @SerializedName("start_date") var start_date: String? = null @SerializedName("end_date") 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 d38adb2..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,16 +1,18 @@ package xyz.adjutor.aniki.topanime +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 TopAnimeAdapter(val animeList: List) : +class TopAnimeAdapter(private val animeList: List) : RecyclerView.Adapter() { // Describes an item view and its place within the RecyclerView @@ -19,6 +21,7 @@ class TopAnimeAdapter(val animeList: List) : 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 @@ -40,13 +43,37 @@ class TopAnimeAdapter(val animeList: List) : holder.animeTitle.text = currentAnime.title holder.animeRank.text = currentAnime.rank.toString() holder.animeScore.text = currentAnime.score.toString() - val image : String = currentAnime.image_url.toString() + val image: String = currentAnime.image_url.toString() Glide - .with(holder.itemView.context) - .load(image) - .apply(RequestOptions().override(400)) - .into(holder.animeImage) - } + .with(holder.itemView.context) + .load(image) + .apply(RequestOptions().override(400)) + .into(holder.animeImage) -} + //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()) + } + holder.itemView.context.startActivity(intent) + } + } +} \ No newline at end of file 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 53dca8a..f2d5e4c 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt @@ -37,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? = getDataFromCache() if(animeList != null ){ @@ -94,9 +94,9 @@ class TopAnimePage : Fragment() { 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 animeList = response.body()!!.getResults() //getting the "top" field containing our list of TopAnimes + val animeList: List = 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 diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt index 70e1422..2b1fac4 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt @@ -44,7 +44,7 @@ class DetailTopMangaActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_detail_top_manga) - sharedPreferences = this.getSharedPreferences("app_aniki", Context.MODE_PRIVATE) + sharedPreferences = this.getSharedPreferences("sp_manga", Context.MODE_PRIVATE) val mangaId = intent.getStringExtra(intentMangaId) val mangaTitle = intent.getStringExtra(intentMangaTitle) 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 d64a744..0396b3d 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt @@ -12,7 +12,7 @@ import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions import xyz.adjutor.aniki.R -class TopMangaAdapter(val mangaList: List) : +class TopMangaAdapter(private val mangaList: List) : RecyclerView.Adapter() { // Describes an item view and its place within the RecyclerView @@ -22,7 +22,6 @@ class TopMangaAdapter(val mangaList: List) : 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 @@ -77,5 +76,4 @@ class TopMangaAdapter(val mangaList: List) : holder.itemView.context.startActivity(intent) } } -} - +} \ No newline at end of file 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 c560ffd..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? = getDataFromCache() if(mangaList != null ){ diff --git a/app/src/main/res/layout/activity_detail_top_anime.xml b/app/src/main/res/layout/activity_detail_top_anime.xml new file mode 100644 index 0000000..6afa6ad --- /dev/null +++ b/app/src/main/res/layout/activity_detail_top_anime.xml @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 a730c17..bb9520a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,5 +33,7 @@ Background "More info at" https://myanimelist.net/media/id/name + "Episodes " + 0000 \ No newline at end of file -- cgit v1.2.3