msb-public
/
samples
mirror of https://github.com/flutter/samples.git
1
0
Code Issues Projects Releases Wiki Activity

Material 3 demo: add tooltips to expanded color picker widgets (#1848)

Browse Source
pull/1850/head
Kevin Moore 1 year ago committed by GitHub
parent f082be4015
commit 4f01fbb9c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File

42
experimental/material_3_demo/lib/home.dart
Unescape View File

@ -521,9 +521,8 @@ class _ExpandedColorSeedAction extends StatelessWidget {
isSelected: colorSelected.color == ColorSeed.values[i].color && isSelected: colorSelected.color == ColorSeed.values[i].color &&
colorSelectionMethod == ColorSelectionMethod.colorSeed, colorSelectionMethod == ColorSelectionMethod.colorSeed,
selectedIcon: const Icon(Icons.circle), selectedIcon: const Icon(Icons.circle),
onPressed: () { onPressed: () => handleColorSelect(i),
handleColorSelect(i); tooltip: ColorSeed.values[i].label,
},
), ),
), ),
), ),
@ -552,23 +551,26 @@ class _ExpandedImageColorAction extends StatelessWidget {
crossAxisCount: 3, crossAxisCount: 3,
children: List.generate( children: List.generate(
ColorImageProvider.values.length, ColorImageProvider.values.length,
(i) => InkWell( (i) => Tooltip(
borderRadius: BorderRadius.circular(4.0), message: ColorImageProvider.values[i].label,
onTap: () => handleImageSelect(i), child: InkWell(
child: Padding( borderRadius: BorderRadius.circular(4.0),
padding: const EdgeInsets.all(8.0), onTap: () => handleImageSelect(i),
child: Material( child: Padding(
borderRadius: BorderRadius.circular(4.0), padding: const EdgeInsets.all(8.0),
elevation: imageSelected == ColorImageProvider.values[i] && child: Material(
colorSelectionMethod == ColorSelectionMethod.image borderRadius: BorderRadius.circular(4.0),
? 3 elevation: imageSelected == ColorImageProvider.values[i] &&
: 0, colorSelectionMethod == ColorSelectionMethod.image
child: Padding( ? 3
padding: const EdgeInsets.all(4.0), : 0,
child: ClipRRect( child: Padding(
borderRadius: BorderRadius.circular(4.0), padding: const EdgeInsets.all(4.0),
child: Image( child: ClipRRect(
image: NetworkImage(ColorImageProvider.values[i].url), borderRadius: BorderRadius.circular(4.0),
child: Image(
image: NetworkImage(ColorImageProvider.values[i].url),
),
), ),
), ),
), ),

38
material_3_demo/lib/home.dart
Unescape View File

@ -524,6 +524,7 @@ class _ExpandedColorSeedAction extends StatelessWidget {
onPressed: () { onPressed: () {
handleColorSelect(i); handleColorSelect(i);
}, },
tooltip: ColorSeed.values[i].label,
), ),
), ),
), ),
@ -552,23 +553,26 @@ class _ExpandedImageColorAction extends StatelessWidget {
crossAxisCount: 3, crossAxisCount: 3,
children: List.generate( children: List.generate(
ColorImageProvider.values.length, ColorImageProvider.values.length,
(i) => InkWell( (i) => Tooltip(
borderRadius: BorderRadius.circular(4.0), message: ColorImageProvider.values[i].name,
onTap: () => handleImageSelect(i), child: InkWell(
child: Padding( borderRadius: BorderRadius.circular(4.0),
padding: const EdgeInsets.all(8.0), onTap: () => handleImageSelect(i),
child: Material( child: Padding(
borderRadius: BorderRadius.circular(4.0), padding: const EdgeInsets.all(8.0),
elevation: imageSelected == ColorImageProvider.values[i] && child: Material(
colorSelectionMethod == ColorSelectionMethod.image borderRadius: BorderRadius.circular(4.0),
? 3 elevation: imageSelected == ColorImageProvider.values[i] &&
: 0, colorSelectionMethod == ColorSelectionMethod.image
child: Padding( ? 3
padding: const EdgeInsets.all(4.0), : 0,
child: ClipRRect( child: Padding(
borderRadius: BorderRadius.circular(4.0), padding: const EdgeInsets.all(4.0),
child: Image( child: ClipRRect(
image: NetworkImage(ColorImageProvider.values[i].url), borderRadius: BorderRadius.circular(4.0),
child: Image(
image: NetworkImage(ColorImageProvider.values[i].url),
),
), ),
), ),
), ),

Write Preview
Loading…
Cancel
Save