Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 9 Projects Releases Packages Wiki Activity Actions

Merge pull request #58 from vector-im/feature/bma/investigation

Browse source 
Add animation between screens
This commit is contained in:
Benoit Marty 2023-01-25 11:49:01 +01:00 • committed by GitHub
commit 7662eb114a
12 changed files with 89 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt
View file

@ -25,9 +25,10 @@ import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.node.ParentNode
import com.bumble.appyx.navmodel.backstack.BackStack
import com.bumble.appyx.navmodel.backstack.operation.push
import io.element.android.libraries.architecture.createNode
import io.element.android.features.login.changeserver.ChangeServerNode
import io.element.android.features.login.root.LoginRootNode
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
import io.element.android.libraries.architecture.createNode
import kotlinx.parcelize.Parcelize
class LoginFlowNode(
@ -64,6 +65,11 @@ class LoginFlowNode(
@Composable
override fun View(modifier: Modifier) {
Children(navModel = backstack)
Children(
navModel = backstack,
modifier = modifier,
// Animate transition to change server screen
transitionHandler = rememberDefaultTransitionHandler(),
)
}
}

3
features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt
View file

@ -33,7 +33,7 @@ import io.element.android.libraries.di.AppScope
class ChangeServerNode @AssistedInject constructor(
@Assisted buildContext: BuildContext,
@Assisted plugins: List<Plugin>,
private val presenter: ChangeServerPresenter,
presenter: ChangeServerPresenter,
) : Node(buildContext, plugins = plugins) {
private val presenterConnector = presenterConnector(presenter)
@ -47,6 +47,7 @@ class ChangeServerNode @AssistedInject constructor(
val state by presenterConnector.stateFlow.collectAsState()
ChangeServerView(
state = state,
modifier = modifier,
onChangeServerSuccess = this::onSuccess,
)
}

3
features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt
View file

@ -36,7 +36,7 @@ import io.element.android.libraries.di.AppScope
class LoginRootNode @AssistedInject constructor(
@Assisted buildContext: BuildContext,
@Assisted plugins: List<Plugin>,
private val presenter: LoginRootPresenter,
presenter: LoginRootPresenter,
) : Node(buildContext, plugins = plugins) {
private val presenterConnector = presenterConnector(presenter)
@ -60,6 +60,7 @@ class LoginRootNode @AssistedInject constructor(
}
LoginRootScreen(
state = state,
modifier = modifier,
onChangeServer = this::onChangeHomeServer,
)
}

9
features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt
View file

@ -24,8 +24,9 @@ import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.node.ParentNode
import com.bumble.appyx.navmodel.backstack.BackStack
import io.element.android.libraries.architecture.createNode
import io.element.android.features.preferences.root.PreferencesRootNode
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
import io.element.android.libraries.architecture.createNode
import kotlinx.parcelize.Parcelize
class PreferencesFlowNode(
@ -59,6 +60,10 @@ class PreferencesFlowNode(
@Composable
override fun View(modifier: Modifier) {
Children(navModel = backstack)
Children(
navModel = backstack,
modifier = modifier,
transitionHandler = rememberDefaultTransitionHandler()
)
}
}

3
features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt
View file

@ -34,7 +34,7 @@ import io.element.android.libraries.di.SessionScope
class PreferencesRootNode @AssistedInject constructor(
@Assisted buildContext: BuildContext,
@Assisted plugins: List<Plugin>,
private val presenter: PreferencesRootPresenter,
presenter: PreferencesRootPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
@ -52,6 +52,7 @@ class PreferencesRootNode @AssistedInject constructor(
val state by presenterConnector.stateFlow.collectAsState()
PreferencesRootView(
state = state,
modifier = modifier,
onBackPressed = this::navigateUp,
onOpenRageShake = this::onOpenBugReport
)

1
features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt
View file

@ -58,6 +58,7 @@ class RoomListNode @AssistedInject constructor(
val state by connector.stateFlow.collectAsState()
RoomListView(
state = state,
modifier = modifier,
onRoomClicked = this::onRoomClicked,
onOpenSettings = this::onOpenSettings
)