diff --git a/appcompose/build.gradle b/appcompose/build.gradle index bc55fd60..fab20394 100644 --- a/appcompose/build.gradle +++ b/appcompose/build.gradle @@ -76,8 +76,18 @@ dependencies { implementation "cafe.adriel.voyager:voyager-bottom-sheet-navigator:$voyager" implementation "cafe.adriel.voyager:voyager-tab-navigator:$voyager" implementation "cafe.adriel.voyager:voyager-androidx:$voyager" - //implementation "cafe.adriel.voyager:voyager-koin:$voyager" + implementation "cafe.adriel.voyager:voyager-koin:$voyager" debugImplementation "androidx.compose.ui:ui-tooling:1.3.3" implementation "androidx.compose.ui:ui-tooling-preview:1.3.3" + + def lifecycle_version = "2.5.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version" + + /*def koin_version = "3.3.3" + implementation "io.insert-koin:koin-core:$koin_version" + implementation "io.insert-koin:koin-android:$koin_version" + implementation "io.insert-koin:koin-androidx-compose:3.4.2"*/ } \ No newline at end of file diff --git a/appcompose/src/main/AndroidManifest.xml b/appcompose/src/main/AndroidManifest.xml index 7ae094c0..379d77bf 100644 --- a/appcompose/src/main/AndroidManifest.xml +++ b/appcompose/src/main/AndroidManifest.xml @@ -2,6 +2,7 @@ () + Column { TimelineItem() } diff --git a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineViewModel.kt b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineViewModel.kt new file mode 100644 index 00000000..0a7f73ab --- /dev/null +++ b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineViewModel.kt @@ -0,0 +1,12 @@ +package com.readrops.app.compose.timelime + +import androidx.lifecycle.ViewModel +import com.readrops.db.Database + +class TimelineViewModel( + val database: Database +) : ViewModel() { + + + +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index b8530fd1..eb7591c4 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ ext { targetSdkVersion = 33 buildToolsVersion = "33.0.2" - koin_version = "3.1.2" + koin_version = "3.3.3" } task clean(type: Delete) { diff --git a/db/build.gradle b/db/build.gradle index b0cfdd28..7c2ab020 100644 --- a/db/build.gradle +++ b/db/build.gradle @@ -93,7 +93,7 @@ dependencies { api "io.insert-koin:koin-core:$rootProject.ext.koin_version" api "io.insert-koin:koin-android:$rootProject.ext.koin_version" - api "io.insert-koin:koin-android-compat:$rootProject.ext.koin_version" + api "io.insert-koin:koin-androidx-compose:3.4.2" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'