Skip to content

Commit a9870af

Browse files
committed
Improve background previews and fix colors
1 parent deceab6 commit a9870af

20 files changed

Lines changed: 122 additions & 23 deletions

api/lib/src/models/colors.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:dart_leap/dart_leap.dart';
22

33
class BasicColors {
4-
static const light = SRGBColor(0xFFD9D9D9);
5-
static const dark = SRGBColor(0xFF1A1A1A);
4+
static const light = SRGBColor(0xFF9E9E9E);
5+
static const dark = SRGBColor(0xFF3A3A3A);
66
static const red = SRGBColor(0xFFF44336);
77
static const blue = SRGBColor(0xFF2196F3);
88
static const whiteTransparent = SRGBColor(0x00FFFFFF);

api/lib/src/models/texture.dart

Lines changed: 52 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ enum PatternTemplate {
1414
plainDark,
1515
ruled,
1616
ruledDark,
17+
ruledSimple,
18+
ruledSimpleDark,
1719
quad,
1820
quadDark,
21+
quadSimple,
22+
quadSimpleDark,
1923
music,
2024
musicDark,
2125
dotted,
@@ -30,77 +34,111 @@ extension PatternTemplateExtension on PatternTemplate {
3034
PatternBackground get background => switch (this) {
3135
PatternTemplate.plain ||
3236
PatternTemplate.ruled ||
37+
PatternTemplate.ruledSimple ||
3338
PatternTemplate.quad ||
39+
PatternTemplate.quadSimple ||
3440
PatternTemplate.music ||
3541
PatternTemplate.dotted => PatternBackground.light,
3642
PatternTemplate.plainDark ||
3743
PatternTemplate.ruledDark ||
44+
PatternTemplate.ruledSimpleDark ||
3845
PatternTemplate.quadDark ||
46+
PatternTemplate.quadSimpleDark ||
3947
PatternTemplate.musicDark ||
4048
PatternTemplate.dottedDark => PatternBackground.dark,
4149
};
4250

4351
PatternTexture create() {
4452
switch (this) {
4553
case PatternTemplate.plain:
46-
return const PatternTexture(boxColor: BasicColors.light);
54+
return const PatternTexture(boxColor: SRGBColor.white);
4755
case PatternTemplate.ruled:
48-
return const PatternTexture(boxColor: BasicColors.light, boxHeight: 40);
56+
return const PatternTexture(boxColor: SRGBColor.white, boxHeight: 40);
57+
case PatternTemplate.ruledSimple:
58+
return const PatternTexture(
59+
boxColor: SRGBColor.white,
60+
boxHeight: 40,
61+
boxXColor: BasicColors.dark,
62+
boxYColor: BasicColors.dark,
63+
);
4964
case PatternTemplate.quad:
5065
return const PatternTexture(
51-
boxColor: BasicColors.light,
66+
boxColor: SRGBColor.white,
5267
boxHeight: 40,
5368
boxWidth: 40,
5469
);
70+
case PatternTemplate.quadSimple:
71+
return const PatternTexture(
72+
boxColor: SRGBColor.white,
73+
boxHeight: 40,
74+
boxWidth: 40,
75+
boxXColor: BasicColors.dark,
76+
boxYColor: BasicColors.dark,
77+
);
5578
case PatternTemplate.music:
5679
return const PatternTexture(
57-
boxColor: BasicColors.light,
80+
boxColor: SRGBColor.white,
5881
boxHeight: 40,
5982
boxYColor: SRGBColor.black,
6083
boxYSpace: 80,
6184
boxYCount: 5,
6285
);
6386
case PatternTemplate.dotted:
6487
return const PatternTexture(
65-
boxColor: BasicColors.light,
88+
boxColor: SRGBColor.white,
6689
boxWidth: 40,
6790
boxHeight: 40,
6891
boxXCount: 1,
6992
boxYCount: 2,
7093
boxXStroke: 5,
7194
boxYStroke: 35,
72-
boxXColor: SRGBColor.black,
73-
boxYColor: BasicColors.light,
95+
boxXColor: BasicColors.light,
96+
boxYColor: SRGBColor.white,
7497
);
7598
case PatternTemplate.plainDark:
76-
return const PatternTexture(boxColor: BasicColors.dark);
99+
return const PatternTexture(boxColor: SRGBColor.black);
77100
case PatternTemplate.ruledDark:
78-
return const PatternTexture(boxColor: BasicColors.dark, boxHeight: 40);
101+
return const PatternTexture(boxColor: SRGBColor.black, boxHeight: 40);
102+
case PatternTemplate.ruledSimpleDark:
103+
return const PatternTexture(
104+
boxColor: SRGBColor.black,
105+
boxHeight: 40,
106+
boxXColor: BasicColors.dark,
107+
boxYColor: BasicColors.dark,
108+
);
79109
case PatternTemplate.quadDark:
80110
return const PatternTexture(
81-
boxColor: BasicColors.dark,
111+
boxColor: SRGBColor.black,
112+
boxWidth: 40,
113+
boxHeight: 40,
114+
);
115+
case PatternTemplate.quadSimpleDark:
116+
return const PatternTexture(
117+
boxColor: SRGBColor.black,
82118
boxWidth: 40,
83119
boxHeight: 40,
120+
boxXColor: BasicColors.dark,
121+
boxYColor: BasicColors.dark,
84122
);
85123
case PatternTemplate.musicDark:
86124
return const PatternTexture(
87-
boxColor: BasicColors.dark,
125+
boxColor: SRGBColor.black,
88126
boxYColor: SRGBColor.white,
89127
boxHeight: 40,
90128
boxYSpace: 80,
91129
boxYCount: 5,
92130
);
93131
case PatternTemplate.dottedDark:
94132
return const PatternTexture(
95-
boxColor: BasicColors.dark,
133+
boxColor: SRGBColor.black,
96134
boxWidth: 40,
97135
boxHeight: 40,
98136
boxXCount: 1,
99137
boxYCount: 2,
100138
boxXStroke: 5,
101139
boxYStroke: 35,
102-
boxXColor: SRGBColor.white,
103-
boxYColor: BasicColors.dark,
140+
boxXColor: BasicColors.dark,
141+
boxYColor: SRGBColor.black,
104142
);
105143
}
106144
}

app/lib/l10n/app_en.arb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1268,5 +1268,9 @@
12681268
"customizeShortcuts": "Customize shortcuts",
12691269
"clickToSave": "Click to save",
12701270
"toolbars": "Toolbars",
1271-
"logs": "Logs"
1271+
"logs": "Logs",
1272+
"ruledSimple": "Ruled simple",
1273+
"ruledSimpleDark": "Ruled simple dark",
1274+
"quadSimple": "Quad simple",
1275+
"quadSimpleDark": "Quad simple dark"
12721276
}

app/lib/visualizer/preset.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,19 @@ extension PatternTemplateHelper on PatternTemplate {
1111
PatternTemplate.quad => AppLocalizations.of(context).quad,
1212
PatternTemplate.music => AppLocalizations.of(context).music,
1313
PatternTemplate.dotted => AppLocalizations.of(context).dotted,
14+
PatternTemplate.ruledSimple => AppLocalizations.of(context).ruledSimple,
15+
PatternTemplate.quadSimple => AppLocalizations.of(context).quadSimple,
1416
PatternTemplate.plainDark => AppLocalizations.of(context).plainDark,
1517
PatternTemplate.ruledDark => AppLocalizations.of(context).ruledDark,
1618
PatternTemplate.quadDark => AppLocalizations.of(context).quadDark,
1719
PatternTemplate.musicDark => AppLocalizations.of(context).musicDark,
1820
PatternTemplate.dottedDark => AppLocalizations.of(context).dottedDark,
21+
PatternTemplate.ruledSimpleDark => AppLocalizations.of(
22+
context,
23+
).ruledSimpleDark,
24+
PatternTemplate.quadSimpleDark => AppLocalizations.of(
25+
context,
26+
).quadSimpleDark,
1927
};
2028
}
2129

app/templates/dotted.png

-29 Bytes
Loading

app/templates/dotted_dark.png

-29 Bytes
Loading

app/templates/music.png

-52 Bytes
Loading

app/templates/music_dark.png

-35 Bytes
Loading

app/templates/plain.png

-27 Bytes
Loading

app/templates/plain_dark.png

-27 Bytes
Loading

0 commit comments

Comments
 (0)