instructure · vargaat · Apr 17, 2025 · Mar 27, 2025 · Mar 28, 2025 · Mar 28, 2025
@@ -32,7 +32,7 @@ struct CommentLibrarySheet: View {
                 CommentLibraryList(viewModel: viewModel, comment: $comment) {
                     presentationMode.wrappedValue.dismiss()
                 }
-                CommentEditor(
+                CommentEditorView(
                     text: $comment,
                     shouldShowCommentLibrary: false,
                     showCommentLibrary: .constant(false),

@@ -19,7 +19,7 @@
 import SwiftUI
 import Core
 
-struct CommentEditor: View {
+struct CommentEditorView: View {
     @Environment(\.viewController) var controller
 
     @Binding var text: String
@@ -77,7 +77,7 @@ struct CommentEditor: View {
 struct CommentEditor_Previews: PreviewProvider {
     static var previews: some View {
         @State var showCommentLibrary = false
-        CommentEditor(text: .constant("Sample Text"),
+        CommentEditorView(text: .constant("Sample Text"),
                       shouldShowCommentLibrary: true,
                       showCommentLibrary: $showCommentLibrary,
                       action: {},

@@ -24,7 +24,7 @@ struct SubmissionCommentListCell: View {
     let submission: Submission
     let comment: SubmissionComment
 
-    @Binding var attempt: Int?
+    @Binding var attempt: Int
     @Binding var fileID: String?
 
     @Environment(\.appEnvironment.currentSession?.userID) var currentUserID

@@ -20,38 +20,38 @@ import SwiftUI
 import Core
 import Combine
 
-struct SubmissionCommentList: View {
+struct SubmissionCommentListView: View {
     let assignment: Assignment
     let submission: Submission
     let filePicker = FilePicker(env: .shared)
-    @Binding var attempt: Int?
+    @Binding var attempt: Int
     @Binding var fileID: String?
     @Binding var showRecorder: MediaCommentType?
     @Binding var comment: String
 
     @Environment(\.appEnvironment) var env
     @Environment(\.viewController) var controller
 
-    @ObservedObject var attempts: Store<LocalUseCase<Submission>>
+    var attempts: [Submission]
     @ObservedObject var commentLibrary: SubmissionCommentLibraryViewModel
 
     @StateObject private var viewModel: SubmissionCommentListViewModel
     @State var error: Text?
     @State var showMediaOptions = false
     @State var showCommentLibrary = false
 
-    @AccessibilityFocusState private var focusedTab: SubmissionGrader.GraderTab?
+    @AccessibilityFocusState private var focusedTab: SubmissionGraderView.GraderTab?
 
     init(
         assignment: Assignment,
         submission: Submission,
-        attempts: Store<LocalUseCase<Submission>>,
-        attempt: Binding<Int?>,
+        attempts: [Submission],
+        attempt: Binding<Int>,
         fileID: Binding<String?>,
         showRecorder: Binding<MediaCommentType?>,
         enteredComment: Binding<String>,
         commentLibrary: SubmissionCommentLibraryViewModel,
-        focusedTab: AccessibilityFocusState<SubmissionGrader.GraderTab?>
+        focusedTab: AccessibilityFocusState<SubmissionGraderView.GraderTab?>
     ) {
         self.assignment = assignment
         self.submission = submission
@@ -159,7 +159,7 @@ struct SubmissionCommentList: View {
                         .cancel()
                     ])
                 }
-            CommentEditor(
+            CommentEditorView(
                 text: $comment,
                 shouldShowCommentLibrary: commentLibrary.shouldShow,
                 showCommentLibrary: $showCommentLibrary,

@@ -126,7 +126,7 @@ struct SubmissionGrades: View {
     }
 
     private func commentEditor() -> some View {
-        CommentEditor(
+        CommentEditorView(
             text: $rubricsViewModel.criterionComment,
             shouldShowCommentLibrary: false,
             showCommentLibrary: .constant(false),

@@ -25,7 +25,7 @@ enum DrawerState {
 }
 
 // Place after the main content in a ZStack(alignment: .bottom)
-struct Drawer<Content: View>: View {
+struct DrawerContainer<Content: View>: View {
     let content: Content
     let minHeight: CGFloat
     let maxHeight: CGFloat

@@ -19,7 +19,7 @@
 import SwiftUI
 import Core
 
-struct SimilarityScore: View {
+struct SimilarityScoreView: View {
     let status: String
     let score: Double
     let url: URL?