From b18f245d5b8313fc79073662c65cf38e5975bf2d Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Fri, 10 May 2019 10:34:26 +0530 Subject: [PATCH 01/20] Changed separator color from WHITE to BLACK --- android/src/main/java/com/zyu/ReactWheelCurvedPicker.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/com/zyu/ReactWheelCurvedPicker.java b/android/src/main/java/com/zyu/ReactWheelCurvedPicker.java index 126e866..ef58f4b 100644 --- a/android/src/main/java/com/zyu/ReactWheelCurvedPicker.java +++ b/android/src/main/java/com/zyu/ReactWheelCurvedPicker.java @@ -55,11 +55,11 @@ protected void drawForeground(Canvas canvas) { super.drawForeground(canvas); Paint paint = new Paint(); - paint.setColor(Color.WHITE); + paint.setColor(Color.BLACK); // changed this from WHITE to BLACK int colorFrom = 0x00FFFFFF;//Color.BLACK; - int colorTo = Color.WHITE; - LinearGradient linearGradientShader = new LinearGradient(rectCurItem.left, rectCurItem.top, rectCurItem.right/2, rectCurItem.top, colorFrom, colorTo, Shader.TileMode.MIRROR); - paint.setShader(linearGradientShader); + int colorTo = Color.BLACK; // changed this from WHITE to BLACK +// LinearGradient linearGradientShader = new LinearGradient(rectCurItem.left, rectCurItem.top, rectCurItem.right/2, rectCurItem.top, colorFrom, colorTo, Shader.TileMode.MIRROR); +// paint.setShader(linearGradientShader); // Gradient is unnecessary canvas.drawLine(rectCurItem.left, rectCurItem.top, rectCurItem.right, rectCurItem.top, paint); canvas.drawLine(rectCurItem.left, rectCurItem.bottom, rectCurItem.right, rectCurItem.bottom, paint); } From 599b035e1afdc4fe9b655821af1ad232e7dca55b Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Fri, 10 May 2019 12:02:40 +0530 Subject: [PATCH 02/20] parsing hex, rgb, rgba colors to integers --- android/src/main/java/com/zyu/Utils.java | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 android/src/main/java/com/zyu/Utils.java diff --git a/android/src/main/java/com/zyu/Utils.java b/android/src/main/java/com/zyu/Utils.java new file mode 100644 index 0000000..ee6045e --- /dev/null +++ b/android/src/main/java/com/zyu/Utils.java @@ -0,0 +1,42 @@ +package com.zyu; + +import android.graphics.Color; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class Utils { + + private static final String REGEXP_HEX = "^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{8})$"; + private static final String REGEXP_RGB = "^rgb\\((\\d{1,3}), ?(\\d{1,3}), ?(\\d{1,3})\\)$"; + private static final String REGEXP_RGBA = "^rgba\\((\\d{1,3}), ?(\\d{1,3}), ?(\\d{1,3}), ?(0|0.[0-9]+|1)\\)$"; + + private static final Pattern PATTERN_RGB = Pattern.compile(REGEXP_RGB); + private static final Pattern PATTERN_RGBA = Pattern.compile(REGEXP_RGBA); + + public static int parseColor(String color) { + // Check if this is a Hex color + if (Pattern.matches(REGEXP_HEX, color)){ + return Color.parseColor(color); + } + if (Pattern.matches(REGEXP_RGB, color)) { + Matcher matcher = PATTERN_RGB.matcher(color); + matcher.matches(); + String hex = String.format( + "#%02x%02x%02x", + Integer.parseInt(matcher.group(1)),Integer.parseInt(matcher.group(2)), Integer.parseInt(matcher.group(3)) + ); + return Color.parseColor(hex); + } + if (Pattern.matches(REGEXP_RGBA, color)) { + Matcher matcher = PATTERN_RGBA.matcher(color); + matcher.matches(); + String hex = String.format( + "#%02x%02x%02x%02x", + Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)), Integer.parseInt(matcher.group(3)), Integer.parseInt(matcher.group(4)) + ); + return Color.parseColor(hex); + } + return -1; + } +} From 1387207f76b6d1824dc85a653365deb36acdc05e Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Fri, 10 May 2019 12:18:03 +0530 Subject: [PATCH 03/20] Example on how to pass props. Added how to pass the props for, 1. line color 2. starting gradient line color 2. ending gradient line color --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ada4eb1..7ab9eff 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,11 @@ export default class App extends Component<{}> { Welcome to React Native! + this.onPickerSelect(index)}> From 26b511d2e0e768be072501a7f600afc3cf298e4f Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Fri, 10 May 2019 12:22:32 +0530 Subject: [PATCH 04/20] ReactProp functions. Added functions to retrieve values from react props. The functions are as follows. 1. setLineColor to retrieve the line color without gradient 2. lineGradientColorFrom to retrieve starting gradient color 3. setLineGradientColorTo to retrieve ending gradient color --- .../zyu/ReactWheelCurvedPickerManager.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java b/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java index cd0e5c4..c825d61 100644 --- a/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java +++ b/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java @@ -86,6 +86,30 @@ public void setItemSpace(ReactWheelCurvedPicker picker, int space) { picker.setItemSpace((int) PixelUtil.toPixelFromDIP(space)); } } + + @ReactProp(name="lineColor") + public void setLineColor(ReactWheelCurvedPicker picker, String color) { + if (picker != null) { + picker.setLineColor(Utils.parseColor(color)); + picker.invalidate(); + } + } + + @ReactProp(name="lineGradientColorFrom") + public void setLineGradientColorFrom(ReactWheelCurvedPicker picker, String color) { + if (picker != null) { + picker.setLineGradientColorFrom(Utils.parseColor(color)); + picker.invalidate(); + } + } + + @ReactProp(name="lineGradientColorTo") + public void setLineGradientColorTo(ReactWheelCurvedPicker picker, String color) { + if (picker != null) { + picker.setLineGradientColorTo(Utils.parseColor(color)); + picker.invalidate(); + } + } @Override public String getName() { From 6fefa9a3daf96fcc771b6e2df4047dfa55beb7a2 Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Fri, 10 May 2019 12:28:55 +0530 Subject: [PATCH 05/20] Get prop values and assign to paint object Three methods were added to get the values which were passed from props and assigned them to the Paint object. The new methods are as follows, 1. setLineColor 2. setLineGradientColorFrom 3. setLineGradientColorTo --- .../java/com/zyu/ReactWheelCurvedPicker.java | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/com/zyu/ReactWheelCurvedPicker.java b/android/src/main/java/com/zyu/ReactWheelCurvedPicker.java index ef58f4b..0999ff3 100644 --- a/android/src/main/java/com/zyu/ReactWheelCurvedPicker.java +++ b/android/src/main/java/com/zyu/ReactWheelCurvedPicker.java @@ -27,6 +27,11 @@ public class ReactWheelCurvedPicker extends WheelCurvedPicker { private final EventDispatcher mEventDispatcher; private List mValueData; + + private Integer mLineColor = Color.WHITE; // Default line color + private boolean isLineGradient = false; // By default line color is not a gradient + private Integer mLinegradientFrom = Color.BLACK; // Default starting gradient color + private Integer mLinegradientTo = Color.WHITE; // Default end gradient color public ReactWheelCurvedPicker(ReactContext reactContext) { super(reactContext); @@ -56,13 +61,32 @@ protected void drawForeground(Canvas canvas) { Paint paint = new Paint(); paint.setColor(Color.BLACK); // changed this from WHITE to BLACK - int colorFrom = 0x00FFFFFF;//Color.BLACK; - int colorTo = Color.BLACK; // changed this from WHITE to BLACK -// LinearGradient linearGradientShader = new LinearGradient(rectCurItem.left, rectCurItem.top, rectCurItem.right/2, rectCurItem.top, colorFrom, colorTo, Shader.TileMode.MIRROR); -// paint.setShader(linearGradientShader); // Gradient is unnecessary + + if (this.isLineGradient) { + int colorFrom = this.mLinegradientFrom; + int colorTo = this.mLinegradientTo; + + LinearGradient linearGradientShader = new LinearGradient(rectCurItem.left, rectCurItem.top, rectCurItem.right/2, rectCurItem.top, colorFrom, colorTo, Shader.TileMode.MIRROR); + paint.setShader(linearGradientShader); + } + canvas.drawLine(rectCurItem.left, rectCurItem.top, rectCurItem.right, rectCurItem.top, paint); canvas.drawLine(rectCurItem.left, rectCurItem.bottom, rectCurItem.right, rectCurItem.bottom, paint); } + + public void setLineColor(Integer color) { + this.mLineColor = color; + } + + public void setLineGradientColorFrom (Integer color) { + this.isLineGradient = true; + this.mLinegradientFrom = color; + } + + public void setLineGradientColorTo (Integer color) { + this.isLineGradient = true; + this.mLinegradientTo = color; + } @Override public void setItemIndex(int index) { From f5aec8882338a3aa0ac05321ee2f3d43867d57cb Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Fri, 10 May 2019 12:35:03 +0530 Subject: [PATCH 06/20] Added new PropTypes Added new PropTypes for lineColor, lineGradientColorFrom, and lineGradientColorTo props. --- WheelCurvedPicker.android.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/WheelCurvedPicker.android.js b/WheelCurvedPicker.android.js index 2a774e8..b1d9911 100644 --- a/WheelCurvedPicker.android.js +++ b/WheelCurvedPicker.android.js @@ -19,6 +19,9 @@ const WheelCurvedPickerNativeInterface = { textSize: PropTypes.number, itemStyle: PropTypes.object, itemSpace: PropTypes.number, + lineColor: PropTypes.string, + lineGradientColorFrom: PropTypes.string, + lineGradientColorTo: PropTypes.string, onValueChange: PropTypes.func, selectedValue: PropTypes.any, selectedIndex: PropTypes.number, @@ -47,6 +50,12 @@ class WheelCurvedPicker extends React.Component { selectedValue: PropTypes.any, selectedIndex: PropTypes.number, + + lineColor: PropTypes.string, + + lineGradientColorFrom: PropTypes.string, + + lineGradientColorTo: PropTypes.string, } constructor(props){ From f0448183cb183336eb341ff95844323e786aa079 Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Tue, 10 Mar 2020 15:26:18 +0530 Subject: [PATCH 07/20] Change PropType.number to any --- WheelCurvedPicker.android.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/WheelCurvedPicker.android.js b/WheelCurvedPicker.android.js index b1d9911..9fda751 100644 --- a/WheelCurvedPicker.android.js +++ b/WheelCurvedPicker.android.js @@ -16,15 +16,15 @@ const WheelCurvedPickerNativeInterface = { ...View.propTypes, data:PropTypes.array, textColor: ColorPropType, - textSize: PropTypes.number, + textSize: any, itemStyle: PropTypes.object, - itemSpace: PropTypes.number, + itemSpace: any, lineColor: PropTypes.string, lineGradientColorFrom: PropTypes.string, lineGradientColorTo: PropTypes.string, onValueChange: PropTypes.func, selectedValue: PropTypes.any, - selectedIndex: PropTypes.number, + selectedIndex: any, } } @@ -39,17 +39,17 @@ class WheelCurvedPicker extends React.Component { textColor: ColorPropType, - textSize: PropTypes.number, + textSize: any, itemStyle: PropTypes.object, - itemSpace: PropTypes.number, + itemSpace: any, onValueChange: PropTypes.func, selectedValue: PropTypes.any, - selectedIndex: PropTypes.number, + selectedIndex: any, lineColor: PropTypes.string, From 9791845165c4e2b901205603d45aa1706274f1a9 Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Tue, 10 Mar 2020 15:35:30 +0530 Subject: [PATCH 08/20] Change all proptype to any --- WheelCurvedPicker.android.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/WheelCurvedPicker.android.js b/WheelCurvedPicker.android.js index 9fda751..04514b1 100644 --- a/WheelCurvedPicker.android.js +++ b/WheelCurvedPicker.android.js @@ -14,16 +14,16 @@ const WheelCurvedPickerNativeInterface = { name: 'WheelCurvedPicker', propTypes: { ...View.propTypes, - data:PropTypes.array, + data: any, textColor: ColorPropType, textSize: any, - itemStyle: PropTypes.object, + itemStyle: any, itemSpace: any, - lineColor: PropTypes.string, - lineGradientColorFrom: PropTypes.string, - lineGradientColorTo: PropTypes.string, - onValueChange: PropTypes.func, - selectedValue: PropTypes.any, + lineColor: any, + lineGradientColorFrom: any, + lineGradientColorTo: any, + onValueChange: any, + selectedValue: any, selectedIndex: any, } } @@ -35,27 +35,27 @@ class WheelCurvedPicker extends React.Component { propTypes: { ...View.propTypes, - data: PropTypes.array, + data: any, textColor: ColorPropType, textSize: any, - itemStyle: PropTypes.object, + itemStyle: any, itemSpace: any, - onValueChange: PropTypes.func, + onValueChange: any, - selectedValue: PropTypes.any, + selectedValue: any, selectedIndex: any, - lineColor: PropTypes.string, + lineColor: any, - lineGradientColorFrom: PropTypes.string, + lineGradientColorFrom: any, - lineGradientColorTo: PropTypes.string, + lineGradientColorTo: any, } constructor(props){ From 98c133170208c6bdd1a4a62d4a4faba6b6ab2832 Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Tue, 10 Mar 2020 15:40:59 +0530 Subject: [PATCH 09/20] Change PropType --- WheelCurvedPicker.android.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WheelCurvedPicker.android.js b/WheelCurvedPicker.android.js index 04514b1..e7b4770 100644 --- a/WheelCurvedPicker.android.js +++ b/WheelCurvedPicker.android.js @@ -107,8 +107,8 @@ class WheelCurvedPicker extends React.Component { class Item extends React.Component { propTypes: { - value: React.PropTypes.any, // string or integer basically - label: React.PropTypes.string, + value: any, // string or integer basically + label: any, } render () { From b5be0a79a087f59a8f831a36803fa0613a1d6bc7 Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Tue, 10 Mar 2020 15:55:41 +0530 Subject: [PATCH 10/20] Change PropTypes --- WheelCurvedPicker.android.js | 72 +++++++++++++++--------------------- 1 file changed, 30 insertions(+), 42 deletions(-) diff --git a/WheelCurvedPicker.android.js b/WheelCurvedPicker.android.js index e7b4770..d123c90 100644 --- a/WheelCurvedPicker.android.js +++ b/WheelCurvedPicker.android.js @@ -14,50 +14,23 @@ const WheelCurvedPickerNativeInterface = { name: 'WheelCurvedPicker', propTypes: { ...View.propTypes, - data: any, + data:PropTypes.array, textColor: ColorPropType, - textSize: any, - itemStyle: any, - itemSpace: any, - lineColor: any, - lineGradientColorFrom: any, - lineGradientColorTo: any, - onValueChange: any, - selectedValue: any, - selectedIndex: any, + textSize: PropTypes.number, + itemStyle: PropTypes.object, + itemSpace: PropTypes.number, + onValueChange: PropTypes.func, + selectedValue: PropTypes.any, + selectedIndex: PropTypes.number, + lineColor: PropTypes.any, + lineGradientColorFrom: PropTypes.any, + lineGradientColorTo: PropTypes.any, } } const WheelCurvedPickerNative = requireNativeComponent('WheelCurvedPicker', WheelCurvedPickerNativeInterface); class WheelCurvedPicker extends React.Component { - - propTypes: { - ...View.propTypes, - - data: any, - - textColor: ColorPropType, - - textSize: any, - - itemStyle: any, - - itemSpace: any, - - onValueChange: any, - - selectedValue: any, - - selectedIndex: any, - - lineColor: any, - - lineGradientColorFrom: any, - - lineGradientColorTo: any, - } - constructor(props){ super(props) this.state = this._stateFromProps(props) @@ -106,16 +79,31 @@ class WheelCurvedPicker extends React.Component { } class Item extends React.Component { - propTypes: { - value: any, // string or integer basically - label: any, - } - render () { // These items don't get rendered directly. return null; } } + +WheelCurvedPicker.propTypes = { + ...View.propTypes, + data: PropTypes.array, + textColor: ColorPropType, + textSize: PropTypes.number, + itemStyle: PropTypes.object, + itemSpace: PropTypes.number, + onValueChange: PropTypes.func, + selectedValue: PropTypes.any, + selectedIndex: PropTypes.number, + lineColor: PropTypes.any, + lineGradientColorFrom: PropTypes.any, + lineGradientColorTo: PropTypes.any +} + +Item.propTypes = { + value: PropTypes.any, // string or integer basically + label: PropTypes.string, +} WheelCurvedPicker.Item = Item; From b4c27eca09d3051488da631bab391328e3c6da0e Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Thu, 12 Mar 2020 00:59:34 +0530 Subject: [PATCH 11/20] Upgrade target sdk version --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f0a74ba..52b32be 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 28 versionCode 1 versionName "1.0" ndk { From dd26c947b0185f4d625da4a84f7bcf9ac5dd5bdc Mon Sep 17 00:00:00 2001 From: Naveen Cooray Date: Thu, 12 Mar 2020 20:41:37 +0530 Subject: [PATCH 12/20] Increase default text size --- .../src/main/java/com/zyu/ReactWheelCurvedPickerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java b/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java index c825d61..ead7628 100644 --- a/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java +++ b/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java @@ -21,7 +21,7 @@ public class ReactWheelCurvedPickerManager extends SimpleViewManager Date: Thu, 12 Mar 2020 21:23:45 +0530 Subject: [PATCH 13/20] Update ReactWheelCurvedPickerManager.java --- .../src/main/java/com/zyu/ReactWheelCurvedPickerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java b/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java index ead7628..a6023a8 100644 --- a/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java +++ b/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java @@ -21,7 +21,7 @@ public class ReactWheelCurvedPickerManager extends SimpleViewManager Date: Thu, 12 Mar 2020 21:50:59 +0530 Subject: [PATCH 14/20] Update ReactWheelCurvedPickerManager.java --- .../src/main/java/com/zyu/ReactWheelCurvedPickerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java b/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java index a6023a8..da6a483 100644 --- a/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java +++ b/android/src/main/java/com/zyu/ReactWheelCurvedPickerManager.java @@ -21,7 +21,7 @@ public class ReactWheelCurvedPickerManager extends SimpleViewManager Date: Fri, 12 Nov 2021 21:31:20 +0530 Subject: [PATCH 15/20] add new ios picker --- .gitignore | 1 + index.js | 14 ++++++-------- package.json | 8 ++++++-- yarn.lock | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore index 7696dd5..cf093d7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ android/build *.iml android/.idea/workspace.xml android/.idea/copyright/profiles_settings.xml +node_modules \ No newline at end of file diff --git a/index.js b/index.js index bc7ed07..256fbc7 100644 --- a/index.js +++ b/index.js @@ -1,12 +1,10 @@ -'use strict'; +"use strict"; -import React from 'react'; +import React from "react"; -import { - PickerIOS, - Platform, -} from 'react-native'; +import { Platform } from "react-native"; +import { PickerIOS } from "@react-native-picker/picker"; -import WheelCurvedPicker from './WheelCurvedPicker' +import WheelCurvedPicker from "./WheelCurvedPicker"; -module.exports = (Platform.OS === 'ios' ? PickerIOS : WheelCurvedPicker) +module.exports = Platform.OS === "ios" ? PickerIOS : WheelCurvedPicker; diff --git a/package.json b/package.json index 6f285dc..d950d50 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "keywords": [ "react-native", "picker", - "wheel" + "wheel" ], "author": "Yu Zheng", "license": "ISC", @@ -21,5 +21,9 @@ "url": "https://github.com/lesliesam/react-native-wheel-picker/issues" }, "homepage": "https://github.com/lesliesam/react-native-wheel-picker#readme", - "dependencies": {} + "dependencies": { + "@react-native-picker/picker": "^2.2.0", + "add": "^2.0.6", + "yarn": "^1.22.17" + } } diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..167f17e --- /dev/null +++ b/yarn.lock @@ -0,0 +1,18 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@react-native-picker/picker@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.2.0.tgz#e96ecc0808bdf2a706a263b422864bee5a0e6b76" + integrity sha512-zhzXsppY9t6TU39WMx/x1L1PyP3dPgGhtav7Yo8nlfihNGIAFwHnNcNuyC8CLdWxKj9n2+Z6+ZR6r/Kda82JnA== + +add@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/add/-/add-2.0.6.tgz#248f0a9f6e5a528ef2295dbeec30532130ae2235" + integrity sha1-JI8Kn25aUo7yKV2+7DBTITCuIjU= + +yarn@^1.22.17: + version "1.22.17" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.17.tgz#bf910747d22497b573131f7341c0e1d15c74036c" + integrity sha512-H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ== From 7e3def3a1f6d8a8d7d2c2da704089bff8820820a Mon Sep 17 00:00:00 2001 From: "Naveen C. Cooray" Date: Fri, 12 Nov 2021 21:34:40 +0530 Subject: [PATCH 16/20] add picker lib as a peer dependency --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index d950d50..be4a456 100644 --- a/package.json +++ b/package.json @@ -25,5 +25,8 @@ "@react-native-picker/picker": "^2.2.0", "add": "^2.0.6", "yarn": "^1.22.17" + }, + "peerDependencies": { + "@react-native-picker/picker": "^2.2.0" } } From f77bb7cdbfc6d3aba7ed27a3c36594b7299d4c3d Mon Sep 17 00:00:00 2001 From: "Naveen C. Cooray" Date: Fri, 12 Nov 2021 21:58:04 +0530 Subject: [PATCH 17/20] reset master branch --- index.js | 3 +-- package.json | 1 - yarn.lock | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/index.js b/index.js index 256fbc7..1e8cdb2 100644 --- a/index.js +++ b/index.js @@ -2,8 +2,7 @@ import React from "react"; -import { Platform } from "react-native"; -import { PickerIOS } from "@react-native-picker/picker"; +import { Platform, PickerIOS } from "react-native"; import WheelCurvedPicker from "./WheelCurvedPicker"; diff --git a/package.json b/package.json index d950d50..6022473 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ }, "homepage": "https://github.com/lesliesam/react-native-wheel-picker#readme", "dependencies": { - "@react-native-picker/picker": "^2.2.0", "add": "^2.0.6", "yarn": "^1.22.17" } diff --git a/yarn.lock b/yarn.lock index 167f17e..6f49b66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@react-native-picker/picker@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.2.0.tgz#e96ecc0808bdf2a706a263b422864bee5a0e6b76" - integrity sha512-zhzXsppY9t6TU39WMx/x1L1PyP3dPgGhtav7Yo8nlfihNGIAFwHnNcNuyC8CLdWxKj9n2+Z6+ZR6r/Kda82JnA== - add@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/add/-/add-2.0.6.tgz#248f0a9f6e5a528ef2295dbeec30532130ae2235" From c006d901da7743229f90b57a2073ffb09a8a86ed Mon Sep 17 00:00:00 2001 From: "Naveen C. Cooray" Date: Fri, 12 Nov 2021 21:59:43 +0530 Subject: [PATCH 18/20] Reset master brancj --- .gitignore | 3 +-- package.json | 8 +------- yarn.lock | 13 ------------- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore index cf093d7..2be9c5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ android/build *.iml android/.idea/workspace.xml -android/.idea/copyright/profiles_settings.xml -node_modules \ No newline at end of file +android/.idea/copyright/profiles_settings.xml \ No newline at end of file diff --git a/package.json b/package.json index 40e9f33..80bb911 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,5 @@ "url": "https://github.com/lesliesam/react-native-wheel-picker/issues" }, "homepage": "https://github.com/lesliesam/react-native-wheel-picker#readme", - "dependencies": { - "add": "^2.0.6", - "yarn": "^1.22.17" - }, - "peerDependencies": { - "@react-native-picker/picker": "^2.2.0" - } + "dependencies": {} } diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index 6f49b66..0000000 --- a/yarn.lock +++ /dev/null @@ -1,13 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -add@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/add/-/add-2.0.6.tgz#248f0a9f6e5a528ef2295dbeec30532130ae2235" - integrity sha1-JI8Kn25aUo7yKV2+7DBTITCuIjU= - -yarn@^1.22.17: - version "1.22.17" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.17.tgz#bf910747d22497b573131f7341c0e1d15c74036c" - integrity sha512-H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ== From 4fb58ea38e8c4679fef00b54a7235aab80ae1cf0 Mon Sep 17 00:00:00 2001 From: Thanushan Vasanthanathan <60136322+thanushanCalcey@users.noreply.github.com> Date: Mon, 3 Apr 2023 17:07:07 +0530 Subject: [PATCH 19/20] Changed compile to implementation --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 52b32be..4fce7d0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -15,7 +15,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile "cn.aigestudio.wheelpicker:WheelPicker:1.0.3" - compile 'com.facebook.react:react-native:+' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "cn.aigestudio.wheelpicker:WheelPicker:1.0.3" + implementation 'com.facebook.react:react-native:+' } From 35fc2fc10576db8a189442cb743832b3a250fbdb Mon Sep 17 00:00:00 2001 From: Thanushan Vasanthanathan <60136322+thanushanCalcey@users.noreply.github.com> Date: Mon, 3 Apr 2023 17:19:17 +0530 Subject: [PATCH 20/20] Reset master --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 4fce7d0..52b32be 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -15,7 +15,7 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "cn.aigestudio.wheelpicker:WheelPicker:1.0.3" - implementation 'com.facebook.react:react-native:+' + compile fileTree(dir: 'libs', include: ['*.jar']) + compile "cn.aigestudio.wheelpicker:WheelPicker:1.0.3" + compile 'com.facebook.react:react-native:+' }