From f9a122d571b9beb8a4fe5c3879ba367b4f1c5518 Mon Sep 17 00:00:00 2001 From: Stefano Sansone Date: Sat, 17 Feb 2024 18:52:16 +0000 Subject: [PATCH] add hilt compose navigation and compose runtime lifecycle libs --- android/Omnivore/app/build.gradle.kts | 3 +++ .../app/src/main/java/app/omnivore/omnivore/MainActivity.kt | 2 -- android/Omnivore/gradle/libs.versions.toml | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/android/Omnivore/app/build.gradle.kts b/android/Omnivore/app/build.gradle.kts index 46456f00f..c29f05525 100644 --- a/android/Omnivore/app/build.gradle.kts +++ b/android/Omnivore/app/build.gradle.kts @@ -118,6 +118,7 @@ dependencies { implementation(libs.androidx.compose.ui.util) implementation(libs.androidx.activity.compose) implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.hilt.navigation.compose) androidTestImplementation(libs.androidx.compose.ui.test) debugImplementation(libs.androidx.compose.ui.tooling) debugImplementation(libs.androidx.compose.ui.tooling.preview) @@ -165,6 +166,8 @@ dependencies { implementation(libs.compose.markdown) implementation(libs.chiptextfield.m3) + implementation(libs.androidx.lifecycle.runtimeCompose) + } apollo { diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt index b6e878e04..688db9601 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt @@ -35,7 +35,6 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) val loginViewModel: LoginViewModel by viewModels() - val libraryViewModel: LibraryViewModel by viewModels() val settingsViewModel: SettingsViewModel by viewModels() val searchViewModel: SearchViewModel by viewModels() val labelsViewModel: LabelsViewModel by viewModels() @@ -65,7 +64,6 @@ class MainActivity : ComponentActivity() { RootView( loginViewModel, searchViewModel, - libraryViewModel, settingsViewModel, labelsViewModel, saveViewModel, diff --git a/android/Omnivore/gradle/libs.versions.toml b/android/Omnivore/gradle/libs.versions.toml index 6ebf7b841..b67815b52 100644 --- a/android/Omnivore/gradle/libs.versions.toml +++ b/android/Omnivore/gradle/libs.versions.toml @@ -9,6 +9,7 @@ androidxComposeCompiler = "1.5.9" androidxCore = "1.12.0" androidxDataStore = "1.0.0" androidxEspresso = "3.5.1" +androidxHiltNavigationCompose = "1.1.0" androidxLifecycle = "2.7.0" androidxNavigation = "2.7.7" androidxSecurity = "1.0.0" @@ -48,9 +49,11 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" } androidx-dataStore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDataStore" } +androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-viewModelKtx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } androidx-lifecycle-viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidxLifecycle" } +androidx-lifecycle-runtimeCompose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycle" } androidx-lifecycle-viewmodelSavedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" } androidx-security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "androidxSecurity" }