From 4f01fbb9c172ee870146acecc45fae66c3b49675 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Fri, 26 May 2023 12:04:49 -0700 Subject: [PATCH] Material 3 demo: add tooltips to expanded color picker widgets (#1848) --- experimental/material_3_demo/lib/home.dart | 42 +++++++++++----------- material_3_demo/lib/home.dart | 38 +++++++++++--------- 2 files changed, 43 insertions(+), 37 deletions(-) diff --git a/experimental/material_3_demo/lib/home.dart b/experimental/material_3_demo/lib/home.dart index 382a64956..f31532126 100644 --- a/experimental/material_3_demo/lib/home.dart +++ b/experimental/material_3_demo/lib/home.dart @@ -521,9 +521,8 @@ class _ExpandedColorSeedAction extends StatelessWidget { isSelected: colorSelected.color == ColorSeed.values[i].color && colorSelectionMethod == ColorSelectionMethod.colorSeed, selectedIcon: const Icon(Icons.circle), - onPressed: () { - handleColorSelect(i); - }, + onPressed: () => handleColorSelect(i), + tooltip: ColorSeed.values[i].label, ), ), ), @@ -552,23 +551,26 @@ class _ExpandedImageColorAction extends StatelessWidget { crossAxisCount: 3, children: List.generate( ColorImageProvider.values.length, - (i) => InkWell( - borderRadius: BorderRadius.circular(4.0), - onTap: () => handleImageSelect(i), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Material( - borderRadius: BorderRadius.circular(4.0), - elevation: imageSelected == ColorImageProvider.values[i] && - colorSelectionMethod == ColorSelectionMethod.image - ? 3 - : 0, - child: Padding( - padding: const EdgeInsets.all(4.0), - child: ClipRRect( - borderRadius: BorderRadius.circular(4.0), - child: Image( - image: NetworkImage(ColorImageProvider.values[i].url), + (i) => Tooltip( + message: ColorImageProvider.values[i].label, + child: InkWell( + borderRadius: BorderRadius.circular(4.0), + onTap: () => handleImageSelect(i), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Material( + borderRadius: BorderRadius.circular(4.0), + elevation: imageSelected == ColorImageProvider.values[i] && + colorSelectionMethod == ColorSelectionMethod.image + ? 3 + : 0, + child: Padding( + padding: const EdgeInsets.all(4.0), + child: ClipRRect( + borderRadius: BorderRadius.circular(4.0), + child: Image( + image: NetworkImage(ColorImageProvider.values[i].url), + ), ), ), ), diff --git a/material_3_demo/lib/home.dart b/material_3_demo/lib/home.dart index 382a64956..4bb4621b8 100644 --- a/material_3_demo/lib/home.dart +++ b/material_3_demo/lib/home.dart @@ -524,6 +524,7 @@ class _ExpandedColorSeedAction extends StatelessWidget { onPressed: () { handleColorSelect(i); }, + tooltip: ColorSeed.values[i].label, ), ), ), @@ -552,23 +553,26 @@ class _ExpandedImageColorAction extends StatelessWidget { crossAxisCount: 3, children: List.generate( ColorImageProvider.values.length, - (i) => InkWell( - borderRadius: BorderRadius.circular(4.0), - onTap: () => handleImageSelect(i), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Material( - borderRadius: BorderRadius.circular(4.0), - elevation: imageSelected == ColorImageProvider.values[i] && - colorSelectionMethod == ColorSelectionMethod.image - ? 3 - : 0, - child: Padding( - padding: const EdgeInsets.all(4.0), - child: ClipRRect( - borderRadius: BorderRadius.circular(4.0), - child: Image( - image: NetworkImage(ColorImageProvider.values[i].url), + (i) => Tooltip( + message: ColorImageProvider.values[i].name, + child: InkWell( + borderRadius: BorderRadius.circular(4.0), + onTap: () => handleImageSelect(i), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Material( + borderRadius: BorderRadius.circular(4.0), + elevation: imageSelected == ColorImageProvider.values[i] && + colorSelectionMethod == ColorSelectionMethod.image + ? 3 + : 0, + child: Padding( + padding: const EdgeInsets.all(4.0), + child: ClipRRect( + borderRadius: BorderRadius.circular(4.0), + child: Image( + image: NetworkImage(ColorImageProvider.values[i].url), + ), ), ), ),