From f00646713827fae1a23a9844b09110ab305aa7b5 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Mon, 10 Aug 2020 11:26:26 -0400
Subject: [PATCH] Add 18+ warnings in extensions list

(cherry picked from commit b657bba96e333476c89b2e4da2d15f7dfaad1ab0)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
---
 .../ui/browse/extension/ExtensionHolder.kt    | 13 ++++++------
 .../details/ExtensionDetailsHeaderAdapter.kt  |  1 +
 .../res/layout/extension_detail_header.xml    | 21 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  2 ++
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
index 99db99dd7..f8b52e3f4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
@@ -47,14 +47,15 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
         version.text = extension.versionName
         lang.text = LocaleHelper.getSourceDisplayName(extension.lang, itemView.context)
         warning.text = when {
-            extension is Extension.Untrusted -> itemView.context.getString(R.string.ext_untrusted).toUpperCase()
-            extension is Extension.Installed && extension.isObsolete -> itemView.context.getString(R.string.ext_obsolete).toUpperCase()
-            extension is Extension.Installed && extension.isUnofficial -> itemView.context.getString(R.string.ext_unofficial).toUpperCase()
+            extension is Extension.Untrusted -> itemView.context.getString(R.string.ext_untrusted)
+            extension is Extension.Installed && extension.isObsolete -> itemView.context.getString(R.string.ext_obsolete)
+            extension is Extension.Installed && extension.isUnofficial -> itemView.context.getString(R.string.ext_unofficial)
             // SY -->
-            extension is Extension.Installed && extension.isRedundant -> itemView.context.getString(R.string.ext_redundant).toUpperCase()
+            extension is Extension.Installed && extension.isRedundant -> itemView.context.getString(R.string.ext_redundant)
             // SY <--
-            else -> null
-        }
+            extension.isNsfw -> itemView.context.getString(R.string.ext_nsfw_short)
+            else -> ""
+        }.toUpperCase()
 
         GlideApp.with(itemView.context).clear(image)
         if (extension is Extension.Available) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt
index 37d79af80..a339b0e0b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt
@@ -42,6 +42,7 @@ class ExtensionDetailsHeaderAdapter(private val presenter: ExtensionDetailsPrese
             binding.extensionTitle.text = extension.name
             binding.extensionVersion.text = context.getString(R.string.ext_version_info, extension.versionName)
             binding.extensionLang.text = context.getString(R.string.ext_language_info, LocaleHelper.getSourceDisplayName(extension.lang, context))
+            binding.extensionNsfw.isVisible = extension.isNsfw
             binding.extensionPkg.text = extension.pkgName
 
             binding.extensionUninstallButton.clicks()
diff --git a/app/src/main/res/layout/extension_detail_header.xml b/app/src/main/res/layout/extension_detail_header.xml
index 158a73ae5..ddd9ec61e 100644
--- a/app/src/main/res/layout/extension_detail_header.xml
+++ b/app/src/main/res/layout/extension_detail_header.xml
@@ -69,6 +69,21 @@
             app:layout_constraintTop_toBottomOf="@id/extension_version"
             tools:text="Language: English" />
 
+        <TextView
+            android:id="@+id/extension_nsfw"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:elevation="3dp"
+            android:gravity="center"
+            android:text="@string/ext_nsfw_warning"
+            android:textColor="?attr/colorError"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="@id/extension_title"
+            app:layout_constraintTop_toBottomOf="@id/extension_lang"
+            tools:visibility="visible" />
+
         <TextView
             android:id="@+id/extension_pkg"
             android:layout_width="0dp"
@@ -78,7 +93,7 @@
             android:singleLine="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/extension_title"
-            app:layout_constraintTop_toBottomOf="@id/extension_lang"
+            app:layout_constraintTop_toBottomOf="@id/extension_nsfw"
             tools:text="eu.kanade.tachiyomi.extension.en.myext" />
 
         <Button
@@ -86,12 +101,12 @@
             style="@style/Theme.Widget.Button.FilledAccent"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="8dp"
             android:paddingStart="32dp"
             android:paddingEnd="32dp"
             android:text="@string/ext_uninstall"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/extension_lang" />
+            app:layout_constraintTop_toBottomOf="@id/extension_pkg" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1e1c2a07e..991a3a2dc 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -231,6 +231,8 @@
     <string name="unofficial_extension_message">This extension is not from the official Tachiyomi extensions list.</string>
     <string name="ext_version_info">Version: %1$s</string>
     <string name="ext_language_info">Language: %1$s</string>
+    <string name="ext_nsfw_short">18+</string>
+    <string name="ext_nsfw_warning">May contain 18+ content</string>
 
       <!-- Reader section -->
     <string name="pref_fullscreen">Fullscreen</string>