Skip to content

Commit 2210a21

Browse files
committed
✨ 更新默认颜色方案,使用 ColorScheme.fromSeed 替代 ColorScheme.fromSwatch
1 parent 1f58f20 commit 2210a21

2 files changed

Lines changed: 6 additions & 10 deletions

File tree

lib/controllers/config.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ FutureLazyDynamicCan<Directory> platDirectory =
1717

1818
FutureLazyDynamicCan<Directory> platUserDataDirectory = FutureLazyDynamicCan(
1919
builder: () async => (await platDirectory.getValue())
20-
.subDirectory(Platform.isAndroid ? "userdata" : "cczu-helper-userdata")
20+
.subDirectory(Platform.isIOS ? "cczu-helper-userdata" : "userdata")
2121
.check());
2222

2323
FutureLazyDynamicCan<Directory> platCalendarDataDirectory =

lib/main.dart

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,10 @@ void main() {
142142
);
143143
}
144144

145-
final _defaultLightColorScheme =
146-
ColorScheme.fromSwatch(primarySwatch: Colors.blue);
145+
final _defaultLightColorScheme = ColorScheme.fromSeed(seedColor: Colors.blue);
147146

148-
final _defaultDarkColorScheme = ColorScheme.fromSwatch(
149-
primarySwatch: Colors.blue, brightness: Brightness.dark);
147+
final _defaultDarkColorScheme =
148+
ColorScheme.fromSeed(seedColor: Colors.blue, brightness: Brightness.dark);
150149

151150
class MainApplication extends StatefulWidget {
152151
const MainApplication({super.key});
@@ -218,8 +217,7 @@ class MainApplicationState extends State<MainApplication>
218217
brightness: Brightness.dark,
219218
fontFamily: configs.sysfont.tryGet(),
220219
useMaterial3: true,
221-
colorScheme:
222-
customDarkColorScheme ?? darkDynamic ?? _defaultDarkColorScheme,
220+
colorScheme: _defaultDarkColorScheme,
223221
typography: Typography.material2021(),
224222
),
225223
theme: ThemeData(
@@ -230,9 +228,7 @@ class MainApplicationState extends State<MainApplication>
230228
brightness: Brightness.light,
231229
fontFamily: configs.sysfont.tryGet(),
232230
useMaterial3: true,
233-
colorScheme: customLightColorScheme ??
234-
lightDynamic ??
235-
_defaultLightColorScheme,
231+
colorScheme: _defaultLightColorScheme,
236232
typography: Typography.material2021(),
237233
),
238234
themeMode: configs.themeMode.getOr(ThemeMode.system),

0 commit comments

Comments
 (0)