mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-06-02 04:42:34 +00:00
Removed base
This commit is contained in:
Juan Gilsanz Polo
parent
a0772032b4
commit
f966ab7fc5
2 changed files with 88 additions and 160 deletions
116
lib/base.dart
116
lib/base.dart
|
|
@ -1,116 +0,0 @@
|
||||||
// ignore_for_file: use_build_context_synchronously, depend_on_referenced_packages
|
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:animations/animations.dart';
|
|
||||||
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
|
||||||
import 'package:provider/provider.dart';
|
|
||||||
import 'package:sentry_flutter/sentry_flutter.dart';
|
|
||||||
import 'package:flutter/services.dart';
|
|
||||||
|
|
||||||
import 'package:adguard_home_manager/widgets/bottom_nav_bar.dart';
|
|
||||||
import 'package:adguard_home_manager/widgets/menu_bar.dart';
|
|
||||||
import 'package:adguard_home_manager/widgets/update_modal.dart';
|
|
||||||
import 'package:adguard_home_manager/widgets/navigation_rail.dart';
|
|
||||||
|
|
||||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
|
||||||
import 'package:adguard_home_manager/functions/check_app_updates.dart';
|
|
||||||
import 'package:adguard_home_manager/functions/open_url.dart';
|
|
||||||
import 'package:adguard_home_manager/models/app_screen.dart';
|
|
||||||
import 'package:adguard_home_manager/config/app_screens.dart';
|
|
||||||
import 'package:adguard_home_manager/providers/servers_provider.dart';
|
|
||||||
|
|
||||||
class Base extends StatefulWidget {
|
|
||||||
const Base({Key? key}) : super(key: key);
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<Base> createState() => _BaseState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _BaseState extends State<Base> with WidgetsBindingObserver {
|
|
||||||
int selectedScreen = 0;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
WidgetsBinding.instance.addObserver(this);
|
|
||||||
|
|
||||||
super.initState();
|
|
||||||
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
|
||||||
final appConfigProvider = Provider.of<AppConfigProvider>(context, listen: false);
|
|
||||||
final result = await checkAppUpdates(
|
|
||||||
currentBuildNumber: appConfigProvider.getAppInfo!.buildNumber,
|
|
||||||
installationSource: appConfigProvider.installationSource,
|
|
||||||
setUpdateAvailable: appConfigProvider.setAppUpdatesAvailable,
|
|
||||||
isBeta: appConfigProvider.getAppInfo!.version.contains('beta'),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (result != null && appConfigProvider.doNotRememberVersion != result.tagName) {
|
|
||||||
await showDialog(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => UpdateModal(
|
|
||||||
gitHubRelease: result,
|
|
||||||
onDownload: (link, version) => openUrl(link),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final serversProvider = Provider.of<ServersProvider>(context);
|
|
||||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
|
||||||
|
|
||||||
final width = MediaQuery.of(context).size.width;
|
|
||||||
|
|
||||||
List<AppScreen> screens = serversProvider.selectedServer != null
|
|
||||||
? screensServerConnected
|
|
||||||
: screensSelectServer;
|
|
||||||
|
|
||||||
if (kDebugMode && dotenv.env['ENABLE_SENTRY'] == "true") {
|
|
||||||
Sentry.captureMessage("Debug mode");
|
|
||||||
}
|
|
||||||
|
|
||||||
return CustomMenuBar(
|
|
||||||
child: AnnotatedRegion<SystemUiOverlayStyle>(
|
|
||||||
value: SystemUiOverlayStyle(
|
|
||||||
statusBarColor: Colors.transparent,
|
|
||||||
statusBarBrightness: Theme.of(context).brightness == Brightness.light
|
|
||||||
? Brightness.light
|
|
||||||
: Brightness.dark,
|
|
||||||
statusBarIconBrightness: Theme.of(context).brightness == Brightness.light
|
|
||||||
? Brightness.dark
|
|
||||||
: Brightness.light,
|
|
||||||
systemNavigationBarColor: Theme.of(context).scaffoldBackgroundColor,
|
|
||||||
systemNavigationBarIconBrightness: Theme.of(context).brightness == Brightness.light
|
|
||||||
? Brightness.dark
|
|
||||||
: Brightness.light,
|
|
||||||
),
|
|
||||||
child: Scaffold(
|
|
||||||
body: Row(
|
|
||||||
children: [
|
|
||||||
if (width > 900) const SideNavigationRail(),
|
|
||||||
Expanded(
|
|
||||||
child: PageTransitionSwitcher(
|
|
||||||
duration: const Duration(milliseconds: 200),
|
|
||||||
transitionBuilder: (
|
|
||||||
(child, primaryAnimation, secondaryAnimation) => FadeThroughTransition(
|
|
||||||
animation: primaryAnimation,
|
|
||||||
secondaryAnimation: secondaryAnimation,
|
|
||||||
child: child,
|
|
||||||
)
|
|
||||||
),
|
|
||||||
child: SizedBox()
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
bottomNavigationBar: width <= 900
|
|
||||||
? const BottomNavBar()
|
|
||||||
: null,
|
|
||||||
)
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
132
lib/main.dart
132
lib/main.dart
|
|
@ -2,9 +2,10 @@ import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter_displaymode/flutter_displaymode.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:flutter_displaymode/flutter_displaymode.dart';
|
||||||
import 'package:dynamic_color/dynamic_color.dart';
|
import 'package:dynamic_color/dynamic_color.dart';
|
||||||
import 'package:device_info_plus/device_info_plus.dart';
|
import 'package:device_info_plus/device_info_plus.dart';
|
||||||
import 'package:package_info_plus/package_info_plus.dart';
|
import 'package:package_info_plus/package_info_plus.dart';
|
||||||
|
|
@ -15,6 +16,10 @@ import 'package:window_size/window_size.dart';
|
||||||
import 'package:flutter_localizations/flutter_localizations.dart';
|
import 'package:flutter_localizations/flutter_localizations.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/widgets/menu_bar.dart';
|
||||||
|
import 'package:adguard_home_manager/functions/check_app_updates.dart';
|
||||||
|
import 'package:adguard_home_manager/functions/open_url.dart';
|
||||||
|
import 'package:adguard_home_manager/widgets/update_modal.dart';
|
||||||
import 'package:adguard_home_manager/routes/router.dart';
|
import 'package:adguard_home_manager/routes/router.dart';
|
||||||
import 'package:adguard_home_manager/providers/logs_provider.dart';
|
import 'package:adguard_home_manager/providers/logs_provider.dart';
|
||||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||||
|
|
@ -175,7 +180,7 @@ class Main extends StatefulWidget {
|
||||||
State<Main> createState() => _MainState();
|
State<Main> createState() => _MainState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _MainState extends State<Main> {
|
class _MainState extends State<Main> with WidgetsBindingObserver {
|
||||||
List<DisplayMode> modes = <DisplayMode>[];
|
List<DisplayMode> modes = <DisplayMode>[];
|
||||||
DisplayMode? active;
|
DisplayMode? active;
|
||||||
DisplayMode? preferred;
|
DisplayMode? preferred;
|
||||||
|
|
@ -195,54 +200,93 @@ class _MainState extends State<Main> {
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
displayMode();
|
displayMode();
|
||||||
|
|
||||||
|
WidgetsBinding.instance.addObserver(this);
|
||||||
|
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
||||||
|
final appConfigProvider = Provider.of<AppConfigProvider>(context, listen: false);
|
||||||
|
final result = await checkAppUpdates(
|
||||||
|
currentBuildNumber: appConfigProvider.getAppInfo!.buildNumber,
|
||||||
|
installationSource: appConfigProvider.installationSource,
|
||||||
|
setUpdateAvailable: appConfigProvider.setAppUpdatesAvailable,
|
||||||
|
isBeta: appConfigProvider.getAppInfo!.version.contains('beta'),
|
||||||
|
);
|
||||||
|
if (result != null && appConfigProvider.doNotRememberVersion != result.tagName && mounted) {
|
||||||
|
await showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => UpdateModal(
|
||||||
|
gitHubRelease: result,
|
||||||
|
onDownload: (link, version) => openUrl(link),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||||
|
|
||||||
return DynamicColorBuilder(
|
return AnnotatedRegion<SystemUiOverlayStyle>(
|
||||||
builder: (lightDynamic, darkDynamic) => MaterialApp.router(
|
value: SystemUiOverlayStyle(
|
||||||
title: 'AdGuard Home Manager',
|
statusBarColor: Colors.transparent,
|
||||||
theme: appConfigProvider.androidDeviceInfo != null && appConfigProvider.androidDeviceInfo!.version.sdkInt >= 31
|
statusBarBrightness: Theme.of(context).brightness == Brightness.light
|
||||||
? appConfigProvider.useDynamicColor == true
|
? Brightness.light
|
||||||
? lightTheme(lightDynamic)
|
: Brightness.dark,
|
||||||
: lightThemeOldVersions(colors[appConfigProvider.staticColor])
|
statusBarIconBrightness: Theme.of(context).brightness == Brightness.light
|
||||||
: lightThemeOldVersions(colors[appConfigProvider.staticColor]),
|
? Brightness.dark
|
||||||
darkTheme: appConfigProvider.androidDeviceInfo != null && appConfigProvider.androidDeviceInfo!.version.sdkInt >= 31
|
: Brightness.light,
|
||||||
? appConfigProvider.useDynamicColor == true
|
systemNavigationBarColor: Theme.of(context).scaffoldBackgroundColor,
|
||||||
? darkTheme(darkDynamic)
|
systemNavigationBarIconBrightness: Theme.of(context).brightness == Brightness.light
|
||||||
: darkThemeOldVersions(colors[appConfigProvider.staticColor])
|
? Brightness.dark
|
||||||
: darkThemeOldVersions(colors[appConfigProvider.staticColor]),
|
: Brightness.light,
|
||||||
themeMode: appConfigProvider.selectedTheme,
|
),
|
||||||
debugShowCheckedModeBanner: false,
|
child: DynamicColorBuilder(
|
||||||
localizationsDelegates: const [
|
builder: (lightDynamic, darkDynamic) => MaterialApp.router(
|
||||||
GlobalMaterialLocalizations.delegate,
|
title: 'AdGuard Home Manager',
|
||||||
GlobalWidgetsLocalizations.delegate,
|
theme: appConfigProvider.androidDeviceInfo != null && appConfigProvider.androidDeviceInfo!.version.sdkInt >= 31
|
||||||
GlobalCupertinoLocalizations.delegate,
|
? appConfigProvider.useDynamicColor == true
|
||||||
AppLocalizations.delegate,
|
? lightTheme(lightDynamic)
|
||||||
],
|
: lightThemeOldVersions(colors[appConfigProvider.staticColor])
|
||||||
supportedLocales: const [
|
: lightThemeOldVersions(colors[appConfigProvider.staticColor]),
|
||||||
Locale('en', ''),
|
darkTheme: appConfigProvider.androidDeviceInfo != null && appConfigProvider.androidDeviceInfo!.version.sdkInt >= 31
|
||||||
Locale('es', ''),
|
? appConfigProvider.useDynamicColor == true
|
||||||
Locale('zh', ''),
|
? darkTheme(darkDynamic)
|
||||||
Locale('zh', 'CN'),
|
: darkThemeOldVersions(colors[appConfigProvider.staticColor])
|
||||||
Locale('pl', ''),
|
: darkThemeOldVersions(colors[appConfigProvider.staticColor]),
|
||||||
Locale('tr', '')
|
themeMode: appConfigProvider.selectedTheme,
|
||||||
],
|
debugShowCheckedModeBanner: false,
|
||||||
scaffoldMessengerKey: scaffoldMessengerKey,
|
localizationsDelegates: const [
|
||||||
builder: (context, child) {
|
GlobalMaterialLocalizations.delegate,
|
||||||
return MediaQuery(
|
GlobalWidgetsLocalizations.delegate,
|
||||||
data: MediaQuery.of(context).copyWith(
|
GlobalCupertinoLocalizations.delegate,
|
||||||
textScaleFactor: !(Platform.isAndroid || Platform.isIOS)
|
AppLocalizations.delegate,
|
||||||
? 0.9
|
],
|
||||||
: 1.0
|
supportedLocales: const [
|
||||||
),
|
Locale('en', ''),
|
||||||
child: child!,
|
Locale('es', ''),
|
||||||
);
|
Locale('zh', ''),
|
||||||
},
|
Locale('zh', 'CN'),
|
||||||
routerConfig: goRouter,
|
Locale('pl', ''),
|
||||||
|
Locale('tr', '')
|
||||||
|
],
|
||||||
|
scaffoldMessengerKey: scaffoldMessengerKey,
|
||||||
|
builder: (context, child) {
|
||||||
|
return CustomMenuBar(
|
||||||
|
child: MediaQuery(
|
||||||
|
data: MediaQuery.of(context).copyWith(
|
||||||
|
textScaleFactor: !(Platform.isAndroid || Platform.isIOS)
|
||||||
|
? 0.9
|
||||||
|
: 1.0
|
||||||
|
),
|
||||||
|
child: child!,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
routerConfig: goRouter,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue