Improve code (#843)

* Improve PDFReaderViewController code * Improve PDFReaderViewController code * Fix AnnotationToolOptionsViewController memory leak Improve AnnotationToolOptionsViewController code
zotero · Feb 9, 2024 · e9afa97 · e9afa97
1 parent 3ccb1ff
commit e9afa97
Show file tree

Hide file tree

Showing 2 changed files with 366 additions and 365 deletions.
diff --git a/Zotero/Scenes/Detail/PDF/Views/AnnotationToolOptionsViewController.swift b/Zotero/Scenes/Detail/PDF/Views/AnnotationToolOptionsViewController.swift
@@ -51,8 +51,8 @@ class AnnotationToolOptionsViewController: UIViewController {
 
         viewModel.stateObservable
             .observe(on: MainScheduler.instance)
-            .subscribe(with: self, onNext: { _, state in
-                update(state: state)
+            .subscribe(onNext: { [weak self] state in
+                self?.update(state: state)
             })
             .disposed(by: disposeBag)
 
@@ -148,13 +148,6 @@ class AnnotationToolOptionsViewController: UIViewController {
                 .disposed(by: disposeBag)
             navigationItem.rightBarButtonItem = doneButton
         }
-
-        func update(state: AnnotationToolOptionsState) {
-            valueChanged(state.colorHex, state.size)
-            if state.changes.contains(.color) {
-                presentingViewController?.dismiss(animated: true)
-            }
-        }
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -167,4 +160,11 @@ class AnnotationToolOptionsViewController: UIViewController {
             preferredContentSize = CGSize(width: Self.width, height: size.height)
         }
     }
+
+    private func update(state: AnnotationToolOptionsState) {
+        valueChanged(state.colorHex, state.size)
+        if state.changes.contains(.color) {
+            presentingViewController?.dismiss(animated: true)
+        }
+    }
 }