Quellcode durchsuchen

Merge pull request #15 from kevgug/master

Minor UI Changes - makes more iOS-like
刘彦博 vor 6 Jahren
Ursprung
Commit
f93f149eed

+ 17 - 0
example/android/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

+ 2 - 0
example/android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

+ 7 - 3
lib/flutter_datetime_picker.dart

@@ -384,7 +384,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
   Widget _renderTitleActionsView(DatePickerTheme theme) {
     String done = _localeDone();
     String cancel = _localeCancel();
-
+    
     return Container(
       height: theme.titleHeight,
       decoration: BoxDecoration(color: theme.backgroundColor ?? Colors.white),
@@ -393,7 +393,9 @@ class _DatePickerState extends State<_DatePickerComponent> {
         children: <Widget>[
           Container(
             height: theme.titleHeight,
-            child: FlatButton(
+            child: CupertinoButton(
+              pressedOpacity: 0.3,
+              padding: EdgeInsets.only(left: 16, top: 0),
               child: Text(
                 '$cancel',
                 style: theme.cancelStyle,
@@ -403,7 +405,9 @@ class _DatePickerState extends State<_DatePickerComponent> {
           ),
           Container(
             height: theme.titleHeight,
-            child: FlatButton(
+            child: CupertinoButton(
+              pressedOpacity: 0.3,
+              padding: EdgeInsets.only(right: 16, top: 0),
               child: Text(
                 '$done',
                 style: theme.doneStyle,

+ 1 - 1
lib/src/date_format.dart

@@ -242,7 +242,7 @@ String formatDate(DateTime date, List<String> formats, LocaleType locale) {
       } else if (locale == LocaleType.nl) {
         return formatDate(date, [D, ' ', dd, ' ', M, ' ', yyyy], locale);
       } else {
-        return formatDate(date, [D, ' ', M, ' ', dd, ',', yyyy], locale);
+        return formatDate(date, [D, ' ', M, ' ', dd, ', ', yyyy], locale);
       }
     }
   }

+ 9 - 1
lib/src/date_model.dart

@@ -149,6 +149,7 @@ class DatePickerModel extends CommonPickerModel {
 
   void _fillLeftLists() {
     this.leftList = List.generate(maxTime.year - minTime.year + 1, (int index) {
+      print('LEFT LIST... ${minTime.year + index}${_localeYear()}');
       return '${minTime.year + index}${_localeYear()}';
     });
   }
@@ -179,8 +180,15 @@ class DatePickerModel extends CommonPickerModel {
   void _fillMiddleLists() {
     int minMonth = _minMonthOfCurrentYear();
     int maxMonth = _maxMonthOfCurrentYear();
+
+    List monthStrings = i18nObjInLocale(locale)['monthLong'];
+    
     this.middleList = List.generate(maxMonth - minMonth + 1, (int index) {
-      return '${minMonth + index}${_localeMonth()}';
+      if (locale == LocaleType.zh) {
+        return '${minMonth + index}${_localeMonth()}';
+      } else {
+        return monthStrings[minMonth + index - 1];
+      }
     });
   }