mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-28 03:57:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
arkon
2022-05-11 22:17:12 -04:00
parent 37199a10bf
commit c7707dc50e
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/kanade/tachiyomi/ui/manga/AddDuplicateMangaDialog.kt
View File

@ -11,8 +11,7 @@ import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.ui.base.controller.pushController
import uy.kohesive.injekt.injectLazy
class AddDuplicateMangaDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
where T : Controller, T : AddDuplicateMangaDialog.Listener {
class AddDuplicateMangaDialog(bundle: Bundle? = null) : DialogController(bundle) {
private val sourceManager: SourceManager by injectLazy()
@ -20,7 +19,7 @@ class AddDuplicateMangaDialog<T>(bundle: Bundle? = null) : DialogController(bund
private lateinit var onAddToLibrary: () -> Unit
constructor(
target: T,
target: Controller,
libraryManga: Manga,
onAddToLibrary: () -> Unit,
) : this() {
@ -46,8 +45,4 @@ class AddDuplicateMangaDialog<T>(bundle: Bundle? = null) : DialogController(bund
.setCancelable(true)
.create()
}
interface Listener {
fun addToLibrary(newManga: Manga)
}
}

3
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
View File

@ -113,7 +113,6 @@ class MangaController :
FlexibleAdapter.OnItemClickListener,
FlexibleAdapter.OnItemLongClickListener,
BaseChaptersAdapter.OnChapterClickListener,
AddDuplicateMangaDialog.Listener,
ChangeMangaCoverDialog.Listener,
ChangeMangaCategoriesDialog.Listener,
DownloadCustomChaptersDialog.Listener,
@ -533,7 +532,7 @@ class MangaController :
trackSheet?.show()
}
override fun addToLibrary(newManga: Manga) {
private fun addToLibrary(newManga: Manga) {
val categories = presenter.getCategories()
val defaultCategoryId = preferences.defaultCategory()
val defaultCategory = categories.find { it.id == defaultCategoryId }

12
app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
View File

@ -11,6 +11,7 @@ import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Drawable
import android.graphics.drawable.GradientDrawable
import android.os.Build
import androidx.annotation.ColorInt
import androidx.core.graphics.alpha
import androidx.core.graphics.applyCanvas
import androidx.core.graphics.blue
@ -446,19 +447,22 @@ object ImageUtil {
)
}
private fun Int.isDark(): Boolean =
private fun @receiver:ColorInt Int.isDark(): Boolean =
red < 40 && blue < 40 && green < 40 && alpha > 200
private fun Int.isCloseTo(other: Int): Boolean =
private fun @receiver:ColorInt Int.isCloseTo(other: Int): Boolean =
abs(red - other.red) < 30 && abs(green - other.green) < 30 && abs(blue - other.blue) < 30
private fun Int.isWhite(): Boolean =
private fun @receiver:ColorInt Int.isWhite(): Boolean =
red + blue + green > 740
/**
* Used to check an image's dimensions without loading it in the memory.
*/
private fun extractImageOptions(imageStream: InputStream, resetAfterExtraction: Boolean = true): BitmapFactory.Options {
private fun extractImageOptions(
imageStream: InputStream,
resetAfterExtraction: Boolean = true,
): BitmapFactory.Options {
imageStream.mark(imageStream.available() + 1)
val imageBytes = imageStream.readBytes()