Create root node

This commit is contained in:
Florian Renaud
2023-02-28 17:42:26 +01:00
parent 0e4bde644d
commit c135d2a13c
9 changed files with 115 additions and 44 deletions

View File

@@ -20,6 +20,7 @@ plugins {
id("io.element.android-compose-library")
alias(libs.plugins.ksp)
alias(libs.plugins.anvil)
id("kotlin-parcelize")
}
android {

View File

@@ -16,29 +16,48 @@
package io.element.android.features.createroom
import android.os.Parcelable
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import com.bumble.appyx.core.composable.Children
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.di.SessionScope
import com.bumble.appyx.core.node.ParentNode
import com.bumble.appyx.navmodel.backstack.BackStack
import io.element.android.features.createroom.root.CreateRoomRootNode
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
import io.element.android.libraries.architecture.createNode
import kotlinx.parcelize.Parcelize
@ContributesNode(SessionScope::class)
class CreateRoomNode @AssistedInject constructor(
@Assisted buildContext: BuildContext,
@Assisted plugins: List<Plugin>,
private val presenter: CreateRoomPresenter,
) : Node(buildContext, plugins = plugins) {
class CreateRoomNode(
buildContext: BuildContext,
private val backstack: BackStack<NavTarget> = BackStack(
initialElement = NavTarget.Root,
savedStateMap = buildContext.savedStateMap,
),
) : ParentNode<CreateRoomNode.NavTarget>(
navModel = backstack,
buildContext = buildContext
) {
sealed interface NavTarget : Parcelable {
@Parcelize
object Root : NavTarget
}
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
return when (navTarget) {
NavTarget.Root -> createNode<CreateRoomRootNode>(buildContext)
}
}
@Composable
override fun View(modifier: Modifier) {
val state = presenter.present()
CreateRoomView(
state = state,
modifier = modifier
Children(
navModel = backstack,
modifier = modifier,
// Animate transition to change server screen
transitionHandler = rememberDefaultTransitionHandler(),
)
}
}

View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package io.element.android.features.createroom
package io.element.android.features.createroom.root
// TODO Add your events or remove the file completely if no events
sealed interface CreateRoomEvents {
object MyEvent : CreateRoomEvents
sealed interface CreateRoomRootEvents {
object MyEvent : CreateRoomRootEvents
}

View File

@@ -0,0 +1,51 @@
/*
* Copyright (c) 2023 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.element.android.features.createroom.root
import android.os.Parcelable
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.di.SessionScope
import kotlinx.parcelize.Parcelize
@ContributesNode(SessionScope::class)
class CreateRoomRootNode @AssistedInject constructor(
@Assisted buildContext: BuildContext,
@Assisted plugins: List<Plugin>,
private val presenter: CreateRoomRootPresenter,
) : Node(buildContext, plugins = plugins) {
sealed interface NavTarget : Parcelable {
@Parcelize
object Root : NavTarget
}
@Composable
override fun View(modifier: Modifier) {
val state = presenter.present()
CreateRoomRootView(
state = state,
modifier = modifier
)
}
}

View File

@@ -14,24 +14,24 @@
* limitations under the License.
*/
package io.element.android.features.createroom
package io.element.android.features.createroom.root
import androidx.compose.runtime.Composable
import io.element.android.libraries.architecture.Presenter
import javax.inject.Inject
class CreateRoomPresenter @Inject constructor() : Presenter<CreateRoomState> {
class CreateRoomRootPresenter @Inject constructor() : Presenter<CreateRoomRootState> {
@Composable
override fun present(): CreateRoomState {
override fun present(): CreateRoomRootState {
fun handleEvents(event: CreateRoomEvents) {
fun handleEvents(event: CreateRoomRootEvents) {
when (event) {
CreateRoomEvents.MyEvent -> Unit
CreateRoomRootEvents.MyEvent -> Unit
}
}
return CreateRoomState(
return CreateRoomRootState(
eventSink = ::handleEvents
)
}

View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package io.element.android.features.createroom
package io.element.android.features.createroom.root
// TODO add your ui models. Remove the eventSink if you don't have events.
// Do not use default value, so no member get forgotten in the presenters.
data class CreateRoomState(
val eventSink: (CreateRoomEvents) -> Unit
data class CreateRoomRootState(
val eventSink: (CreateRoomRootEvents) -> Unit
)

View File

@@ -14,18 +14,18 @@
* limitations under the License.
*/
package io.element.android.features.createroom
package io.element.android.features.createroom.root
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
open class CreateRoomStateProvider : PreviewParameterProvider<CreateRoomState> {
override val values: Sequence<CreateRoomState>
open class CreateRoomRootStateProvider : PreviewParameterProvider<CreateRoomRootState> {
override val values: Sequence<CreateRoomRootState>
get() = sequenceOf(
aCreateRoomState(),
aCreateRoomRootState(),
// Add other state here
)
}
fun aCreateRoomState() = CreateRoomState(
fun aCreateRoomRootState() = CreateRoomRootState(
eventSink = {}
)

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.element.android.features.createroom
package io.element.android.features.createroom.root
import androidx.compose.foundation.layout.Box
import androidx.compose.material3.MaterialTheme
@@ -28,8 +28,8 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.theme.components.Text
@Composable
fun CreateRoomView(
state: CreateRoomState,
fun CreateRoomRootView(
state: CreateRoomRootState,
modifier: Modifier = Modifier,
) {
Box(modifier, contentAlignment = Alignment.Center) {
@@ -42,17 +42,17 @@ fun CreateRoomView(
@Preview
@Composable
fun CreateRoomViewLightPreview(@PreviewParameter(CreateRoomStateProvider::class) state: CreateRoomState) =
fun CreateRoomRootViewLightPreview(@PreviewParameter(CreateRoomRootStateProvider::class) state: CreateRoomRootState) =
ElementPreviewLight { ContentToPreview(state) }
@Preview
@Composable
fun CreateRoomViewDarkPreview(@PreviewParameter(CreateRoomStateProvider::class) state: CreateRoomState) =
fun CreateRoomRootViewDarkPreview(@PreviewParameter(CreateRoomRootStateProvider::class) state: CreateRoomRootState) =
ElementPreviewDark { ContentToPreview(state) }
@Composable
private fun ContentToPreview(state: CreateRoomState) {
CreateRoomView(
private fun ContentToPreview(state: CreateRoomRootState) {
CreateRoomRootView(
state = state,
)
}

View File

@@ -16,7 +16,7 @@
@file:OptIn(ExperimentalCoroutinesApi::class)
package io.element.android.features.createroom
package io.element.android.features.createroom.root
import app.cash.molecule.RecompositionClock
import app.cash.molecule.moleculeFlow
@@ -26,11 +26,11 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest
import org.junit.Test
class CreateRoomPresenterTests {
class CreateRoomRootPresenterTests {
@Test
fun `present - initial state`() = runTest {
val presenter = CreateRoomPresenter()
val presenter = CreateRoomRootPresenter()
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
}.test {
@@ -41,12 +41,12 @@ class CreateRoomPresenterTests {
@Test
fun `present - send event`() = runTest {
val presenter = CreateRoomPresenter()
val presenter = CreateRoomRootPresenter()
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
}.test {
val initialState = awaitItem()
initialState.eventSink.invoke(CreateRoomEvents.MyEvent)
initialState.eventSink.invoke(CreateRoomRootEvents.MyEvent)
}
}
}