【2025】【综合】PDF界面暗黑模式优化

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_highlight_Cover.imageset/Contents.json

@@ -3,16 +3,6 @@
     {
       "filename" : "highlight.pdf",
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "highlight 1.pdf",
-      "idiom" : "universal"
     }
   ],
   "info" : {

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_highlight_Cover_Dark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "highlight 2.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_note_Cover.imageset/Contents.json

@@ -3,16 +3,6 @@
     {
       "filename" : "note.pdf",
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "note 1.pdf",
-      "idiom" : "universal"
     }
   ],
   "info" : {

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_note_Cover_Dark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "note 2.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_pen_base.imageset/Contents.json

@@ -3,16 +3,6 @@
     {
       "filename" : "pen.pdf",
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "pen 1.pdf",
-      "idiom" : "universal"
     }
   ],
   "info" : {

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_pen_base_Dark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "pen 2.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_strikethrough_base.imageset/Contents.json

@@ -3,16 +3,6 @@
     {
       "filename" : "strikethrough.pdf",
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "strikethrough 1.pdf",
-      "idiom" : "universal"
     }
   ],
   "info" : {

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_strikethrough_base_Dark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "strikethrough 2.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_underline_base.imageset/Contents.json

@@ -3,16 +3,6 @@
     {
       "filename" : "underline.pdf",
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "underline 1.pdf",
-      "idiom" : "universal"
     }
   ],
   "info" : {

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_underline_base_Dark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "underline 2.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_wavyline_base.imageset/Contents.json

@@ -3,16 +3,6 @@
     {
       "filename" : "wavyline.pdf",
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "wavyline 1.pdf",
-      "idiom" : "universal"
     }
   ],
   "info" : {

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Markup/markup_wavyline_base_Dark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "wavyline 2.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/KMRightSideController.swift

@@ -25,7 +25,7 @@ import KMComponentLibrary
     @objc func kmRightSideControllerDidRevertCropInfo(_ controller: KMRightSideController)
 }
 
-class KMRightSideController: NSViewController {
+class KMRightSideController: KMNBaseViewController {
     
     @IBOutlet var contendView: NSView!
     @IBOutlet var contendLeftDivider: ComponentDivider!
@@ -99,6 +99,18 @@ class KMRightSideController: NSViewController {
         setupContentController()
     }
     
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupUI()
+    }
+    
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupUI()
+    }
+    
     //MARK: - Get
     
     func getValidAnnotations() -> [CPDFAnnotation] {

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFSecToolbarController.swift

@@ -317,6 +317,9 @@ class KMPDFSecToolbarController: KMNBaseViewController {
     }
     
     func setupMainView() {
+        guard let _ = infoContendView else {
+            return
+        }
         let subviews = infoContendView.subviews
         for view in subviews {
             view.removeFromSuperview()
@@ -475,7 +478,7 @@ class KMPDFSecToolbarController: KMNBaseViewController {
     }
     
     func reloadMainview() {
-        guard let view = infoContendView else {
+        guard let _ = infoContendView else {
             return
         }
         let subviews = infoContendView.subviews
@@ -491,7 +494,7 @@ class KMPDFSecToolbarController: KMNBaseViewController {
     }
     
     func reloadRightview() {
-        guard let view = infoContendView else {
+        guard let _ = infoContendView else {
             return
         }
         let subviews = rightContendView.subviews

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.swift

@@ -34,6 +34,7 @@ import KMComponentLibrary
 class KMPDFToolbarController: KMNBaseViewController {
     
     @IBOutlet var contendBox: NSBox!
+    @IBOutlet var sepDivider: ComponentDivider!
     
     @IBOutlet var mainToolbarContendView: NSView!
     
@@ -129,6 +130,8 @@ class KMPDFToolbarController: KMNBaseViewController {
         
         contendBox.fillColor = ComponentLibrary.shared.getComponentColorFromKey("colorBg/layout-middle")
         
+        sepDivider.properties = sepDivider.properties
+        
         leftToolsView.wantsLayer = true
         leftToolsView.layer?.backgroundColor = contendBox.fillColor.cgColor
         
@@ -146,6 +149,8 @@ class KMPDFToolbarController: KMNBaseViewController {
         selectZoom.properties = selectZoom.properties
         
         toolbarManager?.refreshMarkupColorImages()
+        
+        secondToolBar.setupMainView()
     }
     
     override func updateUILanguage() {

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.xib

@@ -18,6 +18,7 @@
                 <outlet property="rightViewWidthConst" destination="dh8-di-9PV" id="7bL-PH-oIX"/>
                 <outlet property="secondContendView" destination="l3n-KG-leC" id="rAu-2n-c0w"/>
                 <outlet property="selectZoom" destination="sWP-oz-Pbl" id="RQl-q0-ySD"/>
+                <outlet property="sepDivider" destination="fWG-WR-IBe" id="KaU-2k-ySg"/>
                 <outlet property="tabsContendView" destination="ocQ-f5-AfT" id="otj-NR-vWu"/>
                 <outlet property="tabsLeftConst" destination="B26-fP-wCQ" id="Ssq-jk-6XA"/>
                 <outlet property="tabsMoreButton" destination="ZOR-OC-eGy" id="y7l-kz-Lzj"/>

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/Model/KMPDFToolbarManager.swift

@@ -571,7 +571,7 @@ class KMPDFToolbarManager: NSObject {
     //MARK: - 获取Markup相关icon图片
     class func getMarkup_HighlightImage() -> NSImage? {
         let image = NSImage(named: "markup_highlight_base")
-        let upImage = NSImage(named: "markup_highlight_Cover")
+        let upImage = KMAppearance.isDarkMode() ? NSImage(named: "markup_highlight_Cover_Dark") : NSImage(named: "markup_highlight_Cover")
         
         if let img = NSImage.combineImages(images: [image?.filled(with: CPDFMarkupAnnotation.defaultColor(.highlight)), upImage]) {
             return img
@@ -582,7 +582,7 @@ class KMPDFToolbarManager: NSObject {
     
     class func getMarkupNoteImage() -> NSImage? {
         let image = NSImage(named: "markup_note_base")
-        let upImage = NSImage(named: "markup_note_Cover")
+        let upImage = KMAppearance.isDarkMode() ? NSImage(named: "markup_note_Cover_Dark") : NSImage(named: "markup_note_Cover")
         
         if let img = NSImage.combineImages(images: [image?.filled(with: CPDFTextAnnotation.defaultColor()), upImage]) {
             return img
@@ -593,7 +593,7 @@ class KMPDFToolbarManager: NSObject {
     
     class func getMarkupPenImage() -> NSImage? {
         let image = NSImage(named: "markup_pen_Cover")
-        let upImage = NSImage(named: "markup_pen_base")
+        let upImage = KMAppearance.isDarkMode() ? NSImage(named: "markup_pen_base_Dark") : NSImage(named: "markup_pen_base")
         
         if let img = NSImage.combineImages(images: [(image?.filled(with: CPDFInkAnnotation.defaultColor()))!, upImage!]) {
             return img
@@ -604,7 +604,7 @@ class KMPDFToolbarManager: NSObject {
     
     class func getMarkupStrikethroughImage() -> NSImage? {
         let image = NSImage(named: "markup_strikethrough_Cover")
-        let upImage = NSImage(named: "markup_strikethrough_base")
+        let upImage = KMAppearance.isDarkMode() ? NSImage(named: "markup_strikethrough_base_Dark") : NSImage(named: "markup_strikethrough_base")
         
         if let img = NSImage.combineImages(images: [(image?.filled(with: CPDFMarkupAnnotation.defaultColor(.strikeOut)))!, upImage!]) {
             return img
@@ -615,7 +615,7 @@ class KMPDFToolbarManager: NSObject {
     
     class func getMarkupUnderlineImage() -> NSImage? {
         let image = NSImage(named: "markup_underline_Cover")
-        let upImage = NSImage(named: "markup_underline_base")
+        let upImage = KMAppearance.isDarkMode() ? NSImage(named: "markup_underline_base_Dark") : NSImage(named: "markup_underline_base")
         
         if let img = NSImage.combineImages(images: [(image?.filled(with: CPDFMarkupAnnotation.defaultColor(.underline)))!, upImage!]) {
             return img
@@ -626,7 +626,7 @@ class KMPDFToolbarManager: NSObject {
     
     class func getMarkupwavylineImage() -> NSImage? {
         let image = NSImage(named: "markup_wavyline_Cover")
-        let upImage = NSImage(named: "markup_wavyline_base")
+        let upImage = KMAppearance.isDarkMode() ? NSImage(named: "markup_wavyline_base_Dark") : NSImage(named: "markup_wavyline_base")
         
         if let img = NSImage.combineImages(images: [(image?.filled(with: CPDFMarkupAnnotation.defaultColor(.squiggly)))!, upImage!]) {
             return img