luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-04 20:30:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue theme color defined by system

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-29 14:22:19 +02:00
parent fe7ab0df50
commit 5d7f2c68c6
3 changed files with 74 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

41
lib/screens/settings/customization/theme_mode_button.dart
View file

@ -6,6 +6,7 @@ class ThemeModeButton extends StatelessWidget {
final int selected;
final String label;
final void Function(int) onChanged;
final bool? disabled;
const ThemeModeButton({
Key? key,
@ -14,15 +15,25 @@ class ThemeModeButton extends StatelessWidget {
required this.selected,
required this.label,
required this.onChanged,
this.disabled
}) : super(key: key);
@override
Widget build(BuildContext context) {
final Color greyBackgroundColor = Theme.of(context).brightness == Brightness.light
?const Color.fromRGBO(200, 200, 200, 1)
:const Color.fromRGBO(50, 50, 50, 1);
final Color greyIconColor = Theme.of(context).brightness == Brightness.light
? const Color.fromRGBO(130, 130, 130, 1)
: const Color.fromRGBO(100, 100, 100, 1);
return Material(
color: Colors.transparent,
borderRadius: BorderRadius.circular(16),
child: InkWell(
onTap: () => onChanged(value),
onTap: disabled == null || disabled == false
? () => onChanged(value)
: null,
borderRadius: BorderRadius.circular(16),
child: AnimatedContainer(
padding: const EdgeInsets.all(10),
@ -32,10 +43,16 @@ class ThemeModeButton extends StatelessWidget {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16),
color: value == selected
? Theme.of(context).primaryColor
: Theme.of(context).primaryColor.withOpacity(0.1),
? disabled == null || disabled == false
? Theme.of(context).primaryColor
: greyBackgroundColor
: disabled == null || disabled == false
? Theme.of(context).primaryColor.withOpacity(0.1)
: greyBackgroundColor,
border: Border.all(
color: Theme.of(context).primaryColor
color: disabled == null || disabled == false
? Theme.of(context).primaryColor
: greyBackgroundColor
)
),
child: Column(
@ -44,16 +61,24 @@ class ThemeModeButton extends StatelessWidget {
Icon(
icon,
color: value == selected
? Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white
: null,
? disabled == null || disabled == false
? Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white
: greyIconColor
: disabled == null || disabled == false
? null
: greyIconColor,
size: 30,
),
Text(
label,
style: TextStyle(
color: value == selected
? Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white
: null,
? disabled == null || disabled == false
? Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white
: greyIconColor
: disabled == null || disabled == false
? null
: greyIconColor,
fontSize: 18
),
)