@@ -59,7 +59,7 @@ ThemeData zulipThemeData(BuildContext context) {
59
59
colorScheme: ColorScheme .fromSeed (
60
60
seedColor: kZulipBrandColor,
61
61
),
62
- scaffoldBackgroundColor: designVariables.bgMain ,
62
+ scaffoldBackgroundColor: designVariables.mainBackground ,
63
63
tooltipTheme: const TooltipThemeData (preferBelow: false ),
64
64
);
65
65
}
@@ -76,18 +76,18 @@ const kZulipBrandColor = Color.fromRGBO(0x64, 0x92, 0xfe, 1);
76
76
/// https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=2945-49492&t=MEb4vtp7S26nntxm-0
77
77
class DesignVariables extends ThemeExtension <DesignVariables > {
78
78
DesignVariables () :
79
- bgMain = const Color (0xfff0f0f0 ),
80
79
bgTopBar = const Color (0xfff5f5f5 ),
81
80
borderBar = const Color (0x33000000 ),
82
81
icon = const Color (0xff666699 ),
82
+ mainBackground = const Color (0xfff0f0f0 ),
83
83
title = const Color (0xff1a1a1a ),
84
84
streamColorSwatches = StreamColorSwatches .light;
85
85
86
86
DesignVariables ._({
87
- required this .bgMain,
88
87
required this .bgTopBar,
89
88
required this .borderBar,
90
89
required this .icon,
90
+ required this .mainBackground,
91
91
required this .title,
92
92
required this .streamColorSwatches,
93
93
});
@@ -102,29 +102,29 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
102
102
return extension ! ;
103
103
}
104
104
105
- final Color bgMain;
106
105
final Color bgTopBar;
107
106
final Color borderBar;
108
107
final Color icon;
108
+ final Color mainBackground;
109
109
final Color title;
110
110
111
111
// Not exactly from the Figma design, but from Vlad anyway.
112
112
final StreamColorSwatches streamColorSwatches;
113
113
114
114
@override
115
115
DesignVariables copyWith ({
116
- Color ? bgMain,
117
116
Color ? bgTopBar,
118
117
Color ? borderBar,
119
118
Color ? icon,
119
+ Color ? mainBackground,
120
120
Color ? title,
121
121
StreamColorSwatches ? streamColorSwatches,
122
122
}) {
123
123
return DesignVariables ._(
124
- bgMain: bgMain ?? this .bgMain,
125
124
bgTopBar: bgTopBar ?? this .bgTopBar,
126
125
borderBar: borderBar ?? this .borderBar,
127
126
icon: icon ?? this .icon,
127
+ mainBackground: mainBackground ?? this .mainBackground,
128
128
title: title ?? this .title,
129
129
streamColorSwatches: streamColorSwatches ?? this .streamColorSwatches,
130
130
);
@@ -136,10 +136,10 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
136
136
return this ;
137
137
}
138
138
return DesignVariables ._(
139
- bgMain: Color .lerp (bgMain, other.bgMain, t)! ,
140
139
bgTopBar: Color .lerp (bgTopBar, other.bgTopBar, t)! ,
141
140
borderBar: Color .lerp (borderBar, other.borderBar, t)! ,
142
141
icon: Color .lerp (icon, other.icon, t)! ,
142
+ mainBackground: Color .lerp (mainBackground, other.mainBackground, t)! ,
143
143
title: Color .lerp (title, other.title, t)! ,
144
144
streamColorSwatches: StreamColorSwatches .lerp (streamColorSwatches, other.streamColorSwatches, t),
145
145
);
0 commit comments