Skip to content

Commit 9fdacf5

Browse files
committed
darker dark
1 parent 4540377 commit 9fdacf5

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

example/lib/src/home/home_page.dart

+7-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,13 @@ class _AppBar extends StatelessWidget implements PreferredSizeWidget {
139139
final show = context.mq.size.width > 800;
140140
return Row(
141141
children: [
142-
if (show) SizedBox(width: 80, child: AppBar()),
142+
if (show)
143+
SizedBox(
144+
width: 80,
145+
child: AppBar(
146+
backgroundColor: context.theme.colorScheme.surface,
147+
),
148+
),
143149
if (show)
144150
const SizedBox(
145151
height: kToolbarHeight,

lib/src/theme.dart

+12-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ import 'package:flutter/material.dart';
33
import 'color_x.dart';
44
import 'theme_data_x.dart';
55

6+
typedef ThemePair = ({ThemeData lightTheme, ThemeData darkTheme});
7+
68
const lightBase = Colors.white;
7-
final darkBase = Colors.black.scale(lightness: 0.13);
9+
final darkBase = Colors.black.scale(lightness: 0.11);
810
final darkMenuBase = Colors.black.scale(lightness: 0.1);
911
const kContainerRadius = 10.0;
1012
const kButtonRadius = 6.0;
@@ -32,6 +34,7 @@ ThemePair phoenixTheme({
3234
switchTheme: _switchTheme(lightScheme),
3335
navigationRailTheme: _naviRailTheme(lightScheme),
3436
navigationBarTheme: _naviBarTheme(lightScheme),
37+
appBarTheme: _appBarTheme(lightScheme),
3538
),
3639
darkTheme: ThemeData(
3740
colorScheme: darkScheme,
@@ -48,6 +51,7 @@ ThemePair phoenixTheme({
4851
switchTheme: _switchTheme(darkScheme),
4952
navigationRailTheme: _naviRailTheme(darkScheme),
5053
navigationBarTheme: _naviBarTheme(darkScheme),
54+
appBarTheme: _appBarTheme(darkScheme),
5155
)
5256
);
5357
}
@@ -60,7 +64,7 @@ ColorScheme _darkScheme(Color color) {
6064
surfaceTint: darkBase,
6165
background: darkBase,
6266
surface: darkBase.scale(
63-
lightness: 0.04,
67+
lightness: 0.03,
6468
),
6569
outline: darkBase.scale(
6670
lightness: 0.28,
@@ -91,7 +95,7 @@ DividerThemeData _dividerTheme(ColorScheme colorScheme) => DividerThemeData(
9195
);
9296

9397
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);
9599
}
96100

97101
DialogTheme _dialogTheme(ColorScheme colorScheme) {
@@ -245,4 +249,8 @@ NavigationBarThemeData _naviBarTheme(ColorScheme colorScheme) {
245249
Color _indicatorColor(ColorScheme colorScheme) =>
246250
_dividerColor(colorScheme).withOpacity(0.8);
247251

248-
typedef ThemePair = ({ThemeData lightTheme, ThemeData darkTheme});
252+
AppBarTheme _appBarTheme(ColorScheme colorScheme) {
253+
return AppBarTheme(
254+
backgroundColor: colorScheme.background,
255+
);
256+
}

0 commit comments

Comments
 (0)