From 8ede9457fd21ac5e272e73f5ece1d4bc9c23faab Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Wed, 19 May 2021 10:07:23 +0200 Subject: Big update Restructuring the packages and adding a Constants.kt for the api URL. Also adding gson in Singletons.kt --- .../view/anime/DetailSearchAnimeActivity.kt | 114 --------------------- .../view/anime/DetailTopAnimeActivity.kt | 104 ------------------- .../presentation/view/anime/SearchAnimeAdapter.kt | 82 --------------- .../presentation/view/anime/SearchAnimePage.kt | 99 ------------------ .../presentation/view/anime/TopAnimeAdapter.kt | 81 --------------- .../aniki/presentation/view/anime/TopAnimePage.kt | 87 ---------------- 6 files changed, 567 deletions(-) delete mode 100644 app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailSearchAnimeActivity.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailTopAnimeActivity.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimeAdapter.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimePage.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimeAdapter.kt delete mode 100644 app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimePage.kt (limited to 'app/src/main/java/xyz/adjutor/aniki/presentation/view/anime') diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailSearchAnimeActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailSearchAnimeActivity.kt deleted file mode 100644 index 5acf1c3..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailSearchAnimeActivity.kt +++ /dev/null @@ -1,114 +0,0 @@ -package xyz.adjutor.aniki.presentation.view.anime - -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 xyz.adjutor.aniki.R -import xyz.adjutor.aniki.presentation.controller.anime.DetailSearchAnimeController -import xyz.adjutor.aniki.presentation.model.anime.AnimeResponse - -class DetailSearchAnimeActivity : AppCompatActivity() { - - lateinit var controller: DetailSearchAnimeController - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_detail_search_anime) - - controller = DetailSearchAnimeController() - - //used in the list - val intentAnimeImageUrl = "theanimeimageurl" - val intentAnimeTitle = "theanimetitle" - val intentAnimeScore = "theanimescore" - - //only used for the detail - val intentAnimeId = "theanimeid" - val intentAnimeUrl = "theanimeurl" - val intentAnimeEpisodes = "theanimeepisodes" - val intentAnimeStartDate = "theanimestartdate" - val intentAnimeEndDate = "theanimeenddate" - - 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() - } - - controller.onStart(this, 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 - - } - - 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/presentation/view/anime/DetailTopAnimeActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailTopAnimeActivity.kt deleted file mode 100644 index b8cf505..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailTopAnimeActivity.kt +++ /dev/null @@ -1,104 +0,0 @@ -package xyz.adjutor.aniki.presentation.view.anime - -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 xyz.adjutor.aniki.R -import xyz.adjutor.aniki.presentation.controller.anime.DetailTopAnimeController -import xyz.adjutor.aniki.presentation.model.anime.AnimeResponse - -class DetailTopAnimeActivity : AppCompatActivity() { - - lateinit var controller: DetailTopAnimeController - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_detail_top_anime) - - controller = DetailTopAnimeController() - - val intentAnimeId = "theanimeid" - val intentAnimeTitle = "theanimetitle" - val intentAnimeRank = "theanimerank" - val intentAnimeScore = "theanimescore" - val intentAnimeImageUrl = "theanimeimageurl" - - val intentAnimeEpisodes = "theanimeepisodes" - val intentAnimeStartDate = "theanimestartdate" - val intentAnimeEndDate = "theanimeenddate" - val intentAnimeUrl = "theanimeurl" - - 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 - - controller.onStart(this, animeId.toString()) - - } - - fun showDetail(anime: AnimeResponse) { - //elements from AnimeResponse - val tvSynopsis: TextView = findViewById(R.id.tv_synopsis) - - tvSynopsis.text = anime.synopsis.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/presentation/view/anime/SearchAnimeAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimeAdapter.kt deleted file mode 100644 index 3bb875b..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimeAdapter.kt +++ /dev/null @@ -1,82 +0,0 @@ -package xyz.adjutor.aniki.presentation.view.anime - -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 -import xyz.adjutor.aniki.presentation.model.anime.SearchAnime - -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/presentation/view/anime/SearchAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimePage.kt deleted file mode 100644 index 764601f..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimePage.kt +++ /dev/null @@ -1,99 +0,0 @@ -package xyz.adjutor.aniki.presentation.view.anime - -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 xyz.adjutor.aniki.R -import xyz.adjutor.aniki.presentation.controller.anime.SearchAnimeController -import xyz.adjutor.aniki.presentation.model.anime.SearchAnime -import xyz.adjutor.aniki.presentation.view.MainActivity - -class SearchAnimePage : Fragment() { - - lateinit var controller: SearchAnimeController - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - // Inflate the layout for this fragment - val view = inflater.inflate(R.layout.search_anime_page, container, false) - - controller = SearchAnimeController() - controller.onStart(this) - - return view - } - - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - //button to return to the home page - view.findViewById