Skip to content

Commit 0f2f057

Browse files
freaknessfreakness
committed
feat(flutter-3-10): update package for flutter 3.10.0
1 parent eb66486 commit 0f2f057

File tree

11 files changed

+425
-159
lines changed

11 files changed

+425
-159
lines changed

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Miscellaneous
22
*.class
3-
*.lock
43
*.log
54
*.pyc
65
*.swp
@@ -29,7 +28,6 @@
2928
build/
3029

3130
# Android related
32-
pubspec.lock
3331
**/android/**/gradle-wrapper.jar
3432
**/android/.gradle
3533
**/android/captures/

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,5 @@
4848
## [1.3.8] - add Swedish language and fix issues
4949
## [1.4.0] - support flutter 1.2.0
5050
## [1.5.0] - so much update
51-
## [1.5.1] - null safety
51+
## [1.5.1] - null safety
52+
## [2.0.0] - Support flutter 3.10.0 / dart 3.0.0

‎example/ios/Flutter/flutter_export_environment.sh‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=/Users/liuyanbo/flutter"
4-
export "FLUTTER_APPLICATION_PATH=/Users/liuyanbo/Documents/GitHub/flutter_datetime_picker/example"
5-
export "FLUTTER_TARGET=/Users/liuyanbo/Documents/GitHub/flutter_datetime_picker/example/lib/main.dart"
3+
export "FLUTTER_ROOT=/Users/louis/development/flutter"
4+
export "FLUTTER_APPLICATION_PATH=/Users/louis/Projects/Picky/flutter_datetime_picker/example"
5+
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
6+
export "FLUTTER_TARGET=lib/main.dart"
67
export "FLUTTER_BUILD_DIR=build"
7-
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
8-
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
9-
export "FLUTTER_FRAMEWORK_DIR=/Users/liuyanbo/flutter/bin/cache/artifacts/engine/ios"
108
export "FLUTTER_BUILD_NAME=1.0.0"
119
export "FLUTTER_BUILD_NUMBER=1"
12-
export "DART_DEFINES=flutter.inspector.structuredErrors%3Dtrue"
1310
export "DART_OBFUSCATION=false"
1411
export "TRACK_WIDGET_CREATION=true"
1512
export "TREE_SHAKE_ICONS=false"
16-
export "PACKAGE_CONFIG=.packages"
13+
export "PACKAGE_CONFIG=.dart_tool/package_config.json"

‎example/lib/main.dart‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
2+
import 'package:flutter_datetime_picker_plus/flutter_datetime_picker_plus.dart'
3+
as picker;
34

45
void main() => runApp(new MyApp());
56

6-
class CustomPicker extends CommonPickerModel {
7+
class CustomPicker extends picker.CommonPickerModel {
78
String digits(int value, int length) {
89
return '$value'.padLeft(length, "0");
910
}
1011

11-
CustomPicker({DateTime? currentTime, LocaleType? locale})
12+
CustomPicker({DateTime? currentTime, picker.LocaleType? locale})
1213
: super(locale: locale) {
1314
this.currentTime = currentTime ?? DateTime.now();
1415
this.setLeftIndex(this.currentTime.hour);
@@ -104,11 +105,11 @@ class HomePage extends StatelessWidget {
104105
children: <Widget>[
105106
TextButton(
106107
onPressed: () {
107-
DatePicker.showDatePicker(context,
108+
picker.DatePicker.showDatePicker(context,
108109
showTitleActions: true,
109110
minTime: DateTime(2018, 3, 5),
110111
maxTime: DateTime(2019, 6, 7),
111-
theme: DatePickerTheme(
112+
theme: picker.DatePickerTheme(
112113
headerColor: Colors.orange,
113114
backgroundColor: Colors.blue,
114115
itemStyle: TextStyle(
@@ -122,16 +123,16 @@ class HomePage extends StatelessWidget {
122123
date.timeZoneOffset.inHours.toString());
123124
}, onConfirm: (date) {
124125
print('confirm $date');
125-
}, currentTime: DateTime.now(), locale: LocaleType.en);
126+
}, currentTime: DateTime.now(), locale: picker.LocaleType.en);
126127
},
127128
child: Text(
128129
'show date picker(custom theme &date time range)',
129130
style: TextStyle(color: Colors.blue),
130131
)),
131132
TextButton(
132133
onPressed: () {
133-
DatePicker.showTimePicker(context, showTitleActions: true,
134-
onChanged: (date) {
134+
picker.DatePicker.showTimePicker(context,
135+
showTitleActions: true, onChanged: (date) {
135136
print('change $date in time zone ' +
136137
date.timeZoneOffset.inHours.toString());
137138
}, onConfirm: (date) {
@@ -144,8 +145,8 @@ class HomePage extends StatelessWidget {
144145
)),
145146
TextButton(
146147
onPressed: () {
147-
DatePicker.showTime12hPicker(context, showTitleActions: true,
148-
onChanged: (date) {
148+
picker.DatePicker.showTime12hPicker(context,
149+
showTitleActions: true, onChanged: (date) {
149150
print('change $date in time zone ' +
150151
date.timeZoneOffset.inHours.toString());
151152
}, onConfirm: (date) {
@@ -158,24 +159,24 @@ class HomePage extends StatelessWidget {
158159
)),
159160
TextButton(
160161
onPressed: () {
161-
DatePicker.showDateTimePicker(context,
162+
picker.DatePicker.showDateTimePicker(context,
162163
showTitleActions: true,
163164
minTime: DateTime(2020, 5, 5, 20, 50),
164165
maxTime: DateTime(2020, 6, 7, 05, 09), onChanged: (date) {
165166
print('change $date in time zone ' +
166167
date.timeZoneOffset.inHours.toString());
167168
}, onConfirm: (date) {
168169
print('confirm $date');
169-
}, locale: LocaleType.zh);
170+
}, locale: picker.LocaleType.zh);
170171
},
171172
child: Text(
172173
'show date time picker (Chinese)',
173174
style: TextStyle(color: Colors.blue),
174175
)),
175176
TextButton(
176177
onPressed: () {
177-
DatePicker.showDateTimePicker(context, showTitleActions: true,
178-
onChanged: (date) {
178+
picker.DatePicker.showDateTimePicker(context,
179+
showTitleActions: true, onChanged: (date) {
179180
print('change $date in time zone ' +
180181
date.timeZoneOffset.inHours.toString());
181182
}, onConfirm: (date) {
@@ -188,63 +189,63 @@ class HomePage extends StatelessWidget {
188189
)),
189190
TextButton(
190191
onPressed: () {
191-
DatePicker.showDateTimePicker(context, showTitleActions: true,
192-
onChanged: (date) {
192+
picker.DatePicker.showDateTimePicker(context,
193+
showTitleActions: true, onChanged: (date) {
193194
print('change $date in time zone ' +
194195
date.timeZoneOffset.inHours.toString());
195196
}, onConfirm: (date) {
196197
print('confirm $date');
197198
},
198199
currentTime: DateTime(2008, 12, 31, 23, 12, 34),
199-
locale: LocaleType.nl);
200+
locale: picker.LocaleType.nl);
200201
},
201202
child: Text(
202203
'show date time picker (Dutch)',
203204
style: TextStyle(color: Colors.blue),
204205
)),
205206
TextButton(
206207
onPressed: () {
207-
DatePicker.showDateTimePicker(context, showTitleActions: true,
208-
onChanged: (date) {
208+
picker.DatePicker.showDateTimePicker(context,
209+
showTitleActions: true, onChanged: (date) {
209210
print('change $date in time zone ' +
210211
date.timeZoneOffset.inHours.toString());
211212
}, onConfirm: (date) {
212213
print('confirm $date');
213214
},
214215
currentTime: DateTime(2008, 12, 31, 23, 12, 34),
215-
locale: LocaleType.ru);
216+
locale: picker.LocaleType.ru);
216217
},
217218
child: Text(
218219
'show date time picker (Russian)',
219220
style: TextStyle(color: Colors.blue),
220221
)),
221222
TextButton(
222223
onPressed: () {
223-
DatePicker.showDateTimePicker(context, showTitleActions: true,
224-
onChanged: (date) {
224+
picker.DatePicker.showDateTimePicker(context,
225+
showTitleActions: true, onChanged: (date) {
225226
print('change $date in time zone ' +
226227
date.timeZoneOffset.inHours.toString());
227228
}, onConfirm: (date) {
228229
print('confirm $date');
229230
},
230231
currentTime: DateTime.utc(2019, 12, 31, 23, 12, 34),
231-
locale: LocaleType.de);
232+
locale: picker.LocaleType.de);
232233
},
233234
child: Text(
234235
'show date time picker in UTC (German)',
235236
style: TextStyle(color: Colors.blue),
236237
)),
237238
TextButton(
238239
onPressed: () {
239-
DatePicker.showPicker(context, showTitleActions: true,
240+
picker.DatePicker.showPicker(context, showTitleActions: true,
240241
onChanged: (date) {
241242
print('change $date in time zone ' +
242243
date.timeZoneOffset.inHours.toString());
243244
}, onConfirm: (date) {
244245
print('confirm $date');
245246
},
246247
pickerModel: CustomPicker(currentTime: DateTime.now()),
247-
locale: LocaleType.en);
248+
locale: picker.LocaleType.en);
248249
},
249250
child: Text(
250251
'show custom time picker,\nyou can custom picker model like this',

‎example/pubspec.lock‎

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
# Generated by pub
2+
# See https://dart.dev/tools/pub/glossary#lockfile
3+
packages:
4+
async:
5+
dependency: transitive
6+
description:
7+
name: async
8+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
9+
url: "https://pub.dev"
10+
source: hosted
11+
version: "2.11.0"
12+
boolean_selector:
13+
dependency: transitive
14+
description:
15+
name: boolean_selector
16+
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
17+
url: "https://pub.dev"
18+
source: hosted
19+
version: "2.1.1"
20+
characters:
21+
dependency: transitive
22+
description:
23+
name: characters
24+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
25+
url: "https://pub.dev"
26+
source: hosted
27+
version: "1.3.0"
28+
clock:
29+
dependency: transitive
30+
description:
31+
name: clock
32+
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
33+
url: "https://pub.dev"
34+
source: hosted
35+
version: "1.1.1"
36+
collection:
37+
dependency: transitive
38+
description:
39+
name: collection
40+
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
41+
url: "https://pub.dev"
42+
source: hosted
43+
version: "1.17.1"
44+
cupertino_icons:
45+
dependency: "direct main"
46+
description:
47+
name: cupertino_icons
48+
sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
49+
url: "https://pub.dev"
50+
source: hosted
51+
version: "1.0.5"
52+
fake_async:
53+
dependency: transitive
54+
description:
55+
name: fake_async
56+
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
57+
url: "https://pub.dev"
58+
source: hosted
59+
version: "1.3.1"
60+
flutter:
61+
dependency: "direct main"
62+
description: flutter
63+
source: sdk
64+
version: "0.0.0"
65+
flutter_datetime_picker:
66+
dependency: "direct main"
67+
description:
68+
name: flutter_datetime_picker
69+
sha256: "8e695c63c769350e541951227c2775190ec73ceda774a315b1dc9a99d5facfe5"
70+
url: "https://pub.dev"
71+
source: hosted
72+
version: "1.5.1"
73+
flutter_test:
74+
dependency: "direct dev"
75+
description: flutter
76+
source: sdk
77+
version: "0.0.0"
78+
js:
79+
dependency: transitive
80+
description:
81+
name: js
82+
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
83+
url: "https://pub.dev"
84+
source: hosted
85+
version: "0.6.7"
86+
matcher:
87+
dependency: transitive
88+
description:
89+
name: matcher
90+
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
91+
url: "https://pub.dev"
92+
source: hosted
93+
version: "0.12.15"
94+
material_color_utilities:
95+
dependency: transitive
96+
description:
97+
name: material_color_utilities
98+
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
99+
url: "https://pub.dev"
100+
source: hosted
101+
version: "0.2.0"
102+
meta:
103+
dependency: transitive
104+
description:
105+
name: meta
106+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
107+
url: "https://pub.dev"
108+
source: hosted
109+
version: "1.9.1"
110+
path:
111+
dependency: transitive
112+
description:
113+
name: path
114+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
115+
url: "https://pub.dev"
116+
source: hosted
117+
version: "1.8.3"
118+
sky_engine:
119+
dependency: transitive
120+
description: flutter
121+
source: sdk
122+
version: "0.0.99"
123+
source_span:
124+
dependency: transitive
125+
description:
126+
name: source_span
127+
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
128+
url: "https://pub.dev"
129+
source: hosted
130+
version: "1.9.1"
131+
stack_trace:
132+
dependency: transitive
133+
description:
134+
name: stack_trace
135+
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
136+
url: "https://pub.dev"
137+
source: hosted
138+
version: "1.11.0"
139+
stream_channel:
140+
dependency: transitive
141+
description:
142+
name: stream_channel
143+
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
144+
url: "https://pub.dev"
145+
source: hosted
146+
version: "2.1.1"
147+
string_scanner:
148+
dependency: transitive
149+
description:
150+
name: string_scanner
151+
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
152+
url: "https://pub.dev"
153+
source: hosted
154+
version: "1.2.0"
155+
term_glyph:
156+
dependency: transitive
157+
description:
158+
name: term_glyph
159+
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
160+
url: "https://pub.dev"
161+
source: hosted
162+
version: "1.2.1"
163+
test_api:
164+
dependency: transitive
165+
description:
166+
name: test_api
167+
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
168+
url: "https://pub.dev"
169+
source: hosted
170+
version: "0.5.1"
171+
vector_math:
172+
dependency: transitive
173+
description:
174+
name: vector_math
175+
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
176+
url: "https://pub.dev"
177+
source: hosted
178+
version: "2.1.4"
179+
sdks:
180+
dart: ">=3.0.0-0 <4.0.0"

0 commit comments

Comments
 (0)