Skip to content

Commit e884169

Browse files
Remove broken animatedContent
1 parent f4aefd4 commit e884169

1 file changed

Lines changed: 23 additions & 33 deletions

File tree

features/navigation-suite/src/main/kotlin/ss/navigation/suite/HomeNavigationUi.kt

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,10 @@
2424
package ss.navigation.suite
2525

2626
import androidx.activity.compose.LocalActivity
27-
import androidx.compose.animation.AnimatedContent
2827
import androidx.compose.animation.AnimatedVisibility
2928
import androidx.compose.animation.core.tween
3029
import androidx.compose.animation.fadeIn
31-
import androidx.compose.animation.fadeOut
3230
import androidx.compose.animation.slideInVertically
33-
import androidx.compose.animation.togetherWith
3431
import androidx.compose.foundation.layout.Box
3532
import androidx.compose.foundation.layout.PaddingValues
3633
import androidx.compose.foundation.layout.fillMaxSize
@@ -132,48 +129,41 @@ private fun NavigationSuite(
132129
)
133130
}
134131

135-
val currentBackStack = rememberTabBackStack(
132+
val backStack = rememberTabBackStack(
136133
items = state.items,
137134
selectedScreen = state.selectedItem,
138-
rootScreenProvider = { it.screen() }
139-
)
140-
val circuitNavigator = rememberCircuitNavigator(currentBackStack)
141-
val navigator = rememberInterceptingNavigator(
142-
navigator = circuitNavigator,
143-
interceptors = interceptors,
135+
rootScreenProvider = { it.screen() },
144136
)
145137

146138
val content: @Composable (PaddingValues) -> Unit = {
147-
AnimatedContent(
148-
targetState = currentBackStack,
149-
transitionSpec = {
150-
fadeIn(animationSpec = tween(300)).togetherWith(fadeOut(animationSpec = tween(300)))
151-
},
152-
label = "content",
153-
) { backStack ->
154-
CompositionLocalProvider(
155-
LocalNavbarController provides controller,
156-
LocalScrollToTop provides scrollToTopSignal,
157-
) {
158-
NavigableCircuitContent(
159-
navigator = navigator,
160-
backStack = backStack,
161-
modifier = Modifier.fillMaxSize(),
162-
decoratorFactory =
163-
remember(navigator) {
164-
GestureNavigationDecorationFactory(onBackInvoked = navigator::pop)
165-
},
166-
)
167-
}
139+
val circuitNavigator = rememberCircuitNavigator(backStack)
140+
val navigator = rememberInterceptingNavigator(
141+
navigator = circuitNavigator,
142+
interceptors = interceptors,
143+
)
144+
val decoratorFactory = remember(navigator) {
145+
GestureNavigationDecorationFactory(onBackInvoked = navigator::pop)
146+
}
147+
148+
CompositionLocalProvider(
149+
LocalNavbarController provides controller,
150+
LocalScrollToTop provides scrollToTopSignal,
151+
) {
152+
NavigableCircuitContent(
153+
navigator = navigator,
154+
backStack = backStack,
155+
modifier = Modifier.fillMaxSize(),
156+
decoratorFactory = decoratorFactory,
157+
)
168158
}
169159
}
170160

171161
fun handleSelection(isSelected: Boolean, model: NavbarItem) {
172162
if (isSelected) {
173-
if (currentBackStack.size > 1) {
163+
if (backStack.size > 1) {
174164
// Reset backstack to the home screen i.e
175165
// clear every screen in this stack
176-
currentBackStack.popUntil { it.screen == state.selectedItem }
166+
backStack.popUntil { it.screen == state.selectedItem }
177167
} else {
178168
// Signal a scroll-to-top on current screen
179169
scrollToTopSignal.tryEmit(Unit)

0 commit comments

Comments
 (0)