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/manga/MangaApi.kt | 12 -- .../java/xyz/adjutor/aniki/manga/MangaResponse.kt | 22 --- .../manga/search/DetailSearchMangaActivity.kt | 169 ------------------ .../xyz/adjutor/aniki/manga/search/SearchManga.kt | 34 ---- .../aniki/manga/search/SearchMangaAdapter.kt | 83 --------- .../adjutor/aniki/manga/search/SearchMangaApi.kt | 12 -- .../adjutor/aniki/manga/search/SearchMangaPage.kt | 142 --------------- .../aniki/manga/search/SearchMangaResponse.kt | 13 -- .../aniki/manga/topmanga/DetailTopMangaActivity.kt | 193 --------------------- .../xyz/adjutor/aniki/manga/topmanga/TopManga.kt | 35 ---- .../aniki/manga/topmanga/TopMangaAdapter.kt | 81 --------- .../adjutor/aniki/manga/topmanga/TopMangaApi.kt | 12 -- .../adjutor/aniki/manga/topmanga/TopMangaPage.kt | 174 ------------------- .../aniki/manga/topmanga/TopMangaResponse.kt | 13 -- 14 files changed, 995 deletions(-) delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/SearchManga.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaApi.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaResponse.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopManga.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaAdapter.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaResponse.kt (limited to 'app/src/main/java/xyz/adjutor/aniki/manga') diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt deleted file mode 100644 index f1b51a4..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt +++ /dev/null @@ -1,12 +0,0 @@ -package xyz.adjutor.aniki.manga - -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Path - -interface MangaApi { - - @GET("v3/manga/{id}") - fun getMangaData(@Path("id") id: String): Call - -} \ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt deleted file mode 100644 index 263b93c..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt +++ /dev/null @@ -1,22 +0,0 @@ -package xyz.adjutor.aniki.manga - -import com.google.gson.annotations.SerializedName - -class MangaResponse { //only kept the infos I didn't have and that were interesting to me. - - @SerializedName("mal_id") - var mal_id: Int? = null - - @SerializedName("chapters") - var chapters: Int? = null - - @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 deleted file mode 100644 index 4ae01f8..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt +++ /dev/null @@ -1,169 +0,0 @@ -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 { - 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/SearchManga.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchManga.kt deleted file mode 100644 index 518a0a6..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchManga.kt +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index fb95c9c..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt +++ /dev/null @@ -1,83 +0,0 @@ -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) : - RecyclerView.Adapter() { - - // 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 deleted file mode 100644 index 6f3e63d..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaApi.kt +++ /dev/null @@ -1,12 +0,0 @@ -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 - -} \ 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 deleted file mode 100644 index d236887..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt +++ /dev/null @@ -1,142 +0,0 @@ -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.EditorInfo -import android.view.inputmethod.InputMethodManager -import android.widget.Button -import android.widget.TextView.OnEditorActionListener -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