From b18075de14612eda455bfd2040abc6496bea605d Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 24 May 2021 14:48:41 -0400 Subject: [PATCH] Cleanup --- app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt | 4 +--- .../java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt | 3 --- app/src/main/java/exh/ui/login/EhLoginActivity.kt | 2 +- app/src/main/java/exh/util/SourceTagsUtil.kt | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt index d38d88cb6..a34f304cf 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt @@ -17,9 +17,7 @@ open class Page( // SY --> var imageUrl = imageUrl - get() { - return field?.let { DataSaver.compress(it) } - } + get() = field?.let { DataSaver.compress(it) } // SY <-- val number: Int diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt index fdd02e804..1d920f093 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.ui.reader.model -import android.graphics.drawable.Drawable import eu.kanade.tachiyomi.source.model.Page import java.io.InputStream @@ -9,8 +8,6 @@ open class ReaderPage( url: String = "", imageUrl: String? = null, // SY --> - var bg: Drawable? = null, - var bgType: Int? = null, /** Value to check if this page is used to as if it was too wide */ var shiftedPage: Boolean = false, /** Value to check if a page is can be doubled up, but can't because the next page is too wide */ diff --git a/app/src/main/java/exh/ui/login/EhLoginActivity.kt b/app/src/main/java/exh/ui/login/EhLoginActivity.kt index 66176ad2b..10c636326 100644 --- a/app/src/main/java/exh/ui/login/EhLoginActivity.kt +++ b/app/src/main/java/exh/ui/login/EhLoginActivity.kt @@ -145,7 +145,7 @@ class EhLoginActivity : BaseViewBindingActivity() { } } - fun openIgneousDialog() { + private fun openIgneousDialog() { var igneous: CharSequence? = null MaterialDialog(this) .title(R.string.custom_igneous_cookie) diff --git a/app/src/main/java/exh/util/SourceTagsUtil.kt b/app/src/main/java/exh/util/SourceTagsUtil.kt index db245e5a0..8bbfb8631 100644 --- a/app/src/main/java/exh/util/SourceTagsUtil.kt +++ b/app/src/main/java/exh/util/SourceTagsUtil.kt @@ -45,9 +45,9 @@ object SourceTagsUtil { private fun wrapTagNHentai(namespace: String, tag: String) = if (tag.contains(' ')) { if (namespace == "tag") { - "\"$tag\"" + """"$tag"""" } else { - "$namespace:\"$tag\"" + """$namespace:"$tag"""" } } else { "$namespace:$tag"