소스 검색

【会员系统】补充AI领取夜间模式

wangshuai 4 달 전
부모
커밋
c9fe21fc49
16개의 변경된 파일298개의 추가작업 그리고 232개의 파일을 삭제
  1. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/101828.colorset/Contents.json
  2. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/1D2023.colorset/Contents.json
  3. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/F04438.colorset/Contents.json
  4. 1 1
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/ButtonBackgroundImage6.imageset/Contents.json
  5. 86 79
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/ButtonBackgroundImage6.imageset/bg 1.pdf
  6. 2 2
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/DMG/OpenBootBackground.imageset/Contents.json
  7. 0 0
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/DMG/OpenBootBackground.imageset/bg-2.pdf
  8. 84 79
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/DMG/OpenBootBackground.imageset/bg (1).pdf
  9. 11 0
      PDF Office/PDF Master/MemberCenter/Assets/en.lproj/MemberCenterLocalizable.strings
  10. 12 0
      PDF Office/PDF Master/MemberCenter/Assets/zh-Hans.lproj/MemberCenterLocalizable.strings
  11. 12 0
      PDF Office/PDF Master/MemberCenter/Assets/zh-Hant.lproj/MemberCenterLocalizable.strings
  12. 2 2
      PDF Office/PDF Master/MemberCenter/View/KMSignUpView.xib
  13. 23 6
      PDF Office/PDF Master/MemberCenter/WindowsController/DMG/KMOpenDMGPopupBootWC.swift
  14. 18 18
      PDF Office/PDF Master/MemberCenter/WindowsController/DMG/KMOpenDMGPopupBootWC.xib
  15. 18 8
      PDF Office/PDF Master/MemberCenter/WindowsController/KMFreeGetAIWC.swift
  16. 20 28
      PDF Office/PDF Master/MemberCenter/WindowsController/KMFreeGetAIWC.xib

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/101828.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x28",
-          "green" : "0x18",
-          "red" : "0x10"
+          "blue" : "0xCC",
+          "green" : "0xC9",
+          "red" : "0xC8"
         }
       },
       "idiom" : "universal"

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/1D2023.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x23",
-          "green" : "0x20",
-          "red" : "0x1D"
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/F04438.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x38",
-          "green" : "0x44",
-          "red" : "0xF0"
+          "blue" : "0x61",
+          "green" : "0x38",
+          "red" : "0xE7"
         }
       },
       "idiom" : "universal"

+ 1 - 1
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/ButtonBackgroundImage6.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "bg 1.pdf",
+      "filename" : "Frame 1000007040.pdf",
       "idiom" : "universal"
     }
   ],

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 86 - 79
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/ButtonBackgroundImage6.imageset/bg 1.pdf


+ 2 - 2
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/DMG/OpenBootBackground.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "bg (1).pdf",
+      "filename" : "bg-2.pdf",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "bg (1) 1.pdf",
+      "filename" : "bg.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/DMG/OpenBootBackground.imageset/bg (1) 1.pdf → PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/DMG/OpenBootBackground.imageset/bg-2.pdf


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 84 - 79
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/DMG/OpenBootBackground.imageset/bg (1).pdf


+ 11 - 0
PDF Office/PDF Master/MemberCenter/Assets/en.lproj/MemberCenterLocalizable.strings

@@ -76,3 +76,14 @@
 "Subscribe to All Access Pack to Enjoy More Expanded Features" = "Subscribe to All Access Pack to Enjoy More Expanded Features";
 "Subscription Plan:" = "Subscription Plan:";
 "Renew now" = "Renew now";
+"Successfully subscribe PDF Reader Pro Advanced - Annual Plan!" = "Successfully subscribe PDF Reader Pro Advanced - Annual Plan!";
+"You get the chance to use AI Tools free for a year on the desktop version" = "You get the chance to use AI Tools free for a year on the desktop version";
+"Free for the first year, then auto-renewal at $125.99 per year. You can cancel your subscription anytime." = "You get the chance to use AI Tools free for a year on the desktop version";
+"Pick up free AI Tools before 23:59:00, or it will be invalid" = "Pick up free AI Tools before 23:59:00, or it will be invalid";
+"Get 1-Year AI Tools with $0" = "Get 1-Year AI Tools with $0";
+"Later" = "Later";
+
+"Free to Get 7-Day VIP Now" = "Free to Get 7-Day VIP Now";
+"Use all functions without restrictions" = "Use all functions without restrictions";
+"Get 7-Day VIP Free" = "Get 7-Day VIP Free";
+"Already have an account? %@" = "Already have an account? %@";

+ 12 - 0
PDF Office/PDF Master/MemberCenter/Assets/zh-Hans.lproj/MemberCenterLocalizable.strings

@@ -71,3 +71,15 @@
 "Undo Remove Account" = "撤销注销账户";
 "Restore your account successfully! Enjoy PDF Reader Pro now." = "撤销注销账户成功";
 "Renew now" = "立即续费";
+
+"Successfully subscribe PDF Reader Pro Advanced - Annual Plan!" = "成功购买 PDF Reader Pro 高级版 - 年订阅套餐!";
+"You get the chance to use AI Tools free for a year on the desktop version" = "赠送您一年AI,可在PDF Reader Pro PC版使用";
+"Free for the first year, then auto-renewal at $125.99 per year. You can cancel your subscription anytime." = "首年0元,到期自动续费818.9元/年,可随时取消";
+"Pick up free AI Tools before 23:59:00, or it will be invalid" = "领取时间截至当日23:59:00";
+"Get 1-Year AI Tools with $0" = "0元领取一年AI";
+"Later" = "稍后领取";
+
+"Free to Get 7-Day VIP Now" = "即刻免费获得7天VIP!";
+"Use all functions without restrictions" = "无限制地使用所有功能";
+"Get 7-Day VIP Free" = "免费领取7天VIP";
+"Already have an account? %@" = "已经有账户了? %@";

+ 12 - 0
PDF Office/PDF Master/MemberCenter/Assets/zh-Hant.lproj/MemberCenterLocalizable.strings

@@ -71,3 +71,15 @@
 "You have already submitted an account removal request. Please Undo Remove Account before making a purchase." = "您已提交註銷帳號申請。請先撤銷註銷帳戶,再進行購買。";
 "Undo Remove Account" = "撤銷註銷帳戶";
 "Restore your account successfully! Enjoy PDF Reader Pro now." = "您已成功撤銷登出帳戶,可以繼續使用PDF Reader Pro!";
+
+"Successfully subscribe PDF Reader Pro Advanced - Annual Plan!" = "成功購買PDF Reader Pro高級版-年訂閱方案!";
+"You get the chance to use AI Tools free for a year on the desktop version" = "介紹您一年AI,可在PDF Reader Pro PC版使用";
+"Free for the first year, then auto-renewal at $125.99 per year. You can cancel your subscription anytime." = "首年0元,繼續自動續費818.9元/年,可隨時取消";
+"Pick up free AI Tools before 23:59:00, or it will be invalid" = "領取時間截止當日23:59:00";
+"Get 1-Year AI Tools with $0" = "0元領取一年AI";
+"Later" = "近期領取";
+
+"Free to Get 7-Day VIP Now" = "即刻免費獲得7天VIP!";
+"Use all functions without restrictions" = "無限制地使用所有功能";
+"Get 7-Day VIP Free" = "免費領取7天VIP";
+"Already have an account? %@" = "已經有帳戶了? %@";

+ 2 - 2
PDF Office/PDF Master/MemberCenter/View/KMSignUpView.xib

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

+ 23 - 6
PDF Office/PDF Master/MemberCenter/WindowsController/DMG/KMOpenDMGPopupBootWC.swift

@@ -30,17 +30,29 @@ class KMOpenDMGPopupBootWC: NSWindowController {
         
         languageLocalized()
         initializeUI()
+        NotificationCenter.default.addObserver(self, selector: #selector(changeEffectiveAppearance), name: NSNotification.Name(rawValue: "kEffectiveAppearance"), object: nil)
     }
     
+    @objc func changeEffectiveAppearance() {
+        self.initializeUI()
+    }
+
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
-        titleLabel.stringValue = NSLocalizedString("Free to Get 7-Day VIP Now!", tableName: "MemberCenterLocalizable", comment: "")
-        subTitleLabel.stringValue = NSLocalizedString("· Use all functions without restrictions", tableName: "MemberCenterLocalizable", comment: "")
+        titleLabel.stringValue = NSLocalizedString("Free to Get 7-Day VIP Now", tableName: "MemberCenterLocalizable", comment: "")
+        subTitleLabel.stringValue = NSLocalizedString("Use all functions without restrictions", tableName: "MemberCenterLocalizable", comment: "")
         freeLabel.stringValue = NSLocalizedString("Get 7-Day VIP Free", tableName: "MemberCenterLocalizable", comment: "")
     }
     
     private func initializeUI() -> Void {
+        let isDarkModel = KMAdvertisementConfig.isDarkModel()
+        if  isDarkModel {
+            self.window?.contentView?.layer?.backgroundColor = NSColor(hex: "0E1114").cgColor;
+        } else {
+            self.window?.contentView?.layer?.backgroundColor = NSColor(hex: "FFFFFF").cgColor;
+        }
+
         titleLabel.textColor = NSColor(named: "4982E6")
         titleLabel.font = NSFont.SFProTextSemiboldFont(24)
         subTitleLabel.textColor = NSColor(named: "101828")
@@ -52,16 +64,20 @@ class KMOpenDMGPopupBootWC: NSWindowController {
         signInTextView.isSelectable = true
         signInTextView.textColor = NSColor.black
         signInTextView.font = NSFont.SFProTextRegularFont(12)
-        let tipsString = NSLocalizedString("Already have an account? %@", comment: "")
-        let specialOffer = NSLocalizedString("Sign in", comment: "")
+        let tipsString = NSLocalizedString("Already have an account? %@", tableName: "MemberCenterLocalizable", comment: "")
+        let specialOffer = NSLocalizedString("Sign in", tableName: "MemberCenterLocalizable", comment: "")
         let fullString = String(format: tipsString, specialOffer)
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.alignment = .center
+        
         let attributedString = NSMutableAttributedString(string: fullString)
         let specialOfferRange = (fullString as NSString).range(of: specialOffer)
         let linkColor = NSColor(named: "4982E6") ?? NSColor.blue
         let font = NSFont.SFProTextRegularFont(12)
         attributedString.addAttributes([
             .foregroundColor: NSColor(named: "42464D") ?? NSColor.black as Any,
-            .font: font
+            .font: font,
+            .paragraphStyle: paragraphStyle
         ], range: (fullString as NSString).range(of: fullString))
         attributedString.addAttributes([
             .foregroundColor: linkColor,
@@ -86,11 +102,12 @@ class KMOpenDMGPopupBootWC: NSWindowController {
 }
 
 extension KMOpenDMGPopupBootWC: NSTextViewDelegate {
+    
     func textView(_ textView: NSTextView, clickedOnLink link: Any, at charIndex: Int) -> Bool {
         if let urlString = link as? String, urlString == "action://openDetail" {
-            print("按钮被点击,打开详细内容")
             viewModel.signUpAction()
             self.window?.close()
+            return true
         }
         return false
     }

+ 18 - 18
PDF Office/PDF Master/MemberCenter/WindowsController/DMG/KMOpenDMGPopupBootWC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,11 +18,11 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="F0z-JX-Cv5">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="538" height="497"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="contentRect" x="482" y="218" width="538" height="497"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="538" height="497"/>
             <value key="maxSize" type="size" width="538" height="497"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -42,7 +42,7 @@
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="OpenBootIcon" id="kFg-QT-7fE"/>
                     </imageView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="VA6-Lb-SSr">
-                        <rect key="frame" x="0.0" y="218" width="538" height="16"/>
+                        <rect key="frame" x="0.0" y="232" width="538" height="16"/>
                         <subviews>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="57i-Up-o4T">
                                 <rect key="frame" x="-2" y="0.0" width="542" height="16"/>
@@ -61,7 +61,7 @@
                         </constraints>
                     </customView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="0DW-MF-WYY">
-                        <rect key="frame" x="0.0" y="190" width="538" height="16"/>
+                        <rect key="frame" x="0.0" y="204" width="538" height="16"/>
                         <subviews>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="840-5T-fTs">
                                 <rect key="frame" x="-2" y="0.0" width="542" height="16"/>
@@ -80,7 +80,7 @@
                         </constraints>
                     </customView>
                     <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="jx5-Fz-b1I" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                        <rect key="frame" x="183" y="134" width="173" height="32"/>
+                        <rect key="frame" x="183" y="148" width="173" height="32"/>
                         <view key="contentView" id="Pws-CS-RiZ">
                             <rect key="frame" x="0.0" y="0.0" width="173" height="32"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -105,24 +105,24 @@
                         </constraints>
                     </box>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="3If-uv-zMj">
-                        <rect key="frame" x="0.0" y="110" width="538" height="16"/>
+                        <rect key="frame" x="0.0" y="110" width="538" height="30"/>
                         <subviews>
                             <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8u9-6z-c22">
-                                <rect key="frame" x="0.0" y="0.0" width="538" height="16"/>
+                                <rect key="frame" x="0.0" y="0.0" width="538" height="30"/>
                                 <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="KwX-SL-d0a">
-                                    <rect key="frame" x="0.0" y="0.0" width="538" height="16"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="538" height="30"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textView wantsLayer="YES" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="sot-Mw-XQF">
-                                            <rect key="frame" x="0.0" y="0.0" width="538" height="16"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="538" height="30"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            <size key="minSize" width="538" height="16"/>
+                                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <size key="minSize" width="538" height="30"/>
                                             <size key="maxSize" width="538" height="10000000"/>
-                                            <color key="insertionPointColor" name="textInsertionPointColor" catalog="System" colorSpace="catalog"/>
                                         </textView>
                                     </subviews>
+                                    <color key="backgroundColor" red="0.11764705882352941" green="0.11764705882352941" blue="0.11764705882352941" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 </clipView>
                                 <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="jYM-XI-VRo">
                                     <rect key="frame" x="-100" y="-100" width="225" height="15"/>
@@ -138,6 +138,7 @@
                             <constraint firstItem="8u9-6z-c22" firstAttribute="top" secondItem="3If-uv-zMj" secondAttribute="top" id="1NC-sW-tet"/>
                             <constraint firstItem="8u9-6z-c22" firstAttribute="leading" secondItem="3If-uv-zMj" secondAttribute="leading" id="OIF-QL-5bC"/>
                             <constraint firstAttribute="bottom" secondItem="8u9-6z-c22" secondAttribute="bottom" id="l7K-Q6-Hli"/>
+                            <constraint firstAttribute="height" constant="30" id="t1I-0d-qsm"/>
                             <constraint firstAttribute="trailing" secondItem="8u9-6z-c22" secondAttribute="trailing" id="vaZ-Le-PlL"/>
                         </constraints>
                     </customView>
@@ -156,11 +157,10 @@
                     <constraint firstItem="3If-uv-zMj" firstAttribute="top" secondItem="jx5-Fz-b1I" secondAttribute="bottom" constant="8" id="dN5-XT-PID"/>
                     <constraint firstItem="jx5-Fz-b1I" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="f57-s4-yRs"/>
                     <constraint firstItem="0DW-MF-WYY" firstAttribute="top" secondItem="VA6-Lb-SSr" secondAttribute="bottom" constant="12" id="fWL-SN-ejQ"/>
-                    <constraint firstItem="VA6-Lb-SSr" firstAttribute="top" secondItem="LPZ-J5-zQ1" secondAttribute="bottom" constant="24" id="gkm-H8-zpP"/>
+                    <constraint firstItem="LPZ-J5-zQ1" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="12" id="hLq-SX-jUW"/>
                     <constraint firstAttribute="trailing" secondItem="VA6-Lb-SSr" secondAttribute="trailing" id="iRu-tS-50u"/>
                     <constraint firstItem="LPZ-J5-zQ1" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="jfO-vv-VuK"/>
                     <constraint firstAttribute="bottom" secondItem="3If-uv-zMj" secondAttribute="bottom" constant="110" id="vDn-cM-zaR"/>
-                    <constraint firstItem="LPZ-J5-zQ1" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="12" id="z1a-T5-vSe"/>
                 </constraints>
             </view>
             <connections>

+ 18 - 8
PDF Office/PDF Master/MemberCenter/WindowsController/KMFreeGetAIWC.swift

@@ -11,7 +11,6 @@ import Cocoa
 class KMFreeGetAIWC: NSWindowController {
     
     @IBOutlet weak var titleLabel1: NSTextField!
-    @IBOutlet weak var titleLabel2: NSTextField!
     @IBOutlet weak var subTitle1: NSTextField!
     @IBOutlet weak var subTitle2: NSTextField!
     @IBOutlet weak var subTitle3: NSTextField!
@@ -30,20 +29,27 @@ class KMFreeGetAIWC: NSWindowController {
 
     override func windowDidLoad() {
         super.windowDidLoad()
-
+        
         // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
         languageLocalized()
         initializeUI()
+        
+        DistributedNotificationCenter.default.addObserver(self, selector: #selector(themeChanged(_:)), name: NSNotification.Name("AppleInterfaceThemeChangedNotification"), object: nil)
+    }
+    
+    @objc func themeChanged(_ notification: Notification) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+            self.initializeUI()
+        }
     }
     
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
-        titleLabel1.stringValue = NSLocalizedString("Successfully subscribe PDF Reader", tableName: "MemberCenterLocalizable", comment: "")
-        titleLabel2.stringValue = NSLocalizedString("Pro Advanced - Annual Plan!", tableName: "MemberCenterLocalizable", comment: "")
+        titleLabel1.stringValue = NSLocalizedString("Successfully subscribe PDF Reader Pro Advanced - Annual Plan!", tableName: "MemberCenterLocalizable", comment: "")
         subTitle1.stringValue = String(format: " · %@", NSLocalizedString("You get the chance to use AI Tools free for a year on the desktop version", tableName: "MemberCenterLocalizable", comment: ""))
-        subTitle2.stringValue = String(format: " · %@", NSLocalizedString("Free for the first year, then automatically renew at $169.99 annually. You can cancel your subscription anytime.", tableName: "MemberCenterLocalizable", comment: ""))
-        subTitle3.stringValue = String(format: " · %@", NSLocalizedString("Pick up free AI tools before 23:59:00, or it will be invalid", tableName: "MemberCenterLocalizable", comment: ""))
+        subTitle2.stringValue = String(format: " · %@", NSLocalizedString("Free for the first year, then auto-renewal at $125.99 per year. You can cancel your subscription anytime.", tableName: "MemberCenterLocalizable", comment: ""))
+        subTitle3.stringValue = String(format: " · %@", NSLocalizedString("Pick up free AI Tools before 23:59:00, or it will be invalid", tableName: "MemberCenterLocalizable", comment: ""))
         aitoolsLabel.stringValue = NSLocalizedString("Get 1-Year AI Tools with $0", tableName: "MemberCenterLocalizable", comment: "")
         laterButton.title = NSLocalizedString("Later", tableName: "MemberCenterLocalizable", comment: "")
         
@@ -94,10 +100,14 @@ class KMFreeGetAIWC: NSWindowController {
     }
     
     private func initializeUI() -> Void {
+        let isDarkModel = KMAdvertisementConfig.isDarkModel()
+        if  isDarkModel {
+            self.window?.contentView?.layer?.backgroundColor = NSColor(hex: "0E1114").cgColor;
+        } else {
+            self.window?.contentView?.layer?.backgroundColor = NSColor(hex: "FFFFFF").cgColor;
+        }
         titleLabel1.textColor = NSColor(named: "1D2023")
         titleLabel1.font = NSFont.SFProTextSemiboldFont(24)
-        titleLabel2.textColor = NSColor(named: "1D2023")
-        titleLabel2.font = NSFont.SFProTextSemiboldFont(24)
         subTitle1.textColor = NSColor(named: "101828")
         subTitle1.font = NSFont.SFProTextRegularFont(14)
         subTitle2.textColor = NSColor(named: "101828")

+ 20 - 28
PDF Office/PDF Master/MemberCenter/WindowsController/KMFreeGetAIWC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,16 +17,15 @@
                 <outlet property="subTitle3" destination="PBU-ok-xbw" id="b6W-UI-E6z"/>
                 <outlet property="termsServiceLabel" destination="8EG-n3-qe5" id="cpb-ZZ-qng"/>
                 <outlet property="titleLabel1" destination="rmE-FB-IiS" id="SWe-sK-cFh"/>
-                <outlet property="titleLabel2" destination="w7d-TK-EBj" id="Mk6-OY-x36"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="F0z-JX-Cv5">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" fullSizeContentView="YES"/>
             <rect key="contentRect" x="196" y="240" width="538" height="436"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="538" height="436"/>
             <value key="maxSize" type="size" width="538" height="436"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -45,18 +44,14 @@
                         <rect key="frame" x="40" y="352" width="458" height="72"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="mbR-HY-7t5">
-                                <rect key="frame" x="211" y="20" width="37" height="32"/>
+                                <rect key="frame" x="0.0" y="-15" width="458" height="102"/>
                                 <subviews>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w7d-TK-EBj">
-                                        <rect key="frame" x="-2" y="0.0" width="41" height="16"/>
-                                        <textFieldCell key="cell" alignment="center" title="Label" id="r7M-gJ-38u">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rmE-FB-IiS">
-                                        <rect key="frame" x="-2" y="16" width="41" height="16"/>
+                                        <rect key="frame" x="-2" y="0.0" width="462" height="72"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="458" id="0ej-vo-VhL"/>
+                                            <constraint firstAttribute="height" constant="72" id="dFN-nC-eft"/>
+                                        </constraints>
                                         <textFieldCell key="cell" alignment="center" title="Label" id="ajC-Av-in6">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -65,13 +60,10 @@
                                     </textField>
                                 </subviews>
                                 <constraints>
-                                    <constraint firstItem="w7d-TK-EBj" firstAttribute="top" secondItem="rmE-FB-IiS" secondAttribute="bottom" id="QXf-5J-jqH"/>
-                                    <constraint firstAttribute="trailing" secondItem="rmE-FB-IiS" secondAttribute="trailing" id="RhD-nw-ugn"/>
-                                    <constraint firstItem="rmE-FB-IiS" firstAttribute="top" secondItem="mbR-HY-7t5" secondAttribute="top" id="kLV-Hw-xYQ"/>
-                                    <constraint firstItem="w7d-TK-EBj" firstAttribute="leading" secondItem="mbR-HY-7t5" secondAttribute="leading" id="o65-TC-LGn"/>
-                                    <constraint firstItem="rmE-FB-IiS" firstAttribute="leading" secondItem="mbR-HY-7t5" secondAttribute="leading" id="or0-Na-UiA"/>
-                                    <constraint firstAttribute="bottom" secondItem="w7d-TK-EBj" secondAttribute="bottom" id="osl-lx-xDX"/>
-                                    <constraint firstAttribute="trailing" secondItem="w7d-TK-EBj" secondAttribute="trailing" id="vd7-0i-YFE"/>
+                                    <constraint firstAttribute="trailing" secondItem="rmE-FB-IiS" secondAttribute="trailing" id="DEq-7V-Rb4"/>
+                                    <constraint firstItem="rmE-FB-IiS" firstAttribute="leading" secondItem="mbR-HY-7t5" secondAttribute="leading" id="E57-fm-0M0"/>
+                                    <constraint firstItem="rmE-FB-IiS" firstAttribute="top" secondItem="mbR-HY-7t5" secondAttribute="top" constant="30" id="kLV-Hw-xYQ"/>
+                                    <constraint firstAttribute="bottom" secondItem="rmE-FB-IiS" secondAttribute="bottom" id="nlH-6F-UVV"/>
                                 </constraints>
                             </customView>
                         </subviews>
@@ -102,7 +94,7 @@
                         </constraints>
                     </customView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="c5z-V7-cme">
-                        <rect key="frame" x="40" y="236" width="458" height="40"/>
+                        <rect key="frame" x="40" y="243" width="458" height="40"/>
                         <subviews>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6D4-4c-2Nm">
                                 <rect key="frame" x="-2" y="12" width="462" height="16"/>
@@ -121,7 +113,7 @@
                         </constraints>
                     </customView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Vcv-ai-hhc">
-                        <rect key="frame" x="40" y="204" width="458" height="20"/>
+                        <rect key="frame" x="40" y="218" width="458" height="20"/>
                         <subviews>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PBU-ok-xbw">
                                 <rect key="frame" x="-2" y="2" width="462" height="16"/>
@@ -140,7 +132,7 @@
                         </constraints>
                     </customView>
                     <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Abq-53-J71" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                        <rect key="frame" x="212" y="148" width="114" height="32"/>
+                        <rect key="frame" x="212" y="162" width="114" height="32"/>
                         <view key="contentView" id="ZXj-k3-y1s">
                             <rect key="frame" x="0.0" y="0.0" width="114" height="32"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -165,7 +157,7 @@
                         </constraints>
                     </box>
                     <button translatesAutoresizingMaskIntoConstraints="NO" id="E7S-Bk-g72">
-                        <rect key="frame" x="247" y="124" width="45" height="16"/>
+                        <rect key="frame" x="247" y="138" width="45" height="16"/>
                         <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="WO4-oe-cbl">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -192,10 +184,10 @@
                     </textField>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="Vcv-ai-hhc" firstAttribute="top" secondItem="c5z-V7-cme" secondAttribute="bottom" constant="12" id="1Z4-JM-965"/>
+                    <constraint firstItem="Vcv-ai-hhc" firstAttribute="top" secondItem="c5z-V7-cme" secondAttribute="bottom" constant="5" id="1Z4-JM-965"/>
                     <constraint firstAttribute="trailing" secondItem="iRN-bz-X6B" secondAttribute="trailing" constant="40" id="5Pn-81-Dq3"/>
                     <constraint firstItem="Vcv-ai-hhc" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="40" id="6DE-Db-wFX"/>
-                    <constraint firstItem="c5z-V7-cme" firstAttribute="top" secondItem="hWR-hK-k4D" secondAttribute="bottom" constant="12" id="BfD-VE-xLJ"/>
+                    <constraint firstItem="c5z-V7-cme" firstAttribute="top" secondItem="hWR-hK-k4D" secondAttribute="bottom" constant="5" id="BfD-VE-xLJ"/>
                     <constraint firstItem="53R-cw-WGs" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="Bng-eA-ciz"/>
                     <constraint firstItem="c5z-V7-cme" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="40" id="EO0-GC-J8H"/>
                     <constraint firstItem="Abq-53-J71" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="GwF-JY-IS0"/>