diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/core/prefs/AppSettings.kt b/app/src/main/kotlin/io/github/landwarderer/futon/core/prefs/AppSettings.kt index 873dcbc00a..af6aa2ec37 100644 --- a/app/src/main/kotlin/io/github/landwarderer/futon/core/prefs/AppSettings.kt +++ b/app/src/main/kotlin/io/github/landwarderer/futon/core/prefs/AppSettings.kt @@ -116,9 +116,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) { get() = prefs.getEnumValue(KEY_LIST_MODE_FAVORITES, listMode) set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_FAVORITES, value) } - val isTagsWarningsEnabled: Boolean - get() = prefs.getBoolean(KEY_TAGS_WARNINGS, true) - var isNsfwContentDisabled: Boolean get() = prefs.getBoolean(KEY_DISABLE_NSFW, true) @@ -817,7 +814,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) { const val KEY_BACKUP_TG_ENABLED = "backup_periodic_tg_enabled" const val KEY_BACKUP_TG_CHAT = "backup_periodic_tg_chat_id" const val KEY_MANGA_LIST_BADGES = "manga_list_badges" - const val KEY_TAGS_WARNINGS = "tags_warnings" const val KEY_DISCORD_RPC = "discord_rpc" const val KEY_DISCORD_RPC_SKIP_NSFW = "discord_rpc_skip_nsfw" const val KEY_DISCORD_TOKEN = "discord_token" diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/list/domain/MangaListMapper.kt b/app/src/main/kotlin/io/github/landwarderer/futon/list/domain/MangaListMapper.kt index 9b79c646b4..06cf7b1b3e 100644 --- a/app/src/main/kotlin/io/github/landwarderer/futon/list/domain/MangaListMapper.kt +++ b/app/src/main/kotlin/io/github/landwarderer/futon/list/domain/MangaListMapper.kt @@ -4,8 +4,6 @@ import android.annotation.SuppressLint import android.content.Context import androidx.annotation.ColorRes import androidx.annotation.IntDef -import androidx.collection.MutableScatterSet -import androidx.collection.ScatterSet import dagger.Reusable import dagger.hilt.android.qualifiers.ApplicationContext import io.github.landwarderer.futon.R @@ -39,7 +37,6 @@ class MangaListMapper @Inject constructor( private val dataRepository: MangaDataRepository, ) { - private val dict by lazy { readTagsDict(context) } suspend fun toListModelList( manga: Collection, @@ -170,25 +167,9 @@ class MangaListMapper @Inject constructor( @ColorRes private fun getTagTint(tag: MangaTag): Int { - return if (settings.isTagsWarningsEnabled && tag.title.lowercase() in dict) { - R.color.warning - } else { - 0 - } + return 0 } - private fun readTagsDict(context: Context): ScatterSet = - context.resources.openRawResource(R.raw.tags_warnlist).use { - val set = MutableScatterSet() - it.bufferedReader().forEachLine { x -> - val line = x.trim() - if (line.isNotEmpty()) { - set.add(line) - } - } - set.trim() - set - } private fun Int.isBadgeEnabled(@Options badge: Int) = this and badge == badge diff --git a/app/src/main/res/raw/tags_warnlist b/app/src/main/res/raw/tags_warnlist deleted file mode 100644 index 353de8ad83..0000000000 --- a/app/src/main/res/raw/tags_warnlist +++ /dev/null @@ -1,110 +0,0 @@ -amputation -amputee -anal birth -anal torture -bdsm -beast -beastiality -bestiality -birth -blackmail -blood -body horror -bondage -boys' love -brother -bukkake -cannibalism -cbt -choking -coprophagia -degradation -diapers -drugs -egg laying -electrical play -electro -electro play -enema -extreme -father -femdom -force -full censorship -furry -futanari -gang rape -gangbang -gangbang rape -gender bender -girls' love -guro -gore -human pet -humiliation -hypno -incest -inflation -insect -inseki -knife play -loli -lolicon -machine -mind break -mindbreak -molestation -mosaic -mother -mutilation -necrophila -necrophilia -netorase -netorare -nipple torture -non-consensual -ntr -orgasm denial -parasite -piercing -prolapse -prostitution -public use -puke -puppy play -rape -ryona -scar -scat -sexual violence -shemale -shota -shotacon -sister -slave -slavery -snuff -tentacles -toddlercon -torture -trans -transgender -trap -traps -unbirth -urination -vaginal birth -violent -vomit -vore -watersports -yaoi -yuri -гуро -инцест -копро -тентакли -трап -футанари -юри -яой diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0dab0aa3e6..bec5eb19d2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -842,8 +842,6 @@ Adult manga will not be shown in suggestions. This option may work inaccurate with some sources Include disabled sources Show suggestions from all manga sources, including disabled ones - Highlight dangerous genres - Highlight genres that may be inappropriate for most users The selected path cannot be used because it does not denote a file or directory These changes will affect how manga is displayed in the app Use default cover diff --git a/app/src/main/res/xml/pref_sources.xml b/app/src/main/res/xml/pref_sources.xml index 4be14d39a7..8e48104e32 100644 --- a/app/src/main/res/xml/pref_sources.xml +++ b/app/src/main/res/xml/pref_sources.xml @@ -44,11 +44,6 @@ android:title="@string/incognito_for_nsfw" app:useSimpleSummaryProvider="true" /> -