user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify Source definition

Browse Source
This commit is contained in:
tom5079
2021-07-03 23:22:41 +09:00
parent 32d49833d8
commit a9a07ddcfa
9 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/xyz/quaver/pupil/sources/Hitomi.kt
View File

@@ -35,9 +35,9 @@ import xyz.quaver.pupil.util.wordCapitalize
import kotlin.math.max
import kotlin.math.min
class Hitomi : Source<Hitomi.SortMode, Hitomi.TagSuggestion>() {
class Hitomi : Source() {
enum class SortMode {
enum class SortMode : SortModeInterface {
NEWEST,
POPULAR
}
@@ -58,13 +58,13 @@ class Hitomi : Source<Hitomi.SortMode, Hitomi.TagSuggestion>() {
override val name: String = "hitomi.la"
override val iconResID: Int = R.drawable.hitomi
override val preferenceID: Int = R.xml.hitomi_preferences
override val availableSortMode: Array<SortMode> = SortMode.values()
override val availableSortMode: List<SortModeInterface> = SortMode.values().toList()
var cachedQuery: String? = null
var cachedSortMode: SortMode? = null
val cache = mutableListOf<Int>()
override suspend fun search(query: String, range: IntRange, sortMode: Enum<*>): Pair<Channel<ItemInfo>, Int> {
override suspend fun search(query: String, range: IntRange, sortMode: SortModeInterface): Pair<Channel<ItemInfo>, Int> {
if (cachedQuery != query || cachedSortMode != sortMode || cache.isEmpty()) {
cachedQuery = null
cache.clear()
@@ -143,7 +143,9 @@ class Hitomi : Source<Hitomi.SortMode, Hitomi.TagSuggestion>() {
)
}
override fun onSuggestionBind(binding: SearchSuggestionItemBinding, item: TagSuggestion) {
override fun onSuggestionBind(binding: SearchSuggestionItemBinding, item: SearchSuggestion) {
item as TagSuggestion
binding.leftIcon.setImageResource(
when(item.n) {
"female" -> R.drawable.gender_female