File tree 1 file changed +3
-16
lines changed
Owl/app/src/main/java/com/example/owl/ui 1 file changed +3
-16
lines changed Original file line number Diff line number Diff line change @@ -51,13 +51,14 @@ fun OwlApp(finishActivity: () -> Unit) {
51
51
BlueTheme {
52
52
val tabs = remember { CourseTabs .values() }
53
53
val navController = rememberNavController()
54
- OwlScaffold (
54
+ Scaffold (
55
+ backgroundColor = MaterialTheme .colors.primarySurface,
55
56
bottomBar = { OwlBottomBar (navController = navController, tabs) }
56
57
) { innerPaddingModifier ->
57
58
NavGraph (
58
59
finishActivity = finishActivity,
59
60
navController = navController,
60
- modifier = innerPaddingModifier
61
+ modifier = Modifier .padding( innerPaddingModifier)
61
62
)
62
63
}
63
64
}
@@ -99,17 +100,3 @@ fun OwlBottomBar(navController: NavController, tabs: Array<CourseTabs>) {
99
100
}
100
101
}
101
102
}
102
-
103
- @Composable
104
- fun OwlScaffold (
105
- bottomBar : @Composable () -> Unit ,
106
- content : @Composable (Modifier ) -> Unit
107
- ) {
108
- Scaffold (
109
- backgroundColor = MaterialTheme .colors.primarySurface,
110
- bottomBar = bottomBar
111
- ) { innerPadding ->
112
- val modifier = Modifier .padding(innerPadding)
113
- content(modifier)
114
- }
115
- }
You can’t perform that action at this time.
0 commit comments