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

Improved modalbottomsheets with low height

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-21 04:03:14 +02:00
parent 88235a8ecc
commit 3552bbced6
3 changed files with 170 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/screens/home/management_modal.dart
View file

@ -130,9 +130,13 @@ class ManagementModal extends StatelessWidget {
), ),
child: Column( child: Column(
children: [ children: [
Column( Expanded(
children: [ child: ListView(
const Padding( physics: 540 < MediaQuery.of(context).size.height
? const NeverScrollableScrollPhysics()
: null,
children: [
const Padding(
padding: EdgeInsets.only(top: 24), padding: EdgeInsets.only(top: 24),
child: Icon( child: Icon(
Icons.shield_rounded, Icons.shield_rounded,
@ -143,6 +147,7 @@ class ManagementModal extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 24), padding: const EdgeInsets.symmetric(vertical: 24),
child: Text( child: Text(
AppLocalizations.of(context)!.manageServer, AppLocalizations.of(context)!.manageServer,
textAlign: TextAlign.center,
style: const TextStyle( style: const TextStyle(
fontSize: 22 fontSize: 22
), ),
@ -178,7 +183,8 @@ class ManagementModal extends StatelessWidget {
(value) => updateBlocking(value, 'safeSearch'), (value) => updateBlocking(value, 'safeSearch'),
serversProvider.protectionsManagementProcess.contains('safeSearch') serversProvider.protectionsManagementProcess.contains('safeSearch')
), ),
], ],
),
), ),
Padding( Padding(
padding: const EdgeInsets.all(24), padding: const EdgeInsets.all(24),

275
lib/screens/logs/logs_config_modal.dart
View file

@ -120,150 +120,153 @@ class _LogsConfigModalWidgetState extends State<LogsConfigModalWidget> {
case 1: case 1:
return Column( return Column(
children: [ children: [
const Padding( Expanded(
padding: EdgeInsets.only(top: 28), child: ListView(
child: Icon( physics: 450 < MediaQuery.of(context).size.height
Icons.settings, ? const NeverScrollableScrollPhysics()
size: 26, : null,
), children: [
), const Padding(
const SizedBox(height: 20), padding: EdgeInsets.only(top: 28),
Text( child: Icon(
AppLocalizations.of(context)!.logsSettings, Icons.settings,
style: const TextStyle( size: 26,
fontSize: 24
),
),
const SizedBox(height: 30),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 12),
child: Material(
color: Theme.of(context).primaryColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(28),
child: InkWell(
onTap: () => setState(() => generalSwitch = !generalSwitch),
borderRadius: BorderRadius.circular(28),
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 8
), ),
child: Row( ),
mainAxisAlignment: MainAxisAlignment.spaceBetween, const SizedBox(height: 20),
children: [ Text(
Text( AppLocalizations.of(context)!.logsSettings,
AppLocalizations.of(context)!.enableLog, textAlign: TextAlign.center,
style: const TextStyle( style: const TextStyle(
fontSize: 18, fontSize: 24
),
),
const SizedBox(height: 30),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 12),
child: Material(
color: Theme.of(context).primaryColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(28),
child: InkWell(
onTap: () => setState(() => generalSwitch = !generalSwitch),
borderRadius: BorderRadius.circular(28),
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 8
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
AppLocalizations.of(context)!.enableLog,
style: const TextStyle(
fontSize: 18,
),
),
Switch(
value: generalSwitch,
onChanged: (value) => setState(() => generalSwitch = value),
activeColor: Theme.of(context).primaryColor,
)
],
), ),
), ),
Switch( ),
value: generalSwitch,
onChanged: (value) => setState(() => generalSwitch = value),
activeColor: Theme.of(context).primaryColor,
)
],
), ),
), ),
), const SizedBox(height: 20),
), Material(
), color: Colors.transparent,
const SizedBox(height: 20), child: InkWell(
Material( onTap: () => setState(() => anonymizeClientIp = !anonymizeClientIp),
color: Colors.transparent, child: Padding(
child: InkWell( padding: const EdgeInsets.symmetric(horizontal: 30),
onTap: () => setState(() => anonymizeClientIp = !anonymizeClientIp), child: Row(
child: Padding( mainAxisAlignment: MainAxisAlignment.spaceBetween,
padding: const EdgeInsets.symmetric(horizontal: 30), children: [
child: Row( Text(
mainAxisAlignment: MainAxisAlignment.spaceBetween, AppLocalizations.of(context)!.anonymizeClientIp,
children: [ style: const TextStyle(
Text( fontSize: 16
AppLocalizations.of(context)!.anonymizeClientIp, ),
style: const TextStyle( ),
fontSize: 16 Switch(
value: anonymizeClientIp,
onChanged: (value) => setState(() => anonymizeClientIp = value),
activeColor: Theme.of(context).primaryColor,
)
],
), ),
), ),
Switch(
value: anonymizeClientIp,
onChanged: (value) => setState(() => anonymizeClientIp = value),
activeColor: Theme.of(context).primaryColor,
)
],
),
),
),
),
const SizedBox(height: 20),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 28),
child: DropdownButtonFormField(
items: retentionItems.map<DropdownMenuItem<String>>((Map<String, dynamic> item) {
return DropdownMenuItem<String>(
value: item['value'].toString(),
child: Text(item['label']),
);
}).toList(),
value: retentionTime,
onChanged: (value) => setState(() => retentionTime = value),
decoration: InputDecoration(
border: const OutlineInputBorder(
borderRadius: BorderRadius.all(
Radius.circular(10)
)
),
label: Text(AppLocalizations.of(context)!.retentionTime)
),
borderRadius: BorderRadius.circular(20),
),
),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Padding(
padding: const EdgeInsets.all(20),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
TextButton(
onPressed: () {
Navigator.pop(context);
widget.onClear();
},
child: Text(AppLocalizations.of(context)!.clearLogs)
),
Row(
children: [
TextButton(
onPressed: () => Navigator.pop(context),
child: Text(AppLocalizations.of(context)!.cancel)
),
const SizedBox(width: 20),
TextButton(
onPressed: retentionTime != ''
? () {
Navigator.pop(context);
widget.onConfirm({
"enabled": generalSwitch,
"interval": double.parse(retentionTime!),
"anonymize_client_ip": anonymizeClientIp
});
}
: null,
child: Text(
AppLocalizations.of(context)!.confirm,
style: TextStyle(
color: retentionTime != ''
? Theme.of(context).primaryColor
: Colors.grey
),
)
),
],
)
],
), ),
),
const SizedBox(height: 20),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 28),
child: DropdownButtonFormField(
items: retentionItems.map<DropdownMenuItem<String>>((Map<String, dynamic> item) {
return DropdownMenuItem<String>(
value: item['value'].toString(),
child: Text(item['label']),
);
}).toList(),
value: retentionTime,
onChanged: (value) => setState(() => retentionTime = value),
decoration: InputDecoration(
border: const OutlineInputBorder(
borderRadius: BorderRadius.all(
Radius.circular(10)
)
),
label: Text(AppLocalizations.of(context)!.retentionTime)
),
borderRadius: BorderRadius.circular(20),
),
),
],
),
),
Padding(
padding: const EdgeInsets.all(20),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
TextButton(
onPressed: () {
Navigator.pop(context);
widget.onClear();
},
child: Text(AppLocalizations.of(context)!.clearLogs)
),
Row(
children: [
TextButton(
onPressed: () => Navigator.pop(context),
child: Text(AppLocalizations.of(context)!.cancel)
),
const SizedBox(width: 20),
TextButton(
onPressed: retentionTime != ''
? () {
Navigator.pop(context);
widget.onConfirm({
"enabled": generalSwitch,
"interval": double.parse(retentionTime!),
"anonymize_client_ip": anonymizeClientIp
});
}
: null,
child: Text(
AppLocalizations.of(context)!.confirm,
style: TextStyle(
color: retentionTime != ''
? Theme.of(context).primaryColor
: Colors.grey
),
)
),
],
) )
], ],
), ),

39
lib/screens/logs/logs_filters_modal.dart
View file

@ -180,27 +180,30 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
), ),
child: Column( child: Column(
children: [ children: [
const Padding(
padding: EdgeInsets.only(
top: 24,
bottom: 20,
),
child: Icon(
Icons.filter_list_rounded,
size: 26,
),
),
Text(
AppLocalizations.of(context)!.filters,
style: const TextStyle(
fontSize: 24
),
),
const SizedBox(height: 20),
Expanded( Expanded(
child: ListView( child: ListView(
physics: const NeverScrollableScrollPhysics(), physics: 380 < MediaQuery.of(context).size.height
? const NeverScrollableScrollPhysics()
: null,
children: [ children: [
const Padding(
padding: EdgeInsets.only(
top: 24,
bottom: 20,
),
child: Icon(
Icons.filter_list_rounded,
size: 26,
),
),
Text(
AppLocalizations.of(context)!.filters,
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 24
),
),
const SizedBox(height: 20),
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20), padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
child: Row( child: Row(