Merge pull request #635 from friederbluemle/drop-bv

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
       - run: curl https://raw.githubusercontent.com/fbtmp/rn-native-module-support/master/Podfile -o ios/Podfile
       - working-directory: ios/
         run: pod install
-      - run: xcodebuild -workspace "ios/BVLinearGradient.xcworkspace" -scheme "BVLinearGradient" -destination "platform=iOS Simulator,name=iPhone 12"
+      - run: xcodebuild -workspace "ios/RNLinearGradient.xcworkspace" -scheme "RNLinearGradient" -destination "platform=iOS Simulator,name=iPhone 12"
   integration-rn63:
     runs-on: ubuntu-latest
     steps:

BVLinearGradient.podspec → RNLinearGradient.podspec

@@ -5,7 +5,7 @@ folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1
 
 Pod::Spec.new do |s|
 
-  s.name            = "BVLinearGradient"
+  s.name            = "RNLinearGradient"
   s.version         = version
   s.homepage        = "https://github.com/brentvatne/react-native-linear-gradient"
   s.summary         = "A <LinearGradient /> component for react-native"

android/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="com.BV.LinearGradient" />
+<manifest package="com.rnlineargradient" />

android/src/main/java/com/BV/LinearGradient/LinearGradientManager.java → android/src/main/java/com/rnlineargradient/LinearGradientManager.java

@@ -1,12 +1,12 @@
-package com.BV.LinearGradient;
+package com.rnlineargradient;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
 public class LinearGradientManager extends SimpleViewManager<LinearGradientView> {
-    public static final String REACT_CLASS = "BVLinearGradient";
+    public static final String REACT_CLASS = "RNLinearGradient";
     public static final String PROP_COLORS = "colors";
     public static final String PROP_LOCATIONS = "locations";
     public static final String PROP_START_POINT = "startPoint";

android/src/main/java/com/BV/LinearGradient/LinearGradientPackage.java → android/src/main/java/com/rnlineargradient/LinearGradientPackage.java

@@ -1,4 +1,4 @@
-package com.BV.LinearGradient;
+package com.rnlineargradient;
 
 import androidx.annotation.NonNull;
 

android/src/main/java/com/BV/LinearGradient/LinearGradientView.java → android/src/main/java/com/rnlineargradient/LinearGradientView.java

@@ -1,4 +1,4 @@
-package com.BV.LinearGradient;
+package com.rnlineargradient;
 
 import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableArray;

common.js

@@ -4,7 +4,7 @@ import type { ElementConfig } from 'react';
 import { requireNativeComponent, typeof View } from 'react-native';
 
 /* $FlowFixMe */
-export default requireNativeComponent('BVLinearGradient');
+export default requireNativeComponent('RNLinearGradient');
 
 export type Point = $ReadOnly<{| x: number, y: number |}>;
 

example/ios/Podfile.lock

@@ -1,7 +1,5 @@
 PODS:
   - boost (1.76.0)
-  - BVLinearGradient (2.7.3):
-    - React-Core
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.70.12)
   - FBReactNativeSpec (0.70.12):
@@ -309,11 +307,12 @@ PODS:
     - React-jsi (= 0.70.12)
     - React-logger (= 0.70.12)
     - React-perflogger (= 0.70.12)
+  - RNLinearGradient (2.8.0):
+    - React-Core
   - Yoga (1.14.0)
 
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
-  - BVLinearGradient (from `../..`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
@@ -349,6 +348,7 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - RNLinearGradient (from `../..`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -359,8 +359,6 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   boost:
     :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
-  BVLinearGradient:
-    :path: "../.."
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
@@ -427,12 +425,13 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  RNLinearGradient:
+    :path: "../.."
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
-  BVLinearGradient: fbe308a1d19a8133f69e033abc85d8008644f5e3
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: ad10768c7e516954e6f26b7e923eb27cda4f9895
   FBReactNativeSpec: e957ece605f33719f85d08ebb85bc862e968098b
@@ -468,6 +467,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: 89e72d020ee2848022ee214f0542facafe91110a
   React-runtimeexecutor: 6bedb63b3de0c5c3bb3cc44595431e2a91c24da2
   ReactCommon: 2642dd48fe3def7738d85f747c05fdd8c3a47950
+  RNLinearGradient: 8e446e1ef3a9f58d697e535e8eab959bc033dc2e
   Yoga: bb774af243598f7f860127c6e9ac7b62fb6519c4
 
 PODFILE CHECKSUM: 939cb4e1426d71cf4626b9cd73ece1c933be9590

ios/BVLinearGradient.h → ios/RNLinearGradient.h

@@ -1,6 +1,6 @@
 #import <React/RCTView.h>
 
-@interface BVLinearGradient : RCTView
+@interface RNLinearGradient : RCTView
 
 @property (nullable, nonatomic, copy) NSArray<UIColor *> *colors;
 @property (nullable, nonatomic, copy) NSArray<NSNumber *> *locations;

ios/BVLinearGradient.m → ios/RNLinearGradient.m

@@ -1,21 +1,21 @@
-#import "BVLinearGradient.h"
+#import "RNLinearGradient.h"
 
 #import <React/RCTConvert.h>
 #import <UIKit/UIKit.h>
 #import <QuartzCore/QuartzCore.h>
 
-#import "BVLinearGradientLayer.h"
+#import "RNLinearGradientLayer.h"
 
-@implementation BVLinearGradient
+@implementation RNLinearGradient
 
 + (Class)layerClass
 {
-  return [BVLinearGradientLayer class];
+  return [RNLinearGradientLayer class];
 }
 
-- (BVLinearGradientLayer *)gradientLayer
+- (RNLinearGradientLayer *)gradientLayer
 {
-  return (BVLinearGradientLayer *)self.layer;
+  return (RNLinearGradientLayer *)self.layer;
 }
 
 - (NSArray *)colors

ios/BVLinearGradient.xcodeproj/project.pbxproj → ios/RNLinearGradient.xcodeproj/project.pbxproj

@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		D6BF2FA420D7DC1F006672AE /* BVLinearGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = D6BF2FA320D7DC1F006672AE /* BVLinearGradientLayer.m */; };
-		EF6045F01C4E5D290001F552 /* BVLinearGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = EF6045ED1C4E5D290001F552 /* BVLinearGradient.m */; };
-		EF6045F11C4E5D290001F552 /* BVLinearGradientManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EF6045EF1C4E5D290001F552 /* BVLinearGradientManager.m */; };
+		D6BF2FA420D7DC1F006672AE /* RNLinearGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = D6BF2FA320D7DC1F006672AE /* RNLinearGradientLayer.m */; };
+		EF6045F01C4E5D290001F552 /* RNLinearGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = EF6045ED1C4E5D290001F552 /* RNLinearGradient.m */; };
+		EF6045F11C4E5D290001F552 /* RNLinearGradientManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EF6045EF1C4E5D290001F552 /* RNLinearGradientManager.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -34,13 +34,13 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		134814201AA4EA6300B7C361 /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBVLinearGradient.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		D6BF2FA220D7DC1F006672AE /* BVLinearGradientLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BVLinearGradientLayer.h; sourceTree = "<group>"; };
-		D6BF2FA320D7DC1F006672AE /* BVLinearGradientLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BVLinearGradientLayer.m; sourceTree = "<group>"; };
-		EF6045EC1C4E5D290001F552 /* BVLinearGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BVLinearGradient.h; sourceTree = "<group>"; };
-		EF6045ED1C4E5D290001F552 /* BVLinearGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BVLinearGradient.m; sourceTree = "<group>"; };
-		EF6045EE1C4E5D290001F552 /* BVLinearGradientManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BVLinearGradientManager.h; sourceTree = "<group>"; };
-		EF6045EF1C4E5D290001F552 /* BVLinearGradientManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BVLinearGradientManager.m; sourceTree = "<group>"; };
+		134814201AA4EA6300B7C361 /* libRNLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNLinearGradient.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		D6BF2FA220D7DC1F006672AE /* RNLinearGradientLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNLinearGradientLayer.h; sourceTree = "<group>"; };
+		D6BF2FA320D7DC1F006672AE /* RNLinearGradientLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNLinearGradientLayer.m; sourceTree = "<group>"; };
+		EF6045EC1C4E5D290001F552 /* RNLinearGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNLinearGradient.h; sourceTree = "<group>"; };
+		EF6045ED1C4E5D290001F552 /* RNLinearGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNLinearGradient.m; sourceTree = "<group>"; };
+		EF6045EE1C4E5D290001F552 /* RNLinearGradientManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNLinearGradientManager.h; sourceTree = "<group>"; };
+		EF6045EF1C4E5D290001F552 /* RNLinearGradientManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNLinearGradientManager.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -64,30 +64,30 @@
 		134814211AA4EA7D00B7C361 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				134814201AA4EA6300B7C361 /* libBVLinearGradient.a */,
+				134814201AA4EA6300B7C361 /* libRNLinearGradient.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-				EF6045EC1C4E5D290001F552 /* BVLinearGradient.h */,
-				EF6045ED1C4E5D290001F552 /* BVLinearGradient.m */,
-				EF6045EE1C4E5D290001F552 /* BVLinearGradientManager.h */,
-				EF6045EF1C4E5D290001F552 /* BVLinearGradientManager.m */,
-				D6BF2FA220D7DC1F006672AE /* BVLinearGradientLayer.h */,
-				D6BF2FA320D7DC1F006672AE /* BVLinearGradientLayer.m */,
+				EF6045EC1C4E5D290001F552 /* RNLinearGradient.h */,
+				EF6045ED1C4E5D290001F552 /* RNLinearGradient.m */,
+				EF6045EE1C4E5D290001F552 /* RNLinearGradientManager.h */,
+				EF6045EF1C4E5D290001F552 /* RNLinearGradientManager.m */,
+				D6BF2FA220D7DC1F006672AE /* RNLinearGradientLayer.h */,
+				D6BF2FA320D7DC1F006672AE /* RNLinearGradientLayer.m */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		58B511DA1A9E6C8500147676 /* BVLinearGradient */ = {
+		58B511DA1A9E6C8500147676 /* RNLinearGradient */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "BVLinearGradient" */;
+			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNLinearGradient" */;
 			buildPhases = (
 				58B511D71A9E6C8500147676 /* Sources */,
 				58B511D81A9E6C8500147676 /* Frameworks */,
@@ -97,9 +97,9 @@
 			);
 			dependencies = (
 			);
-			name = BVLinearGradient;
+			name = RNLinearGradient;
 			productName = RCTDataManager;
-			productReference = 134814201AA4EA6300B7C361 /* libBVLinearGradient.a */;
+			productReference = 134814201AA4EA6300B7C361 /* libRNLinearGradient.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -116,7 +116,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "BVLinearGradient" */;
+			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNLinearGradient" */;
 			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -128,7 +128,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				58B511DA1A9E6C8500147676 /* BVLinearGradient */,
+				58B511DA1A9E6C8500147676 /* RNLinearGradient */,
 			);
 		};
 /* End PBXProject section */
@@ -138,9 +138,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EF6045F11C4E5D290001F552 /* BVLinearGradientManager.m in Sources */,
-				EF6045F01C4E5D290001F552 /* BVLinearGradient.m in Sources */,
-				D6BF2FA420D7DC1F006672AE /* BVLinearGradientLayer.m in Sources */,
+				EF6045F11C4E5D290001F552 /* RNLinearGradientManager.m in Sources */,
+				EF6045F01C4E5D290001F552 /* RNLinearGradient.m in Sources */,
+				D6BF2FA420D7DC1F006672AE /* RNLinearGradientLayer.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -257,7 +257,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = BVLinearGradient;
+				PRODUCT_NAME = RNLinearGradient;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
@@ -273,15 +273,15 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = BVLinearGradient;
+				PRODUCT_NAME = RNLinearGradient;
 				SKIP_INSTALL = YES;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "BVLinearGradient" */ = {
+		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNLinearGradient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B511ED1A9E6C8500147676 /* Debug */,
@@ -290,7 +290,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "BVLinearGradient" */ = {
+		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNLinearGradient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B511F01A9E6C8500147676 /* Debug */,

ios/BVLinearGradientLayer.h → ios/RNLinearGradientLayer.h

@@ -3,7 +3,7 @@
 
 @class UIColor;
 
-@interface BVLinearGradientLayer : CALayer
+@interface RNLinearGradientLayer : CALayer
 
 @property (nullable, nonatomic, copy) NSArray<UIColor *> *colors;
 @property (nullable, nonatomic, copy) NSArray<NSNumber *> *locations;

ios/BVLinearGradientLayer.m → ios/RNLinearGradientLayer.m

@@ -1,9 +1,9 @@
-#import "BVLinearGradientLayer.h"
+#import "RNLinearGradientLayer.h"
 
 #include <math.h>
 #import <UIKit/UIKit.h>
 
-@implementation BVLinearGradientLayer
+@implementation RNLinearGradientLayer
 
 - (instancetype)init
 {
@@ -149,7 +149,7 @@ + (CGPoint) getGradientStartPointFromAngle:(CGFloat)angle AndSize:(CGSize)size
     // Explicitly check for horizontal or vertical gradients, as slopes of
     // the gradient line or a line perpendicular will be undefined in that case
     if (fmodf(angle, 90) == 0)
-        return [BVLinearGradientLayer getHorizontalOrVerticalStartPointFromAngle:angle AndSize:size];
+        return [RNLinearGradientLayer getHorizontalOrVerticalStartPointFromAngle:angle AndSize:size];
 
     // Get the equivalent slope of the gradient line as tan = opposite/adjacent = y/x
     float slope = tan(angle * M_PI / 180.0);
@@ -159,7 +159,7 @@ + (CGPoint) getGradientStartPointFromAngle:(CGFloat)angle AndSize:(CGSize)size
     float perpendicularSlope = -1 / slope;
 
     // Get the start corner to intersect relative to center, in cartesian space (+y = up)
-    CGPoint startCorner = [BVLinearGradientLayer getStartCornerToIntersectFromAngle:angle AndSize:size];
+    CGPoint startCorner = [RNLinearGradientLayer getStartCornerToIntersectFromAngle:angle AndSize:size];
 
     // Compute b (of y = mx + b) to get the equation for the perpendicular line
     float b = startCorner.y - perpendicularSlope * startCorner.x;
@@ -214,7 +214,7 @@ - (void)drawInContext:(CGContextRef)ctx
         // Angle is in bearing degrees (North = 0, East = 90)
         // convert it to cartesian (N = 90, E = 0)
         float angle = (90 - _angle);
-        CGPoint relativeStartPoint = [BVLinearGradientLayer getGradientStartPointFromAngle:angle AndSize:size];
+        CGPoint relativeStartPoint = [RNLinearGradientLayer getGradientStartPointFromAngle:angle AndSize:size];
 
         // Get true angleCenter
         CGPoint angleCenter = CGPointMake(

ios/RNLinearGradientManager.h

@@ -0,0 +1,5 @@
+#import <React/RCTViewManager.h>
+
+@interface RNLinearGradientManager : RCTViewManager
+
+@end

ios/BVLinearGradientManager.m → ios/RNLinearGradientManager.m

@@ -1,16 +1,16 @@
-#import "BVLinearGradientManager.h"
-#import "BVLinearGradient.h"
+#import "RNLinearGradientManager.h"
+#import "RNLinearGradient.h"
 #import <React/RCTBridge.h>
 
-@implementation BVLinearGradientManager
+@implementation RNLinearGradientManager
 
 RCT_EXPORT_MODULE();
 
 @synthesize bridge = _bridge;
 
 - (UIView *)view
 {
-  return [[BVLinearGradient alloc] init];
+  return [[RNLinearGradient alloc] init];
 }
 
 - (dispatch_queue_t)methodQueue

package.json

@@ -13,7 +13,7 @@
     "index.d.ts",
     "index.ios.js",
     "index.windows.js",
-    "BVLinearGradient.podspec"
+    "react-native-linear-gradient.podspec"
   ],
   "scripts": {
     "flow": "flow check"