feat: use swift code which is closer to original swift lib

Author: maitrungduc1410

LoaderKit.podspec

@@ -13,10 +13,8 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/maitrungduc1410/react-native-loader-kit.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,cpp}"
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.private_header_files = "ios/**/*.h"
 
-  s.dependency "NVActivityIndicatorView-ObjC"
-
   install_modules_dependencies(s)
 end

example/ios/Podfile.lock

@@ -8,11 +8,10 @@ PODS:
   - hermes-engine (0.79.2):
     - hermes-engine/Pre-built (= 0.79.2)
   - hermes-engine/Pre-built (0.79.2)
-  - LoaderKit (3.0.0):
+  - LoaderKit (4.0.0):
     - DoubleConversion
     - glog
     - hermes-engine
-    - NVActivityIndicatorView-ObjC
     - RCT-Folly (= 2024.11.18.00)
     - RCTRequired
     - RCTTypeSafety
@@ -33,7 +32,6 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - NVActivityIndicatorView-ObjC (1.0.1)
   - RCT-Folly (2024.11.18.00):
     - boost
     - DoubleConversion
@@ -1760,7 +1758,6 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - NVActivityIndicatorView-ObjC
     - SocketRocket
 
 EXTERNAL SOURCES:
@@ -1916,8 +1913,7 @@ SPEC CHECKSUMS:
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
   hermes-engine: 314be5250afa5692b57b4dd1705959e1973a8ebe
-  LoaderKit: 984fcf908338cee4137a65115a0f44df26e9754a
-  NVActivityIndicatorView-ObjC: a2394f53d84c32f71823743a2030e0378d40332f
+  LoaderKit: a1a6f4a99814e4bf7b1b5792272551d24e04a22f
   RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809
   RCTDeprecation: 83ffb90c23ee5cea353bd32008a7bca100908f8c
   RCTRequired: eb7c0aba998009f47a540bec9e9d69a54f68136e

example/src/App.tsx

@@ -34,18 +34,19 @@ const getDisplayName = (name: IndicatorName) => {
 export default function App() {
   const [speed, setSpeed] = useState(1.0);
   const indicators = getIndicators();
-  
+
   const spacing = 10;
   const columns = 4;
   const itemWidth = (screenWidth - spacing * (columns + 1)) / columns;
   const itemHeight = itemWidth + 45; // Extra height for label
-  
+
   const renderIndicator = (name: IndicatorName, index: number) => {
     const isIOSOnly = IOS_ONLY_INDICATORS.includes(name as any);
-    const backgroundColor = isIOSOnly && Platform.OS === 'android' 
-      ? 'rgba(255, 255, 255, 0.3)' 
-      : 'transparent';
-    
+    const backgroundColor =
+      isIOSOnly && Platform.OS === 'android'
+        ? 'rgba(255, 255, 255, 0.3)'
+        : 'transparent';
+
     return (
       <View
         key={name}
@@ -61,7 +62,7 @@ export default function App() {
         <View style={styles.indicatorWrapper}>
           <LoaderKitView
             name={name}
-            color="white"
+            color="blue"
             animationSpeedMultiplier={speed}
             style={styles.indicator}
           />
@@ -106,11 +107,12 @@ export default function App() {
         <View style={styles.grid}>
           {indicators.map((name, index) => renderIndicator(name, index))}
         </View>
-        
+
         {/* Platform Info */}
         <View style={styles.infoContainer}>
           <Text style={styles.infoText}>
-            Platform: {Platform.OS.charAt(0).toUpperCase() + Platform.OS.slice(1)}
+            Platform:{' '}
+            {Platform.OS.charAt(0).toUpperCase() + Platform.OS.slice(1)}
           </Text>
           <Text style={styles.infoText}>
             Available Indicators: {indicators.length}

ios/LoaderKit-Bridging-Header.h

@@ -0,0 +1 @@
+#import <React/RCTViewManager.h>

ios/LoaderKitView.h

@@ -18,7 +18,4 @@ NS_ASSUME_NONNULL_END
 
 #import "React/RCTViewManager.h"
 
-@interface LoaderKitViewManager : RCTViewManager
-@end
-
 #endif

ios/LoaderKitView.mm

@@ -1,45 +1,16 @@
 #import "LoaderKitView.h"
-#import "NVActivityIndicatorView.h"
-#import "React/RCTConvert.h"
-
-static const NSDictionary *nameToTypeMap = @{
-    @"BallPulse": @(NVActivityIndicatorTypeBallPulse),
-    @"BallGridPulse": @(NVActivityIndicatorTypeBallGridPulse),
-    @"BallClipRotate": @(NVActivityIndicatorTypeBallClipRotate),
-    @"SquareSpin": @(NVActivityIndicatorTypeSquareSpin),
-    @"BallClipRotatePulse": @(NVActivityIndicatorTypeBallClipRotatePulse),
-    @"BallClipRotateMultiple": @(NVActivityIndicatorTypeBallClipRotateMultiple),
-    @"BallPulseRise": @(NVActivityIndicatorTypeBallPulseRise),
-    @"BallRotate": @(NVActivityIndicatorTypeBallRotate),
-    @"CubeTransition": @(NVActivityIndicatorTypeCubeTransition),
-    @"BallZigZag": @(NVActivityIndicatorTypeBallZigZag),
-    @"BallZigZagDeflect": @(NVActivityIndicatorTypeBallZigZagDeflect),
-    @"BallTrianglePath": @(NVActivityIndicatorTypeBallTrianglePath),
-    @"BallScale": @(NVActivityIndicatorTypeBallScale),
-    @"LineScale": @(NVActivityIndicatorTypeLineScale),
-    @"LineScaleParty": @(NVActivityIndicatorTypeLineScaleParty),
-    @"BallScaleMultiple": @(NVActivityIndicatorTypeBallScaleMultiple),
-    @"BallPulseSync": @(NVActivityIndicatorTypeBallPulseSync),
-    @"BallBeat": @(NVActivityIndicatorTypeBallBeat),
-    @"LineScalePulseOut": @(NVActivityIndicatorTypeLineScalePulseOut),
-    @"LineScalePulseOutRapid": @(NVActivityIndicatorTypeLineScalePulseOutRapid),
-    @"BallScaleRipple": @(NVActivityIndicatorTypeBallScaleRipple),
-    @"BallScaleRippleMultiple": @(NVActivityIndicatorTypeBallScaleRippleMultiple),
-    @"BallSpinFadeLoader": @(NVActivityIndicatorTypeBallSpinFadeLoader),
-    @"LineSpinFadeLoader": @(NVActivityIndicatorTypeLineSpinFadeLoader),
-    @"TriangleSkewSpin": @(NVActivityIndicatorTypeTriangleSkewSpin),
-    @"Pacman": @(NVActivityIndicatorTypePacman),
-    @"BallGridBeat": @(NVActivityIndicatorTypeBallGridBeat),
-    @"SemiCircleSpin": @(NVActivityIndicatorTypeSemiCircleSpin),
-    @"BallRotateChase": @(NVActivityIndicatorTypeBallRotateChase),
-    @"Orbit": @(NVActivityIndicatorTypeOrbit),
-    @"AudioEqualizer": @(NVActivityIndicatorTypeAudioEqualizer),
-    @"CircleStrokeSpin": @(NVActivityIndicatorTypeCircleStrokeSpin),
-    @"BallDoubleBounce": @(NVActivityIndicatorTypeBallDoubleBounce)
-};
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
+#import "React/RCTConvert.h"
+
+#if __has_include(<LoaderKit/LoaderKit-Swift.h>)
+// if use_frameworks! :static
+#import <LoaderKit/LoaderKit-Swift.h>
+#else
+#import "LoaderKit-Swift.h"
+#endif
+
 #import <react/renderer/components/LoaderKitViewSpec/ComponentDescriptors.h>
 #import <react/renderer/components/LoaderKitViewSpec/EventEmitters.h>
 #import <react/renderer/components/LoaderKitViewSpec/Props.h>
@@ -68,8 +39,8 @@ - (instancetype)initWithFrame:(CGRect)frame
     static const auto defaultProps = std::make_shared<const LoaderKitViewProps>();
     _props = defaultProps;
 
-    _indicatorView = [[NVActivityIndicatorView alloc] init];
-    
+    _indicatorView = [[NVActivityIndicatorView alloc] initWithFrame:CGRectZero];
+        
     self.contentView = _indicatorView;
   }
 
@@ -82,9 +53,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     const auto &newViewProps = *std::static_pointer_cast<LoaderKitViewProps const>(props);
 
     if (oldViewProps.name != newViewProps.name) {
-        NSString * indicatorName = [[NSString alloc] initWithUTF8String: newViewProps.name.c_str()];
-        NVActivityIndicatorType type = [self getIndicatorTypeFromName:indicatorName];
-        _indicatorView.type = type;
+      _indicatorView.name = [[NSString alloc] initWithUTF8String: newViewProps.name.c_str()];
     }
 
     // Update color
@@ -104,65 +73,17 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     return LoaderKitView.class;
 }
 
-- (NVActivityIndicatorType)getIndicatorTypeFromName:(NSString *)name
-{
-    if (!name) return NVActivityIndicatorTypeBallPulse;
-        
-    NSNumber *typeNumber = nameToTypeMap[name];
-    if (typeNumber) {
-        return (NVActivityIndicatorType)[typeNumber integerValue];
-    }
-    
-    return NVActivityIndicatorTypeBallPulse; // Default fallback
-}
-
 @end
 
 #else
 
-@implementation LoaderKitViewManager
+@interface RCT_EXTERN_MODULE(LoaderKitViewManager, RCTViewManager)
 
-RCT_EXPORT_MODULE(LoaderKitView)
+RCT_EXPORT_VIEW_PROPERTY(name, NSString)
 
-- (UIView *)view
-{
-  return [[NVActivityIndicatorView alloc] init];
-}
+RCT_REMAP_VIEW_PROPERTY(color, colorRN, NSNumber) // map from "colorRN" of native view to "color" of react prop
 
-- (NVActivityIndicatorType)getIndicatorTypeFromName:(NSString *)name
-{
-    if (!name) return NVActivityIndicatorTypeBallPulse;
-    
-    NSNumber *typeNumber = nameToTypeMap[name];
-    if (typeNumber) {
-        return (NVActivityIndicatorType)[typeNumber integerValue];
-    }
-    
-    return NVActivityIndicatorTypeBallPulse;
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(name, NSString, NVActivityIndicatorView)
-{
-    NSString *indicatorName = [RCTConvert NSString:json];
-    if (indicatorName) {
-        NVActivityIndicatorType type = [self getIndicatorTypeFromName:indicatorName];
-        view.type = type;
-    }
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(color, UIColor, NVActivityIndicatorView)
-{
-    UIColor *color = [RCTConvert UIColor:json];
-    if (color) {
-        view.color = color;
-    }
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(animationSpeedMultiplier, CGFloat, NVActivityIndicatorView)
-{
-    CGFloat speedMultiplier = [RCTConvert CGFloat:json];
-    view.animationSpeedMultiplier = speedMultiplier;
-}
+RCT_REMAP_VIEW_PROPERTY(animationSpeedMultiplier, animationSpeedMultiplierRN, NSNumber) // map from "animationSpeedMultiplierRN" of native view to "animationSpeedMultiplier" of react prop
 
 @end
 

ios/LoaderKitView.swift

@@ -0,0 +1,20 @@
+//
+//  LoaderKitView.swift
+//  LoaderKit
+//
+//  Created by Duc Trung Mai on 10/21/25.
+//
+
+import React
+
+@objc(LoaderKitViewManager)
+class LoaderKitViewManager: RCTViewManager {
+    
+    override func view() -> (NVActivityIndicatorView) {
+      return NVActivityIndicatorView(frame: .zero)
+    }
+    
+    @objc override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+}

ios/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationAudioEqualizer.swift

@@ -0,0 +1,75 @@
+//
+//  NVActivityIndicatorAnimationAudioEqualizer.swift
+//  NVActivityIndicatorView
+//
+// The MIT License (MIT)
+
+// Copyright (c) 2016 Vinh Nguyen
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#if canImport(UIKit)
+import UIKit
+
+class NVActivityIndicatorAnimationAudioEqualizer: NVActivityIndicatorAnimationDelegate {
+
+    func setUpAnimation(in layer: CALayer, size: CGSize, color: UIColor, animationSpeedMultiplier: CGFloat) {
+        let lineSize = size.width / 9
+        let x = (layer.bounds.size.width - lineSize * 7) / 2
+        let y = (layer.bounds.size.height - size.height) / 2
+        let duration: [CFTimeInterval] = [4.3 / CFTimeInterval(animationSpeedMultiplier), 
+                                         2.5 / CFTimeInterval(animationSpeedMultiplier), 
+                                         1.7 / CFTimeInterval(animationSpeedMultiplier), 
+                                         3.1 / CFTimeInterval(animationSpeedMultiplier)]
+        let values = [0, 0.7, 0.4, 0.05, 0.95, 0.3, 0.9, 0.4, 0.15, 0.18, 0.75, 0.01]
+
+        // Draw lines
+        for i in 0 ..< 4 {
+            let animation = CAKeyframeAnimation()
+
+            animation.keyPath = "path"
+            animation.isAdditive = true
+            animation.values = []
+
+            for j in 0 ..< values.count {
+                let heightFactor = values[j]
+                let height = size.height * CGFloat(heightFactor)
+                let point = CGPoint(x: 0, y: size.height - height)
+                let path = UIBezierPath(rect: CGRect(origin: point, size: CGSize(width: lineSize, height: height)))
+
+                animation.values?.append(path.cgPath)
+            }
+            animation.duration = duration[i]
+            animation.repeatCount = HUGE
+            animation.isRemovedOnCompletion = false
+
+            let line = NVActivityIndicatorShape.line.layerWith(size: CGSize(width: lineSize, height: size.height), color: color)
+            let frame = CGRect(x: x + lineSize * 2 * CGFloat(i),
+                               y: y,
+                               width: lineSize,
+                               height: size.height)
+
+            line.frame = frame
+            line.add(animation, forKey: "animation")
+            layer.addSublayer(line)
+        }
+    }
+}
+#endif