wbrawner/PeopleInSpace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

start using navigation compose animation

Browse source
This commit is contained in:
John O'Reilly 2021-08-07 11:28:06 +01:00
parent 210a6b6e00
commit 9b8bb2f330
3 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -71,7 +71,7 @@ dependencies {
implementation(material)
implementation(navigation)
implementation(coilCompose)
implementation(accompanistPlaceholder)
implementation(accompanistNavigationAnimation)
}
with(Deps.Koin) {

36
app/src/main/java/com/surrus/peopleinspace/ui/MainActivity.kt
View file

@ -3,6 +3,8 @@ package com.surrus.peopleinspace.ui
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.animation.*
import androidx.compose.animation.core.tween
import androidx.compose.material.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.LocationOn
@ -12,10 +14,10 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import com.google.accompanist.navigation.animation.composable
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.google.accompanist.navigation.animation.AnimatedNavHost
import com.google.accompanist.navigation.animation.rememberAnimatedNavController
import com.surrus.common.remote.Assignment
import com.surrus.peopleinspace.BuildConfig
import org.osmdroid.config.Configuration
@ -59,9 +61,10 @@ val bottomNavigationItems = listOf(
)
)
@OptIn(ExperimentalAnimationApi::class)
@Composable
fun MainLayout() {
val navController = rememberNavController()
val navController = rememberAnimatedNavController()
PeopleInSpaceTheme {
Scaffold(
@ -90,8 +93,18 @@ fun MainLayout() {
}
}
) { paddingValues ->
NavHost(navController, startDestination = Screen.PersonList.title) {
composable(Screen.PersonList.title) {
AnimatedNavHost(navController, startDestination = Screen.PersonList.title) {
composable(
route = Screen.PersonList.title,
exitTransition = { _, _ ->
slideOutHorizontally() +
fadeOut(animationSpec = tween(1000))
},
popEnterTransition = { _, _ ->
slideInHorizontally()
}
) {
PersonListScreen(
paddingValues = paddingValues,
personSelected = {
@ -99,7 +112,16 @@ fun MainLayout() {
}
)
}
composable(Screen.PersonDetails.title + "/{person}") { backStackEntry ->
composable(
route = Screen.PersonDetails.title + "/{person}",
enterTransition = { _, _ ->
slideInHorizontally() +
fadeIn(animationSpec = tween(1000))
},
popExitTransition = { _, _ ->
slideOutHorizontally()
}
) { backStackEntry ->
PersonDetailsScreen(
backStackEntry.arguments?.get("person") as String,
popBack = { navController.popBackStack() }

2
buildSrc/src/main/java/Dependencies.kt
View file

@ -96,7 +96,7 @@ object Deps {
const val wearMaterial = "androidx.wear.compose:compose-material:${Versions.wearCompose}"
const val coilCompose = "io.coil-kt:coil-compose:1.3.1"
const val accompanistPlaceholder = "com.google.accompanist:accompanist-placeholder:${Versions.accompanist}"
const val accompanistNavigationAnimation = "com.google.accompanist:accompanist-navigation-animation:${Versions.accompanist}"
}
object Koin {