Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source 
(cherry picked from commit c7707dc50edb817652d4e850f4f0806ab05307df)

# Conflicts:
#	.github/renovate.json
This commit is contained in:
arkon 2022-05-11 22:17:12 -04:00 committed by Jobobby04
parent 409162d3d7
commit 61ff7f8b21
4 changed files with 11 additions and 14 deletions
Show Stats 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 eu.kanade.tachiyomi.ui.base.controller.pushController
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
class AddDuplicateMangaDialog<T>(bundle: Bundle? = null) : DialogController(bundle) class AddDuplicateMangaDialog(bundle: Bundle? = null) : DialogController(bundle) {
where T : Controller, T : AddDuplicateMangaDialog.Listener {
private val sourceManager: SourceManager by injectLazy() private val sourceManager: SourceManager by injectLazy()
@ -20,7 +19,7 @@ class AddDuplicateMangaDialog<T>(bundle: Bundle? = null) : DialogController(bund
private lateinit var onAddToLibrary: () -> Unit private lateinit var onAddToLibrary: () -> Unit
constructor( constructor(
target: T, target: Controller,
libraryManga: Manga, libraryManga: Manga,
onAddToLibrary: () -> Unit, onAddToLibrary: () -> Unit,
) : this() { ) : this() {
@ -46,8 +45,4 @@ class AddDuplicateMangaDialog<T>(bundle: Bundle? = null) : DialogController(bund
.setCancelable(true) .setCancelable(true)
.create() .create()
} }
interface Listener {
fun addToLibrary(newManga: Manga)
}
} }

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

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

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

@ -449,19 +449,22 @@ object ImageUtil {
) )
} }
private fun Int.isDark(): Boolean = private fun @receiver:ColorInt Int.isDark(): Boolean =
red < 40 && blue < 40 && green < 40 && alpha > 200 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 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 red + blue + green > 740
/** /**
* Used to check an image's dimensions without loading it in the memory. * 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) imageStream.mark(imageStream.available() + 1)
val imageBytes = imageStream.readBytes() val imageBytes = imageStream.readBytes()

2
gradle/libs.versions.toml
View File

@ -80,7 +80,7 @@ flowbinding-viewpager = { module = "io.github.reactivecircus.flowbinding:flowbin
logcat = "com.squareup.logcat:logcat:0.1" logcat = "com.squareup.logcat:logcat:0.1"
acra-http = "ch.acra:acra-http:5.9.1" acra-http = "ch.acra:acra-http:5.9.3"
firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.0.0" firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.0.0"
aboutLibraries-gradle = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlib_version" } aboutLibraries-gradle = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlib_version" }