Skip to content

Commit d73982f

Browse files
kjeremykjeremy
authored
Dart Format (#50)
1 parent 5fc5a82 commit d73982f

4 files changed

Lines changed: 80 additions & 75 deletions

File tree

‎system_theme/example/lib/main.dart‎

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -22,51 +22,56 @@ class MyApp extends StatefulWidget {
2222
class _MyAppState extends State<MyApp> {
2323
@override
2424
Widget build(BuildContext context) {
25-
return SystemThemeBuilder(builder: (context, color) {
26-
final colors = [
27-
color.lightest,
28-
color.lighter,
29-
color.light,
30-
color.accent,
31-
color.dark,
32-
color.darker,
33-
color.darkest,
34-
];
35-
return Scaffold(
36-
body: SafeArea(
37-
child: Column(children: [
38-
Text(
39-
'Accent color: ${defaultTargetPlatform.supportsAccentColor ? 'supported' : 'not supported'}'),
40-
...colors.map((color) {
41-
return Expanded(
42-
child: Container(
43-
color: color,
44-
alignment: Alignment.center,
45-
child: Text(
46-
[
47-
'Lightest',
48-
'Lighter',
49-
'Light',
50-
'Default',
51-
'Dark',
52-
'Darker',
53-
'Darkest',
54-
][colors.indexOf(color)] +
55-
'\n${color.toHex()}',
56-
style: Theme.of(context).textTheme.titleLarge?.copyWith(
25+
return SystemThemeBuilder(
26+
builder: (context, color) {
27+
final colors = [
28+
color.lightest,
29+
color.lighter,
30+
color.light,
31+
color.accent,
32+
color.dark,
33+
color.darker,
34+
color.darkest,
35+
];
36+
return Scaffold(
37+
body: SafeArea(
38+
child: Column(
39+
children: [
40+
Text(
41+
'Accent color: ${defaultTargetPlatform.supportsAccentColor ? 'supported' : 'not supported'}',
42+
),
43+
...colors.map((color) {
44+
return Expanded(
45+
child: Container(
46+
color: color,
47+
alignment: Alignment.center,
48+
child: Text(
49+
[
50+
'Lightest',
51+
'Lighter',
52+
'Light',
53+
'Default',
54+
'Dark',
55+
'Darker',
56+
'Darkest',
57+
][colors.indexOf(color)] +
58+
'\n${color.toHex()}',
59+
style: Theme.of(context).textTheme.titleLarge?.copyWith(
5760
color: color.computeLuminance() >= 0.5
5861
? Colors.black
5962
: Colors.white,
6063
),
61-
textAlign: TextAlign.center,
62-
),
63-
),
64-
);
65-
}).toList(),
66-
]),
67-
),
68-
);
69-
});
64+
textAlign: TextAlign.center,
65+
),
66+
),
67+
);
68+
}).toList(),
69+
],
70+
),
71+
),
72+
);
73+
},
74+
);
7075
}
7176
}
7277

‎system_theme/lib/system_theme.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class SystemAccentColor {
140140
}
141141

142142
SystemAccentColor._fromMap(dynamic colors)
143-
: defaultAccentColor = SystemTheme.fallbackColor {
143+
: defaultAccentColor = SystemTheme.fallbackColor {
144144
_retrieveFromColors(colors);
145145
}
146146

‎system_theme/lib/system_theme_builder.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import 'package:flutter/widgets.dart';
22
import 'package:system_theme/system_theme.dart';
33

4-
typedef ThemeWidgetBuilder = Widget Function(
5-
BuildContext context,
6-
SystemAccentColor accent,
7-
);
4+
typedef ThemeWidgetBuilder =
5+
Widget Function(BuildContext context, SystemAccentColor accent);
86

97
/// A widget that rebuilds when the system theme changes.
108
///

‎system_theme/test/system_theme_test.dart‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ void main() {
1111
final List<MethodCall> log = <MethodCall>[];
1212

1313
// Helper to create a color map in the format the plugin expects
14-
Map<String, dynamic> createColorMap(
15-
{int r = 0, int g = 0, int b = 0, int a = 255}) {
14+
Map<String, dynamic> createColorMap({
15+
int r = 0,
16+
int g = 0,
17+
int b = 0,
18+
int a = 255,
19+
}) {
1620
return {'R': r, 'G': g, 'B': b, 'A': a};
1721
}
1822

@@ -35,14 +39,12 @@ void main() {
3539

3640
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
3741
.setMockMethodCallHandler(channel, (MethodCall methodCall) async {
38-
log.add(methodCall);
39-
if (methodCall.method == 'SystemTheme.accentColor') {
40-
return {
41-
'accent': createColorMap(r: 0, g: 0, b: 255),
42-
};
43-
}
44-
return null;
45-
});
42+
log.add(methodCall);
43+
if (methodCall.method == 'SystemTheme.accentColor') {
44+
return {'accent': createColorMap(r: 0, g: 0, b: 255)};
45+
}
46+
return null;
47+
});
4648
});
4749

4850
tearDown(() {
@@ -63,11 +65,15 @@ void main() {
6365
test('Check platform support for listening to changes', () {
6466
debugDefaultTargetPlatformOverride = TargetPlatform.windows;
6567
expect(
66-
defaultTargetPlatform.supportsListeningToAccentColorChanges, isTrue);
68+
defaultTargetPlatform.supportsListeningToAccentColorChanges,
69+
isTrue,
70+
);
6771

6872
debugDefaultTargetPlatformOverride = TargetPlatform.android;
6973
expect(
70-
defaultTargetPlatform.supportsListeningToAccentColorChanges, isFalse);
74+
defaultTargetPlatform.supportsListeningToAccentColorChanges,
75+
isFalse,
76+
);
7177
});
7278

7379
test('Loads accent color correctly (Singleton)', () async {
@@ -82,8 +88,8 @@ void main() {
8288
test('Handles MissingPluginException gracefully', () async {
8389
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
8490
.setMockMethodCallHandler(channel, (MethodCall methodCall) async {
85-
throw MissingPluginException();
86-
});
91+
throw MissingPluginException();
92+
});
8793

8894
final testTheme = SystemAccentColor(kDefaultFallbackColor);
8995

@@ -97,8 +103,8 @@ void main() {
97103

98104
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
99105
.setMockMethodCallHandler(channel, (MethodCall methodCall) async {
100-
return null;
101-
});
106+
return null;
107+
});
102108

103109
final testTheme = SystemAccentColor(customFallback);
104110

@@ -114,10 +120,8 @@ void main() {
114120

115121
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
116122
.setMockMethodCallHandler(channel, (MethodCall methodCall) async {
117-
return {
118-
'accent': createColorMap(r: 0, g: 0, b: 255),
119-
};
120-
});
123+
return {'accent': createColorMap(r: 0, g: 0, b: 255)};
124+
});
121125

122126
final testTheme = SystemAccentColor(kDefaultFallbackColor);
123127
await testTheme.load();
@@ -134,11 +138,11 @@ void main() {
134138

135139
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
136140
.setMockMethodCallHandler(channel, (MethodCall methodCall) async {
137-
return {
138-
'accent': createColorMap(r: 0, g: 0, b: 255),
139-
'light': createColorMap(r: 0, g: 255, b: 0),
140-
};
141-
});
141+
return {
142+
'accent': createColorMap(r: 0, g: 0, b: 255),
143+
'light': createColorMap(r: 0, g: 255, b: 0),
144+
};
145+
});
142146

143147
final testTheme = SystemAccentColor(kDefaultFallbackColor);
144148
await testTheme.load();
@@ -151,10 +155,8 @@ void main() {
151155

152156
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
153157
.setMockMethodCallHandler(channel, (MethodCall methodCall) async {
154-
return {
155-
'accent': createColorMap(r: 0, g: 0, b: 255),
156-
};
157-
});
158+
return {'accent': createColorMap(r: 0, g: 0, b: 255)};
159+
});
158160

159161
final testTheme = SystemAccentColor(kDefaultFallbackColor);
160162
await testTheme.load();

0 commit comments

Comments
 (0)