@@ -4,7 +4,8 @@ import 'dart:async';
44import 'package:flutter/cupertino.dart' ;
55import 'package:flutter/material.dart' ;
66import '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;
89import 'package:flutter_datetime_picker/src/date_model.dart' ;
910import 'package:flutter_datetime_picker/src/i18n_model.dart' ;
1011
@@ -30,7 +31,7 @@ class DatePicker {
3031 DateCancelledCallback ? onCancel,
3132 locale: LocaleType .en,
3233 DateTime ? currentTime,
33- DatePickerTheme ? theme,
34+ datetime_picker_theme. DatePickerTheme ? theme,
3435 }) async {
3536 return await Navigator .push (
3637 context,
@@ -65,7 +66,7 @@ class DatePicker {
6566 DateCancelledCallback ? onCancel,
6667 locale: LocaleType .en,
6768 DateTime ? currentTime,
68- DatePickerTheme ? theme,
69+ datetime_picker_theme. DatePickerTheme ? theme,
6970 }) async {
7071 return await Navigator .push (
7172 context,
@@ -98,7 +99,7 @@ class DatePicker {
9899 DateCancelledCallback ? onCancel,
99100 locale: LocaleType .en,
100101 DateTime ? currentTime,
101- DatePickerTheme ? theme,
102+ datetime_picker_theme. DatePickerTheme ? theme,
102103 }) async {
103104 return await Navigator .push (
104105 context,
@@ -132,7 +133,7 @@ class DatePicker {
132133 DateCancelledCallback ? onCancel,
133134 locale: LocaleType .en,
134135 DateTime ? currentTime,
135- DatePickerTheme ? theme,
136+ datetime_picker_theme. DatePickerTheme ? theme,
136137 }) async {
137138 return await Navigator .push (
138139 context,
@@ -166,7 +167,7 @@ class DatePicker {
166167 DateCancelledCallback ? onCancel,
167168 locale: LocaleType .en,
168169 BasePickerModel ? pickerModel,
169- DatePickerTheme ? theme,
170+ datetime_picker_theme. DatePickerTheme ? theme,
170171 }) async {
171172 return await Navigator .push (
172173 context,
@@ -191,21 +192,21 @@ class _DatePickerRoute<T> extends PopupRoute<T> {
191192 this .onChanged,
192193 this .onConfirm,
193194 this .onCancel,
194- DatePickerTheme ? theme,
195+ datetime_picker_theme. DatePickerTheme ? theme,
195196 this .barrierLabel,
196197 this .locale,
197198 RouteSettings ? settings,
198199 BasePickerModel ? pickerModel,
199200 }) : this .pickerModel = pickerModel ?? DatePickerModel (),
200- this .theme = theme ?? DatePickerTheme (),
201+ this .theme = theme ?? datetime_picker_theme. DatePickerTheme (),
201202 super (settings: settings);
202203
203204 final bool ? showTitleActions;
204205 final DateChangedCallback ? onChanged;
205206 final DateChangedCallback ? onConfirm;
206207 final DateCancelledCallback ? onCancel;
207208 final LocaleType ? locale;
208- final DatePickerTheme theme;
209+ final datetime_picker_theme. DatePickerTheme theme;
209210 final BasePickerModel pickerModel;
210211
211212 @override
@@ -293,7 +294,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
293294
294295 @override
295296 Widget build (BuildContext context) {
296- DatePickerTheme theme = widget.route.theme;
297+ datetime_picker_theme. DatePickerTheme theme = widget.route.theme;
297298 return GestureDetector (
298299 child: AnimatedBuilder (
299300 animation: widget.route.animation! ,
@@ -326,7 +327,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
326327 }
327328 }
328329
329- Widget _renderPickerView (DatePickerTheme theme) {
330+ Widget _renderPickerView (datetime_picker_theme. DatePickerTheme theme) {
330331 Widget itemView = _renderItemView (theme);
331332 if (widget.route.showTitleActions == true ) {
332333 return Column (
@@ -341,7 +342,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
341342
342343 Widget _renderColumnView (
343344 ValueKey key,
344- DatePickerTheme theme,
345+ datetime_picker_theme. DatePickerTheme theme,
345346 StringAtIndexCallBack stringAtIndexCB,
346347 ScrollController scrollController,
347348 int layoutProportion,
@@ -396,7 +397,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
396397 );
397398 }
398399
399- Widget _renderItemView (DatePickerTheme theme) {
400+ Widget _renderItemView (datetime_picker_theme. DatePickerTheme theme) {
400401 return Container (
401402 color: theme.backgroundColor,
402403 child: Directionality (
@@ -471,7 +472,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
471472 }
472473
473474 // Title View
474- Widget _renderTitleActionsView (DatePickerTheme theme) {
475+ Widget _renderTitleActionsView (datetime_picker_theme. DatePickerTheme theme) {
475476 final done = _localeDone ();
476477 final cancel = _localeCancel ();
477478
@@ -543,7 +544,7 @@ class _BottomPickerLayout extends SingleChildLayoutDelegate {
543544 final double progress;
544545 final int ? itemCount;
545546 final bool ? showTitleActions;
546- final DatePickerTheme theme;
547+ final datetime_picker_theme. DatePickerTheme theme;
547548 final double bottomPadding;
548549
549550 @override
0 commit comments