Refactor desktop window management and tray
This commit is contained in:
@@ -1,41 +0,0 @@
|
||||
import 'package:hiddify/core/preferences/general_preferences.dart';
|
||||
import 'package:hiddify/features/common/window/window_controller.dart';
|
||||
import 'package:hiddify/features/connection/notifier/connection_notifier.dart';
|
||||
import 'package:hiddify/features/profile/notifier/profiles_update_notifier.dart';
|
||||
import 'package:hiddify/features/system_tray/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(
|
||||
introCompletedProvider,
|
||||
(_, completed) async {
|
||||
if (completed) {
|
||||
await ref.read(foregroundProfilesUpdateNotifierProvider.future);
|
||||
}
|
||||
},
|
||||
fireImmediately: true,
|
||||
);
|
||||
ref.listen(
|
||||
connectionNotifierProvider,
|
||||
(previous, next) {},
|
||||
fireImmediately: true,
|
||||
);
|
||||
if (PlatformUtils.isDesktop) {
|
||||
ref.listen(
|
||||
windowControllerProvider,
|
||||
(previous, next) {},
|
||||
fireImmediately: true,
|
||||
);
|
||||
ref.listen(
|
||||
systemTrayControllerProvider,
|
||||
(previous, next) {},
|
||||
fireImmediately: true,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,80 +0,0 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hiddify/core/app_info/app_info_provider.dart';
|
||||
import 'package:hiddify/core/model/constants.dart';
|
||||
import 'package:hiddify/core/preferences/general_preferences.dart';
|
||||
import 'package:hiddify/core/preferences/service_preferences.dart';
|
||||
import 'package:hiddify/features/connection/notifier/connection_notifier.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 size = Size(868, 668);
|
||||
const minimumSize = Size(368, 568);
|
||||
const windowOptions = WindowOptions(
|
||||
size: size,
|
||||
minimumSize: minimumSize,
|
||||
center: true,
|
||||
);
|
||||
await windowManager.setPreventClose(true);
|
||||
await windowManager.waitUntilReadyToShow(
|
||||
windowOptions,
|
||||
() async {
|
||||
final version = await ref.watch(appInfoProvider.future);
|
||||
await windowManager
|
||||
.setTitle("${Constants.appName} ${version.presentVersion}");
|
||||
|
||||
if (ref.read(silentStartNotifierProvider)) {
|
||||
loggy.debug("silent start is enabled, hiding window");
|
||||
await windowManager.hide();
|
||||
}
|
||||
await Future.delayed(
|
||||
const Duration(seconds: 3),
|
||||
() async {
|
||||
if (ref.read(startedByUserProvider)) {
|
||||
loggy.debug("previously started by user, trying to connect");
|
||||
return ref.read(connectionNotifierProvider.notifier).mayConnect();
|
||||
}
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
windowManager.addListener(this);
|
||||
|
||||
ref.onDispose(() {
|
||||
loggy.debug("disposing");
|
||||
windowManager.removeListener(this);
|
||||
});
|
||||
return windowManager.isVisible();
|
||||
}
|
||||
|
||||
Future<void> show() async {
|
||||
await windowManager.show();
|
||||
await windowManager.focus();
|
||||
state = const AsyncData(true);
|
||||
}
|
||||
|
||||
Future<void> hide() async {
|
||||
await windowManager.close();
|
||||
}
|
||||
|
||||
Future<void> quit() async {
|
||||
loggy.debug("quitting");
|
||||
await windowManager.close();
|
||||
await windowManager.destroy();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> onWindowClose() async {
|
||||
await windowManager.hide();
|
||||
state = const AsyncData(false);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user