From a56dbf0f61e80225f0d86af43ea0f1d6efa5e66a Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 17 Apr 2021 19:03:47 -0700
Subject: Injection checkpoint

---
 .../com/pitchedapps/frost/activities/ImageActivity.kt       | 13 +++++++++----
 .../com/pitchedapps/frost/activities/LoginActivity.kt       |  8 ++++++--
 .../com/pitchedapps/frost/activities/SelectorActivity.kt    |  4 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)

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

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 bcb43299..5d41be29 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -67,13 +67,13 @@ 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 dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koin.android.ext.android.inject
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -84,13 +84,17 @@ import kotlin.math.max
 /**
  * Created by Allan Wang on 2017-07-15.
  */
+@AndroidEntryPoint
 class ImageActivity : KauBaseActivity() {
 
     @Inject
     lateinit var activityThemer: ActivityThemer
 
-    private val prefs: Prefs by inject()
-    private val themeProvider: ThemeProvider by inject()
+    @Inject
+    lateinit var prefs: Prefs
+
+    @Inject
+    lateinit var themeProvider: ThemeProvider
 
     @Volatile
     internal var errorRef: Throwable? = null
@@ -412,7 +416,8 @@ internal enum class FabStates(
      *
      */
     fun update(fab: FloatingActionButton, themeProvider: ThemeProvider) {
-        val tint = if (backgroundTint != Int.MAX_VALUE) backgroundTint else themeProvider.accentColor
+        val tint =
+            if (backgroundTint != Int.MAX_VALUE) backgroundTint else themeProvider.accentColor
         val iconColor = iconColorProvider(themeProvider)
         if (fab.isHidden) {
             fab.setIcon(iicon, color = iconColor)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
index 72d17eb7..949f1ddd 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
@@ -47,6 +47,7 @@ import com.pitchedapps.frost.utils.launchNewTask
 import com.pitchedapps.frost.utils.logFrostEvent
 import com.pitchedapps.frost.utils.uniqueOnly
 import com.pitchedapps.frost.web.LoginWebView
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.channels.Channel
@@ -55,21 +56,24 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
-import org.koin.android.ext.android.inject
 import java.net.UnknownHostException
+import javax.inject.Inject
 import kotlin.coroutines.resume
 
 /**
  * Created by Allan Wang on 2017-06-01.
  */
+@AndroidEntryPoint
 class LoginActivity : BaseActivity() {
 
+    @Inject
+    lateinit var cookieDao: CookieDao
+
     private val toolbar: Toolbar by bindView(R.id.toolbar)
     private val web: LoginWebView by bindView(R.id.login_webview)
     private val swipeRefresh: SwipeRefreshLayout by bindView(R.id.swipe_refresh)
     private val textview: AppCompatTextView by bindView(R.id.textview)
     private val profile: ImageView by bindView(R.id.profile)
-    private val cookieDao: CookieDao by inject()
 
     private lateinit var profileLoader: RequestManager
     private val refreshChannel = Channel<Boolean>(10)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SelectorActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SelectorActivity.kt
index f2e00aae..a891c7c9 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SelectorActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SelectorActivity.kt
@@ -47,8 +47,8 @@ class SelectorActivity : BaseActivity() {
         setContentView(R.layout.activity_selector)
         recycler.layoutManager = GridLayoutManager(this, 2)
         recycler.adapter = adapter
-        adapter.add(cookies().map { AccountItem(it) })
-        adapter.add(AccountItem(null)) // add account
+        adapter.add(cookies().map { AccountItem(it, themeProvider) })
+        adapter.add(AccountItem(null, themeProvider)) // add account
         adapter.addEventHook(object : ClickEventHook<AccountItem>() {
             override fun onBind(viewHolder: RecyclerView.ViewHolder): View? =
                 (viewHolder as? AccountItem.ViewHolder)?.itemView
-- 
cgit v1.2.3