From 581df4b9310e989587b5f66d1c3ca3854d1120a9 Mon Sep 17 00:00:00 2001 From: "Jeremy A. Kolb" Date: Thu, 21 May 2026 09:34:31 -0400 Subject: [PATCH] dart format --- system_theme/example/lib/main.dart | 87 ++++++++++++---------- system_theme/lib/system_theme.dart | 2 +- system_theme/lib/system_theme_builder.dart | 6 +- system_theme/test/system_theme_test.dart | 60 +++++++-------- 4 files changed, 80 insertions(+), 75 deletions(-) diff --git a/system_theme/example/lib/main.dart b/system_theme/example/lib/main.dart index e6d6fe0..bbcd568 100644 --- a/system_theme/example/lib/main.dart +++ b/system_theme/example/lib/main.dart @@ -22,51 +22,56 @@ class MyApp extends StatefulWidget { class _MyAppState extends State { @override Widget build(BuildContext context) { - return SystemThemeBuilder(builder: (context, color) { - final colors = [ - color.lightest, - color.lighter, - color.light, - color.accent, - color.dark, - color.darker, - color.darkest, - ]; - return Scaffold( - body: SafeArea( - child: Column(children: [ - Text( - 'Accent color: ${defaultTargetPlatform.supportsAccentColor ? 'supported' : 'not supported'}'), - ...colors.map((color) { - return Expanded( - child: Container( - color: color, - alignment: Alignment.center, - child: Text( - [ - 'Lightest', - 'Lighter', - 'Light', - 'Default', - 'Dark', - 'Darker', - 'Darkest', - ][colors.indexOf(color)] + - '\n${color.toHex()}', - style: Theme.of(context).textTheme.titleLarge?.copyWith( + return SystemThemeBuilder( + builder: (context, color) { + final colors = [ + color.lightest, + color.lighter, + color.light, + color.accent, + color.dark, + color.darker, + color.darkest, + ]; + return Scaffold( + body: SafeArea( + child: Column( + children: [ + Text( + 'Accent color: ${defaultTargetPlatform.supportsAccentColor ? 'supported' : 'not supported'}', + ), + ...colors.map((color) { + return Expanded( + child: Container( + color: color, + alignment: Alignment.center, + child: Text( + [ + 'Lightest', + 'Lighter', + 'Light', + 'Default', + 'Dark', + 'Darker', + 'Darkest', + ][colors.indexOf(color)] + + '\n${color.toHex()}', + style: Theme.of(context).textTheme.titleLarge?.copyWith( color: color.computeLuminance() >= 0.5 ? Colors.black : Colors.white, ), - textAlign: TextAlign.center, - ), - ), - ); - }).toList(), - ]), - ), - ); - }); + textAlign: TextAlign.center, + ), + ), + ); + }).toList(), + ], + ), + ), + ); + }, + ); } } diff --git a/system_theme/lib/system_theme.dart b/system_theme/lib/system_theme.dart index 43ab5e5..1fe239b 100644 --- a/system_theme/lib/system_theme.dart +++ b/system_theme/lib/system_theme.dart @@ -140,7 +140,7 @@ class SystemAccentColor { } SystemAccentColor._fromMap(dynamic colors) - : defaultAccentColor = SystemTheme.fallbackColor { + : defaultAccentColor = SystemTheme.fallbackColor { _retrieveFromColors(colors); } diff --git a/system_theme/lib/system_theme_builder.dart b/system_theme/lib/system_theme_builder.dart index e2e48be..c56c8c4 100644 --- a/system_theme/lib/system_theme_builder.dart +++ b/system_theme/lib/system_theme_builder.dart @@ -1,10 +1,8 @@ import 'package:flutter/widgets.dart'; import 'package:system_theme/system_theme.dart'; -typedef ThemeWidgetBuilder = Widget Function( - BuildContext context, - SystemAccentColor accent, -); +typedef ThemeWidgetBuilder = + Widget Function(BuildContext context, SystemAccentColor accent); /// A widget that rebuilds when the system theme changes. /// diff --git a/system_theme/test/system_theme_test.dart b/system_theme/test/system_theme_test.dart index f508c97..05c7a78 100644 --- a/system_theme/test/system_theme_test.dart +++ b/system_theme/test/system_theme_test.dart @@ -11,8 +11,12 @@ void main() { final List log = []; // Helper to create a color map in the format the plugin expects - Map createColorMap( - {int r = 0, int g = 0, int b = 0, int a = 255}) { + Map createColorMap({ + int r = 0, + int g = 0, + int b = 0, + int a = 255, + }) { return {'R': r, 'G': g, 'B': b, 'A': a}; } @@ -35,14 +39,12 @@ void main() { TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger .setMockMethodCallHandler(channel, (MethodCall methodCall) async { - log.add(methodCall); - if (methodCall.method == 'SystemTheme.accentColor') { - return { - 'accent': createColorMap(r: 0, g: 0, b: 255), - }; - } - return null; - }); + log.add(methodCall); + if (methodCall.method == 'SystemTheme.accentColor') { + return {'accent': createColorMap(r: 0, g: 0, b: 255)}; + } + return null; + }); }); tearDown(() { @@ -63,11 +65,15 @@ void main() { test('Check platform support for listening to changes', () { debugDefaultTargetPlatformOverride = TargetPlatform.windows; expect( - defaultTargetPlatform.supportsListeningToAccentColorChanges, isTrue); + defaultTargetPlatform.supportsListeningToAccentColorChanges, + isTrue, + ); debugDefaultTargetPlatformOverride = TargetPlatform.android; expect( - defaultTargetPlatform.supportsListeningToAccentColorChanges, isFalse); + defaultTargetPlatform.supportsListeningToAccentColorChanges, + isFalse, + ); }); test('Loads accent color correctly (Singleton)', () async { @@ -82,8 +88,8 @@ void main() { test('Handles MissingPluginException gracefully', () async { TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger .setMockMethodCallHandler(channel, (MethodCall methodCall) async { - throw MissingPluginException(); - }); + throw MissingPluginException(); + }); final testTheme = SystemAccentColor(kDefaultFallbackColor); @@ -97,8 +103,8 @@ void main() { TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger .setMockMethodCallHandler(channel, (MethodCall methodCall) async { - return null; - }); + return null; + }); final testTheme = SystemAccentColor(customFallback); @@ -114,10 +120,8 @@ void main() { TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger .setMockMethodCallHandler(channel, (MethodCall methodCall) async { - return { - 'accent': createColorMap(r: 0, g: 0, b: 255), - }; - }); + return {'accent': createColorMap(r: 0, g: 0, b: 255)}; + }); final testTheme = SystemAccentColor(kDefaultFallbackColor); await testTheme.load(); @@ -134,11 +138,11 @@ void main() { TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger .setMockMethodCallHandler(channel, (MethodCall methodCall) async { - return { - 'accent': createColorMap(r: 0, g: 0, b: 255), - 'light': createColorMap(r: 0, g: 255, b: 0), - }; - }); + return { + 'accent': createColorMap(r: 0, g: 0, b: 255), + 'light': createColorMap(r: 0, g: 255, b: 0), + }; + }); final testTheme = SystemAccentColor(kDefaultFallbackColor); await testTheme.load(); @@ -151,10 +155,8 @@ void main() { TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger .setMockMethodCallHandler(channel, (MethodCall methodCall) async { - return { - 'accent': createColorMap(r: 0, g: 0, b: 255), - }; - }); + return {'accent': createColorMap(r: 0, g: 0, b: 255)}; + }); final testTheme = SystemAccentColor(kDefaultFallbackColor); await testTheme.load();