1

CustomKeyboard/KeyboardAssets.xcassets/buy_sel_icon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "buy_sel_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "buy_sel_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

CustomKeyboard/KeyboardViewController.m

@@ -359,7 +359,7 @@ static void KBSkinInstallNotificationCallback(CFNotificationCenterRef center,
     NSString *encodedId = [self.class kb_urlEncodedString:product.productId];
     NSString *title = [product displayTitle];
     NSString *encodedTitle = [self.class kb_urlEncodedString:title];
-    NSMutableArray<NSString *> *params = [NSMutableArray arrayWithObject:@"autoPay=1"];
+    NSMutableArray<NSString *> *params = [NSMutableArray arrayWithObjects:@"autoPay=1", @"prefill=1", nil];
     if (encodedId.length) {
         [params addObject:[NSString stringWithFormat:@"productId=%@", encodedId]];
     }

CustomKeyboard/View/KBKeyboardSubscriptionOptionCell.m

@@ -11,8 +11,7 @@
 @property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) UILabel *priceLabel;
 @property (nonatomic, strong) UILabel *strikeLabel;
-@property (nonatomic, strong) UIView *checkBadge;
-@property (nonatomic, strong) UILabel *checkLabel;
+@property (nonatomic, strong) UIImageView *selectedImageView;
 @end
 @implementation KBKeyboardSubscriptionOptionCell
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -22,8 +21,7 @@
         [self.cardView addSubview:self.titleLabel];
         [self.cardView addSubview:self.priceLabel];
         [self.cardView addSubview:self.strikeLabel];
-        [self.cardView addSubview:self.checkBadge];
-        [self.checkBadge addSubview:self.checkLabel];
+        [self.cardView addSubview:self.selectedImageView];
 
         [self.cardView mas_makeConstraints:^(MASConstraintMaker *make) {
 //            make.edges.equalTo(self.contentView);
@@ -32,7 +30,7 @@
         }];
 
         [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.cardView.mas_top).offset(4);
+            make.top.equalTo(self.cardView.mas_top).offset(8);
             make.left.equalTo(self.cardView.mas_left).offset(10);
             make.right.equalTo(self.cardView.mas_right).offset(-10);
         }];
@@ -47,14 +45,11 @@
             make.centerY.equalTo(self.priceLabel);
         }];
 
-        [self.checkBadge mas_makeConstraints:^(MASConstraintMaker *make) {
+        [self.selectedImageView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerX.equalTo(self.cardView.mas_centerX);
             make.bottom.equalTo(self.cardView.mas_bottom).offset(10);
-            make.width.height.mas_equalTo(20);
-        }];
-
-        [self.checkLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.center.equalTo(self.checkBadge);
+            make.width.mas_equalTo(16);
+            make.height.mas_equalTo(17);
         }];
     }
     return self;
@@ -92,13 +87,16 @@
     void (^changes)(void) = ^{
         self.cardView.layer.borderColor = selected ? [UIColor colorWithHex:0x02BEAC].CGColor : [[UIColor blackColor] colorWithAlphaComponent:0.12].CGColor;
         self.cardView.layer.borderWidth = selected ? 2.0 : 1.0;
-        self.checkBadge.backgroundColor = selected ? [UIColor colorWithHex:0x02BEAC] : [[UIColor blackColor] colorWithAlphaComponent:0.15];
-        self.checkLabel.textColor = [UIColor whiteColor];
+        self.selectedImageView.alpha = selected ? 1.0 : 0.0;
     };
     if (animated) {
-        [UIView animateWithDuration:0.18 animations:changes];
+        self.selectedImageView.hidden = NO;
+        [UIView animateWithDuration:0.18 animations:changes completion:^(BOOL finished) {
+            self.selectedImageView.hidden = !selected;
+        }];
     } else {
         changes();
+        self.selectedImageView.hidden = !selected;
     }
 }
 
@@ -141,23 +139,13 @@
     return _strikeLabel;
 }
 
-- (UIView *)checkBadge {
-    if (!_checkBadge) {
-        _checkBadge = [[UIView alloc] init];
-        _checkBadge.layer.cornerRadius = 10;
-        _checkBadge.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.15];
+- (UIImageView *)selectedImageView {
+    if (!_selectedImageView) {
+        _selectedImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"buy_sel_icon"]];
+        _selectedImageView.contentMode = UIViewContentModeScaleAspectFit;
+        _selectedImageView.hidden = YES;
+        _selectedImageView.alpha = 0.0;
     }
-    return _checkBadge;
-}
-
-- (UILabel *)checkLabel {
-    if (!_checkLabel) {
-        _checkLabel = [[UILabel alloc] init];
-        _checkLabel.text = @"✓";
-        _checkLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightBold];
-        _checkLabel.textColor = [UIColor whiteColor];
-        _checkLabel.textAlignment = NSTextAlignmentCenter;
-    }
-    return _checkLabel;
+    return _selectedImageView;
 }
 @end

CustomKeyboard/View/KBKeyboardSubscriptionView.m

@@ -9,11 +9,39 @@
 #import "KBFullAccessManager.h"
 #import "KBKeyboardSubscriptionFeatureMarqueeView.h"
 #import "KBKeyboardSubscriptionOptionCell.h"
+#import "KBConfig.h"
 
 #import <MJExtension/MJExtension.h>
 
 static NSString * const kKBKeyboardSubscriptionCellId = @"kKBKeyboardSubscriptionCellId";
 
+static id KBKeyboardSubscriptionSanitizeJSON(id obj) {
+    if (!obj || obj == (id)kCFNull) { return nil; }
+    if ([obj isKindOfClass:[NSDictionary class]]) {
+        NSDictionary *dict = (NSDictionary *)obj;
+        NSMutableDictionary *result = [NSMutableDictionary dictionaryWithCapacity:dict.count];
+        [dict enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) {
+            (void)stop;
+            if (![key isKindOfClass:[NSString class]]) { return; }
+            id sanitized = KBKeyboardSubscriptionSanitizeJSON(value);
+            if (!sanitized) { return; }
+            result[key] = sanitized;
+        }];
+        return result;
+    }
+    if ([obj isKindOfClass:[NSArray class]]) {
+        NSArray *arr = (NSArray *)obj;
+        NSMutableArray *result = [NSMutableArray arrayWithCapacity:arr.count];
+        for (id item in arr) {
+            id sanitized = KBKeyboardSubscriptionSanitizeJSON(item);
+            if (!sanitized) { continue; }
+            [result addObject:sanitized];
+        }
+        return result;
+    }
+    return obj;
+}
+
 @interface KBKeyboardSubscriptionView () <UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
 @property (nonatomic, strong) UIImageView *cardView;
 @property (nonatomic, strong) UIButton *closeButton;
@@ -25,6 +53,7 @@ static NSString * const kKBKeyboardSubscriptionCellId = @"kKBKeyboardSubscriptio
 @property (nonatomic, strong) UIActivityIndicatorView *loadingIndicator;
 @property (nonatomic, strong) UILabel *emptyLabel;
 @property (nonatomic, copy) NSArray<KBKeyboardSubscriptionProduct *> *products;
+@property (nonatomic, copy, nullable) NSArray *productsRawJSON;
 @property (nonatomic, assign) NSInteger selectedIndex;
 @property (nonatomic, assign) BOOL didLoadOnce;
 @property (nonatomic, assign, getter=isLoading) BOOL loading;
@@ -156,6 +185,7 @@ static NSString * const kKBKeyboardSubscriptionCellId = @"kKBKeyboardSubscriptio
         return;
     }
     KBKeyboardSubscriptionProduct *product = self.products[self.selectedIndex];
+    [self kb_persistPrefillPayloadForProduct:product];
     if ([self.delegate respondsToSelector:@selector(subscriptionView:didTapPurchaseForProduct:)]) {
         [self.delegate subscriptionView:self didTapPurchaseForProduct:product];
     }
@@ -191,6 +221,7 @@ static NSString * const kKBKeyboardSubscriptionCellId = @"kKBKeyboardSubscriptio
                 NSString *tip = error.localizedDescription ?: KBLocalized(@"Network error");
                 [KBHUD showInfo:tip];
                 self.products = @[];
+                self.productsRawJSON = nil;
                 self.selectedIndex = NSNotFound;
                 [self.collectionView reloadData];
                 self.emptyLabel.hidden = NO;
@@ -203,12 +234,15 @@ static NSString * const kKBKeyboardSubscriptionCellId = @"kKBKeyboardSubscriptio
             }
             if (![dataObj isKindOfClass:[NSArray class]]) {
                 self.products = @[];
+                self.productsRawJSON = nil;
                 self.selectedIndex = NSNotFound;
                 [self.collectionView reloadData];
                 self.emptyLabel.hidden = NO;
                 [self updatePurchaseButtonState];
                 return;
             }
+            id sanitized = KBKeyboardSubscriptionSanitizeJSON(dataObj);
+            self.productsRawJSON = [sanitized isKindOfClass:NSArray.class] ? (NSArray *)sanitized : nil;
             NSArray *models = [KBKeyboardSubscriptionProduct mj_objectArrayWithKeyValuesArray:(NSArray *)dataObj];
             self.products = models ?: @[];
             self.selectedIndex = self.products.count > 0 ? 0 : NSNotFound;
@@ -221,6 +255,25 @@ static NSString * const kKBKeyboardSubscriptionCellId = @"kKBKeyboardSubscriptio
     }];
 }
 
+- (void)kb_persistPrefillPayloadForProduct:(KBKeyboardSubscriptionProduct *)product {
+    if (![product isKindOfClass:KBKeyboardSubscriptionProduct.class]) { return; }
+    if (![self.productsRawJSON isKindOfClass:NSArray.class] || self.productsRawJSON.count == 0) { return; }
+    NSUserDefaults *ud = [[NSUserDefaults alloc] initWithSuiteName:AppGroup];
+    if (!ud) { return; }
+    NSMutableDictionary *payload = [NSMutableDictionary dictionary];
+    payload[@"ts"] = @((long long)floor([NSDate date].timeIntervalSince1970));
+    payload[@"src"] = @"keyboard";
+    if (product.productId.length) {
+        payload[@"productId"] = product.productId;
+    }
+    if (self.selectedIndex != NSNotFound) {
+        payload[@"selectedIndex"] = @(self.selectedIndex);
+    }
+    payload[@"products"] = self.productsRawJSON;
+    [ud setObject:payload forKey:AppGroup_SubscriptionPrefillPayload];
+    [ud synchronize];
+}
+
 - (void)selectCurrentProductAnimated:(BOOL)animated {
     if (self.selectedIndex == NSNotFound || self.selectedIndex >= self.products.count) { return; }
     NSIndexPath *indexPath = [NSIndexPath indexPathForItem:self.selectedIndex inSection:0];
@@ -401,4 +454,3 @@ static NSString * const kKBKeyboardSubscriptionCellId = @"kKBKeyboardSubscriptio
 }
 
 @end
-