From ac929460d07e0d0ef8c6b4ea569a2b2c6daa3b13 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Tue, 23 Mar 2021 11:47:53 +0100 Subject: Refactoring into MVC --- .../main/java/xyz/adjutor/aniki/anime/AnimeApi.kt | 12 -- .../java/xyz/adjutor/aniki/anime/AnimeResponse.kt | 16 -- .../anime/search/DetailSearchAnimeActivity.kt | 156 ------------------ .../xyz/adjutor/aniki/anime/search/SearchAnime.kt | 31 ---- .../aniki/anime/search/SearchAnimeAdapter.kt | 81 ---------- .../adjutor/aniki/anime/search/SearchAnimeApi.kt | 12 -- .../adjutor/aniki/anime/search/SearchAnimePage.kt | 134 ---------------- .../aniki/anime/search/SearchAnimeResponse.kt | 13 -- .../aniki/anime/topanime/DetailTopAnimeActivity.kt | 176 --------------------- .../xyz/adjutor/aniki/anime/topanime/TopAnime.kt | 35 ---- .../aniki/anime/topanime/TopAnimeAdapter.kt | 80 ---------- .../adjutor/aniki/anime/topanime/TopAnimeApi.kt | 12 -- .../adjutor/aniki/anime/topanime/TopAnimePage.kt | 173 -------------------- .../aniki/anime/topanime/TopAnimeResponse.kt | 13 -- 14 files changed, 944 deletions(-) delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/AnimeApi.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/AnimeResponse.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/search/DetailSearchAnimeActivity.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnime.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeAdapter.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeApi.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeResponse.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/topanime/DetailTopAnimeActivity.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnime.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimeAdapter.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimeApi.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimePage.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimeResponse.kt (limited to 'app/src/main/java/xyz/adjutor/aniki/anime') diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/anime/AnimeApi.kt deleted file mode 100644 index 52ca2ba..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeApi.kt +++ /dev/null @@ -1,12 +0,0 @@ -package xyz.adjutor.aniki.anime - -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Path - -interface AnimeApi { - - @GET("v3/anime/{id}") - fun getAnimeData(@Path("id") id: String): Call - -} \ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeResponse.kt b/app/src/main/java/xyz/adjutor/aniki/anime/AnimeResponse.kt deleted file mode 100644 index 9e279e1..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeResponse.kt +++ /dev/null @@ -1,16 +0,0 @@ -package xyz.adjutor.aniki.anime - -import com.google.gson.annotations.SerializedName - -class AnimeResponse { //only kept the infos I didn't have and that were interesting to me. - - @SerializedName("mal_id") - var mal_id: Int? = null - - @SerializedName("rank") - var rank: Int? = null //added for the search feature (detail) - - @SerializedName("synopsis") - var synopsis: String? = null - -} diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/DetailSearchAnimeActivity.kt b/app/src/main/java/xyz/adjutor/aniki/anime/search/DetailSearchAnimeActivity.kt deleted file mode 100644 index 2f4a6c2..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/anime/search/DetailSearchAnimeActivity.kt +++ /dev/null @@ -1,156 +0,0 @@ -package xyz.adjutor.aniki.anime.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.anime.AnimeApi -import xyz.adjutor.aniki.anime.AnimeResponse - -class DetailSearchAnimeActivity : AppCompatActivity() { - - private var baseUrl = "https://api.jikan.moe/" - private val gson = GsonBuilder() - .setLenient() - .create() - - //used in the list - private val intentAnimeImageUrl = "theanimeimageurl" - private val intentAnimeTitle = "theanimetitle" - private val intentAnimeScore = "theanimescore" - - //only used for the detail - private val intentAnimeId = "theanimeid" - private val intentAnimeUrl = "theanimeurl" - private val intentAnimeEpisodes = "theanimeepisodes" - private val intentAnimeStartDate = "theanimestartdate" - private val intentAnimeEndDate = "theanimeenddate" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_detail_search_anime) - - val animeImageUrl = intent.getStringExtra(intentAnimeImageUrl) - val animeTitle = intent.getStringExtra(intentAnimeTitle) - val animeScore = intent.getStringExtra(intentAnimeScore) - - val animeId = intent.getStringExtra(intentAnimeId) - val animeUrl = intent.getStringExtra(intentAnimeUrl) - val animeEpisodes = intent.getStringExtra(intentAnimeEpisodes) - val animeStartDate = intent.getStringExtra(intentAnimeStartDate) - val animeEndDate = intent.getStringExtra(intentAnimeEndDate) - - - 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 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) - - Glide - .with(this) - .load(animeImageUrl) - .apply(RequestOptions().override(400)) - .into(ivImage) - tvTitle.text = animeTitle - tvScore.text = animeScore - - - tvId.text = animeId - tvUrl.text = animeUrl - - //using null as a string because it has been converted to a string before - tvEpisodes.text = if (animeEpisodes != "null") { - animeEpisodes - } else { - fieldIsNull() - } - - tvStartDate.text = splitDate(animeStartDate!!) - - tvEndDate.text = if (animeEndDate != "null") { - splitDate(animeEndDate!!) - } else { - fieldIsNull() - } - - makeApiCall(baseUrl, animeId.toString()) - - } - - private fun splitDate(animeDate: String): CharSequence { - val delimiter = "T" - return animeDate - .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, - animeId: String - ) { //we take the rest of the data that we need from the internet - - 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 AnimeResponse fields - showDetail(anime!!) - - } else { - showError("API ERROR : is not successful") - } - } - - override fun onFailure(call: Call, t: Throwable) { - showError("API ERROR : onFailure") - } - - }) - } - - private fun showDetail(anime: AnimeResponse) { - //elements from AnimeResponse - val tvSynopsis: TextView = findViewById(R.id.tv_synopsis) - val tvRank: TextView = findViewById(R.id.tv_detail_rank) - - tvSynopsis.text = anime.synopsis.toString() - - tvRank.text = anime.rank.toString() - - } - - 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/anime/search/SearchAnime.kt b/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnime.kt deleted file mode 100644 index ad7b7eb..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnime.kt +++ /dev/null @@ -1,31 +0,0 @@ -package xyz.adjutor.aniki.anime.search - -import com.google.gson.annotations.SerializedName - -class SearchAnime { - - @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("episodes") - var episodes: 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/anime/search/SearchAnimeAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeAdapter.kt deleted file mode 100644 index 78718dd..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeAdapter.kt +++ /dev/null @@ -1,81 +0,0 @@ -package xyz.adjutor.aniki.anime.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 SearchAnimeAdapter(private val animeList: List) : - RecyclerView.Adapter() { - - // Describes an item view and its place within the RecyclerView - class AnimeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val animeTitle: TextView = itemView.findViewById(R.id.tv_title) - 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 - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AnimeViewHolder { - val view = LayoutInflater.from(parent.context) - .inflate(R.layout.item_layout, parent, false) - - return AnimeViewHolder(view) - } - - // Returns size of data list - override fun getItemCount(): Int { - return animeList.size - } - - // Displays data at a certain position - override fun onBindViewHolder(holder: AnimeViewHolder, position: Int) { - val currentAnime: SearchAnime = animeList[position] - holder.animeTitle.text = currentAnime.title - holder.animeRank.text = "" //the rank isn't supplied by this API - holder.animeScore.text = currentAnime.score.toString() - val image: String = currentAnime.image_url.toString() - Glide - .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 currentAnimeUrl = "theanimeurl" - val currentAnimeImageUrl = "theanimeimageurl" - val currentAnimeTitle = "theanimetitle" - val currentAnimeEpisodes = "theanimeepisodes" - val currentAnimeScore = "theanimescore" - val currentAnimeStartDate = "theanimestartdate" - val currentAnimeEndDate = "theanimeenddate" - - //intent is used to pass data to another activity - - val intent: Intent = - Intent(holder.itemView.context, DetailSearchAnimeActivity::class.java).apply { - putExtra(currentAnimeId, currentAnime.mal_id.toString()) - putExtra(currentAnimeUrl, currentAnime.url.toString()) - putExtra(currentAnimeImageUrl, currentAnime.image_url.toString()) - putExtra(currentAnimeTitle, currentAnime.title) - putExtra(currentAnimeEpisodes, currentAnime.episodes.toString()) - putExtra(currentAnimeScore, currentAnime.score.toString()) - putExtra(currentAnimeStartDate, currentAnime.start_date) - putExtra(currentAnimeEndDate, currentAnime.end_date.toString()) - } - holder.itemView.context.startActivity(intent) - } - - } -} \ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeApi.kt deleted file mode 100644 index 5512636..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeApi.kt +++ /dev/null @@ -1,12 +0,0 @@ -package xyz.adjutor.aniki.anime.search - -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Query - -interface SearchAnimeApi { - - @GET("v3/search/anime") - fun getSearchAnimeData(@Query("q") q: String): Call - -} \ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt deleted file mode 100644 index b624069..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt +++ /dev/null @@ -1,134 +0,0 @@ -package xyz.adjutor.aniki.anime.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.EditorInfo -import android.view.inputmethod.InputMethodManager -import android.widget.Button -import android.widget.TextView -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 SearchAnimePage : 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_anime_page, container, false) - } - - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - //button to return to the home page - view.findViewById