From 3d33d50c63585c433f06bd07cb064c00176dc72d Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Thu, 3 Jun 2021 16:42:26 -0400 Subject: [PATCH] Cleanup some constructors --- app/src/main/java/exh/md/handlers/ApiMangaParser.kt | 5 ++++- app/src/main/java/exh/md/handlers/FollowsHandler.kt | 6 +++--- app/src/main/java/exh/md/handlers/MangaHandler.kt | 4 ++-- app/src/main/java/exh/md/handlers/PageHandler.kt | 4 ++-- app/src/main/java/exh/md/handlers/PopularHandler.kt | 6 +++++- app/src/main/java/exh/md/handlers/SearchHandler.kt | 8 +++++++- app/src/main/java/exh/md/handlers/SimilarHandler.kt | 5 ++++- 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index 2b612c7d3..e1befe8f9 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -27,7 +27,10 @@ import tachiyomi.source.model.MangaInfo import uy.kohesive.injekt.injectLazy import java.util.Locale -class ApiMangaParser(val client: OkHttpClient, private val lang: String) { +class ApiMangaParser( + private val client: OkHttpClient, + private val lang: String +) { val db: DatabaseHelper by injectLazy() val metaClass = MangaDexSearchMetadata::class diff --git a/app/src/main/java/exh/md/handlers/FollowsHandler.kt b/app/src/main/java/exh/md/handlers/FollowsHandler.kt index c025f6508..2413b2253 100644 --- a/app/src/main/java/exh/md/handlers/FollowsHandler.kt +++ b/app/src/main/java/exh/md/handlers/FollowsHandler.kt @@ -35,9 +35,9 @@ import okhttp3.Response import java.util.Locale class FollowsHandler( - val client: OkHttpClient, - val headers: Headers, - val preferences: PreferencesHelper, + private val client: OkHttpClient, + private val headers: Headers, + private val preferences: PreferencesHelper, private val lang: String, private val mdList: MdList ) { diff --git a/app/src/main/java/exh/md/handlers/MangaHandler.kt b/app/src/main/java/exh/md/handlers/MangaHandler.kt index b3fa974de..680bd8241 100644 --- a/app/src/main/java/exh/md/handlers/MangaHandler.kt +++ b/app/src/main/java/exh/md/handlers/MangaHandler.kt @@ -27,8 +27,8 @@ import tachiyomi.source.model.MangaInfo import uy.kohesive.injekt.api.get class MangaHandler( - val client: OkHttpClient, - val headers: Headers, + private val client: OkHttpClient, + private val headers: Headers, private val lang: String, private val apiMangaParser: ApiMangaParser, private val followsHandler: FollowsHandler diff --git a/app/src/main/java/exh/md/handlers/PageHandler.kt b/app/src/main/java/exh/md/handlers/PageHandler.kt index 9bc7cd6cf..0c688d74d 100644 --- a/app/src/main/java/exh/md/handlers/PageHandler.kt +++ b/app/src/main/java/exh/md/handlers/PageHandler.kt @@ -12,8 +12,8 @@ import okhttp3.Request import rx.Observable class PageHandler( - val client: OkHttpClient, - val headers: Headers, + private val client: OkHttpClient, + private val headers: Headers, private val dataSaver: Boolean, private val apiChapterParser: ApiChapterParser, private val mangaPlusHandler: MangaPlusHandler diff --git a/app/src/main/java/exh/md/handlers/PopularHandler.kt b/app/src/main/java/exh/md/handlers/PopularHandler.kt index 28c0c79cb..b562f8031 100644 --- a/app/src/main/java/exh/md/handlers/PopularHandler.kt +++ b/app/src/main/java/exh/md/handlers/PopularHandler.kt @@ -19,7 +19,11 @@ import rx.Observable /** * Returns the latest manga from the updates url since it actually respects the users settings */ -class PopularHandler(val client: OkHttpClient, private val headers: Headers, private val lang: String) { +class PopularHandler( + private val client: OkHttpClient, + private val headers: Headers, + private val lang: String +) { fun fetchPopularManga(page: Int): Observable { return client.newCall(popularMangaRequest(page)) diff --git a/app/src/main/java/exh/md/handlers/SearchHandler.kt b/app/src/main/java/exh/md/handlers/SearchHandler.kt index 1154bc279..87bc7de6b 100644 --- a/app/src/main/java/exh/md/handlers/SearchHandler.kt +++ b/app/src/main/java/exh/md/handlers/SearchHandler.kt @@ -20,7 +20,13 @@ import okhttp3.Request import okhttp3.Response import rx.Observable -class SearchHandler(val client: OkHttpClient, private val headers: Headers, val lang: String, val filterHandler: FilterHandler, private val apiMangaParser: ApiMangaParser) { +class SearchHandler( + private val client: OkHttpClient, + private val headers: Headers, + private val lang: String, + private val filterHandler: FilterHandler, + private val apiMangaParser: ApiMangaParser +) { fun fetchSearchManga(page: Int, query: String, filters: FilterList, sourceId: Long): Observable { return if (query.startsWith(PREFIX_ID_SEARCH)) { diff --git a/app/src/main/java/exh/md/handlers/SimilarHandler.kt b/app/src/main/java/exh/md/handlers/SimilarHandler.kt index e14a5e2e5..4c618f0e9 100644 --- a/app/src/main/java/exh/md/handlers/SimilarHandler.kt +++ b/app/src/main/java/exh/md/handlers/SimilarHandler.kt @@ -14,7 +14,10 @@ import okhttp3.Request import okhttp3.Response import tachiyomi.source.model.MangaInfo -class SimilarHandler(val client: OkHttpClient, val lang: String) { +class SimilarHandler( + private val client: OkHttpClient, + private val lang: String +) { suspend fun getSimilar(manga: MangaInfo): MangasPage { val response = client.newCall(similarMangaRequest(manga)).await()