Merge pull request #1770 from AllanWang/hilt

1 files changed, 8 insertions, 6 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
index f2827397..adf543df 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
@@ -42,18 +42,20 @@ import com.pitchedapps.frost.db.saveTabs
 import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.iitems.TabIItem
 import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.utils.setFrostColors
-import java.util.Collections
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
-import org.koin.android.ext.android.inject
+import java.util.Collections
+import javax.inject.Inject
 
 /**
  * Created by Allan Wang on 26/11/17.
  */
+@AndroidEntryPoint
 class TabCustomizerActivity : BaseActivity() {
 
-    private val genericDao: GenericDao by inject()
+    @Inject
+    lateinit var genericDao: GenericDao
 
     private val adapter = FastItemAdapter<TabIItem>()
 
@@ -85,7 +87,7 @@ class TabCustomizerActivity : BaseActivity() {
             val remaining = FbItem.values().filter { it.name[0] != '_' }.toMutableList()
             remaining.removeAll(tabs)
             tabs.addAll(remaining)
-            adapter.set(tabs.map(::TabIItem))
+            adapter.set(tabs.map { TabIItem(it, themeProvider) })
 
             bindSwapper(adapter, tabRecycler)
 
@@ -107,7 +109,7 @@ class TabCustomizerActivity : BaseActivity() {
         fabCancel.setIcon(GoogleMaterial.Icon.gmd_close, themeProvider.iconColor)
         fabCancel.backgroundTintList = ColorStateList.valueOf(themeProvider.accentColor)
         fabCancel.setOnClickListener { finish() }
-        setFrostColors {
+        activityThemer.setFrostColors {
             themeWindow = true
         }
     }