Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add modifier for NodeHost.kt to decorate the view of a root node #159

Merged
merged 2 commits into from
Sep 21, 2022
Merged

Add modifier for NodeHost.kt to decorate the view of a root node #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95ad391
Add modifier for NodeHost.kt to decorate the view of a root node
KovalevAndrey Sep 21, 2022
4a60bed
Merge branch 'main' into hode-host-modifier
KovalevAndrey Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- [#138](https://github.com/bumble-tech/appyx/pull/138) - **Fixed**: `androidx.appcompat:appcompat` from is exposed via `api` within `com.bumble.appyx:core`. This prevents potential compilation bugs.
- [#143](https://github.com/bumble-tech/appyx/issues/143) - **Fixed**: Correctly exposed transitive dependencies that are part of the libraries ABI
- [#145](https://github.com/bumble-tech/appyx/issues/145) - **Updated**: `SpotlightSlider` now uses offset modifier with lambda
- [#159](https://github.com/bumble-tech/appyx/pull/159) - **Added**: `NodeHost` now takes modifier parameter to decorate the view of a root node

---

Expand Down
1 change: 1 addition & 0 deletions app/src/main/kotlin/com/bumble/appyx/app/node/root/RootNode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class RootNode(
}

Children(
modifier = modifier,
navModel = backStack,
transitionHandler = rememberBackstackFader { tween(750) }
)
Expand Down
8 changes: 5 additions & 3 deletions core/src/main/kotlin/com/bumble/appyx/core/integration/NodeHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.mapSaver
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import com.bumble.appyx.utils.customisations.NodeCustomisationDirectory
import com.bumble.appyx.utils.customisations.NodeCustomisationDirectoryImpl
import com.bumble.appyx.core.integrationpoint.IntegrationPoint
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.node.build
import com.bumble.appyx.core.state.SavedStateMap
import com.bumble.appyx.utils.customisations.NodeCustomisationDirectory
import com.bumble.appyx.utils.customisations.NodeCustomisationDirectoryImpl

/**
* Composable function to host [Node].
Expand All @@ -26,6 +27,7 @@ import com.bumble.appyx.core.state.SavedStateMap
*/
@Composable
fun <N : Node> NodeHost(
modifier: Modifier = Modifier,
customisations: NodeCustomisationDirectory = remember { NodeCustomisationDirectoryImpl() },
integrationPoint: IntegrationPoint,
factory: NodeFactory<N>
Expand All @@ -34,7 +36,7 @@ fun <N : Node> NodeHost(
DisposableEffect(node) {
onDispose { node.updateLifecycleState(Lifecycle.State.DESTROYED) }
}
node.Compose()
node.Compose(modifier = modifier)
val lifecycle = LocalLifecycleOwner.current.lifecycle
DisposableEffect(lifecycle) {
node.updateLifecycleState(lifecycle.currentState)
Expand Down