@@ -20,14 +20,17 @@ class AssignmentPagesViewController: UIViewController {
2020 return pageControl
2121 } ( )
2222 private let pageControlView = UIView ( )
23- private let pageController = UIPageViewController ( transitionStyle: . scroll,
24- navigationOrientation: . horizontal,
25- options: nil )
23+ private let pageController = UIPageViewController ( transitionStyle: . scroll, navigationOrientation: . horizontal, options: nil )
2624
2725 // Even when the current Assignment changes, the popup controller
2826 // instance will be the same but the popup URL will change
2927 private let webController = WebViewController ( allowsOptions: false )
30- private lazy var popupController = WebViewNavigationController ( rootViewController: webController)
28+ private let editorController = RichTextEditorViewController ( )
29+ private lazy var containerController
30+ = SegmentedContainerViewController ( segments: [ ( " Web " , webController) , ( " Editor " , editorController) ] )
31+
32+ private lazy var popupController = WebViewNavigationController ( rootViewController: containerController)
33+
3134 private let submitPopupBarController = SubmitPopupBarViewController ( )
3235
3336 private var pendingIndex : Int ?
@@ -47,10 +50,6 @@ class AssignmentPagesViewController: UIViewController {
4750 setPage ( assignment: assignments [ start] , index: start)
4851 }
4952
50- override func loadView( ) {
51- view = UIView ( )
52- }
53-
5453 required init ? ( coder aDecoder: NSCoder ) {
5554 fatalError ( " init(coder:) has not been implemented " )
5655 }
@@ -76,9 +75,16 @@ class AssignmentPagesViewController: UIViewController {
7675 webController. dismissAction = { [ weak self] in
7776 self ? . tabBarController? . closePopup ( animated: true , completion: nil )
7877 }
78+ editorController. dismissAction = { [ weak self] in
79+ self ? . tabBarController? . closePopup ( animated: true , completion: nil )
80+ }
81+
82+ editorController. delegate = webController
83+ editorController. needsTitleField = false
7984
8085 tabBarController? . popupInteractionStyle = . default
8186 tabBarController? . popupBar. backgroundStyle = . regular
87+ tabBarController? . popupContentView. popupCloseButtonStyle = . none
8288 tabBarController? . popupBar. customBarViewController = submitPopupBarController
8389
8490 submitPopupBarController. titleLabel. text = " DRAG TO SUBMIT "
@@ -103,14 +109,13 @@ class AssignmentPagesViewController: UIViewController {
103109 guard let tabBarController = tabBarController as? TabsController else {
104110 return
105111 }
106- tabBarController . popupController = nil
107- // If a new tab is selected, the UITabBarController will handle
108- // presentation and dismissal of the popup bar
109- if tabBarController . isMovingToNewTabFromPages {
110- tabBarController. isMovingToNewTabFromPages = false
112+
113+ let isNavigationPushing = navigationController ? . viewControllers . last != self
114+
115+ if isMovingFromParentViewController || isNavigationPushing {
116+ tabBarController. dismissPopupBar ( animated : true , completion : nil )
111117 return
112118 }
113- tabBarController. dismissPopupBar ( animated: true , completion: nil )
114119 }
115120
116121 override func viewDidAppear( _ animated: Bool ) {
@@ -121,18 +126,23 @@ class AssignmentPagesViewController: UIViewController {
121126 guard let tabBarController = tabBarController as? TabsController else {
122127 return
123128 }
124- tabBarController. popupController = popupController
125129
126- tabBarController. presentPopupBar ( withContentViewController: popupController,
127- animated: true ,
128- completion: nil )
129- // When popping back to PagesController, LNPopupController
130- // encounters a bug where it is entirely removed from the view
131- // hierarchy and causes a black space to appear in its place.
132- // Adding the views back to the tabBarController manually fixes
133- // the bug.
134- tabBarController. view. addSubview ( tabBarController. popupBar)
135- tabBarController. view. addSubview ( tabBarController. popupContentView)
130+ if tabBarController. popupPresentationState == . hidden ||
131+ tabBarController. popupPresentationState == . closed {
132+
133+ tabBarController. presentPopupBar ( withContentViewController: popupController,
134+ animated: true ,
135+ completion: nil )
136+
137+ // When popping back to PagesController, LNPopupController
138+ // encounters a bug where it is entirely removed from the view
139+ // hierarchy and causes a black space to appear in its place.
140+ // Adding the views back to the tabBarController manually fixes
141+ // the bug.
142+ tabBarController. view. addSubview ( tabBarController. popupBar)
143+ tabBarController. view. addSubview ( tabBarController. popupContentView)
144+ tabBarController. popupContentView. popupCloseButtonStyle = . none
145+ }
136146 }
137147}
138148
@@ -143,7 +153,6 @@ extension AssignmentPagesViewController: UIPageViewControllerDataSource, UIPageV
143153 guard let viewControllerIndex = pages. index ( of: viewController) else {
144154 return nil
145155 }
146- setPopupURL ( viewControllerIndex: viewControllerIndex)
147156
148157 let previousIndex = viewControllerIndex - 1
149158 guard previousIndex >= 0 else {
@@ -162,7 +171,6 @@ extension AssignmentPagesViewController: UIPageViewControllerDataSource, UIPageV
162171 guard let viewControllerIndex = pages. index ( of: viewController) else {
163172 return nil
164173 }
165- setPopupURL ( viewControllerIndex: viewControllerIndex)
166174
167175 let nextIndex = viewControllerIndex + 1
168176 let assignmentsCount = assignments. count
@@ -190,6 +198,7 @@ extension AssignmentPagesViewController: UIPageViewControllerDataSource, UIPageV
190198 if completed, let index = pendingIndex {
191199 pageControl. currentPage = index
192200 delegate? . pageController ( self , didMoveToIndex: index)
201+ setPopupURL ( viewControllerIndex: index)
193202 }
194203 }
195204
@@ -208,6 +217,9 @@ extension AssignmentPagesViewController: UIPageViewControllerDataSource, UIPageV
208217 webController. title = assignment. title
209218 webController. setURL ( url: url)
210219 webController. setNeedsLoad ( to: true )
220+ let instructions = PageView . getInstructionsString ( attributedText: assignment. attributedInstructions)
221+ editorController. attributedContext = instructions
222+ editorController. html = " "
211223 }
212224}
213225
0 commit comments