react-native-firework-sdk 2.1.0 → 2.2.0

package/ios/FireworkVideoUI/FireworkVideoUI/FireworkVideoUI.docc/FireworkVideoUI.md

@@ -0,0 +1,13 @@
+# ``FireworkVideoUI``
+
+<!--@START_MENU_TOKEN@-->Summary<!--@END_MENU_TOKEN@-->
+
+## Overview
+
+<!--@START_MENU_TOKEN@-->Text<!--@END_MENU_TOKEN@-->
+
+## Topics
+
+### <!--@START_MENU_TOKEN@-->Group<!--@END_MENU_TOKEN@-->
+
+- <!--@START_MENU_TOKEN@-->``Symbol``<!--@END_MENU_TOKEN@-->

package/ios/FireworkVideoUI/FireworkVideoUI/FireworkVideoUI.h

@@ -0,0 +1,18 @@
+//
+//  FireworkVideoUI.h
+//  FireworkVideoUI
+//
+//  Created by linjie jiang on 4/25/23.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for FireworkVideoUI.
+FOUNDATION_EXPORT double FireworkVideoUIVersionNumber;
+
+//! Project version string for FireworkVideoUI.
+FOUNDATION_EXPORT const unsigned char FireworkVideoUIVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <FireworkVideoUI/PublicHeader.h>
+
+

package/ios/FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/AppLanguageManager.swift

@@ -0,0 +1,147 @@
+//
+//  AppLanguageManager.swift
+//  
+//  Created by linjie jiang on 2023/2/7.
+//
+
+import UIKit
+
+private let appLanguageStorageKey = "firework_sdk_app_language_storage_key"
+
+enum AppLanguageLayoutDirection: Int {
+    case ltr, rtl, unsupported
+}
+
+/// The manager of supporting app language
+public class AppLanguageManager {
+    public struct NotificationName {
+        /// The notification name for language change
+        public static let AppLanguageChanged = Notification.Name(
+            rawValue: "firework.notification.name.appLanguageChanged"
+        )
+    }
+
+    public static let shared = AppLanguageManager()
+
+    var systemLanguage: String?
+    private var systemLanguageCode: String? {
+        guard let language = systemLanguage else {
+            return nil
+        }
+
+        return LanguageUtil.getLanguageCode(language)
+    }
+
+    /// Get current app language.
+    public private(set) var appLanguage: String? {
+        didSet {
+            if appLanguage != nil {
+                AppLanguageManager.swizzelMethods()
+                LayoutFlipManager.shared.enableHorizontalFlip = shouldHorizontalFlip
+            }
+
+            if appLanguage != oldValue {
+                NotificationCenter.default.post(name: NotificationName.AppLanguageChanged, object: nil)
+            }
+        }
+    }
+
+    var appLanguageCode: String? {
+        guard let language = appLanguage else {
+            return nil
+        }
+
+        return LanguageUtil.getLanguageCode(language)
+    }
+
+    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
+        }
+    }
+
+    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.swizzleViewControllerMethodsForAppLanguage()
+            Bundle.swizzleBundleMethodsForAppLanguage()
+            URLSession.swizzleURLSessionMethodsForAppLanguage()
+            NumberFormatter.swizzleNumberFormatterMethodsForAppLanguage()
+            UIImageView.swizzleImageViewMethodsForAppLanguage()
+            UILabel.swizzleLabelMethodsForAppLanguage()
+            UITextField.swizzleTextFieldMethodsForAppLanguage()
+            UITextView.swizzleTextViewMethodsForAppLanguage()
+            UIWindow.swizzleWindowMethodsForAppLanguage()
+            UIView.swizzleViewMethodsForAppLanguage()
+        }
+
+        LayoutFlipManager.swizzelMethods()
+    }
+
+    private init() {
+        initializeManager()
+    }
+
+    private func initializeManager() {
+        self.systemLanguage = Locale.preferredLanguages.first
+        let cachedAppLanguage = UserDefaults.standard.object(forKey: appLanguageStorageKey) as? String
+        if LanguageUtil.isValidLanguage(cachedAppLanguage) {
+            self.appLanguage = cachedAppLanguage
+        }
+    }
+
+    /// Change app language
+    ///
+    /// - Parameters:
+    ///    - language: app language. We will use system langauge when language is nil.
+    /// - Returns: The result of changing app language.
+    @discardableResult
+    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 LanguageUtil.isValidLanguage(language) {
+            appLanguage = language
+            UserDefaults.standard.set(language, forKey: appLanguageStorageKey)
+            UserDefaults.standard.synchronize()
+            return true
+        } else {
+            return false
+        }
+    }
+}

package/ios/{Utils/AppLanguage/Bundle+FWSwizzle.swift → FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/Foundation/Bundle+AppLanguage.swift}

@@ -1,5 +1,5 @@
 //
-//  Bundle+FWSwizzle.swift
+//  Bundle+AppLanguage.swift
 //  
 //  Created by linjie jiang on 2023/2/7.
 //
@@ -7,9 +7,9 @@
 import Foundation
 import FireworkVideo
 
-public extension Bundle {
-    static func swizzleMethodsForBundle() {
-        FWSwizzleUtil.swizzleSelector(
+extension Bundle {
+    static func swizzleBundleMethodsForAppLanguage() {
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: #selector(Bundle.localizedString(forKey:value:table:)),
             customSelector: #selector(Bundle.fw_localizedString(forKey:value:table:)))
@@ -20,8 +20,8 @@ public extension Bundle {
         value: String?,
         table tableName: String?
     ) -> String {
-        if let language = FWAppLanguageManager.shared.appLanguage,
-           let languageCode = FWAppLanguageManager.shared.appLanguageCode,
+        if let language = AppLanguageManager.shared.appLanguage,
+           let languageCode = AppLanguageManager.shared.appLanguageCode,
            Bundle(for: FireworkVideoSDK.self) == self {
             let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
 
@@ -38,7 +38,7 @@ public extension Bundle {
                     return item != "Base" && item != "en"
                 }
                 if let targeLanguage = targeLanguageList.first(where: { item in
-                    let targeLanguageCode = FWLanguageUtil.getLanguageCode(item)
+                    let targeLanguageCode = LanguageUtil.getLanguageCode(item)
                     return languageCode == targeLanguageCode
                 }) {
                     languageBundlePath = iOSSDKBundle.path(forResource: targeLanguage, ofType: "lproj")

package/ios/{Utils/AppLanguage/NumberFormatter+FWSwizzle.swift → FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/Foundation/NumberFormatter+AppLanguage.swift}

@@ -1,21 +1,21 @@
 //
-//  NumberFormatter+FWSwizzle.swift
+//  NumberFormatter+AppLanguage.swift
 //  
 //  Created by linjie jiang on 2023/2/20.
 //
 
 import Foundation
 
-public extension NumberFormatter {
-    static func swizzleMethodsForNumberFormatter() {
-        FWSwizzleUtil.swizzleSelector(
+extension NumberFormatter {
+    static func swizzleNumberFormatterMethodsForAppLanguage() {
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: #selector(NumberFormatter.string(from:)),
             customSelector: #selector(NumberFormatter.fw_string(from:)))
     }
 
     @objc func fw_string(from number: NSNumber) -> String? {
-        if let language = FWAppLanguageManager.shared.appLanguage,
+        if let language = AppLanguageManager.shared.appLanguage,
            self.numberStyle == .currency {
             self.locale = Locale(identifier: language)
         }

package/ios/{Utils/AppLanguage/URLSession+FWSwizzle.swift → FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/Foundation/URLSession+AppLanguage.swift}

@@ -1,5 +1,5 @@
 //
-//  URLSession+FWSwizzle.swift
+//  URLSession+AppLanguage.swift
 //  
 //  Created by linjie jiang on 2023/2/20.
 //
@@ -11,19 +11,19 @@ private var FWHostList: [String] = [
     "p2.fwpixel.com"
 ]
 
-public extension URLSession {
-    static func swizzleMethodsForURLSession() {
+extension URLSession {
+    static func swizzleURLSessionMethodsForAppLanguage() {
         // swiftlint:disable:next line_length
         let orginalSelector1 = #selector(URLSession.dataTask(with:completionHandler:) as (URLSession) -> (URLRequest, @escaping (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask)
         let customSelector1 = #selector(URLSession.fw_dataTask(with:completionHandler:))
-        FWSwizzleUtil.swizzleSelector(
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: orginalSelector1,
             customSelector: customSelector1)
         // swiftlint:disable:next line_length
         let orginalSelector2 = #selector(URLSession.dataTask(with:) as (URLSession) -> (URLRequest) -> URLSessionDataTask)
         let customSelector2 = #selector(URLSession.fw_dataTask(with:))
-        FWSwizzleUtil.swizzleSelector(
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: orginalSelector2,
             customSelector: customSelector2)
@@ -52,8 +52,8 @@ public extension URLSession {
         host = request.url?.host ?? ""
         #endif
 
-        if let language = FWAppLanguageManager.shared.appLanguage,
-           let languageCode = FWAppLanguageManager.shared.appLanguageCode,
+        if let language = AppLanguageManager.shared.appLanguage,
+           let languageCode = AppLanguageManager.shared.appLanguageCode,
            FWHostList.contains(host) {
             var mutableRequest = request
             if language != languageCode {

package/ios/{Utils/AppLanguage/UIImageView+FWSwizzle.swift → FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/UIKit/UIImageView+AppLanguage.swift}

@@ -1,5 +1,5 @@
 //
-//  UIImageView+FWSwizzle.swift
+//  UIImageView+AppLanguage.swift
 //
 //  Created by linjie jiang on 2023/2/22.
 //
@@ -16,17 +16,17 @@ private let FWImageNamesWithDirections: [String] = [
 ]
 
 extension UIImageView {
-    static func swizzleMethodsForImageView() {
-        FWSwizzleUtil.swizzleSelector(
+    static func swizzleImageViewMethodsForAppLanguage() {
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: #selector(UIImageView.didMoveToWindow),
             customSelector: #selector(UIImageView.fw_imageViewDidMoveToWindow))
-        FWSwizzleUtil.swizzleSelector(
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: #selector(setter: UIImageView.image),
             customSelector: #selector(UIImageView.fw_setImage(_:))
         )
-        FWSwizzleUtil.swizzleSelector(
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: #selector(UIImageView.awakeFromNib),
             customSelector: #selector(UIImageView.fw_imageViewAwakeFromNib)
@@ -49,7 +49,7 @@ extension UIImageView {
     }
 
     private func updateViewType(_ image: UIImage?) {
-        self.fwrtl_viewType = shouldFlipImage(image) ? FWRTLViewTypeFlip : FWRTLViewTypeAuto
+        self.viewType = shouldFlipImage(image) ? .flip : .auto
     }
 
     private func shouldFlipImage(_ image: UIImage?) -> Bool {
@@ -57,7 +57,7 @@ extension UIImageView {
             return false
         }
 
-        if FWAppLanguageManager.shared.shouldHorizontalFlip, self.isIOSSDKView {
+        if AppLanguageManager.shared.shouldHorizontalFlip, self.isIOSSDKView {
             let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
 
             for imageName in FWImageNamesWithDirections {
@@ -80,7 +80,7 @@ extension UIImageView {
             }
         }
 
-        if FWAppLanguageManager.shared.shouldHorizontalFlip,
+        if AppLanguageManager.shared.shouldHorizontalFlip,
            image.flipsForRightToLeftLayoutDirection == true,
            self.isIOSSDKView {
             return true

package/ios/{Utils/AppLanguage/UILabel+FWSwizzle.swift → FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/UIKit/UILabel+AppLanguage.swift}

@@ -1,5 +1,5 @@
 //
-//  UILabel+FWSwizzle.swift
+//  UILabel+AppLanguage.swift
 //
 //  Created by linjie jiang on 2023/2/22.
 //
@@ -8,39 +8,39 @@ import UIKit
 
 extension UILabel {
     private struct AssociatedKeys {
-        static var fwHasCalculatedTextAlignment = "fwHasCalculatedTextAlignmentKey"
+        static var hasCalculatedTextAlignment = "hasCalculatedTextAlignmentKey"
     }
 
-    private var fwHasCalculatedTextAlignment: Bool {
+    private var hasCalculatedTextAlignment: Bool {
         get {
-            let result = objc_getAssociatedObject(self, &AssociatedKeys.fwHasCalculatedTextAlignment) as? Bool
+            let result = objc_getAssociatedObject(self, &AssociatedKeys.hasCalculatedTextAlignment) as? Bool
             return result ?? false
         }
 
         set {
             objc_setAssociatedObject(
                 self,
-                &AssociatedKeys.fwHasCalculatedTextAlignment,
+                &AssociatedKeys.hasCalculatedTextAlignment,
                 newValue,
                 .OBJC_ASSOCIATION_RETAIN_NONATOMIC
             )
         }
     }
 
-    static func swizzleMethodsForLabel() {
-        FWSwizzleUtil.swizzleSelector(cls: self,
+    static func swizzleLabelMethodsForAppLanguage() {
+        Swizzle.swizzleSelector(cls: self,
                                     originalSelector: #selector(setter: UILabel.textAlignment),
                                     customSelector: #selector(UILabel.fw_setLabelTextAlignment(_:)))
-        FWSwizzleUtil.swizzleSelector(cls: self,
+        Swizzle.swizzleSelector(cls: self,
                                     originalSelector: #selector(UILabel.didMoveToWindow),
                                     customSelector: #selector(UILabel.fw_labelDidMoveToWindow))
-        FWSwizzleUtil.swizzleSelector(cls: self,
+        Swizzle.swizzleSelector(cls: self,
                                       originalSelector: #selector(UILabel.removeFromSuperview),
                                     customSelector: #selector(UILabel.fw_labelRemoveFromSuperview))
     }
 
     @objc func fw_setLabelTextAlignment(_ textAlignment: NSTextAlignment) {
-        self.fwrtl_addReloadBlock(forKey: "alignment") { [weak self] in
+        addReloadClosure(key: "alignment") { [weak self] in
             guard let self = self else {
                 return
             }
@@ -52,7 +52,7 @@ extension UILabel {
     @objc func fw_labelDidMoveToWindow() {
         fw_labelDidMoveToWindow()
         if shouldCalculateTextAlignment(),
-           !self.fwHasCalculatedTextAlignment,
+           !self.hasCalculatedTextAlignment,
            self.isIOSSDKView {
             self.textAlignment = self.textAlignment
         }
@@ -60,13 +60,13 @@ extension UILabel {
 
     @objc func fw_labelRemoveFromSuperview() {
         fw_labelRemoveFromSuperview()
-        self.fwHasCalculatedTextAlignment = false
+        self.hasCalculatedTextAlignment = false
     }
 
     private func calculatedTextAlignment(_ textAlignment: NSTextAlignment) -> NSTextAlignment {
         if shouldCalculateTextAlignment(),
-           let layoutDirection = FWAppLanguageManager.shared.appLanguageLayoutDirection {
-            self.fwHasCalculatedTextAlignment = true
+           let layoutDirection = AppLanguageManager.shared.appLanguageLayoutDirection {
+            self.hasCalculatedTextAlignment = true
             if layoutDirection == .rtl {
                 if textAlignment == .center {
                     return textAlignment
@@ -85,11 +85,11 @@ extension UILabel {
     }
 
     private func shouldCalculateTextAlignment() -> Bool {
-        if FWAppLanguageManager.shared.shouldHorizontalFlip,
+        if AppLanguageManager.shared.shouldHorizontalFlip,
            self.isIOSSDKView,
-           let layoutDirection = FWAppLanguageManager.shared.appLanguageLayoutDirection,
+           let layoutDirection = AppLanguageManager.shared.appLanguageLayoutDirection,
            layoutDirection != .unsupported,
-           fwrtl_shouldUseCalculatedTextAlignment() {
+           shouldUseCalculatedTextAlignment() {
             return true
         }
 

package/ios/{Utils/AppLanguage/UITextField+FWSwizzle.swift → FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/UIKit/UITextField+AppLanguage.swift}

@@ -1,5 +1,5 @@
 //
-//  UITextField+FWSwizzle.swift
+//  UITextField+AppLanguage.swift
 //
 //  Created by linjie jiang on 2023/2/23.
 //
@@ -8,39 +8,39 @@ import UIKit
 
 extension UITextField {
     private struct AssociatedKeys {
-        static var fwHasCalculatedTextAlignment = "fwHasCalculatedTextAlignmentKey"
+        static var hasCalculatedTextAlignment = "hasCalculatedTextAlignmentKey"
     }
 
-    private var fwHasCalculatedTextAlignment: Bool {
+    private var hasCalculatedTextAlignment: Bool {
         get {
-            let result = objc_getAssociatedObject(self, &AssociatedKeys.fwHasCalculatedTextAlignment) as? Bool
+            let result = objc_getAssociatedObject(self, &AssociatedKeys.hasCalculatedTextAlignment) as? Bool
             return result ?? false
         }
 
         set {
             objc_setAssociatedObject(
                 self,
-                &AssociatedKeys.fwHasCalculatedTextAlignment,
+                &AssociatedKeys.hasCalculatedTextAlignment,
                 newValue,
                 .OBJC_ASSOCIATION_RETAIN_NONATOMIC
             )
         }
     }
 
-    static func swizzleMethodsForTextField() {
-        FWSwizzleUtil.swizzleSelector(cls: self,
+    static func swizzleTextFieldMethodsForAppLanguage() {
+        Swizzle.swizzleSelector(cls: self,
                                     originalSelector: #selector(setter: UITextField.textAlignment),
                                     customSelector: #selector(UITextField.fw_setTextFieldTextAlignment(_:)))
-        FWSwizzleUtil.swizzleSelector(cls: self,
+        Swizzle.swizzleSelector(cls: self,
                                     originalSelector: #selector(UITextField.didMoveToWindow),
                                     customSelector: #selector(UITextField.fw_textFieldDidMoveToWindow))
-        FWSwizzleUtil.swizzleSelector(cls: self,
+        Swizzle.swizzleSelector(cls: self,
                                       originalSelector: #selector(UITextField.removeFromSuperview),
                                     customSelector: #selector(UITextField.fw_textFieldRemoveFromSuperview))
     }
 
     @objc func fw_setTextFieldTextAlignment(_ textAlignment: NSTextAlignment) {
-        self.fwrtl_addReloadBlock(forKey: "alignment") { [weak self] in
+        addReloadClosure(key: "alignment") { [weak self] in
             guard let self = self else {
                 return
             }
@@ -52,7 +52,7 @@ extension UITextField {
     @objc func fw_textFieldDidMoveToWindow() {
         fw_textFieldDidMoveToWindow()
         if shouldCalculateTextAlignment(),
-           !self.fwHasCalculatedTextAlignment,
+           !self.hasCalculatedTextAlignment,
            self.isIOSSDKView {
             self.textAlignment = self.textAlignment
         }
@@ -60,13 +60,13 @@ extension UITextField {
 
     @objc func fw_textFieldRemoveFromSuperview() {
         fw_textFieldRemoveFromSuperview()
-        self.fwHasCalculatedTextAlignment = false
+        self.hasCalculatedTextAlignment = false
     }
 
     private func calculatedTextAlignment(_ textAlignment: NSTextAlignment) -> NSTextAlignment {
         if shouldCalculateTextAlignment(),
-           let layoutDirection = FWAppLanguageManager.shared.appLanguageLayoutDirection {
-            self.fwHasCalculatedTextAlignment = true
+           let layoutDirection = AppLanguageManager.shared.appLanguageLayoutDirection {
+            self.hasCalculatedTextAlignment = true
             if layoutDirection == .rtl {
                 if textAlignment == .center {
                     return textAlignment
@@ -85,9 +85,9 @@ extension UITextField {
     }
 
     private func shouldCalculateTextAlignment() -> Bool {
-        if FWAppLanguageManager.shared.shouldHorizontalFlip,
+        if AppLanguageManager.shared.shouldHorizontalFlip,
            self.isIOSSDKView,
-           let layoutDirection = FWAppLanguageManager.shared.appLanguageLayoutDirection,
+           let layoutDirection = AppLanguageManager.shared.appLanguageLayoutDirection,
            layoutDirection != .unsupported {
             return true
         }

package/ios/{Utils/AppLanguage/UITextView+FWSwizzle.swift → FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/UIKit/UITextView+AppLanguage.swift}

@@ -1,5 +1,5 @@
 //
-//  UITextView+FWSwizzle.swift
+//  UITextView+AppLanguage.swift
 //
 //  Created by linjie jiang on 2023/2/23.
 //
@@ -8,39 +8,39 @@ import UIKit
 
 extension UITextView {
     private struct AssociatedKeys {
-        static var fwHasCalculatedTextAlignment = "fwHasCalculatedTextAlignmentKey"
+        static var hasCalculatedTextAlignment = "hasCalculatedTextAlignmentKey"
     }
 
-    private var fwHasCalculatedTextAlignment: Bool {
+    private var hasCalculatedTextAlignment: Bool {
         get {
-            let result = objc_getAssociatedObject(self, &AssociatedKeys.fwHasCalculatedTextAlignment) as? Bool
+            let result = objc_getAssociatedObject(self, &AssociatedKeys.hasCalculatedTextAlignment) as? Bool
             return result ?? false
         }
 
         set {
             objc_setAssociatedObject(
                 self,
-                &AssociatedKeys.fwHasCalculatedTextAlignment,
+                &AssociatedKeys.hasCalculatedTextAlignment,
                 newValue,
                 .OBJC_ASSOCIATION_RETAIN_NONATOMIC
             )
         }
     }
 
-    static func swizzleMethodsForTextView() {
-        FWSwizzleUtil.swizzleSelector(cls: self,
+    static func swizzleTextViewMethodsForAppLanguage() {
+        Swizzle.swizzleSelector(cls: self,
                                     originalSelector: #selector(setter: UITextView.textAlignment),
                                     customSelector: #selector(UITextView.fw_setTextViewTextAlignment(_:)))
-        FWSwizzleUtil.swizzleSelector(cls: self,
+        Swizzle.swizzleSelector(cls: self,
                                     originalSelector: #selector(UITextView.didMoveToWindow),
                                     customSelector: #selector(UITextView.fw_textViewDidMoveToWindow))
-        FWSwizzleUtil.swizzleSelector(cls: self,
+        Swizzle.swizzleSelector(cls: self,
                                       originalSelector: #selector(UITextView.removeFromSuperview),
                                     customSelector: #selector(UITextView.fw_textViewRemoveFromSuperview))
     }
 
     @objc func fw_setTextViewTextAlignment(_ textAlignment: NSTextAlignment) {
-        self.fwrtl_addReloadBlock(forKey: "alignment") { [weak self] in
+        addReloadClosure(key: "alignment") { [weak self] in
             guard let self = self else {
                 return
             }
@@ -52,7 +52,7 @@ extension UITextView {
     @objc func fw_textViewDidMoveToWindow() {
         fw_textViewDidMoveToWindow()
         if shouldCalculateTextAlignment(),
-           !self.fwHasCalculatedTextAlignment,
+           !self.hasCalculatedTextAlignment,
            self.isIOSSDKView {
             self.textAlignment = self.textAlignment
         }
@@ -60,13 +60,13 @@ extension UITextView {
 
     @objc func fw_textViewRemoveFromSuperview() {
         fw_textViewRemoveFromSuperview()
-        self.fwHasCalculatedTextAlignment = false
+        self.hasCalculatedTextAlignment = false
     }
 
     private func calculatedTextAlignment(_ textAlignment: NSTextAlignment) -> NSTextAlignment {
         if shouldCalculateTextAlignment(),
-           let layoutDirection = FWAppLanguageManager.shared.appLanguageLayoutDirection {
-            self.fwHasCalculatedTextAlignment = true
+           let layoutDirection = AppLanguageManager.shared.appLanguageLayoutDirection {
+            self.hasCalculatedTextAlignment = true
             if layoutDirection == .rtl {
                 if textAlignment == .center {
                     return textAlignment
@@ -85,9 +85,9 @@ extension UITextView {
     }
 
     private func shouldCalculateTextAlignment() -> Bool {
-        if FWAppLanguageManager.shared.shouldHorizontalFlip,
+        if AppLanguageManager.shared.shouldHorizontalFlip,
            self.isIOSSDKView,
-           let layoutDirection = FWAppLanguageManager.shared.appLanguageLayoutDirection,
+           let layoutDirection = AppLanguageManager.shared.appLanguageLayoutDirection,
            layoutDirection != .unsupported {
             return true
         }

package/ios/{Utils/AppLanguage/UIView+FWSwizzle.swift → FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/UIKit/UIView+AppLanguage.swift}

@@ -1,5 +1,5 @@
 //
-//  UIView+FWSwizzle.swift
+//  UIView+AppLanguage.swift
 //
 //  Created by linjie jiang on 2023/3/11.
 //
@@ -8,13 +8,13 @@ import UIKit
 import FireworkVideo
 
 extension UIView {
-    static func swizzleMethodsForView() {
-        FWSwizzleUtil.swizzleSelector(
+    static func swizzleViewMethodsForAppLanguage() {
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: #selector(UIView.init(frame:)),
             customSelector: #selector(UIView.fw_init(frame:))
         )
-        FWSwizzleUtil.swizzleSelector(
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: #selector(UIView.awakeFromNib),
             customSelector: #selector(UIView.fw_viewAwakeFromNib)
@@ -24,15 +24,15 @@ extension UIView {
     @objc func fw_init(frame: CGRect) -> UIView {
         let view = self.fw_init(frame: frame)
         if view is FireworkPlayerView {
-            view.fwrtl_viewType = FWRTLViewTypeNormal
+            view.viewType = .normal
         }
         return view
     }
 
     @objc func fw_viewAwakeFromNib() {
         self.fw_viewAwakeFromNib()
-        if self is FireworkPlayerView, FWAppLanguageManager.shared.shouldHorizontalFlip {
-            self.fwrtl_viewType = FWRTLViewTypeNormal
+        if self is FireworkPlayerView, AppLanguageManager.shared.shouldHorizontalFlip {
+            self.viewType = .normal
         }
     }
 }