mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-05-14 05:52:51 +00:00
More UI changes
This commit is contained in:
parent
d8897f1d74
commit
22346362a6
56 changed files with 217 additions and 139 deletions
|
@ -117,9 +117,7 @@ class _AccessSettingsWidgetState extends State<AccessSettingsWidget> with Ticker
|
|||
color: Theme.of(context).scaffoldBackgroundColor,
|
||||
border: Border(
|
||||
top: BorderSide(
|
||||
color: Theme.of(context).brightness == Brightness.light
|
||||
? const Color.fromRGBO(220, 220, 220, 1)
|
||||
: const Color.fromRGBO(50, 50, 50, 1)
|
||||
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.1)
|
||||
)
|
||||
)
|
||||
),
|
||||
|
|
|
@ -86,7 +86,7 @@ class _AddClientModalState extends State<AddClientModal> {
|
|||
Icon(
|
||||
icon(),
|
||||
size: 24,
|
||||
color: Theme.of(context).colorScheme.secondary,
|
||||
color: Theme.of(context).listTileTheme.iconColor
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
|
|
|
@ -246,7 +246,7 @@ class _ClientsListState extends State<ClientsList> {
|
|||
children: [
|
||||
Icon(
|
||||
Icons.info_rounded,
|
||||
color: Theme.of(context).colorScheme.secondary,
|
||||
color: Theme.of(context).listTileTheme.iconColor,
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
Flexible(
|
||||
|
@ -267,7 +267,13 @@ class _ClientsListState extends State<ClientsList> {
|
|||
padding: const EdgeInsets.only(top: 0),
|
||||
itemCount: widget.data.length,
|
||||
itemBuilder: (context, index) => ListTile(
|
||||
title: Text(widget.data[index]),
|
||||
title: Text(
|
||||
widget.data[index],
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.normal,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
trailing: IconButton(
|
||||
onPressed: () => {
|
||||
showDialog(
|
||||
|
@ -315,7 +321,7 @@ class _ClientsListState extends State<ClientsList> {
|
|||
: -70,
|
||||
right: 20,
|
||||
child: FloatingActionButton(
|
||||
backgroundColor: Theme.of(context).colorScheme.primaryContainer,
|
||||
backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
|
||||
onPressed: () {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
|
@ -329,7 +335,7 @@ class _ClientsListState extends State<ClientsList> {
|
|||
},
|
||||
child: Icon(
|
||||
Icons.add,
|
||||
color: Theme.of(context).colorScheme.onPrimaryContainer
|
||||
color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
|
||||
),
|
||||
),
|
||||
)
|
||||
|
|
|
@ -68,7 +68,7 @@ class _AddStaticLeaseModalState extends State<AddStaticLeaseModal> {
|
|||
return Padding(
|
||||
padding: MediaQuery.of(context).viewInsets,
|
||||
child: Container(
|
||||
height: 550,
|
||||
height: 510,
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).dialogBackgroundColor,
|
||||
borderRadius: const BorderRadius.only(
|
||||
|
@ -84,22 +84,24 @@ class _AddStaticLeaseModalState extends State<AddStaticLeaseModal> {
|
|||
? const NeverScrollableScrollPhysics()
|
||||
: null,
|
||||
children: [
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(top: 28),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 24),
|
||||
child: Icon(
|
||||
Icons.add,
|
||||
size: 26,
|
||||
size: 24,
|
||||
color: Theme.of(context).listTileTheme.iconColor
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
AppLocalizations.of(context)!.addStaticLease,
|
||||
textAlign: TextAlign.center,
|
||||
style: const TextStyle(
|
||||
fontSize: 24
|
||||
style: TextStyle(
|
||||
fontSize: 24,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 30),
|
||||
const SizedBox(height: 16),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 28),
|
||||
child: TextFormField(
|
||||
|
|
|
@ -14,18 +14,27 @@ class DeleteStaticLeaseModal extends StatelessWidget {
|
|||
return AlertDialog(
|
||||
title: Column(
|
||||
children: [
|
||||
const Icon(
|
||||
Icon(
|
||||
Icons.delete_rounded,
|
||||
size: 26,
|
||||
size: 24,
|
||||
color: Theme.of(context).listTileTheme.iconColor
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
AppLocalizations.of(context)!.deleteStaticLease,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
content: Text(AppLocalizations.of(context)!.deleteStaticLeaseDescription),
|
||||
content: Text(
|
||||
AppLocalizations.of(context)!.deleteStaticLeaseDescription,
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant
|
||||
),
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
|
|
|
@ -409,7 +409,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
|
|||
selectedInterface!.name,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
color: Theme.of(context).listTileTheme.textColor
|
||||
),
|
||||
)
|
||||
]
|
||||
|
|
|
@ -184,9 +184,10 @@ class DhcpLeases extends StatelessWidget {
|
|||
floatingActionButton: staticLeases == true
|
||||
? FloatingActionButton(
|
||||
onPressed: openAddStaticLease,
|
||||
backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
|
||||
child: Icon(
|
||||
Icons.add,
|
||||
color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white,
|
||||
color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
|
||||
),
|
||||
)
|
||||
: null,
|
||||
|
|
|
@ -36,7 +36,7 @@ class SelectInterfaceModal extends StatelessWidget {
|
|||
child: Icon(
|
||||
Icons.settings_ethernet_rounded,
|
||||
size: 24,
|
||||
color: Theme.of(context).colorScheme.secondary,
|
||||
color: Theme.of(context).listTileTheme.iconColor
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
|
|
@ -142,7 +142,7 @@ class _BootstrapDnsScreenState extends State<BootstrapDnsScreen> {
|
|||
children: [
|
||||
Icon(
|
||||
Icons.info_rounded,
|
||||
color: Theme.of(context).colorScheme.secondary
|
||||
color: Theme.of(context).listTileTheme.iconColor,
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
Flexible(
|
||||
|
|
|
@ -175,7 +175,7 @@ class _PrivateReverseDnsServersScreenState extends State<PrivateReverseDnsServer
|
|||
children: [
|
||||
Icon(
|
||||
Icons.info_rounded,
|
||||
color: Theme.of(context).colorScheme.secondary
|
||||
color: Theme.of(context).listTileTheme.iconColor,
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
Flexible(
|
||||
|
|
|
@ -72,7 +72,7 @@ class _AddDnsRewriteModalState extends State<AddDnsRewriteModal> {
|
|||
child: Icon(
|
||||
Icons.add,
|
||||
size: 24,
|
||||
color: Theme.of(context).colorScheme.secondary,
|
||||
color: Theme.of(context).listTileTheme.iconColor
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
|
|
@ -286,6 +286,7 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
|
|||
),
|
||||
body: generateBody(),
|
||||
floatingActionButton: FloatingActionButton(
|
||||
backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
|
||||
onPressed: () => {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
|
@ -298,7 +299,7 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
|
|||
},
|
||||
child: Icon(
|
||||
Icons.add,
|
||||
color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white,
|
||||
color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
|
|
@ -376,7 +376,7 @@ class _EncryptionSettingsWidgetState extends State<EncryptionSettingsWidget> {
|
|||
children: [
|
||||
Icon(
|
||||
Icons.info_rounded,
|
||||
color: Theme.of(context).colorScheme.secondary,
|
||||
color: Theme.of(context).listTileTheme.iconColor,
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
Flexible(
|
||||
|
|
|
@ -49,7 +49,7 @@ class EncryptionMasterSwitch extends StatelessWidget {
|
|||
AppLocalizations.of(context)!.enableEncryptionTypes,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant
|
||||
color: Theme.of(context).listTileTheme.textColor
|
||||
),
|
||||
)
|
||||
],
|
||||
|
|
|
@ -16,7 +16,7 @@ class DnsAddressesModal extends StatelessWidget {
|
|||
children: [
|
||||
Icon(
|
||||
Icons.route_rounded,
|
||||
color: Theme.of(context).colorScheme.secondary,
|
||||
color: Theme.of(context).listTileTheme.iconColor
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
|
@ -37,7 +37,7 @@ class DnsAddressesModal extends StatelessWidget {
|
|||
address,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.normal,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant
|
||||
color: Theme.of(context).listTileTheme.textColor
|
||||
),
|
||||
),
|
||||
)).toList(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue