Add config options

lib/features/settings/view/clash_overrides_page.dart

@@ -1,100 +0,0 @@
-// 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});
-
-//   @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);
-
-//     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),
-//                 ),
-//               ),
-//             ],
-//           ),
-//         ],
-//       ),
-//     );
-//   }
-// }

lib/features/settings/view/config_options_page.dart

@@ -0,0 +1,214 @@
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:hiddify/core/core_providers.dart';
+import 'package:hiddify/core/prefs/prefs.dart';
+import 'package:hiddify/data/repository/config_options_store.dart';
+import 'package:hiddify/domain/singbox/singbox.dart';
+import 'package:hiddify/features/settings/widgets/widgets.dart';
+import 'package:hiddify/utils/utils.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class ConfigOptionsPage extends HookConsumerWidget {
+  const ConfigOptionsPage({super.key});
+
+  static final _default = ConfigOptions.initial;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final t = ref.watch(translationsProvider);
+
+    final options = ref.watch(configOptionsProvider);
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(t.settings.config.pageTitle),
+      ),
+      body: ListView(
+        children: [
+          if (ref.watch(debugModeProvider))
+            SwitchListTile(
+              title: Text(t.settings.config.executeConfigAsIs),
+              subtitle: Text(t.settings.config.executeConfigAsIsMsg),
+              value: options.executeConfigAsIs,
+              onChanged: ref.read(executeConfigAsIs.notifier).update,
+            ),
+          ListTile(
+            title: Text(t.settings.config.logLevel),
+            subtitle: Text(options.logLevel.name),
+            onTap: () async {
+              final logLevel = await SettingsPickerDialog(
+                title: t.settings.config.logLevel,
+                selected: options.logLevel,
+                options: LogLevel.values,
+                getTitle: (e) => e.name,
+                resetValue: _default.logLevel,
+              ).show(context);
+              if (logLevel == null) return;
+              await ref.read(logLevelStore.notifier).update(logLevel);
+            },
+          ),
+          const SettingsDivider(),
+          SettingsSection(t.settings.config.section.route),
+          SwitchListTile(
+            title: Text(t.settings.config.resolveDestination),
+            value: options.resolveDestination,
+            onChanged: ref.read(resolveDestinationStore.notifier).update,
+          ),
+          ListTile(
+            title: Text(t.settings.config.ipv6Mode),
+            subtitle: Text(options.ipv6Mode.present(t)),
+            onTap: () async {
+              final ipv6Mode = await SettingsPickerDialog(
+                title: t.settings.config.ipv6Mode,
+                selected: options.ipv6Mode,
+                options: IPv6Mode.values,
+                getTitle: (e) => e.present(t),
+                resetValue: _default.ipv6Mode,
+              ).show(context);
+              if (ipv6Mode == null) return;
+              await ref.read(ipv6ModeStore.notifier).update(ipv6Mode);
+            },
+          ),
+          const SettingsDivider(),
+          SettingsSection(t.settings.config.section.dns),
+          ListTile(
+            title: Text(t.settings.config.remoteDnsAddress),
+            subtitle: Text(options.remoteDnsAddress),
+            onTap: () async {
+              final url = await SettingsInputDialog(
+                title: t.settings.config.remoteDnsAddress,
+                initialValue: options.remoteDnsAddress,
+                resetValue: _default.remoteDnsAddress,
+              ).show(context);
+              if (url == null || url.isEmpty) return;
+              await ref.read(remoteDnsAddressStore.notifier).update(url);
+            },
+          ),
+          ListTile(
+            title: Text(t.settings.config.remoteDnsDomainStrategy),
+            subtitle: Text(options.remoteDnsDomainStrategy.displayName),
+            onTap: () async {
+              final domainStrategy = await SettingsPickerDialog(
+                title: t.settings.config.remoteDnsDomainStrategy,
+                selected: options.remoteDnsDomainStrategy,
+                options: DomainStrategy.values,
+                getTitle: (e) => e.displayName,
+                resetValue: _default.remoteDnsDomainStrategy,
+              ).show(context);
+              if (domainStrategy == null) return;
+              await ref
+                  .read(remoteDnsDomainStrategyStore.notifier)
+                  .update(domainStrategy);
+            },
+          ),
+          ListTile(
+            title: Text(t.settings.config.directDnsAddress),
+            subtitle: Text(options.directDnsAddress),
+            onTap: () async {
+              final url = await SettingsInputDialog(
+                title: t.settings.config.directDnsAddress,
+                initialValue: options.directDnsAddress,
+                resetValue: _default.directDnsAddress,
+              ).show(context);
+              if (url == null || url.isEmpty) return;
+              await ref.read(directDnsAddressStore.notifier).update(url);
+            },
+          ),
+          ListTile(
+            title: Text(t.settings.config.directDnsDomainStrategy),
+            subtitle: Text(options.directDnsDomainStrategy.displayName),
+            onTap: () async {
+              final domainStrategy = await SettingsPickerDialog(
+                title: t.settings.config.directDnsDomainStrategy,
+                selected: options.directDnsDomainStrategy,
+                options: DomainStrategy.values,
+                getTitle: (e) => e.displayName,
+                resetValue: _default.directDnsDomainStrategy,
+              ).show(context);
+              if (domainStrategy == null) return;
+              await ref
+                  .read(directDnsDomainStrategyStore.notifier)
+                  .update(domainStrategy);
+            },
+          ),
+          const SettingsDivider(),
+          SettingsSection(t.settings.config.section.inbound),
+          SwitchListTile(
+            title: Text(t.settings.config.enableTun),
+            value: options.enableTun,
+            onChanged: ref.read(enableTunStore.notifier).update,
+          ),
+          SwitchListTile(
+            title: Text(t.settings.config.setSystemProxy),
+            value: options.setSystemProxy,
+            onChanged: ref.read(setSystemProxyStore.notifier).update,
+          ),
+          ListTile(
+            title: Text(t.settings.config.mixedPort),
+            subtitle: Text(options.mixedPort.toString()),
+            onTap: () async {
+              final mixedPort = await SettingsInputDialog(
+                title: t.settings.config.mixedPort,
+                initialValue: options.mixedPort,
+                resetValue: _default.mixedPort,
+                validator: isPort,
+                mapTo: int.tryParse,
+                digitsOnly: true,
+              ).show(context);
+              if (mixedPort == null) return;
+              await ref.read(mixedPortStore.notifier).update(mixedPort);
+            },
+          ),
+          ListTile(
+            title: Text(t.settings.config.localDnsPort),
+            subtitle: Text(options.localDnsPort.toString()),
+            onTap: () async {
+              final localDnsPort = await SettingsInputDialog(
+                title: t.settings.config.localDnsPort,
+                initialValue: options.localDnsPort,
+                resetValue: _default.localDnsPort,
+                validator: isPort,
+                mapTo: int.tryParse,
+                digitsOnly: true,
+              ).show(context);
+              if (localDnsPort == null) return;
+              await ref.read(localDnsPortStore.notifier).update(localDnsPort);
+            },
+          ),
+          const SettingsDivider(),
+          SettingsSection(t.settings.config.section.misc),
+          ListTile(
+            title: Text(t.settings.config.connectionTestUrl),
+            subtitle: Text(options.connectionTestUrl),
+            onTap: () async {
+              final url = await SettingsInputDialog(
+                title: t.settings.config.connectionTestUrl,
+                initialValue: options.connectionTestUrl,
+                resetValue: _default.connectionTestUrl,
+              ).show(context);
+              if (url == null || url.isEmpty || !isUrl(url)) return;
+              await ref.read(connectionTestUrlStore.notifier).update(url);
+            },
+          ),
+          ListTile(
+            title: Text(t.settings.config.clashApiPort),
+            subtitle: Text(options.clashApiPort.toString()),
+            onTap: () async {
+              final clashApiPort = await SettingsInputDialog(
+                title: t.settings.config.clashApiPort,
+                initialValue: options.clashApiPort,
+                resetValue: _default.clashApiPort,
+                validator: isPort,
+                mapTo: int.tryParse,
+                digitsOnly: true,
+              ).show(context);
+              if (clashApiPort == null) return;
+              await ref.read(clashApiPortStore.notifier).update(clashApiPort);
+            },
+          ),
+          const Gap(24),
+        ],
+      ),
+    );
+  }
+}

lib/features/settings/view/settings_page.dart

@@ -1,10 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:hiddify/core/core_providers.dart';
-import 'package:hiddify/features/settings/widgets/miscellaneous_setting_tiles.dart';
 import 'package:hiddify/features/settings/widgets/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:recase/recase.dart';
 
 class SettingsPage extends HookConsumerWidget {
   const SettingsPage({super.key});
@@ -13,58 +11,19 @@ class SettingsPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final t = ref.watch(translationsProvider);
 
-    // const divider = Divider(indent: 16, endIndent: 16);
-
     return Scaffold(
       appBar: AppBar(
-        title: Text(t.settings.pageTitle.titleCase),
+        title: Text(t.settings.pageTitle),
       ),
-      body: ListTileTheme(
-        data: ListTileTheme.of(context).copyWith(
-          contentPadding: const EdgeInsetsDirectional.only(start: 48, end: 16),
-        ),
-        child: ListView(
-          children: [
-            _SettingsSectionHeader(
-              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);
-            //   },
-            // ),
-            _SettingsSectionHeader(
-              t.settings.miscellaneous.sectionTitle.titleCase,
-            ),
-            const MiscellaneousSettingTiles(),
-            const Gap(16),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _SettingsSectionHeader extends StatelessWidget {
-  const _SettingsSectionHeader(this.title);
-
-  final String title;
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-      child: Text(
-        title,
-        style: Theme.of(context).textTheme.titleMedium,
+      body: ListView(
+        children: [
+          SettingsSection(t.settings.general.sectionTitle),
+          const GeneralSettingTiles(),
+          const SettingsDivider(),
+          SettingsSection(t.settings.advanced.sectionTitle),
+          const AdvancedSettingTiles(),
+          const Gap(16),
+        ],
       ),
     );
   }

lib/features/settings/view/view.dart

@@ -1,2 +1,2 @@
-export 'clash_overrides_page.dart';
+export 'config_options_page.dart';
 export 'settings_page.dart';