From 25caba6905e5ed87424c5264165c7005f339aaf8 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 17 Jan 2021 15:33:49 -0500
Subject: [PATCH] More consistent injectLazy style

(cherry picked from commit f667f85fa5857bee1f55217d28d1e751cbb8a66b)
---
 .../ui/browse/source/globalsearch/GlobalSearchPresenter.kt  | 2 +-
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt    | 2 +-
 .../eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt    | 2 +-
 .../kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt | 6 ++----
 .../eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt | 2 +-
 .../kanade/tachiyomi/ui/security/SecureActivityDelegate.kt  | 2 +-
 .../java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt  | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
index 10556b94a..bac02dc39 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
@@ -69,7 +69,7 @@ open class GlobalSearchPresenter(
      */
     private var fetchImageSubscription: Subscription? = null
 
-    private val extensionManager by injectLazy<ExtensionManager>()
+    private val extensionManager: ExtensionManager by injectLazy()
 
     private var extensionFilter: String? = null
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 2ae7ffb83..a7407cd7d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -98,7 +98,7 @@ import kotlin.time.seconds
 @RequiresPresenter(ReaderPresenter::class)
 class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>() {
 
-    private val preferences by injectLazy<PreferencesHelper>()
+    private val preferences: PreferencesHelper by injectLazy()
 
     /**
      * The maximum bitmap size supported by the device.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
index c49829f15..a6ac333a9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
@@ -21,7 +21,7 @@ import uy.kohesive.injekt.injectLazy
  */
 class ReaderSettingsSheet(private val activity: ReaderActivity) : BottomSheetDialog(activity) {
 
-    private val preferences by injectLazy<PreferencesHelper>()
+    private val preferences: PreferencesHelper by injectLazy()
 
     private val binding = ReaderSettingsSheetBinding.inflate(activity.layoutInflater, null, false)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt
index 36c46f0a5..6b8680197 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt
@@ -26,10 +26,8 @@ class DownloadPageLoader(
     private val downloadManager: DownloadManager
 ) : PageLoader() {
 
-    /**
-     * The application context. Needed to open input streams.
-     */
-    private val context by injectLazy<Application>()
+    // Needed to open input streams
+    private val context: Application by injectLazy()
 
     private val downloadProvider by lazy { DownloadProvider(context) }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt
index d85a41a20..4772c6095 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt
@@ -18,7 +18,7 @@ import java.text.DecimalFormatSymbols
 class HistoryAdapter(controller: HistoryController) :
     FlexibleAdapter<IFlexible<*>>(null, controller, true) {
 
-    val sourceManager by injectLazy<SourceManager>()
+    val sourceManager: SourceManager by injectLazy()
 
     val resumeClickListener: OnResumeClickListener = controller
     val removeClickListener: OnRemoveClickListener = controller
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
index daf4b5965..e946daf60 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
@@ -18,7 +18,7 @@ import kotlin.time.minutes
 
 class SecureActivityDelegate(private val activity: FragmentActivity) {
 
-    private val preferences by injectLazy<PreferencesHelper>()
+    private val preferences: PreferencesHelper by injectLazy()
 
     fun onCreate() {
         preferences.secureScreen().asFlow()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
index c43fa01c1..2a00ad948 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
@@ -34,7 +34,7 @@ import uy.kohesive.injekt.injectLazy
 
 class WebViewActivity : BaseViewBindingActivity<WebviewActivityBinding>() {
 
-    private val sourceManager by injectLazy<SourceManager>()
+    private val sourceManager: SourceManager by injectLazy()
 
     private var bundle: Bundle? = null