quick changes in db

groupeminaste · Apr 5, 2024 · a3d3f29 · a3d3f29
1 parent d98ba5b
commit a3d3f29
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 18 deletions.
diff --git a/android/src/main/java/me/nathanfallet/extopy/di/AndroidModule.kt b/android/src/main/java/me/nathanfallet/extopy/di/AndroidModule.kt
@@ -2,6 +2,7 @@ package me.nathanfallet.extopy.di
 
 import me.nathanfallet.extopy.BuildConfig
 import me.nathanfallet.extopy.database.DatabaseDriverFactory
+import me.nathanfallet.extopy.database.IDatabaseDriverFactory
 import me.nathanfallet.extopy.models.application.ExtopyEnvironment
 import me.nathanfallet.extopy.repositories.application.ITokenRepository
 import me.nathanfallet.extopy.repositories.application.TokenRepository
@@ -15,7 +16,7 @@ val environmentModule = module {
 }
 
 val databaseModule = module {
-    single { DatabaseDriverFactory(get()) }
+    single<IDatabaseDriverFactory> { DatabaseDriverFactory(get()) }
 }
 
 val repositoryModule = module {

diff --git a/android/src/main/java/me/nathanfallet/extopy/di/ExtopyApplication.kt b/android/src/main/java/me/nathanfallet/extopy/di/ExtopyApplication.kt
@@ -17,7 +17,7 @@ class ExtopyApplication : Application() {
             modules(sharedModule + androidModule)
         }
         if (!BuildConfig.DEBUG) {
-            initializeSentry(this)
+            initializeSentry()
         }
     }
 

diff --git a/ios/Extopy/DI/ExtopyApp.swift b/ios/Extopy/DI/ExtopyApp.swift
@@ -10,7 +10,7 @@ struct ExtopyApp: App {
         KoinApplication.start()
 
         #if !DEBUG
-        SentryKt.initializeSentry(context: nil)
+        SentryKt.initializeSentry()
         #endif
     }
 

diff --git a/shared/src/androidMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt b/shared/src/androidMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt
@@ -4,9 +4,9 @@ import android.content.Context
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 
-actual class DatabaseDriverFactory(private val context: Context) {
+class DatabaseDriverFactory(private val context: Context) : IDatabaseDriverFactory {
 
-    actual fun createDriver(): SqlDriver =
+    override fun createDriver(): SqlDriver =
         AndroidSqliteDriver(AppDatabase.Schema, context, "extopy.db")
 
 }
diff --git a/shared/src/commonMain/kotlin/me/nathanfallet/extopy/database/Database.kt b/shared/src/commonMain/kotlin/me/nathanfallet/extopy/database/Database.kt
@@ -1,6 +1,6 @@
 package me.nathanfallet.extopy.database
 
-class Database(databaseDriverFactory: DatabaseDriverFactory) {
+class Database(databaseDriverFactory: IDatabaseDriverFactory) {
 
     private val database = AppDatabase(databaseDriverFactory.createDriver())
 

diff --git a/.../extopy/database/DatabaseDriverFactory.kt → ...extopy/database/IDatabaseDriverFactory.kt b/.../extopy/database/DatabaseDriverFactory.kt → ...extopy/database/IDatabaseDriverFactory.kt
@@ -2,7 +2,7 @@ package me.nathanfallet.extopy.database
 
 import app.cash.sqldelight.db.SqlDriver
 
-expect class DatabaseDriverFactory {
+interface IDatabaseDriverFactory {
 
     fun createDriver(): SqlDriver
 

diff --git a/shared/src/commonMain/kotlin/me/nathanfallet/extopy/di/Sentry.kt b/shared/src/commonMain/kotlin/me/nathanfallet/extopy/di/Sentry.kt
@@ -1,17 +1,12 @@
 package me.nathanfallet.extopy.di
 
-import io.sentry.kotlin.multiplatform.Context
 import io.sentry.kotlin.multiplatform.Sentry
 import io.sentry.kotlin.multiplatform.SentryOptions
 
-fun initializeSentry(context: Context?) {
+fun initializeSentry() {
     val configuration: (SentryOptions) -> Unit = {
         it.dsn = "https://0c402f45f26b3288980c13a4ef5db57a@o4506105040470016.ingest.sentry.io/4506370995453953"
         // Add common configuration here
     }
-    if (context != null) {
-        Sentry.init(context, configuration)
-    } else {
-        Sentry.init(configuration)
-    }
+    Sentry.init(configuration)
 }
diff --git a/shared/src/iosMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt b/shared/src/iosMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt
@@ -3,9 +3,9 @@ package me.nathanfallet.extopy.database
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.driver.native.NativeSqliteDriver
 
-actual class DatabaseDriverFactory {
+class DatabaseDriverFactory : IDatabaseDriverFactory {
 
-    actual fun createDriver(): SqlDriver =
+    override fun createDriver(): SqlDriver =
         NativeSqliteDriver(AppDatabase.Schema, "extopy.db")
 
 }
diff --git a/shared/src/iosMain/kotlin/me/nathanfallet/extopy/di/SwiftModule.kt b/shared/src/iosMain/kotlin/me/nathanfallet/extopy/di/SwiftModule.kt
@@ -1,6 +1,6 @@
 package me.nathanfallet.extopy.di
 
-import me.nathanfallet.extopy.database.DatabaseDriverFactory
+import me.nathanfallet.extopy.database.IDatabaseDriverFactory
 import me.nathanfallet.extopy.models.application.ExtopyEnvironment
 import me.nathanfallet.extopy.repositories.application.ITokenRepository
 
@@ -10,7 +10,7 @@ object SwiftModule {
     lateinit var tokenRepository: ITokenRepository
 
     fun module() = org.koin.dsl.module {
-        single { DatabaseDriverFactory() }
+        single<IDatabaseDriverFactory> { DatabaseDriverFactory() }
 
         single { environment }
         single { tokenRepository }