【2025】【Home】快捷工具自适应优化，暗黑模式兼容优化

PDF Office/PDF Master/KMClass/KMHomeViewController/Views/KMHomeQuickToolsView/KMHomeQuickToolsView.swift

@@ -107,7 +107,7 @@ public class KMHomeQuickToolsView: BaseXibView {
         }
         print(showCount)
         
-        var itemWidth = (CGRectGetWidth(self.itemsContendView.frame) - (showCount-1)*16)/showCount
+        var itemWidth = (CGRectGetWidth(self.itemsContendView.frame) - (showCount-1)*16 - 8)/showCount
         if itemWidth < 168 {
             itemWidth = 168
         }
@@ -135,8 +135,8 @@ public class KMHomeQuickToolsView: BaseXibView {
         }
         self.refreshUI()
         
-        var items = [cardPDFTool1, cardPDFTool2, cardPDFTool3, cardPDFTool4, cardPDFTool5, cardPDFTool6, cardPDFTool7, cardPDFTool8]
-        var tagItems = [newTag1, newTag2, newTag3, newTag4, newTag5, newTag6, newTag7, newTag8]
+        let items = [cardPDFTool1, cardPDFTool2, cardPDFTool3, cardPDFTool4, cardPDFTool5, cardPDFTool6, cardPDFTool7, cardPDFTool8]
+        let tagItems = [newTag1, newTag2, newTag3, newTag4, newTag5, newTag6, newTag7, newTag8]
         for tagItem in tagItems {
             tagItem?.isHidden = true
             tagItem?.properties = ComponentTagProperty(tagType: .mark_New, size: .m, text: KMLocalizedString("new"))
@@ -146,8 +146,13 @@ public class KMHomeQuickToolsView: BaseXibView {
             var index = items.firstIndex(of: item) ?? 0
             if index > KMNHomeQuickToolManager.defaultManager.quickToolsItemMutableArray.count - 1 {
                 index = 0
+                
+                item?.isHidden = true
+                continue
             }
             
+            item?.isHidden = false
+            
             let toolType = HomeQuickToolType(rawValue: KMNHomeQuickToolManager.defaultManager.quickToolsItemMutableArray[index])!
             let toolMode = KMNHomeQuickToolMode.toolModeData(type: toolType)
             

PDF Office/PDF Master/KMClass/KMHomeViewController/Views/KMHomeQuickToolsView/KMHomeQuickToolsView.xib

@@ -39,13 +39,13 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="6Sr-Sn-Npw">
-                    <rect key="frame" x="40" y="0.0" width="400" height="172"/>
+                    <rect key="frame" x="40" y="0.0" width="408" height="172"/>
                     <view key="contentView" id="JjO-Lz-hL8">
-                        <rect key="frame" x="0.0" y="0.0" width="400" height="172"/>
+                        <rect key="frame" x="0.0" y="0.0" width="408" height="172"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="AfO-5i-mBA">
-                                <rect key="frame" x="0.0" y="148" width="400" height="24"/>
+                                <rect key="frame" x="0.0" y="148" width="408" height="24"/>
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QbD-Me-hYz">
                                         <rect key="frame" x="-2" y="4" width="75" height="16"/>
@@ -66,13 +66,13 @@
                                 <constraints>
                                     <constraint firstItem="N5c-sG-bzx" firstAttribute="centerY" secondItem="AfO-5i-mBA" secondAttribute="centerY" id="HUa-ZL-4MD"/>
                                     <constraint firstItem="QbD-Me-hYz" firstAttribute="leading" secondItem="AfO-5i-mBA" secondAttribute="leading" id="Unf-I7-NN4"/>
-                                    <constraint firstAttribute="trailing" secondItem="N5c-sG-bzx" secondAttribute="trailing" id="atj-X6-6EX"/>
+                                    <constraint firstAttribute="trailing" secondItem="N5c-sG-bzx" secondAttribute="trailing" constant="8" id="atj-X6-6EX"/>
                                     <constraint firstItem="QbD-Me-hYz" firstAttribute="centerY" secondItem="AfO-5i-mBA" secondAttribute="centerY" id="tEE-85-Dmm"/>
                                     <constraint firstAttribute="height" constant="24" id="ua7-um-ynK"/>
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="gA8-1c-MZ1">
-                                <rect key="frame" x="0.0" y="0.0" width="400" height="148"/>
+                                <rect key="frame" x="0.0" y="0.0" width="408" height="148"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="M7a-T4-uXS" customClass="ComponentCardPDFTool" customModule="KMComponentLibrary">
                                         <rect key="frame" x="0.0" y="91" width="86" height="45"/>
@@ -224,11 +224,11 @@
             </subviews>
             <constraints>
                 <constraint firstItem="6Sr-Sn-Npw" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="40" id="7zc-bc-Qpb"/>
-                <constraint firstAttribute="trailing" secondItem="6Sr-Sn-Npw" secondAttribute="trailing" constant="40" id="MzO-ZC-drq"/>
+                <constraint firstAttribute="trailing" secondItem="6Sr-Sn-Npw" secondAttribute="trailing" constant="32" id="MzO-ZC-drq"/>
                 <constraint firstItem="6Sr-Sn-Npw" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="32" id="qTV-5E-CWT"/>
                 <constraint firstAttribute="bottom" secondItem="6Sr-Sn-Npw" secondAttribute="bottom" id="t4K-vi-AXu"/>
             </constraints>
-            <point key="canvasLocation" x="64" y="114"/>
+            <point key="canvasLocation" x="104" y="102"/>
         </customView>
     </objects>
 </document>

PDF Office/PDF Master/KMClass/KMHomeViewController/Views/KMHomeRightView/KMHomeRightView.swift

@@ -339,8 +339,14 @@ extension KMHomeRightView: NSCollectionViewDelegate, NSCollectionViewDataSource,
     public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> NSSize {
         if section == 0 {
             if KMNHomeQuickToolManager.defaultManager.collapseTools {
+                if KMNHomeQuickToolManager.defaultManager.quickToolsItemMutableArray.count < 4 {
+                    return NSSize(width: collectionView.frame.size.width, height: 172+32+2-60-14) //折叠
+                }
                 return NSSize(width: collectionView.frame.size.width, height: 172+32+2) //折叠
             } else {
+                if KMNHomeQuickToolManager.defaultManager.quickToolsItemMutableArray.count < 4 {
+                    return NSSize(width: collectionView.frame.size.width, height: 228+32-88-14)
+                }
                 return NSSize(width: collectionView.frame.size.width, height: 228+32)
             }
         } else if section == 1 {

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/file_list.imageset/Contents.json

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

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/file_list_active.imageset/Contents.json

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

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/file_thumb.imageset/Contents.json

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

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/file_thumb_active.imageset/Contents.json

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

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/filelist_more.imageset/Contents.json

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

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/filelist_more.imageset/more-horizontal.pdf

@@ -0,0 +1,84 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.800000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 2.500000 8.333008 cm
+1.000000 1.000000 1.000000 scn
+0.000000 1.666829 m
+0.000000 2.587304 0.746192 3.333496 1.666667 3.333496 c
+2.587141 3.333496 3.333333 2.587304 3.333333 1.666829 c
+3.333333 0.746354 2.587141 0.000162 1.666667 0.000162 c
+0.746192 0.000162 0.000000 0.746354 0.000000 1.666829 c
+h
+5.833333 1.666829 m
+5.833333 2.587304 6.579525 3.333496 7.500000 3.333496 c
+8.420474 3.333496 9.166666 2.587304 9.166666 1.666829 c
+9.166666 0.746354 8.420474 0.000162 7.500000 0.000162 c
+6.579525 0.000162 5.833333 0.746354 5.833333 1.666829 c
+h
+11.666666 1.666829 m
+11.666666 2.587304 12.412859 3.333496 13.333333 3.333496 c
+14.253807 3.333496 15.000000 2.587304 15.000000 1.666829 c
+15.000000 0.746354 14.253808 0.000162 13.333333 0.000162 c
+12.412859 0.000162 11.666666 0.746354 11.666666 1.666829 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  884
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.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
+0000000074 00000 n
+0000001014 00000 n
+0000001036 00000 n
+0000001209 00000 n
+0000001283 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1342
+%%EOF

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/list.imageset/Contents.json

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

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/quickTools_more_nor.imageset/Contents.json

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

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/quickTools_more_nor.imageset/more-horizontal 1.pdf

@@ -0,0 +1,84 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.500000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 2.000000 6.666992 cm
+1.000000 1.000000 1.000000 scn
+0.000000 1.333171 m
+0.000000 2.069550 0.596954 2.666504 1.333333 2.666504 c
+2.069713 2.666504 2.666667 2.069550 2.666667 1.333171 c
+2.666667 0.596791 2.069713 -0.000163 1.333333 -0.000163 c
+0.596954 -0.000163 0.000000 0.596791 0.000000 1.333171 c
+h
+4.666667 1.333171 m
+4.666667 2.069550 5.263620 2.666504 6.000000 2.666504 c
+6.736380 2.666504 7.333333 2.069550 7.333333 1.333171 c
+7.333333 0.596791 6.736380 -0.000163 6.000000 -0.000163 c
+5.263620 -0.000163 4.666667 0.596791 4.666667 1.333171 c
+h
+9.333334 1.333171 m
+9.333334 2.069550 9.930287 2.666504 10.666667 2.666504 c
+11.403046 2.666504 12.000000 2.069550 12.000000 1.333171 c
+12.000000 0.596791 11.403048 -0.000163 10.666667 -0.000163 c
+9.930287 -0.000163 9.333334 0.596791 9.333334 1.333171 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  887
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.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
+0000000074 00000 n
+0000001017 00000 n
+0000001039 00000 n
+0000001212 00000 n
+0000001286 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1345
+%%EOF

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/quickTools_more_press.imageset/Contents.json

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

PDF Office/PDF Master/KMClass/KMHomeViewController/home.xcassets/quickTools_more_press.imageset/more-horizontal.pdf

@@ -0,0 +1,84 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.800000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 2.000000 6.666992 cm
+1.000000 1.000000 1.000000 scn
+0.000000 1.333171 m
+0.000000 2.069550 0.596954 2.666504 1.333333 2.666504 c
+2.069713 2.666504 2.666667 2.069550 2.666667 1.333171 c
+2.666667 0.596791 2.069713 -0.000163 1.333333 -0.000163 c
+0.596954 -0.000163 0.000000 0.596791 0.000000 1.333171 c
+h
+4.666667 1.333171 m
+4.666667 2.069550 5.263620 2.666504 6.000000 2.666504 c
+6.736380 2.666504 7.333333 2.069550 7.333333 1.333171 c
+7.333333 0.596791 6.736380 -0.000163 6.000000 -0.000163 c
+5.263620 -0.000163 4.666667 0.596791 4.666667 1.333171 c
+h
+9.333334 1.333171 m
+9.333334 2.069550 9.930287 2.666504 10.666667 2.666504 c
+11.403046 2.666504 12.000000 2.069550 12.000000 1.333171 c
+12.000000 0.596791 11.403048 -0.000163 10.666667 -0.000163 c
+9.930287 -0.000163 9.333334 0.596791 9.333334 1.333171 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  887
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.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
+0000000074 00000 n
+0000001017 00000 n
+0000001039 00000 n
+0000001212 00000 n
+0000001286 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1345
+%%EOF

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -36,54 +36,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "79E9334E-3B37-40D3-A13F-146207E23539"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/KMClass/KMHomeViewController/Views/KMHomeQuickTools/KMNHomeQuickToolManager.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "130"
-            endingLineNumber = "130"
-            landmarkName = "quickToolsItemMutableArray"
-            landmarkType = "24">
-            <Locations>
-               <Location
-                  uuid = "79E9334E-3B37-40D3-A13F-146207E23539 - 5a963a57a9ebe8b1"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMNHomeQuickToolManager.__deallocating_deinit"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMHomeViewController/Views/KMHomeQuickTools/KMNHomeQuickToolManager.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "0"
-                  endingLineNumber = "0"
-                  offsetFromSymbolStart = "16">
-               </Location>
-               <Location
-                  uuid = "79E9334E-3B37-40D3-A13F-146207E23539 - 21cdddd1f6b291bb"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMNHomeQuickToolManager.quickToolsItemMutableArray.didset : Swift.Array&lt;Swift.Int&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMHomeViewController/Views/KMHomeQuickTools/KMNHomeQuickToolManager.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "130"
-                  endingLineNumber = "130"
-                  offsetFromSymbolStart = "44">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent