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

Add config option reset

Browse Source
This commit is contained in:
problematicconsumer
2023-12-12 18:07:02 +03:30
parent 4c2a412820
commit 5e436e3f13
8 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/translations/strings_en.i18n.json
View File

@@ -178,6 +178,7 @@
"clearSelection": "Clear selection"
},
"config": {
"resetBtn": "Reset options",
"serviceMode": "Service Mode",
"serviceModes": {
"proxy": "Proxy",

3
assets/translations/strings_fa.i18n.json
View File

@@ -223,7 +223,8 @@
"tlsFragmentSleep": "TLS Fragment Sleep",
"enableTlsMixedSniCase": "Enable TLS Mixed SNI Case",
"enableTlsPadding": "Enable TLS Padding",
"tlsPaddingSize": "TLS Padding"
"tlsPaddingSize": "TLS Padding",
"resetBtn": "گزینه ها را بازنشانی کنید"
},
"geoAssets": {
"pageTitle": "فایل‌های مسیریابی",

3
assets/translations/strings_ru.i18n.json
View File

@@ -223,7 +223,8 @@
"tlsFragmentSleep": "TLS Fragment Sleep",
"enableTlsMixedSniCase": "Enable TLS Mixed SNI Case",
"enableTlsPadding": "Enable TLS Padding",
"tlsPaddingSize": "TLS Padding"
"tlsPaddingSize": "TLS Padding",
"resetBtn": "Сбросить параметры"
},
"geoAssets": {
"pageTitle": "Активы маршрутизации",

3
assets/translations/strings_tr.i18n.json
View File

@@ -223,7 +223,8 @@
"tlsFragmentSleep": "TLS Fragment Sleep",
"enableTlsMixedSniCase": "Enable TLS Mixed SNI Case",
"enableTlsPadding": "Enable TLS Padding",
"tlsPaddingSize": "TLS Padding"
"tlsPaddingSize": "TLS Padding",
"resetBtn": "Ayarları sıfırla"
},
"geoAssets": {
"pageTitle": "Varlıkları Yönlendirme",

3
assets/translations/strings_zh-CN.i18n.json
View File

@@ -223,7 +223,8 @@
"tlsFragmentSleep": "TLS Fragment Sleep",
"enableTlsMixedSniCase": "Enable TLS Mixed SNI Case",
"enableTlsPadding": "Enable TLS Padding",
"tlsPaddingSize": "TLS Padding"
"tlsPaddingSize": "TLS Padding",
"resetBtn": "重置选项"
},
"geoAssets": {
"pageTitle": "路由资源文件",

60
lib/features/config_option/data/config_option_repository.dart
View File

@@ -10,6 +10,7 @@ import 'package:hiddify/singbox/model/singbox_config_enum.dart';
import 'package:hiddify/singbox/model/singbox_config_option.dart';
import 'package:hiddify/singbox/model/singbox_rule.dart';
import 'package:hiddify/utils/utils.dart';
import 'package:meta/meta.dart';
import 'package:shared_preferences/shared_preferences.dart';
abstract interface class ConfigOptionRepository {
@@ -19,6 +20,7 @@ abstract interface class ConfigOptionRepository {
TaskEither<ConfigOptionFailure, Unit> updateConfigOption(
ConfigOptionPatch patch,
);
TaskEither<ConfigOptionFailure, Unit> resetConfigOption();
}
class ConfigOptionRepositoryImpl
@@ -151,28 +153,48 @@ class ConfigOptionRepositoryImpl
return exceptionHandler(
() async {
final map = patch.toJson();
for (final key in map.keys) {
final value = map[key];
if (value != null) {
loggy.debug("updating [$key] to [$value]");
switch (value) {
case bool _:
await preferences.setBool(key, value);
case String _:
await preferences.setString(key, value);
case int _:
await preferences.setInt(key, value);
case double _:
await preferences.setDouble(key, value);
default:
loggy.warning("unexpected type");
}
}
}
await updateByJson(map);
return right(unit);
},
ConfigOptionUnexpectedFailure.new,
);
}
@override
TaskEither<ConfigOptionFailure, Unit> resetConfigOption() {
return exceptionHandler(
() async {
final map = ConfigOptionEntity.initial.toJson();
await updateByJson(map);
return right(unit);
},
ConfigOptionUnexpectedFailure.new,
);
}
@visibleForTesting
Future<void> updateByJson(
Map<String, dynamic> options,
) async {
final map = ConfigOptionEntity.initial.toJson();
for (final key in map.keys) {
final value = options[key];
if (value != null) {
loggy.debug("updating [$key] to [$value]");
switch (value) {
case bool _:
await preferences.setBool(key, value);
case String _:
await preferences.setString(key, value);
case int _:
await preferences.setInt(key, value);
case double _:
await preferences.setDouble(key, value);
default:
loggy.warning("unexpected type");
}
}
}
}
}

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

@@ -28,4 +28,9 @@ class ConfigOptionNotifier extends _$ConfigOptionNotifier with AppLogger {
.run();
}
}
Future<void> resetOption() async {
await ref.read(configOptionRepositoryProvider).resetConfigOption().run();
ref.invalidateSelf();
}
}

30
lib/features/config_option/overview/config_options_page.dart
View File

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:gap/gap.dart';
import 'package:hiddify/core/localization/translations.dart';
import 'package:hiddify/core/model/failures.dart';
import 'package:hiddify/core/model/range.dart';
import 'package:hiddify/features/config_option/model/config_option_entity.dart';
import 'package:hiddify/features/config_option/model/config_option_patch.dart';
@@ -45,6 +46,14 @@ class ConfigOptionsPage extends HookConsumerWidget {
);
},
),
PopupMenuItem(
child: Text(t.settings.config.resetBtn),
onTap: () async {
await ref
.read(configOptionNotifierProvider.notifier)
.resetOption();
},
),
];
},
),
@@ -377,7 +386,26 @@ class ConfigOptionsPage extends HookConsumerWidget {
const Gap(24),
],
),
// TODO show appropriate error/loading widgets
AsyncError(:final error) => Center(
child: SingleChildScrollView(
child: Column(
children: [
const Icon(Icons.error),
const Gap(2),
Text(t.presentShortError(error)),
const Gap(2),
TextButton(
onPressed: () async {
await ref
.read(configOptionNotifierProvider.notifier)
.resetOption();
},
child: Text(t.settings.config.resetBtn),
),
],
),
),
),
_ => const SizedBox(),
},
);