diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt index f51b28ff..6fd3409b 100644 --- a/app/src/main/java/ani/dantotsu/Functions.kt +++ b/app/src/main/java/ani/dantotsu/Functions.kt @@ -394,7 +394,6 @@ class InputFilterMinMax( return "" } - @SuppressLint("SetTextI18n") private fun isInRange(a: Double, b: Double, c: Double): Boolean { val statusStrings = currContext()!!.resources.getStringArray(R.array.status_manga)[2] @@ -897,9 +896,9 @@ fun copyToClipboard(string: String, toast: Boolean = true) { } } -@SuppressLint("SetTextI18n") fun countDown(media: Media, view: ViewGroup) { - if (media.anime?.nextAiringEpisode != null && media.anime.nextAiringEpisodeTime != null && (media.anime.nextAiringEpisodeTime!! - System.currentTimeMillis() / 1000) <= 86400 * 28.toLong()) { + if (media.anime?.nextAiringEpisode != null && media.anime.nextAiringEpisodeTime != null + && (media.anime.nextAiringEpisodeTime!! - System.currentTimeMillis() / 1000) <= 86400 * 28.toLong()) { val v = ItemCountDownBinding.inflate(LayoutInflater.from(view.context), view, false) view.addView(v.root, 0) v.mediaCountdownText.text = diff --git a/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt b/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt index ef0c4148..9668874c 100644 --- a/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt +++ b/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt @@ -1,7 +1,6 @@ package ani.dantotsu.download.anime -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -38,7 +37,6 @@ class OfflineAnimeAdapter( return position.toLong() } - @SuppressLint("SetTextI18n") override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { val view: View = convertView ?: when (style) { @@ -61,14 +59,14 @@ class OfflineAnimeAdapter( if (style == 0) { val bannerView = view.findViewById(R.id.itemCompactBanner) // for large view val episodes = view.findViewById(R.id.itemTotal) - episodes.text = " Episodes" + episodes.text = context.getString(R.string.episodes) bannerView.setImageURI(item.banner) totalepisodes.text = item.totalEpisodeList } else if (style == 1) { val watchedEpisodes = view.findViewById(R.id.itemCompactUserProgress) // for compact view watchedEpisodes.text = item.watchedEpisode - totalepisodes.text = " | " + item.totalEpisode + totalepisodes.text = context.getString(R.string.total_divider, item.totalEpisode) } // Bind item data to the views diff --git a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt index 4ef12c03..9f24a488 100644 --- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt +++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt @@ -37,7 +37,6 @@ class OfflineMangaAdapter( return position.toLong() } - @SuppressLint("SetTextI18n") override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { val view: View = convertView ?: when (style) { @@ -60,14 +59,14 @@ class OfflineMangaAdapter( if (style == 0) { val bannerView = view.findViewById(R.id.itemCompactBanner) // for large view val chapters = view.findViewById(R.id.itemTotal) - chapters.text = " Chapters" + chapters.text = context.getString(R.string.chapters) bannerView.setImageURI(item.banner) totalChapter.text = item.totalChapter } else if (style == 1) { val readChapter = view.findViewById(R.id.itemCompactUserProgress) // for compact view readChapter.text = item.readChapter - totalChapter.text = " | " + item.totalChapter + totalChapter.text = context.getString(R.string.total_divider, item.totalChapter) } // Bind item data to the views diff --git a/app/src/main/java/ani/dantotsu/media/AuthorAdapter.kt b/app/src/main/java/ani/dantotsu/media/AuthorAdapter.kt index 35195960..431c5ddd 100644 --- a/app/src/main/java/ani/dantotsu/media/AuthorAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/AuthorAdapter.kt @@ -24,7 +24,6 @@ class AuthorAdapter( return AuthorViewHolder(binding) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder:AuthorViewHolder, position: Int) { val binding = holder.binding setAnimation(binding.root.context, holder.binding.root) diff --git a/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt b/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt index bbe66477..df4acb7f 100644 --- a/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt +++ b/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt @@ -34,7 +34,6 @@ class CalendarActivity : AppCompatActivity() { private var selectedTabIdx = 1 private val model: OtherDetailsViewModel by viewModels() - @SuppressLint("SetTextI18n") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/ani/dantotsu/media/CharacterAdapter.kt b/app/src/main/java/ani/dantotsu/media/CharacterAdapter.kt index d8c4961c..78eeb273 100644 --- a/app/src/main/java/ani/dantotsu/media/CharacterAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/CharacterAdapter.kt @@ -24,12 +24,12 @@ class CharacterAdapter( return CharacterViewHolder(binding) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: CharacterViewHolder, position: Int) { val binding = holder.binding setAnimation(binding.root.context, holder.binding.root) val character = characterList[position] - binding.itemCompactRelation.text = character.role + " " + val whitespace = "${character.role} " + binding.itemCompactRelation.text = whitespace binding.itemCompactImage.loadImage(character.image) binding.itemCompactTitle.text = character.name } diff --git a/app/src/main/java/ani/dantotsu/media/CharacterDetailsAdapter.kt b/app/src/main/java/ani/dantotsu/media/CharacterDetailsAdapter.kt index 2e419492..5c78feb0 100644 --- a/app/src/main/java/ani/dantotsu/media/CharacterDetailsAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/CharacterDetailsAdapter.kt @@ -20,15 +20,16 @@ class CharacterDetailsAdapter(private val character: Character, private val acti return GenreViewHolder(binding) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: GenreViewHolder, position: Int) { val binding = holder.binding val desc = - (if (character.age != "null") currActivity()!!.getString(R.string.age) + " " + character.age else "") + - (if (character.dateOfBirth.toString() != "") currActivity()!!.getString(R.string.birthday) + " " + character.dateOfBirth.toString() else "") + - (if (character.gender != "null") currActivity()!!.getString(R.string.gender) + " " + when (character.gender) { - "Male" -> currActivity()!!.getString(R.string.male) - "Female" -> currActivity()!!.getString(R.string.female) + (if (character.age != "null") "${currActivity()!!.getString(R.string.age)} ${character.age}" else "") + + (if (character.dateOfBirth.toString() != "") + "${currActivity()!!.getString(R.string.birthday)} ${character.dateOfBirth.toString()}" else "") + + (if (character.gender != "null") + currActivity()!!.getString(R.string.gender) + " " + when (character.gender) { + currActivity()!!.getString(R.string.male) -> currActivity()!!.getString(R.string.male) + currActivity()!!.getString(R.string.female) -> currActivity()!!.getString(R.string.female) else -> character.gender } else "") + "\n" + character.description diff --git a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt index 9a528b80..74e6cbbc 100644 --- a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt +++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt @@ -75,7 +75,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi var anime = true private var adult = false - @SuppressLint("SetTextI18n", "ClickableViewAccessibility") + @SuppressLint("ClickableViewAccessibility") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) var media: Media = intent.getSerialized("media") ?: mediaSingleton ?: emptyMedia() @@ -83,8 +83,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi if (id != -1) { runBlocking { withContext(Dispatchers.IO) { - media = - Anilist.query.getMedia(id, false) ?: emptyMedia() + media = Anilist.query.getMedia(id, false) ?: emptyMedia() } } } @@ -157,9 +156,10 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi binding.mediaCoverImage.loadImage(media.cover) binding.mediaCoverImage.setOnLongClickListener { + val coverTitle = "${media.userPreferredName}[Cover]" ImageViewDialog.newInstance( this, - media.userPreferredName + "[Cover]", + coverTitle, media.cover ) } @@ -176,9 +176,10 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi } override fun onLongClick(event: MotionEvent) { + val bannerTitle = "${media.userPreferredName}[Banner]" ImageViewDialog.newInstance( this@MediaDetailsActivity, - media.userPreferredName + "[Banner]", + bannerTitle, media.banner ?: media.cover ) banner.performClick() @@ -186,7 +187,8 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi }) banner.setOnTouchListener { _, motionEvent -> gestureDetector.onTouchEvent(motionEvent);true } if (PrefManager.getVal(PrefName.Incognito)) { - binding.mediaTitle.text = " ${media.userPreferredName}" + val mediaTitle = " ${media.userPreferredName}" + binding.mediaTitle.text = mediaTitle binding.incognito.visibility = View.VISIBLE } else { binding.mediaTitle.text = media.userPreferredName diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a974ff47..910d9f4f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -111,6 +111,9 @@ Format Status Total Episodes + Episode(s) + Chapter(s) + | %1$s Total Chapters Average Duration " min"