Addressing PR comments

bumble-tech · Oct 9, 2023 · 5c833c1 · 5c833c1
1 parent 8b27516
commit 5c833c1
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/demos/appyx-navigation/android/build.gradle.kts b/demos/appyx-navigation/android/build.gradle.kts
@@ -45,6 +45,7 @@ dependencies {
     implementation(project(":appyx-interactions:appyx-interactions"))
     implementation(project(":appyx-components:stable:backstack:backstack"))
     implementation(project(":appyx-components:experimental:cards:cards"))
+    implementation(project(":utils:viewmodel-android"))
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.appcompat)

diff --git a/...pyx/utils/viewmodel/sample/MyViewModel.kt → .../navigation/node/viewModel/MyViewModel.kt b/...pyx/utils/viewmodel/sample/MyViewModel.kt → .../navigation/node/viewModel/MyViewModel.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.utils.viewmodel.sample
+package com.bumble.appyx.navigation.node.viewModel
 
 import com.bumble.appyx.utils.viewmodel.IntegrationPointViewModel
 import kotlinx.coroutines.delay

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -33,6 +33,8 @@ androidx-core-splashscreen = "androidx.core:core-splashscreen:1.0.0"
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation-compose" }
 androidx-test-espresso-core = "androidx.test.espresso:espresso-core:3.5.1"
 androidx-test-junit = "androidx.test.ext:junit:1.1.3"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -82,7 +82,7 @@ include(
     ":utils:testing-ui-activity",
     ":utils:testing-unit-common",
     ":utils:multiplatform",
-    ":utils:viewmodel",
+    ":utils:viewmodel-android",
 )
 
 // do not remove this. Otherwise all multiplatform modules will produce clashing artifacts

diff --git a/utils/viewmodel/build.gradle.kts → utils/viewmodel-android/build.gradle.kts b/utils/viewmodel/build.gradle.kts → utils/viewmodel-android/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 publishingPlugin {
-    artifactId = "utils-testing-android-viewmodel"
+    artifactId = "utils-node-viewmodel"
 }
 
 appyx {
@@ -17,6 +17,6 @@ appyx {
 
 dependencies {
     api(project(":appyx-navigation:appyx-navigation"))
-    api("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
-    api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
+    api(libs.androidx.lifecycle.viewmodel.compose)
+    api(libs.androidx.lifecycle.viewmodel.ktx)
 }
diff --git a/utils/viewmodel/lint-baseline.xml → utils/viewmodel-android/lint-baseline.xml b/utils/viewmodel/lint-baseline.xml → utils/viewmodel-android/lint-baseline.xml
diff --git a/utils/viewmodel/src/main/AndroidManifest.xml → ...odel-android/src/main/AndroidManifest.xml b/utils/viewmodel/src/main/AndroidManifest.xml → ...odel-android/src/main/AndroidManifest.xml
diff --git a/.../ActivityIntegrationPointWithViewModel.kt → .../ActivityIntegrationPointWithViewModel.kt b/.../ActivityIntegrationPointWithViewModel.kt → .../ActivityIntegrationPointWithViewModel.kt
@@ -10,6 +10,4 @@ class ActivityIntegrationPointWithViewModel(
 ) : ActivityIntegrationPoint(activity, savedInstanceState) {
 
     val viewModel = IntegrationPointViewModel.getInstance(activity)
-
-    fun isChangingConfigurations(): Boolean = activity.isChangingConfigurations
-}
+}
diff --git a/...ls/viewmodel/IntegrationPointViewModel.kt → ...ls/viewmodel/IntegrationPointViewModel.kt b/...ls/viewmodel/IntegrationPointViewModel.kt → ...ls/viewmodel/IntegrationPointViewModel.kt
@@ -27,4 +27,4 @@ open class IntegrationPointViewModel : ViewModel() {
             return ViewModelProvider(viewModelStoreOwner).get()
         }
     }
-}
+}
diff --git a/...pyx/utils/viewmodel/node/ViewModelNode.kt → ...pyx/utils/viewmodel/node/ViewModelNode.kt b/...pyx/utils/viewmodel/node/ViewModelNode.kt → ...pyx/utils/viewmodel/node/ViewModelNode.kt
@@ -7,7 +7,7 @@ import com.bumble.appyx.navigation.modality.BuildContext
 import com.bumble.appyx.navigation.node.Node
 import com.bumble.appyx.utils.viewmodel.ActivityIntegrationPointWithViewModel
 
-class ViewModelNode(
+open class ViewModelNode(
     buildContext: BuildContext,
 ) : Node(buildContext), ViewModelStoreOwner {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,4 @@ open class IntegrationPointViewModel : ViewModel() { @@
                 return ViewModelProvider(viewModelStoreOwner).get()
             }
         }
-    }
+    }