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

More changes

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-21 11:37:16 +02:00
parent 6f9b16e94f
commit 26d89730ef
8 changed files with 44 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/screens/clients/client_modal.dart
View file

@ -307,9 +307,8 @@ class _ClientModalState extends State<ClientModal> {
), ),
child: Row( child: Row(
children: [ children: [
Icon( const Icon(
Icons.label_rounded, Icons.label_rounded,
color: Theme.of(context).listTileTheme.iconColor,
), ),
const SizedBox(width: 20), const SizedBox(width: 20),
Column( Column(
@ -530,7 +529,7 @@ class _ClientModalState extends State<ClientModal> {
Icon( Icon(
Icons.public, Icons.public,
color: useGlobalSettingsServices == false color: useGlobalSettingsServices == false
? Theme.of(context).listTileTheme.iconColor ? null
: Colors.grey, : Colors.grey,
), ),
const SizedBox(width: 20), const SizedBox(width: 20),

8
lib/screens/filters/check_host_modal.dart
View file

@ -161,8 +161,7 @@ class _CheckHostModalState extends State<CheckHostModal> {
), ),
), ),
), ),
if (resultWidget != null) Expanded( if (resultWidget != null) Padding(
child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
top: 20, top: 20,
left: 20, left: 20,
@ -170,9 +169,7 @@ class _CheckHostModalState extends State<CheckHostModal> {
), ),
child: resultWidget, child: resultWidget,
), ),
), if (resultWidget == null) Padding(
if (resultWidget == null) Expanded(
child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
top: 20, top: 20,
left: 20, left: 20,
@ -186,7 +183,6 @@ class _CheckHostModalState extends State<CheckHostModal> {
), ),
), ),
), ),
)
), ),
], ],
), ),

13
lib/screens/filters/filter_list_tile.dart
View file

@ -19,17 +19,16 @@ class FilterListTile extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10), padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 15),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Icon( Icon(
icon, icon,
size: 26,
color: Theme.of(context).listTileTheme.iconColor,
), ),
const SizedBox(width: 20), const SizedBox(width: 20),
Column( Flexible(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
@ -40,9 +39,7 @@ class FilterListTile extends StatelessWidget {
), ),
), ),
const SizedBox(height: 5), const SizedBox(height: 5),
SizedBox( Text(
width: MediaQuery.of(context).size.width-86,
child: Text(
subtitle, subtitle,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
@ -50,8 +47,8 @@ class FilterListTile extends StatelessWidget {
fontWeight: bold == true ? FontWeight.bold : null fontWeight: bold == true ? FontWeight.bold : null
), ),
), ),
),
], ],
),
) )
], ],
), ),

2
lib/screens/filters/filters_list.dart
View file

@ -218,7 +218,7 @@ class _FiltersListState extends State<FiltersList> {
: 0.95; : 0.95;
ScaffoldMessenger.of(context).clearSnackBars(); ScaffoldMessenger.of(context).clearSnackBars();
print(height);
showFlexibleBottomSheet( showFlexibleBottomSheet(
minHeight: 0.6, minHeight: 0.6,
initHeight: 0.6, initHeight: 0.6,

1
lib/screens/logs/filter_status_modal.dart
View file

@ -57,7 +57,6 @@ class _FilterStatusModalState extends State<FilterStatusModal> {
Icon( Icon(
icon, icon,
size: 24, size: 24,
color: Theme.of(context).listTileTheme.iconColor,
), ),
const SizedBox(width: 20), const SizedBox(width: 20),
Text( Text(

1
lib/screens/logs/log_list_tile.dart
View file

@ -30,7 +30,6 @@ class LogListTile extends StatelessWidget {
Icon( Icon(
icon, icon,
size: 24, size: 24,
color: Theme.of(context).listTileTheme.iconColor,
), ),
const SizedBox(width: 20), const SizedBox(width: 20),
Column( Column(

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

@ -1,5 +1,6 @@
// ignore_for_file: use_build_context_synchronously // ignore_for_file: use_build_context_synchronously
import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@ -170,7 +171,7 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
return Padding( return Padding(
padding: MediaQuery.of(context).viewInsets, padding: MediaQuery.of(context).viewInsets,
child: Container( child: Container(
height: 380, height: 400,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).dialogBackgroundColor, color: Theme.of(context).dialogBackgroundColor,
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
@ -182,7 +183,7 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
children: [ children: [
Expanded( Expanded(
child: ListView( child: ListView(
physics: 380 < MediaQuery.of(context).size.height physics: 400 < MediaQuery.of(context).size.height
? const NeverScrollableScrollPhysics() ? const NeverScrollableScrollPhysics()
: null, : null,
children: [ children: [
@ -278,44 +279,11 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
// ), // ),
// ), // ),
// ), // ),
Material( CustomListTile(
color: Colors.transparent, title: AppLocalizations.of(context)!.responseStatus,
child: InkWell( subtitle: "${translatedString[logsProvider.selectedResultStatus]}",
onTap: openSelectFilterStatus, onTap: openSelectFilterStatus,
child: Padding( icon: Icons.shield_rounded,
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
child: Row(
children: [
Icon(
Icons.shield_rounded,
size: 24,
color: Theme.of(context).listTileTheme.iconColor,
),
const SizedBox(width: 20),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
AppLocalizations.of(context)!.responseStatus,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500
),
),
const SizedBox(height: 5),
Text(
"${translatedString[logsProvider.selectedResultStatus]}",
style: TextStyle(
fontSize: 14,
color: Theme.of(context).listTileTheme.iconColor,
),
)
],
)
],
),
),
),
), ),
], ],
), ),

1
lib/widgets/custom_list_tile.dart
View file

@ -35,7 +35,6 @@ class CustomListTile extends StatelessWidget {
if (icon != null) ...[ if (icon != null) ...[
Icon( Icon(
icon, icon,
color: Theme.of(context).listTileTheme.iconColor,
), ),
const SizedBox(width: 20), const SizedBox(width: 20),
], ],