mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-05-05 04:40:37 +00:00
Simplified theme
This commit is contained in:
parent
1b4274d68d
commit
4ef11c889d
2 changed files with 6 additions and 123 deletions
|
@ -1,12 +1,8 @@
|
|||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:adguard_home_manager/constants/adguard_green_color.dart';
|
||||
|
||||
ThemeData lightTheme(ColorScheme? dynamicColorScheme) => ThemeData(
|
||||
useMaterial3: true,
|
||||
colorScheme: dynamicColorScheme ?? ColorScheme.fromSwatch(primarySwatch: adguardGreenColor),
|
||||
primaryColor: dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor,
|
||||
scaffoldBackgroundColor: dynamicColorScheme != null ? dynamicColorScheme.background : Colors.white,
|
||||
colorScheme: dynamicColorScheme,
|
||||
snackBarTheme: SnackBarThemeData(
|
||||
behavior: SnackBarBehavior.floating,
|
||||
shape: RoundedRectangleBorder(
|
||||
|
@ -14,145 +10,31 @@ ThemeData lightTheme(ColorScheme? dynamicColorScheme) => ThemeData(
|
|||
),
|
||||
elevation: 4,
|
||||
),
|
||||
brightness: Brightness.light,
|
||||
dialogBackgroundColor: dynamicColorScheme != null ? dynamicColorScheme.surface : Colors.white,
|
||||
textTheme: const TextTheme(
|
||||
bodyText1: TextStyle(
|
||||
color: Colors.black54
|
||||
),
|
||||
bodyText2: TextStyle(
|
||||
color: Colors.black
|
||||
),
|
||||
),
|
||||
navigationBarTheme: NavigationBarThemeData(
|
||||
indicatorColor: dynamicColorScheme != null ? dynamicColorScheme.secondaryContainer : adguardGreenColor,
|
||||
iconTheme: MaterialStateProperty.all(
|
||||
IconThemeData(
|
||||
color: dynamicColorScheme != null ? dynamicColorScheme.onSecondaryContainer : adguardGreenColor,
|
||||
)
|
||||
)
|
||||
),
|
||||
floatingActionButtonTheme: FloatingActionButtonThemeData(
|
||||
foregroundColor: dynamicColorScheme != null ? dynamicColorScheme.onPrimaryContainer : Colors.white,
|
||||
backgroundColor: dynamicColorScheme != null ? dynamicColorScheme.primaryContainer : adguardGreenColor
|
||||
),
|
||||
textButtonTheme: TextButtonThemeData(
|
||||
style: ButtonStyle(
|
||||
foregroundColor: MaterialStateProperty.all(
|
||||
dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor
|
||||
),
|
||||
overlayColor: MaterialStateProperty.all(
|
||||
dynamicColorScheme != null ? dynamicColorScheme.primary.withOpacity(0.1) : adguardGreenColor.withOpacity(0.1)
|
||||
),
|
||||
),
|
||||
),
|
||||
dividerColor: Colors.black12,
|
||||
listTileTheme: ListTileThemeData(
|
||||
brightness: Brightness.light, listTileTheme: ListTileThemeData(
|
||||
tileColor: Colors.transparent,
|
||||
textColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(117, 117, 117, 1),
|
||||
iconColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(117, 117, 117, 1),
|
||||
),
|
||||
checkboxTheme: CheckboxThemeData(
|
||||
checkColor: MaterialStateProperty.all(Colors.white),
|
||||
fillColor: MaterialStateProperty.all(
|
||||
dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor
|
||||
),
|
||||
),
|
||||
tabBarTheme: TabBarTheme(
|
||||
unselectedLabelColor: Colors.black,
|
||||
labelColor: dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor,
|
||||
indicator: UnderlineTabIndicator(
|
||||
borderSide: BorderSide(
|
||||
color: dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor,
|
||||
width: 2
|
||||
)
|
||||
)
|
||||
),
|
||||
radioTheme: RadioThemeData(
|
||||
fillColor: MaterialStateProperty.all(
|
||||
dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor
|
||||
),
|
||||
),
|
||||
iconTheme: IconThemeData(
|
||||
color: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(117, 117, 117, 1),
|
||||
),
|
||||
androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
|
||||
);
|
||||
|
||||
ThemeData darkTheme(ColorScheme? dynamicColorScheme) => ThemeData(
|
||||
useMaterial3: true,
|
||||
colorScheme: dynamicColorScheme ?? ColorScheme.fromSwatch(primarySwatch: adguardGreenColor).copyWith(
|
||||
brightness: Brightness.dark
|
||||
),
|
||||
primaryColor: dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor,
|
||||
scaffoldBackgroundColor: dynamicColorScheme != null ? dynamicColorScheme.background :const Color.fromRGBO(18, 18, 18, 1),
|
||||
dialogBackgroundColor: dynamicColorScheme != null ? dynamicColorScheme.background : const Color.fromRGBO(44, 44, 44, 1),
|
||||
navigationBarTheme: NavigationBarThemeData(
|
||||
indicatorColor: dynamicColorScheme != null ? dynamicColorScheme.secondaryContainer : adguardGreenColor,
|
||||
iconTheme: MaterialStateProperty.all(
|
||||
IconThemeData(
|
||||
color: dynamicColorScheme != null ? dynamicColorScheme.onSecondaryContainer : adguardGreenColor,
|
||||
)
|
||||
)
|
||||
),
|
||||
colorScheme: dynamicColorScheme,
|
||||
snackBarTheme: SnackBarThemeData(
|
||||
contentTextStyle: const TextStyle(
|
||||
color: Colors.white
|
||||
),
|
||||
behavior: SnackBarBehavior.floating,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(5)
|
||||
),
|
||||
elevation: 4,
|
||||
),
|
||||
floatingActionButtonTheme: FloatingActionButtonThemeData(
|
||||
foregroundColor: dynamicColorScheme != null ? dynamicColorScheme.onPrimaryContainer : Colors.white,
|
||||
backgroundColor: dynamicColorScheme != null ? dynamicColorScheme.primaryContainer : adguardGreenColor
|
||||
),
|
||||
textButtonTheme: TextButtonThemeData(
|
||||
style: ButtonStyle(
|
||||
foregroundColor: MaterialStateProperty.all(
|
||||
dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor
|
||||
),
|
||||
overlayColor: MaterialStateProperty.all(
|
||||
dynamicColorScheme != null ? dynamicColorScheme.primary.withOpacity(0.1) : adguardGreenColor.withOpacity(0.1)
|
||||
),
|
||||
),
|
||||
),
|
||||
brightness: Brightness.dark,
|
||||
dividerColor: Colors.white12,
|
||||
brightness: Brightness.dark,
|
||||
listTileTheme: ListTileThemeData(
|
||||
tileColor: Colors.transparent,
|
||||
textColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(187, 187, 187, 1),
|
||||
iconColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(187, 187, 187, 1),
|
||||
),
|
||||
checkboxTheme: CheckboxThemeData(
|
||||
checkColor: MaterialStateProperty.all(
|
||||
dynamicColorScheme != null ? dynamicColorScheme.onPrimary : Colors.white
|
||||
),
|
||||
fillColor: MaterialStateProperty.all(
|
||||
dynamicColorScheme != null ? dynamicColorScheme.onSurface : adguardGreenColor
|
||||
),
|
||||
),
|
||||
tabBarTheme: TabBarTheme(
|
||||
unselectedLabelColor: Colors.white,
|
||||
labelColor: dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor,
|
||||
indicator: UnderlineTabIndicator(
|
||||
borderSide: BorderSide(
|
||||
color: dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor,
|
||||
width: 2
|
||||
)
|
||||
)
|
||||
),
|
||||
radioTheme: RadioThemeData(
|
||||
fillColor: MaterialStateProperty.all(
|
||||
dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor
|
||||
),
|
||||
),
|
||||
iconTheme: IconThemeData(
|
||||
color: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(187, 187, 187, 1),
|
||||
),
|
||||
androidOverscrollIndicator: AndroidOverscrollIndicator.stretch
|
||||
androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
|
||||
);
|
||||
|
||||
ThemeData lightThemeOldVersions(MaterialColor primaryColor) => ThemeData(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue