From e5f3bacaf8f45a0e96c3a85ee078aee6bc4c5931 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 6 Mar 2024 11:03:13 -0800 Subject: [PATCH] [material_3_demo] bump min SDK, move time and date components together (#2192) Add some icons Fix component names --- material_3_demo/lib/component_screen.dart | 30 ++++++++++++----------- material_3_demo/pubspec.yaml | 4 +-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/material_3_demo/lib/component_screen.dart b/material_3_demo/lib/component_screen.dart index c484e96fb..747c5a809 100644 --- a/material_3_demo/lib/component_screen.dart +++ b/material_3_demo/lib/component_screen.dart @@ -280,12 +280,12 @@ class Selection extends StatelessWidget { return const ComponentGroupDecoration(label: 'Selection', children: [ Checkboxes(), Chips(), - DatePickers(), + DatePicker(), + TimePicker(), Menus(), Radios(), Sliders(), Switches(), - TimePickers(), ]); } } @@ -1400,14 +1400,14 @@ class _ChipsState extends State { } } -class DatePickers extends StatefulWidget { - const DatePickers({super.key}); +class DatePicker extends StatefulWidget { + const DatePicker({super.key}); @override - State createState() => _DatePickersState(); + State createState() => _DatePickerState(); } -class _DatePickersState extends State { +class _DatePickerState extends State { DateTime? selectedDate; final DateTime _firstDate = DateTime(DateTime.now().year - 2); final DateTime _lastDate = DateTime(DateTime.now().year + 1); @@ -1417,7 +1417,7 @@ class _DatePickersState extends State { return ComponentDecoration( label: 'Date picker', tooltipMessage: 'Use showDatePicker', - child: TextButton( + child: TextButton.icon( onPressed: () async { DateTime? date = await showDatePicker( context: context, @@ -1435,7 +1435,8 @@ class _DatePickersState extends State { } }); }, - child: const Text( + icon: const Icon(Icons.calendar_month), + label: const Text( 'Show date picker', style: TextStyle(fontWeight: FontWeight.bold), ), @@ -1444,14 +1445,14 @@ class _DatePickersState extends State { } } -class TimePickers extends StatefulWidget { - const TimePickers({super.key}); +class TimePicker extends StatefulWidget { + const TimePicker({super.key}); @override - State createState() => _TimePickersState(); + State createState() => _TimePickerState(); } -class _TimePickersState extends State { +class _TimePickerState extends State { TimeOfDay? selectedTime; @override @@ -1459,7 +1460,7 @@ class _TimePickersState extends State { return ComponentDecoration( label: 'Time picker', tooltipMessage: 'Use showTimePicker', - child: TextButton( + child: TextButton.icon( onPressed: () async { final TimeOfDay? time = await showTimePicker( context: context, @@ -1483,7 +1484,8 @@ class _TimePickersState extends State { } }); }, - child: const Text( + icon: const Icon(Icons.schedule), + label: const Text( 'Show time picker', style: TextStyle(fontWeight: FontWeight.bold), ), diff --git a/material_3_demo/pubspec.yaml b/material_3_demo/pubspec.yaml index 0f3b334f7..ab164cfca 100644 --- a/material_3_demo/pubspec.yaml +++ b/material_3_demo/pubspec.yaml @@ -8,8 +8,8 @@ publish_to: "none" version: 1.0.0+1 environment: - sdk: ^3.2.0 - flutter: ^3.16.0 + sdk: ^3.3.0 + flutter: ^3.19.0 dependencies: flutter: