Add silent start for desktop
This commit is contained in:
36
lib/features/common/common_controllers.dart
Normal file
36
lib/features/common/common_controllers.dart
Normal file
@@ -0,0 +1,36 @@
|
||||
import 'package:hiddify/features/common/clash/clash_controller.dart';
|
||||
import 'package:hiddify/features/common/connectivity/connectivity_controller.dart';
|
||||
import 'package:hiddify/features/common/window/window_controller.dart';
|
||||
import 'package:hiddify/features/system_tray/controller/system_tray_controller.dart';
|
||||
import 'package:hiddify/utils/platform_utils.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
||||
part 'common_controllers.g.dart';
|
||||
|
||||
// this is a temporary solution to keep providers running even when there are no active listeners
|
||||
// https://github.com/rrousselGit/riverpod/discussions/2730
|
||||
@Riverpod(keepAlive: true)
|
||||
void commonControllers(CommonControllersRef ref) {
|
||||
ref.listen(
|
||||
clashControllerProvider,
|
||||
(previous, next) {},
|
||||
fireImmediately: true,
|
||||
);
|
||||
ref.listen(
|
||||
connectivityControllerProvider,
|
||||
(previous, next) {},
|
||||
fireImmediately: true,
|
||||
);
|
||||
if (PlatformUtils.isDesktop) {
|
||||
ref.listen(
|
||||
windowControllerProvider,
|
||||
(previous, next) {},
|
||||
fireImmediately: true,
|
||||
);
|
||||
ref.listen(
|
||||
systemTrayControllerProvider,
|
||||
(previous, next) {},
|
||||
fireImmediately: true,
|
||||
);
|
||||
}
|
||||
}
|
||||
54
lib/features/common/window/window_controller.dart
Normal file
54
lib/features/common/window/window_controller.dart
Normal file
@@ -0,0 +1,54 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hiddify/core/prefs/prefs.dart';
|
||||
import 'package:hiddify/utils/utils.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:window_manager/window_manager.dart';
|
||||
|
||||
part 'window_controller.g.dart';
|
||||
|
||||
// TODO improve
|
||||
@Riverpod(keepAlive: true)
|
||||
class WindowController extends _$WindowController
|
||||
with WindowListener, AppLogger {
|
||||
@override
|
||||
Future<bool> build() async {
|
||||
await windowManager.ensureInitialized();
|
||||
const windowOptions = WindowOptions(
|
||||
size: Size(868, 768),
|
||||
minimumSize: Size(868, 648),
|
||||
center: true,
|
||||
);
|
||||
await windowManager.setPreventClose(true);
|
||||
await windowManager.waitUntilReadyToShow(
|
||||
windowOptions,
|
||||
() async {
|
||||
if (ref.read(prefsControllerProvider).general.silentStart) {
|
||||
loggy.debug("silent start is enabled, hiding window");
|
||||
await windowManager.hide();
|
||||
}
|
||||
},
|
||||
);
|
||||
windowManager.addListener(this);
|
||||
|
||||
ref.onDispose(() {
|
||||
loggy.debug("disposing");
|
||||
windowManager.removeListener(this);
|
||||
});
|
||||
return windowManager.isVisible();
|
||||
}
|
||||
|
||||
Future<void> show() async {
|
||||
await windowManager.show();
|
||||
state = const AsyncData(true);
|
||||
}
|
||||
|
||||
Future<void> hide() async {
|
||||
await windowManager.close();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> onWindowClose() async {
|
||||
await windowManager.hide();
|
||||
state = const AsyncData(false);
|
||||
}
|
||||
}
|
||||
@@ -3,8 +3,10 @@ import 'package:flutter_localized_locales/flutter_localized_locales.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:hiddify/core/core_providers.dart';
|
||||
import 'package:hiddify/core/locale/locale.dart';
|
||||
import 'package:hiddify/core/prefs/prefs.dart';
|
||||
import 'package:hiddify/core/theme/theme.dart';
|
||||
import 'package:hiddify/features/settings/widgets/theme_mode_switch_button.dart';
|
||||
import 'package:hiddify/utils/platform_utils.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:recase/recase.dart';
|
||||
|
||||
@@ -15,6 +17,9 @@ class AppearanceSettingTiles extends HookConsumerWidget {
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final t = ref.watch(translationsProvider);
|
||||
|
||||
final general =
|
||||
ref.watch(prefsControllerProvider.select((value) => value.general));
|
||||
|
||||
final locale = ref.watch(localeControllerProvider);
|
||||
|
||||
final theme = ref.watch(themeControllerProvider);
|
||||
@@ -89,6 +94,16 @@ class AppearanceSettingTiles extends HookConsumerWidget {
|
||||
themeController.change(trueBlack: value);
|
||||
},
|
||||
),
|
||||
if (PlatformUtils.isDesktop)
|
||||
SwitchListTile(
|
||||
title: Text(t.settings.general.silentStart.titleCase),
|
||||
value: general.silentStart,
|
||||
onChanged: (value) {
|
||||
ref
|
||||
.read(prefsControllerProvider.notifier)
|
||||
.patchGeneralPrefs(silentStart: value);
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -7,48 +7,40 @@ import 'package:hiddify/domain/clash/clash.dart';
|
||||
import 'package:hiddify/domain/connectivity/connectivity.dart';
|
||||
import 'package:hiddify/features/common/clash/clash_mode.dart';
|
||||
import 'package:hiddify/features/common/connectivity/connectivity_controller.dart';
|
||||
import 'package:hiddify/features/common/window/window_controller.dart';
|
||||
import 'package:hiddify/gen/assets.gen.dart';
|
||||
import 'package:hiddify/utils/utils.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:tray_manager/tray_manager.dart';
|
||||
import 'package:window_manager/window_manager.dart';
|
||||
|
||||
part 'system_tray_controller.g.dart';
|
||||
|
||||
// TODO: rewrite
|
||||
@Riverpod(keepAlive: true)
|
||||
class SystemTrayController extends _$SystemTrayController
|
||||
with TrayListener, AppLogger {
|
||||
@override
|
||||
Future<void> build() async {
|
||||
await trayManager.setIcon(Assets.images.logoRound);
|
||||
trayManager.addListener(this);
|
||||
ref.onDispose(() {
|
||||
loggy.debug('disposing');
|
||||
trayManager.removeListener(this);
|
||||
});
|
||||
ref.listen(
|
||||
connectivityControllerProvider,
|
||||
(_, next) async {
|
||||
connection = next;
|
||||
await _updateTray();
|
||||
},
|
||||
fireImmediately: true,
|
||||
);
|
||||
ref.listen(
|
||||
clashModeProvider.select((value) => value.valueOrNull),
|
||||
(_, next) async {
|
||||
mode = next;
|
||||
await _updateTray();
|
||||
},
|
||||
fireImmediately: true,
|
||||
);
|
||||
if (!_initialized) {
|
||||
loggy.debug('initializing');
|
||||
await trayManager.setIcon(Assets.images.logoRound);
|
||||
trayManager.addListener(this);
|
||||
_initialized = true;
|
||||
}
|
||||
|
||||
final connection = ref.watch(connectivityControllerProvider);
|
||||
final mode =
|
||||
ref.watch(clashModeProvider.select((value) => value.valueOrNull));
|
||||
|
||||
loggy.debug('updating system tray');
|
||||
await _updateTray(connection, mode);
|
||||
}
|
||||
|
||||
late ConnectionStatus connection;
|
||||
late TunnelMode? mode;
|
||||
bool _initialized = false;
|
||||
|
||||
Future<void> _updateTray() async {
|
||||
Future<void> _updateTray(
|
||||
ConnectionStatus connection,
|
||||
TunnelMode? mode,
|
||||
) async {
|
||||
final t = ref.watch(translationsProvider);
|
||||
final trayMenu = Menu(
|
||||
items: [
|
||||
@@ -85,7 +77,7 @@ class SystemTrayController extends _$SystemTrayController
|
||||
|
||||
@override
|
||||
Future<void> onTrayIconMouseDown() async {
|
||||
await windowManager.show();
|
||||
await ref.read(windowControllerProvider.notifier).show();
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -95,8 +87,8 @@ class SystemTrayController extends _$SystemTrayController
|
||||
}
|
||||
|
||||
Future<void> handleClickShowApp(MenuItem menuItem) async {
|
||||
if (await windowManager.isVisible()) return;
|
||||
await windowManager.show();
|
||||
if (await ref.read(windowControllerProvider.future)) return;
|
||||
await ref.read(windowControllerProvider.notifier).show();
|
||||
}
|
||||
|
||||
Future<void> handleClickModeItem(
|
||||
@@ -112,6 +104,7 @@ class SystemTrayController extends _$SystemTrayController
|
||||
return ref.read(connectivityControllerProvider.notifier).toggleConnection();
|
||||
}
|
||||
|
||||
// TODO rewrite
|
||||
Future<void> handleClickExitApp(MenuItem menuItem) async {
|
||||
exit(0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user