Merge branch 'master' of https://github.com/yangyxd/flutter_picker

yangyxd · Oct 17, 2019 · 0b0c2de · 0b0c2de
2 parents 1858569 + 9619c42
commit 0b0c2de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16

diff --git a/lib/Picker.dart b/lib/Picker.dart
@@ -1127,9 +1127,10 @@ class DateTimePickerAdapter extends PickerAdapter<DateTime> {
 
   @override
   int getColumnFlex(int column) {
-    if (getColumnType(column) == 0) {
+    if (picker.columnFlex != null && column < picker.columnFlex.length)
+      return picker.columnFlex[column];
+    if (getColumnType(column) == 0)
       return 3;
-    }
     return 2;
   }