react-native-firework-sdk 1.9.0 → 1.10.0-beta.1

package/src/components/VideoFeed.tsx

@@ -48,6 +48,14 @@ export interface IVideoFeedProps {
    * The dynamic content parameters of the feed. Required when the source is set as dynamicContent.
    */
   dynamicContentParameters?: { [key: string]: string[] };
+  /**
+   * Hashtag filter expression is an s-expression used to provide feeds filtered by hashtags with specified criteria.
+   * Queries are specified with boolean predicates on what hashtags are there on the video.
+   * For instance, (and sport food) (or sport food) (and sport (or food comedy)) sport are all valid expressions.
+   * Non-UTF-8 characters are not allowed. If using boolean predicates, the expression needs to be wrapped with parenthesis.
+   * Only supported on iOS.
+   */
+  hashtagFilterExpression?: string;
   /**
    * One of three available display modes. Defaults to row.
    */
@@ -201,6 +209,7 @@ class VideoFeed extends React.Component<IVideoFeedProps> {
       mode = 'row',
       adConfiguration,
       enablePictureInPicture = false,
+      hashtagFilterExpression = '',
     } = this.props;
     const videoFeedConfiguration = this._getVideoFeedConfiguration();
     const titleHidden = videoFeedConfiguration?.title?.hidden ?? false;
@@ -250,6 +259,7 @@ class VideoFeed extends React.Component<IVideoFeedProps> {
     key += `_vastAttributes:${vastAttributesString}`;
     key += `_showAdBadge:${showAdBadge}`;
     key += `_appLanguage:${appLanguage}`;
+    key += `_hashtagFilterExpression:${hashtagFilterExpression}`;
 
     return (
       <FWVideoFeed

package/src/models/FWEventName.ts

@@ -13,6 +13,7 @@ export enum FWEventName {
   ShareBaseURLUpdated = 'fw:share-base-url-updated',
   AdBadgeConfigurationUpdated = 'fw:ad-badge-configuration-updated',
   AppLanguageUpdated = 'fw:app-language-updated',
+  NativeAppLanguageUpdated = 'fw:native-app-language-updated',
   LogMessage = 'fw:log-message',
   CustomLinkButtonClick = 'fw:shopping:custom-link-button-click',
 }

package/src/models/StoryBlockSource.ts

@@ -2,4 +2,5 @@ export type StoryBlockSource =
   | 'discover'
   | 'channel'
   | 'playlist'
-  | 'dynamicContent';
+  | 'dynamicContent'
+  | 'hashtagPlaylist';

package/src/models/VideoFeedSource.ts

@@ -3,4 +3,5 @@ export type VideoFeedSource =
   | 'channel'
   | 'playlist'
   | 'playlistGroup'
-  | 'dynamicContent';
+  | 'dynamicContent'
+  | 'hashtagPlaylist';

package/src/models/VideoPlaybackEventName.ts

@@ -7,6 +7,14 @@ enum VideoPlaybackEventName {
    * Video started.
    */
   Start = 'fw:video:start',
+  /**
+   * Video paused. Only supported on iOS.
+   */
+  Pause = 'fw:video:pause',
+  /**
+   * Video resume. Only supported on iOS.
+   */
+  Resume = 'fw:video:resume',
   /**
    * Video reached 25%.
    */
@@ -24,7 +32,11 @@ enum VideoPlaybackEventName {
    */
   Complete = 'fw:video:complete',
   /**
-   * When ad video finishes playing.
+   * Ad video started playing. Only supported on iOS.
+   */
+  AdStart = 'fw:video:ad-start',
+  /**
+   * Ad video completed playing.
    */
   AdEnd = 'fw:video:ad-end',
   /**

package/ios/Utils/AppLanguage/FWAppLanguageManager.swift

@@ -1,139 +0,0 @@
-//
-//  FWAppLanguageManager.swift
-//  
-//  Created by linjie jiang on 2023/2/7.
-//
-
-import Foundation
-
-private let appLanguageStorageKey = "firework_sdk_app_language_storage_key"
-
-public enum AppLanguageLayoutDirection: Int {
-    case ltr, rtl, unsupported
-}
-
-public class FWAppLanguageManager {
-    public static let shared = FWAppLanguageManager()
-
-    private var _systemLanguage: String?
-    private var _systemLanguageCode: String? {
-        guard let language = _systemLanguage else {
-            return nil
-        }
-
-        return FWLanguageUtil.getLanguageCode(language)
-    }
-    private var _hasInitialized: Bool = false
-
-    public var appLanguage: String? {
-        didSet {
-            if appLanguage != nil {
-                FWAppLanguageManager.swizzelMethods()
-                FWRTLManager.sharedInstance().enableHorizontalFlip = shouldHorizontalFlip
-            }
-        }
-    }
-
-    public var appLanguageCode: String? {
-        guard let language = appLanguage else {
-            return nil
-        }
-
-        return FWLanguageUtil.getLanguageCode(language)
-    }
-
-    public var appLanguageLayoutDirection: AppLanguageLayoutDirection? {
-        guard let languageCode = appLanguageCode else {
-            return nil
-        }
-        let direction = Locale.characterDirection(forLanguage: languageCode)
-        switch direction {
-        case .leftToRight:
-            return .ltr
-        case .rightToLeft:
-            return .rtl
-        default:
-            return .unsupported
-        }
-    }
-
-    public var shouldHorizontalFlip: Bool {
-        guard let appLanguageCode = appLanguageCode else {
-            return false
-        }
-
-        guard let systemLanguageCode = _systemLanguageCode else {
-            return false
-        }
-
-        let appLanguageDirection = Locale.characterDirection(forLanguage: appLanguageCode)
-        let systemLanguageDirection = Locale.characterDirection(forLanguage: systemLanguageCode)
-
-        if appLanguageDirection == .leftToRight, systemLanguageDirection == .rightToLeft {
-            return true
-        }
-
-        if appLanguageDirection == .rightToLeft, systemLanguageDirection == .leftToRight {
-            return true
-        }
-
-        return false
-    }
-
-    private static func swizzelMethods() {
-        DispatchQueue.once {
-            UIViewController.swizzleMethodsForViewController()
-            Bundle.swizzleMethodsForBundle()
-            URLSession.swizzleMethodsForURLSession()
-            NumberFormatter.swizzleMethodsForNumberFormatter()
-            UIImageView.swizzleMethodsForImageView()
-            UILabel.swizzleMethodsForLabel()
-            UITextField.swizzleMethodsForTextField()
-            UITextView.swizzleMethodsForTextView()
-            UIWindow.swizzleMethodsForWindow()
-            UIView.swizzleMethodsForView()
-        }
-    }
-
-    private init() {
-        initializeManager()
-    }
-
-    public func initializeManager() {
-        guard !_hasInitialized else {
-            return
-        }
-        _hasInitialized = true
-
-        self._systemLanguage = Locale.preferredLanguages.first
-        let cachedAppLanguage = UserDefaults.standard.object(forKey: appLanguageStorageKey) as? String
-        if FWLanguageUtil.isValidLanguage(cachedAppLanguage) {
-            self.appLanguage = cachedAppLanguage
-        }
-        #if DEBUG
-        print("""
-        FWAppLanguageManager init method
-        current app language: \(self.appLanguage ?? "")
-        system language: \(self._systemLanguage ?? "")
-        """)
-        #endif
-    }
-
-    public func changeAppLanguage(_ language: String?) -> Bool {
-        guard let language = language, language.count > 0 else {
-            appLanguage = nil
-            UserDefaults.standard.removeObject(forKey: appLanguageStorageKey)
-            UserDefaults.standard.synchronize()
-            return true
-        }
-
-        if FWLanguageUtil.isValidLanguage(language) {
-            appLanguage = language
-            UserDefaults.standard.set(language, forKey: appLanguageStorageKey)
-            UserDefaults.standard.synchronize()
-            return true
-        } else {
-            return false
-        }
-    }
-}

package/ios/Utils/FWRTL/Classes/Manager/FWRTLManager.h

@@ -1,25 +0,0 @@
-//
-//  FWRTLManager.h
-//  FWRTL
-//
-//  Created by ByteDance on 2018/9/10.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FWRTLManager : NSObject
-
-/**
- * Turn on / off FWRTL via this property.
- */
-@property (nonatomic, assign) BOOL enableHorizontalFlip;
-
-+ (instancetype)sharedInstance;
-
-- (void)registerUIElement:(UIView *)element;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/Utils/FWRTL/Classes/Manager/FWRTLManager.m

@@ -1,75 +0,0 @@
-//
-//  FWRTLManager.m
-//  FWRTL
-//
-//  Created by ByteDance on 2018/9/10.
-//
-
-#import "FWRTLManager.h"
-#import "UIView+FWRTL.h"
-#import "NSObject+FWRTLReloadBlock.h"
-#import "FWRTLDefinitions.h"
-
-@interface FWRTLManager ()
-
-@property (nonatomic, strong) NSPointerArray *registeredUIElements;
-
-@end
-
-@implementation FWRTLManager
-
-+ (instancetype)sharedInstance
-{
-    static FWRTLManager *manager;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        manager = [[FWRTLManager alloc] init];
-        manager.registeredUIElements = [NSPointerArray pointerArrayWithOptions:NSPointerFunctionsWeakMemory];
-    });
-    return manager;
-}
-
-- (void)registerUIElement:(UIView *)element
-{
-    [self.registeredUIElements addPointer:(__bridge void * _Nullable)(element)];
-}
-
-- (void)setEnableHorizontalFlip:(BOOL)enableHorizontalFlip
-{
-    if (enableHorizontalFlip == _enableHorizontalFlip) {
-        return;
-    }
-    _enableHorizontalFlip = enableHorizontalFlip;
-    NSInteger count = self.registeredUIElements.count;
-    NSMutableSet<UIView *> *rootViews = [NSMutableSet set];
-    for (NSInteger i = 0; i < count; i++) {
-        UIView *element = (UIView *)[self.registeredUIElements pointerAtIndex:i];
-        [element fwrtl_performReload];
-        if (!element) {
-            continue;
-        }
-        if (element.window && element.window != element) {
-            continue;
-        }
-        
-        [rootViews addObject:[self rootViewForView:element]];
-    }
-    
-    [rootViews enumerateObjectsUsingBlock:^(UIView * _Nonnull obj, BOOL * _Nonnull stop) {
-        [obj fwrtl_renewLayerTransformForceRecursively:YES];
-    }];
-}
-
-- (UIView *)rootViewForView:(UIView *)view
-{
-    if (view.window) {
-        return view.window;
-    }
-    UIView *rootView = view;
-    while (rootView.superview) {
-        rootView = rootView.superview;
-    }
-    return rootView;
-}
-
-@end

package/ios/Utils/FWRTL/Classes/UICategories/CALayer+FWRTL.h

@@ -1,21 +0,0 @@
-//
-//  CALayer+FWRTL.h
-//  FWRTL
-//
-//  Created by ByteDance on 2018/9/10.
-//
-
-#import <QuartzCore/QuartzCore.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CALayer (FWRTL)
-
-/**
- * Additional property for CALayer, which will be multiplied to the original transform before set.
- */
-@property (nonatomic, assign) CGAffineTransform fwrtl_basicTransform;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/Utils/FWRTL/Classes/UICategories/CALayer+FWRTL.m

@@ -1,124 +0,0 @@
-//
-//  CALayer+FWRTL.m
-//  FWRTL
-//
-//  Created by ByteDance on 2018/9/10.
-//
-
-#import "CALayer+FWRTL.h"
-#import "FWRTLDefinitions.h"
-#import "FWRTLManager.h"
-
-static BOOL shouldEnableHorizontalFlip = NO;
-
-@implementation CALayer (FWRTL)
-
-+ (void)load
-{
-    FWSwizzle(self, setAffineTransform:, fwrtl_setAffineTransform:);
-    FWSwizzle(self, affineTransform, fwrtl_affineTransform);
-    FWSwizzle(self, addAnimation:forKey:, fwrtl_addAnimation:forKey:);
-    FWSwizzle(self, renderInContext:, fwrtl_renderInContext:);
-}
-
-- (void)setFwrtl_basicTransform:(CGAffineTransform)fwrtl_basicTransform
-{
-    if (!objc_getAssociatedObject(self, @selector(fwrtl_basicTransform)) && CGAffineTransformIsIdentity(fwrtl_basicTransform)) {
-        return;
-    }
-    objc_setAssociatedObject(self, @selector(fwrtl_basicTransform), [NSValue valueWithCGAffineTransform:fwrtl_basicTransform], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-    self.affineTransform = self.affineTransform;
-}
-
-- (CGAffineTransform)fwrtl_basicTransform
-{
-    NSValue *value = objc_getAssociatedObject(self, _cmd);
-    return value ? [value CGAffineTransformValue] : CGAffineTransformIdentity;
-}
-
-- (void)setFwrtl_isRenderStartLayer:(BOOL)fwrtl_isRenderStartLayer
-{
-    objc_setAssociatedObject(self, @selector(fwrtl_isRenderStartLayer), @(fwrtl_isRenderStartLayer), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (BOOL)fwrtl_isRenderStartLayer
-{
-    return [objc_getAssociatedObject(self, _cmd) boolValue];
-}
-
-- (void)fwrtl_setAffineTransform:(CGAffineTransform)m
-{
-    if (!shouldEnableHorizontalFlip && [FWRTLManager sharedInstance].enableHorizontalFlip) {
-        shouldEnableHorizontalFlip = YES;
-    }
-    if (shouldEnableHorizontalFlip) {
-        objc_setAssociatedObject(self, @selector(fwrtl_affineTransform), [NSValue valueWithCGAffineTransform:m], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-        [self fwrtl_setAffineTransform:CGAffineTransformConcat(self.fwrtl_basicTransform, m)];
-    } else {
-        [self fwrtl_setAffineTransform:m];
-    }
-}
-
-- (CGAffineTransform)fwrtl_affineTransform
-{
-    if (!shouldEnableHorizontalFlip && [FWRTLManager sharedInstance].enableHorizontalFlip) {
-        shouldEnableHorizontalFlip = YES;
-    }
-    if (shouldEnableHorizontalFlip) {
-        NSValue *value = objc_getAssociatedObject(self, @selector(fwrtl_affineTransform));
-        return value ? [value CGAffineTransformValue] : [self fwrtl_affineTransform];
-    } else {
-        return [self fwrtl_affineTransform];
-    }
-}
-
-- (void)fwrtl_addAnimation:(CAAnimation *)anim forKey:(NSString *)key
-{
-    if ([anim isKindOfClass:[CABasicAnimation class]]) {
-        CABasicAnimation *basicAnim = (CABasicAnimation *)anim;
-        if ([basicAnim.keyPath hasPrefix:@"transform.scale"] && self.fwrtl_basicTransform.a == -1) {
-            basicAnim.fromValue = @([basicAnim.fromValue floatValue] * -1);
-            basicAnim.toValue = @([basicAnim.toValue floatValue] * -1);
-        }
-    }
-    [self fwrtl_addAnimation:anim forKey:key];
-}
-
-- (void)fwrtl_renderInContext:(CGContextRef)ctx
-{
-    if (!shouldEnableHorizontalFlip && [FWRTLManager sharedInstance].enableHorizontalFlip) {
-        shouldEnableHorizontalFlip = YES;
-    }
-    if (shouldEnableHorizontalFlip) {
-        BOOL isRenderStartLayer = YES;
-        CGAffineTransform allSuperLayerTransform = self.fwrtl_basicTransform;
-        CALayer *layer = self;
-        while (layer.superlayer) {
-            layer = layer.superlayer;
-            if ([layer fwrtl_isRenderStartLayer]) {
-                isRenderStartLayer = NO;
-                break;
-            }
-            allSuperLayerTransform = CGAffineTransformConcat(layer.fwrtl_basicTransform, allSuperLayerTransform);
-        }
-        if (isRenderStartLayer) {
-            [self setFwrtl_isRenderStartLayer:YES];
-            if (allSuperLayerTransform.a == -1) {
-                CGContextSaveGState(ctx);
-                CGContextConcatCTM(ctx, CGAffineTransformMakeScale(-1, 1));
-                CGContextTranslateCTM(ctx, -self.bounds.size.width, 0);
-            }
-        }
-        [self fwrtl_renderInContext:ctx];
-        if (isRenderStartLayer) {
-            [self setFwrtl_isRenderStartLayer:NO];
-            if (allSuperLayerTransform.a == -1) {
-                CGContextRestoreGState(ctx);
-            }
-        }
-    } else {
-        [self fwrtl_renderInContext:ctx];
-    }
-}
-
-@end

package/ios/Utils/FWRTL/Classes/UICategories/FWRTLRemoteViewControllerAdaptor.h

@@ -1,11 +0,0 @@
-//
-//  UIWebView+FWRTL.h
-//  FWRTL
-//
-//  Created by ByteDance on 2018/10/9.
-//
-
-#import <UIKit/UIKit.h>
-#import <WebKit/WebKit.h>
-#import <SafariServices/SafariServices.h>
-#import <StoreKit/StoreKit.h>

package/ios/Utils/FWRTL/Classes/UICategories/FWRTLRemoteViewControllerAdaptor.m

@@ -1,86 +0,0 @@
-//
-//  UIWebView+FWRTL.m
-//  FWRTL
-//
-//  Created by ByteDance on 2018/10/9.
-//
-
-#import "FWRTLRemoteViewControllerAdaptor.h"
-#import "UIView+FWRTL.h"
-#import "FWRTLDefinitions.h"
-#import "FWRTLManager.h"
-
-@implementation SFSafariViewController (FWRTL)
-
-+ (void)load
-{
-    FWSwizzle(self, viewDidLoad, alpweb_viewDidLoad);
-}
-
-- (void)alpweb_viewDidLoad
-{
-    [self alpweb_viewDidLoad];
-    self.view.fwrtl_viewType = FWRTLViewTypeNormalWithAllDescendants;
-}
-
-@end
-
-@implementation SKCloudServiceSetupViewController (FWRTL)
-
-+ (void)load
-{
-    FWSwizzle(self, viewDidLoad, alpsk_viewDidLoad);
-}
-
-- (void)alpsk_viewDidLoad
-{
-    [self alpsk_viewDidLoad];
-    self.view.fwrtl_viewType = FWRTLViewTypeNormalWithAllDescendants;
-}
-
-@end
-
-@implementation UIActivityViewController (FWRTL)
-
-+ (void)load
-{
-    FWSwizzle(self, viewDidLoad, fwrtl_act_viewDidLoad);
-}
-
-- (void)fwrtl_act_viewDidLoad
-{
-    [self fwrtl_act_viewDidLoad];
-    self.view.fwrtl_viewType = FWRTLViewTypeNormalWithAllDescendants;
-}
-
-@end
-
-@implementation UIImagePickerController (FWRTL)
-
-+ (void)load
-{
-    FWSwizzle(self, loadView, fwrtl_act_loadView);
-}
-
-- (void)fwrtl_act_loadView
-{
-    [self fwrtl_act_loadView];
-    self.view.fwrtl_viewType = FWRTLViewTypeNormalWithAllDescendants;
-}
-
-@end
-
-@implementation SKStoreProductViewController (FWRTL)
-
-+ (void)load
-{
-    FWSwizzle(self, loadView, fwrtl_act_loadView);
-}
-
-- (void)fwrtl_act_loadView
-{
-    [self fwrtl_act_loadView];
-    self.view.fwrtl_viewType = FWRTLViewTypeNormalWithAllDescendants;
-}
-
-@end

package/ios/Utils/FWRTL/Classes/UICategories/FWRTLWhiteListManager.h

@@ -1,16 +0,0 @@
-//
-//  FWRTLWhiteListManager.h
-//  FWRTL
-//
-//  Created by ByteDance on 2018/12/6.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FWRTLWhiteListManager : NSObject
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/Utils/FWRTL/Classes/UICategories/FWRTLWhiteListManager.m

@@ -1,55 +0,0 @@
-//
-//  FWRTLWhiteListManager.m
-//  FWRTL
-//
-//  Created by ByteDanceon 2018/12/6.
-//
-
-#import "FWRTLWhiteListManager.h"
-#import "UIView+FWRTL.h"
-#import <objc/runtime.h>
-#import "FWRTLManager.h"
-#import "UIView+FWRTL.h"
-#import "NSObject+FWRTLReloadBlock.h"
-#import "FWRTLDefinitions.h"
-
-@implementation FWRTLWhiteListManager
-
-+ (void)load
-{
-    NSArray<NSString *> *noFlipWhiteListClasses = @[@"UILabel", @"UITextView", @"UITextField", @"UIWebView", @"WKWebView", @"UIImageView", @"UISearchBar", @"PUPhotosSectionHeaderContentView", @"UITableViewIndex", FWBase64Decode(@"X1VJUmVtb3RlVmlldw==") /* _UIRemoteView */ , FWBase64Decode(@"VUlBdXRvY29ycmVjdFRleHRWaWV3") /* UIAutocorrectTextView */ ];
-    [noFlipWhiteListClasses enumerateObjectsUsingBlock:^(NSString * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        BOOL shouldFlip = NO;
-        BOOL shouldInherit = NO;
-        if ([obj hasPrefix:@"!"]) {
-            shouldFlip = YES;
-            obj = [obj substringFromIndex:1];
-        }
-        if ([obj hasSuffix:@"!"]) {
-            shouldInherit = YES;
-            obj = [obj substringToIndex:obj.length - 1];
-        }
-        Class class = NSClassFromString(obj);
-        SEL sel = NSSelectorFromString(@"fwrtl_automaticViewType");
-        if (!class) {
-            return;
-        }
-        IMP implementation = imp_implementationWithBlock(^(NSObject *self) {
-            if (shouldInherit) {
-                return shouldFlip ? FWRTLViewTypeFlipWithAllDescendants : FWRTLViewTypeNormalWithAllDescendants;
-            } else {
-                return shouldFlip ? FWRTLViewTypeFlip : FWRTLViewTypeNormal;
-            }
-        });
-        if (!class_addMethod(class, sel, implementation, method_getTypeEncoding(class_getInstanceMethod([UIView class], @selector(fwrtl_automaticViewType))))) {
-            Method method = class_getInstanceMethod(class, sel);
-            if (!method) {
-                return;
-            }
-            
-            method_setImplementation(method, implementation);
-        }
-    }];
-}
-
-@end

package/ios/Utils/FWRTL/Classes/UICategories/UILabel+FWRTL.h

@@ -1,18 +0,0 @@
-//
-//  UILabel+FWRTL.h
-//  FWRTL
-//
-//  Created by ByteDance on 2018/12/6.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface UILabel (FWRTL)
-
-- (BOOL)fwrtl_shouldUseCalculatedTextAlignment;
-
-@end
-
-NS_ASSUME_NONNULL_END