Fix symbol collision with react-native-keyboard-input (#6030)

wix · Mar 11, 2020 · 8ad40e1 · 8ad40e1 · AugustoAleGon · Mar 12, 2020
1 parent 0f227f9
commit 8ad40e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/ios/Color+Interpolation.h b/lib/ios/Color+Interpolation.h
@@ -18,12 +18,12 @@
 /**
  Interpolate using the LAB color space for optimal quality. This constant is equal to @c LNUseDefaultInterpolationBehavior.
  */
-extern LNInterpolationBehavior const LNInterpolationBehaviorUseLABColorSpace;
+extern LNInterpolationBehavior const RNNInterpolationBehaviorUseLABColorSpace;
 
 /**
  Interpolate using the RGB color space.
  */
-extern LNInterpolationBehavior const LNInterpolationBehaviorUseRGBColorSpace;
+extern LNInterpolationBehavior const RNNInterpolationBehaviorUseRGBColorSpace;
 
 /**
  Interpolates between colors.

diff --git a/lib/ios/Color+Interpolation.m b/lib/ios/Color+Interpolation.m
@@ -18,8 +18,8 @@
 #define SWAP(x, y) do { __typeof(x) __ZZZZ__SWAP = x; x = y; y = __ZZZZ__SWAP; } while(0)
 
 //Same value as LNInterpolationBehaviorUseDefault
-LNInterpolationBehavior const LNInterpolationBehaviorUseLABColorSpace = @"LNInterpolationBehaviorUseDefault";
-LNInterpolationBehavior const LNInterpolationBehaviorUseRGBColorSpace = @"LNInterpolationBehaviorUseRGB";
+LNInterpolationBehavior const RNNInterpolationBehaviorUseLABColorSpace = @"LNInterpolationBehaviorUseDefault";
+LNInterpolationBehavior const RNNInterpolationBehaviorUseRGBColorSpace = @"LNInterpolationBehaviorUseRGB";
 
 extern double LNLinearInterpolate(double from, double to, double p);
 
@@ -149,7 +149,7 @@ - (instancetype)interpolateToValue:(id)toValue progress:(double)p behavior:(LNIn
 		return toValue;
 	}
 
-	return LNInterpolateColor(self, toValue, p, behavior == LNInterpolationBehaviorUseRGBColorSpace ? LNRGBComponentsFromColor : LNLabComponentsFromColor, behavior == LNInterpolationBehaviorUseRGBColorSpace ? LNColorFromRGBComponents : LNColorFromLabComponents);
+	return LNInterpolateColor(self, toValue, p, behavior == RNNInterpolationBehaviorUseRGBColorSpace ? LNRGBComponentsFromColor : LNLabComponentsFromColor, behavior == RNNInterpolationBehaviorUseRGBColorSpace ? LNColorFromRGBComponents : LNColorFromLabComponents);
 }
 
 @end

diff --git a/lib/ios/RNNInterpolator.m b/lib/ios/RNNInterpolator.m
@@ -4,7 +4,7 @@
 @implementation RNNInterpolator
 
 + (UIColor *)fromColor:(UIColor *)fromColor toColor:(UIColor *)toColor precent:(CGFloat)precent {
-    return [fromColor ?: UIColor.clearColor interpolateToValue:toColor ?: UIColor.clearColor progress:precent behavior:LNInterpolationBehaviorUseLABColorSpace];
+    return [fromColor ?: UIColor.clearColor interpolateToValue:toColor ?: UIColor.clearColor progress:precent behavior:RNNInterpolationBehaviorUseLABColorSpace];
 }
 
 + (CGFloat)fromFloat:(CGFloat)from toFloat:(CGFloat)to precent:(CGFloat)precent interpolation:(RNNInterpolationOptions)interpolation {