From 9b515a95ffea225b85127f654286f157758abe7c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 25 Jan 2023 11:14:50 +0100 Subject: [PATCH] Rename function (code review) --- .../main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt | 4 ++-- .../kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt | 4 ++-- app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt | 4 ++-- .../kotlin/io/element/android/features/login/LoginFlowNode.kt | 4 ++-- .../android/features/preferences/PreferencesFlowNode.kt | 4 ++-- .../libraries/architecture/animation/ScreenTransition.kt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index cb7bed5d84..b2e2aca077 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -34,7 +34,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.preferences.PreferencesFlowNode import io.element.android.features.roomlist.RoomListNode -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner @@ -129,7 +129,7 @@ class LoggedInFlowNode( navModel = backstack, modifier = modifier, // Animate navigation to settings and to a room - transitionHandler = getDefaultTransitionHandler(), + transitionHandler = rememberDefaultTransitionHandler(), ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt index 774a075db2..b9e38d1063 100644 --- a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt @@ -29,7 +29,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.login.LoginFlowNode import io.element.android.features.onboarding.OnBoardingScreen -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import kotlinx.parcelize.Parcelize import timber.log.Timber @@ -76,7 +76,7 @@ class NotLoggedInFlowNode( navModel = backstack, modifier = modifier, // Animate navigation to login screen - transitionHandler = getDefaultTransitionHandler(), + transitionHandler = rememberDefaultTransitionHandler(), ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index ccb63965f1..d82ac55e7f 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -37,7 +37,7 @@ import com.bumble.appyx.navmodel.backstack.operation.newRoot import com.bumble.appyx.navmodel.backstack.operation.pop import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.rageshake.bugreport.BugReportNode -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.DaggerComponentOwner @@ -114,7 +114,7 @@ class RootFlowNode( Children( navModel = backstack, // Animate opening the bug report screen - transitionHandler = getDefaultTransitionHandler(), + transitionHandler = rememberDefaultTransitionHandler(), ) } } diff --git a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt index 8d5bab90d3..641435642d 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.login.changeserver.ChangeServerNode import io.element.android.features.login.root.LoginRootNode -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.createNode import kotlinx.parcelize.Parcelize @@ -69,7 +69,7 @@ class LoginFlowNode( navModel = backstack, modifier = modifier, // Animate transition to change server screen - transitionHandler = getDefaultTransitionHandler(), + transitionHandler = rememberDefaultTransitionHandler(), ) } } diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt index c87bb0e0d0..5407072398 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt @@ -25,7 +25,7 @@ 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.features.preferences.root.PreferencesRootNode -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.createNode import kotlinx.parcelize.Parcelize @@ -63,7 +63,7 @@ class PreferencesFlowNode( Children( navModel = backstack, modifier = modifier, - transitionHandler = getDefaultTransitionHandler() + transitionHandler = rememberDefaultTransitionHandler() ) } } diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt index c777ebed02..faac896b85 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt @@ -24,7 +24,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.transitionhandler.rememberBackstackSlider @Composable -fun getDefaultTransitionHandler(): ModifierTransitionHandler { +fun rememberDefaultTransitionHandler(): ModifierTransitionHandler { return rememberBackstackSlider( transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) }, )