fix colors
Serhii committed
Nov 10, 2022 at 16:43 UTC
4269f18d013162b7fec61e5b0f37dc77fee00a86
2 files changed
+8
-20
lib/src/screens/dashboard/widgets/filter_widget.dart
+3
-15
@@ -28,16 +28,6 @@ class FilterWidget extends StatelessWidget {
28
Column(
29
mainAxisSize: MainAxisSize.min,
30
children: <Widget>[
31
- Text(
32
- S.of(context).filters,
33
- style: TextStyle(
34
- color: Colors.white,
35
- fontSize: 18,
36
- fontWeight: FontWeight.bold,
37
- fontFamily: 'Lato',
38
- decoration: TextDecoration.none,
39
- ),
40
- ),
31
Padding(
32
padding: EdgeInsets.only(left: 24, right: 24, top: 24),
33
child: ClipRRect(
@@ -55,10 +45,8 @@ class FilterWidget extends StatelessWidget {
45
child: Text(
46
S.of(context).filters,
47
style: TextStyle(
58
- color: Theme.of(context)
59
- .textTheme!
60
- .bodyText1!
61
- .decorationColor!,
48
+ color: Theme.of(context).primaryTextTheme
49
+ .overline!.color!,
50
fontSize: 16,
51
fontFamily: 'Lato',
52
decoration: TextDecoration.none,
@@ -182,7 +170,7 @@ class SectionDivider extends StatelessWidget {
170
Widget build(BuildContext context) {
171
return Container(
172
height: 1,
185
- color: Colors.red,//Fixme Theme.of(context).accentTextTheme.subhead.backgroundColor,
173
+ color: Theme.of(context).dividerColor,
174
);
175
}
176
}
\ No newline at end of file
lib/src/widgets/rounded_checkbox.dart
+5
-5
@@ -20,8 +20,8 @@ class RoundedCheckboxWidget extends StatelessWidget {
20
Widget build(BuildContext context) {
21
22
final baseGradient = LinearGradient(colors: [
23
- Colors.red, //Fixme Theme.of(context).primaryTextTheme!.subtitle!.color!,
24
- Colors.red //Fixme Theme.of(context).primaryTextTheme!.subtitle!.decorationColor!,
23
+ Theme.of(context).primaryTextTheme.subtitle1!.color!,
24
+ Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!,
25
], begin: Alignment.centerLeft, end: Alignment.centerRight);
26
27
final darkThemeGradient = LinearGradient(colors: [
@@ -32,11 +32,11 @@ class RoundedCheckboxWidget extends StatelessWidget {
32
final gradient = darkTheme ? darkThemeGradient : baseGradient;
33
34
final uncheckedColor = darkTheme
35
- ? Colors.red //Fixme Theme.of(context).accentTextTheme.subhead.decorationColor
35
+ ? Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!
36
: Colors.white;
37
38
final borderColor = darkTheme
39
- ? Colors.red //Fixme Theme.of(context).accentTextTheme.subtitle.backgroundColor
39
+ ? Theme.of(context).accentTextTheme.subtitle2!.backgroundColor!
40
: Colors.transparent;
41
42
final checkedOuterBoxDecoration =
@@ -77,7 +77,7 @@ class RoundedCheckboxWidget extends StatelessWidget {
77
child: Text(
78
caption,
79
style: TextStyle(
80
- color: Colors.red, //Fixme Theme.of(context).primaryTextTheme.title.color,
80
+ color: Theme.of(context).primaryTextTheme.headline6!.color!,
81
fontSize: 18,
82
fontFamily: 'Lato',
83
fontWeight: FontWeight.w500,