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

Messages: refine a bit toolbar

Browse source
This commit is contained in:
ganfra 2022-11-08 11:08:02 +01:00
parent 754d266325
commit bdb2a1295c
2 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/io/element/android/x/Navigation.kt
View file

@ -18,8 +18,8 @@ import io.element.android.x.matrix.core.RoomId
fun LoginScreenNavigation(navigator: DestinationsNavigator) {
LoginScreen(
onLoginWithSuccess = {
navigator.navigate(RoomListScreenNavigationDestination){
popUpTo(LoginScreenNavigationDestination){
navigator.navigate(RoomListScreenNavigationDestination) {
popUpTo(LoginScreenNavigationDestination) {
inclusive = true
}
}
@ -36,8 +36,8 @@ fun RoomListScreenNavigation(navigator: DestinationsNavigator) {
navigator.navigate(MessagesScreenNavigationDestination(roomId = roomId.value))
},
onSuccessLogout = {
navigator.navigate(LoginScreenNavigationDestination){
popUpTo(RoomListScreenNavigationDestination){
navigator.navigate(LoginScreenNavigationDestination) {
popUpTo(RoomListScreenNavigationDestination) {
inclusive = true
}
}
@ -46,8 +46,8 @@ fun RoomListScreenNavigation(navigator: DestinationsNavigator) {
@Destination
@Composable
fun MessagesScreenNavigation(roomId: String) {
MessagesScreen(roomId)
fun MessagesScreenNavigation(roomId: String, navigator: DestinationsNavigator) {
MessagesScreen(roomId, navigator::navigateUp)
}