Skip to content
This repository was archived by the owner on Sep 9, 2024. It is now read-only.

Commit c860346

Browse files
committed
v2.0.31
1 parent 40c4a3a commit c860346

File tree

4 files changed

+26
-23
lines changed

4 files changed

+26
-23
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Using `react-native-modal` and `@react-native-community/picker` component for IO
88
<img src="./docs/android-picker-module.png" width="200"> <img width="200" src="./docs/ios-picker-module.png">
99

1010

11-
## v2.0.3 released.
11+
## v2.0.31 released.
1212

1313
### v2.0.2 has a lot of breaking changes. You should be carefull when using this version.
1414

15-
### v2.0.3
16-
- PRs merged.
15+
### v2.0.31
16+
- PRs merged. Some issues fixed
1717

1818
### v2.0.2
1919
- Android input.substr issue solved.

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
minSdkVersion 16
1515
targetSdkVersion 28
1616
versionCode 3
17-
versionName "2.0.3"
17+
versionName "2.0.31"
1818
}
1919
lintOptions {
2020
abortOnError false

android/src/main/java/com/taluttasgiran/pickermodule/RNSpinnerAdapter.java

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,28 @@ public void onBindViewHolder(MyViewHolder holder, final int position) {
6262
String text = null;
6363
Button button = holder.linearLayout.findViewById(R.id.button);
6464
if (mDataset.getType(position) == ReadableType.Map) {
65-
if (mDataset.getMap(position).getType("value") == ReadableType.String) {
66-
value = mDataset.getMap(position).getString("value");
67-
} else {
68-
double number = mDataset.getMap(position).getDouble("value");
69-
if (number == Math.rint(number)) {
70-
value = String.valueOf((int) number);
71-
} else {
72-
value = String.valueOf(number);
65+
if(mDataset.getMap(position).getType("value") != ReadableType.Null){
66+
if (mDataset.getMap(position).getType("value") == ReadableType.String) {
67+
value = mDataset.getMap(position).getString("value");
68+
} else {
69+
double number = mDataset.getMap(position).getDouble("value");
70+
if (number == Math.rint(number)) {
71+
value = String.valueOf((int) number);
72+
} else {
73+
value = String.valueOf(number);
74+
}
75+
}
76+
if (mDataset.getMap(position).getType("label") == ReadableType.String) {
77+
text = mDataset.getMap(position).getString("label");
78+
} else {
79+
double number = mDataset.getMap(position).getDouble("label");
80+
if (number == Math.rint(number)) {
81+
text = String.valueOf((int) number);
82+
} else {
83+
text = String.valueOf(number);
84+
}
85+
}
7386
}
74-
}
75-
if (mDataset.getMap(position).getType("label") == ReadableType.String) {
76-
text = mDataset.getMap(position).getString("label");
77-
} else {
78-
double number = mDataset.getMap(position).getDouble("label");
79-
if (number == Math.rint(number)) {
80-
text = String.valueOf((int) number);
81-
} else {
82-
text = String.valueOf(number);
83-
}
84-
}
8587
} else if (mDataset.getType(position) == ReadableType.String) {
8688
text = mDataset.getString(position);
8789
value = mDataset.getString(position);

android/src/main/res/layout/spinner_item.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
android:layout_height="wrap_content"
1313
android:gravity="start|center_vertical"
1414
android:padding="15dp"
15+
android:textAllCaps="false"
1516
android:text="Button" />
1617

1718
</LinearLayout>

0 commit comments

Comments
 (0)