@@ -3,8 +3,10 @@ import 'package:flutter/material.dart';
3
3
import 'color_x.dart' ;
4
4
import 'theme_data_x.dart' ;
5
5
6
+ typedef ThemePair = ({ThemeData lightTheme, ThemeData darkTheme});
7
+
6
8
const lightBase = Colors .white;
7
- final darkBase = Colors .black.scale (lightness: 0.13 );
9
+ final darkBase = Colors .black.scale (lightness: 0.11 );
8
10
final darkMenuBase = Colors .black.scale (lightness: 0.1 );
9
11
const kContainerRadius = 10.0 ;
10
12
const kButtonRadius = 6.0 ;
@@ -32,6 +34,7 @@ ThemePair phoenixTheme({
32
34
switchTheme: _switchTheme (lightScheme),
33
35
navigationRailTheme: _naviRailTheme (lightScheme),
34
36
navigationBarTheme: _naviBarTheme (lightScheme),
37
+ appBarTheme: _appBarTheme (lightScheme),
35
38
),
36
39
darkTheme: ThemeData (
37
40
colorScheme: darkScheme,
@@ -48,6 +51,7 @@ ThemePair phoenixTheme({
48
51
switchTheme: _switchTheme (darkScheme),
49
52
navigationRailTheme: _naviRailTheme (darkScheme),
50
53
navigationBarTheme: _naviBarTheme (darkScheme),
54
+ appBarTheme: _appBarTheme (darkScheme),
51
55
)
52
56
);
53
57
}
@@ -60,7 +64,7 @@ ColorScheme _darkScheme(Color color) {
60
64
surfaceTint: darkBase,
61
65
background: darkBase,
62
66
surface: darkBase.scale (
63
- lightness: 0.04 ,
67
+ lightness: 0.03 ,
64
68
),
65
69
outline: darkBase.scale (
66
70
lightness: 0.28 ,
@@ -91,7 +95,7 @@ DividerThemeData _dividerTheme(ColorScheme colorScheme) => DividerThemeData(
91
95
);
92
96
93
97
Color _dividerColor (ColorScheme colorScheme) {
94
- return colorScheme.outline.scale (lightness: colorScheme.isLight ? 0.3 : - 0.3 );
98
+ return colorScheme.outline.scale (lightness: colorScheme.isLight ? 0.3 : - 0.4 );
95
99
}
96
100
97
101
DialogTheme _dialogTheme (ColorScheme colorScheme) {
@@ -245,4 +249,8 @@ NavigationBarThemeData _naviBarTheme(ColorScheme colorScheme) {
245
249
Color _indicatorColor (ColorScheme colorScheme) =>
246
250
_dividerColor (colorScheme).withOpacity (0.8 );
247
251
248
- typedef ThemePair = ({ThemeData lightTheme, ThemeData darkTheme});
252
+ AppBarTheme _appBarTheme (ColorScheme colorScheme) {
253
+ return AppBarTheme (
254
+ backgroundColor: colorScheme.background,
255
+ );
256
+ }
0 commit comments