Skip to content

Commit e1684a3

Browse files
committed
Fix build error from conflict
1 parent 9d5e8fd commit e1684a3

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

Teacher/Teacher/SpeedGrader/SpeedGraderScreen/View/SpeedGraderScreen.swift

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,18 @@ struct SpeedGraderScreen: View, ScreenViewTrackable {
8686
title: viewModel.navigationTitle,
8787
subtitle: viewModel.navigationSubtitle
8888
)
89-
.frame(width: proxy.size.width, height: proxy.size.height)
90-
}
91-
// There's an attributed graph cycle (caused by UINavigationBar.useContextColor) that prevents
92-
// the screen from moving from loading to data state. Adding this ID will treat the view as
93-
// completely new when the state changes and allowing the view to re-render.
94-
.id(viewModel.state)
95-
.navigationBarTitleView(
96-
title: viewModel.navigationTitle,
97-
subtitle: viewModel.navigationSubtitle
98-
)
99-
.navBarItems(trailing: navBarTrailingItems)
100-
.navigationBarStyle(.color(viewModel.navigationBarColor))
101-
.onFirstAppear {
102-
setupStatusBarStyleUpdates()
103-
// When speedgrader is opened from a discussion
104-
// the router automatically adds a done button
105-
controller.value.navigationItem.leadingItemGroups = []
89+
// There's an attributed graph cycle (caused by UINavigationBar.useContextColor) that prevents
90+
// the screen from moving from loading to data state. Adding this ID will treat the view as
91+
// completely new when the state changes and allowing the view to re-render.
92+
.id(viewModel.state)
93+
.navBarItems(trailing: navBarTrailingItems)
94+
.navigationBarStyle(.color(viewModel.navigationBarColor))
95+
.onFirstAppear {
96+
setupStatusBarStyleUpdates()
97+
// When speedgrader is opened from a discussion
98+
// the router automatically adds a done button
99+
controller.value.navigationItem.leadingItemGroups = []
100+
}
106101
}
107102
}
108103

0 commit comments

Comments
 (0)