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

Refactor preferences

Browse Source
This commit is contained in:
problematicconsumer
2024-03-02 22:53:14 +03:30
parent 201ea5e88d
commit 2a994dc348
32 changed files with 1104 additions and 1389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/features/config_option/notifier/config_option_notifier.dart
View File

@@ -1,5 +1,7 @@
import 'package:hiddify/features/config_option/data/config_option_data_providers.dart';
import 'package:hiddify/features/config_option/model/config_option_entity.dart';
import 'dart:convert';
import 'package:flutter/services.dart';
import 'package:hiddify/features/config_option/data/config_option_repository.dart';
import 'package:hiddify/utils/custom_loggers.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -8,28 +10,22 @@ part 'config_option_notifier.g.dart';
@Riverpod(keepAlive: true)
class ConfigOptionNotifier extends _$ConfigOptionNotifier with AppLogger {
@override
Future<ConfigOptionEntity> build() async {
return ref
.watch(configOptionRepositoryProvider)
.getConfigOption()
.getOrElse((l) {
loggy.error("error getting persisted options $l", l);
throw l;
});
}
Future<void> build() async {}
Future<void> updateOption(ConfigOptionPatch patch) async {
if (state case AsyncData(value: final options)) {
await ref
.read(configOptionRepositoryProvider)
.updateConfigOption(patch)
.map((_) => state = AsyncData(options.patch(patch)))
.run();
}
Future<void> exportJsonToClipboard() async {
final map = {
for (final option in ConfigOptions.preferences)
ref.read(option.notifier).entry.key: ref.read(option.notifier).raw(),
};
const encoder = JsonEncoder.withIndent(' ');
final json = encoder.convert(map);
await Clipboard.setData(ClipboardData(text: json));
}
Future<void> resetOption() async {
await ref.read(configOptionRepositoryProvider).resetConfigOption().run();
for (final option in ConfigOptions.preferences) {
await ref.read(option.notifier).reset();
}
ref.invalidateSelf();
}
}

34
lib/features/config_option/notifier/warp_option_notifier.dart
View File

@@ -1,7 +1,8 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:hiddify/core/preferences/preferences_provider.dart';
import 'package:hiddify/features/config_option/data/config_option_data_providers.dart';
import 'package:hiddify/features/config_option/data/config_option_repository.dart';
import 'package:hiddify/features/config_option/model/config_option_failure.dart';
import 'package:hiddify/singbox/service/singbox_service_provider.dart';
import 'package:hiddify/utils/utils.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:shared_preferences/shared_preferences.dart';
@@ -46,15 +47,28 @@ class WarpOptionNotifier extends _$WarpOptionNotifier with AppLogger {
Future<void> generateWarpConfig() async {
if (state.configGeneration.isLoading) return;
state = state.copyWith(configGeneration: const AsyncLoading());
final result = await AsyncValue.guard(
() async => await ref
.read(configOptionRepositoryProvider)
.generateWarpConfig()
.getOrElse((l) {
loggy.warning("error generating warp config: $l", l);
throw l;
}).run(),
);
final result = await AsyncValue.guard(() async {
final warp = await ref
.read(singboxServiceProvider)
.generateWarpConfig(
licenseKey: ref.read(ConfigOptions.warpLicenseKey),
previousAccountId: ref.read(ConfigOptions.warpAccountId),
previousAccessToken: ref.read(ConfigOptions.warpAccessToken),
)
.getOrElse((l) => throw l)
.run();
await ref
.read(ConfigOptions.warpAccountId.notifier)
.update(warp.accountId);
await ref
.read(ConfigOptions.warpAccessToken.notifier)
.update(warp.accessToken);
return warp.log;
});
state = state.copyWith(configGeneration: result);
}