#74 homescreen now contains a feed
This commit is contained in:
parent
190c3467ec
commit
4728755c5e
1 changed files with 8 additions and 4 deletions
|
@ -25,6 +25,7 @@ fun HomeRoute(
|
||||||
HomeScreen(
|
HomeScreen(
|
||||||
onStartSessionClick = { viewModel.onStartSessionClick(open) },
|
onStartSessionClick = { viewModel.onStartSessionClick(open) },
|
||||||
drawerActions = drawerActions,
|
drawerActions = drawerActions,
|
||||||
|
open = open,
|
||||||
navigationBarActions = navigationBarActions,
|
navigationBarActions = navigationBarActions,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -32,6 +33,7 @@ fun HomeRoute(
|
||||||
@Composable
|
@Composable
|
||||||
fun HomeScreen(
|
fun HomeScreen(
|
||||||
onStartSessionClick: () -> Unit,
|
onStartSessionClick: () -> Unit,
|
||||||
|
open: (String) -> Unit,
|
||||||
drawerActions: DrawerActions,
|
drawerActions: DrawerActions,
|
||||||
navigationBarActions: NavigationBarActions
|
navigationBarActions: NavigationBarActions
|
||||||
) {
|
) {
|
||||||
|
@ -41,9 +43,10 @@ fun HomeScreen(
|
||||||
navigationBarActions = navigationBarActions,
|
navigationBarActions = navigationBarActions,
|
||||||
// TODO barAction = { FriendsAction() }
|
// TODO barAction = { FriendsAction() }
|
||||||
) {
|
) {
|
||||||
BasicButton(R.string.start_session, Modifier.basicButton()) {
|
Feed(open)
|
||||||
onStartSessionClick()
|
// BasicButton(R.string.start_session, Modifier.basicButton()) {
|
||||||
}
|
// onStartSessionClick()
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,6 +66,7 @@ fun HomeScreenPreview() {
|
||||||
HomeScreen(
|
HomeScreen(
|
||||||
onStartSessionClick = {},
|
onStartSessionClick = {},
|
||||||
drawerActions = DrawerActions({}, {}, {}, {}, {}),
|
drawerActions = DrawerActions({}, {}, {}, {}, {}),
|
||||||
navigationBarActions = NavigationBarActions({ false }, {}, {}, {}, {}, {}, {}, {})
|
navigationBarActions = NavigationBarActions({ false }, {}, {}, {}, {}, {}, {}, {}),
|
||||||
|
open = {}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue