【订阅】比较表UI调整

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -1267,6 +1267,7 @@
 		AD53B70529ACC65500D61E81 /* KMMailHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = AD53B70429ACC65500D61E81 /* KMMailHelper.m */; };
 		AD53B70629ACC65500D61E81 /* KMMailHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = AD53B70429ACC65500D61E81 /* KMMailHelper.m */; };
 		AD53B70729ACC65500D61E81 /* KMMailHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = AD53B70429ACC65500D61E81 /* KMMailHelper.m */; };
+		AD6218D42A7D29F40088475C /* KMComparativeGradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD6218D32A7D29F40088475C /* KMComparativeGradientView.swift */; };
 		AD68782129A5FADC005B5210 /* KMLightMemberCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD68782029A5FADC005B5210 /* KMLightMemberCache.swift */; };
 		AD68782229A5FADC005B5210 /* KMLightMemberCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD68782029A5FADC005B5210 /* KMLightMemberCache.swift */; };
 		AD68782329A5FADC005B5210 /* KMLightMemberCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD68782029A5FADC005B5210 /* KMLightMemberCache.swift */; };
@@ -4084,6 +4085,7 @@
 		AD53B6FD29AC5FCD00D61E81 /* KMLightMemberToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLightMemberToken.swift; sourceTree = "<group>"; };
 		AD53B70329ACC65500D61E81 /* KMMailHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMMailHelper.h; sourceTree = "<group>"; };
 		AD53B70429ACC65500D61E81 /* KMMailHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMMailHelper.m; sourceTree = "<group>"; };
+		AD6218D32A7D29F40088475C /* KMComparativeGradientView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMComparativeGradientView.swift; sourceTree = "<group>"; };
 		AD68782029A5FADC005B5210 /* KMLightMemberCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMLightMemberCache.swift; sourceTree = "<group>"; };
 		AD68783229A60FA7005B5210 /* KMLoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLoginView.swift; sourceTree = "<group>"; };
 		AD68783729A60FC0005B5210 /* KMLoginView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLoginView.xib; sourceTree = "<group>"; };
@@ -7578,6 +7580,7 @@
 		ADF6B8732A48153E0090CB78 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				AD6218D32A7D29F40088475C /* KMComparativeGradientView.swift */,
 				ADF6B8742A48155E0090CB78 /* KMComparativeViewCollectionItem.swift */,
 				ADF6B8752A48155E0090CB78 /* KMComparativeViewCollectionItem.xib */,
 				ADF6B87C2A485A8F0090CB78 /* KMComparativeViewCollectionItemItem.swift */,
@@ -11098,6 +11101,7 @@
 				AD71E7C42990A8A4001C5D3F /* KMBatchRemoveViewModel.swift in Sources */,
 				BB162E92294FFE020088E9D1 /* KMWatermarkModel.swift in Sources */,
 				9FDD0F842952FC9C000C4DAD /* KMAliasLightParser.swift in Sources */,
+				AD6218D42A7D29F40088475C /* KMComparativeGradientView.swift in Sources */,
 				BBFE6E5D2930809A00142C01 /* KMMergeCollectionPageViewItem.swift in Sources */,
 				89E4E7132963D7FF002DBA6F /* NSFont_SKExtensions.m in Sources */,
 				89316849296E436B0073EA59 /* KMSignatureManager.m in Sources */,

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/KMComparativeView.xib

@@ -127,7 +127,7 @@
                                     </constraints>
                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Upgrade your plan" id="Qxe-i0-Wsc"/>
                                 </imageView>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MnS-Io-H7L">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MnS-Io-H7L">
                                     <rect key="frame" x="82" y="8" width="117" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Upgrade your plan" id="YKh-hc-g1N">
                                         <font key="font" metaFont="system"/>

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeGradientView.swift

@@ -0,0 +1,31 @@
+//
+//  KMComparativeGradientView.swift
+//  PDF Master
+//
+//  Created by lizhe on 2023/8/4.
+//
+
+import Cocoa
+
+class KMComparativeGradientView: NSView {
+
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+        
+        // Create a CAGradientLayer
+        let gradientLayer = CAGradientLayer()
+        
+        // Set the colors of the gradient (from transparent to white)
+        gradientLayer.colors = [NSColor.white.withAlphaComponent(0).cgColor, NSColor.white.withAlphaComponent(1).cgColor]
+        
+        // Set the start and end points of the gradient (left to right in this case)
+        gradientLayer.startPoint = CGPoint(x: 0.5, y: 1.0)
+        gradientLayer.endPoint = CGPoint(x: 0.5, y: 0.0)
+        
+        // Set the frame of the gradient layer to fill the view
+        gradientLayer.frame = self.bounds
+        
+        // Add the gradient layer to the layer hierarchy of the view
+        self.layer?.addSublayer(gradientLayer)
+    }
+}

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItem.swift

@@ -23,7 +23,6 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
     
     @IBOutlet weak var describeLabel: NSTextField!
     @IBOutlet weak var iconImageView: NSImageView!
-    @IBOutlet weak var blurImageView: NSImageView!
     
     var doneAction: KMComparativeViewCollectionItemDoneAction?
     var isSubscription: Bool = false

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItem.xib

@@ -8,7 +8,6 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMComparativeViewCollectionItem" customModule="PDF_Master" customModuleProvider="target">
             <connections>
-                <outlet property="blurImageView" destination="kad-Jv-Qsg" id="uLL-fH-GEu"/>
                 <outlet property="collectionViewContentView" destination="JU3-B0-lwD" id="CDu-IW-nP6"/>
                 <outlet property="contentCollectionView" destination="9Pp-ih-jEG" id="z5w-fy-VHk"/>
                 <outlet property="describeLabel" destination="3TK-IO-Uc2" id="KKA-ma-4Aj"/>
@@ -74,22 +73,21 @@
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>
                         </scrollView>
-                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kad-Jv-Qsg">
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="gkc-pg-xk3" customClass="KMComparativeGradientView" customModule="PDF_Master" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="284" height="40"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="40" id="eDk-1b-RHY"/>
+                                <constraint firstAttribute="height" constant="40" id="k6w-lh-S8U"/>
                             </constraints>
-                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="渐变" id="6xK-SX-U6z"/>
-                        </imageView>
+                        </customView>
                     </subviews>
                     <constraints>
                         <constraint firstItem="2qF-pT-dP8" firstAttribute="top" secondItem="JU3-B0-lwD" secondAttribute="top" id="19V-04-40u"/>
-                        <constraint firstItem="kad-Jv-Qsg" firstAttribute="leading" secondItem="JU3-B0-lwD" secondAttribute="leading" id="St4-s0-ukx"/>
+                        <constraint firstItem="gkc-pg-xk3" firstAttribute="leading" secondItem="JU3-B0-lwD" secondAttribute="leading" id="5qG-ZN-HSb"/>
+                        <constraint firstAttribute="bottom" secondItem="gkc-pg-xk3" secondAttribute="bottom" id="eyR-Va-GWE"/>
                         <constraint firstAttribute="trailing" secondItem="2qF-pT-dP8" secondAttribute="trailing" id="g5f-fd-e2B"/>
                         <constraint firstItem="2qF-pT-dP8" firstAttribute="leading" secondItem="JU3-B0-lwD" secondAttribute="leading" id="pHP-gP-r3J"/>
-                        <constraint firstAttribute="trailing" secondItem="kad-Jv-Qsg" secondAttribute="trailing" id="q6G-00-GXv"/>
                         <constraint firstAttribute="height" constant="180" id="sUt-m6-Pqi"/>
-                        <constraint firstAttribute="bottom" secondItem="kad-Jv-Qsg" secondAttribute="bottom" id="uXc-Mf-3MM"/>
+                        <constraint firstAttribute="trailing" secondItem="gkc-pg-xk3" secondAttribute="trailing" id="yrx-L3-QeM"/>
                         <constraint firstAttribute="bottom" secondItem="2qF-pT-dP8" secondAttribute="bottom" id="zna-H1-Nwa"/>
                     </constraints>
                 </customView>
@@ -167,6 +165,5 @@
     </objects>
     <resources>
         <image name="Badge" width="80" height="24"/>
-        <image name="渐变" width="284" height="40"/>
     </resources>
 </document>

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItemItem.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>