Remove unnecessary prefs

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

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);

View File

@@ -1,2 +1,2 @@
export 'prefs_controller.dart';
export 'prefs_state.dart';
export 'general_prefs.dart';
export 'misc_prefs.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);
}
}

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;
}