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

Merge branch 'beta'

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-02 18:33:03 +01:00
commit 98f7ec6946
6 changed files with 273 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/main.dart
View file

@ -214,7 +214,7 @@ class _MainState extends State<Main> with WidgetsBindingObserver {
isBeta: appConfigProvider.getAppInfo!.version.contains('beta'),
);
if (result != null && appConfigProvider.doNotRememberVersion != result.tagName && mounted) {
await showDialog(
showDialog(
context: context,
builder: (context) => UpdateModal(
gitHubRelease: result,

1
lib/screens/clients/added_list.dart
View file

@ -188,7 +188,6 @@ class _AddedListState extends State<AddedList> {
: null,
onDelete: openDeleteModal,
splitView: widget.splitView,
serverVersion: statusProvider.serverStatus!.serverVersion,
),
noData: SizedBox(
width: double.maxFinite,

8
lib/screens/clients/client/added_client_tile.dart
View file

@ -5,6 +5,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/functions/compare_versions.dart';
import 'package:adguard_home_manager/functions/copy_clipboard.dart';
import 'package:adguard_home_manager/models/clients.dart';
@ -18,7 +19,6 @@ class AddedClientTile extends StatelessWidget {
final void Function(Client) onDelete;
final Client? selectedClient;
final bool? splitView;
final String serverVersion;
const AddedClientTile({
Key? key,
@ -29,11 +29,11 @@ class AddedClientTile extends StatelessWidget {
required this.onDelete,
this.selectedClient,
required this.splitView,
required this.serverVersion
}) : super(key: key);
@override
Widget build(BuildContext context) {
final statusProvider = Provider.of<StatusProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
if (splitView == true) {
@ -147,7 +147,7 @@ class AddedClientTile extends StatelessWidget {
Icons.search_rounded,
size: 19,
color: serverVersionIsAhead(
currentVersion: serverVersion,
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true
@ -261,7 +261,7 @@ class AddedClientTile extends StatelessWidget {
Icons.search_rounded,
size: 19,
color: serverVersionIsAhead(
currentVersion: serverVersion,
currentVersion: statusProvider.serverStatus!.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true

50
lib/screens/filters/filters_triple_column.dart
View file

@ -75,7 +75,30 @@ class FiltersTripleColumn extends StatelessWidget {
}
}
Widget content() {
return Scaffold(
appBar: AppBar(
surfaceTintColor: isDesktop(width) ? Colors.transparent : null,
title: Text(AppLocalizations.of(context)!.filters),
actions: [
IconButton(
onPressed: () async {
final result = await filteringProvider.fetchFilters();
if (result == false && context.mounted) {
showSnacbkar(
appConfigProvider: appConfigProvider,
label: AppLocalizations.of(context)!.errorLoadFilters,
color: Colors.red
);
}
},
icon: const Icon(Icons.refresh_rounded),
tooltip: AppLocalizations.of(context)!.refresh,
),
...actions
],
),
body: Builder(
builder: (context) {
switch (filteringProvider.loadStatus) {
case LoadStatus.loading:
return Row(
@ -324,31 +347,8 @@ class FiltersTripleColumn extends StatelessWidget {
default:
return const SizedBox();
}
}
return Scaffold(
appBar: AppBar(
surfaceTintColor: isDesktop(width) ? Colors.transparent : null,
title: Text(AppLocalizations.of(context)!.filters),
actions: [
IconButton(
onPressed: () async {
final result = await filteringProvider.fetchFilters();
if (result == false) {
showSnacbkar(
appConfigProvider: appConfigProvider,
label: AppLocalizations.of(context)!.errorLoadFilters,
color: Colors.red
);
}
},
icon: const Icon(Icons.refresh_rounded),
tooltip: AppLocalizations.of(context)!.refresh,
),
...actions
],
),
body: content(),
)
);
}
}

14
lib/screens/logs/configuration/config_widgets.dart
View file

@ -11,8 +11,8 @@ class LogsConfigOptions extends StatelessWidget {
final bool anonymizeClientIp;
final void Function(bool) updateAnonymizeClientIp;
final List<RetentionItem> retentionItems;
final String? retentionTime;
final void Function(String?) updateRetentionTime;
final double? retentionTime;
final void Function(double?) updateRetentionTime;
final void Function() onClear;
final void Function() onConfirm;
@ -130,14 +130,12 @@ class LogsConfigOptions extends StatelessWidget {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: DropdownButtonFormField(
items: retentionItems.map<DropdownMenuItem<String>>((item) {
return DropdownMenuItem<String>(
value: item.value.toString(),
items: retentionItems.map((item) => DropdownMenuItem(
value: item.value,
child: Text(item.label),
);
}).toList(),
)).toList(),
value: retentionTime,
onChanged: (value) => updateRetentionTime(value),
onChanged: (value) => updateRetentionTime(value as double),
decoration: InputDecoration(
border: const OutlineInputBorder(
borderRadius: BorderRadius.all(

12
lib/screens/logs/configuration/logs_config_modal.dart
View file

@ -79,7 +79,7 @@ class LogsConfigModalWidget extends StatefulWidget {
class _LogsConfigModalWidgetState extends State<LogsConfigModalWidget> {
bool generalSwitch = false;
bool anonymizeClientIp = false;
String? retentionTime = "";
double? retentionTime;
List<RetentionItem> retentionItems = [];
@ -101,8 +101,10 @@ class _LogsConfigModalWidgetState extends State<LogsConfigModalWidget> {
setState(() {
generalSwitch = result['data']['enabled'];
anonymizeClientIp = result['data']['anonymize_client_ip'];
retentionTime = result['data']['interval'].toString();
loadStatus = LoadStatus.loading;
retentionTime = result['data']['interval'] != null
? double.parse(result['data']['interval'].toString())
: null;
loadStatus = LoadStatus.loaded;
});
}
else {
@ -191,7 +193,7 @@ class _LogsConfigModalWidgetState extends State<LogsConfigModalWidget> {
onClear: () => widget.onClear(),
onConfirm: () => widget.onConfirm({
"enabled": generalSwitch,
"interval": double.parse(retentionTime!),
"interval": retentionTime,
"anonymize_client_ip": anonymizeClientIp
})
);
@ -235,7 +237,7 @@ class _LogsConfigModalWidgetState extends State<LogsConfigModalWidget> {
onClear: () => widget.onClear(),
onConfirm: () => widget.onConfirm({
"enabled": generalSwitch,
"interval": double.parse(retentionTime!),
"interval": retentionTime,
"anonymize_client_ip": anonymizeClientIp
})
);