firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated gallery light and dark themes (#28619)

Browse Source
This commit is contained in:
Hans Muller 2019-02-28 11:41:05 -08:00 committed by GitHub
parent 47c835fb2b
commit 2fd0728cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/flutter_gallery/lib/gallery/themes.dart
View File

@ -25,15 +25,19 @@ TextTheme _buildTextTheme(TextTheme base) {
ThemeData _buildDarkTheme() { ThemeData _buildDarkTheme() {
const Color primaryColor = Color(0xFF0175c2); const Color primaryColor = Color(0xFF0175c2);
const Color secondaryColor = Color(0xFF13B9FD); const Color secondaryColor = Color(0xFF13B9FD);
final ThemeData base = ThemeData.dark();
final ColorScheme colorScheme = const ColorScheme.dark().copyWith( final ColorScheme colorScheme = const ColorScheme.dark().copyWith(
primary: primaryColor, primary: primaryColor,
secondary: secondaryColor, secondary: secondaryColor,
); );
return base.copyWith( final ThemeData base = ThemeData(
brightness: Brightness.dark,
accentColorBrightness: Brightness.dark,
primaryColor: primaryColor, primaryColor: primaryColor,
primaryColorDark: const Color(0xFF0050a0),
primaryColorLight: secondaryColor,
buttonColor: primaryColor, buttonColor: primaryColor,
indicatorColor: Colors.white, indicatorColor: Colors.white,
toggleableActiveColor: const Color(0xFF6997DF),
accentColor: secondaryColor, accentColor: secondaryColor,
canvasColor: const Color(0xFF202124), canvasColor: const Color(0xFF202124),
scaffoldBackgroundColor: const Color(0xFF202124), scaffoldBackgroundColor: const Color(0xFF202124),
@ -43,6 +47,8 @@ ThemeData _buildDarkTheme() {
colorScheme: colorScheme, colorScheme: colorScheme,
textTheme: ButtonTextTheme.primary, textTheme: ButtonTextTheme.primary,
), ),
);
return base.copyWith(
textTheme: _buildTextTheme(base.textTheme), textTheme: _buildTextTheme(base.textTheme),
primaryTextTheme: _buildTextTheme(base.primaryTextTheme), primaryTextTheme: _buildTextTheme(base.primaryTextTheme),
accentTextTheme: _buildTextTheme(base.accentTextTheme), accentTextTheme: _buildTextTheme(base.accentTextTheme),
@ -56,12 +62,14 @@ ThemeData _buildLightTheme() {
primary: primaryColor, primary: primaryColor,
secondary: secondaryColor, secondary: secondaryColor,
); );
final ThemeData base = ThemeData.light(); final ThemeData base = ThemeData(
return base.copyWith( brightness: Brightness.light,
accentColorBrightness: Brightness.dark,
colorScheme: colorScheme, colorScheme: colorScheme,
primaryColor: primaryColor, primaryColor: primaryColor,
buttonColor: primaryColor, buttonColor: primaryColor,
indicatorColor: Colors.white, indicatorColor: Colors.white,
toggleableActiveColor: const Color(0xFF1E88E5),
splashColor: Colors.white24, splashColor: Colors.white24,
splashFactory: InkRipple.splashFactory, splashFactory: InkRipple.splashFactory,
accentColor: secondaryColor, accentColor: secondaryColor,
@ -73,6 +81,8 @@ ThemeData _buildLightTheme() {
colorScheme: colorScheme, colorScheme: colorScheme,
textTheme: ButtonTextTheme.primary, textTheme: ButtonTextTheme.primary,
), ),
);
return base.copyWith(
textTheme: _buildTextTheme(base.textTheme), textTheme: _buildTextTheme(base.textTheme),
primaryTextTheme: _buildTextTheme(base.primaryTextTheme), primaryTextTheme: _buildTextTheme(base.primaryTextTheme),
accentTextTheme: _buildTextTheme(base.accentTextTheme), accentTextTheme: _buildTextTheme(base.accentTextTheme),