Skip to content

Commit 917e60d

Browse files
committed
[Owl] Removes custom Scaffold
1 parent 10b6665 commit 917e60d

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

Owl/app/src/main/java/com/example/owl/ui/OwlApp.kt

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,14 @@ fun OwlApp(finishActivity: () -> Unit) {
5151
BlueTheme {
5252
val tabs = remember { CourseTabs.values() }
5353
val navController = rememberNavController()
54-
OwlScaffold(
54+
Scaffold(
55+
backgroundColor = MaterialTheme.colors.primarySurface,
5556
bottomBar = { OwlBottomBar(navController = navController, tabs) }
5657
) { innerPaddingModifier ->
5758
NavGraph(
5859
finishActivity = finishActivity,
5960
navController = navController,
60-
modifier = innerPaddingModifier
61+
modifier = Modifier.padding(innerPaddingModifier)
6162
)
6263
}
6364
}
@@ -99,17 +100,3 @@ fun OwlBottomBar(navController: NavController, tabs: Array<CourseTabs>) {
99100
}
100101
}
101102
}
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-
}

0 commit comments

Comments
 (0)