【订阅】比较表文案调整

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

@@ -40,20 +40,26 @@ class KMComparativeView: KMBaseXibView {
             "subtitle": "Free Plan",
             "describe": "Simply log in and get benefits.",
             "content": [
-                ["title": "AI translate, rewrite, correction",
+                ["title": "AI translate",
                  "state": 1,
                  "color": "#551CCD"],
-                ["title": "Save without Watermark",
+                ["title": "AI rewrite, AI correction (5 times per month for each function)",
+                 "state": 1,
+                 "color": "#551CCD"],
+                ["title": "Save without watermark",
                  "state": 0,
-                 "color": "#252629"],
-                ["title": "Basic functions like annotation and viewing",
+                 "color": "#F3465B"],
+                ["title": "Convert PDF to Office (Only first 10 pages), unlimited times",
                  "state": 2,
                  "color": "#252629"],
-                ["title": "Convert PDF to Office (Only first 10 pages)",
+                ["title": "Merge 2 files at once, unlimited times",
                  "state": 2,
                  "color": "#252629"],
-                ["title": "Merge only 2 files for free",
+                ["title": "Basic functions like annotation and viewing",
                  "state": 2,
+                 "color": "#252629"],
+                ["title": "",
+                 "state": 0,
                  "color": "#252629"]
             ],
             "buttonTitle": "Free Trial"
@@ -65,20 +71,26 @@ class KMComparativeView: KMBaseXibView {
             "describe": "Save 50%@ for the first year, auto-renew at %@. Billed yearly.",
             "productId": PRODUCT_1,
             "content": [
-                ["title": "AI translate, rewrite, correction",
+                ["title": "AI translate",
                  "state": 1,
-                 "color": "#551CCD"],
-                ["title": "Save without Watermark",
+                 "color": "#252629"],
+                ["title": "AI rewrite, AI correction (5 times per month for each function)",
                  "state": 1,
                  "color": "#252629"],
-                ["title": "Unlock all premium features",
+                ["title": "Save without watermark",
                  "state": 1,
                  "color": "#252629"],
-                ["title": "Convert PDF to Office without limitation",
+                ["title": "Convert PDF to Office without any limitation",
                  "state": 1,
                  "color": "#252629"],
-                ["title": "Batch merge files without limitation",
+                ["title": "Batch merge files without any limitation",
                  "state": 1,
+                 "color": "#252629"],
+                ["title": "Unlock all premium features",
+                 "state": 1,
+                 "color": "#252629"],
+                ["title": "",
+                 "state": 0,
                  "color": "#252629"]
             ],
             "buttonTitle": "Buy Now"

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/KMComparativeView.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>
@@ -51,14 +51,14 @@
                         </box>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eN5-5g-Ftd">
                             <rect key="frame" x="8" y="8" width="12" height="12"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="12" id="hHP-Pp-ky2"/>
-                                <constraint firstAttribute="height" constant="12" id="mIP-CG-QlM"/>
-                            </constraints>
                             <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="control_btn_icon_close" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="x0u-hh-567">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="12" id="hHP-Pp-ky2"/>
+                                <constraint firstAttribute="height" constant="12" id="mIP-CG-QlM"/>
+                            </constraints>
                             <connections>
                                 <action selector="closeButtonAction:" target="-2" id="ugN-d6-a63"/>
                             </connections>
@@ -79,7 +79,7 @@
                             <rect key="frame" x="40" y="20" width="727" height="20"/>
                             <subviews>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rP2-sO-AA6">
-                                    <rect key="frame" x="384" y="2" width="106" height="16"/>
+                                    <rect key="frame" x="384" y="2" width="107" height="16"/>
                                     <buttonCell key="cell" type="square" title="Terms of Service" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="ply-Hb-Jcv">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -96,7 +96,7 @@
                                     </constraints>
                                 </customView>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hY1-Tk-GCi">
-                                    <rect key="frame" x="255" y="2" width="88" height="16"/>
+                                    <rect key="frame" x="254" y="2" width="89" height="16"/>
                                     <buttonCell key="cell" type="square" title="Privacy Policy" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="Z32-Nt-dbF">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -127,8 +127,8 @@
                                     </constraints>
                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Upgrade your plan" id="Qxe-i0-Wsc"/>
                                 </imageView>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MnS-Io-H7L">
-                                    <rect key="frame" x="82" y="8" width="116" height="16"/>
+                                <textField focusRingType="none" 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"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -146,15 +146,15 @@
                                     </connections>
                                 </button>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="t36-hD-ZhM">
-                                    <rect key="frame" x="204" y="8" width="16" height="16"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="16" id="ANF-bC-Abf"/>
-                                        <constraint firstAttribute="width" constant="16" id="YSy-2J-4ZD"/>
-                                    </constraints>
+                                    <rect key="frame" x="205" y="8" width="16" height="16"/>
                                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="icon_info" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="bFX-Ce-vIG">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
                                     </buttonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="16" id="ANF-bC-Abf"/>
+                                        <constraint firstAttribute="width" constant="16" id="YSy-2J-4ZD"/>
+                                    </constraints>
                                     <connections>
                                         <action selector="infoButtonAction:" target="-2" id="XeA-K0-PqQ"/>
                                     </connections>

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

@@ -13,6 +13,7 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var subtitleLabel: NSTextField!
     @IBOutlet weak var lineView: NSView!
+    @IBOutlet weak var collectionViewContentView: NSView!
     @IBOutlet weak var scrollView: NSScrollView!
     @IBOutlet weak var contentCollectionView: NSCollectionView!
     @IBOutlet weak var doneBox: KMBox!
@@ -22,6 +23,7 @@ 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
@@ -156,6 +158,8 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
             }
             self.contentCollectionView.reloadData()
         }
+        
+//        self.collectionViewContentView.addSubview(blurImageView, positioned: .above, relativeTo: scrollView)
     }
     
     func updatePrice() {
@@ -240,7 +244,6 @@ extension KMComparativeViewCollectionItem: NSCollectionViewDelegate {
 }
 
 extension KMComparativeViewCollectionItem: NSCollectionViewDelegateFlowLayout {
-    
     public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> NSSize {
         let array: [[String: Any]] = self.data["content"] as! [[String : Any]]
         let data = array[indexPath.section]

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

@@ -1,13 +1,15 @@
 <?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>
         <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"/>
                 <outlet property="doneBox" destination="jrx-sF-eiw" id="QsK-zK-ZTG"/>
@@ -27,7 +29,7 @@
             <rect key="frame" x="0.0" y="0.0" width="348" height="467"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aal-EW-4N2">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aal-EW-4N2">
                     <rect key="frame" x="30" y="419" width="288" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Register Member" id="u25-eB-jIR">
                         <font key="font" usesAppearanceFont="YES"/>
@@ -35,7 +37,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y61-y9-dAw">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y61-y9-dAw">
                     <rect key="frame" x="30" y="387" width="31" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Free" id="Nmm-Ii-aJs">
                         <font key="font" metaFont="system"/>
@@ -72,7 +74,7 @@
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>
                         </scrollView>
-                        <imageView hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kad-Jv-Qsg">
+                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kad-Jv-Qsg">
                             <rect key="frame" x="0.0" y="0.0" width="284" height="40"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="eDk-1b-RHY"/>
@@ -100,7 +102,7 @@
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="BFX-df-wDy">
                     <rect key="frame" x="32" y="28" width="284" height="40"/>
                     <subviews>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tFQ-Lt-4na">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tFQ-Lt-4na">
                             <rect key="frame" x="122" y="12" width="41" height="16"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" enabled="NO" alignment="center" title="Label" id="91P-uq-jcS">
                                 <font key="font" metaFont="system"/>
@@ -126,7 +128,7 @@
                         <constraint firstItem="jrx-sF-eiw" firstAttribute="leading" secondItem="BFX-df-wDy" secondAttribute="leading" id="qvq-Mx-kLI"/>
                     </constraints>
                 </customView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3TK-IO-Uc2">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3TK-IO-Uc2">
                     <rect key="frame" x="30" y="367" width="288" height="16"/>
                     <textFieldCell key="cell" alignment="left" title="Label" id="tUs-FK-WKB">
                         <font key="font" metaFont="system"/>

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

@@ -27,18 +27,22 @@ class KMComparativeViewCollectionItemItem: NSCollectionViewItem {
         if data.count != 0 {
             let color = NSColor(hex: data["color"] as! String)
             let state: Int = data["state"] as? Int ?? 0
-            if state == 2 {
-                self.iconImageView.image = NSImage(named: "icon_info")
-            } else if state == 1 {
-                self.iconImageView.image = NSImage(named: "tips")
-            } else if state == 0 {
-                self.iconImageView.image = NSImage(named: "tips 1")
+            let string = NSLocalizedString(data["title"] as! String, comment: "")
+            
+            if string.count > 0 {
+                if state == 2 {
+                    self.iconImageView.image = NSImage(named: "icon_info")
+                } else if state == 1 {
+                    self.iconImageView.image = NSImage(named: "tips")
+                } else if state == 0 {
+                    self.iconImageView.image = NSImage(named: "tips 1")
+                }
+            } else {
+                self.iconImageView.image = NSImage(named: "")
             }
             
             self.titleLabel.textColor = color
             
-            let string = NSLocalizedString(data["title"] as! String, comment: "")
-            
             let paragraphStyle = NSMutableParagraphStyle()
             paragraphStyle.lineHeightMultiple = 1.32
             paragraphStyle.alignment = .left

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginLeftImageView.swift

@@ -63,9 +63,9 @@ class KMLoginLeftImageView: KMBaseXibView {
 //            self.subscriptionButton.isHidden = true
         default:
             #if VERSION_FREE
-            image = NSImage(named: "Image_Popup Appstore")!
+            image = NSImage(named: "image_PopupAppstore")!
             #else
-            image = NSImage(named: "Image_Popup Appstore")!
+            image = NSImage(named: "image_PopupDMG")!
             #endif
 //            self.subscriptionButton.isHidden = false
         }

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.swift

@@ -242,9 +242,9 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
     
     func reloadData() {
         if KMLightMemberManager.manager.isLogin() || tempType == .save {
-            self.waterViewHeightConstrain.constant = 506
+            self.waterViewHeightConstrain.constant = 462
         } else {
-            self.waterViewHeightConstrain.constant = 643
+            self.waterViewHeightConstrain.constant = 563
         }
         self.waterMarkView.type = tempType
         self.waterMarkView.updateConstraints()

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.xib

@@ -18,16 +18,16 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="450" height="643"/>
+            <rect key="contentRect" x="196" y="240" width="450" height="563"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="450" height="643"/>
+                <rect key="frame" x="0.0" y="0.0" width="450" height="564"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="kKR-sQ-MOd" customClass="KMSubscribeWaterMarkView" customModule="PDF_Master" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="450" height="643"/>
+                        <rect key="frame" x="0.0" y="0.0" width="450" height="564"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="643" id="hGQ-d7-hqP"/>
+                            <constraint firstAttribute="height" constant="564" id="hGQ-d7-hqP"/>
                         </constraints>
                     </customView>
                 </subviews>

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift

@@ -157,9 +157,9 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
             self.subscribeLabel.stringValue = NSLocalizedString("Upgrade Now", comment: "")
         } else {
             self.subTitleContentView.isHidden = false
-            self.subtitleContentHeightConstraint.constant = 60
+            self.subtitleContentHeightConstraint.constant = 40
             self.collectionContentViewHeightConstraint.constant = 330
-            self.collectionViewContentTopConstraint.constant = 96
+            self.collectionViewContentTopConstraint.constant = 76
             self.titleLabel.stringValue = NSLocalizedString("Login Benefits", comment: "")
 //            self.waterExportButton.title = NSLocalizedString("Later", comment: "")
             self.subscribeLabel.stringValue = NSLocalizedString("Login or Sign up", comment: "")
@@ -245,7 +245,7 @@ extension KMSubscribeWaterMarkView: NSCollectionViewDelegateFlowLayout {
         paragraphStyle.alignment = .left
         let size: NSSize = string.boundingRect(with: NSSize(width: 350, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextSemibold(14), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
         let subtitleSize: NSSize = subtitleString.boundingRect(with: NSSize(width: 350, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(12), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
-        return NSSize(width: 394, height: max(66, size.height + subtitleSize.height + 4))
+        return NSSize(width: 394, height: max(44, size.height + subtitleSize.height + 4))
     }
 
     public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, insetForSectionAt section: Int) -> NSEdgeInsets {

PDF Office/PDF Master/Class/KMLightMember/Source/KMLightMember.xcassets/Image_PopupDMG.imageset/Contents.json

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