Fix conflict issue with color native lib name

ethanshar · ethanshar · commit f4f4ba06648b · 2020-03-14T13:31:12.000+02:00
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.h b/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/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 RNUIInterpolationBehaviorUseLABColorSpace;
 
 /**
  Interpolate using the RGB color space.
  */
-extern LNInterpolationBehavior const LNInterpolationBehaviorUseRGBColorSpace;
+extern LNInterpolationBehavior const RNUIInterpolationBehaviorUseRGBColorSpace;
 
 /**
  Interpolates between colors.
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.m b/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/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 RNUIInterpolationBehaviorUseLABColorSpace = @"LNInterpolationBehaviorUseDefault";
+LNInterpolationBehavior const RNUIInterpolationBehaviorUseRGBColorSpace = @"LNInterpolationBehaviorUseRGB";
 
 extern double LNLinearInterpolate(double from, double to, double p);
 
@@ -152,7 +152,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 == RNUIInterpolationBehaviorUseRGBColorSpace ? LNRGBComponentsFromColor : LNLabComponentsFromColor, behavior == RNUIInterpolationBehaviorUseRGBColorSpace ? LNColorFromRGBComponents : LNColorFromLabComponents);
 }
 
 @end
diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uilib-native",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "homepage": "https://github.com/wix/react-native-ui-lib",
   "description": "uilib native components (separated from js components)",
   "main": "components/index.js",

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`	`#define SWAP(x, y) do { __typeof(x) __ZZZZ__SWAP = x; x = y; y = __ZZZZ__SWAP; } while(0)`
`19`	`19`
`20`	`20`	`//Same value as LNInterpolationBehaviorUseDefault`
`21`		`-LNInterpolationBehavior const LNInterpolationBehaviorUseLABColorSpace = @"LNInterpolationBehaviorUseDefault";`
`22`		`-LNInterpolationBehavior const LNInterpolationBehaviorUseRGBColorSpace = @"LNInterpolationBehaviorUseRGB";`
	`21`	`+LNInterpolationBehavior const RNUIInterpolationBehaviorUseLABColorSpace = @"LNInterpolationBehaviorUseDefault";`
	`22`	`+LNInterpolationBehavior const RNUIInterpolationBehaviorUseRGBColorSpace = @"LNInterpolationBehaviorUseRGB";`
`23`	`23`
`24`	`24`	`extern double LNLinearInterpolate(double from, double to, double p);`
`25`	`25`
`@@ -152,7 +152,7 @@ - (instancetype)interpolateToValue:(id)toValue progress:(double)p behavior:(LNIn`
`152`	`152`	`return toValue;`
`153`	`153`	`}`
`154`	`154`
`155`		`- return LNInterpolateColor(self, toValue, p, behavior == LNInterpolationBehaviorUseRGBColorSpace ? LNRGBComponentsFromColor : LNLabComponentsFromColor, behavior == LNInterpolationBehaviorUseRGBColorSpace ? LNColorFromRGBComponents : LNColorFromLabComponents);`
	`155`	`+ return LNInterpolateColor(self, toValue, p, behavior == RNUIInterpolationBehaviorUseRGBColorSpace ? LNRGBComponentsFromColor : LNLabComponentsFromColor, behavior == RNUIInterpolationBehaviorUseRGBColorSpace ? LNColorFromRGBComponents : LNColorFromLabComponents);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "uilib-native",`
`3`		`- "version": "2.0.1",`
	`3`	`+ "version": "2.0.2",`
`4`	`4`	`"homepage": "https://github.com/wix/react-native-ui-lib",`
`5`	`5`	`"description": "uilib native components (separated from js components)",`
`6`	`6`	`"main": "components/index.js",`