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

Removed innecesary stuff, updated packages and changed macOS default size

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-05-04 20:23:29 +02:00
parent 62cf4d0c7f
commit c8d395396a
13 changed files with 38 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -106,7 +106,6 @@ On [this repository](https://github.com/JuanRodenas/Pihole_list) you can find a
- [fl chart](https://pub.dev/packages/fl_chart)
- [flutter web browser](https://pub.dev/packages/flutter_web_browser)
- [flutter svg](https://pub.dev/packages/flutter_svg)
- [bottom sheet](https://pub.dev/packages/bottom_sheet)
- [percent indicator](https://pub.dev/packages/percent_indicator)
- [store checker](https://pub.dev/packages/store_checker)
- [flutter markdown](https://pub.dev/packages/flutter_markdown)

20
lib/base.dart
View file

@ -5,7 +5,6 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:animations/animations.dart';
import 'package:flutter_web_browser/flutter_web_browser.dart';
import 'package:provider/provider.dart';
import 'package:store_checker/store_checker.dart';
import 'package:flutter/services.dart';
@ -17,6 +16,7 @@ import 'package:adguard_home_manager/widgets/navigation_rail.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/models/github_release.dart';
import 'package:adguard_home_manager/functions/open_url.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/models/app_screen.dart';
import 'package:adguard_home_manager/config/app_screens.dart';
@ -80,22 +80,6 @@ class _BaseState extends State<Base> with WidgetsBindingObserver {
return null;
}
void download(String link, String version) async {
FlutterWebBrowser.openWebPage(
url: link,
customTabsOptions: const CustomTabsOptions(
instantAppsEnabled: true,
showTitle: true,
urlBarHidingEnabled: false,
),
safariVCOptions: const SafariViewControllerOptions(
barCollapsingEnabled: true,
dismissButtonStyle: SafariViewControllerDismissButtonStyle.close,
modalPresentationCapturesStatusBarAppearance: true,
)
);
}
@override
void initState() {
WidgetsBinding.instance.addObserver(this);
@ -110,7 +94,7 @@ class _BaseState extends State<Base> with WidgetsBindingObserver {
context: context,
builder: (context) => UpdateModal(
gitHubRelease: result,
onDownload: download,
onDownload: (link, version) => openUrl(link),
),
);
}

1
lib/main.dart
View file

@ -1,7 +1,6 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_displaymode/flutter_displaymode.dart';
import 'package:provider/provider.dart';
import 'package:dynamic_color/dynamic_color.dart';

6
lib/screens/connect/connect.dart
View file

@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:provider/provider.dart';
import 'package:expandable/expandable.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/connect/fab.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/providers/servers_provider.dart';
@ -58,7 +58,9 @@ class _ConnectState extends State<Connect> {
}
return Scaffold(
appBar: const ConnectAppBar(),
appBar: AppBar(
title: Text(AppLocalizations.of(context)!.connect),
),
body: Stack(
children: [
ServersList(

20
lib/screens/home/appbar.dart
View file

@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_web_browser/flutter_web_browser.dart';
import 'package:adguard_home_manager/screens/servers/servers.dart';
import 'package:adguard_home_manager/functions/open_url.dart';
import 'package:adguard_home_manager/models/server.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
@ -27,22 +27,6 @@ class HomeAppBar extends StatelessWidget with PreferredSizeWidget {
}));
}
void openWebAdminPanel() {
FlutterWebBrowser.openWebPage(
url: "${server!.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}",
customTabsOptions: const CustomTabsOptions(
instantAppsEnabled: true,
showTitle: true,
urlBarHidingEnabled: false,
),
safariVCOptions: const SafariViewControllerOptions(
barCollapsingEnabled: true,
dismissButtonStyle: SafariViewControllerDismissButtonStyle.close,
modalPresentationCapturesStatusBarAppearance: true,
)
);
}
return AppBar(
toolbarHeight: 70,
title: Padding(
@ -113,7 +97,7 @@ class HomeAppBar extends StatelessWidget with PreferredSizeWidget {
),
),
if (serversProvider.selectedServer != null && serversProvider.serverStatus.loadStatus == 1) PopupMenuItem(
onTap: openWebAdminPanel,
onTap: () => openUrl("${server!.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}"),
child: Row(
children: [
const Icon(Icons.web_rounded),

2
lib/screens/settings/access_settings/add_client_modal.dart
View file

@ -1,5 +1,3 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

31
lib/screens/settings/appbar.dart
View file

@ -1,31 +0,0 @@
import 'package:flutter/material.dart';
class SettingsAppBar extends StatelessWidget with PreferredSizeWidget {
const SettingsAppBar({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
return AppBar(
toolbarHeight: 80,
title: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
'assets/icon/icon1024-white-center.png',
width: 60,
),
const SizedBox(width: 20),
const Text(
"AdGuard Home Manager",
style: TextStyle(
fontSize: 22
),
)
],
)
);
}
@override
Size get preferredSize => const Size.fromHeight(80);
}

2
macos/Flutter/GeneratedPluginRegistrant.swift
View file

@ -7,7 +7,7 @@ import Foundation
import device_info_plus_macos
import dynamic_color
import package_info_plus_macos
import package_info_plus
import sqflite
import sqlite3_flutter_libs
import url_launcher_macos

12
macos/Podfile.lock
View file

@ -7,7 +7,7 @@ PODS:
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
- package_info_plus_macos (0.0.1):
- package_info_plus (0.0.1):
- FlutterMacOS
- sqflite (0.0.2):
- FlutterMacOS
@ -36,7 +36,7 @@ DEPENDENCIES:
- device_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos`)
- dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`)
- FlutterMacOS (from `Flutter/ephemeral`)
- package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`)
- package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
- sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`)
- sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos`)
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
@ -54,8 +54,8 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos
FlutterMacOS:
:path: Flutter/ephemeral
package_info_plus_macos:
:path: Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos
package_info_plus:
:path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
sqflite:
:path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos
sqlite3_flutter_libs:
@ -67,10 +67,10 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
device_info_plus_macos: 1ad388a1ef433505c4038e7dd9605aadd1e2e9c7
dynamic_color: 394d6a888650f8534e029b27d2f8bc5c64e44008
dynamic_color: 2eaa27267de1ca20d879fbd6e01259773fb1670f
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c
package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea
sqlite3: d31b2b69d59bd1b4ab30e5c92eb18fd8e82fa392
sqlite3_flutter_libs: f20746e4a0245afbee4f20d9afc0072ebff7cc26

3
macos/Runner.xcodeproj/project.pbxproj
View file

@ -431,6 +431,7 @@
);
MARKETING_VERSION = 2.0.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.jgeek00.adguard-home-manager";
PRODUCT_COPYRIGHT = "Copyright © 2023 JGeek00. All rights reserved.";
PRODUCT_NAME = "AdGuard Home Manager";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
@ -563,6 +564,7 @@
);
MARKETING_VERSION = 2.0.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.jgeek00.adguard-home-manager";
PRODUCT_COPYRIGHT = "Copyright © 2023 JGeek00. All rights reserved.";
PRODUCT_NAME = "AdGuard Home Manager";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -589,6 +591,7 @@
);
MARKETING_VERSION = 2.0.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.jgeek00.adguard-home-manager";
PRODUCT_COPYRIGHT = "Copyright © 2023 JGeek00. All rights reserved.";
PRODUCT_NAME = "AdGuard Home Manager";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;

15
macos/Runner/Base.lproj/MainMenu.xib
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -13,7 +13,7 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Runner" customModuleProvider="target">
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="AdGuard_Home_Manager" customModuleProvider="target">
<connections>
<outlet property="applicationMenu" destination="uQy-DD-JDr" id="XBo-yE-nKs"/>
<outlet property="mainFlutterWindow" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/>
@ -330,14 +330,15 @@
</items>
<point key="canvasLocation" x="142" y="-258"/>
</menu>
<window title="APP_NAME" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MainFlutterWindow" customModule="Runner" customModuleProvider="target">
<window title="APP_NAME" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MainFlutterWindow" customModule="AdGuard_Home_Manager" customModuleProvider="target">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<rect key="contentRect" x="335" y="390" width="800" height="600"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1577"/>
<rect key="contentRect" x="335" y="390" width="1200" height="700"/>
<rect key="screenRect" x="0.0" y="0.0" width="1728" height="1079"/>
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
<rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="1200" height="700"/>
<autoresizingMask key="autoresizingMask"/>
</view>
<point key="canvasLocation" x="159.5" y="231"/>
</window>
</objects>
</document>

66
pubspec.lock
View file

@ -41,22 +41,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.1"
bottom_inset_observer:
dependency: transitive
description:
name: bottom_inset_observer
sha256: cbfb01e0e07cc4922052701786d5e607765a6f54e1844f41061abf8744519a7d
url: "https://pub.dev"
source: hosted
version: "3.1.0"
bottom_sheet:
dependency: "direct main"
description:
name: bottom_sheet
sha256: "7a3d4a1515eba91a7d9e1359e49416147de339889170fc879a8b905d27958c94"
url: "https://pub.dev"
source: hosted
version: "3.1.2"
characters:
dependency: transitive
description:
@ -181,10 +165,10 @@ packages:
dependency: "direct main"
description:
name: dynamic_color
sha256: "37a15576f5a0bfd5555b613cf20ea3bd379607cf88d457374a16032f4e942174"
sha256: bbebb1b7ebed819e0ec83d4abdc2a8482d934f6a85289ffc1c6acf7589fa2aad
url: "https://pub.dev"
source: hosted
version: "1.5.4"
version: "1.6.3"
equatable:
dependency: transitive
description:
@ -442,50 +426,18 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637
sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745"
url: "https://pub.dev"
source: hosted
version: "1.4.3+1"
package_info_plus_linux:
dependency: transitive
description:
name: package_info_plus_linux
sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc"
url: "https://pub.dev"
source: hosted
version: "1.0.5"
package_info_plus_macos:
dependency: transitive
description:
name: package_info_plus_macos
sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "3.1.2"
package_info_plus_platform_interface:
dependency: transitive
description:
name: package_info_plus_platform_interface
sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8
sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
url: "https://pub.dev"
source: hosted
version: "1.0.2"
package_info_plus_web:
dependency: transitive
description:
name: package_info_plus_web
sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b
url: "https://pub.dev"
source: hosted
version: "1.0.6"
package_info_plus_windows:
dependency: transitive
description:
name: package_info_plus_windows
sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.0.1"
path:
dependency: transitive
description:
@ -615,10 +567,10 @@ packages:
dependency: "direct main"
description:
name: store_checker
sha256: "0bb9b67fe3c9b0545918ca8621983ab830a1b242eef12ac19b17abac56d452b8"
sha256: "9a08c82715fc72b8ef3520b18be98715e95e623ca6dc9693451606c276062b63"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.2.0"
stream_channel:
dependency: transitive
description:
@ -790,4 +742,4 @@ packages:
version: "3.1.1"
sdks:
dart: ">=2.19.0 <3.0.0"
flutter: ">=3.3.0"
flutter: ">=3.4.0-17.0.pre"

7
pubspec.yaml
View file

@ -38,10 +38,10 @@ dependencies:
cupertino_icons: ^1.0.2
flutter_localizations:
sdk: flutter
intl: ^0.17.0
intl: any
provider: ^6.0.3
sqflite: ^2.2.5
package_info_plus: ^1.4.3+1
package_info_plus: ^3.1.2
flutter_displaymode: ^0.4.0
dynamic_color: ^1.5.4
animations: ^2.0.5
@ -51,9 +51,8 @@ dependencies:
fl_chart: ^0.55.2
flutter_web_browser: ^0.17.1
flutter_svg: ^1.1.5
bottom_sheet: ^3.1.2
percent_indicator: ^4.2.2
store_checker: ^1.1.0
store_checker: ^1.2.0
flutter_markdown: ^0.6.14
markdown: ^7.0.2
html: ^0.15.2