Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix errors for flutter 3.10.0 #322

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix errors for flutter 3.10.0 #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b5a529
example: Name flutter_datetime_picker as datetime_picker.
ryojiro May 11, 2023
b178ff6
flutter_datetime_picker: Name datetime_picker_theme as datetime_picke…
ryojiro May 11, 2023
a81f78a
Fix deprecated_colon_for_default_value.
ryojiro May 11, 2023
482c92d
Fix unused_element.
ryojiro May 11, 2023
32ea472
Fix unnecessary_import.
ryojiro May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import 'package:flutter/material.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'
as datetime_picker;

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

class CustomPicker extends CommonPickerModel {
class CustomPicker extends datetime_picker.CommonPickerModel {
String digits(int value, int length) {
return '$value'.padLeft(length, "0");
}

CustomPicker({DateTime? currentTime, LocaleType? locale})
CustomPicker({DateTime? currentTime, datetime_picker.LocaleType? locale})
: super(locale: locale) {
this.currentTime = currentTime ?? DateTime.now();
this.setLeftIndex(this.currentTime.hour);
Expand Down Expand Up @@ -104,11 +105,11 @@ class HomePage extends StatelessWidget {
children: <Widget>[
TextButton(
onPressed: () {
DatePicker.showDatePicker(context,
datetime_picker.DatePicker.showDatePicker(context,
showTitleActions: true,
minTime: DateTime(2018, 3, 5),
maxTime: DateTime(2019, 6, 7),
theme: DatePickerTheme(
theme: datetime_picker.DatePickerTheme(
headerColor: Colors.orange,
backgroundColor: Colors.blue,
itemStyle: TextStyle(
Expand All @@ -122,16 +123,18 @@ class HomePage extends StatelessWidget {
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
print('confirm $date');
}, currentTime: DateTime.now(), locale: LocaleType.en);
},
currentTime: DateTime.now(),
locale: datetime_picker.LocaleType.en);
},
child: Text(
'show date picker(custom theme &date time range)',
style: TextStyle(color: Colors.blue),
)),
TextButton(
onPressed: () {
DatePicker.showTimePicker(context, showTitleActions: true,
onChanged: (date) {
datetime_picker.DatePicker.showTimePicker(context,
showTitleActions: true, onChanged: (date) {
print('change $date in time zone ' +
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
Expand All @@ -144,8 +147,8 @@ class HomePage extends StatelessWidget {
)),
TextButton(
onPressed: () {
DatePicker.showTime12hPicker(context, showTitleActions: true,
onChanged: (date) {
datetime_picker.DatePicker.showTime12hPicker(context,
showTitleActions: true, onChanged: (date) {
print('change $date in time zone ' +
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
Expand All @@ -158,24 +161,24 @@ class HomePage extends StatelessWidget {
)),
TextButton(
onPressed: () {
DatePicker.showDateTimePicker(context,
datetime_picker.DatePicker.showDateTimePicker(context,
showTitleActions: true,
minTime: DateTime(2020, 5, 5, 20, 50),
maxTime: DateTime(2020, 6, 7, 05, 09), onChanged: (date) {
print('change $date in time zone ' +
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
print('confirm $date');
}, locale: LocaleType.zh);
}, locale: datetime_picker.LocaleType.zh);
},
child: Text(
'show date time picker (Chinese)',
style: TextStyle(color: Colors.blue),
)),
TextButton(
onPressed: () {
DatePicker.showDateTimePicker(context, showTitleActions: true,
onChanged: (date) {
datetime_picker.DatePicker.showDateTimePicker(context,
showTitleActions: true, onChanged: (date) {
print('change $date in time zone ' +
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
Expand All @@ -188,63 +191,63 @@ class HomePage extends StatelessWidget {
)),
TextButton(
onPressed: () {
DatePicker.showDateTimePicker(context, showTitleActions: true,
onChanged: (date) {
datetime_picker.DatePicker.showDateTimePicker(context,
showTitleActions: true, onChanged: (date) {
print('change $date in time zone ' +
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
print('confirm $date');
},
currentTime: DateTime(2008, 12, 31, 23, 12, 34),
locale: LocaleType.nl);
locale: datetime_picker.LocaleType.nl);
},
child: Text(
'show date time picker (Dutch)',
style: TextStyle(color: Colors.blue),
)),
TextButton(
onPressed: () {
DatePicker.showDateTimePicker(context, showTitleActions: true,
onChanged: (date) {
datetime_picker.DatePicker.showDateTimePicker(context,
showTitleActions: true, onChanged: (date) {
print('change $date in time zone ' +
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
print('confirm $date');
},
currentTime: DateTime(2008, 12, 31, 23, 12, 34),
locale: LocaleType.ru);
locale: datetime_picker.LocaleType.ru);
},
child: Text(
'show date time picker (Russian)',
style: TextStyle(color: Colors.blue),
)),
TextButton(
onPressed: () {
DatePicker.showDateTimePicker(context, showTitleActions: true,
onChanged: (date) {
datetime_picker.DatePicker.showDateTimePicker(context,
showTitleActions: true, onChanged: (date) {
print('change $date in time zone ' +
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
print('confirm $date');
},
currentTime: DateTime.utc(2019, 12, 31, 23, 12, 34),
locale: LocaleType.de);
locale: datetime_picker.LocaleType.de);
},
child: Text(
'show date time picker in UTC (German)',
style: TextStyle(color: Colors.blue),
)),
TextButton(
onPressed: () {
DatePicker.showPicker(context, showTitleActions: true,
onChanged: (date) {
datetime_picker.DatePicker.showPicker(context,
showTitleActions: true, onChanged: (date) {
print('change $date in time zone ' +
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
print('confirm $date');
},
pickerModel: CustomPicker(currentTime: DateTime.now()),
locale: LocaleType.en);
locale: datetime_picker.LocaleType.en);
},
child: Text(
'show custom time picker,\nyou can custom picker model like this',
Expand Down
56 changes: 27 additions & 29 deletions lib/flutter_datetime_picker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ library flutter_datetime_picker;
import 'dart:async';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/painting.dart';
import 'package:flutter_datetime_picker/src/datetime_picker_theme.dart';
import 'package:flutter_datetime_picker/src/datetime_picker_theme.dart'
as datetime_picker_theme;
import 'package:flutter_datetime_picker/src/date_model.dart';
import 'package:flutter_datetime_picker/src/i18n_model.dart';

Expand All @@ -22,15 +22,15 @@ class DatePicker {
///
static Future<DateTime?> showDatePicker(
BuildContext context, {
bool showTitleActions: true,
bool showTitleActions = true,
DateTime? minTime,
DateTime? maxTime,
DateChangedCallback? onChanged,
DateChangedCallback? onConfirm,
DateCancelledCallback? onCancel,
locale: LocaleType.en,
locale = LocaleType.en,
DateTime? currentTime,
DatePickerTheme? theme,
datetime_picker_theme.DatePickerTheme? theme,
}) async {
return await Navigator.push(
context,
Expand Down Expand Up @@ -58,14 +58,14 @@ class DatePicker {
///
static Future<DateTime?> showTimePicker(
BuildContext context, {
bool showTitleActions: true,
bool showSecondsColumn: true,
bool showTitleActions = true,
bool showSecondsColumn = true,
DateChangedCallback? onChanged,
DateChangedCallback? onConfirm,
DateCancelledCallback? onCancel,
locale: LocaleType.en,
locale = LocaleType.en,
DateTime? currentTime,
DatePickerTheme? theme,
datetime_picker_theme.DatePickerTheme? theme,
}) async {
return await Navigator.push(
context,
Expand All @@ -92,13 +92,13 @@ class DatePicker {
///
static Future<DateTime?> showTime12hPicker(
BuildContext context, {
bool showTitleActions: true,
bool showTitleActions = true,
DateChangedCallback? onChanged,
DateChangedCallback? onConfirm,
DateCancelledCallback? onCancel,
locale: LocaleType.en,
locale = LocaleType.en,
DateTime? currentTime,
DatePickerTheme? theme,
datetime_picker_theme.DatePickerTheme? theme,
}) async {
return await Navigator.push(
context,
Expand All @@ -124,15 +124,15 @@ class DatePicker {
///
static Future<DateTime?> showDateTimePicker(
BuildContext context, {
bool showTitleActions: true,
bool showTitleActions = true,
DateTime? minTime,
DateTime? maxTime,
DateChangedCallback? onChanged,
DateChangedCallback? onConfirm,
DateCancelledCallback? onCancel,
locale: LocaleType.en,
locale = LocaleType.en,
DateTime? currentTime,
DatePickerTheme? theme,
datetime_picker_theme.DatePickerTheme? theme,
}) async {
return await Navigator.push(
context,
Expand Down Expand Up @@ -160,13 +160,13 @@ class DatePicker {
///
static Future<DateTime?> showPicker(
BuildContext context, {
bool showTitleActions: true,
bool showTitleActions = true,
DateChangedCallback? onChanged,
DateChangedCallback? onConfirm,
DateCancelledCallback? onCancel,
locale: LocaleType.en,
locale = LocaleType.en,
BasePickerModel? pickerModel,
DatePickerTheme? theme,
datetime_picker_theme.DatePickerTheme? theme,
}) async {
return await Navigator.push(
context,
Expand All @@ -191,21 +191,21 @@ class _DatePickerRoute<T> extends PopupRoute<T> {
this.onChanged,
this.onConfirm,
this.onCancel,
DatePickerTheme? theme,
datetime_picker_theme.DatePickerTheme? theme,
this.barrierLabel,
this.locale,
RouteSettings? settings,
BasePickerModel? pickerModel,
}) : this.pickerModel = pickerModel ?? DatePickerModel(),
this.theme = theme ?? DatePickerTheme(),
this.theme = theme ?? datetime_picker_theme.DatePickerTheme(),
super(settings: settings);

final bool? showTitleActions;
final DateChangedCallback? onChanged;
final DateChangedCallback? onConfirm;
final DateCancelledCallback? onCancel;
final LocaleType? locale;
final DatePickerTheme theme;
final datetime_picker_theme.DatePickerTheme theme;
final BasePickerModel pickerModel;

@override
Expand Down Expand Up @@ -293,7 +293,7 @@ class _DatePickerState extends State<_DatePickerComponent> {

@override
Widget build(BuildContext context) {
DatePickerTheme theme = widget.route.theme;
datetime_picker_theme.DatePickerTheme theme = widget.route.theme;
return GestureDetector(
child: AnimatedBuilder(
animation: widget.route.animation!,
Expand Down Expand Up @@ -326,7 +326,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
}
}

Widget _renderPickerView(DatePickerTheme theme) {
Widget _renderPickerView(datetime_picker_theme.DatePickerTheme theme) {
Widget itemView = _renderItemView(theme);
if (widget.route.showTitleActions == true) {
return Column(
Expand All @@ -341,7 +341,7 @@ class _DatePickerState extends State<_DatePickerComponent> {

Widget _renderColumnView(
ValueKey key,
DatePickerTheme theme,
datetime_picker_theme.DatePickerTheme theme,
StringAtIndexCallBack stringAtIndexCB,
ScrollController scrollController,
int layoutProportion,
Expand Down Expand Up @@ -396,7 +396,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
);
}

Widget _renderItemView(DatePickerTheme theme) {
Widget _renderItemView(datetime_picker_theme.DatePickerTheme theme) {
return Container(
color: theme.backgroundColor,
child: Directionality(
Expand Down Expand Up @@ -471,7 +471,7 @@ class _DatePickerState extends State<_DatePickerComponent> {
}

// Title View
Widget _renderTitleActionsView(DatePickerTheme theme) {
Widget _renderTitleActionsView(datetime_picker_theme.DatePickerTheme theme) {
final done = _localeDone();
final cancel = _localeCancel();

Expand Down Expand Up @@ -535,15 +535,13 @@ class _BottomPickerLayout extends SingleChildLayoutDelegate {
_BottomPickerLayout(
this.progress,
this.theme, {
this.itemCount,
this.showTitleActions,
this.bottomPadding = 0,
});

final double progress;
final int? itemCount;
final bool? showTitleActions;
final DatePickerTheme theme;
final datetime_picker_theme.DatePickerTheme theme;
final double bottomPadding;

@override
Expand Down
8 changes: 5 additions & 3 deletions lib/src/date_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,11 @@ class DatePickerModel extends CommonPickerModel {
class TimePickerModel extends CommonPickerModel {
bool showSecondsColumn;

TimePickerModel(
{DateTime? currentTime, LocaleType? locale, this.showSecondsColumn: true})
: super(locale: locale) {
TimePickerModel({
DateTime? currentTime,
LocaleType? locale,
this.showSecondsColumn = true,
}) : super(locale: locale) {
this.currentTime = currentTime ?? DateTime.now();

_currentLeftIndex = this.currentTime.hour;
Expand Down