From 57bca56d2bcace29b311ed9c8aca0cb9e09186ca Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Wed, 23 Apr 2025 00:32:53 +0300 Subject: [PATCH] style: simplify db declaration --- app/build.gradle.kts | 3 ++- .../main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c2d2c1d..5d4d8ad 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -105,7 +105,8 @@ dependencies { implementation(libs.coil.compose) implementation(libs.androidx.datastore.preferences) - implementation(libs.splitties.funpack.android.base.with.views.dsl) + implementation(libs.splitties.base) + implementation(libs.splitties.room) implementation(libs.compose) diff --git a/app/src/main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt b/app/src/main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt index ebb221f..992adc1 100644 --- a/app/src/main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt +++ b/app/src/main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt @@ -38,6 +38,7 @@ import ru.sweetbread.unn.db.AppDatabase import ru.sweetbread.unn.ui.composes.Blogposts import ru.sweetbread.unn.ui.composes.Schedule import ru.sweetbread.unn.ui.theme.UNNTheme +import splitties.arch.room.roomDb import splitties.toast.toast val client = HttpClient(Android) { @@ -62,18 +63,13 @@ val client = HttpClient(Android) { } } -lateinit var db: AppDatabase +val db = roomDb(name = "database") class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - db = Room.databaseBuilder( - applicationContext, - AppDatabase::class.java, "database" - ).build() - setContent { UNNTheme { Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {