prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Koitharu
2023-05-29 11:57:22 +03:00
parent 5a0c54e00f 6881c22453
commit 4522c478cb
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
View File

@@ -17,7 +17,7 @@ import java.util.EnumSet
class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
override val configKeyDomain: ConfigKey.Domain
get() = ConfigKey.Domain("", null)
get() = ConfigKey.Domain()
override val sortOrders: Set<SortOrder>
get() = EnumSet.allOf(SortOrder::class.java)

10
app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
View File

@@ -19,10 +19,12 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang
val preference: Preference = when (key) {
is ConfigKey.Domain -> {
val presetValues = key.presetValues
if (presetValues.isNullOrEmpty()) {
if (presetValues.size <= 1) {
EditTextPreference(requireContext())
} else {
AutoCompleteTextViewPreference(requireContext()).apply { entries = presetValues }
AutoCompleteTextViewPreference(requireContext()).apply {
entries = presetValues.toStringArray()
}
}.apply {
summaryProvider = EditTextDefaultSummaryProvider(key.defaultValue)
setOnBindEditTextListener(
@@ -64,3 +66,7 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang
screen.addPreference(preference)
}
}
private fun Array<out String>.toStringArray(): Array<String> {
return Array(size) { i -> this[i] as? String ?: "" }
}

2
app/src/release/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
View File

@@ -15,7 +15,7 @@ import java.util.EnumSet
class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
override val configKeyDomain: ConfigKey.Domain
get() = ConfigKey.Domain("localhost", null)
get() = ConfigKey.Domain("localhost")
override val sortOrders: Set<SortOrder>
get() = EnumSet.allOf(SortOrder::class.java)