diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt index 6a1bf640..e05c018e 100644 --- a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt @@ -209,8 +209,15 @@ class InstalledAnimeExtensionsFragment : Fragment() { } override fun onBindViewHolder(holder: ViewHolder, position: Int) { - val extension = getItem(position) // Use getItem() from ListAdapter + val extension = getItem(position) // Use getItem() from ListAdapter + val nsfw = if (extension.isNsfw) { + "(18+)" + } else { + "" + } + holder.extensionNameTextView.text = extension.name + holder.extensionVersionTextView.text = "${extension.versionName} $nsfw" if (!skipIcons) { holder.extensionIconImageView.setImageDrawable(extension.icon) } @@ -235,6 +242,7 @@ class InstalledAnimeExtensionsFragment : Fragment() { inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { val extensionNameTextView: TextView = view.findViewById(R.id.extensionNameTextView) + val extensionVersionTextView: TextView = view.findViewById(R.id.extensionVersionTextView) val settingsImageView: ImageView = view.findViewById(R.id.settingsImageView) val extensionIconImageView: ImageView = view.findViewById(R.id.extensionIconImageView) val closeTextView: TextView = view.findViewById(R.id.closeTextView) diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt index 51e0487d..abb795f5 100644 --- a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt @@ -204,7 +204,13 @@ class InstalledMangaExtensionsFragment : Fragment() { override fun onBindViewHolder(holder: ViewHolder, position: Int) { val extension = getItem(position) // Use getItem() from ListAdapter + val nsfw = if (extension.isNsfw) { + "(18+)" + } else { + "" + } holder.extensionNameTextView.text = extension.name + holder.extensionVersionTextView.text = "${extension.versionName} $nsfw" if (!skipIcons) { holder.extensionIconImageView.setImageDrawable(extension.icon) } @@ -229,6 +235,7 @@ class InstalledMangaExtensionsFragment : Fragment() { inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { val extensionNameTextView: TextView = view.findViewById(R.id.extensionNameTextView) + val extensionVersionTextView: TextView = view.findViewById(R.id.extensionVersionTextView) val settingsImageView: ImageView = view.findViewById(R.id.settingsImageView) val extensionIconImageView: ImageView = view.findViewById(R.id.extensionIconImageView) val closeTextView: TextView = view.findViewById(R.id.closeTextView) diff --git a/app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt b/app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt index 653d85d6..9d016f6b 100644 --- a/app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt +++ b/app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt @@ -151,8 +151,14 @@ class AnimeExtensionAdapter(private val clickListener: OnAnimeInstallClickListen } } val extensionIconImageView: ImageView = binding.extensionIconImageView - fun bind(extension: AnimeExtension.Available) { + fun bind(extension: AnimeExtension.Available) { + val nsfw = if (extension.isNsfw) { + "(18+)" + } else { + "" + } binding.extensionNameTextView.text = extension.name + binding.extensionVersionTextView.text = "${extension.versionName} $nsfw" } } } diff --git a/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt b/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt index 8dec149d..715d425f 100644 --- a/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt +++ b/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt @@ -154,7 +154,13 @@ class MangaExtensionAdapter(private val clickListener: OnMangaInstallClickListen } val extensionIconImageView: ImageView = binding.extensionIconImageView fun bind(extension: MangaExtension.Available) { + val nsfw = if (extension.isNsfw) { + "(18+)" + } else { + "" + } binding.extensionNameTextView.text = extension.name + binding.extensionVersionTextView.text = "${extension.versionName} $nsfw" } } } diff --git a/app/src/main/res/layout/item_extension.xml b/app/src/main/res/layout/item_extension.xml index 93a0fb41..78754f21 100644 --- a/app/src/main/res/layout/item_extension.xml +++ b/app/src/main/res/layout/item_extension.xml @@ -4,24 +4,49 @@ android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" - android:paddingTop="16dp" - android:paddingBottom="16dp"> + android:paddingTop="10dp" + android:paddingBottom="10dp"> + android:layout_marginEnd="3dp" /> - + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + - diff --git a/app/src/main/res/layout/item_extension_all.xml b/app/src/main/res/layout/item_extension_all.xml index 7288cabe..36c65aa6 100644 --- a/app/src/main/res/layout/item_extension_all.xml +++ b/app/src/main/res/layout/item_extension_all.xml @@ -3,24 +3,38 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingTop="16dp" - android:paddingBottom="16dp"> + android:paddingTop="10dp" + android:paddingBottom="10dp"> + android:layout_marginEnd="3dp"/> - + android:orientation="vertical"> + + + + +