Browse Source

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

Yogev Ben David 4 years ago
parent
commit
8ad40e1ab2
No account linked to committer's email address
3 changed files with 6 additions and 6 deletions
  1. 2
    2
      lib/ios/Color+Interpolation.h
  2. 3
    3
      lib/ios/Color+Interpolation.m
  3. 1
    1
      lib/ios/RNNInterpolator.m

+ 2
- 2
lib/ios/Color+Interpolation.h View File

18
 /**
18
 /**
19
  Interpolate using the LAB color space for optimal quality. This constant is equal to @c LNUseDefaultInterpolationBehavior.
19
  Interpolate using the LAB color space for optimal quality. This constant is equal to @c LNUseDefaultInterpolationBehavior.
20
  */
20
  */
21
-extern LNInterpolationBehavior const LNInterpolationBehaviorUseLABColorSpace;
21
+extern LNInterpolationBehavior const RNNInterpolationBehaviorUseLABColorSpace;
22
 
22
 
23
 /**
23
 /**
24
  Interpolate using the RGB color space.
24
  Interpolate using the RGB color space.
25
  */
25
  */
26
-extern LNInterpolationBehavior const LNInterpolationBehaviorUseRGBColorSpace;
26
+extern LNInterpolationBehavior const RNNInterpolationBehaviorUseRGBColorSpace;
27
 
27
 
28
 /**
28
 /**
29
  Interpolates between colors.
29
  Interpolates between colors.

+ 3
- 3
lib/ios/Color+Interpolation.m View File

18
 #define SWAP(x, y) do { __typeof(x) __ZZZZ__SWAP = x; x = y; y = __ZZZZ__SWAP; } while(0)
18
 #define SWAP(x, y) do { __typeof(x) __ZZZZ__SWAP = x; x = y; y = __ZZZZ__SWAP; } while(0)
19
 
19
 
20
 //Same value as LNInterpolationBehaviorUseDefault
20
 //Same value as LNInterpolationBehaviorUseDefault
21
-LNInterpolationBehavior const LNInterpolationBehaviorUseLABColorSpace = @"LNInterpolationBehaviorUseDefault";
22
-LNInterpolationBehavior const LNInterpolationBehaviorUseRGBColorSpace = @"LNInterpolationBehaviorUseRGB";
21
+LNInterpolationBehavior const RNNInterpolationBehaviorUseLABColorSpace = @"LNInterpolationBehaviorUseDefault";
22
+LNInterpolationBehavior const RNNInterpolationBehaviorUseRGBColorSpace = @"LNInterpolationBehaviorUseRGB";
23
 
23
 
24
 extern double LNLinearInterpolate(double from, double to, double p);
24
 extern double LNLinearInterpolate(double from, double to, double p);
25
 
25
 
149
 		return toValue;
149
 		return toValue;
150
 	}
150
 	}
151
 	
151
 	
152
-	return LNInterpolateColor(self, toValue, p, behavior == LNInterpolationBehaviorUseRGBColorSpace ? LNRGBComponentsFromColor : LNLabComponentsFromColor, behavior == LNInterpolationBehaviorUseRGBColorSpace ? LNColorFromRGBComponents : LNColorFromLabComponents);
152
+	return LNInterpolateColor(self, toValue, p, behavior == RNNInterpolationBehaviorUseRGBColorSpace ? LNRGBComponentsFromColor : LNLabComponentsFromColor, behavior == RNNInterpolationBehaviorUseRGBColorSpace ? LNColorFromRGBComponents : LNColorFromLabComponents);
153
 }
153
 }
154
 
154
 
155
 @end
155
 @end

+ 1
- 1
lib/ios/RNNInterpolator.m View File

4
 @implementation RNNInterpolator
4
 @implementation RNNInterpolator
5
 
5
 
6
 + (UIColor *)fromColor:(UIColor *)fromColor toColor:(UIColor *)toColor precent:(CGFloat)precent {
6
 + (UIColor *)fromColor:(UIColor *)fromColor toColor:(UIColor *)toColor precent:(CGFloat)precent {
7
-    return [fromColor ?: UIColor.clearColor interpolateToValue:toColor ?: UIColor.clearColor progress:precent behavior:LNInterpolationBehaviorUseLABColorSpace];
7
+    return [fromColor ?: UIColor.clearColor interpolateToValue:toColor ?: UIColor.clearColor progress:precent behavior:RNNInterpolationBehaviorUseLABColorSpace];
8
 }
8
 }
9
 
9
 
10
 + (CGFloat)fromFloat:(CGFloat)from toFloat:(CGFloat)to precent:(CGFloat)precent interpolation:(RNNInterpolationOptions)interpolation {
10
 + (CGFloat)fromFloat:(CGFloat)from toFloat:(CGFloat)to precent:(CGFloat)precent interpolation:(RNNInterpolationOptions)interpolation {