Merge branch 'master' of http://git.freezer.life/pato05/freezer
This commit is contained in:
commit
10a5455cc7
|
@ -272,22 +272,13 @@ class Settings {
|
||||||
static const deezerBottom = Color(0xFF1b1714);
|
static const deezerBottom = Color(0xFF1b1714);
|
||||||
TextTheme get _textTheme => (font == 'Deezer')
|
TextTheme get _textTheme => (font == 'Deezer')
|
||||||
? null
|
? null
|
||||||
: GoogleFonts.getTextTheme(font,
|
: GoogleFonts.getTextTheme(
|
||||||
isDark ? ThemeData.dark().textTheme : ThemeData.light().textTheme);
|
font,
|
||||||
|
this.isDark
|
||||||
|
? ThemeData.dark().textTheme
|
||||||
|
: ThemeData.light().textTheme);
|
||||||
String get _fontFamily => (font == 'Deezer') ? 'MabryPro' : null;
|
String get _fontFamily => (font == 'Deezer') ? 'MabryPro' : null;
|
||||||
|
|
||||||
//Overrides for the non-deprecated buttons to look like the old ones
|
|
||||||
OutlinedButtonThemeData get outlinedButtonTheme => OutlinedButtonThemeData(
|
|
||||||
style: ButtonStyle(
|
|
||||||
foregroundColor:
|
|
||||||
MaterialStateProperty.all(isDark ? Colors.white : Colors.black),
|
|
||||||
));
|
|
||||||
TextButtonThemeData get textButtonTheme => TextButtonThemeData(
|
|
||||||
style: ButtonStyle(
|
|
||||||
foregroundColor:
|
|
||||||
MaterialStateProperty.all(isDark ? Colors.white : Colors.black),
|
|
||||||
));
|
|
||||||
|
|
||||||
Map<Themes, ThemeData> get _themeData => {
|
Map<Themes, ThemeData> get _themeData => {
|
||||||
Themes.Light: ThemeData(
|
Themes.Light: ThemeData(
|
||||||
textTheme: _textTheme,
|
textTheme: _textTheme,
|
||||||
|
|
Loading…
Reference in a new issue