rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

got rid of both companion object (#50)

Browse source
This commit is contained in:
aayush262 2023-11-18 12:03:09 +05:30 • committed by GitHub
parent 736b06bdbe
commit f4266d0da3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
View file

@ -50,11 +50,6 @@ class SettingsActivity : AppCompatActivity() {
private val restartMainActivity = object : OnBackPressedCallback(false) { private val restartMainActivity = object : OnBackPressedCallback(false) {
override fun handleOnBackPressed() = startMainActivity(this@SettingsActivity) override fun handleOnBackPressed() = startMainActivity(this@SettingsActivity)
} }
companion object {
@Volatile
var isNsfwEnabled: Boolean = loadData("NFSWExtension") ?: false
}
lateinit var binding: ActivitySettingsBinding lateinit var binding: ActivitySettingsBinding
private val extensionInstaller = Injekt.get<BasePreferences>().extensionInstaller() private val extensionInstaller = Injekt.get<BasePreferences>().extensionInstaller()
private val networkPreferences = Injekt.get<NetworkPreferences>() private val networkPreferences = Injekt.get<NetworkPreferences>()
@ -174,7 +169,6 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
} }
binding.NSFWExtension.isChecked = loadData("NFSWExtension") ?: false binding.NSFWExtension.isChecked = loadData("NFSWExtension") ?: false
binding.NSFWExtension.setOnCheckedChangeListener { _, isChecked -> binding.NSFWExtension.setOnCheckedChangeListener { _, isChecked ->
isNsfwEnabled = isChecked
saveData("NFSWExtension", isChecked) saveData("NFSWExtension", isChecked)
} }

3
app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt
View file

@ -78,12 +78,13 @@ class AnimeExtensionPagingSource(
val installedExtensions = installedExtensionsFlow.first().map { it.pkgName }.toSet() val installedExtensions = installedExtensionsFlow.first().map { it.pkgName }.toSet()
val availableExtensions = availableExtensionsFlow.first().filterNot { it.pkgName in installedExtensions } val availableExtensions = availableExtensionsFlow.first().filterNot { it.pkgName in installedExtensions }
val query = searchQuery.first() val query = searchQuery.first()
var isNsfwEnabled: Boolean = loadData("NFSWExtension") ?: false
val filteredExtensions = if (query.isEmpty()) { val filteredExtensions = if (query.isEmpty()) {
availableExtensions availableExtensions
} else { } else {
availableExtensions.filter { it.name.contains(query, ignoreCase = true) } availableExtensions.filter { it.name.contains(query, ignoreCase = true) }
} }
val filternfsw = if(SettingsActivity.isNsfwEnabled) {//TODO val filternfsw = if(isNsfwEnabled) {
filteredExtensions filteredExtensions
} else { } else {
filteredExtensions.filterNot { it.isNsfw } filteredExtensions.filterNot { it.isNsfw }

3
app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt
View file

@ -82,12 +82,13 @@ class MangaExtensionPagingSource(
val installedExtensions = installedExtensionsFlow.first().map { it.pkgName }.toSet() val installedExtensions = installedExtensionsFlow.first().map { it.pkgName }.toSet()
val availableExtensions = availableExtensionsFlow.first().filterNot { it.pkgName in installedExtensions } val availableExtensions = availableExtensionsFlow.first().filterNot { it.pkgName in installedExtensions }
val query = searchQuery.first() val query = searchQuery.first()
var isNsfwEnabled: Boolean = loadData("NFSWExtension") ?: false
val filteredExtensions = if (query.isEmpty()) { val filteredExtensions = if (query.isEmpty()) {
availableExtensions availableExtensions
} else { } else {
availableExtensions.filter { it.name.contains(query, ignoreCase = true) } availableExtensions.filter { it.name.contains(query, ignoreCase = true) }
} }
val filternfsw = if(SettingsActivity.isNsfwEnabled) {//TODO val filternfsw = if(isNsfwEnabled) {
filteredExtensions filteredExtensions
} else { } else {
filteredExtensions.filterNot { it.isNsfw } filteredExtensions.filterNot { it.isNsfw }