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

Migrate to singbox

Browse Source
This commit is contained in:
problematicconsumer
2023-08-19 22:27:23 +03:30
parent 14369d0a03
commit 684acc555d
124 changed files with 3408 additions and 2047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
lib/features/settings/view/clash_overrides_page.dart
View File

@@ -1,103 +1,100 @@
import 'package:flutter/material.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/features/settings/widgets/widgets.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:recase/recase.dart';
// import 'package:flutter/material.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/features/settings/widgets/widgets.dart';
// import 'package:hooks_riverpod/hooks_riverpod.dart';
// import 'package:recase/recase.dart';
class ClashOverridesPage extends HookConsumerWidget {
const ClashOverridesPage({super.key});
// class ClashOverridesPage extends HookConsumerWidget {
// const ClashOverridesPage({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final t = ref.watch(translationsProvider);
// @override
// Widget build(BuildContext context, WidgetRef ref) {
// final t = ref.watch(translationsProvider);
final overrides =
ref.watch(prefsControllerProvider.select((value) => value.clash));
final notifier = ref.watch(prefsControllerProvider.notifier);
// final overrides =
// ref.watch(prefsControllerProvider.select((value) => value.clash));
// final notifier = ref.watch(prefsControllerProvider.notifier);
return Scaffold(
body: CustomScrollView(
slivers: [
SliverAppBar(
title: Text(t.settings.clash.sectionTitle.titleCase),
pinned: true,
),
SliverList.list(
children: [
InputOverrideTile(
title: t.settings.clash.overrides.httpPort,
value: overrides.httpPort,
resetValue: ClashConfig.initial.httpPort,
onChange: (value) => notifier.patchClashOverrides(
ClashConfigPatch(httpPort: value),
),
),
InputOverrideTile(
title: t.settings.clash.overrides.socksPort,
value: overrides.socksPort,
resetValue: ClashConfig.initial.socksPort,
onChange: (value) => notifier.patchClashOverrides(
ClashConfigPatch(socksPort: value),
),
),
InputOverrideTile(
title: t.settings.clash.overrides.redirPort,
value: overrides.redirPort,
onChange: (value) => notifier.patchClashOverrides(
ClashConfigPatch(redirPort: value),
),
),
InputOverrideTile(
title: t.settings.clash.overrides.tproxyPort,
value: overrides.tproxyPort,
onChange: (value) => notifier.patchClashOverrides(
ClashConfigPatch(tproxyPort: value),
),
),
InputOverrideTile(
title: t.settings.clash.overrides.mixedPort,
value: overrides.mixedPort,
resetValue: ClashConfig.initial.mixedPort,
onChange: (value) => notifier.patchClashOverrides(
ClashConfigPatch(mixedPort: value),
),
),
ToggleOverrideTile(
title: t.settings.clash.overrides.allowLan,
value: overrides.allowLan,
onChange: (value) => notifier.patchClashOverrides(
ClashConfigPatch(allowLan: value),
),
),
ToggleOverrideTile(
title: t.settings.clash.overrides.ipv6,
value: overrides.ipv6,
onChange: (value) => notifier.patchClashOverrides(
ClashConfigPatch(ipv6: value),
),
),
ChoiceOverrideTile(
title: t.settings.clash.overrides.mode,
value: overrides.mode,
options: TunnelMode.values,
onChange: (value) => notifier.patchClashOverrides(
ClashConfigPatch(mode: value),
),
),
ChoiceOverrideTile(
title: t.settings.clash.overrides.logLevel,
value: overrides.logLevel,
options: LogLevel.values,
onChange: (value) => notifier.patchClashOverrides(
ClashConfigPatch(logLevel: value),
),
),
],
),
],
),
);
}
}
// return Scaffold(
// body: CustomScrollView(
// slivers: [
// SliverAppBar(
// title: Text(t.settings.clash.sectionTitle.titleCase),
// pinned: true,
// ),
// SliverList.list(
// children: [
// InputOverrideTile(
// title: t.settings.clash.overrides.httpPort,
// value: overrides.httpPort,
// onChange: (value) => notifier.patchClashOverrides(
// ClashConfigPatch(httpPort: value),
// ),
// ),
// InputOverrideTile(
// title: t.settings.clash.overrides.socksPort,
// value: overrides.socksPort,
// onChange: (value) => notifier.patchClashOverrides(
// ClashConfigPatch(socksPort: value),
// ),
// ),
// InputOverrideTile(
// title: t.settings.clash.overrides.redirPort,
// value: overrides.redirPort,
// onChange: (value) => notifier.patchClashOverrides(
// ClashConfigPatch(redirPort: value),
// ),
// ),
// InputOverrideTile(
// title: t.settings.clash.overrides.tproxyPort,
// value: overrides.tproxyPort,
// onChange: (value) => notifier.patchClashOverrides(
// ClashConfigPatch(tproxyPort: value),
// ),
// ),
// InputOverrideTile(
// title: t.settings.clash.overrides.mixedPort,
// value: overrides.mixedPort,
// onChange: (value) => notifier.patchClashOverrides(
// ClashConfigPatch(mixedPort: value),
// ),
// ),
// ToggleOverrideTile(
// title: t.settings.clash.overrides.allowLan,
// value: overrides.allowLan,
// onChange: (value) => notifier.patchClashOverrides(
// ClashConfigPatch(allowLan: value),
// ),
// ),
// ToggleOverrideTile(
// title: t.settings.clash.overrides.ipv6,
// value: overrides.ipv6,
// onChange: (value) => notifier.patchClashOverrides(
// ClashConfigPatch(ipv6: value),
// ),
// ),
// ChoiceOverrideTile(
// title: t.settings.clash.overrides.mode,
// value: overrides.mode,
// options: TunnelMode.values,
// onChange: (value) => notifier.patchClashOverrides(
// ClashConfigPatch(mode: value),
// ),
// ),
// ChoiceOverrideTile(
// title: t.settings.clash.overrides.logLevel,
// value: overrides.logLevel,
// options: LogLevel.values,
// onChange: (value) => notifier.patchClashOverrides(
// ClashConfigPatch(logLevel: value),
// ),
// ),
// ],
// ),
// ],
// ),
// );
// }
// }

27
lib/features/settings/view/settings_page.dart
View File

@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:gap/gap.dart';
import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/router/router.dart';
import 'package:hiddify/features/settings/widgets/widgets.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:recase/recase.dart';
@@ -13,7 +12,7 @@ class SettingsPage extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final t = ref.watch(translationsProvider);
const divider = Divider(indent: 16, endIndent: 16);
// const divider = Divider(indent: 16, endIndent: 16);
return Scaffold(
appBar: AppBar(
@@ -29,18 +28,18 @@ class SettingsPage extends HookConsumerWidget {
t.settings.general.sectionTitle.titleCase,
),
const AppearanceSettingTiles(),
divider,
_SettingsSectionHeader(t.settings.network.sectionTitle.titleCase),
const NetworkSettingTiles(),
divider,
ListTile(
title: Text(t.settings.clash.sectionTitle.titleCase),
leading: const Icon(Icons.edit_document),
contentPadding: const EdgeInsets.symmetric(horizontal: 16),
onTap: () async {
await const ClashOverridesRoute().push(context);
},
),
// divider,
// _SettingsSectionHeader(t.settings.network.sectionTitle.titleCase),
// const NetworkSettingTiles(),
// divider,
// ListTile(
// title: Text(t.settings.clash.sectionTitle.titleCase),
// leading: const Icon(Icons.edit_document),
// contentPadding: const EdgeInsets.symmetric(horizontal: 16),
// onTap: () async {
// await const ClashOverridesRoute().push(context);
// },
// ),
const Gap(16),
],
),

64
lib/features/settings/widgets/network_setting_tiles.dart
View File

@@ -1,36 +1,36 @@
import 'package:flutter/material.dart';
import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:recase/recase.dart';
// import 'package:flutter/material.dart';
// import 'package:hiddify/core/core_providers.dart';
// import 'package:hiddify/core/prefs/prefs.dart';
// import 'package:hooks_riverpod/hooks_riverpod.dart';
// import 'package:recase/recase.dart';
class NetworkSettingTiles extends HookConsumerWidget {
const NetworkSettingTiles({super.key});
// class NetworkSettingTiles extends HookConsumerWidget {
// const NetworkSettingTiles({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final t = ref.watch(translationsProvider);
// @override
// Widget build(BuildContext context, WidgetRef ref) {
// final t = ref.watch(translationsProvider);
final prefs =
ref.watch(prefsControllerProvider.select((value) => value.network));
final notifier = ref.watch(prefsControllerProvider.notifier);
// final prefs =
// ref.watch(prefsControllerProvider.select((value) => value.network));
// final notifier = ref.watch(prefsControllerProvider.notifier);
return Column(
children: [
SwitchListTile(
title: Text(t.settings.network.systemProxy.titleCase),
subtitle: Text(t.settings.network.systemProxyMsg),
value: prefs.systemProxy,
onChanged: (value) => notifier.patchNetworkPrefs(systemProxy: value),
),
SwitchListTile(
title: Text(t.settings.network.bypassPrivateNetworks.titleCase),
subtitle: Text(t.settings.network.bypassPrivateNetworksMsg),
value: prefs.bypassPrivateNetworks,
onChanged: (value) =>
notifier.patchNetworkPrefs(bypassPrivateNetworks: value),
),
],
);
}
}
// return Column(
// children: [
// SwitchListTile(
// title: Text(t.settings.network.systemProxy.titleCase),
// subtitle: Text(t.settings.network.systemProxyMsg),
// value: prefs.systemProxy,
// onChanged: (value) => notifier.patchNetworkPrefs(systemProxy: value),
// ),
// SwitchListTile(
// title: Text(t.settings.network.bypassPrivateNetworks.titleCase),
// subtitle: Text(t.settings.network.bypassPrivateNetworksMsg),
// value: prefs.bypassPrivateNetworks,
// onChanged: (value) =>
// notifier.patchNetworkPrefs(bypassPrivateNetworks: value),
// ),
// ],
// );
// }
// }