From 7e93557bd2f094ec4a5f1a7011b86724c8f8fcb0 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 12 Oct 2020 21:50:06 -0400 Subject: [PATCH] Remove markwan dependancy --- app/build.gradle | 9 --- .../java/eu/kanade/tachiyomi/AppModule.kt | 3 - .../kanade/tachiyomi/source/model/Filter.kt | 4 -- .../source/browse/BrowseSourcePresenter.kt | 2 - .../ui/browse/source/filter/HelpDialogItem.kt | 61 ------------------- .../api/http/serializer/FilterSerializer.kt | 5 +- .../http/serializer/FilterSerializerModels.kt | 19 ------ 7 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/HelpDialogItem.kt diff --git a/app/build.gradle b/app/build.gradle index 509249f08..d6b6d90b8 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -330,15 +330,6 @@ dependencies { implementation 'androidx.gridlayout:gridlayout:1.0.0' - final def markwon_version = '4.5.1' - - implementation "io.noties.markwon:core:$markwon_version" - implementation "io.noties.markwon:ext-strikethrough:$markwon_version" - implementation "io.noties.markwon:ext-tables:$markwon_version" - implementation "io.noties.markwon:html:$markwon_version" - implementation "io.noties.markwon:image:$markwon_version" - implementation "io.noties.markwon:linkify:$markwon_version" - implementation 'com.google.guava:guava:29.0-android' } diff --git a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt index a708214a9..2ffbaf148 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt @@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.network.NetworkHelper import eu.kanade.tachiyomi.source.SourceManager import exh.eh.EHentaiUpdateHelper -import io.noties.markwon.Markwon import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import uy.kohesive.injekt.api.InjektModule @@ -51,8 +50,6 @@ class AppModule(val app: Application) : InjektModule { // SY --> addSingletonFactory { EHentaiUpdateHelper(app) } - - addSingletonFactory { Markwon.create(app) } // SY <-- // Asynchronously init expensive components for a faster cold start diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt index e327ebc36..e91e4ebb5 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt @@ -2,10 +2,6 @@ package eu.kanade.tachiyomi.source.model sealed class Filter(val name: String, var state: T) { open class Header(name: String) : Filter(name, 0) - // --> EXH - // name = button text - open class HelpDialog(name: String, val dialogTitle: String = name, val markdown: String) : Filter(name, 0) - // <-- EXH open class Separator(name: String = "") : Filter(name, 0) abstract class Select(name: String, val values: Array, state: Int = 0) : Filter(name, state) abstract class Text(name: String, state: String = "") : Filter(name, state) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt index fd3bb1f98..9184a92b3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt @@ -21,7 +21,6 @@ import eu.kanade.tachiyomi.ui.browse.source.filter.CheckboxItem import eu.kanade.tachiyomi.ui.browse.source.filter.CheckboxSectionItem import eu.kanade.tachiyomi.ui.browse.source.filter.GroupItem import eu.kanade.tachiyomi.ui.browse.source.filter.HeaderItem -import eu.kanade.tachiyomi.ui.browse.source.filter.HelpDialogItem import eu.kanade.tachiyomi.ui.browse.source.filter.SelectItem import eu.kanade.tachiyomi.ui.browse.source.filter.SelectSectionItem import eu.kanade.tachiyomi.ui.browse.source.filter.SeparatorItem @@ -346,7 +345,6 @@ open class BrowseSourcePresenter( when (filter) { is Filter.Header -> HeaderItem(filter) // --> EXH - is Filter.HelpDialog -> HelpDialogItem(filter) is Filter.AutoComplete -> AutoComplete(filter) // <-- EXH is Filter.Separator -> SeparatorItem(filter) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/HelpDialogItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/HelpDialogItem.kt deleted file mode 100644 index ae1d74ae8..000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/HelpDialogItem.kt +++ /dev/null @@ -1,61 +0,0 @@ -package eu.kanade.tachiyomi.ui.browse.source.filter - -import android.annotation.SuppressLint -import android.view.View -import android.widget.Button -import android.widget.TextView -import com.afollestad.materialdialogs.MaterialDialog -import com.afollestad.materialdialogs.customview.customView -import eu.davidea.flexibleadapter.FlexibleAdapter -import eu.davidea.flexibleadapter.items.AbstractHeaderItem -import eu.davidea.flexibleadapter.items.IFlexible -import eu.davidea.viewholders.FlexibleViewHolder -import eu.kanade.tachiyomi.R -import eu.kanade.tachiyomi.source.model.Filter -import io.noties.markwon.Markwon -import uy.kohesive.injekt.injectLazy - -class HelpDialogItem(val filter: Filter.HelpDialog) : AbstractHeaderItem() { - private val markwon: Markwon by injectLazy() - - @SuppressLint("PrivateResource") - override fun getLayoutRes(): Int { - return R.layout.navigation_view_help_dialog - } - - override fun createViewHolder(view: View, adapter: FlexibleAdapter>): Holder { - return Holder(view, adapter) - } - - override fun bindViewHolder(adapter: FlexibleAdapter>, holder: Holder, position: Int, payloads: List?) { - val view = holder.button as TextView - view.text = filter.name - view.setOnClickListener { - val v = TextView(view.context) - - val parsed = markwon.parse(filter.markdown) - val rendered = markwon.render(parsed) - markwon.setParsedMarkdown(v, rendered) - - MaterialDialog(view.context) - .title(text = filter.dialogTitle) - .customView(view = v, scrollable = true) - .positiveButton(android.R.string.ok) - .show() - } - } - - override fun equals(other: Any?): Boolean { - if (this === other) return true - if (javaClass != other?.javaClass) return false - return filter == (other as HelpDialogItem).filter - } - - override fun hashCode(): Int { - return filter.hashCode() - } - - class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) { - val button: Button = itemView.findViewById(R.id.dialog_open_button) - } -} diff --git a/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializer.kt b/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializer.kt index a4d4110fa..52345fc89 100644 --- a/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializer.kt +++ b/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializer.kt @@ -20,10 +20,9 @@ import kotlin.reflect.full.isSubclassOf class FilterSerializer { private val serializers = listOf>( - // EXH --> - HelpDialogSerializer(this), + // SY --> AutoCompleteSerializer(this), - // EXH <-- + // SY <-- HeaderSerializer(this), SeparatorSerializer(this), SelectSerializer(this), diff --git a/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializerModels.kt b/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializerModels.kt index 1b73d06a3..dffcf26b8 100644 --- a/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializerModels.kt +++ b/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializerModels.kt @@ -30,25 +30,6 @@ interface Serializer> { val clazz: KClass } -// EXH --> -class HelpDialogSerializer(override val serializer: FilterSerializer) : Serializer { - override val type = "HELP_DIALOG" - override val clazz = Filter.HelpDialog::class - - override fun mappings() = listOf( - Pair(NAME, Filter.HelpDialog::name), - Pair(DIALOG_TITLE, Filter.HelpDialog::dialogTitle), - Pair(MARKDOWN, Filter.HelpDialog::markdown) - ) - - companion object { - const val NAME = "name" - const val DIALOG_TITLE = "dialogTitle" - const val MARKDOWN = "markdown" - } -} -// EXH <-- - class HeaderSerializer(override val serializer: FilterSerializer) : Serializer { override val type = "HEADER" override val clazz = Filter.Header::class