Rewrite database with SQLDelight

.editorconfig

@@ -19,5 +19,10 @@ charset = utf-8
 indent_style = tab
 tab_width = 4
 
+[*.sq]
+charset = utf-8
+indent_style = tab
+tab_width = 4
+
 [*.md]
 trim_trailing_whitespace = false

app/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
 	alias(libs.plugins.android.app)
 	alias(libs.plugins.kotlin.android)
-	alias(libs.plugins.kotlin.ksp)
+	alias(libs.plugins.sqldelight)
 }
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
@@ -34,6 +34,14 @@ android {
 	}
 }
 
+sqldelight {
+	databases {
+		create("Database") {
+			packageName.set("nl.ndat.tvlauncher.data.sqldelight")
+		}
+	}
+}
+
 dependencies {
 	// System
 	implementation(libs.androidx.core)
@@ -44,8 +52,8 @@ dependencies {
 	implementation(libs.timber)
 
 	// Data
-	implementation(libs.androidx.room.ktx)
-	ksp(libs.androidx.room.compiler)
+	implementation(libs.sqldelight.android)
+	implementation(libs.sqldelight.coroutines)
 
 	// UI
 	implementation(libs.androidx.appcompat)

app/src/main/kotlin/nl/ndat/tvlauncher/LauncherApplication.kt

@@ -4,7 +4,7 @@ import android.app.Application
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.util.DebugLogger
-import nl.ndat.tvlauncher.data.SharedDatabase
+import nl.ndat.tvlauncher.data.DatabaseContainer
 import nl.ndat.tvlauncher.data.repository.AppRepository
 import nl.ndat.tvlauncher.data.repository.ChannelRepository
 import nl.ndat.tvlauncher.data.repository.InputRepository
@@ -23,27 +23,24 @@ import timber.log.Timber
 private val launcherModule = module {
 	single { DefaultLauncherHelper(get()) }
 
-	single { AppRepository(get(), get(), get(), get()) }
+	single { AppRepository(get(), get(), get()) }
 	single { AppResolver() }
 
-	single { ChannelRepository(get(), get(), get(), get(), get()) }
+	single { ChannelRepository(get(), get(), get()) }
 	single { ChannelResolver() }
 
-	single { InputRepository(get(), get(), get(), get()) }
+	single { InputRepository(get(), get(), get()) }
 	single { InputResolver() }
 
 	single { PreferenceRepository() }
 }
 
 private val databaseModule = module {
 	// Create database(s)
-	single { SharedDatabase.build(get()) }
+	single { DatabaseContainer(get()) }
 
 	// Add DAOs for easy access
-	single { get<SharedDatabase>().appDao() }
-	single { get<SharedDatabase>().channelDao() }
-	single { get<SharedDatabase>().channelProgramDao() }
-	single { get<SharedDatabase>().inputDao() }
+
 }
 
 class LauncherApplication : Application(), ImageLoaderFactory {

app/src/main/kotlin/nl/ndat/tvlauncher/data/DatabaseContainer.kt

@@ -0,0 +1,53 @@
+package nl.ndat.tvlauncher.data
+
+import android.content.Context
+import app.cash.sqldelight.ColumnAdapter
+import app.cash.sqldelight.EnumColumnAdapter
+import app.cash.sqldelight.TransactionWithReturn
+import app.cash.sqldelight.TransactionWithoutReturn
+import app.cash.sqldelight.driver.android.AndroidSqliteDriver
+import nl.ndat.tvlauncher.data.sqldelight.Channel
+import nl.ndat.tvlauncher.data.sqldelight.ChannelProgram
+import nl.ndat.tvlauncher.data.sqldelight.Database
+import nl.ndat.tvlauncher.data.sqldelight.Input
+
+class DatabaseContainer(
+	context: Context
+) {
+	companion object {
+		const val DB_FILE = "data.db"
+	}
+
+	private val driver = AndroidSqliteDriver(Database.Schema, context, DB_FILE)
+	private val database = Database(
+		driver = driver,
+		ChannelAdapter = Channel.Adapter(
+			typeAdapter = EnumColumnAdapter(),
+		),
+		ChannelProgramAdapter = ChannelProgram.Adapter(
+			weightAdapter = IntColumnAdapter(),
+			typeAdapter = EnumColumnAdapter(),
+			posterArtAspectRatioAdapter = EnumColumnAdapter(),
+			lastPlaybackPositionMillisAdapter = IntColumnAdapter(),
+			durationMillisAdapter = IntColumnAdapter(),
+			itemCountAdapter = IntColumnAdapter(),
+			interactionTypeAdapter = EnumColumnAdapter(),
+		),
+		InputAdapter = Input.Adapter(
+			typeAdapter = EnumColumnAdapter()
+		),
+	)
+
+	val apps = database.appQueries
+	val inputs = database.inputQueries
+	val channels = database.channelQueries
+	val channelPrograms = database.channelProgramQueries
+
+	fun transaction(body: TransactionWithoutReturn.() -> Unit) = database.transaction { body() }
+	fun <T> transactionForResult(body: TransactionWithReturn<T>.() -> T) = database.transactionWithResult { body() }
+}
+
+class IntColumnAdapter : ColumnAdapter<Int, Long> {
+	override fun decode(databaseValue: Long): Int = databaseValue.toInt()
+	override fun encode(value: Int): Long = value.toLong()
+}