marinofaggiana 5 년 전
부모
커밋
a5ca52e78e
2개의 변경된 파일17개의 추가작업 그리고 5개의 파일을 삭제
  1. 14 4
      iOSClient/RichWorkspace/NCRichWorkspace.swift
  2. 3 1
      iOSClient/RichWorkspace/NCViewerRichWorkspace.swift

+ 14 - 4
iOSClient/RichWorkspace/NCRichWorkspace.swift

@@ -30,25 +30,34 @@ import MarkdownKit
     @objc @IBOutlet weak var textView: UITextView!
     @objc @IBOutlet weak var textViewTopConstraint: NSLayoutConstraint!
 
-    let markdownParser = MarkdownParser(font: UIFont.systemFont(ofSize: 15))
-    var richWorkspaceText: String = ""
+    var markdownParser = MarkdownParser()
+    var richWorkspaceText: String?
     let gradientLayer: CAGradientLayer = CAGradientLayer()
 
     required init?(coder: NSCoder) {
         super.init(coder: coder)
         
-        markdownParser.header.font = UIFont.systemFont(ofSize: 25)
+        NotificationCenter.default.addObserver(self, selector: #selector(self.changeTheming), name: NSNotification.Name(rawValue: "changeTheming"), object: nil)
+        changeTheming()
     }
 
+    @objc func changeTheming() {
+        markdownParser = MarkdownParser(font: UIFont.systemFont(ofSize: 15), color: NCBrandColor.sharedInstance.textView)
+        markdownParser.header.font = UIFont.systemFont(ofSize: 25)
+        if let richWorkspaceText = richWorkspaceText {
+            textView.attributedText = markdownParser.parse(richWorkspaceText)
+        }
+    }
+    
     @objc func load(richWorkspaceText: String) {
         
         if richWorkspaceText != self.richWorkspaceText {
             textView.attributedText = markdownParser.parse(richWorkspaceText)
             self.richWorkspaceText = richWorkspaceText
         }
-        setGradient()
     }
     
+    /*
     @objc func setGradient() {
         
         gradientLayer.removeFromSuperlayer()
@@ -62,4 +71,5 @@ import MarkdownKit
         gradientLayer.endPoint = CGPoint(x: 0, y: 1)
         textView.layer.addSublayer(gradientLayer)
     }
+    */
 }

+ 3 - 1
iOSClient/RichWorkspace/NCViewerRichWorkspace.swift

@@ -31,7 +31,7 @@ import MarkdownKit
     
     private let appDelegate = UIApplication.shared.delegate as! AppDelegate
     private let richWorkspaceCommon = NCRichWorkspaceCommon()
-    private let markdownParser = MarkdownParser(font: UIFont.systemFont(ofSize: 15))
+    private var markdownParser = MarkdownParser()
     @objc public var richWorkspaceText: String = ""
     @objc public var serverUrl: String = ""
    
@@ -76,6 +76,8 @@ import MarkdownKit
     
     @objc func changeTheming() {
         appDelegate.changeTheming(self, tableView: nil, collectionView: nil, form: false)
+        markdownParser = MarkdownParser(font: UIFont.systemFont(ofSize: 15), color: NCBrandColor.sharedInstance.textView)
+        markdownParser.header.font = UIFont.systemFont(ofSize: 25)
         textView.attributedText = markdownParser.parse(richWorkspaceText)
     }