Skip to content

Commit fc69c00

Browse files
vargaatvargaat
committed
Add better name to views
refs: MBL-18708 affects: Teacher release note: none test plan: - Test if attempt switching works correctly.
1 parent e578adc commit fc69c00

File tree

11 files changed

+54
-54
lines changed

11 files changed

+54
-54
lines changed

‎Teacher/Teacher.xcodeproj/project.pbxproj

+28-28
Large diffs are not rendered by default.

‎Teacher/Teacher/SpeedGrader/CommentLibrary/View/CommentLibrarySheet.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct CommentLibrarySheet: View {
3232
CommentLibraryList(viewModel: viewModel, comment: $comment) {
3333
presentationMode.wrappedValue.dismiss()
3434
}
35-
CommentEditor(
35+
CommentEditorView(
3636
text: $comment,
3737
shouldShowCommentLibrary: false,
3838
showCommentLibrary: .constant(false),

‎Teacher/Teacher/SpeedGrader/Comments/View/CommentEditor.swift renamed to ‎Teacher/Teacher/SpeedGrader/Comments/View/CommentEditorView.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import SwiftUI
2020
import Core
2121

22-
struct CommentEditor: View {
22+
struct CommentEditorView: View {
2323
@Environment(\.viewController) var controller
2424

2525
@Binding var text: String
@@ -77,7 +77,7 @@ struct CommentEditor: View {
7777
struct CommentEditor_Previews: PreviewProvider {
7878
static var previews: some View {
7979
@State var showCommentLibrary = false
80-
CommentEditor(text: .constant("Sample Text"),
80+
CommentEditorView(text: .constant("Sample Text"),
8181
shouldShowCommentLibrary: true,
8282
showCommentLibrary: $showCommentLibrary,
8383
action: {},

‎Teacher/Teacher/SpeedGrader/Comments/View/SubmissionCommentList.swift renamed to ‎Teacher/Teacher/SpeedGrader/Comments/View/SubmissionCommentListView.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import SwiftUI
2020
import Core
2121
import Combine
2222

23-
struct SubmissionCommentList: View {
23+
struct SubmissionCommentListView: View {
2424
let assignment: Assignment
2525
let submission: Submission
2626
let filePicker = FilePicker(env: .shared)
@@ -40,7 +40,7 @@ struct SubmissionCommentList: View {
4040
@State var showMediaOptions = false
4141
@State var showCommentLibrary = false
4242

43-
@AccessibilityFocusState private var focusedTab: SubmissionGrader.GraderTab?
43+
@AccessibilityFocusState private var focusedTab: SubmissionGraderView.GraderTab?
4444

4545
init(
4646
assignment: Assignment,
@@ -51,7 +51,7 @@ struct SubmissionCommentList: View {
5151
showRecorder: Binding<MediaCommentType?>,
5252
enteredComment: Binding<String>,
5353
commentLibrary: SubmissionCommentLibraryViewModel,
54-
focusedTab: AccessibilityFocusState<SubmissionGrader.GraderTab?>
54+
focusedTab: AccessibilityFocusState<SubmissionGraderView.GraderTab?>
5555
) {
5656
self.assignment = assignment
5757
self.submission = submission
@@ -159,7 +159,7 @@ struct SubmissionCommentList: View {
159159
.cancel()
160160
])
161161
}
162-
CommentEditor(
162+
CommentEditorView(
163163
text: $comment,
164164
shouldShowCommentLibrary: commentLibrary.shouldShow,
165165
showCommentLibrary: $showCommentLibrary,

‎Teacher/Teacher/SpeedGrader/Grading/Points/View/SubmissionGrades.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ struct SubmissionGrades: View {
126126
}
127127

128128
private func commentEditor() -> some View {
129-
CommentEditor(
129+
CommentEditorView(
130130
text: $rubricsViewModel.criterionComment,
131131
shouldShowCommentLibrary: false,
132132
showCommentLibrary: .constant(false),

‎Teacher/Teacher/SpeedGrader/MainLayout/View/Drawer.swift renamed to ‎Teacher/Teacher/SpeedGrader/MainLayout/View/DrawerContainer.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ enum DrawerState {
2525
}
2626

2727
// Place after the main content in a ZStack(alignment: .bottom)
28-
struct Drawer<Content: View>: View {
28+
struct DrawerContainer<Content: View>: View {
2929
let content: Content
3030
let minHeight: CGFloat
3131
let maxHeight: CGFloat

‎Teacher/Teacher/SpeedGrader/MainLayout/View/SimilarityScore.swift renamed to ‎Teacher/Teacher/SpeedGrader/MainLayout/View/SimilarityScoreView.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import SwiftUI
2020
import Core
2121

22-
struct SimilarityScore: View {
22+
struct SimilarityScoreView: View {
2323
let status: String
2424
let score: Double
2525
let url: URL?

‎Teacher/Teacher/SpeedGrader/MainLayout/View/SubmissionGrader.swift renamed to ‎Teacher/Teacher/SpeedGrader/MainLayout/View/SubmissionGraderView.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Core
2020
import SwiftUI
2121
import Combine
2222

23-
struct SubmissionGrader: View {
23+
struct SubmissionGraderView: View {
2424
private enum Layout {
2525
case portrait
2626
case landscape // only on iPads no matter the iPhone screen size
@@ -106,7 +106,7 @@ struct SubmissionGrader: View {
106106
bottomInset: CGFloat
107107
) -> some View {
108108
VStack(spacing: 0) {
109-
SubmissionHeader(assignment: viewModel.assignment, submission: viewModel.submission)
109+
SubmissionHeaderView(assignment: viewModel.assignment, submission: viewModel.submission)
110110
.accessibility(sortPriority: 2)
111111
Divider()
112112
HStack(spacing: 0) {
@@ -115,7 +115,7 @@ struct SubmissionGrader: View {
115115
Divider()
116116
ZStack(alignment: .top) {
117117
VStack(spacing: 0) {
118-
SimilarityScore(viewModel.selectedAttempt, file: viewModel.file)
118+
SimilarityScoreView(viewModel.selectedAttempt, file: viewModel.file)
119119
SubmissionViewer(
120120
assignment: viewModel.assignment,
121121
submission: viewModel.selectedAttempt,
@@ -151,14 +151,14 @@ struct SubmissionGrader: View {
151151
) -> some View {
152152
ZStack(alignment: .bottom) {
153153
VStack(alignment: .leading, spacing: 0) {
154-
SubmissionHeader(assignment: viewModel.assignment, submission: viewModel.submission)
154+
SubmissionHeaderView(assignment: viewModel.assignment, submission: viewModel.submission)
155155
attemptToggle
156156
.accessibility(hidden: drawerState == .max)
157157
Divider()
158158
let isSubmissionContentHiddenFromA11y = (drawerState != .min || showAttempts)
159159
ZStack(alignment: .top) {
160160
VStack(spacing: 0) {
161-
SimilarityScore(viewModel.selectedAttempt, file: viewModel.file)
161+
SimilarityScoreView(viewModel.selectedAttempt, file: viewModel.file)
162162
SubmissionViewer(
163163
assignment: viewModel.assignment,
164164
submission: viewModel.selectedAttempt,
@@ -173,7 +173,7 @@ struct SubmissionGrader: View {
173173
}
174174
Spacer().frame(height: drawerState == .min ? minHeight : (minHeight + maxHeight) / 2)
175175
}
176-
Drawer(state: $drawerState, minHeight: minHeight, maxHeight: maxHeight) {
176+
DrawerContainer(state: $drawerState, minHeight: minHeight, maxHeight: maxHeight) {
177177
tools(bottomInset: bottomInset, isDrawer: true)
178178
}
179179
}
@@ -257,7 +257,7 @@ struct SubmissionGrader: View {
257257
if drawerState == .min {
258258
snapDrawerTo(.mid)
259259
}
260-
let newTab = SubmissionGrader.GraderTab(rawValue: newValue ?? 0)!
260+
let newTab = SubmissionGraderView.GraderTab(rawValue: newValue ?? 0)!
261261
withAnimation(.default) {
262262
tab = newTab
263263
}
@@ -339,7 +339,7 @@ struct SubmissionGrader: View {
339339
)
340340
let isCommentsOnScreen = isGraderTabOnScreen(.comments, isDrawer: isDrawer)
341341
VStack(spacing: 0) {
342-
SubmissionCommentList(
342+
SubmissionCommentListView(
343343
assignment: viewModel.assignment,
344344
submission: viewModel.submission,
345345
attempts: viewModel.attempts,

‎Teacher/Teacher/SpeedGrader/MainLayout/View/SubmissionHeader.swift renamed to ‎Teacher/Teacher/SpeedGrader/MainLayout/View/SubmissionHeaderView.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import SwiftUI
2020
import Core
2121

22-
struct SubmissionHeader: View {
22+
struct SubmissionHeaderView: View {
2323
let assignment: Assignment
2424
let submission: Submission
2525

‎Teacher/Teacher/SpeedGrader/StudentPager/View/SpeedGraderViewController.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import UIKit
2222
import Core
2323

2424
class SpeedGraderViewController: ScreenViewTrackableViewController, PagesViewControllerDataSource {
25-
typealias Page = CoreHostingController<SubmissionGrader>
25+
typealias Page = CoreHostingController<SubmissionGraderView>
2626

2727
var env: AppEnvironment = .defaultValue
2828

@@ -167,14 +167,14 @@ class SpeedGraderViewController: ScreenViewTrackableViewController, PagesViewCon
167167
return controller
168168
}
169169

170-
func grader(for index: Int) -> SubmissionGrader? {
170+
func grader(for index: Int) -> SubmissionGraderView? {
171171
guard
172172
case .data(let assignment, let submissions, _) = interactor.state.value,
173173
index >= 0,
174174
index < submissions.count
175175
else { return nil }
176176

177-
return SubmissionGrader(
177+
return SubmissionGraderView(
178178
env: env,
179179
userIndexInSubmissionList: index,
180180
viewModel: SubmissionGraderViewModel(

‎Teacher/TeacherTests/SpeedGrader/MainLayout/View/SubmissionHeaderTests.swift renamed to ‎Teacher/TeacherTests/SpeedGrader/MainLayout/View/SubmissionHeaderViewTests.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class SubmissionHeaderTests: TeacherTestCase {
2525
func testGroupSubmissionCheck() {
2626
let submission = Submission(context: databaseClient)
2727
let assignment = Assignment(context: databaseClient)
28-
let testee = SubmissionHeader(assignment: assignment, submission: submission)
28+
let testee = SubmissionHeaderView(assignment: assignment, submission: submission)
2929

3030
assignment.gradedIndividually = false
3131
submission.groupID = "TestGroupID"
@@ -36,7 +36,7 @@ class SubmissionHeaderTests: TeacherTestCase {
3636
func testGroupName() {
3737
let submission = Submission(context: databaseClient)
3838
let assignment = Assignment(context: databaseClient)
39-
let testee = SubmissionHeader(assignment: assignment, submission: submission)
39+
let testee = SubmissionHeaderView(assignment: assignment, submission: submission)
4040

4141
assignment.gradedIndividually = false
4242
submission.groupName = "TestGroup Name"
@@ -49,7 +49,7 @@ class SubmissionHeaderTests: TeacherTestCase {
4949
func testRouteToGroupSubmitter() {
5050
let submission = Submission(context: databaseClient)
5151
let assignment = Assignment(context: databaseClient)
52-
let testee = SubmissionHeader(assignment: assignment, submission: submission)
52+
let testee = SubmissionHeaderView(assignment: assignment, submission: submission)
5353

5454
assignment.gradedIndividually = false
5555
assignment.courseID = "testCourseID"
@@ -61,7 +61,7 @@ class SubmissionHeaderTests: TeacherTestCase {
6161
func testRouteToIndividialInGroupSubmission() {
6262
let submission = Submission(context: databaseClient)
6363
let assignment = Assignment(context: databaseClient)
64-
let testee = SubmissionHeader(assignment: assignment, submission: submission)
64+
let testee = SubmissionHeaderView(assignment: assignment, submission: submission)
6565

6666
assignment.gradedIndividually = true
6767
assignment.courseID = "testCourseID"

0 commit comments

Comments
 (0)