Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Transition Demo #328

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions samples/android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<activity android:name=".basicNavigation.BasicNavigationActivity"/>
<activity android:name=".tabNavigation.TabNavigationActivity"/>
<activity android:name=".nestedNavigation.NestedNavigationActivity"/>
<activity android:name=".transition.TransitionActivity"/>
<activity android:name=".parcelableScreen.ParcelableActivity"/>
<activity android:name=".screenModel.ScreenModelActivity"/>
<activity android:name=".androidViewModel.AndroidViewModelActivity"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import cafe.adriel.voyager.sample.rxJavaIntegration.RxJavaIntegrationActivity
import cafe.adriel.voyager.sample.screenModel.ScreenModelActivity
import cafe.adriel.voyager.sample.stateStack.StateStackActivity
import cafe.adriel.voyager.sample.tabNavigation.TabNavigationActivity
import cafe.adriel.voyager.sample.transition.TransitionActivity

class SampleActivity : ComponentActivity() {

Expand All @@ -58,6 +59,7 @@ class SampleActivity : ComponentActivity() {
StartSampleButton<TabNavigationActivity>("Tab Navigation")
StartSampleButton<BottomSheetNavigationActivity>("BottomSheet Navigation")
StartSampleButton<NestedNavigationActivity>("Nested Navigation")
StartSampleButton<TransitionActivity>("Transition")
StartSampleButton<AndroidViewModelActivity>("Android ViewModel")
StartSampleButton<ScreenModelActivity>("ScreenModel")
StartSampleButton<KoinIntegrationActivity>("Koin Integration")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,49 +26,53 @@ class TabNavigationActivity : ComponentActivity() {
super.onCreate(savedInstanceState)

setContent {
Content()
}
}

@Composable
fun Content() {
TabNavigator(
HomeTab,
tabDisposable = {
TabDisposable(
navigator = it,
tabs = listOf(HomeTab, FavoritesTab, ProfileTab)
)
TabNavigationContent {
CurrentTab()
}
) { tabNavigator ->
Scaffold(
topBar = {
TopAppBar(
title = { Text(text = tabNavigator.current.options.title) }
)
},
content = {
CurrentTab()
},
bottomBar = {
BottomNavigation {
TabNavigationItem(HomeTab)
TabNavigationItem(FavoritesTab)
TabNavigationItem(ProfileTab)
}
}
)
}
}
}

@Composable
private fun RowScope.TabNavigationItem(tab: Tab) {
val tabNavigator = LocalTabNavigator.current
@Composable
private fun RowScope.TabNavigationItem(tab: Tab) {
val tabNavigator = LocalTabNavigator.current

BottomNavigationItem(
selected = tabNavigator.current.key == tab.key,
onClick = { tabNavigator.current = tab },
icon = { Icon(painter = tab.options.icon!!, contentDescription = tab.options.title) }
BottomNavigationItem(
selected = tabNavigator.current.key == tab.key,
onClick = { tabNavigator.current = tab },
icon = { Icon(painter = tab.options.icon!!, contentDescription = tab.options.title) }
)
}

@Composable
fun TabNavigationContent(
scaffoldContent: @Composable (TabNavigator) -> Unit
) {
TabNavigator(
tab = HomeTab,
tabDisposable = {
TabDisposable(
navigator = it,
tabs = listOf(HomeTab, FavoritesTab, ProfileTab)
)
}
) { tabNavigator ->
Scaffold(
topBar = {
TopAppBar(
title = { Text(text = tabNavigator.current.options.title) }
)
},
content = {
scaffoldContent(tabNavigator)
},
bottomBar = {
BottomNavigation {
TabNavigationItem(HomeTab)
TabNavigationItem(FavoritesTab)
TabNavigationItem(ProfileTab)
}
}
)
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package cafe.adriel.voyager.sample.tabNavigation.tabs

import android.util.Log
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
Expand All @@ -19,7 +18,6 @@ import cafe.adriel.voyager.navigator.tab.Tab
import cafe.adriel.voyager.sample.basicNavigation.BasicNavigationScreen
import cafe.adriel.voyager.transitions.SlideTransition

@OptIn(ExperimentalAnimationApi::class)
@Composable
fun Tab.TabContent() {
val tabTitle = options.title
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package cafe.adriel.voyager.sample.transition

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.sp
import cafe.adriel.voyager.core.screen.Screen
import cafe.adriel.voyager.core.screen.uniqueScreenKey

data object FadeScreen : Screen {
override val key = uniqueScreenKey

@Composable
override fun Content() {
Box(modifier = Modifier.fillMaxSize()) {
Text(
text = "Fade Screen",
modifier = Modifier.align(alignment = Alignment.Center),
color = Color.Red,
fontSize = 30.sp
)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package cafe.adriel.voyager.sample.transition

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.sp
import cafe.adriel.voyager.core.screen.Screen
import cafe.adriel.voyager.core.screen.uniqueScreenKey

data object ScaleScreen : Screen {
override val key = uniqueScreenKey

@Composable
override fun Content() {
Box(modifier = Modifier.fillMaxSize()) {
Text(
text = "Scale Screen",
modifier = Modifier.align(alignment = Alignment.Center),
color = Color.Red,
fontSize = 30.sp
)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package cafe.adriel.voyager.sample.transition

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.sp
import cafe.adriel.voyager.core.screen.Screen
import cafe.adriel.voyager.core.screen.uniqueScreenKey

data object ShrinkScreen : Screen {
override val key = uniqueScreenKey

@Composable
override fun Content() {
Box(modifier = Modifier.fillMaxSize()) {
Text(
text = "Shrink Screen",
modifier = Modifier.align(alignment = Alignment.Center),
color = Color.Red,
fontSize = 30.sp
)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package cafe.adriel.voyager.sample.transition

import androidx.compose.runtime.Composable
import cafe.adriel.voyager.core.screen.Screen
import cafe.adriel.voyager.core.screen.uniqueScreenKey
import cafe.adriel.voyager.sample.tabNavigation.TabNavigationContent

data object TabNavigationScreen : Screen {
override val key = uniqueScreenKey

@Composable
override fun Content() {
TabNavigationContent {
TransitionTab(it.navigator)
}
}
}
Loading