Move Student QuizDetails to Core (#2937)

[ignore-commit-lint]

Author: szabinst

Canvas.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -42447,6 +42447,9 @@
           }
         }
       }
+    },
+    "Are you sure you want to leave this quiz?" : {
+
     },
     "Are you sure you want to remove this file?" : {
       "localizations" : {
@@ -129344,6 +129347,9 @@
         }
       }
     },
+    "Exit" : {
+      "comment" : "Exit button to leave the quiz"
+    },
     "Expand" : {
       "localizations" : {
         "ar" : {
@@ -170726,6 +170732,9 @@
           }
         }
       }
+    },
+    "Instructions" : {
+
     },
     "Interactions on this page are limited by your institution." : {
       "localizations" : {
@@ -180081,6 +180090,9 @@
         }
       }
     },
+    "Leave" : {
+      "comment" : "Leave the quiz"
+    },
     "Leave Student View" : {
       "localizations" : {
         "ar" : {
@@ -251197,6 +251209,9 @@
           }
         }
       }
+    },
+    "Questions:" : {
+
     },
     "quiz" : {
       "localizations" : {
@@ -263491,6 +263506,9 @@
           }
         }
       }
+    },
+    "Resume Quiz" : {
+
     },
     "Retake" : {
       "localizations" : {
@@ -263747,6 +263765,9 @@
           }
         }
       }
+    },
+    "Retake Quiz" : {
+
     },
     "Retry" : {
       "localizations" : {
@@ -290104,6 +290125,9 @@
         }
       }
     },
+    "Stay" : {
+      "comment" : "Stay on the quiz view"
+    },
     "Stone" : {
       "comment" : "This is a name of a color."
     },
@@ -298144,6 +298168,9 @@
         }
       }
     },
+    "Submitted %@" : {
+      "comment" : "Submitted date"
+    },
     "Subscribe" : {
       "localizations" : {
         "ar" : {
@@ -304032,6 +304059,9 @@
           }
         }
       }
+    },
+    "Take Quiz" : {
+
     },
     "Tap here for details" : {
       "localizations" : {
@@ -350761,6 +350791,9 @@
           }
         }
       }
+    },
+    "View Results" : {
+
     },
     "Viewed" : {
       "localizations" : {

Core/Core/Localizable.xcstrings

@@ -18,9 +18,8 @@
 
 import Foundation
 import UIKit
-import Core
 
-class QuizDetailsViewController: ScreenViewTrackableViewController, ColoredNavViewProtocol, CoreWebViewLinkDelegate {
+public class StudentQuizDetailsViewController: ScreenViewTrackableViewController, ColoredNavViewProtocol, CoreWebViewLinkDelegate {
     @IBOutlet weak var attemptsLabel: UILabel!
     @IBOutlet weak var attemptsValueLabel: UILabel!
     @IBOutlet weak var dueHeadingLabel: UILabel!
@@ -41,10 +40,10 @@ class QuizDetailsViewController: ScreenViewTrackableViewController, ColoredNavVi
     @IBOutlet weak var timeLimitLabel: UILabel!
     @IBOutlet weak var timeLimitValueLabel: UILabel!
     @IBOutlet weak var titleLabel: UILabel!
-    let titleSubtitleView = TitleSubtitleView.create()
+    public let titleSubtitleView = TitleSubtitleView.create()
     var offlineModeInteractor: OfflineModeInteractor?
 
-    var color: UIColor?
+    public var color: UIColor?
     var courseID = ""
     let env = AppEnvironment.shared
     var quizID = ""
@@ -62,28 +61,28 @@ class QuizDetailsViewController: ScreenViewTrackableViewController, ColoredNavVi
         self?.update()
     }
 
-    static func create(
+    public static func create(
         courseID: String,
         quizID: String,
-        offlineModeInteractor: OfflineModeInteractor = OfflineModeAssembly.make()) -> QuizDetailsViewController {
+        offlineModeInteractor: OfflineModeInteractor = OfflineModeAssembly.make()) -> StudentQuizDetailsViewController {
         let controller = loadFromStoryboard()
         controller.courseID = courseID
         controller.quizID = quizID
         controller.offlineModeInteractor = offlineModeInteractor
         return controller
     }
 
-    override func viewDidLoad() {
+    public override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .backgroundLightest
-        setupTitleViewInNavbar(title: String(localized: "Quiz Details", bundle: .student))
+        setupTitleViewInNavbar(title: String(localized: "Quiz Details", bundle: .core))
 
-        attemptsLabel.text = String(localized: "Allowed Attempts:", bundle: .student)
-        dueHeadingLabel.text = String(localized: "Due", bundle: .student)
-        instructionsHeadingLabel.text = String(localized: "Instructions", bundle: .student)
-        questionsLabel.text = String(localized: "Questions:", bundle: .student)
-        settingsHeadingLabel.text = String(localized: "Settings", bundle: .student)
-        timeLimitLabel.text = String(localized: "Time Limit:", bundle: .student)
+        attemptsLabel.text = String(localized: "Allowed Attempts:", bundle: .core)
+        dueHeadingLabel.text = String(localized: "Due", bundle: .core)
+        instructionsHeadingLabel.text = String(localized: "Instructions", bundle: .core)
+        questionsLabel.text = String(localized: "Questions:", bundle: .core)
+        settingsHeadingLabel.text = String(localized: "Settings", bundle: .core)
+        timeLimitLabel.text = String(localized: "Time Limit:", bundle: .core)
 
         instructionsContainer.addSubview(instructionsWebView)
         instructionsWebView.pinWithThemeSwitchButton(inside: instructionsContainer)
@@ -109,7 +108,7 @@ class QuizDetailsViewController: ScreenViewTrackableViewController, ColoredNavVi
         quizzes.refresh(force: true)
     }
 
-    override func viewWillAppear(_ animated: Bool) {
+    public override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         navigationController?.navigationBar.useContextColor(color)
     }
@@ -139,29 +138,29 @@ class QuizDetailsViewController: ScreenViewTrackableViewController, ColoredNavVi
             statusIconView.tintColor = .textSuccess
             statusLabel.textColor = .textSuccess
             statusLabel.text = String.localizedStringWithFormat(
-                String(localized: "Submitted %@", bundle: .student, comment: "Submitted date"),
+                String(localized: "Submitted %@", bundle: .core, comment: "Submitted date"),
                 finishedAt.dateTimeString
             )
         } else if submission?.attempt ?? 0 > 1 {
             statusIconView.image = .completeSolid
             statusIconView.tintColor = .textSuccess
             statusLabel.textColor = .textSuccess
-            statusLabel.text = String(localized: "Submitted", bundle: .student)
+            statusLabel.text = String(localized: "Submitted", bundle: .core)
         } else {
             statusIconView.image = .noSolid
             statusIconView.tintColor = .textDark
             statusLabel.textColor = .textDark
-            statusLabel.text = String(localized: "Not Submitted", bundle: .student)
+            statusLabel.text = String(localized: "Not Submitted", bundle: .core)
         }
         dueLabel.text = quiz?.dueText
         attemptsValueLabel.text = quiz?.allowedAttemptsText
         questionsValueLabel.text = quiz?.questionCountText
         timeLimitValueLabel.text = quiz?.timeLimitText
         instructionsHeadingLabel.text = quiz?.lockedForUser == true
-            ? String(localized: "Locked", bundle: .student)
-            : String(localized: "Instructions", bundle: .student)
+            ? String(localized: "Locked", bundle: .core)
+            : String(localized: "Instructions", bundle: .core)
         var html = quiz?.lockExplanation ?? quiz?.details ?? ""
-        if html.isEmpty { html = String(localized: "No Content", bundle: .student) }
+        if html.isEmpty { html = String(localized: "No Content", bundle: .core) }
 
         let offlinePath = URL.Paths.Offline.courseSectionResourceFolderURL(
             sessionId: env.currentSession?.uniqueID ?? "",
@@ -192,24 +191,24 @@ class QuizDetailsViewController: ScreenViewTrackableViewController, ColoredNavVi
         guard let quiz = quizzes.first, !quizzes.pending else { return nil }
         if quiz.canTake {
             guard let submission = quiz.submission else {
-                return String(localized: "Take Quiz", bundle: .student)
+                return String(localized: "Take Quiz", bundle: .core)
             }
             if submission.canResume {
-                return String(localized: "Resume Quiz", bundle: .student)
+                return String(localized: "Resume Quiz", bundle: .core)
             }
             return submission.finishedAt != nil || submission.attempt > 1
-                ? String(localized: "Retake Quiz", bundle: .student)
-                : String(localized: "Take Quiz", bundle: .student)
+                ? String(localized: "Retake Quiz", bundle: .core)
+                : String(localized: "Take Quiz", bundle: .core)
         } else if quiz.resultsURL != nil {
-            return String(localized: "View Results", bundle: .student)
+            return String(localized: "View Results", bundle: .core)
         }
         return nil
     }
 
     @IBAction func take() {
         guard let quiz = quizzes.first else { return }
         if quiz.canTake {
-            env.router.show(QuizWebViewController.create(
+            env.router.show(StudentQuizWebViewController.create(
                 courseID: courseID,
                 quizID: quizID
             ), from: self, options: .modal(.fullScreen, isDismissable: false, embedInNav: true))

Student/Student/Quizzes/QuizDetails/QuizDetailsViewController.storyboard renamed to Core/Core/Quizzes/QuizDetails/Student/StudentQuizDetailsViewController.storyboard

@@ -18,35 +18,34 @@
 
 import UIKit
 import WebKit
-import Core
 
-class QuizWebViewController: UIViewController {
+public class StudentQuizWebViewController: UIViewController {
     var courseID = ""
     var quizID = ""
 
     let env = AppEnvironment.shared
     let webView = CoreWebView(features: [.invertColorsInDarkMode, .skipJSInjection(CoreWebView.mathJaxJS)])
 
-    static func create(courseID: String, quizID: String) -> QuizWebViewController {
-        let controller = QuizWebViewController()
+    public static func create(courseID: String, quizID: String) -> StudentQuizWebViewController {
+        let controller = StudentQuizWebViewController()
         controller.courseID = courseID
         controller.quizID = quizID
         return controller
     }
 
-    override func loadView() {
+    public override func loadView() {
         view = webView
     }
 
-    override func viewDidLoad() {
+    public override func viewDidLoad() {
         super.viewDidLoad()
 
         webView.linkDelegate = self
         webView.uiDelegate = self
 
-        title = String(localized: "Take Quiz", bundle: .student)
+        title = String(localized: "Take Quiz", bundle: .core)
         navigationItem.rightBarButtonItem = UIBarButtonItem(
-            title: String(localized: "Exit", bundle: .student, comment: "Exit button to leave the quiz"),
+            title: String(localized: "Exit", bundle: .core, comment: "Exit button to leave the quiz"),
             style: .plain, target: self, action: #selector(exitQuiz)
         )
 
@@ -64,9 +63,9 @@ class QuizWebViewController: UIViewController {
 
     @objc func exitQuiz() {
         if webView.url?.path.contains("/take") == true {
-            let areYouSure = String(localized: "Are you sure you want to leave this quiz?", bundle: .student)
-            let stay = String(localized: "Stay", bundle: .student, comment: "Stay on the quiz view")
-            let leave = String(localized: "Leave", bundle: .student, comment: "Leave the quiz")
+            let areYouSure = String(localized: "Are you sure you want to leave this quiz?", bundle: .core)
+            let stay = String(localized: "Stay", bundle: .core, comment: "Stay on the quiz view")
+            let leave = String(localized: "Leave", bundle: .core, comment: "Leave the quiz")
 
             let alert = UIAlertController(title: nil, message: areYouSure, preferredStyle: .alert)
             alert.addAction(AlertAction(stay, style: .cancel))
@@ -88,20 +87,20 @@ class QuizWebViewController: UIViewController {
     }
 }
 
-extension QuizWebViewController: WKUIDelegate {
-    func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
+extension StudentQuizWebViewController: WKUIDelegate {
+    public func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
         let alert = UIAlertController(title: nil, message: message, preferredStyle: .alert)
-        alert.addAction(AlertAction(String(localized: "Cancel", bundle: .student), style: .cancel) { _ in
+        alert.addAction(AlertAction(String(localized: "Cancel", bundle: .core), style: .cancel) { _ in
             completionHandler(false)
         })
-        alert.addAction(AlertAction(String(localized: "OK", bundle: .student), style: .default) { _ in
+        alert.addAction(AlertAction(String(localized: "OK", bundle: .core), style: .default) { _ in
             completionHandler(true)
         })
         env.router.show(alert, from: self, options: .modal())
     }
 }
 
-extension QuizWebViewController: CoreWebViewLinkDelegate {
+extension StudentQuizWebViewController: CoreWebViewLinkDelegate {
     public func handleLink(_ url: URL) -> Bool {
         if let take = env.currentSession?.baseURL
             .appendingPathComponent("courses/\(courseID)/quizzes/\(quizID)/take"),