Skip to content

Commit 6b81c2f

Browse files
committed
FIX: Add custom Color object toString that always works.
1 parent 9ee1a8a commit 6b81c2f

File tree

3 files changed

+185
-168
lines changed

3 files changed

+185
-168
lines changed

example/lib/example5_themes_playground/utils/generate_colorscheme_dart_code.dart

Lines changed: 93 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
22

33
import '../../shared/const/app.dart';
44
import '../../shared/controllers/theme_controller.dart';
5+
import '../../shared/utils/color_string.dart';
56
import '../theme/flex_theme_dark.dart';
67
import '../theme/flex_theme_light.dart';
78

@@ -21,104 +22,104 @@ String generateColorSchemeDartCode(
2122
/// Requires Flutter 3.22.0 or later.
2223
const ColorScheme lightColorScheme = ColorScheme(
2324
brightness: ${lightScheme.brightness},
24-
primary: ${lightScheme.primary},
25-
onPrimary: ${lightScheme.onPrimary},
26-
primaryContainer: ${lightScheme.primaryContainer},
27-
onPrimaryContainer: ${lightScheme.onPrimaryContainer},
28-
primaryFixed: ${lightScheme.primaryFixed},
29-
primaryFixedDim: ${lightScheme.primaryFixedDim},
30-
onPrimaryFixed: ${lightScheme.onPrimaryFixed},
31-
onPrimaryFixedVariant: ${lightScheme.onPrimaryFixedVariant},
32-
secondary: ${lightScheme.secondary},
33-
onSecondary: ${lightScheme.onSecondary},
34-
secondaryContainer: ${lightScheme.secondaryContainer},
35-
onSecondaryContainer: ${lightScheme.onSecondaryContainer},
36-
secondaryFixed: ${lightScheme.secondaryFixed},
37-
secondaryFixedDim: ${lightScheme.secondaryFixedDim},
38-
onSecondaryFixed: ${lightScheme.onSecondaryFixed},
39-
onSecondaryFixedVariant: ${lightScheme.onSecondaryFixedVariant},
40-
tertiary: ${lightScheme.tertiary},
41-
onTertiary: ${lightScheme.onTertiary},
42-
tertiaryContainer: ${lightScheme.tertiaryContainer},
43-
onTertiaryContainer: ${lightScheme.onTertiaryContainer},
44-
tertiaryFixed: ${lightScheme.tertiaryFixed},
45-
tertiaryFixedDim: ${lightScheme.tertiaryFixedDim},
46-
onTertiaryFixed: ${lightScheme.onTertiaryFixed},
47-
onTertiaryFixedVariant: ${lightScheme.onTertiaryFixedVariant},
48-
error: ${lightScheme.error},
49-
onError: ${lightScheme.onError},
50-
errorContainer: ${lightScheme.errorContainer},
51-
onErrorContainer: ${lightScheme.onErrorContainer},
52-
surface: ${lightScheme.surface},
53-
onSurface: ${lightScheme.onSurface},
54-
surfaceDim: ${lightScheme.surfaceDim},
55-
surfaceBright: ${lightScheme.surfaceBright},
56-
surfaceContainerLowest: ${lightScheme.surfaceContainerLowest},
57-
surfaceContainerLow: ${lightScheme.surfaceContainerLow},
58-
surfaceContainer: ${lightScheme.surfaceContainer},
59-
surfaceContainerHigh: ${lightScheme.surfaceContainerHigh},
60-
surfaceContainerHighest: ${lightScheme.surfaceContainerHighest},
61-
onSurfaceVariant: ${lightScheme.onSurfaceVariant},
62-
outline: ${lightScheme.outline},
63-
outlineVariant: ${lightScheme.outlineVariant},
64-
shadow: ${lightScheme.shadow},
65-
scrim: ${lightScheme.scrim},
66-
inverseSurface: ${lightScheme.inverseSurface},
67-
onInverseSurface: ${lightScheme.onInverseSurface},
68-
inversePrimary: ${lightScheme.inversePrimary},
69-
surfaceTint: ${lightScheme.surfaceTint},
25+
primary: ${lightScheme.primary.toColorString()},
26+
onPrimary: ${lightScheme.onPrimary.toColorString()},
27+
primaryContainer: ${lightScheme.primaryContainer.toColorString()},
28+
onPrimaryContainer: ${lightScheme.onPrimaryContainer.toColorString()},
29+
primaryFixed: ${lightScheme.primaryFixed.toColorString()},
30+
primaryFixedDim: ${lightScheme.primaryFixedDim.toColorString()},
31+
onPrimaryFixed: ${lightScheme.onPrimaryFixed.toColorString()},
32+
onPrimaryFixedVariant: ${lightScheme.onPrimaryFixedVariant.toColorString()},
33+
secondary: ${lightScheme.secondary.toColorString()},
34+
onSecondary: ${lightScheme.onSecondary.toColorString()},
35+
secondaryContainer: ${lightScheme.secondaryContainer.toColorString()},
36+
onSecondaryContainer: ${lightScheme.onSecondaryContainer.toColorString()},
37+
secondaryFixed: ${lightScheme.secondaryFixed.toColorString()},
38+
secondaryFixedDim: ${lightScheme.secondaryFixedDim.toColorString()},
39+
onSecondaryFixed: ${lightScheme.onSecondaryFixed.toColorString()},
40+
onSecondaryFixedVariant: ${lightScheme.onSecondaryFixedVariant.toColorString()},
41+
tertiary: ${lightScheme.tertiary.toColorString()},
42+
onTertiary: ${lightScheme.onTertiary.toColorString()},
43+
tertiaryContainer: ${lightScheme.tertiaryContainer.toColorString()},
44+
onTertiaryContainer: ${lightScheme.onTertiaryContainer.toColorString()},
45+
tertiaryFixed: ${lightScheme.tertiaryFixed.toColorString()},
46+
tertiaryFixedDim: ${lightScheme.tertiaryFixedDim.toColorString()},
47+
onTertiaryFixed: ${lightScheme.onTertiaryFixed.toColorString()},
48+
onTertiaryFixedVariant: ${lightScheme.onTertiaryFixedVariant.toColorString()},
49+
error: ${lightScheme.error.toColorString()},
50+
onError: ${lightScheme.onError.toColorString()},
51+
errorContainer: ${lightScheme.errorContainer.toColorString()},
52+
onErrorContainer: ${lightScheme.onErrorContainer.toColorString()},
53+
surface: ${lightScheme.surface.toColorString()},
54+
onSurface: ${lightScheme.onSurface.toColorString()},
55+
surfaceDim: ${lightScheme.surfaceDim.toColorString()},
56+
surfaceBright: ${lightScheme.surfaceBright.toColorString()},
57+
surfaceContainerLowest: ${lightScheme.surfaceContainerLowest.toColorString()},
58+
surfaceContainerLow: ${lightScheme.surfaceContainerLow.toColorString()},
59+
surfaceContainer: ${lightScheme.surfaceContainer.toColorString()},
60+
surfaceContainerHigh: ${lightScheme.surfaceContainerHigh.toColorString()},
61+
surfaceContainerHighest: ${lightScheme.surfaceContainerHighest.toColorString()},
62+
onSurfaceVariant: ${lightScheme.onSurfaceVariant.toColorString()},
63+
outline: ${lightScheme.outline.toColorString()},
64+
outlineVariant: ${lightScheme.outlineVariant.toColorString()},
65+
shadow: ${lightScheme.shadow.toColorString()},
66+
scrim: ${lightScheme.scrim.toColorString()},
67+
inverseSurface: ${lightScheme.inverseSurface.toColorString()},
68+
onInverseSurface: ${lightScheme.onInverseSurface.toColorString()},
69+
inversePrimary: ${lightScheme.inversePrimary.toColorString()},
70+
surfaceTint: ${lightScheme.surfaceTint.toColorString()},
7071
);
7172
7273
/// Dark [ColorScheme] made with FlexColorScheme v${App.version}.
7374
/// Requires Flutter 3.22.0 or later.
7475
const ColorScheme darkColorScheme = ColorScheme(
7576
brightness: ${darkScheme.brightness},
76-
primary: ${darkScheme.primary},
77-
onPrimary: ${darkScheme.onPrimary},
78-
primaryContainer: ${darkScheme.primaryContainer},
79-
onPrimaryContainer: ${darkScheme.onPrimaryContainer},
80-
primaryFixed: ${darkScheme.primaryFixed},
81-
primaryFixedDim: ${darkScheme.primaryFixedDim},
82-
onPrimaryFixed: ${darkScheme.onPrimaryFixed},
83-
onPrimaryFixedVariant: ${darkScheme.onPrimaryFixedVariant},
84-
secondary: ${darkScheme.secondary},
85-
onSecondary: ${darkScheme.onSecondary},
86-
secondaryContainer: ${darkScheme.secondaryContainer},
87-
onSecondaryContainer: ${darkScheme.onSecondaryContainer},
88-
secondaryFixed: ${darkScheme.secondaryFixed},
89-
secondaryFixedDim: ${darkScheme.secondaryFixedDim},
90-
onSecondaryFixed: ${darkScheme.onSecondaryFixed},
91-
onSecondaryFixedVariant: ${darkScheme.onSecondaryFixedVariant},
92-
tertiary: ${darkScheme.tertiary},
93-
onTertiary: ${darkScheme.onTertiary},
94-
tertiaryContainer: ${darkScheme.tertiaryContainer},
95-
onTertiaryContainer: ${darkScheme.onTertiaryContainer},
96-
tertiaryFixed: ${darkScheme.tertiaryFixed},
97-
tertiaryFixedDim: ${darkScheme.tertiaryFixedDim},
98-
onTertiaryFixed: ${darkScheme.onTertiaryFixed},
99-
onTertiaryFixedVariant: ${darkScheme.onTertiaryFixedVariant},
100-
error: ${darkScheme.error},
101-
onError: ${darkScheme.onError},
102-
errorContainer: ${darkScheme.errorContainer},
103-
onErrorContainer: ${darkScheme.onErrorContainer},
104-
surface: ${darkScheme.surface},
105-
onSurface: ${darkScheme.onSurface},
106-
surfaceDim: ${darkScheme.surfaceDim},
107-
surfaceBright: ${darkScheme.surfaceBright},
108-
surfaceContainerLowest: ${darkScheme.surfaceContainerLowest},
109-
surfaceContainerLow: ${darkScheme.surfaceContainerLow},
110-
surfaceContainer: ${darkScheme.surfaceContainer},
111-
surfaceContainerHigh: ${darkScheme.surfaceContainerHigh},
112-
surfaceContainerHighest: ${darkScheme.surfaceContainerHighest},
113-
onSurfaceVariant: ${darkScheme.onSurfaceVariant},
114-
outline: ${darkScheme.outline},
115-
outlineVariant: ${darkScheme.outlineVariant},
116-
shadow: ${darkScheme.shadow},
117-
scrim: ${darkScheme.scrim},
118-
inverseSurface: ${darkScheme.inverseSurface},
119-
onInverseSurface: ${darkScheme.onInverseSurface},
120-
inversePrimary: ${darkScheme.inversePrimary},
121-
surfaceTint: ${darkScheme.surfaceTint},
77+
primary: ${darkScheme.primary.toColorString()},
78+
onPrimary: ${darkScheme.onPrimary.toColorString()},
79+
primaryContainer: ${darkScheme.primaryContainer.toColorString()},
80+
onPrimaryContainer: ${darkScheme.onPrimaryContainer.toColorString()},
81+
primaryFixed: ${darkScheme.primaryFixed.toColorString()},
82+
primaryFixedDim: ${darkScheme.primaryFixedDim.toColorString()},
83+
onPrimaryFixed: ${darkScheme.onPrimaryFixed.toColorString()},
84+
onPrimaryFixedVariant: ${darkScheme.onPrimaryFixedVariant.toColorString()},
85+
secondary: ${darkScheme.secondary.toColorString()},
86+
onSecondary: ${darkScheme.onSecondary.toColorString()},
87+
secondaryContainer: ${darkScheme.secondaryContainer.toColorString()},
88+
onSecondaryContainer: ${darkScheme.onSecondaryContainer.toColorString()},
89+
secondaryFixed: ${darkScheme.secondaryFixed.toColorString()},
90+
secondaryFixedDim: ${darkScheme.secondaryFixedDim.toColorString()},
91+
onSecondaryFixed: ${darkScheme.onSecondaryFixed.toColorString()},
92+
onSecondaryFixedVariant: ${darkScheme.onSecondaryFixedVariant.toColorString()},
93+
tertiary: ${darkScheme.tertiary.toColorString()},
94+
onTertiary: ${darkScheme.onTertiary.toColorString()},
95+
tertiaryContainer: ${darkScheme.tertiaryContainer.toColorString()},
96+
onTertiaryContainer: ${darkScheme.onTertiaryContainer.toColorString()},
97+
tertiaryFixed: ${darkScheme.tertiaryFixed.toColorString()},
98+
tertiaryFixedDim: ${darkScheme.tertiaryFixedDim.toColorString()},
99+
onTertiaryFixed: ${darkScheme.onTertiaryFixed.toColorString()},
100+
onTertiaryFixedVariant: ${darkScheme.onTertiaryFixedVariant.toColorString()},
101+
error: ${darkScheme.error.toColorString()},
102+
onError: ${darkScheme.onError.toColorString()},
103+
errorContainer: ${darkScheme.errorContainer.toColorString()},
104+
onErrorContainer: ${darkScheme.onErrorContainer.toColorString()},
105+
surface: ${darkScheme.surface.toColorString()},
106+
onSurface: ${darkScheme.onSurface.toColorString()},
107+
surfaceDim: ${darkScheme.surfaceDim.toColorString()},
108+
surfaceBright: ${darkScheme.surfaceBright.toColorString()},
109+
surfaceContainerLowest: ${darkScheme.surfaceContainerLowest.toColorString()},
110+
surfaceContainerLow: ${darkScheme.surfaceContainerLow.toColorString()},
111+
surfaceContainer: ${darkScheme.surfaceContainer.toColorString()},
112+
surfaceContainerHigh: ${darkScheme.surfaceContainerHigh.toColorString()},
113+
surfaceContainerHighest: ${darkScheme.surfaceContainerHighest.toColorString()},
114+
onSurfaceVariant: ${darkScheme.onSurfaceVariant.toColorString()},
115+
outline: ${darkScheme.outline.toColorString()},
116+
outlineVariant: ${darkScheme.outlineVariant.toColorString()},
117+
shadow: ${darkScheme.shadow.toColorString()},
118+
scrim: ${darkScheme.scrim.toColorString()},
119+
inverseSurface: ${darkScheme.inverseSurface.toColorString()},
120+
onInverseSurface: ${darkScheme.onInverseSurface.toColorString()},
121+
inversePrimary: ${darkScheme.inversePrimary.toColorString()},
122+
surfaceTint: ${darkScheme.surfaceTint.toColorString()},
122123
);
123124
''';
124125
return code;

0 commit comments

Comments
 (0)