diff --git a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt index d91c2941..ee69dc90 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt @@ -1,7 +1,6 @@ package ani.dantotsu.media.anime import android.annotation.SuppressLint -import android.content.Context import android.content.Intent import android.net.Uri import android.view.LayoutInflater @@ -9,7 +8,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.ImageButton -import android.widget.ImageView import android.widget.LinearLayout import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat @@ -377,7 +375,7 @@ class AnimeWatchAdapter( } } - fun setLanguageList(lang: Int, source: Int) { + private fun setLanguageList(lang: Int, source: Int) { val binding = _binding if (watchSources is AnimeSources) { val parser = watchSources[source] as? DynamicAnimeParser @@ -386,7 +384,7 @@ class AnimeWatchAdapter( ext.sourceLanguage = lang } try { - binding?.animeSourceLanguage?.setText(parser.extension.sources.sortedBy { it.lang }[lang].lang) + binding?.animeSourceLanguage?.setText(parser.extension.sources[lang].lang) } catch (e: IndexOutOfBoundsException) { binding?.animeSourceLanguage?.setText( parser.extension.sources.firstOrNull()?.lang ?: "Unknown" @@ -395,7 +393,7 @@ class AnimeWatchAdapter( val adapter = ArrayAdapter( fragment.requireContext(), R.layout.item_dropdown, - parser.extension.sources.sortedBy { it.lang }.map { LanguageMapper.mapLanguageCodeToName(it.lang) } + parser.extension.sources.map { LanguageMapper.mapLanguageCodeToName(it.lang) } ) val items = adapter.count if (items > 1) binding?.animeSourceLanguageContainer?.visibility = View.VISIBLE else binding?.animeSourceLanguageContainer?.visibility = View.GONE diff --git a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt index 5fc6635f..53ec248d 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt @@ -320,7 +320,7 @@ class AnimeWatchFragment : Fragment() { if (allSettings.isNotEmpty()) { var selectedSetting = allSettings[0] if (allSettings.size > 1) { - val names = allSettings.sortedBy { it.lang }.map { LanguageMapper.mapLanguageCodeToName(it.lang) }.toTypedArray() + val names = allSettings.map { LanguageMapper.mapLanguageCodeToName(it.lang) }.toTypedArray() var selectedIndex = 0 val dialog = AlertDialog.Builder(requireContext() , R.style.MyPopup) .setTitle("Select a Source") diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt index fb921a9f..dd6f2d17 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt @@ -141,8 +141,8 @@ class MangaChapterAdapter( inner class ChapterListViewHolder(val binding: ItemChapterListBinding) : RecyclerView.ViewHolder(binding.root) { private val activeCoroutines = mutableSetOf() - val typedValue1 = TypedValue() - val typedValue2 = TypedValue() + private val typedValue1 = TypedValue() + private val typedValue2 = TypedValue() fun bind(chapterNumber: String, progress: String?) { if (progress != null) { binding.itemChapterTitle.visibility = View.VISIBLE @@ -235,7 +235,7 @@ class MangaChapterAdapter( input.maxValue = itemCount - bindingAdapterPosition input.value = 1 alertDialog.setView(input) - alertDialog.setPositiveButton("OK") { dialog, which -> + alertDialog.setPositiveButton("OK") { _, _ -> downloadNChaptersFrom(bindingAdapterPosition, input.value) } alertDialog.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() } diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt index 1f91ed09..4f37f417 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt @@ -2,15 +2,12 @@ package ani.dantotsu.media.manga import android.annotation.SuppressLint import android.app.AlertDialog -import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.WindowManager import android.widget.ArrayAdapter import android.widget.CheckBox import android.widget.ImageButton -import android.widget.ImageView import android.widget.LinearLayout import android.widget.NumberPicker import androidx.core.content.ContextCompat @@ -202,7 +199,7 @@ class MangaReadAdapter( input.maxValue = 20 input.value = 1 alertDialog.setView(input) - alertDialog.setPositiveButton("OK") { dialog, which -> + alertDialog.setPositiveButton("OK") { _, _ -> dialogBinding.downloadNo.text = "${input.value}" } alertDialog.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() } @@ -234,7 +231,7 @@ class MangaReadAdapter( // Create AlertDialog val dialog = AlertDialog.Builder(currContext(), R.style.MyPopup) .setView(dialogView2) - .setPositiveButton("OK") { dialog, which -> + .setPositiveButton("OK") { _, _ -> //add unchecked to hidden hiddenScanlators.clear() for (i in 0 until checkboxContainer.childCount) { @@ -407,7 +404,7 @@ class MangaReadAdapter( } } - fun setLanguageList(lang: Int, source: Int) { + private fun setLanguageList(lang: Int, source: Int) { val binding = _binding if (mangaReadSources is MangaSources) { val parser = mangaReadSources[source] as? DynamicMangaParser @@ -416,7 +413,7 @@ class MangaReadAdapter( ext.sourceLanguage = lang } try { - binding?.animeSourceLanguage?.setText(parser.extension.sources.sortedBy { it.lang }[lang].lang) + binding?.animeSourceLanguage?.setText(parser.extension.sources[lang].lang) } catch (e: IndexOutOfBoundsException) { binding?.animeSourceLanguage?.setText( parser.extension.sources.firstOrNull()?.lang ?: "Unknown" @@ -425,7 +422,7 @@ class MangaReadAdapter( val adapter = ArrayAdapter( fragment.requireContext(), R.layout.item_dropdown, - parser.extension.sources.sortedBy { it.lang }.map { LanguageMapper.mapLanguageCodeToName(it.lang) } + parser.extension.sources.map { LanguageMapper.mapLanguageCodeToName(it.lang) } ) val items = adapter.count if (items > 1) binding?.animeSourceLanguageContainer?.visibility = View.VISIBLE else binding?.animeSourceLanguageContainer?.visibility = View.GONE diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt index 51d1c806..2fd60576 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt @@ -263,7 +263,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener { } } - fun getScanlators(chap: MutableMap?): List { + private fun getScanlators(chap: MutableMap?): List { val scanlators = mutableListOf() if (chap != null) { val chapters = chap.values @@ -363,7 +363,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener { if (allSettings.isNotEmpty()) { var selectedSetting = allSettings[0] if (allSettings.size > 1) { - val names = allSettings.sortedBy { it.lang }.map { LanguageMapper.mapLanguageCodeToName(it.lang) }.toTypedArray() + val names = allSettings.map { LanguageMapper.mapLanguageCodeToName(it.lang) }.toTypedArray() var selectedIndex = 0 val dialog = AlertDialog.Builder(requireContext(), R.style.MyPopup) .setTitle("Select a Source") diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt index 07a239cf..ea98366d 100644 --- a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt @@ -46,7 +46,7 @@ class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler { private var _binding: FragmentAnimeExtensionsBinding? = null private val binding get() = _binding!! private lateinit var extensionsRecyclerView: RecyclerView - val skipIcons = loadData("skip_extension_icons") ?: false + private val skipIcons = loadData("skip_extension_icons") ?: false private val animeExtensionManager: AnimeExtensionManager = Injekt.get() private val extensionsAdapter = AnimeExtensionsAdapter( { pkg -> @@ -67,7 +67,7 @@ class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler { if (allSettings.isNotEmpty()) { var selectedSetting = allSettings[0] if (allSettings.size > 1) { - val names = allSettings.sortedBy { it.lang }.map { LanguageMapper.mapLanguageCodeToName(it.lang) }.toTypedArray() + val names = allSettings.map { LanguageMapper.mapLanguageCodeToName(it.lang) }.toTypedArray() var selectedIndex = 0 val dialog = AlertDialog.Builder(requireContext(), R.style.MyPopup) .setTitle("Select a Source") diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt index e791b304..9fe25f23 100644 --- a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt @@ -1,6 +1,7 @@ package ani.dantotsu.settings +import android.annotation.SuppressLint import android.app.AlertDialog import android.app.NotificationManager import android.content.Context @@ -44,7 +45,7 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler { private var _binding: FragmentMangaExtensionsBinding? = null private val binding get() = _binding!! private lateinit var extensionsRecyclerView: RecyclerView - val skipIcons = loadData("skip_extension_icons") ?: false + private val skipIcons = loadData("skip_extension_icons") ?: false private val mangaExtensionManager: MangaExtensionManager = Injekt.get() private val extensionsAdapter = MangaExtensionsAdapter({ pkg -> val name= pkg.name @@ -64,7 +65,7 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler { if (allSettings.isNotEmpty()) { var selectedSetting = allSettings[0] if (allSettings.size > 1) { - val names = allSettings.sortedBy { it.lang }.map { LanguageMapper.mapLanguageCodeToName(it.lang) }.toTypedArray() + val names = allSettings.map { LanguageMapper.mapLanguageCodeToName(it.lang) }.toTypedArray() var selectedIndex = 0 val dialog = AlertDialog.Builder(requireContext(), R.style.MyPopup) .setTitle("Select a Source") @@ -216,6 +217,7 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler { return ViewHolder(view) } + @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ViewHolder, position: Int) { val extension = getItem(position) // Use getItem() from ListAdapter val nsfw = if (extension.isNsfw) "(18+)" else ""