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

Improve DatePicker RTL (#11922)

Browse Source 
This patch just fixes the next and previous buttons to be in the proper
place. There might be other issues with the DatePicker, but this one was
obvious.

See #11377
This commit is contained in:
Adam Barth 2017-09-06 15:35:19 -07:00 committed by GitHub
parent 020029acfd
commit 0d454724d3
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
packages/flutter/lib/src/material/date_picker.dart
View File

@ -10,7 +10,7 @@ import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:intl/date_symbols.dart'; import 'package:intl/date_symbols.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart' hide TextDirection;
import 'button.dart'; import 'button.dart';
import 'button_bar.dart'; import 'button_bar.dart';
@ -533,8 +533,31 @@ class _MonthPickerState extends State<MonthPicker> {
}); });
} }
Icon _getPreviousMonthIcon(TextDirection textDirection) {
assert(textDirection != null);
switch (textDirection) {
case TextDirection.rtl:
return const Icon(Icons.chevron_right);
case TextDirection.ltr:
return const Icon(Icons.chevron_left);
}
return null;
}
Icon _getNextMonthIcon(TextDirection textDirection) {
assert(textDirection != null);
switch (textDirection) {
case TextDirection.rtl:
return const Icon(Icons.chevron_left);
case TextDirection.ltr:
return const Icon(Icons.chevron_right);
}
return null;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final TextDirection textDirection = Directionality.of(context);
return new SizedBox( return new SizedBox(
width: _kMonthPickerPortraitWidth, width: _kMonthPickerPortraitWidth,
height: _kMaxDayPickerHeight, height: _kMaxDayPickerHeight,
@ -548,20 +571,20 @@ class _MonthPickerState extends State<MonthPicker> {
itemBuilder: _buildItems, itemBuilder: _buildItems,
onPageChanged: _handleMonthPageChanged, onPageChanged: _handleMonthPageChanged,
), ),
new Positioned( new PositionedDirectional(
top: 0.0, top: 0.0,
left: 8.0, start: 8.0,
child: new IconButton( child: new IconButton(
icon: const Icon(Icons.chevron_left), icon: _getPreviousMonthIcon(textDirection),
tooltip: MaterialLocalizations.of(context).previousMonthTooltip, tooltip: MaterialLocalizations.of(context).previousMonthTooltip,
onPressed: _isDisplayingFirstMonth ? null : _handlePreviousMonth, onPressed: _isDisplayingFirstMonth ? null : _handlePreviousMonth,
), ),
), ),
new Positioned( new PositionedDirectional(
top: 0.0, top: 0.0,
right: 8.0, end: 8.0,
child: new IconButton( child: new IconButton(
icon: const Icon(Icons.chevron_right), icon: _getNextMonthIcon(textDirection),
tooltip: MaterialLocalizations.of(context).nextMonthTooltip, tooltip: MaterialLocalizations.of(context).nextMonthTooltip,
onPressed: _isDisplayingLastMonth ? null : _handleNextMonth, onPressed: _isDisplayingLastMonth ? null : _handleNextMonth,
), ),