【fix】【APP内反馈】夜间模式未兼容

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Tools/UserFeekback/KMImageNameUserFbFileSizeTipIcon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "alert 1.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "alert.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Tools/UserFeekback/KMImageNameUserFbFileSizeTipIcon.imageset/alert 1.pdf

@@ -0,0 +1,63 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Filter /FlateDecode
+     /Length 3 0 R
+  >>
+stream
+x
]“ËnÔ@D÷þ
+¯‘èÜ÷cH¬�O°‚@J"¡H|?ÕÃÐ6ñªçø>ªª=Ÿÿ<¿~þ°ü¶=œ¿Ž×í×ƃnÏNÿï×i½ãaÑ)¹ËPÚ�ç
e–<;ëd
+å´¿/£Û›€y(“[îÏHÃQ›µ3NnÜ
„^<{�´rõ“Ðy²Ø8Y•žìr¸�_d
8Ѐ̕2¦
+3W�4š«9S,@Ú:iöÙЮ–€@'¶ph°F!Ö.º;RCœqÀ	
¹Š ¿›D~­‹a\æy‹AŒ¢µQШJ�$hsŸ.ŸnÉ’+®œ:ñèoØËç­8~@Ê]Ÿ"¶¬f\•\t+�Ì“¸6HZÔÁj'Gí6H5P3m‘pç”q
q`²çC£¡S$(
ÄÌÐâå~’9« #‹A&3*LR«˜k®©qhDÔ3!DÜl§®©¡=Üô¦~†‹�·O„A–÷9ü—’­rˆ¾¥ÃŽÿÂÉl^á£H­¼
,šŸÐbÓ,òÇ$jÈiXô¹ï[d:*ïiw±¬
+� ÑÔ\W²ö]ã0½Ü¬/Ê×¾E¦ëïﶗíËöÚÏÕk
+endstream
+endobj
+
+3 0 obj
+  474
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 14.000000 14.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000592 00000 n
+0000000614 00000 n
+0000000787 00000 n
+0000000861 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+920
+%%EOF

PDF Office/PDF Master/Class/Tools/UserFeekback/Controller/KMUserFbHelpPopController.swift

@@ -13,20 +13,41 @@ class KMUserFbHelpPopController: NSViewController {
     @IBOutlet weak var point2: NSView!
     @IBOutlet weak var tipLabel2: NSTextField!
     
+    var isDrak: Bool = false {
+        didSet {
+
+        }
+    }
+    
     var formatSting: String = ""
     
     convenience init() {
         self.init(nibName: "KMUserFbHelpPopController", bundle: nil)
     }
     
-    override func viewDidLoad() {
-        super.viewDidLoad()
+    override func viewWillAppear() {
+        super.viewWillAppear()
         
         for pointV in [self.point1, self.point2] {
             pointV?.wantsLayer = true
             pointV?.layer?.cornerRadius = 1.5
-            pointV?.layer?.backgroundColor = .black
+            if self.isDrak {
+                pointV?.layer?.backgroundColor = NSColor(red: 110/255.0, green: 109/255.0, blue: 112/255.0, alpha: 1).cgColor
+            } else {
+                pointV?.layer?.backgroundColor = .black
+            }
+            
         }
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+//        for pointV in [self.point1, self.point2] {
+//            pointV?.wantsLayer = true
+//            pointV?.layer?.cornerRadius = 1.5
+//            pointV?.layer?.backgroundColor = .black
+//        }
         
         self.tipLabel1.stringValue = NSLocalizedString("限制文件大小20M，最高上传10份文件", comment: "")
         // 不限制文件格式（图片+PDF+Office（Excel/Word/Powerpoint）+TXT+HTML+MP4…）

PDF Office/PDF Master/Class/Tools/UserFeekback/Tools/KMUserFeekbackHanddler.swift

@@ -19,6 +19,10 @@ class KMUserFeekbackHanddler: NSObject {
         let vc = KMHomePopViewController(nibName: "KMHomePopViewController", bundle: nil)
         _ = vc.initWithPopViewDataArr(datas)
         
+        vc.background = KMAppearance.Layout.bgColor()
+        vc.textColor = KMAppearance.Layout.h0Color()
+        vc.enterFillColor = KMAppearance.Interactive.s0Color()
+        
         vc.downCallback = { [weak self] result, data in
             self?.popover_?.close()
             

PDF Office/PDF Master/Class/Tools/UserFeekback/View/KMUserFbDespItemView.swift

@@ -39,6 +39,7 @@ class KMUserFbDespItemView: NSView, NibLoadable {
         self.textView.enclosingScrollView?.layer?.cornerRadius = 5
         self.textView.enclosingScrollView?.layer?.masksToBounds = true
         self.textView.isRichText = false
+        self.textView.backgroundColor = .clear
         
         self.tipLabel.stringValue = NSLocalizedString("请填写详情", comment: "")
         self.tipLabel.textColor = NSColor.km_init(hex: "#FA1E5D")

PDF Office/PDF Master/Class/Tools/UserFeekback/View/KMUserListItemView.swift

@@ -63,7 +63,7 @@ class KMUserListItemView: NSView, NibLoadable {
         
         self.tipBox.borderWidth = 0
         self.tipBox.cornerRadius = 0
-        self.tipBox.fillColor = NSColor.km_init(hex: "#FEE4EC")
+//        self.tipBox.fillColor = NSColor.km_init(hex: "#FEE4EC")
         self.tipIv.image = NSImage(named: "KMImageNameUserFbFileSizeTipIcon")
         self.tipBox.isHidden = true
     }

PDF Office/PDF Master/Class/Tools/UserFeekback/Window/KMUserFeekbackWindowController.swift

@@ -39,6 +39,8 @@ import Cocoa
     
     deinit {
         Swift.debugPrint("KMUserFeekbackWindowController deinit.")
+        
+        DistributedNotificationCenter.default().removeObserver(self)
     }
     
     override func windowDidLoad() {
@@ -48,6 +50,9 @@ import Cocoa
         self._initSubViews()
         
         self.typeItemView_?.comBoBox.selectItem(at: 0)
+        
+        self.updateViewColor()
+        DistributedNotificationCenter.default().addObserver(self, selector: #selector(themeChanged), name: NSApplication.interfaceThemeChangedNotification, object: nil)
     }
     
     private func _initDefaultValue() {
@@ -58,7 +63,6 @@ import Cocoa
             btn.isHidden = true
         }
         self.window?.title = NSLocalizedString("Feedback for PDF Reader Pro", comment: "")
-        self.window?.backgroundColor = NSColor.white
         
         self.emailBox.borderWidth = 0
         self.typeBox.borderWidth = 0
@@ -171,6 +175,30 @@ import Cocoa
         self.typeItemView_?.comBoBox.stringValue = self.typeString
     }
     
+    func updateViewColor() {
+        if KMAppearance.isDarkMode() {
+            self.window?.backgroundColor = NSColor(red: 40/255.0, green: 40/255.0, blue: 40/255.0, alpha: 1)
+            self.emailItemView_?.box.fillColor = NSColor(red: 110/255.0, green: 109/255.0, blue: 112/255.0, alpha: 1)
+            self.typeItemView_?.comBoBox.backgroundColor = NSColor(red: 110/255.0, green: 109/255.0, blue: 112/255.0, alpha: 1)
+            self.despItemView_?.box.fillColor = NSColor(red: 110/255.0, green: 109/255.0, blue: 112/255.0, alpha: 1)
+            self.listItemView_?.tipBox.fillColor = NSColor(red: 231/255.0, green: 56/255.0, blue: 91/255.0, alpha: 1)
+        } else {
+            self.window?.backgroundColor = .white
+            self.emailItemView_?.box.fillColor = .white
+            self.typeItemView_?.comBoBox.backgroundColor = .white
+            self.despItemView_?.box.fillColor = .white
+            self.listItemView_?.tipBox.fillColor = NSColor.km_init(hex: "#FEE4EC")
+        }
+    }
+    
+    // MARK: - Noti Methods
+    
+    @objc func themeChanged(_ notification: Notification) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+            self.updateViewColor()
+        }
+    }
+    
     // MARK: - Private Methods
     
     @objc private func _cancelButtonAction() {
@@ -290,6 +318,8 @@ import Cocoa
         popover.setValue(true, forKey: "shouldHideAnchor")
         self.popover_ = popover
         
+        vc.isDrak = KMAppearance.isDarkMode()
+        
         popover.show(relativeTo: sender.bounds, of: sender, preferredEdge: .maxX)
     }