firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error when choose noon on time picker (#78478)

Browse Source
This commit is contained in:
Argel Bejarano 2021-04-05 15:39:03 -07:00 committed by GitHub
parent 26b9a01531
commit 6dd77cc4f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/material/time.dart
View File

@ -91,7 +91,7 @@ class TimeOfDay {
DayPeriod get period => hour < hoursPerPeriod ? DayPeriod.am : DayPeriod.pm;
/// Which hour of the current period (e.g., am or pm) this time is.
int get hourOfPeriod => hour - periodOffset;
int get hourOfPeriod => hour > hoursPerPeriod ? hour - periodOffset : hour;
/// The hour at which the current period starts.
int get periodOffset => period == DayPeriod.am ? 0 : hoursPerPeriod;

19
packages/flutter/test/material/time_test.dart
View File

@ -25,5 +25,24 @@ void main() {
expect(await pumpTest(false), '7:00 AM');
expect(await pumpTest(true), '07:00');
});
testWidgets('return 12 hours at noon', (WidgetTester tester) async {
Future<String> pumpTest(bool alwaysUse24HourFormat) async {
late String formattedValue;
await tester.pumpWidget(MaterialApp(
home: MediaQuery(
data: MediaQueryData(alwaysUse24HourFormat: alwaysUse24HourFormat),
child: Builder(builder: (BuildContext context) {
formattedValue = const TimeOfDay(hour: 12, minute: 0).format(context);
return Container();
}),
),
));
return formattedValue;
}
expect(await pumpTest(false), '12:00 PM');
expect(await pumpTest(true), '12:00');
});
});
}