Skip to content

F
Front-End
Unverified Commit 1de673bc authored by Rami's avatar Rami Committed by GitHub
Browse files
Options

Ensure time picker input mode lays out correctly in RTL (#63599)

parent eb60849e
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 49 deletions
packages/flutter/lib/src/material/time_picker.dart
View file @ 1de673bc
...@@ -1414,58 +1414,68 @@ class _TimePickerInputState extends State<_TimePickerInput> { ...@@ -1414,58 +1414,68 @@ class _TimePickerInputState extends State<_TimePickerInput> {
), ),
const SizedBox(width: 12.0), const SizedBox(width: 12.0),
], ],
Expanded(child: Column( Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Row(
children: <Widget>[ // Hour/minutes should not change positions in RTL locales.
const SizedBox(height: 8.0), textDirection: TextDirection.ltr,
_HourMinuteTextField( children: <Widget>[
selectedTime: _selectedTime, Expanded(
isHour: true, child: Column(
style: hourMinuteStyle, crossAxisAlignment: CrossAxisAlignment.start,
validator: _validateHour, children: <Widget>[
onSavedSubmitted: _handleHourSavedSubmitted, const SizedBox(height: 8.0),
onChanged: _handleHourChanged, _HourTextField(
), selectedTime: _selectedTime,
const SizedBox(height: 8.0), style: hourMinuteStyle,
if (!hourHasError && !minuteHasError) validator: _validateHour,
ExcludeSemantics( onSavedSubmitted: _handleHourSavedSubmitted,
child: Text( onChanged: _handleHourChanged,
MaterialLocalizations.of(context).timePickerHourLabel, ),
style: theme.textTheme.caption, const SizedBox(height: 8.0),
maxLines: 1, if (!hourHasError && !minuteHasError)
overflow: TextOverflow.ellipsis, ExcludeSemantics(
child: Text(
MaterialLocalizations.of(context).timePickerHourLabel,
style: theme.textTheme.caption,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
), ),
), ),
], Container(
)), margin: const EdgeInsets.only(top: 8.0),
Container( height: _kTimePickerHeaderControlHeight,
margin: const EdgeInsets.only(top: 8.0), child: _StringFragment(timeOfDayFormat: timeOfDayFormat),
height: _kTimePickerHeaderControlHeight, ),
child: _StringFragment(timeOfDayFormat: timeOfDayFormat), Expanded(
), child: Column(
Expanded(child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
children: <Widget>[ const SizedBox(height: 8.0),
const SizedBox(height: 8.0), _MinuteTextField(
_HourMinuteTextField( selectedTime: _selectedTime,
selectedTime: _selectedTime, style: hourMinuteStyle,
isHour: false, validator: _validateMinute,
style: hourMinuteStyle, onSavedSubmitted: _handleMinuteSavedSubmitted,
validator: _validateMinute, ),
onSavedSubmitted: _handleMinuteSavedSubmitted, const SizedBox(height: 8.0),
), if (!hourHasError && !minuteHasError)
const SizedBox(height: 8.0), ExcludeSemantics(
if (!hourHasError && !minuteHasError) child: Text(
ExcludeSemantics( MaterialLocalizations.of(context).timePickerMinuteLabel,
child: Text( style: theme.textTheme.caption,
MaterialLocalizations.of(context).timePickerMinuteLabel, maxLines: 1,
style: theme.textTheme.caption, overflow: TextOverflow.ellipsis,
maxLines: 1, ),
overflow: TextOverflow.ellipsis, ),
],
), ),
), ),
], ],
)), ),
),
if (!use24HourDials && timeOfDayFormat != TimeOfDayFormat.a_space_h_colon_mm) ...<Widget>[ if (!use24HourDials && timeOfDayFormat != TimeOfDayFormat.a_space_h_colon_mm) ...<Widget>[
const SizedBox(width: 12.0), const SizedBox(width: 12.0),
_DayPeriodControl( _DayPeriodControl(
...@@ -1489,6 +1499,61 @@ class _TimePickerInputState extends State<_TimePickerInput> { ...@@ -1489,6 +1499,61 @@ class _TimePickerInputState extends State<_TimePickerInput> {
} }
} }
class _HourTextField extends StatelessWidget {
const _HourTextField({
Key key,
@required this.selectedTime,
@required this.style,
@required this.validator,
@required this.onSavedSubmitted,
@required this.onChanged,
}) : super(key: key);
final TimeOfDay selectedTime;
final TextStyle style;
final FormFieldValidator<String> validator;
final ValueChanged<String> onSavedSubmitted;
final ValueChanged<String> onChanged;
@override
Widget build(BuildContext context) {
return _HourMinuteTextField(
selectedTime: selectedTime,
isHour: true,
style: style,
validator: validator,
onSavedSubmitted: onSavedSubmitted,
onChanged: onChanged,
);
}
}
class _MinuteTextField extends StatelessWidget {
const _MinuteTextField({
Key key,
@required this.selectedTime,
@required this.style,
@required this.validator,
@required this.onSavedSubmitted,
}) : super(key: key);
final TimeOfDay selectedTime;
final TextStyle style;
final FormFieldValidator<String> validator;
final ValueChanged<String> onSavedSubmitted;
@override
Widget build(BuildContext context) {
return _HourMinuteTextField(
selectedTime: selectedTime,
isHour: false,
style: style,
validator: validator,
onSavedSubmitted: onSavedSubmitted,
);
}
}
class _HourMinuteTextField extends StatefulWidget { class _HourMinuteTextField extends StatefulWidget {
const _HourMinuteTextField({ const _HourMinuteTextField({
Key key, Key key,
......
packages/flutter_localizations/test/material/time_picker_test.dart
View file @ 1de673bc
...@@ -8,10 +8,16 @@ import 'package:flutter_localizations/flutter_localizations.dart'; ...@@ -8,10 +8,16 @@ import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
class _TimePickerLauncher extends StatelessWidget { class _TimePickerLauncher extends StatelessWidget {
const _TimePickerLauncher({ Key key, this.onChanged, this.locale }) : super(key: key); const _TimePickerLauncher({
Key key,
this.onChanged,
this.locale,
this.entryMode = TimePickerEntryMode.dial,
}) : super(key: key);
final ValueChanged<TimeOfDay> onChanged; final ValueChanged<TimeOfDay> onChanged;
final Locale locale; final Locale locale;
final TimePickerEntryMode entryMode;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -28,6 +34,7 @@ class _TimePickerLauncher extends StatelessWidget { ...@@ -28,6 +34,7 @@ class _TimePickerLauncher extends StatelessWidget {
onPressed: () async { onPressed: () async {
onChanged(await showTimePicker( onChanged(await showTimePicker(
context: context, context: context,
initialEntryMode: entryMode,
initialTime: const TimeOfDay(hour: 7, minute: 0), initialTime: const TimeOfDay(hour: 7, minute: 0),
)); ));
}, },
...@@ -207,6 +214,73 @@ void main() { ...@@ -207,6 +214,73 @@ void main() {
tester.binding.window.devicePixelRatioTestValue = null; tester.binding.window.devicePixelRatioTestValue = null;
}); });
testWidgets('can localize input mode in all known formats', (WidgetTester tester) async {
final Finder stringFragmentTextFinder = find.descendant(
of: find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_StringFragment'),
matching: find.byType(Text),
).first;
final Finder hourControlFinder = find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_HourTextField');
final Finder minuteControlFinder = find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_MinuteTextField');
final Finder dayPeriodControlFinder = find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_DayPeriodControl');
// TODO(yjbanov): also test `HH.mm` (in_ID), `a h:mm` (ko_KR) and `HH:mm น.` (th_TH) when we have .arb files for them
final List<Locale> locales = <Locale>[
const Locale('en', 'US'), //'h:mm a'
const Locale('en', 'GB'), //'HH:mm'
const Locale('es', 'ES'), //'H:mm'
const Locale('fr', 'CA'), //'HH \'h\' mm'
const Locale('zh', 'ZH'), //'ah:mm'
const Locale('fa', 'IR'), //'H:mm' but RTL
];
for (final Locale locale in locales) {
await tester.pumpWidget(_TimePickerLauncher(onChanged: (TimeOfDay time) { }, locale: locale, entryMode: TimePickerEntryMode.input));
await tester.tap(find.text('X'));
await tester.pumpAndSettle(const Duration(seconds: 1));
final Text stringFragmentText = tester.widget(stringFragmentTextFinder);
final double hourLeftOffset = tester.getTopLeft(hourControlFinder).dx;
final double minuteLeftOffset = tester.getTopLeft(minuteControlFinder).dx;
final double stringFragmentLeftOffset = tester.getTopLeft(stringFragmentTextFinder).dx;
if (locale == const Locale('en', 'US')) {
final double dayPeriodLeftOffset = tester.getTopLeft(dayPeriodControlFinder).dx;
expect(stringFragmentText.data, ':');
expect(hourLeftOffset, lessThan(stringFragmentLeftOffset));
expect(stringFragmentLeftOffset, lessThan(minuteLeftOffset));
expect(minuteLeftOffset, lessThan(dayPeriodLeftOffset));
} else if (locale == const Locale('en', 'GB')) {
expect(stringFragmentText.data, ':');
expect(hourLeftOffset, lessThan(stringFragmentLeftOffset));
expect(stringFragmentLeftOffset, lessThan(minuteLeftOffset));
expect(dayPeriodControlFinder, findsNothing);
} else if (locale == const Locale('es', 'ES')) {
expect(stringFragmentText.data, ':');
expect(hourLeftOffset, lessThan(stringFragmentLeftOffset));
expect(stringFragmentLeftOffset, lessThan(minuteLeftOffset));
expect(dayPeriodControlFinder, findsNothing);
} else if (locale == const Locale('fr', 'CA')) {
expect(stringFragmentText.data, 'h');
expect(hourLeftOffset, lessThan(stringFragmentLeftOffset));
expect(stringFragmentLeftOffset, lessThan(minuteLeftOffset));
expect(dayPeriodControlFinder, findsNothing);
} else if (locale == const Locale('zh', 'ZH')) {
final double dayPeriodLeftOffset = tester.getTopLeft(dayPeriodControlFinder).dx;
expect(stringFragmentText.data, ':');
expect(dayPeriodLeftOffset, lessThan(hourLeftOffset));
expect(hourLeftOffset, lessThan(stringFragmentLeftOffset));
expect(stringFragmentLeftOffset, lessThan(minuteLeftOffset));
} else if (locale == const Locale('fa', 'IR')) {
// Even though this is an RTL locale, the hours and minutes positions should remain the same.
expect(stringFragmentText.data, ':');
expect(hourLeftOffset, lessThan(stringFragmentLeftOffset));
expect(stringFragmentLeftOffset, lessThan(minuteLeftOffset));
expect(dayPeriodControlFinder, findsNothing);
}
await finishPicker(tester);
}
});
testWidgets('uses single-ring 24-hour dial for all formats', (WidgetTester tester) async { testWidgets('uses single-ring 24-hour dial for all formats', (WidgetTester tester) async {
const List<Locale> locales = <Locale>[ const List<Locale> locales = <Locale>[
Locale('en', 'US'), // h Locale('en', 'US'), // h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab