Run default Android Studio formatter on code

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupConst.kt

@@ -1,4 +1,5 @@
 package eu.kanade.tachiyomi.data.backup
+
 import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
 
 

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt

@@ -217,10 +217,14 @@ class BackupRestoreService : Service() {
                 .concatMap {
                     val obj = it.asJsonObject
                     val manga = backupManager.parser.fromJson<MangaImpl>(obj.get(MANGA))
-                    val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(obj.get(CHAPTERS) ?: JsonArray())
+                    val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(obj.get(CHAPTERS)
-                    val categories = backupManager.parser.fromJson<List<String>>(obj.get(CATEGORIES) ?: JsonArray())
+                            ?: JsonArray())
-                    val history = backupManager.parser.fromJson<List<DHistory>>(obj.get(HISTORY) ?: JsonArray())
+                    val categories = backupManager.parser.fromJson<List<String>>(obj.get(CATEGORIES)
-                    val tracks = backupManager.parser.fromJson<List<TrackImpl>>(obj.get(TRACK) ?: JsonArray())
+                            ?: JsonArray())
+                    val history = backupManager.parser.fromJson<List<DHistory>>(obj.get(HISTORY)
+                            ?: JsonArray())
+                    val tracks = backupManager.parser.fromJson<List<TrackImpl>>(obj.get(TRACK)
+                            ?: JsonArray())
 
                     val observable = getMangaRestoreObservable(manga, chapters, categories, history, tracks)
                     if (observable != null) {

app/src/main/java/eu/kanade/tachiyomi/data/backup/models/DHistory.kt

@@ -1,3 +1,3 @@
 package eu.kanade.tachiyomi.data.backup.models
 
-data class DHistory(val url: String,val lastRead: Long)
+data class DHistory(val url: String, val lastRead: Long)

app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt

@@ -20,8 +20,8 @@ class CoverCache(private val context: Context) {
     /**
      * Cache directory used for cache management.
      */
-    private val cacheDir = context.getExternalFilesDir("covers") ?:
+    private val cacheDir = context.getExternalFilesDir("covers")
-            File(context.filesDir, "covers").also { it.mkdirs() }
+            ?: File(context.filesDir, "covers").also { it.mkdirs() }
 
     /**
      * Returns the cover from cache.

app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt

@@ -12,7 +12,7 @@ import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory
  * This class provides operations to manage the database through its interfaces.
  */
 open class DatabaseHelper(context: Context)
-: MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries {
+    : MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries {
 
     private val configuration = SupportSQLiteOpenHelper.Configuration.builder(context)
             .name(DbOpenCallback.DATABASE_NAME)

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt

@@ -161,7 +161,8 @@ internal class DownloadNotifier(private val context: Context) {
     fun onError(error: String? = null, chapter: String? = null) {
         // Create notification
         with(notificationBuilder) {
-            setContentTitle(chapter ?: context.getString(R.string.download_notifier_downloader_title))
+            setContentTitle(chapter
+                    ?: context.getString(R.string.download_notifier_downloader_title))
             setContentText(error ?: context.getString(R.string.download_notifier_unkown_error))
             setSmallIcon(android.R.drawable.stat_sys_warning)
             clearActions()

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt

@@ -131,7 +131,8 @@ class DownloadService : Service() {
         subscriptions += ReactiveNetwork.observeNetworkConnectivity(applicationContext)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ state -> onNetworkStateChanged(state)
+                .subscribe({ state ->
+                    onNetworkStateChanged(state)
                 }, {
                     toast(R.string.download_queue_error)
                     stopSelf()
@@ -156,7 +157,9 @@ class DownloadService : Service() {
             DISCONNECTED -> {
                 downloadManager.stopDownloads(getString(R.string.download_notifier_no_network))
             }
-            else -> { /* Do nothing */ }
+            else -> {
+                /* Do nothing */
+            }
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt

@@ -82,7 +82,8 @@ class Downloader(
     /**
      * Whether the downloader is running.
      */
-    @Volatile private var isRunning: Boolean = false
+    @Volatile
+    private var isRunning: Boolean = false
 
     init {
         launchNow {
@@ -175,7 +176,8 @@ class Downloader(
                 .concatMap { downloadChapter(it).subscribeOn(Schedulers.io()) }
                 .onBackpressureBuffer()
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ completeDownload(it)
+                .subscribe({
+                    completeDownload(it)
                 }, { error ->
                     DownloadService.stop(context)
                     Timber.e(error)

app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.kt

@@ -10,17 +10,24 @@ class Download(val source: HttpSource, val manga: Manga, val chapter: Chapter) {
 
     var pages: List<Page>? = null
 
-    @Volatile @Transient var totalProgress: Int = 0
+    @Volatile
+    @Transient
+    var totalProgress: Int = 0
 
-    @Volatile @Transient var downloadedImages: Int = 0
+    @Volatile
+    @Transient
+    var downloadedImages: Int = 0
 
-    @Volatile @Transient var status: Int = 0
+    @Volatile
+    @Transient
+    var status: Int = 0
         set(status) {
             field = status
             statusSubject?.onNext(this)
         }
 
-    @Transient private var statusSubject: PublishSubject<Download>? = null
+    @Transient
+    private var statusSubject: PublishSubject<Download>? = null
 
     fun setStatusSubject(subject: PublishSubject<Download>?) {
         statusSubject = subject

app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.kt

@@ -12,7 +12,7 @@ import java.util.concurrent.CopyOnWriteArrayList
 class DownloadQueue(
         private val store: DownloadStore,
         private val queue: MutableList<Download> = CopyOnWriteArrayList<Download>())
-: List<Download> by queue {
+    : List<Download> by queue {
 
     private val statusSubject = PublishSubject.create<Download>()
 
@@ -42,7 +42,9 @@ class DownloadQueue(
     }
 
     fun remove(chapters: List<Chapter>) {
-        for (chapter in chapters) { remove(chapter) }
+        for (chapter in chapters) {
+            remove(chapter)
+        }
     }
 
     fun remove(manga: Manga) {

app/src/main/java/eu/kanade/tachiyomi/data/glide/LibraryMangaUrlFetcher.kt

@@ -19,7 +19,7 @@ import java.io.InputStream
 class LibraryMangaUrlFetcher(private val networkFetcher: DataFetcher<InputStream>,
                              private val manga: Manga,
                              private val file: File)
-: FileFetcher(file) {
+    : FileFetcher(file) {
 
     override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
         if (!file.exists()) {

app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt

@@ -137,7 +137,7 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
             track.status = COMPLETED
         }
         // If user was using API v1 fetch library_id
-        if (track.library_id == null || track.library_id!! == 0L){
+        if (track.library_id == null || track.library_id!! == 0L) {
             return api.findLibManga(track, getUsername().toInt()).flatMap {
                 if (it == null) {
                     throw Exception("$track not found on user library")
@@ -187,7 +187,7 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
         return api.getCurrentUser().map { (username, scoreType) ->
             scorePreference.set(scoreType)
             saveCredentials(username.toString(), oauth.access_token)
-         }.doOnError{
+        }.doOnError {
             logout()
         }.toCompletable()
     }

app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt

@@ -250,7 +250,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
     private fun jsonToALManga(struct: JsonObject): ALManga {
         val date = try {
             val date = Calendar.getInstance()
-            date.set(struct["startDate"]["year"].nullInt ?: 0, (struct["startDate"]["month"].nullInt ?: 0) - 1,
+            date.set(struct["startDate"]["year"].nullInt ?: 0, (struct["startDate"]["month"].nullInt
+                    ?: 0) - 1,
                     struct["startDate"]["day"].nullInt ?: 0)
             date.timeInMillis
         } catch (_: Exception) {

app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistInterceptor.kt

@@ -23,7 +23,7 @@ class AnilistInterceptor(val anilist: Anilist, private var token: String?) : Int
         if (token.isNullOrEmpty()) {
             throw Exception("Not authenticated with Anilist")
         }
-        if (oauth == null){
+        if (oauth == null) {
             oauth = anilist.loadOAuth()
         }
         // Refresh access token if null or expired.

app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt

@@ -86,7 +86,7 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI
     fun findLibManga(track: Track): Observable<Track?> {
         return authClient.newCall(GET(url = listEntryUrl(track.media_id)))
                 .asObservable()
-                .map {response ->
+                .map { response ->
                     var libTrack: Track? = null
                     response.use {
                         if (it.priorResponse?.isRedirect != true) {
@@ -96,7 +96,8 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI
                                 last_chapter_read = trackForm.select("#add_manga_num_read_chapters").`val`().toInt()
                                 total_chapters = trackForm.select("#totalChap").text().toInt()
                                 status = trackForm.select("#add_manga_status > option[selected]").`val`().toInt()
-                                score = trackForm.select("#add_manga_score > option[selected]").`val`().toFloatOrNull() ?: 0f
+                                score = trackForm.select("#add_manga_score > option[selected]").`val`().toFloatOrNull()
+                                        ?: 0f
                             }
                         }
                     }
@@ -158,7 +159,7 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI
     private fun getListUrl(): Observable<String> {
         return authClient.newCall(POST(url = exportListUrl(), body = exportPostBody()))
                 .asObservable()
-                .map {response ->
+                .map { response ->
                     baseUrl + Jsoup.parse(response.consumeBody())
                             .select("div.goodresult")
                             .select("a")
@@ -233,7 +234,7 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI
                 .toString()
 
         private fun addUrl() = Uri.parse(baseModifyListUrl).buildUpon()
-                .appendPath( "add.json")
+                .appendPath("add.json")
                 .toString()
 
         private fun listEntryUrl(mediaId: Int) = Uri.parse(baseModifyListUrl).buildUpon()

app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListInterceptor.kt

@@ -8,7 +8,7 @@ import okhttp3.Response
 import okio.Buffer
 import org.json.JSONObject
 
-class MyAnimeListInterceptor(private val myanimelist: Myanimelist): Interceptor {
+class MyAnimeListInterceptor(private val myanimelist: Myanimelist) : Interceptor {
 
     override fun intercept(chain: Interceptor.Chain): Response {
         myanimelist.ensureLoggedIn()

app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdateResult.kt

@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.data.updater
 
 abstract class UpdateResult {
 
-    open class NewUpdate<T : Release>(val release: T): UpdateResult()
+    open class NewUpdate<T : Release>(val release: T) : UpdateResult()
-    open class NoNewUpdate: UpdateResult()
+    open class NoNewUpdate : UpdateResult()
 
 }

app/src/main/java/eu/kanade/tachiyomi/data/updater/devrepo/DevRepoUpdateResult.kt

@@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.data.updater.UpdateResult
 
 sealed class DevRepoUpdateResult : UpdateResult() {
 
-    class NewUpdate(release: DevRepoRelease): UpdateResult.NewUpdate<DevRepoRelease>(release)
+    class NewUpdate(release: DevRepoRelease) : UpdateResult.NewUpdate<DevRepoRelease>(release)
-    class NoNewUpdate: UpdateResult.NoNewUpdate()
+    class NoNewUpdate : UpdateResult.NoNewUpdate()
 
 }

app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubRelease.kt

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.data.updater.Release
  */
 class GithubRelease(@SerializedName("tag_name") val version: String,
                     @SerializedName("body") override val info: String,
-                    @SerializedName("assets") private val assets: List<Assets>): Release {
+                    @SerializedName("assets") private val assets: List<Assets>) : Release {
 
     /**
      * Get download link of latest release from the assets.

app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateResult.kt

@@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.data.updater.UpdateResult
 
 sealed class GithubUpdateResult : UpdateResult() {
 
-    class NewUpdate(release: GithubRelease): UpdateResult.NewUpdate<GithubRelease>(release)
+    class NewUpdate(release: GithubRelease) : UpdateResult.NewUpdate<GithubRelease>(release)
     class NoNewUpdate : UpdateResult.NoNewUpdate()
 
 }

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt

@@ -31,7 +31,8 @@ internal class ExtensionInstallReceiver(private val listener: Listener) :
     /**
      * Returns the intent filter this receiver should subscribe to.
      */
-    private val filter get() = IntentFilter().apply {
+    private val filter
+        get() = IntentFilter().apply {
             addAction(Intent.ACTION_PACKAGE_ADDED)
             addAction(Intent.ACTION_PACKAGE_REPLACED)
             addAction(Intent.ACTION_PACKAGE_REMOVED)
@@ -61,7 +62,8 @@ internal class ExtensionInstallReceiver(private val listener: Listener) :
                     when (result) {
                         is LoadResult.Success -> listener.onExtensionUpdated(result.extension)
                         // Not needed as a package can't be upgraded if the signature is different
-                        is LoadResult.Untrusted -> {}
+                        is LoadResult.Untrusted -> {
+                        }
                     }
                 }
             }
@@ -92,8 +94,8 @@ internal class ExtensionInstallReceiver(private val listener: Listener) :
      * @param intent The intent containing the package name of the extension.
      */
     private suspend fun getExtensionFromIntent(context: Context, intent: Intent?): LoadResult {
-        val pkgName = getPackageNameFromIntent(intent) ?:
+        val pkgName = getPackageNameFromIntent(intent)
-                return LoadResult.Error("Package name not found")
+                ?: return LoadResult.Error("Package name not found")
         return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT) { ExtensionLoader.loadExtensionFromPkgName(context, pkgName) }.await()
     }
 

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

@@ -95,7 +95,7 @@ internal object ExtensionLoader {
             return LoadResult.Error(error)
         }
 
-        val extName = pkgManager.getApplicationLabel(appInfo)?.toString()
+        val extName = pkgManager.getApplicationLabel(appInfo).toString()
                 .orEmpty().substringAfter("Tachiyomi: ")
         val versionName = pkgInfo.versionName
         val versionCode = pkgInfo.versionCode

app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.network
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.webkit.WebResourceRequest

app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt

@@ -213,7 +213,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
                         .sortedWith(Comparator<File> { f1, f2 -> f1.name.compareToCaseInsensitiveNaturalOrder(f2.name) })
                         .find { !it.isDirectory && ImageUtil.isImage(it.name) { FileInputStream(it) } }
 
-                entry?.let { updateCover(context, manga, it.inputStream())}
+                entry?.let { updateCover(context, manga, it.inputStream()) }
             }
             is Format.Zip -> {
                 ZipFile(format.file).use { zip ->
@@ -221,7 +221,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
                             .sortedWith(Comparator<ZipEntry> { f1, f2 -> f1.name.compareToCaseInsensitiveNaturalOrder(f2.name) })
                             .find { !it.isDirectory && ImageUtil.isImage(it.name) { zip.getInputStream(it) } }
 
-                    entry?.let { updateCover(context, manga, zip.getInputStream(it) )}
+                    entry?.let { updateCover(context, manga, zip.getInputStream(it)) }
                 }
             }
             is Format.Rar -> {
@@ -230,7 +230,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
                             .sortedWith(Comparator<FileHeader> { f1, f2 -> f1.fileNameString.compareToCaseInsensitiveNaturalOrder(f2.fileNameString) })
                             .find { !it.isDirectory && ImageUtil.isImage(it.fileNameString) { archive.getInputStream(it) } }
 
-                    entry?.let { updateCover(context, manga, archive.getInputStream(it) )}
+                    entry?.let { updateCover(context, manga, archive.getInputStream(it)) }
                 }
             }
             is Format.Epub -> {
@@ -252,7 +252,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
     sealed class Format {
         data class Directory(val file: File) : Format()
         data class Zip(val file: File) : Format()
-        data class Rar(val file: File): Format()
+        data class Rar(val file: File) : Format()
         data class Epub(val file: File) : Format()
     }
 

app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt

@@ -17,7 +17,8 @@ sealed class Filter<T>(val name: String, var state: T) {
             const val STATE_EXCLUDE = 2
         }
     }
-    abstract class Group<V>(name: String, state: List<V>): Filter<List<V>>(name, state)
+
+    abstract class Group<V>(name: String, state: List<V>) : Filter<List<V>>(name, state)
 
     abstract class Sort(name: String, val values: Array<String>, state: Selection? = null)
         : Filter<Sort.Selection?>(name, state) {

app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt

@@ -14,15 +14,20 @@ open class Page(
     val number: Int
         get() = index + 1
 
-    @Transient @Volatile var status: Int = 0
+    @Transient
+    @Volatile
+    var status: Int = 0
         set(value) {
             field = value
             statusSubject?.onNext(value)
         }
 
-    @Transient @Volatile var progress: Int = 0
+    @Transient
+    @Volatile
+    var progress: Int = 0
 
-    @Transient private var statusSubject: Subject<Int, Int>? = null
+    @Transient
+    private var statusSubject: Subject<Int, Int>? = null
 
     override fun update(bytesRead: Long, contentLength: Long, done: Boolean) {
         progress = if (contentLength > 0) {

app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt

@@ -69,7 +69,7 @@ abstract class HttpSource : CatalogueSource {
     /**
      * Headers builder for requests. Implementations can override this method for custom headers.
      */
-    open protected fun headersBuilder() = Headers.Builder().apply {
+    protected open fun headersBuilder() = Headers.Builder().apply {
         add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
     }
 
@@ -97,14 +97,14 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param page the page number to retrieve.
      */
-    abstract protected fun popularMangaRequest(page: Int): Request
+    protected abstract fun popularMangaRequest(page: Int): Request
 
     /**
      * Parses the response from the site and returns a [MangasPage] object.
      *
      * @param response the response from the site.
      */
-    abstract protected fun popularMangaParse(response: Response): MangasPage
+    protected abstract fun popularMangaParse(response: Response): MangasPage
 
     /**
      * Returns an observable containing a page with a list of manga. Normally it's not needed to
@@ -129,14 +129,14 @@ abstract class HttpSource : CatalogueSource {
      * @param query the search query.
      * @param filters the list of filters to apply.
      */
-    abstract protected fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request
+    protected abstract fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request
 
     /**
      * Parses the response from the site and returns a [MangasPage] object.
      *
      * @param response the response from the site.
      */
-    abstract protected fun searchMangaParse(response: Response): MangasPage
+    protected abstract fun searchMangaParse(response: Response): MangasPage
 
     /**
      * Returns an observable containing a page with a list of latest manga updates.
@@ -156,14 +156,14 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param page the page number to retrieve.
      */
-    abstract protected fun latestUpdatesRequest(page: Int): Request
+    protected abstract fun latestUpdatesRequest(page: Int): Request
 
     /**
      * Parses the response from the site and returns a [MangasPage] object.
      *
      * @param response the response from the site.
      */
-    abstract protected fun latestUpdatesParse(response: Response): MangasPage
+    protected abstract fun latestUpdatesParse(response: Response): MangasPage
 
     /**
      * Returns an observable with the updated details for a manga. Normally it's not needed to
@@ -194,7 +194,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param response the response from the site.
      */
-    abstract protected fun mangaDetailsParse(response: Response): SManga
+    protected abstract fun mangaDetailsParse(response: Response): SManga
 
     /**
      * Returns an observable with the updated chapter list for a manga. Normally it's not needed to
@@ -220,7 +220,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param manga the manga to look for chapters.
      */
-    open protected fun chapterListRequest(manga: SManga): Request {
+    protected open fun chapterListRequest(manga: SManga): Request {
         return GET(baseUrl + manga.url, headers)
     }
 
@@ -229,7 +229,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param response the response from the site.
      */
-    abstract protected fun chapterListParse(response: Response): List<SChapter>
+    protected abstract fun chapterListParse(response: Response): List<SChapter>
 
     /**
      * Returns an observable with the page list for a chapter.
@@ -250,7 +250,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param chapter the chapter whose page list has to be fetched.
      */
-    open protected fun pageListRequest(chapter: SChapter): Request {
+    protected open fun pageListRequest(chapter: SChapter): Request {
         return GET(baseUrl + chapter.url, headers)
     }
 
@@ -259,7 +259,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param response the response from the site.
      */
-    abstract protected fun pageListParse(response: Response): List<Page>
+    protected abstract fun pageListParse(response: Response): List<Page>
 
     /**
      * Returns an observable with the page containing the source url of the image. If there's any
@@ -279,7 +279,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param page the chapter whose page list has to be fetched
      */
-    open protected fun imageUrlRequest(page: Page): Request {
+    protected open fun imageUrlRequest(page: Page): Request {
         return GET(page.url, headers)
     }
 
@@ -288,7 +288,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param response the response from the site.
      */
-    abstract protected fun imageUrlParse(response: Response): String
+    protected abstract fun imageUrlParse(response: Response): String
 
     /**
      * Returns an observable with the response of the source image.
@@ -306,7 +306,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param page the chapter whose page list has to be fetched
      */
-    open protected fun imageRequest(page: Page): Request {
+    protected open fun imageRequest(page: Page): Request {
         return GET(page.imageUrl!!, headers)
     }
 

app/src/main/java/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt

@@ -36,7 +36,7 @@ abstract class ParsedHttpSource : HttpSource() {
     /**
      * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
      */
-    abstract protected fun popularMangaSelector(): String
+    protected abstract fun popularMangaSelector(): String
 
     /**
      * Returns a manga from the given [element]. Most sites only show the title and the url, it's
@@ -44,13 +44,13 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param element an element obtained from [popularMangaSelector].
      */
-    abstract protected fun popularMangaFromElement(element: Element): SManga
+    protected abstract fun popularMangaFromElement(element: Element): SManga
 
     /**
      * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
      * there's no next page.
      */
-    abstract protected fun popularMangaNextPageSelector(): String?
+    protected abstract fun popularMangaNextPageSelector(): String?
 
     /**
      * Parses the response from the site and returns a [MangasPage] object.
@@ -74,7 +74,7 @@ abstract class ParsedHttpSource : HttpSource() {
     /**
      * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
      */
-    abstract protected fun searchMangaSelector(): String
+    protected abstract fun searchMangaSelector(): String
 
     /**
      * Returns a manga from the given [element]. Most sites only show the title and the url, it's
@@ -82,13 +82,13 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param element an element obtained from [searchMangaSelector].
      */
-    abstract protected fun searchMangaFromElement(element: Element): SManga
+    protected abstract fun searchMangaFromElement(element: Element): SManga
 
     /**
      * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
      * there's no next page.
      */
-    abstract protected fun searchMangaNextPageSelector(): String?
+    protected abstract fun searchMangaNextPageSelector(): String?
 
     /**
      * Parses the response from the site and returns a [MangasPage] object.
@@ -112,7 +112,7 @@ abstract class ParsedHttpSource : HttpSource() {
     /**
      * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
      */
-    abstract protected fun latestUpdatesSelector(): String
+    protected abstract fun latestUpdatesSelector(): String
 
     /**
      * Returns a manga from the given [element]. Most sites only show the title and the url, it's
@@ -120,13 +120,13 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param element an element obtained from [latestUpdatesSelector].
      */
-    abstract protected fun latestUpdatesFromElement(element: Element): SManga
+    protected abstract fun latestUpdatesFromElement(element: Element): SManga
 
     /**
      * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
      * there's no next page.
      */
-    abstract protected fun latestUpdatesNextPageSelector(): String?
+    protected abstract fun latestUpdatesNextPageSelector(): String?
 
     /**
      * Parses the response from the site and returns the details of a manga.
@@ -142,7 +142,7 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param document the parsed document.
      */
-    abstract protected fun mangaDetailsParse(document: Document): SManga
+    protected abstract fun mangaDetailsParse(document: Document): SManga
 
     /**
      * Parses the response from the site and returns a list of chapters.
@@ -157,14 +157,14 @@ abstract class ParsedHttpSource : HttpSource() {
     /**
      * Returns the Jsoup selector that returns a list of [Element] corresponding to each chapter.
      */
-    abstract protected fun chapterListSelector(): String
+    protected abstract fun chapterListSelector(): String
 
     /**
      * Returns a chapter from the given element.
      *
      * @param element an element obtained from [chapterListSelector].
      */
-    abstract protected fun chapterFromElement(element: Element): SChapter
+    protected abstract fun chapterFromElement(element: Element): SChapter
 
     /**
      * Parses the response from the site and returns the page list.
@@ -180,7 +180,7 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param document the parsed document.
      */
-    abstract protected fun pageListParse(document: Document): List<Page>
+    protected abstract fun pageListParse(document: Document): List<Page>
 
     /**
      * Parse the response from the site and returns the absolute url to the source image.
@@ -196,5 +196,5 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param document the parsed document.
      */
-    abstract protected fun imageUrlParse(document: Document): String
+    protected abstract fun imageUrlParse(document: Document): String
 }

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt

@@ -55,7 +55,7 @@ abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateContr
 
     abstract fun inflateView(inflater: LayoutInflater, container: ViewGroup): View
 
-    open fun onViewCreated(view: View) { }
+    open fun onViewCreated(view: View) {}
 
     override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
         if (type.isEnter) {
@@ -90,6 +90,7 @@ abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateContr
      * Issue link: https://issuetracker.google.com/issues/37657375
      */
     var expandActionViewFromInteraction = false
+
     fun MenuItem.fixExpand(onExpand: ((MenuItem) -> Boolean)? = null, onCollapse: ((MenuItem) -> Boolean)? = null) {
         setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
             override fun onMenuItemActionExpand(item: MenuItem): Boolean {

app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt

@@ -23,8 +23,7 @@ open class BasePresenter<V> : RxPresenter<V>() {
      * @param onNext function to execute when the observable emits an item.
      * @param onError function to execute when the observable throws an error.
      */
-    fun <T> Observable<T>.subscribeFirst(onNext: (V, T) -> Unit, onError: ((V, Throwable) -> Unit)? = null)
+    fun <T> Observable<T>.subscribeFirst(onNext: (V, T) -> Unit, onError: ((V, Throwable) -> Unit)? = null) = compose(deliverFirst<T>()).subscribe(split(onNext, onError)).apply { add(this) }
-            = compose(deliverFirst<T>()).subscribe(split(onNext, onError)).apply { add(this) }
 
     /**
      * Subscribes an observable with [deliverLatestCache] and adds it to the presenter's lifecycle
@@ -33,8 +32,7 @@ open class BasePresenter<V> : RxPresenter<V>() {
      * @param onNext function to execute when the observable emits an item.
      * @param onError function to execute when the observable throws an error.
      */
-    fun <T> Observable<T>.subscribeLatestCache(onNext: (V, T) -> Unit, onError: ((V, Throwable) -> Unit)? = null)
+    fun <T> Observable<T>.subscribeLatestCache(onNext: (V, T) -> Unit, onError: ((V, Throwable) -> Unit)? = null) = compose(deliverLatestCache<T>()).subscribe(split(onNext, onError)).apply { add(this) }
-            = compose(deliverLatestCache<T>()).subscribe(split(onNext, onError)).apply { add(this) }
 
     /**
      * Subscribes an observable with [deliverReplay] and adds it to the presenter's lifecycle
@@ -43,8 +41,7 @@ open class BasePresenter<V> : RxPresenter<V>() {
      * @param onNext function to execute when the observable emits an item.
      * @param onError function to execute when the observable throws an error.
      */
-    fun <T> Observable<T>.subscribeReplay(onNext: (V, T) -> Unit, onError: ((V, Throwable) -> Unit)? = null)
+    fun <T> Observable<T>.subscribeReplay(onNext: (V, T) -> Unit, onError: ((V, Throwable) -> Unit)? = null) = compose(deliverReplay<T>()).subscribe(split(onNext, onError)).apply { add(this) }
-            = compose(deliverReplay<T>()).subscribe(split(onNext, onError)).apply { add(this) }
 
     /**
      * Subscribes an observable with [DeliverWithView] and adds it to the presenter's lifecycle
@@ -53,8 +50,7 @@ open class BasePresenter<V> : RxPresenter<V>() {
      * @param onNext function to execute when the observable emits an item.
      * @param onError function to execute when the observable throws an error.
      */
-    fun <T> Observable<T>.subscribeWithView(onNext: (V, T) -> Unit, onError: ((V, Throwable) -> Unit)? = null)
+    fun <T> Observable<T>.subscribeWithView(onNext: (V, T) -> Unit, onError: ((V, Throwable) -> Unit)? = null) = compose(DeliverWithView<V, T>(view())).subscribe(split(onNext, onError)).apply { add(this) }
-            = compose(DeliverWithView<V, T>(view())).subscribe(split(onNext, onError)).apply { add(this) }
 
     /**
      * A deliverable that only emits to the view if attached, otherwise the event is ignored.

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt

@@ -192,7 +192,7 @@ class CatalogueController : NucleusController<CataloguePresenter>(),
                 .subscribeUntilDestroy { performGlobalSearch(it.queryText().toString()) }
     }
 
-    fun performGlobalSearch(query: String){
+    fun performGlobalSearch(query: String) {
         router.pushController(CatalogueSearchController(query).withFadeTransaction())
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt

@@ -347,7 +347,8 @@ open class BrowseCatalogueController(bundle: Bundle) :
         snack?.dismiss()
 
         if (catalogue_view != null) {
-            val message = if (error is NoResultsException) catalogue_view.context.getString(R.string.no_results_found) else (error.message ?: "")
+            val message = if (error is NoResultsException) catalogue_view.context.getString(R.string.no_results_found) else (error.message
+                    ?: "")
 
             snack = catalogue_view.snack(message, Snackbar.LENGTH_INDEFINITE) {
                 setAction(R.string.action_retry) {
@@ -497,7 +498,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
                             0 -> {
                                 presenter.changeMangaFavorite(manga)
                                 adapter?.notifyItemChanged(position)
-                                activity?.toast(activity?.getString(R.string.manga_removed_library))
+                                activity.toast(activity.getString(R.string.manga_removed_library))
                             }
                         }
                     }.show()
@@ -522,7 +523,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
                             .showDialog(router)
                 }
             }
-            activity?.toast(activity?.getString(R.string.manga_added_library))
+            activity.toast(activity.getString(R.string.manga_added_library))
         }
 
     }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchPresenter.kt

@@ -74,11 +74,12 @@ open class CatalogueSearchPresenter(
     override fun onCreate(savedState: Bundle?) {
         super.onCreate(savedState)
 
-        extensionFilter = savedState?.getString(CatalogueSearchPresenter::extensionFilter.name) ?:
+        extensionFilter = savedState?.getString(CatalogueSearchPresenter::extensionFilter.name)
-                          initialExtensionFilter
+                ?: initialExtensionFilter
 
         // Perform a search with previous or initial state
-        search(savedState?.getString(BrowseCataloguePresenter::query.name) ?: initialQuery.orEmpty())
+        search(savedState?.getString(BrowseCataloguePresenter::query.name)
+                ?: initialQuery.orEmpty())
     }
 
     override fun onDestroy() {

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/latest/LatestUpdatesPager.kt

@@ -10,7 +10,7 @@ import rx.schedulers.Schedulers
 /**
  * LatestUpdatesPager inherited from the general Pager.
  */
-class LatestUpdatesPager(val source: CatalogueSource): Pager() {
+class LatestUpdatesPager(val source: CatalogueSource) : Pager() {
 
     override fun requestNext(): Observable<MangasPage> {
         return source.fetchLatestUpdates(currentPage)

app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt

@@ -37,7 +37,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie
 
         // Update circle letter image.
         itemView.post {
-            image.setImageDrawable(image.getRound(category.name.take(1).toUpperCase(),false))
+            image.setImageDrawable(image.getRound(category.name.take(1).toUpperCase(), false))
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionFilterController.kt

@@ -12,7 +12,7 @@ import eu.kanade.tachiyomi.util.system.LocaleHelper
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
-class ExtensionFilterController: SettingsController() {
+class ExtensionFilterController : SettingsController() {
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
         titleRes = R.string.action_filter

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionPresenter.kt

@@ -67,9 +67,11 @@ open class ExtensionPresenter(
         val untrustedSorted = untrusted.sortedBy { it.pkgName }
         val availableSorted = available
                 // Filter out already installed extensions and disabled languages
-                .filter { avail -> installed.none { it.pkgName == avail.pkgName }
+                .filter { avail ->
+                    installed.none { it.pkgName == avail.pkgName }
                             && untrusted.none { it.pkgName == avail.pkgName }
-                        && (avail.lang in activeLangs || avail.lang == "all")}
+                            && (avail.lang in activeLangs || avail.lang == "all")
+                }
                 .sortedBy { it.pkgName }
 
         if (updatesSorted.isNotEmpty()) {

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionTrustDialog.kt

@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 
 class ExtensionTrustDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
-        where T : Controller, T: ExtensionTrustDialog.Listener {
+        where T : Controller, T : ExtensionTrustDialog.Listener {
 
     constructor(target: T, signatureHash: String, pkgName: String) : this(Bundle().apply {
         putString(SIGNATURE_KEY, signatureHash)

app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt

@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.widget.DialogCheckboxView
 
 class DeleteLibraryMangasDialog<T>(bundle: Bundle? = null) :
-        DialogController(bundle) where T : Controller, T: DeleteLibraryMangasDialog.Listener {
+        DialogController(bundle) where T : Controller, T : DeleteLibraryMangasDialog.Listener {
 
     private var mangas = emptyList<Manga>()
 

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt

@@ -43,7 +43,7 @@ class LibraryGridHolder(
             text = item.downloadCount.toString()
         }
         //set local visibility if its local manga
-        local_text.visibility = if(item.manga.source == LocalSource.ID) View.VISIBLE else View.GONE
+        local_text.visibility = if (item.manga.source == LocalSource.ID) View.VISIBLE else View.GONE
 
         // Update the cover.
         GlideApp.with(view.context).clear(thumbnail)

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt

@@ -89,14 +89,14 @@ class LibraryPresenter(
     fun subscribeLibrary() {
         if (librarySubscription.isNullOrUnsubscribed()) {
             librarySubscription = getLibraryObservable()
-                    .combineLatest(downloadTriggerRelay.observeOn(Schedulers.io())) {
+                    .combineLatest(downloadTriggerRelay.observeOn(Schedulers.io())) { lib, _ ->
-                        lib, _ -> lib.apply { setDownloadCount(mangaMap) }
+                        lib.apply { setDownloadCount(mangaMap) }
                     }
-                    .combineLatest(filterTriggerRelay.observeOn(Schedulers.io())) {
+                    .combineLatest(filterTriggerRelay.observeOn(Schedulers.io())) { lib, _ ->
-                        lib, _ -> lib.copy(mangaMap = applyFilters(lib.mangaMap))
+                        lib.copy(mangaMap = applyFilters(lib.mangaMap))
                     }
-                    .combineLatest(sortTriggerRelay.observeOn(Schedulers.io())) {
+                    .combineLatest(sortTriggerRelay.observeOn(Schedulers.io())) { lib, _ ->
-                        lib, _ -> lib.copy(mangaMap = applySort(lib.mangaMap))
+                        lib.copy(mangaMap = applySort(lib.mangaMap))
                     }
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribeLatestCache({ view, (categories, mangaMap) ->
@@ -117,7 +117,7 @@ class LibraryPresenter(
 
         val filterCompleted = preferences.filterCompleted().getOrDefault()
 
-        val filterFn: (LibraryItem) -> Boolean = f@ { item ->
+        val filterFn: (LibraryItem) -> Boolean = f@{ item ->
             // Filter when there isn't unread chapters.
             if (filterUnread && item.manga.unread == 0) {
                 return@f false
@@ -231,8 +231,7 @@ class LibraryPresenter(
      * @return an observable of the categories and its manga.
      */
     private fun getLibraryObservable(): Observable<Library> {
-        return Observable.combineLatest(getCategoriesObservable(), getLibraryMangasObservable()) {
+        return Observable.combineLatest(getCategoriesObservable(), getLibraryMangasObservable()) { dbCategories, libraryManga ->
-            dbCategories, libraryManga ->
             val categories = if (libraryManga.containsKey(0))
                 arrayListOf(Category.createDefault()) + dbCategories
             else

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySelectionEvent.kt

@@ -6,5 +6,5 @@ sealed class LibrarySelectionEvent {
 
     class Selected(val manga: Manga) : LibrarySelectionEvent()
     class Unselected(val manga: Manga) : LibrarySelectionEvent()
-    class Cleared() : LibrarySelectionEvent()
+    class Cleared : LibrarySelectionEvent()
 }

app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkActivity.kt

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 
-class DeepLinkActivity: Activity() {
+class DeepLinkActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterItem.kt

@@ -17,9 +17,12 @@ class ChapterItem(val chapter: Chapter, val manga: Manga) : AbstractFlexibleItem
 
     var status: Int
         get() = download?.status ?: _status
-        set(value) { _status = value }
+        set(value) {
+            _status = value
+        }
 
-    @Transient var download: Download? = null
+    @Transient
+    var download: Download? = null
 
     val isDownloaded: Boolean
         get() = status == Download.DOWNLOADED

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt

@@ -139,11 +139,11 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
         menuFilterDownloaded.isChecked = presenter.onlyDownloaded()
         menuFilterBookmarked.isChecked = presenter.onlyBookmarked()
 
+        // Disable unread filter option if read filter is enabled.
         if (presenter.onlyRead())
-            //Disable unread filter option if read filter is enabled.
             menuFilterUnread.isEnabled = false
+        // Disable read filter option if unread filter is enabled.
         if (presenter.onlyUnread())
-            //Disable read filter option if unread filter is enabled.
             menuFilterRead.isEnabled = false
 
         // Display mode submenu

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt

@@ -109,8 +109,8 @@ class ChaptersPresenter(
                 .observeOn(AndroidSchedulers.mainThread())
                 .filter { download -> download.manga.id == manga.id }
                 .doOnNext { onDownloadStatusChange(it) }
-                .subscribeLatestCache(ChaptersController::onChapterStatusChange) {
+                .subscribeLatestCache(ChaptersController::onChapterStatusChange) { _, error ->
-                    _, error -> Timber.e(error)
+                    Timber.e(error)
                 }
     }
 
@@ -176,8 +176,7 @@ class ChaptersPresenter(
         var observable = Observable.from(chapters).subscribeOn(Schedulers.io())
         if (onlyUnread()) {
             observable = observable.filter { !it.read }
-        }
+        } else if (onlyRead()) {
-        else if (onlyRead()) {
             observable = observable.filter { it.read }
         }
         if (onlyDownloaded()) {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt

@@ -91,7 +91,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
         fab_favorite.clicks().subscribeUntilDestroy { onFabClick() }
 
         // Set onLongClickListener to manage categories when FAB is clicked.
-        fab_favorite.longClicks().subscribeUntilDestroy{ onFabLongClick() }
+        fab_favorite.longClicks().subscribeUntilDestroy { onFabLongClick() }
 
         // Set SwipeRefresh to refresh manga data.
         swipe_refresh.refreshes().subscribeUntilDestroy { fetchMangaFromSource() }
@@ -488,7 +488,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
                         activity?.toast(R.string.icon_creation_fail)
                     }
 
-                    override fun onLoadCleared(placeholder: Drawable?) { }
+                    override fun onLoadCleared(placeholder: Drawable?) {}
                 })
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt

@@ -37,7 +37,7 @@ class SourceHolder(view: View, override val adapter: SourceAdapter) :
 
         // Set circle letter image.
         itemView.post {
-            image.setImageDrawable(image.getRound(source.name.take(1).toUpperCase(),false))
+            image.setImageDrawable(image.getRound(source.name.take(1).toUpperCase(), false))
         }
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt

@@ -32,7 +32,7 @@ class PageIndicatorTextView(
         // Also add a bit of spacing between each character, as the stroke overlaps them
         val finalText = SpannableString(currText.asIterable().joinToString("\u00A0")).apply {
             // Apply text outline
-            setSpan(spanOutline, 1, length-1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            setSpan(spanOutline, 1, length - 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
 
             for (i in 1..lastIndex step 2) {
                 setSpan(ScaleXSpan(0.2f), i, i + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -575,7 +575,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 subscriptions += preferences.cutoutShort().asObservable()
-                        .subscribe { setCutoutShort(it)}
+                        .subscribe { setCutoutShort(it) }
             }
 
             subscriptions += preferences.keepScreenOn().asObservable()

app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt

@@ -86,7 +86,8 @@ class HttpPageLoader(
                 .getPageListFromCache(chapter.chapter)
                 .onErrorResumeNext { source.fetchPageList(chapter.chapter) }
                 .map { pages ->
-                    pages.mapIndexed { index, page -> // Don't trust sources and use our own indexing
+                    pages.mapIndexed { index, page ->
+                        // Don't trust sources and use our own indexing
                         ReaderPage(index, page.url, page.imageUrl)
                     }
                 }
@@ -166,7 +167,7 @@ class HttpPageLoader(
     private class PriorityPage(
             val page: ReaderPage,
             val priority: Int
-    ): Comparable<PriorityPage> {
+    ) : Comparable<PriorityPage> {
 
         companion object {
             private val idGenerator = AtomicInteger()

app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ChapterTransition.kt

@@ -8,6 +8,7 @@ sealed class ChapterTransition {
     class Prev(
             override val from: ReaderChapter, override val to: ReaderChapter?
     ) : ChapterTransition()
+
     class Next(
             override val from: ReaderChapter, override val to: ReaderChapter?
     ) : ChapterTransition()

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt

@@ -144,7 +144,8 @@ class PagerTransitionHolder(
                 .subscribe { state ->
                     pagesContainer.removeAllViews()
                     when (state) {
-                    is ReaderChapter.State.Wait -> {}
+                        is ReaderChapter.State.Wait -> {
+                        }
                         is ReaderChapter.State.Loading -> setLoading()
                         is ReaderChapter.State.Error -> setError(state.error)
                         is ReaderChapter.State.Loaded -> setLoaded()

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt

@@ -85,7 +85,7 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
                 else -> activity.toggleMenu()
             }
         }
-        pager.longTapListener = f@ {
+        pager.longTapListener = f@{
             if (activity.menuVisible || config.longTapEnabled) {
                 val item = adapter.items.getOrNull(pager.currentItem)
                 if (item is ReaderPage) {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt

@@ -328,7 +328,7 @@ class WebtoonPageHolder(
             val size = 48.dpToPx
             layoutParams = FrameLayout.LayoutParams(size, size).apply {
                 gravity = Gravity.CENTER_HORIZONTAL
-                setMargins(0, parentHeight/4, 0, 0)
+                setMargins(0, parentHeight / 4, 0, 0)
             }
         }
         progressContainer.addView(progress)
@@ -389,7 +389,7 @@ class WebtoonPageHolder(
         AppCompatButton(context).apply {
             layoutParams = FrameLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply {
                 gravity = Gravity.CENTER_HORIZONTAL
-                setMargins(0, parentHeight/4, 0, 0)
+                setMargins(0, parentHeight / 4, 0, 0)
             }
             setText(R.string.action_retry)
             setOnClickListener {
@@ -411,7 +411,7 @@ class WebtoonPageHolder(
 
         val decodeLayout = LinearLayout(context).apply {
             layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, parentHeight).apply {
-                setMargins(0, parentHeight/6, 0, 0)
+                setMargins(0, parentHeight / 6, 0, 0)
             }
             gravity = Gravity.CENTER_HORIZONTAL
             orientation = LinearLayout.VERTICAL

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt

@@ -147,7 +147,8 @@ class WebtoonTransitionHolder(
                 .subscribe { state ->
                     pagesContainer.removeAllViews()
                     when (state) {
-                    is ReaderChapter.State.Wait -> {}
+                        is ReaderChapter.State.Wait -> {
+                        }
                         is ReaderChapter.State.Loading -> setLoading()
                         is ReaderChapter.State.Error -> setError(state.error, transition)
                         is ReaderChapter.State.Loaded -> setLoaded()

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt

@@ -95,7 +95,7 @@ class WebtoonViewer(val activity: ReaderActivity) : BaseViewer {
                 else -> activity.toggleMenu()
             }
         }
-        recycler.longTapListener = f@ { event ->
+        recycler.longTapListener = f@{ event ->
             if (activity.menuVisible || config.longTapEnabled) {
                 val child = recycler.findChildViewUnder(event.x, event.y)
                 if (child != null) {

app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChapterItem.kt

@@ -17,9 +17,12 @@ class RecentChapterItem(val chapter: Chapter, val manga: Manga, header: DateItem
 
     var status: Int
         get() = download?.status ?: _status
-        set(value) { _status = value }
+        set(value) {
+            _status = value
+        }
 
-    @Transient var download: Download? = null
+    @Transient
+    var download: Download? = null
 
     val isDownloaded: Boolean
         get() = status == Download.DOWNLOADED
@@ -29,7 +32,7 @@ class RecentChapterItem(val chapter: Chapter, val manga: Manga, header: DateItem
     }
 
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): RecentChapterHolder {
-        return RecentChapterHolder(view , adapter as RecentChaptersAdapter)
+        return RecentChapterHolder(view, adapter as RecentChaptersAdapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>,

app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChaptersPresenter.kt

@@ -38,8 +38,8 @@ class RecentChaptersPresenter(
                 .subscribeLatestCache(RecentChaptersController::onNextRecentChapters)
 
         getChapterStatusObservable()
-                .subscribeLatestCache(RecentChaptersController::onChapterStatusChange) {
+                .subscribeLatestCache(RecentChaptersController::onChapterStatusChange) { _, error ->
-                    _, error -> Timber.e(error)
+                    Timber.e(error)
                 }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadAdapter.kt

@@ -18,7 +18,7 @@ import java.text.DecimalFormatSymbols
  * @constructor creates an instance of the adapter.
  */
 class RecentlyReadAdapter(controller: RecentlyReadController)
-: FlexibleAdapter<RecentlyReadItem>(null, controller, true) {
+    : FlexibleAdapter<RecentlyReadItem>(null, controller, true) {
 
     val sourceManager by injectLazy<SourceManager>()
 

app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadPresenter.kt

@@ -99,7 +99,8 @@ class RecentlyReadPresenter : BasePresenter<RecentlyReadController>() {
 
                 ((currChapterIndex + 1) until chapters.size)
                         .map { chapters[it] }
-                        .firstOrNull { it.chapter_number > chapterNumber &&
+                        .firstOrNull {
+                            it.chapter_number > chapterNumber &&
                                     it.chapter_number <= chapterNumber + 1
                         }
             }

app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RemoveHistoryDialog.kt

@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.widget.DialogCheckboxView
 
 class RemoveHistoryDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
-        where T : Controller, T: RemoveHistoryDialog.Listener {
+        where T : Controller, T : RemoveHistoryDialog.Listener {
 
     private var manga: Manga? = null
 

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt

@@ -109,10 +109,10 @@ class SettingsBackupController : SettingsController() {
 
                 onClick {
                     val currentDir = preferences.backupsDirectory().getOrDefault()
-                    try{
+                    try {
                         val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
                         startActivityForResult(intent, CODE_BACKUP_DIR)
-                    } catch (e: ActivityNotFoundException){
+                    } catch (e: ActivityNotFoundException) {
                         // Fall back to custom picker on error
                         startActivityForResult(preferences.context.getFilePicker(currentDir), CODE_BACKUP_DIR)
                     }

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt

@@ -171,7 +171,8 @@ class SettingsLibraryController : SettingsController() {
                 defaultValue = "-1"
 
                 val selectedCategory = categories.find { it.id == preferences.defaultCategory() }
-                summary = selectedCategory?.name ?: context.getString(R.string.default_category_summary)
+                summary = selectedCategory?.name
+                        ?: context.getString(R.string.default_category_summary)
                 onChange { newValue ->
                     summary = categories.find {
                         it.id == (newValue as String).toInt()

app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt

@@ -53,7 +53,8 @@ class WebViewActivity : BaseActivity() {
         }
 
         if (bundle == null) {
-            val source = sourceManager.get(intent.extras!!.getLong(SOURCE_KEY)) as? HttpSource ?: return
+            val source = sourceManager.get(intent.extras!!.getLong(SOURCE_KEY)) as? HttpSource
+                    ?: return
             val url = intent.extras!!.getString(URL_KEY) ?: return
             val headers = source.headers.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }
 

app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt

@@ -88,28 +88,42 @@ inline fun Preference.onChange(crossinline block: (Any?) -> Boolean) {
 
 var Preference.defaultValue: Any?
     get() = null // set only
-    set(value) { setDefaultValue(value) }
+    set(value) {
+        setDefaultValue(value)
+    }
 
 var Preference.titleRes: Int
     get() = 0 // set only
-    set(value) { setTitle(value) }
+    set(value) {
+        setTitle(value)
+    }
 
 var Preference.iconRes: Int
     get() = 0 // set only
-    set(value) { icon = VectorDrawableCompat.create(context.resources, value, context.theme) }
+    set(value) {
+        icon = VectorDrawableCompat.create(context.resources, value, context.theme)
+    }
 
 var Preference.summaryRes: Int
     get() = 0 // set only
-    set(value) { setSummary(value) }
+    set(value) {
+        setSummary(value)
+    }
 
 var Preference.iconTint: Int
     get() = 0 // set only
-    set(value) { DrawableCompat.setTint(icon, value) }
+    set(value) {
+        DrawableCompat.setTint(icon, value)
+    }
 
 var ListPreference.entriesRes: Array<Int>
     get() = emptyArray() // set only
-    set(value) { entries = value.map { context.getString(it) }.toTypedArray() }
+    set(value) {
+        entries = value.map { context.getString(it) }.toTypedArray()
+    }
 
 var MultiSelectListPreference.entriesRes: Array<Int>
     get() = emptyArray() // set only
-    set(value) { entries = value.map { context.getString(it) }.toTypedArray() }
+    set(value) {
+        entries = value.map { context.getString(it) }.toTypedArray()
+    }

app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt

@@ -90,8 +90,7 @@ fun Context.getFilePicker(currentDir: String): Intent {
  * @param permission the permission to check.
  * @return true if it has permissions.
  */
-fun Context.hasPermission(permission: String)
+fun Context.hasPermission(permission: String) = ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
-        = ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
 
 /**
  * Returns the color for the given attribute.

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

@@ -44,7 +44,7 @@ object ImageUtil {
             if (bytes.compareWith("RIFF".toByteArray())) {
                 return ImageType.WEBP
             }
-        } catch(e: Exception) {
+        } catch (e: Exception) {
         }
         return null
     }

app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt

@@ -58,7 +58,7 @@ inline fun View.visibleIf(block: () -> Boolean) {
  * @param text text of [TextDrawable]
  * @param random random color
  */
-fun View.getRound(text: String, random : Boolean = true): TextDrawable {
+fun View.getRound(text: String, random: Boolean = true): TextDrawable {
     val size = min(this.width, this.height)
     return TextDrawable.builder()
             .beginConfig()

app/src/main/java/eu/kanade/tachiyomi/widget/DialogCheckboxView.kt

@@ -16,11 +16,11 @@ class DialogCheckboxView @JvmOverloads constructor(context: Context, attrs: Attr
         addView(inflate(R.layout.common_dialog_with_checkbox))
     }
 
-    fun setDescription(@StringRes id: Int){
+    fun setDescription(@StringRes id: Int) {
         description.text = context.getString(id)
     }
 
-    fun setOptionDescription(@StringRes id: Int){
+    fun setOptionDescription(@StringRes id: Int) {
         checkbox_option.text = context.getString(id)
     }
 

app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt

@@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.common_view_empty.view.image_view
 import kotlinx.android.synthetic.main.common_view_empty.view.text_label
 
 class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
-        RelativeLayout (context, attrs) {
+        RelativeLayout(context, attrs) {
 
     init {
         inflate(context, R.layout.common_view_empty, this)

app/src/main/java/eu/kanade/tachiyomi/widget/IgnoreFirstSpinnerListener.kt

@@ -4,7 +4,7 @@ import android.view.View
 import android.widget.AdapterView
 import android.widget.AdapterView.OnItemSelectedListener
 
-class IgnoreFirstSpinnerListener(private val block: (Int) -> Unit): OnItemSelectedListener {
+class IgnoreFirstSpinnerListener(private val block: (Int) -> Unit) : OnItemSelectedListener {
 
     private var firstEvent = true
 

app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt

@@ -90,7 +90,7 @@ open class SimpleNavigationView @JvmOverloads constructor(
      * Header view holder.
      */
     class HeaderHolder(parent: ViewGroup)
-        : Holder(parent.inflate(TR.layout.navigation_view_group)){
+        : Holder(parent.inflate(TR.layout.navigation_view_group)) {
 
         val title: TextView = itemView.findViewById(TR.id.title)
     }

app/src/main/java/eu/kanade/tachiyomi/widget/SimpleSeekBarListener.kt

@@ -1,4 +1,5 @@
 package eu.kanade.tachiyomi.widget
+
 import android.widget.SeekBar
 
 open class SimpleSeekBarListener : SeekBar.OnSeekBarChangeListener {

app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginCheckBoxPreference.kt

@@ -51,7 +51,7 @@ class LoginCheckBoxPreference @JvmOverloads constructor(
     }
 
     // Make method public
-    override public fun notifyChanged() {
+    public override fun notifyChanged() {
         super.notifyChanged()
     }
 

app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginPreference.kt

@@ -23,7 +23,7 @@ class LoginPreference @JvmOverloads constructor(context: Context, attrs: Attribu
             R.drawable.ic_done_green_24dp)
     }
 
-    override public fun notifyChanged() {
+    public override fun notifyChanged() {
         super.notifyChanged()
     }
 

app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchPreferenceCategory.kt

@@ -18,11 +18,11 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
 class SwitchPreferenceCategory @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null)
-: PreferenceCategory(
+    : PreferenceCategory(
         context,
         attrs,
         R.attr.switchPreferenceCompatStyle),
-CompoundButton.OnCheckedChangeListener {
+        CompoundButton.OnCheckedChangeListener {
 
     private var mChecked = false