ganfra
1 year ago
8 changed files with 411 additions and 314 deletions
@ -1,177 +0,0 @@
@@ -1,177 +0,0 @@
|
||||
/* |
||||
* 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. |
||||
*/ |
||||
|
||||
@file:OptIn(ExperimentalMaterial3Api::class) |
||||
|
||||
package io.element.android.appnav.room |
||||
|
||||
import android.os.Parcelable |
||||
import androidx.compose.foundation.background |
||||
import androidx.compose.foundation.layout.Box |
||||
import androidx.compose.foundation.layout.Row |
||||
import androidx.compose.foundation.layout.Spacer |
||||
import androidx.compose.foundation.layout.WindowInsets |
||||
import androidx.compose.foundation.layout.fillMaxSize |
||||
import androidx.compose.foundation.layout.padding |
||||
import androidx.compose.foundation.layout.size |
||||
import androidx.compose.foundation.layout.systemBars |
||||
import androidx.compose.foundation.layout.width |
||||
import androidx.compose.foundation.shape.CircleShape |
||||
import androidx.compose.material3.ExperimentalMaterial3Api |
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.ui.Alignment |
||||
import androidx.compose.ui.Modifier |
||||
import androidx.compose.ui.unit.dp |
||||
import androidx.lifecycle.lifecycleScope |
||||
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.node.node |
||||
import com.bumble.appyx.core.plugin.Plugin |
||||
import com.bumble.appyx.core.plugin.plugins |
||||
import com.bumble.appyx.navmodel.backstack.BackStack |
||||
import dagger.assisted.Assisted |
||||
import dagger.assisted.AssistedInject |
||||
import io.element.android.anvilannotations.ContributesNode |
||||
import io.element.android.appnav.NodeLifecycleCallback |
||||
import io.element.android.appnav.safeRoot |
||||
import io.element.android.libraries.architecture.BackstackNode |
||||
import io.element.android.libraries.architecture.NodeInputs |
||||
import io.element.android.libraries.architecture.createNode |
||||
import io.element.android.libraries.architecture.inputs |
||||
import io.element.android.libraries.designsystem.atomic.atoms.PlaceholderAtom |
||||
import io.element.android.libraries.designsystem.components.avatar.AvatarSize |
||||
import io.element.android.libraries.designsystem.components.button.BackButton |
||||
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator |
||||
import io.element.android.libraries.designsystem.theme.components.Scaffold |
||||
import io.element.android.libraries.designsystem.theme.components.TopAppBar |
||||
import io.element.android.libraries.designsystem.theme.placeholderBackground |
||||
import io.element.android.libraries.di.SessionScope |
||||
import io.element.android.libraries.matrix.api.core.RoomId |
||||
import io.element.android.libraries.theme.ElementTheme |
||||
import kotlinx.coroutines.flow.launchIn |
||||
import kotlinx.coroutines.flow.onEach |
||||
import kotlinx.parcelize.Parcelize |
||||
|
||||
@ContributesNode(SessionScope::class) |
||||
class AwaitRoomNode @AssistedInject constructor( |
||||
@Assisted val buildContext: BuildContext, |
||||
@Assisted plugins: List<Plugin>, |
||||
awaitRoomStateFlowFactory: AwaitRoomStateFlowFactory, |
||||
) : |
||||
BackstackNode<AwaitRoomNode.NavTarget>( |
||||
backstack = BackStack( |
||||
initialElement = NavTarget.Loading, |
||||
savedStateMap = buildContext.savedStateMap, |
||||
), |
||||
buildContext = buildContext, |
||||
plugins = plugins |
||||
) { |
||||
|
||||
data class Inputs( |
||||
val roomId: RoomId, |
||||
val initialElement: RoomFlowNode.NavTarget = RoomFlowNode.NavTarget.Messages, |
||||
) : NodeInputs |
||||
|
||||
private val inputs: Inputs = inputs() |
||||
private val awaitRoomStateFlow = awaitRoomStateFlowFactory.create(lifecycleScope, inputs.roomId) |
||||
|
||||
sealed interface NavTarget : Parcelable { |
||||
@Parcelize |
||||
object Loading : NavTarget |
||||
|
||||
@Parcelize |
||||
object Loaded : NavTarget |
||||
} |
||||
|
||||
init { |
||||
awaitRoomStateFlow.onEach { awaitRoomState -> |
||||
when (awaitRoomState) { |
||||
is AwaitRoomState.Loaded -> backstack.safeRoot(NavTarget.Loaded) |
||||
else -> backstack.safeRoot(NavTarget.Loading) |
||||
} |
||||
}.launchIn(lifecycleScope) |
||||
} |
||||
|
||||
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node { |
||||
return when (navTarget) { |
||||
NavTarget.Loaded -> { |
||||
val nodeLifecycleCallbacks = plugins<NodeLifecycleCallback>() |
||||
val roomFlowNodeCallback = plugins<RoomFlowNode.Callback>() |
||||
val awaitRoomState = awaitRoomStateFlow.value |
||||
if (awaitRoomState is AwaitRoomState.Loaded) { |
||||
val inputs = RoomFlowNode.Inputs(awaitRoomState.room, initialElement = inputs.initialElement) |
||||
createNode<RoomFlowNode>(buildContext, plugins = listOf(inputs) + roomFlowNodeCallback + nodeLifecycleCallbacks) |
||||
} else { |
||||
loadingNode(buildContext, this::navigateUp) |
||||
} |
||||
} |
||||
NavTarget.Loading -> { |
||||
loadingNode(buildContext, this::navigateUp) |
||||
} |
||||
} |
||||
} |
||||
|
||||
private fun loadingNode(buildContext: BuildContext, onBackPressed: () -> Unit) = node(buildContext) { modifier -> |
||||
Scaffold( |
||||
modifier = modifier, |
||||
contentWindowInsets = WindowInsets.systemBars, |
||||
topBar = { |
||||
TopAppBar( |
||||
modifier = Modifier, |
||||
navigationIcon = { |
||||
BackButton(onClick = onBackPressed) |
||||
}, |
||||
title = { |
||||
Row( |
||||
verticalAlignment = Alignment.CenterVertically |
||||
) { |
||||
Box( |
||||
modifier = Modifier |
||||
.size(AvatarSize.TimelineRoom.dp) |
||||
.align(Alignment.CenterVertically) |
||||
.background(color = ElementTheme.colors.placeholderBackground, shape = CircleShape) |
||||
) |
||||
Spacer(modifier = Modifier.width(8.dp)) |
||||
PlaceholderAtom(width = 20.dp, height = 7.dp) |
||||
Spacer(modifier = Modifier.width(7.dp)) |
||||
PlaceholderAtom(width = 45.dp, height = 7.dp) |
||||
} |
||||
}, |
||||
) |
||||
}, |
||||
content = { padding -> |
||||
Box( |
||||
modifier = Modifier |
||||
.fillMaxSize() |
||||
.padding(padding), contentAlignment = Alignment.Center |
||||
) { |
||||
CircularProgressIndicator() |
||||
} |
||||
}, |
||||
) |
||||
|
||||
} |
||||
|
||||
@Composable |
||||
override fun View(modifier: Modifier) { |
||||
Children( |
||||
navModel = backstack, |
||||
modifier = modifier, |
||||
) |
||||
} |
||||
} |
||||
|
||||
@ -0,0 +1,126 @@
@@ -0,0 +1,126 @@
|
||||
/* |
||||
* 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.appnav.room |
||||
|
||||
import androidx.compose.foundation.background |
||||
import androidx.compose.foundation.layout.Box |
||||
import androidx.compose.foundation.layout.Row |
||||
import androidx.compose.foundation.layout.Spacer |
||||
import androidx.compose.foundation.layout.WindowInsets |
||||
import androidx.compose.foundation.layout.fillMaxSize |
||||
import androidx.compose.foundation.layout.padding |
||||
import androidx.compose.foundation.layout.size |
||||
import androidx.compose.foundation.layout.systemBars |
||||
import androidx.compose.foundation.layout.width |
||||
import androidx.compose.foundation.shape.CircleShape |
||||
import androidx.compose.material3.ExperimentalMaterial3Api |
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.ui.Alignment |
||||
import androidx.compose.ui.Modifier |
||||
import androidx.compose.ui.res.stringResource |
||||
import androidx.compose.ui.tooling.preview.Preview |
||||
import androidx.compose.ui.tooling.preview.PreviewParameter |
||||
import androidx.compose.ui.unit.dp |
||||
import androidx.compose.ui.unit.sp |
||||
import io.element.android.appnav.loggedin.LoggedInState |
||||
import io.element.android.appnav.loggedin.LoggedInStateProvider |
||||
import io.element.android.appnav.loggedin.LoggedInView |
||||
import io.element.android.libraries.designsystem.atomic.atoms.PlaceholderAtom |
||||
import io.element.android.libraries.designsystem.components.avatar.AvatarSize |
||||
import io.element.android.libraries.designsystem.components.button.BackButton |
||||
import io.element.android.libraries.designsystem.preview.ElementPreviewDark |
||||
import io.element.android.libraries.designsystem.preview.ElementPreviewLight |
||||
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator |
||||
import io.element.android.libraries.designsystem.theme.components.Scaffold |
||||
import io.element.android.libraries.designsystem.theme.components.Text |
||||
import io.element.android.libraries.designsystem.theme.components.TopAppBar |
||||
import io.element.android.libraries.designsystem.theme.placeholderBackground |
||||
import io.element.android.libraries.theme.ElementTheme |
||||
import io.element.android.libraries.ui.strings.CommonStrings |
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class) |
||||
@Composable |
||||
fun LoadingRoomNodeView( |
||||
state: LoadingRoomState, |
||||
onBackClicked: () -> Unit, |
||||
modifier: Modifier = Modifier, |
||||
) { |
||||
Scaffold( |
||||
modifier = modifier, |
||||
contentWindowInsets = WindowInsets.systemBars, |
||||
topBar = { |
||||
TopAppBar( |
||||
modifier = Modifier, |
||||
navigationIcon = { |
||||
BackButton(onClick = onBackClicked) |
||||
}, |
||||
title = { |
||||
Row( |
||||
verticalAlignment = Alignment.CenterVertically |
||||
) { |
||||
Box( |
||||
modifier = Modifier |
||||
.size(AvatarSize.TimelineRoom.dp) |
||||
.align(Alignment.CenterVertically) |
||||
.background(color = ElementTheme.colors.placeholderBackground, shape = CircleShape) |
||||
) |
||||
Spacer(modifier = Modifier.width(8.dp)) |
||||
PlaceholderAtom(width = 20.dp, height = 7.dp) |
||||
Spacer(modifier = Modifier.width(7.dp)) |
||||
PlaceholderAtom(width = 45.dp, height = 7.dp) |
||||
} |
||||
}, |
||||
) |
||||
}, |
||||
content = { padding -> |
||||
Box( |
||||
modifier = Modifier |
||||
.fillMaxSize() |
||||
.padding(padding) |
||||
.padding(16.dp), contentAlignment = Alignment.Center |
||||
) { |
||||
if (state is LoadingRoomState.Error) { |
||||
Text( |
||||
text = stringResource(id = CommonStrings.error_unknown), |
||||
color = ElementTheme.colors.textSecondary, |
||||
fontSize = 14.sp, |
||||
) |
||||
} else { |
||||
CircularProgressIndicator() |
||||
} |
||||
} |
||||
}, |
||||
) |
||||
} |
||||
|
||||
@Preview |
||||
@Composable |
||||
fun LoadingRoomNodeViewLightPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) = |
||||
ElementPreviewLight { ContentToPreview(state) } |
||||
|
||||
@Preview |
||||
@Composable |
||||
fun LoadingRoomNodeViewDarkPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) = |
||||
ElementPreviewDark { ContentToPreview(state) } |
||||
|
||||
@Composable |
||||
private fun ContentToPreview(state: LoadingRoomState) { |
||||
LoadingRoomNodeView( |
||||
state = state, |
||||
onBackClicked = {} |
||||
) |
||||
} |
||||
@ -0,0 +1,179 @@
@@ -0,0 +1,179 @@
|
||||
/* |
||||
* 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.appnav.room |
||||
|
||||
import android.os.Parcelable |
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.runtime.DisposableEffect |
||||
import androidx.compose.ui.Modifier |
||||
import androidx.lifecycle.lifecycleScope |
||||
import com.bumble.appyx.core.composable.Children |
||||
import com.bumble.appyx.core.lifecycle.subscribe |
||||
import com.bumble.appyx.core.modality.BuildContext |
||||
import com.bumble.appyx.core.node.Node |
||||
import com.bumble.appyx.core.plugin.Plugin |
||||
import com.bumble.appyx.core.plugin.plugins |
||||
import com.bumble.appyx.navmodel.backstack.BackStack |
||||
import com.bumble.appyx.navmodel.backstack.operation.push |
||||
import dagger.assisted.Assisted |
||||
import dagger.assisted.AssistedInject |
||||
import io.element.android.anvilannotations.ContributesNode |
||||
import io.element.android.appnav.NodeLifecycleCallback |
||||
import io.element.android.features.messages.api.MessagesEntryPoint |
||||
import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint |
||||
import io.element.android.libraries.architecture.BackstackNode |
||||
import io.element.android.libraries.architecture.NodeInputs |
||||
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler |
||||
import io.element.android.libraries.architecture.inputs |
||||
import io.element.android.libraries.di.SessionScope |
||||
import io.element.android.libraries.matrix.api.core.RoomId |
||||
import io.element.android.libraries.matrix.api.core.UserId |
||||
import io.element.android.libraries.matrix.api.room.MatrixRoom |
||||
import io.element.android.libraries.matrix.api.room.RoomMembershipObserver |
||||
import io.element.android.services.appnavstate.api.AppNavigationStateService |
||||
import kotlinx.coroutines.flow.filter |
||||
import kotlinx.coroutines.flow.launchIn |
||||
import kotlinx.coroutines.flow.onEach |
||||
import kotlinx.coroutines.launch |
||||
import kotlinx.parcelize.Parcelize |
||||
import timber.log.Timber |
||||
|
||||
@ContributesNode(SessionScope::class) |
||||
class RoomLoadedFlowNode @AssistedInject constructor( |
||||
@Assisted buildContext: BuildContext, |
||||
@Assisted plugins: List<Plugin>, |
||||
private val messagesEntryPoint: MessagesEntryPoint, |
||||
private val roomDetailsEntryPoint: RoomDetailsEntryPoint, |
||||
private val appNavigationStateService: AppNavigationStateService, |
||||
roomMembershipObserver: RoomMembershipObserver, |
||||
) : BackstackNode<RoomLoadedFlowNode.NavTarget>( |
||||
backstack = BackStack( |
||||
initialElement = plugins.filterIsInstance(Inputs::class.java).first().initialElement, |
||||
savedStateMap = buildContext.savedStateMap, |
||||
), |
||||
buildContext = buildContext, |
||||
plugins = plugins, |
||||
) { |
||||
|
||||
interface Callback : Plugin { |
||||
fun onForwardedToSingleRoom(roomId: RoomId) |
||||
} |
||||
|
||||
interface LifecycleCallback : NodeLifecycleCallback { |
||||
fun onFlowCreated(identifier: String, room: MatrixRoom) = Unit |
||||
fun onFlowReleased(identifier: String, room: MatrixRoom) = Unit |
||||
} |
||||
|
||||
data class Inputs( |
||||
val room: MatrixRoom, |
||||
val initialElement: NavTarget = NavTarget.Messages, |
||||
) : NodeInputs |
||||
|
||||
private val inputs: Inputs = inputs() |
||||
private val callbacks = plugins.filterIsInstance<Callback>() |
||||
|
||||
init { |
||||
lifecycle.subscribe( |
||||
onCreate = { |
||||
Timber.v("OnCreate") |
||||
plugins<LifecycleCallback>().forEach { it.onFlowCreated(id, inputs.room) } |
||||
appNavigationStateService.onNavigateToRoom(id, inputs.room.roomId) |
||||
fetchRoomMembers() |
||||
}, |
||||
onDestroy = { |
||||
Timber.v("OnDestroy") |
||||
plugins<LifecycleCallback>().forEach { it.onFlowReleased(id, inputs.room) } |
||||
appNavigationStateService.onLeavingRoom(id) |
||||
} |
||||
) |
||||
roomMembershipObserver.updates |
||||
.filter { update -> update.roomId == inputs.room.roomId && !update.isUserInRoom } |
||||
.onEach { |
||||
navigateUp() |
||||
} |
||||
.launchIn(lifecycleScope) |
||||
inputs<Inputs>() |
||||
} |
||||
|
||||
private fun fetchRoomMembers() = lifecycleScope.launch { |
||||
val room = inputs.room |
||||
room.updateMembers() |
||||
.onFailure { |
||||
Timber.e(it, "Fail to fetch members for room ${room.roomId}") |
||||
}.onSuccess { |
||||
Timber.v("Success fetching members for room ${room.roomId}") |
||||
} |
||||
} |
||||
|
||||
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node { |
||||
return when (navTarget) { |
||||
NavTarget.Messages -> { |
||||
val callback = object : MessagesEntryPoint.Callback { |
||||
override fun onRoomDetailsClicked() { |
||||
backstack.push(NavTarget.RoomDetails) |
||||
} |
||||
|
||||
override fun onUserDataClicked(userId: UserId) { |
||||
backstack.push(NavTarget.RoomMemberDetails(userId)) |
||||
} |
||||
|
||||
override fun onForwardedToSingleRoom(roomId: RoomId) { |
||||
callbacks.forEach { it.onForwardedToSingleRoom(roomId) } |
||||
} |
||||
} |
||||
messagesEntryPoint.createNode(this, buildContext, callback) |
||||
} |
||||
NavTarget.RoomDetails -> { |
||||
val inputs = RoomDetailsEntryPoint.Inputs(RoomDetailsEntryPoint.InitialTarget.RoomDetails) |
||||
roomDetailsEntryPoint.createNode(this, buildContext, inputs, emptyList()) |
||||
} |
||||
is NavTarget.RoomMemberDetails -> { |
||||
val inputs = RoomDetailsEntryPoint.Inputs(RoomDetailsEntryPoint.InitialTarget.RoomMemberDetails(navTarget.userId)) |
||||
roomDetailsEntryPoint.createNode(this, buildContext, inputs, emptyList()) |
||||
} |
||||
} |
||||
} |
||||
|
||||
sealed interface NavTarget : Parcelable { |
||||
@Parcelize |
||||
object Messages : NavTarget |
||||
|
||||
@Parcelize |
||||
object RoomDetails : NavTarget |
||||
|
||||
@Parcelize |
||||
data class RoomMemberDetails(val userId: UserId) : NavTarget |
||||
} |
||||
|
||||
@Composable |
||||
override fun View(modifier: Modifier) { |
||||
// Rely on the View Lifecycle instead of the Node Lifecycle, |
||||
// because this node enters 'onDestroy' before his children, so it can leads to |
||||
// using the room in a child node where it's already closed. |
||||
DisposableEffect(Unit) { |
||||
inputs.room.open() |
||||
onDispose { |
||||
inputs.room.close() |
||||
} |
||||
} |
||||
Children( |
||||
navModel = backstack, |
||||
modifier = modifier, |
||||
transitionHandler = rememberDefaultTransitionHandler(), |
||||
) |
||||
} |
||||
} |
||||
Loading…
Reference in new issue