Skip to content

fix inconsistent time format #42

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

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

fix inconsistent time format #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4414bb4
fix inconsistent time format
sxtfv Jul 15, 2021
4f4bc35
fix onChanged no time period in 12 hr format
sxtfv Jul 19, 2021
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
69 changes: 58 additions & 11 deletions lib/date_time_picker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

library date_time_picker;

import 'dart:core';

import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:intl/intl.dart';
Expand Down Expand Up @@ -582,20 +584,53 @@ class _DateTimePickerState extends FormFieldState<String> {
DateFormat(lsMask, languageCode).format(_dDate);
}
} else {
final llTime = lsValue.split(':');
_tTime =
TimeOfDay(hour: int.parse(llTime[0]), minute: int.parse(llTime[1]));
final llTime = lsValue.split(RegExp(r'[:, \s]'));
if (llTime.length == 3) {
// if case when string in hh:mm a format
_tTime = _getTimeOfDay12HrsFormat(
llTime[0],
llTime[1],
llTime[2],
);
} else {
// when format is HH:mm
_tTime = TimeOfDay(
hour: int.parse(llTime[0]),
minute: int.parse(llTime[1]),
);
}

_sTime = lsValue;

if (!widget.use24HourFormat) {
_sPeriod = _tTime.period.index == 0 ? ' AM' : ' PM';
set12HourTimeValues(_tTime);
}

_effectiveController?.text = _sTime + _sPeriod;

_timeLabelController.text = _sTime + _sPeriod;
}
}
}

TimeOfDay _getTimeOfDay12HrsFormat(
String hourStr,
String minuteStr,
String periodStr,
) {
var hour = int.parse(hourStr);
if (periodStr == 'PM') {
hour = hour == 12 ? 12 : hour + 12;
}
if (periodStr == 'AM' && hour == 12) {
hour = 0;
}

final minute = int.parse(minuteStr);

return TimeOfDay(hour: hour, minute: minute);
}

@override
void didUpdateWidget(DateTimePicker oldWidget) {
super.didUpdateWidget(oldWidget);
Expand Down Expand Up @@ -661,10 +696,22 @@ class _DateTimePickerState extends FormFieldState<String> {
DateFormat(lsMask, languageCode).format(_dDate);
}
} else {
final llTime = lsValue.split(':');
_tTime = TimeOfDay(
hour: int.parse(llTime[0]), minute: int.parse(llTime[1]));
_sTime = lsValue;
final llTime = lsValue.split(RegExp(r'[:, \s]'));
if (llTime.length == 3) {
// in case when string in hh:mm a format
_tTime = _getTimeOfDay12HrsFormat(
llTime[0],
llTime[1],
llTime[2],
);
} else {
// when format is HH:mm
_tTime = TimeOfDay(
hour: int.parse(llTime[0]),
minute: int.parse(llTime[1]),
);
}
_sTime = '${llTime[0]}:${llTime[1]}';
_timeLabelController.text = _sTime + _sPeriod;
}
}
Expand Down Expand Up @@ -801,12 +848,12 @@ class _DateTimePickerState extends FormFieldState<String> {

_tTime = ltTimePicked;

_timeLabelController.text = _sTime;
_timeLabelController.text = _sTime + _sPeriod;
final lsOldValue = _sValue;
_sValue = _sTime;
_sValue = _sTime + _sPeriod;

if (widget.type == DateTimePickerType.dateTimeSeparate && _sDate != '') {
_sValue = '$_sDate $_sTime';
_sValue = '$_sDate $_sTime $_sPeriod';
}

_sValue = _sValue.trim();
Expand Down