Merge pull request #668 from manuel-martos/1.x-rename-integration-point

Appyx 1.x - Rename integration point
bumble-tech · Feb 1, 2024 · 20f2290 · 20f2290
2 parents 1ab37ff + dcc1c3c
commit 20f2290
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 32 deletions.
diff --git a/documentation/how-to-use-appyx/quick-start.md b/documentation/how-to-use-appyx/quick-start.md
@@ -56,7 +56,7 @@ class MainActivity : NodeActivity() {
         super.onCreate(savedInstanceState)
         setContent {
             AppTheme {
-                NodeHost(integrationPoint = appyxIntegrationPoint) {
+                NodeHost(integrationPoint = appyxV1IntegrationPoint) {
                     RootNode(buildContext = it)
                 }
             }

diff --git a/documentation/navigation/deep-linking.md b/documentation/navigation/deep-linking.md
@@ -19,7 +19,7 @@ class ExplicitNavigationExampleActivity : NodeActivity(), Navigator {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            NodeHost(integrationPoint = appyxIntegrationPoint) {
+            NodeHost(integrationPoint = appyxV1IntegrationPoint) {
                 RootNode(
                     buildContext = it,
                     plugins = listOf(object : NodeReadyObserver<RootNode> {

diff --git a/documentation/navigation/explicit-navigation.md b/documentation/navigation/explicit-navigation.md
@@ -139,7 +139,7 @@ class ExplicitNavigationExampleActivity : NodeActivity(), Navigator {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            NodeHost(integrationPoint = appyxIntegrationPoint) {
+            NodeHost(integrationPoint = appyxV1IntegrationPoint) {
                 RootNode(
                     buildContext = it,
                     navigator = this@ExplicitNavigationExampleActivity,

diff --git a/libraries/core/src/androidTest/kotlin/com/bumble/appyx/core/AppyxTestScenario.kt b/libraries/core/src/androidTest/kotlin/com/bumble/appyx/core/AppyxTestScenario.kt
@@ -30,7 +30,7 @@ class AppyxTestScenario<T : Node>(
         AppyxTestActivity.composableView = { activity ->
             decorator {
                 NodeHost(
-                    integrationPoint = activity.appyxIntegrationPoint,
+                    integrationPoint = activity.appyxV1IntegrationPoint,
                     factory = { buildContext ->
                         node = nodeFactory.create(buildContext)
                         awaitNode.countDown()

diff --git a/...s/core/src/main/kotlin/com/bumble/appyx/core/integrationpoint/ActivityIntegrationPoint.kt b/...s/core/src/main/kotlin/com/bumble/appyx/core/integrationpoint/ActivityIntegrationPoint.kt
@@ -61,7 +61,7 @@ open class ActivityIntegrationPoint(
                 "Activity ${activity::class.qualifiedName} does not implement IntegrationPointProvider"
             )
 
-            return integrationPointProvider.appyxIntegrationPoint
+            return integrationPointProvider.appyxV1IntegrationPoint
         }
 
         @Suppress("UNCHECKED_CAST")

diff --git a/...s/core/src/main/kotlin/com/bumble/appyx/core/integrationpoint/IntegrationPointProvider.kt b/...s/core/src/main/kotlin/com/bumble/appyx/core/integrationpoint/IntegrationPointProvider.kt
@@ -2,5 +2,5 @@ package com.bumble.appyx.core.integrationpoint
 
 interface IntegrationPointProvider {
 
-    val appyxIntegrationPoint: IntegrationPoint
+    val appyxV1IntegrationPoint: IntegrationPoint
 }
diff --git a/libraries/core/src/main/kotlin/com/bumble/appyx/core/integrationpoint/NodeActivity.kt b/libraries/core/src/main/kotlin/com/bumble/appyx/core/integrationpoint/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 [appyxIntegrationPoint]:
+ * down the tree via [appyxV1IntegrationPoint]:
  * - [ActivityStarter]
  * - [PermissionRequester]
  *
@@ -19,7 +19,7 @@ import androidx.appcompat.app.AppCompatActivity
  */
 open class NodeActivity : AppCompatActivity(), IntegrationPointProvider {
 
-    override lateinit var appyxIntegrationPoint: ActivityIntegrationPoint
+    override lateinit var appyxV1IntegrationPoint: 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)
-        appyxIntegrationPoint = createIntegrationPoint(savedInstanceState)
+        appyxV1IntegrationPoint = createIntegrationPoint(savedInstanceState)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        appyxIntegrationPoint.onActivityResult(requestCode, resultCode, data)
+        appyxV1IntegrationPoint.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun onRequestPermissionsResult(
@@ -44,12 +44,12 @@ open class NodeActivity : AppCompatActivity(), IntegrationPointProvider {
         grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        appyxIntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        appyxV1IntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        appyxIntegrationPoint.onSaveInstanceState(outState)
+        appyxV1IntegrationPoint.onSaveInstanceState(outState)
     }
 
 }
diff --git a/...ries/core/src/main/kotlin/com/bumble/appyx/core/integrationpoint/NodeComponentActivity.kt b/...ries/core/src/main/kotlin/com/bumble/appyx/core/integrationpoint/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 [appyxIntegrationPoint]:
+ * down the tree via [appyxV1IntegrationPoint]:
  * - [ActivityStarter]
  * - [PermissionRequester]
  *
@@ -19,7 +19,7 @@ import androidx.activity.ComponentActivity
  */
 open class NodeComponentActivity : ComponentActivity(), IntegrationPointProvider {
 
-    override lateinit var appyxIntegrationPoint: ActivityIntegrationPoint
+    override lateinit var appyxV1IntegrationPoint: 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)
-        appyxIntegrationPoint = createIntegrationPoint(savedInstanceState)
+        appyxV1IntegrationPoint = createIntegrationPoint(savedInstanceState)
     }
 
     @Suppress("OVERRIDE_DEPRECATION")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        appyxIntegrationPoint.onActivityResult(requestCode, resultCode, data)
+        appyxV1IntegrationPoint.onActivityResult(requestCode, resultCode, data)
     }
 
     @Suppress("OVERRIDE_DEPRECATION")
@@ -46,11 +46,11 @@ open class NodeComponentActivity : ComponentActivity(), IntegrationPointProvider
         grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        appyxIntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        appyxV1IntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        appyxIntegrationPoint.onSaveInstanceState(outState)
+        appyxV1IntegrationPoint.onSaveInstanceState(outState)
     }
 }
diff --git a/...rop-ribs/src/androidTest/kotlin/com/bumble/appyx/interop/ribs/AppyxRibsInteropActivity.kt b/...rop-ribs/src/androidTest/kotlin/com/bumble/appyx/interop/ribs/AppyxRibsInteropActivity.kt
@@ -14,7 +14,7 @@ class AppyxRibsInteropActivity : InteropActivity() {
 
     override fun createRib(savedInstanceState: Bundle?): Rib =
         RibsNodeBuilder()
-            .build(BuildContext.root(savedInstanceState), appyxIntegrationPoint)
+            .build(BuildContext.root(savedInstanceState), appyxV1IntegrationPoint)
             .also { ribsNode = it }
 
 }
diff --git a/libraries/interop-ribs/src/main/kotlin/com/bumble/appyx/interop/ribs/InteropActivity.kt b/libraries/interop-ribs/src/main/kotlin/com/bumble/appyx/interop/ribs/InteropActivity.kt
@@ -8,7 +8,7 @@ import com.bumble.appyx.core.integrationpoint.IntegrationPointProvider
 
 abstract class InteropActivity : RibActivity(), IntegrationPointProvider {
 
-    override lateinit var appyxIntegrationPoint: ActivityIntegrationPoint
+    override lateinit var appyxV1IntegrationPoint: ActivityIntegrationPoint
 
     protected open fun createAppyxIntegrationPoint(savedInstanceState: Bundle?) =
         ActivityIntegrationPoint(
@@ -18,14 +18,14 @@ 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
-        appyxIntegrationPoint = createAppyxIntegrationPoint(savedInstanceState)
+        // appyxV1IntegrationPoint ready before we create a root node
+        appyxV1IntegrationPoint = createAppyxIntegrationPoint(savedInstanceState)
         super.onCreate(savedInstanceState)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        appyxIntegrationPoint.onActivityResult(requestCode, resultCode, data)
+        appyxV1IntegrationPoint.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun onRequestPermissionsResult(
@@ -34,12 +34,12 @@ abstract class InteropActivity : RibActivity(), IntegrationPointProvider {
         grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        appyxIntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        appyxV1IntegrationPoint.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        appyxIntegrationPoint.onSaveInstanceState(outState)
+        appyxV1IntegrationPoint.onSaveInstanceState(outState)
     }
 
 }
diff --git a/...ies/testing-ui/src/main/kotlin/com/bumble/appyx/testing/ui/rules/AppyxActivityTestRule.kt b/...ies/testing-ui/src/main/kotlin/com/bumble/appyx/testing/ui/rules/AppyxActivityTestRule.kt
@@ -44,7 +44,7 @@ open class AppyxActivityTestRule<T : Node>(
     override fun beforeActivityLaunched() {
         AppyxTestActivity.composableView = { activity ->
             decorator {
-                NodeHost(integrationPoint = activity.appyxIntegrationPoint, factory = { buildContext ->
+                NodeHost(integrationPoint = activity.appyxV1IntegrationPoint, factory = { buildContext ->
                     node = nodeFactory.create(buildContext)
                     node
                 })

diff --git a/samples/app/src/main/kotlin/com/bumble/appyx/app/MainActivity.kt b/samples/app/src/main/kotlin/com/bumble/appyx/app/MainActivity.kt
@@ -30,7 +30,7 @@ class MainActivity : NodeActivity() {
                 // A surface container using the 'background' color from the theme
                 Surface(color = MaterialTheme.colorScheme.background) {
                     Column {
-                        NodeHost(integrationPoint = appyxIntegrationPoint) {
+                        NodeHost(integrationPoint = appyxV1IntegrationPoint) {
                             SamplesContainerNode(buildContext = 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.appyxIntegrationPoint,
+                LocalIntegrationPoint provides appyxTestActivity.appyxV1IntegrationPoint,
             ) {
                 ComposeNavigationRoot()
             }

diff --git a/samples/sandbox/src/main/kotlin/com/bumble/appyx/sandbox/MainActivity.kt b/samples/sandbox/src/main/kotlin/com/bumble/appyx/sandbox/MainActivity.kt
@@ -21,7 +21,7 @@ class MainActivity : NodeActivity() {
             AppyxSandboxTheme {
                 // A surface container using the 'background' color from the theme
                 Surface(color = MaterialTheme.colorScheme.background) {
-                    NodeHost(integrationPoint = appyxIntegrationPoint) {
+                    NodeHost(integrationPoint = appyxV1IntegrationPoint) {
                         ContainerBuilder().build(buildContext = it)
                     }
                 }

diff --git a/.../main/kotlin/com/bumble/appyx/sandbox/client/customisations/ViewCustomisationsActivity.kt b/.../main/kotlin/com/bumble/appyx/sandbox/client/customisations/ViewCustomisationsActivity.kt
@@ -24,7 +24,7 @@ class ViewCustomisationsActivity : NodeActivity() {
                 Surface(color = MaterialTheme.colorScheme.background) {
                     Column {
                         NodeHost(
-                            integrationPoint = appyxIntegrationPoint,
+                            integrationPoint = appyxV1IntegrationPoint,
                             customisations = getCustomisations(hasCustomisedView)
                         ) {
                             ViewCustomisationExampleBuilder().build(buildContext = it)

diff --git a/...n/com/bumble/appyx/sandbox/client/explicitnavigation/ExplicitNavigationExampleActivity.kt b/...n/com/bumble/appyx/sandbox/client/explicitnavigation/ExplicitNavigationExampleActivity.kt
@@ -59,7 +59,7 @@ class ExplicitNavigationExampleActivity : NodeActivity(), Navigator {
                 // A surface container using the 'background' color from the theme
                 Surface(color = MaterialTheme.colorScheme.background) {
                     Column {
-                        NodeHost(integrationPoint = appyxIntegrationPoint) {
+                        NodeHost(integrationPoint = appyxV1IntegrationPoint) {
                             RootNode(
                                 buildContext = it,
                                 navigator = this@ExplicitNavigationExampleActivity,

diff --git a/...sandbox/src/main/kotlin/com/bumble/appyx/sandbox/client/interop/InteropExampleActivity.kt b/...sandbox/src/main/kotlin/com/bumble/appyx/sandbox/client/interop/InteropExampleActivity.kt
@@ -18,7 +18,7 @@ class InteropExampleActivity : InteropActivity() {
     override val rootViewGroup: ViewGroup get() = rootView
 
     override fun createRib(savedInstanceState: Bundle?): Rib {
-        return RibsParentBuilder(appyxIntegrationPoint).build(
+        return RibsParentBuilder(appyxV1IntegrationPoint).build(
             buildContext = BuildContext.root(
                 savedInstanceState= savedInstanceState,
                 customisations = ribCustomisations()