Refactor extensions

app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt

@@ -3,14 +3,13 @@ package org.koitharu.kotatsu.core.model.parcelable
 import android.os.Parcel
 import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.utils.ext.createList
 
 class ParcelableMangaChapters(
 	val chapters: List<MangaChapter>,
 ) : Parcelable {
 
 	constructor(parcel: Parcel) : this(
-		createList(parcel.readInt()) { parcel.readMangaChapter() }
+		List(parcel.readInt()) { parcel.readMangaChapter() }
 	)
 
 	override fun writeToParcel(parcel: Parcel, flags: Int) {

app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt

@@ -3,14 +3,13 @@ package org.koitharu.kotatsu.core.model.parcelable
 import android.os.Parcel
 import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.utils.ext.createList
 
 class ParcelableMangaPages(
 	val pages: List<MangaPage>,
 ) : Parcelable {
 
 	constructor(parcel: Parcel) : this(
-		createList(parcel.readInt()) { parcel.readMangaPage() }
+		List(parcel.readInt()) { parcel.readMangaPage() }
 	)
 
 	override fun writeToParcel(parcel: Parcel, flags: Int) {

app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt

@@ -3,14 +3,14 @@ package org.koitharu.kotatsu.core.model.parcelable
 import android.os.Parcel
 import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.createSet
+import org.koitharu.kotatsu.utils.ext.Set
 
 class ParcelableMangaTags(
 	val tags: Set<MangaTag>,
 ) : Parcelable {
 
 	constructor(parcel: Parcel) : this(
-		createSet(parcel.readInt()) { parcel.readMangaTag() }
+		Set(parcel.readInt()) { parcel.readMangaTag() }
 	)
 
 	override fun writeToParcel(parcel: Parcel, flags: Int) {

app/src/main/java/org/koitharu/kotatsu/scrobbling/domain/Scrobbler.kt

@@ -10,7 +10,7 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.scrobbling.data.ScrobblingEntity
 import org.koitharu.kotatsu.scrobbling.domain.model.*
-import org.koitharu.kotatsu.utils.ext.findKey
+import org.koitharu.kotatsu.utils.ext.findKeyByValue
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 
 abstract class Scrobbler(
@@ -59,7 +59,7 @@ abstract class Scrobbler(
 			scrobbler = scrobblerService,
 			mangaId = mangaId,
 			targetId = targetId,
-			status = statuses.findKey(status),
+			status = statuses.findKeyByValue(status),
 			chapter = chapter,
 			comment = comment,
 			rating = rating,

app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt

@@ -18,25 +18,20 @@ inline fun <T> MutableSet(size: Int, init: (index: Int) -> T): MutableSet<T> {
 	return set
 }
 
-inline fun <T> createSet(size: Int, init: (index: Int) -> T): Set<T> = when (size) {
+@Suppress("FunctionName")
+inline fun <T> Set(size: Int, init: (index: Int) -> T): Set<T> = when (size) {
 	0 -> emptySet()
 	1 -> Collections.singleton(init(0))
 	else -> MutableSet(size, init)
 }
 
-inline fun <T> createList(size: Int, init: (index: Int) -> T): List<T> = when (size) {
-	0 -> emptyList()
-	1 -> Collections.singletonList(init(0))
-	else -> MutableList(size, init)
-}
-
 fun <T> List<T>.asArrayList(): ArrayList<T> = if (this is ArrayList<*>) {
 	this as ArrayList<T>
 } else {
 	ArrayList(this)
 }
 
-fun <K, V> Map<K, V>.findKey(value: V): K? {
+fun <K, V> Map<K, V>.findKeyByValue(value: V): K? {
 	for ((k, v) in entries) {
 		if (v == value) {
 			return k

app/src/main/java/org/koitharu/kotatsu/utils/ext/LocaleExt.kt

@@ -1,34 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import androidx.core.os.LocaleListCompat
-import java.util.*
-
-fun LocaleListCompat.getOrThrow(index: Int) = get(index) ?: throw kotlin.NoSuchElementException()
-
-fun LocaleListCompat.toList(): List<Locale> = createList(size()) { i -> getOrThrow(i) }
-
-operator fun LocaleListCompat.iterator() = object : Iterator<Locale> {
-	private var index = 0
-	override fun hasNext(): Boolean = index < size()
-	override fun next(): Locale = getOrThrow(index++)
-}
-
-inline fun <R, C : MutableCollection<in R>> LocaleListCompat.mapTo(
-	destination: C,
-	block: (Locale) -> R,
-): C {
-	val len = size()
-	for (i in 0 until len) {
-		val item = get(i) ?: continue
-		destination.add(block(item))
-	}
-	return destination
-}
-
-inline fun <T> LocaleListCompat.map(block: (Locale) -> T): List<T> {
-	return mapTo(ArrayList(size()), block)
-}
-
-inline fun <T> LocaleListCompat.mapToSet(block: (Locale) -> T): Set<T> {
-	return mapTo(LinkedHashSet(size()), block)
-}

app/src/main/java/org/koitharu/kotatsu/utils/ext/LocaleListExt.kt

@@ -0,0 +1,35 @@
+package org.koitharu.kotatsu.utils.ext
+
+import androidx.core.os.LocaleListCompat
+import java.util.*
+
+operator fun LocaleListCompat.iterator(): ListIterator<Locale> = LocaleListCompatIterator(this)
+
+fun LocaleListCompat.toList(): List<Locale> = List(size()) { i -> getOrThrow(i) }
+
+inline fun <T> LocaleListCompat.map(block: (Locale) -> T): List<T> {
+	return List(size()) { i -> block(getOrThrow(i)) }
+}
+
+inline fun <T> LocaleListCompat.mapToSet(block: (Locale) -> T): Set<T> {
+	return Set(size()) { i -> block(getOrThrow(i)) }
+}
+
+fun LocaleListCompat.getOrThrow(index: Int) = get(index) ?: throw NoSuchElementException()
+
+private class LocaleListCompatIterator(private val list: LocaleListCompat) : ListIterator<Locale> {
+
+	private var index = 0
+
+	override fun hasNext() = index < list.size()
+
+	override fun hasPrevious() = index > 0
+
+	override fun next() = list.get(index++) ?: throw NoSuchElementException()
+
+	override fun nextIndex() = index
+
+	override fun previous() = list.get(--index) ?: throw NoSuchElementException()
+
+	override fun previousIndex() = index - 1
+}