vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

Remove unnecessary prefs

Browse Source
This commit is contained in:
problematicconsumer
2023-08-26 16:18:38 +03:30
parent 4acee038df
commit d429735a45
13 changed files with 13 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/bootstrap.dart
View File

@@ -51,8 +51,7 @@ Future<void> lazyBootstrap(WidgetsBinding widgetsBinding) async {
await container.read(runtimeDetailsServiceProvider).init();
_loggy.info("basic setup took [${_stopWatch.elapsedMilliseconds}]ms");
final silentStart =
container.read(prefsControllerProvider).general.silentStart;
final silentStart = container.read(silentStartProvider);
if (silentStart) {
FlutterNativeSplash.remove();
}

18
lib/core/prefs/general_prefs.dart
View File

@@ -1,17 +1,3 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:hiddify/utils/pref_notifier.dart';
part 'general_prefs.freezed.dart';
part 'general_prefs.g.dart';
@freezed
class GeneralPrefs with _$GeneralPrefs {
const GeneralPrefs._();
const factory GeneralPrefs({
// desktop only
@Default(false) bool silentStart,
}) = _GeneralPrefs;
factory GeneralPrefs.fromJson(Map<String, dynamic> json) =>
_$GeneralPrefsFromJson(json);
}
final silentStartProvider = PrefNotifier.provider("silent_start", false);

4
lib/core/prefs/prefs.dart
View File

@@ -1,2 +1,2 @@
export 'prefs_controller.dart';
export 'prefs_state.dart';
export 'general_prefs.dart';
export 'misc_prefs.dart';

75
lib/core/prefs/prefs_controller.dart
View File

@@ -1,75 +0,0 @@
import 'dart:convert';
import 'package:hiddify/core/prefs/general_prefs.dart';
import 'package:hiddify/core/prefs/prefs_state.dart';
import 'package:hiddify/data/data_providers.dart';
import 'package:hiddify/domain/clash/clash.dart';
import 'package:hiddify/domain/connectivity/connectivity.dart';
import 'package:hiddify/utils/utils.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:shared_preferences/shared_preferences.dart';
part 'prefs_controller.g.dart';
@Riverpod(keepAlive: true)
class PrefsController extends _$PrefsController with AppLogger {
@override
PrefsState build() {
return PrefsState(
general: _getGeneralPrefs(),
clash: _getClashPrefs(),
network: _getNetworkPrefs(),
);
}
SharedPreferences get _prefs => ref.read(sharedPreferencesProvider);
static const _generalKey = "general_prefs";
static const _overridesKey = "clash_overrides";
static const _networkKey = "network_prefs";
GeneralPrefs _getGeneralPrefs() {
final persisted = _prefs.getString(_generalKey);
if (persisted == null) return const GeneralPrefs();
return GeneralPrefs.fromJson(jsonDecode(persisted) as Map<String, dynamic>);
}
ClashConfig _getClashPrefs() {
final persisted = _prefs.getString(_overridesKey);
if (persisted == null) return const ClashConfig();
return ClashConfig.fromJson(jsonDecode(persisted) as Map<String, dynamic>);
}
NetworkPrefs _getNetworkPrefs() {
final persisted = _prefs.getString(_networkKey);
if (persisted == null) return const NetworkPrefs();
return NetworkPrefs.fromJson(jsonDecode(persisted) as Map<String, dynamic>);
}
Future<void> patchGeneralPrefs({bool? silentStart}) async {
final newPrefs = state.general.copyWith(
silentStart: silentStart ?? state.general.silentStart,
);
await _prefs.setString(_generalKey, jsonEncode(newPrefs.toJson()));
state = state.copyWith(general: newPrefs);
}
Future<void> patchClashOverrides(ClashConfigPatch overrides) async {
final newPrefs = state.clash.patch(overrides);
await _prefs.setString(_overridesKey, jsonEncode(newPrefs.toJson()));
state = state.copyWith(clash: newPrefs);
}
Future<void> patchNetworkPrefs({
bool? systemProxy,
bool? bypassPrivateNetworks,
}) async {
final newPrefs = state.network.copyWith(
systemProxy: systemProxy ?? state.network.systemProxy,
bypassPrivateNetworks:
bypassPrivateNetworks ?? state.network.bypassPrivateNetworks,
);
await _prefs.setString(_networkKey, jsonEncode(newPrefs.toJson()));
state = state.copyWith(network: newPrefs);
}
}

17
lib/core/prefs/prefs_state.dart
View File

@@ -1,17 +0,0 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:hiddify/core/prefs/general_prefs.dart';
import 'package:hiddify/domain/clash/clash.dart';
import 'package:hiddify/domain/connectivity/connectivity.dart';
part 'prefs_state.freezed.dart';
@freezed
class PrefsState with _$PrefsState {
const PrefsState._();
const factory PrefsState({
@Default(GeneralPrefs()) GeneralPrefs general,
@Default(ClashConfig()) ClashConfig clash,
@Default(NetworkPrefs()) NetworkPrefs network,
}) = _PrefsState;
}

1
lib/domain/connectivity/connectivity.dart
View File

@@ -1,5 +1,4 @@
export 'connection_facade.dart';
export 'connection_failure.dart';
export 'connection_status.dart';
export 'network_prefs.dart';
export 'traffic.dart';

17
lib/domain/connectivity/network_prefs.dart
View File

@@ -1,17 +0,0 @@
import 'package:freezed_annotation/freezed_annotation.dart';
part 'network_prefs.freezed.dart';
part 'network_prefs.g.dart';
@freezed
class NetworkPrefs with _$NetworkPrefs {
const NetworkPrefs._();
const factory NetworkPrefs({
@Default(true) bool systemProxy,
@Default(true) bool bypassPrivateNetworks,
}) = _NetworkPrefs;
factory NetworkPrefs.fromJson(Map<String, dynamic> json) =>
_$NetworkPrefsFromJson(json);
}

26
lib/features/common/clash/clash_mode.dart
View File

@@ -1,26 +0,0 @@
import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hiddify/data/data_providers.dart';
import 'package:hiddify/domain/clash/clash.dart';
import 'package:hiddify/features/common/connectivity/connectivity_controller.dart';
import 'package:hiddify/utils/utils.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'clash_mode.g.dart';
@Riverpod(keepAlive: true)
class ClashMode extends _$ClashMode with AppLogger {
@override
Future<TunnelMode?> build() async {
final clash = ref.watch(coreFacadeProvider);
if (!await ref.watch(serviceRunningProvider.future)) {
return null;
}
ref.watch(prefsControllerProvider.select((value) => value.clash.mode));
return clash.getConfigs().map((r) => r.mode).getOrElse(
(l) {
loggy.warning("fetching clash mode: $l");
throw l;
},
).run();
}
}

2
lib/features/common/window/window_controller.dart
View File

@@ -22,7 +22,7 @@ class WindowController extends _$WindowController
await windowManager.waitUntilReadyToShow(
windowOptions,
() async {
if (ref.read(prefsControllerProvider).general.silentStart) {
if (ref.read(silentStartProvider)) {
loggy.debug("silent start is enabled, hiding window");
await windowManager.hide();
}

1
lib/features/proxies/model/group_with_proxies.dart
View File

@@ -16,7 +16,6 @@ class GroupWithProxies with _$GroupWithProxies {
static Future<List<GroupWithProxies>> fromProxies(
List<ClashProxy> proxies,
TunnelMode? mode,
) async {
final stopWatch = Stopwatch()..start();
final res = await CombineWorker().execute(

4
lib/features/proxies/notifier/proxies_notifier.dart
View File

@@ -4,7 +4,6 @@ import 'package:fpdart/fpdart.dart';
import 'package:hiddify/data/data_providers.dart';
import 'package:hiddify/domain/clash/clash.dart';
import 'package:hiddify/domain/core_service_failure.dart';
import 'package:hiddify/features/common/clash/clash_mode.dart';
import 'package:hiddify/features/common/connectivity/connectivity_controller.dart';
import 'package:hiddify/features/proxies/model/model.dart';
import 'package:hiddify/utils/utils.dart';
@@ -20,11 +19,10 @@ class ProxiesNotifier extends _$ProxiesNotifier with AppLogger {
if (!await ref.watch(serviceRunningProvider.future)) {
throw const CoreServiceNotRunning();
}
final mode = await ref.watch(clashModeProvider.future);
return _clash.getProxies().flatMap(
(proxies) {
return TaskEither(
() async => right(await GroupWithProxies.fromProxies(proxies, mode)),
() async => right(await GroupWithProxies.fromProxies(proxies)),
);
},
).getOrElse((l) {

13
lib/features/settings/widgets/general_setting_tiles.dart
View File

@@ -3,7 +3,7 @@ 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/prefs/general_prefs.dart';
import 'package:hiddify/core/theme/theme.dart';
import 'package:hiddify/features/settings/widgets/theme_mode_switch_button.dart';
import 'package:hiddify/services/service_providers.dart';
@@ -18,9 +18,6 @@ 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);
@@ -98,11 +95,9 @@ class AppearanceSettingTiles extends HookConsumerWidget {
if (PlatformUtils.isDesktop) ...[
SwitchListTile(
title: Text(t.settings.general.silentStart.titleCase),
value: general.silentStart,
onChanged: (value) {
ref
.read(prefsControllerProvider.notifier)
.patchGeneralPrefs(silentStart: value);
value: ref.watch(silentStartProvider),
onChanged: (value) async {
await ref.read(silentStartProvider.notifier).update(value);
},
),
ListTile(

32
lib/features/system_tray/controller/system_tray_controller.dart
View File

@@ -1,9 +1,5 @@
import 'package:fpdart/fpdart.dart';
import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/prefs/prefs.dart';
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';
@@ -26,19 +22,14 @@ class SystemTrayController extends _$SystemTrayController
}
final connection = await ref.watch(connectivityControllerProvider.future);
final mode =
ref.watch(clashModeProvider.select((value) => value.valueOrNull));
loggy.debug('updating system tray');
await _updateTray(connection, mode);
await _updateTray(connection);
}
bool _initialized = false;
Future<void> _updateTray(
ConnectionStatus connection,
TunnelMode? mode,
) async {
Future<void> _updateTray(ConnectionStatus connection) async {
final t = ref.watch(translationsProvider);
final trayMenu = Menu(
items: [
@@ -46,16 +37,6 @@ class SystemTrayController extends _$SystemTrayController
label: t.tray.dashboard,
onClick: handleClickShowApp,
),
if (mode != null) ...[
MenuItem.separator(),
...TunnelMode.values.map(
(e) => MenuItem.checkbox(
label: e.name,
checked: e == mode,
onClick: (mi) => handleClickModeItem(e, mi),
),
),
],
MenuItem.separator(),
MenuItem.checkbox(
label: t.tray.systemProxy,
@@ -89,15 +70,6 @@ class SystemTrayController extends _$SystemTrayController
await ref.read(windowControllerProvider.notifier).show();
}
Future<void> handleClickModeItem(
TunnelMode mode,
MenuItem menuItem,
) async {
return ref
.read(prefsControllerProvider.notifier)
.patchClashOverrides(ClashConfigPatch(mode: some(mode)));
}
Future<void> handleClickSetAsSystemProxy(MenuItem menuItem) async {
return ref.read(connectivityControllerProvider.notifier).toggleConnection();
}