@@ -4,7 +4,8 @@ import 'dart:async';
4
4
import 'package:flutter/cupertino.dart' ;
5
5
import 'package:flutter/material.dart' ;
6
6
import 'package:flutter/painting.dart' ;
7
- import 'package:flutter_datetime_picker/src/datetime_picker_theme.dart' ;
7
+ import 'package:flutter_datetime_picker/src/datetime_picker_theme.dart'
8
+ as datetime_picker_theme;
8
9
import 'package:flutter_datetime_picker/src/date_model.dart' ;
9
10
import 'package:flutter_datetime_picker/src/i18n_model.dart' ;
10
11
@@ -30,7 +31,7 @@ class DatePicker {
30
31
DateCancelledCallback ? onCancel,
31
32
locale: LocaleType .en,
32
33
DateTime ? currentTime,
33
- DatePickerTheme ? theme,
34
+ datetime_picker_theme. DatePickerTheme ? theme,
34
35
}) async {
35
36
return await Navigator .push (
36
37
context,
@@ -65,7 +66,7 @@ class DatePicker {
65
66
DateCancelledCallback ? onCancel,
66
67
locale: LocaleType .en,
67
68
DateTime ? currentTime,
68
- DatePickerTheme ? theme,
69
+ datetime_picker_theme. DatePickerTheme ? theme,
69
70
}) async {
70
71
return await Navigator .push (
71
72
context,
@@ -98,7 +99,7 @@ class DatePicker {
98
99
DateCancelledCallback ? onCancel,
99
100
locale: LocaleType .en,
100
101
DateTime ? currentTime,
101
- DatePickerTheme ? theme,
102
+ datetime_picker_theme. DatePickerTheme ? theme,
102
103
}) async {
103
104
return await Navigator .push (
104
105
context,
@@ -132,7 +133,7 @@ class DatePicker {
132
133
DateCancelledCallback ? onCancel,
133
134
locale: LocaleType .en,
134
135
DateTime ? currentTime,
135
- DatePickerTheme ? theme,
136
+ datetime_picker_theme. DatePickerTheme ? theme,
136
137
}) async {
137
138
return await Navigator .push (
138
139
context,
@@ -166,7 +167,7 @@ class DatePicker {
166
167
DateCancelledCallback ? onCancel,
167
168
locale: LocaleType .en,
168
169
BasePickerModel ? pickerModel,
169
- DatePickerTheme ? theme,
170
+ datetime_picker_theme. DatePickerTheme ? theme,
170
171
}) async {
171
172
return await Navigator .push (
172
173
context,
@@ -191,21 +192,21 @@ class _DatePickerRoute<T> extends PopupRoute<T> {
191
192
this .onChanged,
192
193
this .onConfirm,
193
194
this .onCancel,
194
- DatePickerTheme ? theme,
195
+ datetime_picker_theme. DatePickerTheme ? theme,
195
196
this .barrierLabel,
196
197
this .locale,
197
198
RouteSettings ? settings,
198
199
BasePickerModel ? pickerModel,
199
200
}) : this .pickerModel = pickerModel ?? DatePickerModel (),
200
- this .theme = theme ?? DatePickerTheme (),
201
+ this .theme = theme ?? datetime_picker_theme. DatePickerTheme (),
201
202
super (settings: settings);
202
203
203
204
final bool ? showTitleActions;
204
205
final DateChangedCallback ? onChanged;
205
206
final DateChangedCallback ? onConfirm;
206
207
final DateCancelledCallback ? onCancel;
207
208
final LocaleType ? locale;
208
- final DatePickerTheme theme;
209
+ final datetime_picker_theme. DatePickerTheme theme;
209
210
final BasePickerModel pickerModel;
210
211
211
212
@override
@@ -293,7 +294,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
293
294
294
295
@override
295
296
Widget build (BuildContext context) {
296
- DatePickerTheme theme = widget.route.theme;
297
+ datetime_picker_theme. DatePickerTheme theme = widget.route.theme;
297
298
return GestureDetector (
298
299
child: AnimatedBuilder (
299
300
animation: widget.route.animation! ,
@@ -326,7 +327,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
326
327
}
327
328
}
328
329
329
- Widget _renderPickerView (DatePickerTheme theme) {
330
+ Widget _renderPickerView (datetime_picker_theme. DatePickerTheme theme) {
330
331
Widget itemView = _renderItemView (theme);
331
332
if (widget.route.showTitleActions == true ) {
332
333
return Column (
@@ -341,7 +342,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
341
342
342
343
Widget _renderColumnView (
343
344
ValueKey key,
344
- DatePickerTheme theme,
345
+ datetime_picker_theme. DatePickerTheme theme,
345
346
StringAtIndexCallBack stringAtIndexCB,
346
347
ScrollController scrollController,
347
348
int layoutProportion,
@@ -396,7 +397,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
396
397
);
397
398
}
398
399
399
- Widget _renderItemView (DatePickerTheme theme) {
400
+ Widget _renderItemView (datetime_picker_theme. DatePickerTheme theme) {
400
401
return Container (
401
402
color: theme.backgroundColor,
402
403
child: Directionality (
@@ -471,7 +472,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
471
472
}
472
473
473
474
// Title View
474
- Widget _renderTitleActionsView (DatePickerTheme theme) {
475
+ Widget _renderTitleActionsView (datetime_picker_theme. DatePickerTheme theme) {
475
476
final done = _localeDone ();
476
477
final cancel = _localeCancel ();
477
478
@@ -543,7 +544,7 @@ class _BottomPickerLayout extends SingleChildLayoutDelegate {
543
544
final double progress;
544
545
final int ? itemCount;
545
546
final bool ? showTitleActions;
546
- final DatePickerTheme theme;
547
+ final datetime_picker_theme. DatePickerTheme theme;
547
548
final double bottomPadding;
548
549
549
550
@override
0 commit comments