add koin for dependency injection

plateaukao · Sep 28, 2021 · 5b71dd2 · 5b71dd2
1 parent eb730b5
commit 5b71dd2
Show file tree

Hide file tree

Showing 20 changed files with 446 additions and 376 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -74,4 +74,12 @@ dependencies {
 
     // for dark mode
     implementation 'androidx.webkit:webkit:1.4.0'
+
+    def koin_version = "3.1.2"
+    // Koin core features
+    implementation "io.insert-koin:koin-core:$koin_version"
+    // Koin test features
+    testImplementation "io.insert-koin:koin-test:$koin_version"
+    // Android
+    implementation "io.insert-koin:koin-android-compat:$koin_version"
 }
diff --git a/app/src/main/java/de/baumann/browser/EinkBroApplication.kt b/app/src/main/java/de/baumann/browser/EinkBroApplication.kt
@@ -1,12 +1,34 @@
 package de.baumann.browser
 
 import android.app.Application
+import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.preference.PreferenceManager
+import de.baumann.browser.database.BookmarkManager
+import de.baumann.browser.epub.EpubManager
+import de.baumann.browser.preference.ConfigManager
+import de.baumann.browser.view.dialog.DialogManager
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.GlobalContext.startKoin
+import org.koin.dsl.module
 
 class EinkBroApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+        startKoin {
+            androidContext(this@EinkBroApplication)
+            modules(myModule)
+        }
     }
+}
+
+val myModule = module {
+    single { ConfigManager(androidContext()) }
+    single { PreferenceManager.getDefaultSharedPreferences(androidContext()) }
+    single { BookmarkManager(androidContext()) }
+
+    single { DialogManager(it[0]) }
+    single { EpubManager(it[0]) }
 }
diff --git a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt
diff --git a/app/src/main/java/de/baumann/browser/browser/NinjaWebViewClient.kt b/app/src/main/java/de/baumann/browser/browser/NinjaWebViewClient.kt
@@ -31,16 +31,18 @@ import android.graphics.BitmapFactory
 import android.util.Base64
 import de.baumann.browser.util.DebugT
 import de.baumann.browser.view.dTLoadUrl
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import java.io.ByteArrayInputStream
 
 
 class NinjaWebViewClient(
-   private val ninjaWebView: NinjaWebView,
-   private val addHistoryAction: (String) -> Unit
-) : WebViewClient() {
+        private val ninjaWebView: NinjaWebView,
+        private val addHistoryAction: (String) -> Unit
+) : WebViewClient(), KoinComponent {
     private val context: Context = ninjaWebView.context
-    private val sp: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-    private val config: ConfigManager = ConfigManager(context)
+    private val sp: SharedPreferences by inject()
+    private val config: ConfigManager by inject()
     private val adBlock: AdBlock = ninjaWebView.adBlock
     private val cookie: Cookie = ninjaWebView.cookieHosts
     private val white: Boolean = false

diff --git a/app/src/main/java/de/baumann/browser/database/BookmarkDao.kt b/app/src/main/java/de/baumann/browser/database/BookmarkDao.kt
@@ -1,8 +1,11 @@
 package de.baumann.browser.database
 
 import android.content.Context
+import android.graphics.Bitmap
 import androidx.room.*
 import de.baumann.browser.preference.ConfigManager
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 @Database(entities = [Bookmark::class], version = 1)
 abstract class AppDatabase : RoomDatabase() {
@@ -39,16 +42,17 @@ interface BookmarkDao {
     suspend fun deleteAll()
 }
 
-class BookmarkManager(private val context: Context) {
+class BookmarkManager(private val context: Context) : KoinComponent {
+    val config: ConfigManager by inject()
+
     val database = Room.databaseBuilder(
-        context,
-        AppDatabase::class.java, "einkbro_db"
+            context,
+            AppDatabase::class.java, "einkbro_db"
     ).build()
 
     val bookmarkDao = database.bookmarkDao()
 
     suspend fun migrateOldData() {
-        val config = ConfigManager(context)
         if (config.dbVersion != 0) return
 
         //add bookmarks
@@ -57,8 +61,8 @@ class BookmarkManager(private val context: Context) {
         cursor.moveToFirst()
         while (!cursor.isAfterLast) {
             insert(
-                title = cursor.getString(1),
-                url = cursor.getString(2),
+                    title = cursor.getString(1),
+                    url = cursor.getString(2),
             )
             cursor.moveToNext()
         }
@@ -92,12 +96,12 @@ class BookmarkManager(private val context: Context) {
 
     suspend fun insertDirectory(title: String, parentId: Int = 0) {
         bookmarkDao.insert(
-            Bookmark(
-                title = title,
-                url = "",
-                isDirectory = true,
-                parent = parentId,
-            )
+                Bookmark(
+                        title = title,
+                        url = "",
+                        isDirectory = true,
+                        parent = parentId,
+                )
         )
     }
 

diff --git a/app/src/main/java/de/baumann/browser/database/RecordDb.kt b/app/src/main/java/de/baumann/browser/database/RecordDb.kt
@@ -1,17 +1,19 @@
 package de.baumann.browser.database
 
-import android.app.Activity
 import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase
 import androidx.core.database.sqlite.transaction
 import de.baumann.browser.unit.RecordUnit
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import java.util.*
 
-class RecordDb(context: Context?) {
+class RecordDb(context: Context?): KoinComponent {
     private lateinit var database: SQLiteDatabase
     private val helper: RecordHelper = RecordHelper(context)
+    private val bookmarkManager: BookmarkManager by inject()
 
     fun open(rw: Boolean) {
         database = if (rw) helper.writableDatabase else helper.readableDatabase
@@ -157,8 +159,7 @@ class RecordDb(context: Context?) {
         )
     }
 
-    suspend fun listEntries(activity: Activity, listAll: Boolean, amount: Int = 0): List<Record> {
-        val bookmarkManager = BookmarkManager(activity)
+    suspend fun listEntries(listAll: Boolean, amount: Int = 0): List<Record> {
         val list: MutableList<Record> = ArrayList()
         if (listAll) {
             //add bookmarks