Merge pull request #667 from manuel-martos/2.x-rename-integration-point

Appyx 2.x - Rename integration point
bumble-tech · Feb 12, 2024 · e18d59c · e18d59c
2 parents 0bd6e47 + 245219a
commit e18d59c
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 49 deletions.
diff --git a/...avigation/android/src/androidTest/kotlin/com/bumble/appyx/navigation/AppyxTestScenario.kt b/...avigation/android/src/androidTest/kotlin/com/bumble/appyx/navigation/AppyxTestScenario.kt
@@ -28,7 +28,7 @@ class AppyxTestScenario<T : Node<*>>(
             decorator {
                 NodeHost(
                     lifecycle = AndroidLifecycle(LocalLifecycleOwner.current.lifecycle),
-                    integrationPoint = activity.appyxV2IntegrationPoint,
+                    integrationPoint = activity.appyxIntegrationPoint,
                 ) { nodeContext ->
                     node = nodeFactory.create(nodeContext)
                     awaitNode.countDown()

diff --git a/...rc/androidMain/kotlin/com/bumble/appyx/navigation/integration/ActivityIntegrationPoint.kt b/...rc/androidMain/kotlin/com/bumble/appyx/navigation/integration/ActivityIntegrationPoint.kt
@@ -61,7 +61,7 @@ open class ActivityIntegrationPoint(
                 "Activity ${activity::class.qualifiedName} does not implement IntegrationPointProvider"
             )
 
-            return integrationPointProvider.appyxV2IntegrationPoint as? AndroidIntegrationPoint
+            return integrationPointProvider.appyxIntegrationPoint as? AndroidIntegrationPoint
                 ?: error(
                     "Activity ${activity::class.qualifiedName} does not provide AndroidIntegrationPoint"
                 )

diff --git a/...ion/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/NodeActivity.kt b/...ion/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/NodeActivity.kt
@@ -10,7 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
  * See [NodeComponentActivity] for building upon [ComponentActivity].
  *
  * Also offers base functionality to satisfy dependencies of Android-related functionality
- * down the tree via [appyxV2IntegrationPoint]:
+ * down the tree via [appyxIntegrationPoint]:
  * - [ActivityStarter]
  * - [PermissionRequester]
  *
@@ -19,7 +19,7 @@ import androidx.appcompat.app.AppCompatActivity
  */
 open class NodeActivity : AppCompatActivity(), IntegrationPointProvider {
 
-    override lateinit var appyxV2IntegrationPoint: ActivityIntegrationPoint
+    override lateinit var appyxIntegrationPoint: ActivityIntegrationPoint
         protected set
 
     protected open fun createIntegrationPoint(savedInstanceState: Bundle?) =
@@ -30,12 +30,12 @@ open class NodeActivity : AppCompatActivity(), IntegrationPointProvider {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        appyxV2IntegrationPoint = createIntegrationPoint(savedInstanceState)
+        appyxIntegrationPoint = createIntegrationPoint(savedInstanceState)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        appyxV2IntegrationPoint.onActivityResult(requestCode, resultCode, data)
+        appyxIntegrationPoint.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun onRequestPermissionsResult(
@@ -44,12 +44,12 @@ open class NodeActivity : AppCompatActivity(), IntegrationPointProvider {
         grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        appyxV2IntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        appyxIntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        appyxV2IntegrationPoint.onSaveInstanceState(outState)
+        appyxIntegrationPoint.onSaveInstanceState(outState)
     }
 
 }
diff --git a/...n/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/NodeComponentActivity.kt b/...n/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/NodeComponentActivity.kt
@@ -10,7 +10,7 @@ import androidx.activity.ComponentActivity
  * See [NodeActivity] for building upon [AppCompatActivity]
  *
  * Also offers base functionality to satisfy dependencies of Android-related functionality
- * down the tree via [appyxV2IntegrationPoint]:
+ * down the tree via [appyxIntegrationPoint]:
  * - [ActivityStarter]
  * - [PermissionRequester]
  *
@@ -19,7 +19,7 @@ import androidx.activity.ComponentActivity
  */
 open class NodeComponentActivity : ComponentActivity(), IntegrationPointProvider {
 
-    override lateinit var appyxV2IntegrationPoint: ActivityIntegrationPoint
+    override lateinit var appyxIntegrationPoint: ActivityIntegrationPoint
         protected set
 
     protected open fun createIntegrationPoint(savedInstanceState: Bundle?) =
@@ -30,13 +30,13 @@ open class NodeComponentActivity : ComponentActivity(), IntegrationPointProvider
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        appyxV2IntegrationPoint = createIntegrationPoint(savedInstanceState)
+        appyxIntegrationPoint = createIntegrationPoint(savedInstanceState)
     }
 
     @Suppress("OVERRIDE_DEPRECATION")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        appyxV2IntegrationPoint.onActivityResult(requestCode, resultCode, data)
+        appyxIntegrationPoint.onActivityResult(requestCode, resultCode, data)
     }
 
     @Suppress("OVERRIDE_DEPRECATION")
@@ -46,11 +46,11 @@ open class NodeComponentActivity : ComponentActivity(), IntegrationPointProvider
         grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        appyxV2IntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        appyxIntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        appyxV2IntegrationPoint.onSaveInstanceState(outState)
+        appyxIntegrationPoint.onSaveInstanceState(outState)
     }
 }
diff --git a/...src/commonMain/kotlin/com/bumble/appyx/navigation/integration/IntegrationPointProvider.kt b/...src/commonMain/kotlin/com/bumble/appyx/navigation/integration/IntegrationPointProvider.kt
@@ -2,5 +2,5 @@ package com.bumble.appyx.navigation.integration
 
 interface IntegrationPointProvider {
 
-    val appyxV2IntegrationPoint: IntegrationPoint
+    val appyxIntegrationPoint: IntegrationPoint
 }
diff --git a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/MainActivity.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/MainActivity.kt
@@ -24,7 +24,7 @@ class MainActivity : NodeActivity() {
             ) {
                 NodeHost(
                     lifecycle = AndroidLifecycle(LocalLifecycleOwner.current.lifecycle),
-                    integrationPoint = appyxV2IntegrationPoint,
+                    integrationPoint = appyxIntegrationPoint,
                 ) {
                     MosaicNode(
                         nodeContext = it,

diff --git a/.../appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/MainActivity.kt b/.../appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/MainActivity.kt
@@ -38,7 +38,7 @@ class MainActivity : NodeActivity() {
                 ) {
                     NodeHost(
                         lifecycle = AndroidLifecycle(LocalLifecycleOwner.current.lifecycle),
-                        integrationPoint = appyxV2IntegrationPoint,
+                        integrationPoint = appyxIntegrationPoint,
                     ) {
                         AppyxMaterial3NavNode(
                             nodeContext = it,

diff --git a/...ppyx-navigation/android/src/main/kotlin/com/bumble/appyx/demos/navigation/MainActivity.kt b/...ppyx-navigation/android/src/main/kotlin/com/bumble/appyx/demos/navigation/MainActivity.kt
@@ -46,7 +46,7 @@ class MainActivity : NodeActivity() {
                     CompositionLocalProvider(LocalNavigator provides navigator) {
                         NodeHost(
                             lifecycle = AndroidLifecycle(LocalLifecycleOwner.current.lifecycle),
-                            integrationPoint = appyxV2IntegrationPoint,
+                            integrationPoint = appyxIntegrationPoint,
                         ) {
                             RootNode(
                                 nodeContext = it,

diff --git a/...androidTest/kotlin/com/bumble/appyx/sample/navigtion/compose/ComposeNavigationRootTest.kt b/...androidTest/kotlin/com/bumble/appyx/sample/navigtion/compose/ComposeNavigationRootTest.kt
@@ -19,7 +19,7 @@ class ComposeNavigationRootTest {
             // 'integrationPoint' must be provided to ensure it can be accessed from within the
             // Jetpack compose navigation graph.
             CompositionLocalProvider(
-                LocalIntegrationPoint provides appyxTestActivity.appyxV2IntegrationPoint,
+                LocalIntegrationPoint provides appyxTestActivity.appyxIntegrationPoint,
             ) {
                 ComposeNavigationRoot()
             }

diff --git a/...igation/android/src/main/kotlin/com/bumble/appyx/demos/sandbox/navigation/MainActivity.kt b/...igation/android/src/main/kotlin/com/bumble/appyx/demos/sandbox/navigation/MainActivity.kt
@@ -33,7 +33,7 @@ class MainActivity : NodeActivity() {
                 Surface(color = MaterialTheme.colorScheme.background) {
                     NodeHost(
                         lifecycle = AndroidLifecycle(LocalLifecycleOwner.current.lifecycle),
-                        integrationPoint = appyxV2IntegrationPoint,
+                        integrationPoint = appyxIntegrationPoint,
                     ) {
                         MainNavNode(
                             nodeContext = it,

diff --git a/documentation/2.x/migrationguide.md b/documentation/2.x/migrationguide.md
@@ -80,27 +80,6 @@ Artifacts have a `utils-` prefix:
 ```
 
 
-### MainActivity
-
-```diff
--import com.bumble.appyx.core.integration.NodeHost
--import com.bumble.appyx.core.integrationpoint.NodeActivity
-
-+import com.bumble.appyx.navigation.integration.NodeHost
-+import com.bumble.appyx.navigation.integration.NodeActivity
-
-    class MainActivity : NodeActivity() {
-         super.onCreate(savedInstanceState)
-         setContent {
-             HelloAppyxTheme {
--                NodeHost(integrationPoint = appyxIntegrationPoint) {
-+                NodeHost(integrationPoint = appyxV2IntegrationPoint) {
-                     RootNode(it)
-                 }
-             }
-     }
-```
-
 ### Usage site (RootNode)
 
 ```diff

diff --git a/documentation/navigation/multiplatform.md b/documentation/navigation/multiplatform.md
@@ -90,7 +90,7 @@ class MainActivity : NodeActivity() {
             YourAppTheme {
                 NodeHost(
                     lifecycle = AndroidLifecycle(LocalLifecycleOwner.current.lifecycle),
-                    integrationPoint = appyxV2IntegrationPoint
+                    integrationPoint = appyxIntegrationPoint
                 ) {
                     RootNode(nodeContext = it)
                 }

diff --git a/...bs/src/androidTest/kotlin/com/bumble/appyx/utils/interop/ribs/AppyxRibsInteropActivity.kt b/...bs/src/androidTest/kotlin/com/bumble/appyx/utils/interop/ribs/AppyxRibsInteropActivity.kt
@@ -14,7 +14,7 @@ class AppyxRibsInteropActivity : InteropActivity() {
 
     override fun createRib(savedInstanceState: Bundle?): Rib =
         RibsNodeBuilder()
-            .build(BuildContext.root(savedInstanceState), appyxV2IntegrationPoint)
+            .build(BuildContext.root(savedInstanceState), appyxIntegrationPoint)
             .also { ribsNode = it }
 
 }
diff --git a/utils/interop-ribs/src/main/kotlin/com/bumble/appyx/utils/interop/ribs/InteropActivity.kt b/utils/interop-ribs/src/main/kotlin/com/bumble/appyx/utils/interop/ribs/InteropActivity.kt
@@ -8,7 +8,7 @@ import com.bumble.appyx.navigation.integration.IntegrationPointProvider
 
 abstract class InteropActivity : RibActivity(), IntegrationPointProvider {
 
-    override lateinit var appyxV2IntegrationPoint: ActivityIntegrationPoint
+    override lateinit var appyxIntegrationPoint: ActivityIntegrationPoint
 
     protected open fun createAppyxIntegrationPoint(savedInstanceState: Bundle?) =
         ActivityIntegrationPoint(
@@ -19,13 +19,13 @@ abstract class InteropActivity : RibActivity(), IntegrationPointProvider {
     override fun onCreate(savedInstanceState: Bundle?) {
         // super.onCreate() creates RIB with AppyxNode inside. It's important to have
         // appyxIntegrationPoint ready before we create a root node
-        appyxV2IntegrationPoint = createAppyxIntegrationPoint(savedInstanceState)
+        appyxIntegrationPoint = createAppyxIntegrationPoint(savedInstanceState)
         super.onCreate(savedInstanceState)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        appyxV2IntegrationPoint.onActivityResult(requestCode, resultCode, data)
+        appyxIntegrationPoint.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun onRequestPermissionsResult(
@@ -34,12 +34,12 @@ abstract class InteropActivity : RibActivity(), IntegrationPointProvider {
         grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        appyxV2IntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        appyxIntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        appyxV2IntegrationPoint.onSaveInstanceState(outState)
+        appyxIntegrationPoint.onSaveInstanceState(outState)
     }
 
 }
diff --git a/...sting-ui/src/main/kotlin/com/bumble/appyx/utils/testing/ui/rules/AppyxActivityTestRule.kt b/...sting-ui/src/main/kotlin/com/bumble/appyx/utils/testing/ui/rules/AppyxActivityTestRule.kt
@@ -48,7 +48,7 @@ open class AppyxActivityTestRule<T : Node<*>>(
             decorator {
                 NodeHost(
                     lifecycle = AndroidLifecycle(LocalLifecycleOwner.current.lifecycle),
-                    integrationPoint = activity.appyxV2IntegrationPoint,
+                    integrationPoint = activity.appyxIntegrationPoint,
                 ) { nodeContext ->
                     node = nodeFactory.create(nodeContext)
                     node