Small fixes

This commit is contained in:
Juan Gilsanz Polo 2022-10-09 01:43:09 +02:00
parent 5fa174ffc5
commit 18ef679639
2 changed files with 33 additions and 27 deletions

View file

@ -2,6 +2,7 @@ import 'package:expandable/expandable.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:adguard_home_manager/screens/connect/appbar.dart';
import 'package:adguard_home_manager/widgets/servers_list/servers_list.dart'; import 'package:adguard_home_manager/widgets/servers_list/servers_list.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart'; import 'package:adguard_home_manager/providers/servers_provider.dart';
@ -28,10 +29,13 @@ class _ConnectState extends State<Connect> {
expandableControllerList.add(ExpandableController()); expandableControllerList.add(ExpandableController());
} }
return ServersList( return Scaffold(
context: context, appBar: const ConnectAppBar(),
controllers: expandableControllerList, body: ServersList(
onChange: expandOrContract context: context,
controllers: expandableControllerList,
onChange: expandOrContract
),
); );
} }
} }

View file

@ -85,31 +85,33 @@ class Settings extends StatelessWidget {
appBar: const SettingsAppBar(), appBar: const SettingsAppBar(),
body: ListView( body: ListView(
children: [ children: [
SectionLabel(label: AppLocalizations.of(context)!.serverSettings), if (serversProvider.selectedServer != null) ...[
CustomListTile( SectionLabel(label: AppLocalizations.of(context)!.serverSettings),
leadingIcon: Icons.lock_rounded, CustomListTile(
label: AppLocalizations.of(context)!.accessSettings, leadingIcon: Icons.lock_rounded,
description: AppLocalizations.of(context)!.accessSettingsDescription, label: AppLocalizations.of(context)!.accessSettings,
onTap: () => { description: AppLocalizations.of(context)!.accessSettingsDescription,
Navigator.of(context).push( onTap: () => {
MaterialPageRoute( Navigator.of(context).push(
builder: (context) => const AccessSettings() MaterialPageRoute(
builder: (context) => const AccessSettings()
)
) )
) },
}, ),
), CustomListTile(
CustomListTile( leadingIcon: Icons.info_rounded,
leadingIcon: Icons.info_rounded, label: AppLocalizations.of(context)!.serverInformation,
label: AppLocalizations.of(context)!.serverInformation, description: AppLocalizations.of(context)!.serverInformationDescription,
description: AppLocalizations.of(context)!.serverInformationDescription, onTap: () => {
onTap: () => { Navigator.of(context).push(
Navigator.of(context).push( MaterialPageRoute(
MaterialPageRoute( builder: (context) => const ServerInformation()
builder: (context) => const ServerInformation() )
) )
) },
}, ),
), ],
SectionLabel(label: AppLocalizations.of(context)!.appSettings), SectionLabel(label: AppLocalizations.of(context)!.appSettings),
CustomListTile( CustomListTile(
leadingIcon: Icons.light_mode_rounded, leadingIcon: Icons.light_mode_rounded,