Skip to content

Improve color display in M3 Demo #2438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions material_3_demo/lib/color_box.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

class ColorBox extends StatefulWidget {
const ColorBox(
{super.key,
required this.label,
required this.tone,
required this.color,
required this.onColor,
required this.height,
required this.width,
this.displayPaletteInfo = false});

final String label;
final String tone;
final Color color, onColor;
final double height, width;
final bool displayPaletteInfo;

@override
State<ColorBox> createState() => _ColorBoxState();
}

class _ColorBoxState extends State<ColorBox> {
bool hovered = false;

@override
Widget build(BuildContext context) {
final fonts = Theme.of(context).textTheme;
return MouseRegion(
onEnter: (_) {
if (mounted) setState(() => hovered = true);
},
onExit: (_) {
if (mounted) setState(() => hovered = false);
},
child: Container(
color: widget.color,
height: widget.height,
width: widget.width,
child: DefaultTextStyle(
style: fonts.labelSmall!.copyWith(color: widget.onColor),
child: Stack(
children: [
Positioned(
top: 10,
left: 10,
child: Text(widget.label),
),
Positioned(
bottom: 10,
right: 10,
child: Text(widget.displayPaletteInfo ? widget.tone : ''),
),
if (hovered)
Positioned(
top: 0,
right: 0,
child: IconButton(
padding: EdgeInsets.zero,
color: widget.onColor,
tooltip: 'Copy hex color',
icon: const Icon(Icons.copy, size: 24),
onPressed: () async {
final messenger = ScaffoldMessenger.of(context);
// Copy color as hex to clipboard
String hex = '#';
final c = widget.color;
// Will change from int 0-255 to double 0.0-1.0 in 3.26+
// The properties also change from red/green/blue to r/g/b
// hex += (c.[r g b] * 255.0).round().toRadixString(16).padLeft(2, '0');
hex += c.red.toRadixString(16).padLeft(2, '0');
hex += c.green.toRadixString(16).padLeft(2, '0');
hex += c.blue.toRadixString(16).padLeft(2, '0');
final data = ClipboardData(text: hex);
await Clipboard.setData(data);
messenger.hideCurrentSnackBar();
messenger.showSnackBar(
SnackBar(
content: Text('Copied $hex to clipboard'),
),
);
},
),
),
],
),
),
),
);
}
}
45 changes: 23 additions & 22 deletions material_3_demo/lib/color_palettes_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@

import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:material_3_demo/scheme.dart';
import 'package:url_launcher/url_launcher.dart';

const Widget divider = SizedBox(height: 10);

// If screen content width is greater or equal to this value, the light and dark
// color schemes will be displayed in a column. Otherwise, they will
// be displayed in a row.
const double narrowScreenWidthThreshold = 400;
const double narrowScreenWidthThreshold = 500;

class ColorPalettesScreen extends StatelessWidget {
const ColorPalettesScreen({super.key});
Expand Down Expand Up @@ -94,32 +95,32 @@ class ColorPalettesScreen extends StatelessWidget {
),
);
} else {
Color seed = Theme.of(context).colorScheme.primary;
ColorScheme lightScheme = ColorScheme.fromSeed(
seedColor: seed, brightness: Brightness.light);
ColorScheme darkScheme = ColorScheme.fromSeed(
seedColor: seed, brightness: Brightness.dark);
return SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.only(top: 5),
padding: const EdgeInsets.all(8),
child: Column(
children: [
dynamicColorNotice(),
Row(
children: [
Expanded(
child: Column(
children: [
schemeLabel('Light ColorScheme'),
schemeView(lightTheme),
],
),
),
Expanded(
child: Column(
children: [
schemeLabel('Dark ColorScheme'),
schemeView(darkTheme),
],
),
),
],
SchemePreview(
label: "Light ColorScheme",
scheme: lightScheme,
brightness: Brightness.light,
contrast: 1.0,
colorMatch: false,
),
const SizedBox(height: 16),
SchemePreview(
label: "Dark ColorScheme",
scheme: darkScheme,
brightness: Brightness.dark,
contrast: 1.0,
colorMatch: false,
),
const SizedBox(height: 16),
],
),
),
Expand Down
Loading