Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions lib/app_styles.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ final ThemeData _baseThemeData = ThemeData(
errorMaxLines: 2,
border: OutlineInputBorder(),
),
tooltipTheme: const TooltipThemeData(
waitDuration: Duration(milliseconds: 200),
),
);

ThemeData lightTheme() {
Expand All @@ -24,7 +27,6 @@ ThemeData lightTheme() {
secondaryVariant: primaryColorDark,
onSecondary: Colors.white,
),
inputDecorationTheme: _baseThemeData.inputDecorationTheme,
radioTheme: RadioThemeData(
fillColor: _resolveSelectedMaterialState(primaryColor),
),
Expand All @@ -34,6 +36,8 @@ ThemeData lightTheme() {
unselectedIconTheme: const IconThemeData(color: Colors.grey),
unselectedItemColor: Colors.grey,
),
inputDecorationTheme: _baseThemeData.inputDecorationTheme,
tooltipTheme: _baseThemeData.tooltipTheme,
);
}

Expand All @@ -54,7 +58,6 @@ ThemeData darkTheme() {
onPrimary: Colors.white,
onSecondary: Colors.white,
),
inputDecorationTheme: _baseThemeData.inputDecorationTheme,
radioTheme: RadioThemeData(
fillColor: _resolveSelectedMaterialState(primaryColor),
),
Expand All @@ -67,17 +70,15 @@ ThemeData darkTheme() {
unselectedIconTheme: const IconThemeData(color: Colors.grey),
unselectedItemColor: Colors.grey,
),
inputDecorationTheme: _baseThemeData.inputDecorationTheme,
tooltipTheme: _baseThemeData.tooltipTheme,
);
}

MaterialStateProperty<Color?> _resolveSelectedMaterialState(
Color color,
) {
return MaterialStateProperty.resolveWith((states) {
if (states.contains(MaterialState.selected)) {
return color;
}

return null;
if (states.contains(MaterialState.selected)) return color;
});
}