Run linter

This commit is contained in:
arkon
2020-02-26 18:03:34 -05:00
parent 58ab06b4f8
commit 043e3784e8
331 changed files with 876 additions and 1075 deletions
@@ -27,12 +27,12 @@ import eu.kanade.tachiyomi.ui.manga.chapter.ChaptersController
import eu.kanade.tachiyomi.ui.manga.info.MangaInfoController
import eu.kanade.tachiyomi.ui.manga.track.TrackController
import eu.kanade.tachiyomi.util.system.toast
import java.util.Date
import kotlinx.android.synthetic.main.main_activity.tabs
import kotlinx.android.synthetic.main.manga_controller.manga_pager
import rx.Subscription
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.Date
class MangaController : RxController, TabbedController {
@@ -170,7 +170,6 @@ class MangaController : RxController, TabbedController {
override fun getPageTitle(position: Int): CharSequence {
return tabTitles[position]
}
}
companion object {
@@ -181,5 +180,4 @@ class MangaController : RxController, TabbedController {
const val CHAPTERS_CONTROLLER = 1
const val TRACK_CONTROLLER = 2
}
}
@@ -9,12 +9,12 @@ import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.view.gone
import eu.kanade.tachiyomi.util.view.setVectorCompat
import kotlinx.android.synthetic.main.chapters_item.*
import java.util.Date
import kotlinx.android.synthetic.main.chapters_item.*
class ChapterHolder(
private val view: View,
private val adapter: ChaptersAdapter
private val view: View,
private val adapter: ChaptersAdapter
) : BaseFlexibleViewHolder(view, adapter) {
init {
@@ -49,9 +49,9 @@ class ChapterHolder(
chapter_date.text = ""
}
//add scanlator if exists
// add scanlator if exists
chapter_scanlator.text = chapter.scanlator
//allow longer titles if there is no scanlator (most sources)
// allow longer titles if there is no scanlator (most sources)
if (chapter_scanlator.text.isNullOrBlank()) {
chapter_title.maxLines = 2
chapter_scanlator.gone()
@@ -118,5 +118,4 @@ class ChapterHolder(
// Finally show the PopupMenu
popup.show()
}
}
@@ -35,10 +35,12 @@ class ChapterItem(val chapter: Chapter, val manga: Manga) : AbstractFlexibleItem
return ChapterHolder(view, adapter as ChaptersAdapter)
}
override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>,
holder: ChapterHolder,
position: Int,
payloads: List<Any?>?) {
override fun bindViewHolder(
adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>,
holder: ChapterHolder,
position: Int,
payloads: List<Any?>?
) {
holder.bind(this, manga)
}
@@ -54,5 +56,4 @@ class ChapterItem(val chapter: Chapter, val manga: Manga) : AbstractFlexibleItem
override fun hashCode(): Int {
return chapter.id!!.hashCode()
}
}
@@ -7,14 +7,14 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.getOrDefault
import eu.kanade.tachiyomi.util.system.getResourceColor
import uy.kohesive.injekt.injectLazy
import java.text.DateFormat
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
import uy.kohesive.injekt.injectLazy
class ChaptersAdapter(
controller: ChaptersController,
context: Context
controller: ChaptersController,
context: Context
) : FlexibleAdapter<ChapterItem>(null, controller, true) {
val preferences: PreferencesHelper by injectLazy()
@@ -46,5 +46,4 @@ class ChaptersAdapter(
interface OnMenuItemClickListener {
fun onMenuItemClick(position: Int, item: MenuItem)
}
}
@@ -233,7 +233,6 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
}
actionMode?.invalidate()
}
}
private fun initialFetchChapters() {
@@ -466,7 +465,7 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
fun onChaptersDeleted(chapters: List<ChapterItem>) {
dismissDeletingDialog()
//this is needed so the downloaded text gets removed from the item
// this is needed so the downloaded text gets removed from the item
chapters.forEach {
adapter?.updateItem(it)
}
@@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
import eu.kanade.tachiyomi.util.lang.isNullOrUnsubscribed
import java.util.Date
import rx.Observable
import rx.Subscription
import rx.android.schedulers.AndroidSchedulers
@@ -21,20 +22,19 @@ import rx.schedulers.Schedulers
import timber.log.Timber
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.Date
/**
* Presenter of [ChaptersController].
*/
class ChaptersPresenter(
val manga: Manga,
val source: Source,
private val chapterCountRelay: BehaviorRelay<Float>,
private val lastUpdateRelay: BehaviorRelay<Date>,
private val mangaFavoriteRelay: PublishRelay<Boolean>,
val preferences: PreferencesHelper = Injekt.get(),
private val db: DatabaseHelper = Injekt.get(),
private val downloadManager: DownloadManager = Injekt.get()
val manga: Manga,
val source: Source,
private val chapterCountRelay: BehaviorRelay<Float>,
private val lastUpdateRelay: BehaviorRelay<Date>,
private val mangaFavoriteRelay: PublishRelay<Boolean>,
val preferences: PreferencesHelper = Injekt.get(),
private val db: DatabaseHelper = Injekt.get(),
private val downloadManager: DownloadManager = Injekt.get()
) : BasePresenter<ChaptersController>() {
/**
@@ -98,7 +98,6 @@ class ChaptersPresenter(
// Emit the upload date of the most recent chapter
lastUpdateRelay.call(Date(chapters.maxBy { it.date_upload }?.date_upload
?: 0))
}
.subscribe { chaptersRelay.call(it) })
}
@@ -414,5 +413,4 @@ class ChaptersPresenter(
fun sortDescending(): Boolean {
return manga.sortDescending()
}
}
@@ -28,5 +28,4 @@ class DeleteChaptersDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
interface Listener {
fun deleteChapters()
}
}
@@ -23,5 +23,4 @@ class DeletingChaptersDialog(bundle: Bundle? = null) : DialogController(bundle)
override fun showDialog(router: Router) {
showDialog(router, TAG)
}
}
@@ -74,4 +74,4 @@ class DownloadCustomChaptersDialog<T> : DialogController
// Key to retrieve max chapters from bundle on process death.
const val KEY_ITEM_MAX = "DownloadCustomChaptersDialog.int.maxChapters"
}
}
}
@@ -45,12 +45,12 @@ import eu.kanade.tachiyomi.ui.webview.WebViewActivity
import eu.kanade.tachiyomi.util.lang.truncateCenter
import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.util.view.snack
import jp.wasabeef.glide.transformations.CropSquareTransformation
import kotlinx.android.synthetic.main.manga_info_controller.*
import uy.kohesive.injekt.injectLazy
import java.text.DateFormat
import java.text.DecimalFormat
import java.util.Date
import jp.wasabeef.glide.transformations.CropSquareTransformation
import kotlinx.android.synthetic.main.manga_info_controller.*
import uy.kohesive.injekt.injectLazy
/**
* Fragment that shows manga information.
@@ -153,14 +153,13 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
* If true update view with manga information,
* if false fetch manga information
*
* @param manga manga object containing information about manga.
* @param manga manga object containing information about manga.
* @param source the source of the manga.
*/
fun onNextManga(manga: Manga, source: Source) {
if (manga.initialized) {
// Update view.
setMangaInfo(manga, source)
} else {
// Initialize manga.
fetchMangaFromSource()
@@ -176,7 +175,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
private fun setMangaInfo(manga: Manga, source: Source?) {
val view = view ?: return
//update full title TextView.
// update full title TextView.
manga_full_title.text = if (manga.title.isBlank()) {
view.context.getString(R.string.unknown)
} else {
@@ -339,7 +338,6 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
presenter.fetchMangaFromSource()
}
/**
* Update swipe refresh to stop showing refresh in progress spinner.
*/
@@ -577,5 +575,4 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
successCallback.intentSender)
}
}
}
@@ -12,13 +12,13 @@ import eu.kanade.tachiyomi.data.download.DownloadManager
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.util.lang.isNullOrUnsubscribed
import java.util.Date
import rx.Observable
import rx.Subscription
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.Date
/**
* Presenter of MangaInfoFragment.
@@ -26,14 +26,14 @@ import java.util.Date
* Observable updates should be called from here.
*/
class MangaInfoPresenter(
val manga: Manga,
val source: Source,
private val chapterCountRelay: BehaviorRelay<Float>,
private val lastUpdateRelay: BehaviorRelay<Date>,
private val mangaFavoriteRelay: PublishRelay<Boolean>,
private val db: DatabaseHelper = Injekt.get(),
private val downloadManager: DownloadManager = Injekt.get(),
private val coverCache: CoverCache = Injekt.get()
val manga: Manga,
val source: Source,
private val chapterCountRelay: BehaviorRelay<Float>,
private val lastUpdateRelay: BehaviorRelay<Date>,
private val mangaFavoriteRelay: PublishRelay<Boolean>,
private val db: DatabaseHelper = Injekt.get(),
private val downloadManager: DownloadManager = Injekt.get(),
private val coverCache: CoverCache = Injekt.get()
) : BasePresenter<MangaInfoController>() {
/**
@@ -59,7 +59,7 @@ class MangaInfoPresenter(
.subscribe { setFavorite(it) }
.apply { add(this) }
//update last update date
// update last update date
lastUpdateRelay.observeOn(AndroidSchedulers.mainThread())
.subscribeLatestCache(MangaInfoController::setLastUpdateDate)
}
@@ -169,5 +169,4 @@ class MangaInfoPresenter(
fun moveMangaToCategory(manga: Manga, category: Category?) {
moveMangaToCategories(manga, listOfNotNull(category))
}
}
@@ -70,5 +70,4 @@ class SetTrackChaptersDialog<T> : DialogController
private companion object {
const val KEY_ITEM_TRACK = "SetTrackChaptersDialog.item.track"
}
}
}
@@ -76,5 +76,4 @@ class SetTrackScoreDialog<T> : DialogController
private companion object {
const val KEY_ITEM_TRACK = "SetTrackScoreDialog.item.track"
}
}
}
@@ -54,5 +54,4 @@ class SetTrackStatusDialog<T> : DialogController
private companion object {
const val KEY_ITEM_TRACK = "SetTrackStatusDialog.item.track"
}
}
@@ -41,5 +41,4 @@ class TrackAdapter(controller: TrackController) : RecyclerView.Adapter<TrackHold
fun onChaptersClick(position: Int)
fun onScoreClick(position: Int)
}
}
@@ -139,5 +139,4 @@ class TrackController : NucleusController<TrackPresenter>(),
private companion object {
const val TAG_SEARCH_CONTROLLER = "track_search_controller"
}
}
@@ -16,12 +16,11 @@ import rx.schedulers.Schedulers
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class TrackPresenter(
val manga: Manga,
preferences: PreferencesHelper = Injekt.get(),
private val db: DatabaseHelper = Injekt.get(),
private val trackManager: TrackManager = Injekt.get()
val manga: Manga,
preferences: PreferencesHelper = Injekt.get(),
private val db: DatabaseHelper = Injekt.get(),
private val trackManager: TrackManager = Injekt.get()
) : BasePresenter<TrackController>() {
private val context = preferences.context
@@ -130,5 +129,4 @@ class TrackPresenter(
track.last_chapter_read = chapterNumber
updateRemote(track, item.service)
}
}
@@ -10,11 +10,11 @@ import eu.kanade.tachiyomi.data.glide.GlideApp
import eu.kanade.tachiyomi.data.track.model.TrackSearch
import eu.kanade.tachiyomi.util.view.gone
import eu.kanade.tachiyomi.util.view.inflate
import kotlinx.android.synthetic.main.track_search_item.view.*
import java.util.ArrayList
import kotlinx.android.synthetic.main.track_search_item.view.*
class TrackSearchAdapter(context: Context)
: ArrayAdapter<TrackSearch>(context, R.layout.track_search_item, ArrayList<TrackSearch>()) {
class TrackSearchAdapter(context: Context) :
ArrayAdapter<TrackSearch>(context, R.layout.track_search_item, ArrayList<TrackSearch>()) {
override fun getView(position: Int, view: View?, parent: ViewGroup): View {
var v = view
@@ -13,6 +13,7 @@ import eu.kanade.tachiyomi.data.track.TrackService
import eu.kanade.tachiyomi.data.track.model.TrackSearch
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.util.lang.plusAssign
import java.util.concurrent.TimeUnit
import kotlinx.android.synthetic.main.track_search_dialog.view.progress
import kotlinx.android.synthetic.main.track_search_dialog.view.track_search
import kotlinx.android.synthetic.main.track_search_dialog.view.track_search_list
@@ -21,7 +22,6 @@ import rx.android.schedulers.AndroidSchedulers
import rx.subscriptions.CompositeSubscription
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.concurrent.TimeUnit
class TrackSearchDialog : DialogController {
@@ -148,5 +148,4 @@ class TrackSearchDialog : DialogController {
private companion object {
const val KEY_SERVICE = "service_id"
}
}