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

More UI changes

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-11-05 02:35:35 +01:00
parent d8897f1d74
commit 22346362a6
56 changed files with 217 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/widgets/add_server_modal.dart
View file

@ -252,7 +252,11 @@ class _AddServerModalState extends State<AddServerModal> {
0: Text(
'HTTP',
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface,
color: appConfigProvider.useDynamicColor == true
? Theme.of(context).floatingActionButtonTheme.foregroundColor!
: connectionType == 'http'
? Colors.white
: Theme.of(context).primaryColor,
fontSize: 14,
fontWeight: FontWeight.w500
),
@ -260,7 +264,11 @@ class _AddServerModalState extends State<AddServerModal> {
1: Text(
'HTTPS',
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface,
color: appConfigProvider.useDynamicColor == true
? Theme.of(context).floatingActionButtonTheme.foregroundColor!
: connectionType == 'https'
? Colors.white
: Theme.of(context).primaryColor,
fontSize: 14,
fontWeight: FontWeight.w500
),
@ -475,13 +483,11 @@ class _AddServerModalState extends State<AddServerModal> {
);
}
}
print(connectionType);
return Stack(
children: [
Scaffold(
backgroundColor: Theme.of(context).dialogBackgroundColor,
appBar: AppBar(
systemOverlayStyle: systemUiOverlayStyleConfig(context),
appBar: AppBar(
title: Text(AppLocalizations.of(context)!.createConnection),
actions: [
Padding(
@ -560,7 +566,7 @@ print(connectionType);
connectionType = 'https';
}
}),
selectedColor: Theme.of(context).colorScheme.secondaryContainer,
selectedColor: Theme.of(context).floatingActionButtonTheme.backgroundColor!,
unselectedColor: Colors.transparent,
borderColor: Theme.of(context).colorScheme.onSurface,
),

4
lib/widgets/custom_list_tile.dart
View file

@ -39,7 +39,7 @@ class CustomListTile extends StatelessWidget {
Icon(
icon,
size: 24,
color: Theme.of(context).colorScheme.onSurfaceVariant,
color: Theme.of(context).listTileTheme.iconColor,
),
const SizedBox(width: 16),
],
@ -61,7 +61,7 @@ class CustomListTile extends StatelessWidget {
if (subtitle != null && subtitleWidget == null) Text(
subtitle!,
style: TextStyle(
color: Theme.of(context).colorScheme.onSurfaceVariant,
color: Theme.of(context).listTileTheme.textColor,
fontSize: 14,
fontWeight: FontWeight.w400
),

2
lib/widgets/custom_radio_list_tile.dart
View file

@ -59,7 +59,7 @@ class CustomRadioListTile extends StatelessWidget {
child: Text(
subtitle!,
style: TextStyle(
color: Theme.of(context).colorScheme.onSurfaceVariant,
color: Theme.of(context).listTileTheme.textColor,
fontSize: 14
),
),

4
lib/widgets/custom_switch_list_tile.dart
View file

@ -55,8 +55,8 @@ class CustomSwitchListTile extends StatelessWidget {
style: TextStyle(
fontSize: 14,
color: disabled != null && disabled == true
? Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.38)
: Theme.of(context).colorScheme.onSurfaceVariant
? Theme.of(context).listTileTheme.textColor!.withOpacity(0.38)
: Theme.of(context).listTileTheme.textColor
),
),
),

2
lib/widgets/servers_list/delete_modal.dart
View file

@ -49,7 +49,7 @@ class DeleteModal extends StatelessWidget {
Icon(
Icons.delete,
size: 24,
color: Theme.of(context).colorScheme.secondary
color: Theme.of(context).listTileTheme.iconColor
),
Padding(
padding: const EdgeInsets.only(top: 16),

4
lib/widgets/servers_list/servers_list.dart
View file

@ -187,12 +187,12 @@ class _ServersListState extends State<ServersList> with SingleTickerProviderStat
Container(
padding: const EdgeInsets.all(1),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.primaryContainer,
color: Theme.of(context).floatingActionButtonTheme.backgroundColor,
borderRadius: BorderRadius.circular(20)
),
child: Icon(
Icons.star,
color: Theme.of(context).colorScheme.onPrimaryContainer,
color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
size: 10,
),
),

2
lib/widgets/update_modal.dart
View file

@ -37,7 +37,7 @@ class _UpdateModalState extends State<UpdateModal> {
Icon(
Icons.system_update_rounded,
size: 24,
color: Theme.of(context).colorScheme.secondary,
color: Theme.of(context).listTileTheme.iconColor,
),
const SizedBox(height: 16),
Text(