From e1ae3536102a5bb83a3c73c3731eb4af56b96914 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 17 Apr 2021 18:59:06 -0700
Subject: Inject activity themer

---
 .../kotlin/com/pitchedapps/frost/activities/ImageActivity.kt     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
index c85a7472..bcb43299 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -61,12 +61,12 @@ import com.pitchedapps.frost.services.LocalService
 import com.pitchedapps.frost.utils.ARG_COOKIE
 import com.pitchedapps.frost.utils.ARG_IMAGE_URL
 import com.pitchedapps.frost.utils.ARG_TEXT
+import com.pitchedapps.frost.utils.ActivityThemer
 import com.pitchedapps.frost.utils.frostDownload
 import com.pitchedapps.frost.utils.frostSnackbar
 import com.pitchedapps.frost.utils.frostUriFromFile
 import com.pitchedapps.frost.utils.isIndirectImageUrl
 import com.pitchedapps.frost.utils.logFrostEvent
-import com.pitchedapps.frost.utils.setFrostColors
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
@@ -74,10 +74,10 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
-import org.koin.core.component.inject
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
+import javax.inject.Inject
 import kotlin.math.abs
 import kotlin.math.max
 
@@ -86,6 +86,9 @@ import kotlin.math.max
  */
 class ImageActivity : KauBaseActivity() {
 
+    @Inject
+    lateinit var activityThemer: ActivityThemer
+
     private val prefs: Prefs by inject()
     private val themeProvider: ThemeProvider by inject()
 
@@ -224,7 +227,7 @@ class ImageActivity : KauBaseActivity() {
                     loadError(e)
                 }
             })
-        setFrostColors {
+        activityThemer.setFrostColors {
             themeWindow = false
         }
         dragHelper = ViewDragHelper.create(imageDrag, ViewDragCallback()).apply {
-- 
cgit v1.2.3