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

Added unsupported version warning and handle alpha versions

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-05-13 18:33:09 +02:00
parent 3e281095cd
commit 3f0997f5d6
11 changed files with 234 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/widgets/add_server_modal.dart
View file

@ -18,11 +18,13 @@ enum ConnectionType { http, https}
class AddServerModal extends StatefulWidget {
final Server? server;
final bool window;
final void Function(String version) onUnsupportedVersion;
const AddServerModal({
Key? key,
this.server,
required this.window
required this.window,
required this.onUnsupportedVersion
}) : super(key: key);
@override
@ -256,16 +258,25 @@ class _AddServerModalState extends State<AddServerModal> {
final serverCreated = await serversProvider.createServer(serverObj);
if (serverCreated == null) {
serversProvider.setServerStatusLoad(0);
final serverStatus = await getServerStatus(serverObj);
if (serverStatus['result'] == 'success') {
serversProvider.setServerStatusData(serverStatus['data']);
serversProvider.setServerStatusLoad(1);
if (serverStatus['data'].serverVersion.contains('a') || serverStatus['data'].serverVersion.contains('b')) {
Navigator.pop(context);
widget.onUnsupportedVersion(serverStatus['data'].serverVersion);
}
else {
Navigator.pop(context);
}
}
else {
appConfigProvider.addLog(serverStatus['log']);
serversProvider.setServerStatusLoad(2);
Navigator.pop(context);
}
Navigator.pop(context);
}
else {
setState(() => isConnecting = false);
@ -364,8 +375,19 @@ class _AddServerModalState extends State<AddServerModal> {
serverObj.authToken = encodeBase64UserPass(serverObj.user!, serverObj.password!);
}
final serverSaved = await serversProvider.editServer(serverObj);
if (serverSaved == null) {
Navigator.pop(context);
final version = await getServerVersion(serverObj);;
if (
version['result'] == 'success' &&
(version['data'].contains('a') || version['data'].contains('b')) // alpha or beta
) {
Navigator.pop(context);
widget.onUnsupportedVersion(version);
}
else {
Navigator.pop(context);
}
}
else {
appConfigProvider.addLog(

15
lib/widgets/servers_list/servers_list_item.dart
View file

@ -5,6 +5,7 @@ import 'package:expandable/expandable.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/version_warning_modal.dart';
import 'package:adguard_home_manager/widgets/add_server_modal.dart';
import 'package:adguard_home_manager/widgets/servers_list/delete_modal.dart';
@ -93,6 +94,13 @@ class _ServersListItemState extends State<ServersListItem> with SingleTickerProv
builder: (context) => AddServerModal(
server: server,
window: true,
onUnsupportedVersion: (version) => showDialog(
context: context,
builder: (ctx) => VersionWarningModal(
version: version
),
barrierDismissible: false
),
),
)
}
@ -102,6 +110,13 @@ class _ServersListItemState extends State<ServersListItem> with SingleTickerProv
builder: (BuildContext context) => AddServerModal(
server: server,
window: false,
onUnsupportedVersion: (version) => showDialog(
context: context,
builder: (ctx) => VersionWarningModal(
version: version
),
barrierDismissible: false
),
)
))
}

15
lib/widgets/servers_list/servers_tile_item.dart
View file

@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/version_warning_modal.dart';
import 'package:adguard_home_manager/widgets/add_server_modal.dart';
import 'package:adguard_home_manager/widgets/servers_list/delete_modal.dart';
@ -60,6 +61,13 @@ class _ServersTileItemState extends State<ServersTileItem> with SingleTickerProv
builder: (context) => AddServerModal(
server: server,
window: true,
onUnsupportedVersion: (version) => showDialog(
context: context,
builder: (ctx) => VersionWarningModal(
version: version
),
barrierDismissible: false
),
),
)
}
@ -69,6 +77,13 @@ class _ServersTileItemState extends State<ServersTileItem> with SingleTickerProv
builder: (BuildContext context) => AddServerModal(
server: server,
window: false,
onUnsupportedVersion: (version) => showDialog(
context: context,
builder: (ctx) => VersionWarningModal(
version: version
),
barrierDismissible: false
),
)
))
}

46
lib/widgets/version_warning_modal.dart Normal file
View file

@ -0,0 +1,46 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class VersionWarningModal extends StatelessWidget {
final String version;
const VersionWarningModal({
Key? key,
required this.version,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return AlertDialog(
scrollable: true,
title: Column(
children: [
Icon(
Icons.warning_rounded,
size: 24,
color: Theme.of(context).listTileTheme.iconColor
),
const SizedBox(height: 16),
Text(
AppLocalizations.of(context)!.unsupportedVersion,
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface
),
)
],
),
content: Text(AppLocalizations.of(context)!.unsupprtedVersionMessage(version)),
actions: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
TextButton(
onPressed: () => Navigator.pop(context),
child: Text(AppLocalizations.of(context)!.iUnderstand)
)
],
)
],
);
}
}