Merge branch 'main' into ios

2023-10-24 18:38:48 +03:30
parent b83fcce310 bb5f3dfb73
commit d5b8045cfc
44 changed files with 747 additions and 1717 deletions
--- a/lib/core/app/app_view.dart
+++ b/lib/core/app/app_view.dart
@@ -33,7 +33,7 @@ class AppView extends HookConsumerWidget with PresLogger {
      supportedLocales: AppLocaleUtils.supportedLocales,
      localizationsDelegates: GlobalMaterialLocalizations.delegates,
      debugShowCheckedModeBanner: false,
-      themeMode: theme.mode,
+      themeMode: theme.mode.flutterThemeMode,
      theme: theme.light(),
      darkTheme: theme.dark(),
      title: Constants.appName,
--- a/lib/core/core_providers.dart
+++ b/lib/core/core_providers.dart
@@ -19,6 +19,5 @@ TranslationsEn translations(TranslationsRef ref) =>
@Riverpod(keepAlive: true)
 AppTheme theme(ThemeRef ref) => AppTheme(
      ref.watch(themeModeNotifierProvider),
-      ref.watch(trueBlackThemeNotifierProvider),
      ref.watch(localeNotifierProvider).preferredFontFamily,
    );
--- a/lib/core/prefs/app_theme.dart
+++ b/lib/core/prefs/app_theme.dart
@@ -1,16 +1,38 @@
 import 'package:flex_color_scheme/flex_color_scheme.dart';
 import 'package:flutter/material.dart';
+import 'package:hiddify/core/prefs/locale_prefs.dart';
+
+enum AppThemeMode {
+  system,
+  light,
+  dark,
+  black;
+
+  String present(TranslationsEn t) => switch (this) {
+        system => t.settings.general.themeModes.system,
+        light => t.settings.general.themeModes.light,
+        dark => t.settings.general.themeModes.dark,
+        black => t.settings.general.themeModes.black,
+      };
+
+  ThemeMode get flutterThemeMode => switch (this) {
+        system => ThemeMode.system,
+        light => ThemeMode.light,
+        dark => ThemeMode.dark,
+        black => ThemeMode.dark,
+      };
+
+  bool get trueBlack => this == black;
+}

 // mostly exact copy of flex color scheme 7.1's fabulous 12 theme
 class AppTheme {
  AppTheme(
    this.mode,
-    this.trueBlack,
    this.fontFamily,
  );

-  final ThemeMode mode;
-  final bool trueBlack;
+  final AppThemeMode mode;
  final String fontFamily;

  ThemeData light() {
@@ -81,7 +103,7 @@ class AppTheme {
      useMaterial3: true,
      swapLegacyOnMaterial3: true,
      useMaterial3ErrorColors: true,
-      darkIsTrueBlack: trueBlack,
+      darkIsTrueBlack: mode.trueBlack,
      surfaceMode: FlexSurfaceMode.highScaffoldLowSurface,
      // blendLevel: 1,
      subThemesData: const FlexSubThemesData(
--- a/lib/core/prefs/theme_prefs.dart
+++ b/lib/core/prefs/theme_prefs.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:hiddify/core/prefs/app_theme.dart';
 import 'package:hiddify/data/data_providers.dart';
 import 'package:hiddify/utils/pref_notifier.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -10,29 +10,15 @@ class ThemeModeNotifier extends _$ThemeModeNotifier {
  late final _pref = Pref(
    ref.watch(sharedPreferencesProvider),
    "theme_mode",
-    ThemeMode.system,
-    mapFrom: ThemeMode.values.byName,
+    AppThemeMode.system,
+    mapFrom: AppThemeMode.values.byName,
    mapTo: (value) => value.name,
  );

  @override
-  ThemeMode build() => _pref.getValue();
+  AppThemeMode build() => _pref.getValue();

-  Future<void> update(ThemeMode value) {
-    state = value;
-    return _pref.update(value);
-  }
-}
-
-@Riverpod(keepAlive: true)
-class TrueBlackThemeNotifier extends _$TrueBlackThemeNotifier {
-  late final _pref =
-      Pref(ref.watch(sharedPreferencesProvider), "true_black_theme", false);
-
-  @override
-  bool build() => _pref.getValue();
-
-  Future<void> update(bool value) {
+  Future<void> update(AppThemeMode value) {
    state = value;
    return _pref.update(value);
  }
--- a/lib/data/repository/config_options_store.dart
+++ b/lib/data/repository/config_options_store.dart
@@ -1,6 +1,6 @@
 // ignore_for_file: avoid_manual_providers_as_generated_provider_dependency
 import 'package:hiddify/core/prefs/prefs.dart';
-import 'package:hiddify/domain/singbox/config_options.dart';
+import 'package:hiddify/domain/singbox/singbox.dart';
 import 'package:hiddify/utils/pref_notifier.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';

@@ -67,6 +67,42 @@ final enableTunStore = PrefNotifier.provider("enable-tun", _default.enableTun);
 final setSystemProxyStore =
    PrefNotifier.provider("set-system-proxy", _default.setSystemProxy);

+// HACK temporary
+@riverpod
+List<Rule> rules(RulesRef ref) => switch (ref.watch(regionNotifierProvider)) {
+      Region.ir => [
+          const Rule(
+            id: "id",
+            name: "name",
+            enabled: true,
+            domains: "domain:.ir",
+            ip: "geoip:ir",
+            outbound: RuleOutbound.bypass,
+          ),
+        ],
+      Region.cn => [
+          const Rule(
+            id: "id",
+            name: "name",
+            enabled: true,
+            domains: "domain:.cn,geosite:cn",
+            ip: "geoip:cn",
+            outbound: RuleOutbound.bypass,
+          ),
+        ],
+      Region.ru => [
+          const Rule(
+            id: "id",
+            name: "name",
+            enabled: true,
+            domains: "domain:.ru",
+            ip: "geoip:ru",
+            outbound: RuleOutbound.bypass,
+          ),
+        ],
+      _ => [],
+    };
+
@riverpod
 ConfigOptions configOptions(ConfigOptionsRef ref) => ConfigOptions(
      executeConfigAsIs:
@@ -88,4 +124,5 @@ ConfigOptions configOptions(ConfigOptionsRef ref) => ConfigOptions(
      clashApiPort: ref.watch(clashApiPortStore),
      enableTun: ref.watch(enableTunStore),
      setSystemProxy: ref.watch(setSystemProxyStore),
+      rules: ref.watch(rulesProvider),
    );
--- a/lib/data/repository/core_facade_impl.dart
+++ b/lib/data/repository/core_facade_impl.dart
@@ -179,10 +179,21 @@ class CoreFacadeImpl with ExceptionHandler, InfraLogger implements CoreFacade {
  }

  @override
-  Stream<Either<CoreServiceFailure, String>> watchLogs() {
-    return singbox
-        .watchLogs(filesEditor.coreLogsPath)
-        .handleExceptions(CoreServiceFailure.unexpected);
+  Stream<Either<CoreServiceFailure, List<String>>> watchLogs() {
+    return singbox.watchLogs(filesEditor.coreLogsPath).handleExceptions(
+      (error, stackTrace) {
+        loggy.warning("error watching logs", error, stackTrace);
+        return CoreServiceFailure.unexpected(error, stackTrace);
+      },
+    );
+  }
+
+  @override
+  TaskEither<CoreServiceFailure, Unit> clearLogs() {
+    return exceptionHandler(
+      () => singbox.clearLogs().mapLeft(CoreServiceFailure.other).run(),
+      CoreServiceFailure.unexpected,
+    );
  }

  @override
--- a/lib/domain/singbox/box_log.dart
+++ b/lib/domain/singbox/box_log.dart
@@ -0,0 +1,62 @@
+import 'package:dartx/dartx.dart';
+import 'package:flutter/material.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:tint/tint.dart';
+
+part 'box_log.freezed.dart';
+
+enum LogLevel {
+  trace,
+  debug,
+  info,
+  warn,
+  error,
+  fatal,
+  panic;
+
+  static List<LogLevel> get choices => values.takeFirst(4);
+
+  Color? get color => switch (this) {
+        trace => Colors.lightBlueAccent,
+        debug => Colors.grey,
+        info => Colors.lightGreen,
+        warn => Colors.orange,
+        error => Colors.redAccent,
+        fatal => Colors.red,
+        panic => Colors.red,
+      };
+}
+
+@freezed
+class BoxLog with _$BoxLog {
+  const factory BoxLog({
+    LogLevel? level,
+    DateTime? time,
+    required String message,
+  }) = _BoxLog;
+
+  factory BoxLog.parse(String log) {
+    log = log.strip();
+    DateTime? time;
+    if (log.length > 25) {
+      time = DateTime.tryParse(log.substring(6, 25));
+    }
+    if (time != null) {
+      log = log.substring(26);
+    }
+    final level = LogLevel.values.firstOrNullWhere(
+      (e) {
+        if (log.startsWith(e.name.toUpperCase())) {
+          log = log.removePrefix(e.name.toUpperCase());
+          return true;
+        }
+        return false;
+      },
+    );
+    return BoxLog(
+      level: level,
+      time: time,
+      message: log.trim(),
+    );
+  }
+}
--- a/lib/domain/singbox/config_options.dart
+++ b/lib/domain/singbox/config_options.dart
@@ -2,6 +2,8 @@ import 'dart:convert';

 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hiddify/core/prefs/prefs.dart';
+import 'package:hiddify/domain/singbox/box_log.dart';
+import 'package:hiddify/domain/singbox/rules.dart';
 import 'package:hiddify/utils/platform_utils.dart';

 part 'config_options.freezed.dart';
@@ -19,13 +21,13 @@ class ConfigOptions with _$ConfigOptions {
    @Default(IPv6Mode.disable) IPv6Mode ipv6Mode,
    @Default("tcp://8.8.8.8") String remoteDnsAddress,
    @Default(DomainStrategy.auto) DomainStrategy remoteDnsDomainStrategy,
-    @Default("8.8.8.8") String directDnsAddress,
+    @Default("local") String directDnsAddress,
    @Default(DomainStrategy.auto) DomainStrategy directDnsDomainStrategy,
    @Default(2334) int mixedPort,
    @Default(6450) int localDnsPort,
    @Default(TunImplementation.mixed) TunImplementation tunImplementation,
    @Default(9000) int mtu,
-    @Default("https://www.gstatic.com/generate_204") String connectionTestUrl,
+    @Default("http://cp.cloudflare.com/") String connectionTestUrl,
    @IntervalConverter()
    @Default(Duration(minutes: 10))
    Duration urlTestInterval,
@@ -33,6 +35,9 @@ class ConfigOptions with _$ConfigOptions {
    @Default(6756) int clashApiPort,
    @Default(false) bool enableTun,
    @Default(true) bool setSystemProxy,
+    @Default(false) bool bypassLan,
+    @Default(false) bool enableFakeDns,
+    List<Rule>? rules,
  }) = _ConfigOptions;

  static ConfigOptions initial = ConfigOptions(
@@ -49,13 +54,6 @@ class ConfigOptions with _$ConfigOptions {
      _$ConfigOptionsFromJson(json);
 }

-enum LogLevel {
-  warn,
-  info,
-  debug,
-  trace,
-}
-
@JsonEnum(valueField: 'key')
 enum IPv6Mode {
  disable("ipv4_only"),
--- a/lib/domain/singbox/rules.dart
+++ b/lib/domain/singbox/rules.dart
@@ -1,5 +1,40 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hiddify/core/prefs/locale_prefs.dart';

+part 'rules.freezed.dart';
+part 'rules.g.dart';
+
+@freezed
+class Rule with _$Rule {
+  @JsonSerializable(fieldRename: FieldRename.kebab)
+  const factory Rule({
+    required String id,
+    required String name,
+    @Default(false) bool enabled,
+    String? domains,
+    String? ip,
+    String? port,
+    String? protocol,
+    @Default(RuleNetwork.tcpAndUdp) RuleNetwork network,
+    @Default(RuleOutbound.proxy) RuleOutbound outbound,
+  }) = _Rule;
+
+  factory Rule.fromJson(Map<String, dynamic> json) => _$RuleFromJson(json);
+}
+
+enum RuleOutbound { proxy, bypass, block }
+
+@JsonEnum(valueField: 'key')
+enum RuleNetwork {
+  tcpAndUdp(""),
+  tcp("tcp"),
+  udp("udp");
+
+  const RuleNetwork(this.key);
+
+  final String? key;
+}
+
 enum PerAppProxyMode {
  off,
  include,
@@ -26,11 +61,13 @@ enum PerAppProxyMode {
 enum Region {
  ir,
  cn,
+  ru,
  other;

  String present(TranslationsEn t) => switch (this) {
        ir => t.settings.general.regions.ir,
        cn => t.settings.general.regions.cn,
+        ru => t.settings.general.regions.ru,
        other => t.settings.general.regions.other,
      };
 }
--- a/lib/domain/singbox/singbox.dart
+++ b/lib/domain/singbox/singbox.dart
@@ -1,3 +1,4 @@
+export 'box_log.dart';
 export 'config_options.dart';
 export 'core_status.dart';
 export 'outbounds.dart';
--- a/lib/domain/singbox/singbox_facade.dart
+++ b/lib/domain/singbox/singbox_facade.dart
@@ -37,5 +37,7 @@ abstract interface class SingboxFacade {

  Stream<Either<CoreServiceFailure, CoreStatus>> watchCoreStatus();

-  Stream<Either<CoreServiceFailure, String>> watchLogs();
+  Stream<Either<CoreServiceFailure, List<String>>> watchLogs();
+
+  TaskEither<CoreServiceFailure, Unit> clearLogs();
 }
--- a/lib/features/common/common_controllers.dart
+++ b/lib/features/common/common_controllers.dart
@@ -2,7 +2,6 @@ import 'package:hiddify/core/prefs/general_prefs.dart';
 import 'package:hiddify/features/common/app_update_notifier.dart';
 import 'package:hiddify/features/common/connectivity/connectivity_controller.dart';
 import 'package:hiddify/features/common/window/window_controller.dart';
-import 'package:hiddify/features/logs/notifier/notifier.dart';
 import 'package:hiddify/features/profiles/notifier/notifier.dart';
 import 'package:hiddify/features/system_tray/controller/system_tray_controller.dart';
 import 'package:hiddify/services/service_providers.dart';
@@ -24,10 +23,6 @@ void commonControllers(CommonControllersRef ref) {
    },
    fireImmediately: true,
  );
-  ref.listen(
-    logsNotifierProvider,
-    (previous, next) {},
-  );
  ref.listen(
    connectivityControllerProvider,
    (previous, next) {},
--- a/lib/features/logs/notifier/logs_notifier.dart
+++ b/lib/features/logs/notifier/logs_notifier.dart
@@ -1,66 +1,133 @@
 import 'dart:async';

-import 'package:dartx/dartx.dart';
 import 'package:hiddify/data/data_providers.dart';
-import 'package:hiddify/domain/clash/clash.dart';
+import 'package:hiddify/domain/singbox/singbox.dart';
 import 'package:hiddify/features/logs/notifier/logs_state.dart';
+import 'package:hiddify/utils/riverpod_utils.dart';
 import 'package:hiddify/utils/utils.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:rxdart/rxdart.dart';

 part 'logs_notifier.g.dart';

-// TODO: rewrite
-@Riverpod(keepAlive: true)
+@riverpod
 class LogsNotifier extends _$LogsNotifier with AppLogger {
-  static const maxLength = 1000;
-
  @override
-  Stream<LogsState> build() {
-    state = const AsyncData(LogsState());
-    return ref.read(coreFacadeProvider).watchLogs().asyncMap(
-      (event) async {
-        _logs = [
-          event.getOrElse((l) => throw l),
-          ..._logs.takeFirst(maxLength - 1),
-        ];
-        return switch (state) {
-          // ignore: unused_result
-          AsyncData(:final value) => value.copyWith(logs: await _computeLogs()),
-          _ => LogsState(logs: await _computeLogs()),
-        };
+  LogsState build() {
+    ref.disposeDelay(const Duration(seconds: 20));
+    state = const LogsState();
+    ref.onDispose(
+      () {
+        loggy.debug("disposing");
+        _listener?.cancel();
+        _listener = null;
      },
    );
+    ref.onCancel(
+      () {
+        if (_listener?.isPaused != true) {
+          loggy.debug("pausing");
+          _listener?.pause();
+        }
+      },
+    );
+    ref.onResume(
+      () {
+        if (!state.paused && (_listener?.isPaused ?? false)) {
+          loggy.debug("resuming");
+          _listener?.resume();
+        }
+      },
+    );
+
+    _addListeners();
+    return const LogsState();
  }

-  var _logs = <String>[];
+  StreamSubscription? _listener;
+
+  Future<void> _addListeners() async {
+    loggy.debug("adding listeners");
+    await _listener?.cancel();
+    _listener = ref
+        .read(coreFacadeProvider)
+        .watchLogs()
+        .throttle(
+          (_) => Stream.value(_listener?.isPaused ?? false),
+          leading: false,
+          trailing: true,
+        )
+        .throttleTime(
+          const Duration(milliseconds: 250),
+          leading: false,
+          trailing: true,
+        )
+        .asyncMap(
+      (event) async {
+        await event.fold(
+          (f) {
+            _logs = [];
+            state = state.copyWith(logs: AsyncError(f, StackTrace.current));
+          },
+          (a) async {
+            _logs = a.reversed;
+            state = state.copyWith(logs: AsyncData(await _computeLogs()));
+          },
+        );
+      },
+    ).listen((event) {});
+  }
+
+  Iterable<String> _logs = [];
  final _debouncer = CallbackDebouncer(const Duration(milliseconds: 200));
  LogLevel? _levelFilter;
  String _filter = "";

-  Future<List<String>> _computeLogs() async {
-    if (_levelFilter == null && _filter.isEmpty) return _logs;
-    return _logs.where((e) {
-      return _filter.isEmpty || e.contains(_filter);
+  Future<List<BoxLog>> _computeLogs() async {
+    final logs = _logs.map(BoxLog.parse);
+    if (_levelFilter == null && _filter.isEmpty) return logs.toList();
+    return logs.where((e) {
+      return (_filter.isEmpty || e.message.contains(_filter)) &&
+          (_levelFilter == null ||
+              e.level == null ||
+              e.level!.index >= _levelFilter!.index);
    }).toList();
  }

-  void clear() {
-    if (state case AsyncData(:final value)) {
-      state = AsyncData(value.copyWith(logs: [])).copyWithPrevious(state);
-    }
+  void pause() {
+    loggy.debug("pausing");
+    _listener?.pause();
+    state = state.copyWith(paused: true);
+  }
+
+  void resume() {
+    loggy.debug("resuming");
+    _listener?.resume();
+    state = state.copyWith(paused: false);
+  }
+
+  Future<void> clear() async {
+    loggy.debug("clearing");
+    await ref.read(coreFacadeProvider).clearLogs().match(
+      (l) {
+        loggy.warning("error clearing logs", l);
+      },
+      (_) {
+        _logs = [];
+        state = state.copyWith(logs: const AsyncData([]));
+      },
+    ).run();
  }

  void filterMessage(String? filter) {
    _filter = filter ?? '';
    _debouncer(
      () async {
-        if (state case AsyncData(:final value)) {
-          state = AsyncData(
-            value.copyWith(
-              filter: _filter,
-              logs: await _computeLogs(),
-            ),
-          ).copyWithPrevious(state);
+        if (state.logs case AsyncData()) {
+          state = state.copyWith(
+            filter: _filter,
+            logs: AsyncData(await _computeLogs()),
+          );
        }
      },
    );
@@ -68,13 +135,11 @@ class LogsNotifier extends _$LogsNotifier with AppLogger {

  Future<void> filterLevel(LogLevel? level) async {
    _levelFilter = level;
-    if (state case AsyncData(:final value)) {
-      state = AsyncData(
-        value.copyWith(
-          levelFilter: _levelFilter,
-          logs: await _computeLogs(),
-        ),
-      ).copyWithPrevious(state);
+    if (state.logs case AsyncData()) {
+      state = state.copyWith(
+        levelFilter: _levelFilter,
+        logs: AsyncData(await _computeLogs()),
+      );
    }
  }
 }
--- a/lib/features/logs/notifier/logs_state.dart
+++ b/lib/features/logs/notifier/logs_state.dart
@@ -1,5 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:hiddify/domain/clash/clash.dart';
+import 'package:hiddify/domain/singbox/singbox.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';

 part 'logs_state.freezed.dart';

@@ -8,7 +9,8 @@ class LogsState with _$LogsState {
  const LogsState._();

  const factory LogsState({
-    @Default([]) List<String> logs,
+    @Default(AsyncLoading()) AsyncValue<List<BoxLog>> logs,
+    @Default(false) bool paused,
    @Default("") String filter,
    LogLevel? levelFilter,
  }) = _LogsState;
--- a/lib/features/logs/view/logs_page.dart
+++ b/lib/features/logs/view/logs_page.dart
@@ -1,31 +1,31 @@
-import 'package:dartx/dartx.dart';
+
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fpdart/fpdart.dart';
 import 'package:gap/gap.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/domain/failures.dart';
-import 'package:hiddify/features/common/common.dart';
+import 'package:hiddify/domain/singbox/singbox.dart';
 import 'package:hiddify/features/logs/notifier/notifier.dart';
 import 'package:hiddify/services/service_providers.dart';
 import 'package:hiddify/utils/utils.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';

-import 'package:tint/tint.dart';
-
 class LogsPage extends HookConsumerWidget with PresLogger {
  const LogsPage({super.key});

  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final t = ref.watch(translationsProvider);
-    final asyncState = ref.watch(logsNotifierProvider);
+    final state = ref.watch(logsNotifierProvider);
    final notifier = ref.watch(logsNotifierProvider.notifier);

    final debug = ref.watch(debugModeNotifierProvider);
    final filesEditor = ref.watch(filesEditorServiceProvider);

+    final filterController = useTextEditingController(text: state.filter);
+
    final List<PopupMenuEntry> popupButtons = debug || PlatformUtils.isDesktop
        ? [
            PopupMenuItem(
@@ -49,115 +49,146 @@ class LogsPage extends HookConsumerWidget with PresLogger {
          ]
        : [];

-    switch (asyncState) {
-      case AsyncData(value: final state):
-        return Scaffold(
-          appBar: AppBar(
-            // TODO: fix height
-            toolbarHeight: 90,
-            title: Text(t.logs.pageTitle),
-            actions: [
-              if (popupButtons.isNotEmpty)
-                PopupMenuButton(
-                  itemBuilder: (context) {
-                    return popupButtons;
-                  },
-                ),
-            ],
-            bottom: PreferredSize(
-              preferredSize: const Size.fromHeight(36),
-              child: Padding(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-                child: Row(
-                  children: [
-                    Flexible(
-                      child: TextFormField(
-                        onChanged: notifier.filterMessage,
-                        decoration: InputDecoration(
-                          isDense: true,
-                          hintText: t.logs.filterHint,
-                        ),
-                      ),
+    return Scaffold(
+      appBar: AppBar(
+        // TODO: fix height
+        toolbarHeight: 90,
+        title: Text(t.logs.pageTitle),
+        actions: [
+          if (state.paused)
+            IconButton(
+              onPressed: notifier.resume,
+              icon: const Icon(Icons.play_arrow),
+              tooltip: t.logs.resumeTooltip,
+            )
+          else
+            IconButton(
+              onPressed: notifier.pause,
+              icon: const Icon(Icons.pause),
+              tooltip: t.logs.pauseTooltip,
+            ),
+          IconButton(
+            onPressed: notifier.clear,
+            icon: const Icon(Icons.clear_all),
+            tooltip: t.logs.clearTooltip,
+          ),
+          if (popupButtons.isNotEmpty)
+            PopupMenuButton(
+              itemBuilder: (context) {
+                return popupButtons;
+              },
+            ),
+        ],
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(36),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+            child: Row(
+              children: [
+                Flexible(
+                  child: TextFormField(
+                    controller: filterController,
+                    onChanged: notifier.filterMessage,
+                    decoration: InputDecoration(
+                      isDense: true,
+                      hintText: t.logs.filterHint,
                    ),
-                    const Gap(16),
-                    DropdownButton<Option<LogLevel>>(
-                      value: optionOf(state.levelFilter),
-                      onChanged: (v) {
-                        if (v == null) return;
-                        notifier.filterLevel(v.toNullable());
-                      },
-                      padding: const EdgeInsets.symmetric(horizontal: 8),
-                      borderRadius: BorderRadius.circular(4),
-                      items: [
-                        DropdownMenuItem(
-                          value: none(),
-                          child: Text(t.logs.allLevelsFilter),
-                        ),
-                        ...LogLevel.values.takeFirst(3).map(
-                              (e) => DropdownMenuItem(
-                                value: some(e),
-                                child: Text(e.name),
-                              ),
-                            ),
-                      ],
+                  ),
+                ),
+                const Gap(16),
+                DropdownButton<Option<LogLevel>>(
+                  value: optionOf(state.levelFilter),
+                  onChanged: (v) {
+                    if (v == null) return;
+                    notifier.filterLevel(v.toNullable());
+                  },
+                  padding: const EdgeInsets.symmetric(horizontal: 8),
+                  borderRadius: BorderRadius.circular(4),
+                  items: [
+                    DropdownMenuItem(
+                      value: none(),
+                      child: Text(t.logs.allLevelsFilter),
+                    ),
+                    ...LogLevel.choices.map(
+                      (e) => DropdownMenuItem(
+                        value: some(e),
+                        child: Text(e.name),
+                      ),
                    ),
                  ],
                ),
-              ),
+              ],
            ),
          ),
-          body: ListView.builder(
-            itemCount: state.logs.length,
-            reverse: true,
-            itemBuilder: (context, index) {
-              final log = state.logs[index];
-              return Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  ListTile(
-                    dense: true,
-                    subtitle: Text(log.strip()),
-                  ),
-                  if (index != 0)
-                    const Divider(
-                      indent: 16,
-                      endIndent: 16,
-                      height: 4,
+        ),
+      ),
+      body: switch (state.logs) {
+        AsyncData(value: final logs) => SelectionArea(
+            child: ListView.builder(
+              itemCount: logs.length,
+              reverse: true,
+              itemBuilder: (context, index) {
+                final log = logs[index];
+                return Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 16,
+                        vertical: 4,
+                      ),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          if (log.level != null)
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(
+                                  log.level!.name.toUpperCase(),
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .labelMedium
+                                      ?.copyWith(color: log.level!.color),
+                                ),
+                                if (log.time != null)
+                                  Text(
+                                    log.time!.toString(),
+                                    style:
+                                        Theme.of(context).textTheme.labelSmall,
+                                  ),
+                              ],
+                            ),
+                          Text(
+                            log.message,
+                            style: Theme.of(context).textTheme.bodySmall,
+                          ),
+                        ],
+                      ),
                    ),
-                ],
-              );
-            },
+                    if (index != 0)
+                      const Divider(
+                        indent: 16,
+                        endIndent: 16,
+                        height: 4,
+                      ),
+                  ],
+                );
+              },
+            ),
          ),
-        );
-
-      case AsyncError(:final error):
-        return Scaffold(
-          body: CustomScrollView(
+        AsyncError(:final error) => CustomScrollView(
            slivers: [
-              NestedTabAppBar(
-                title: Text(t.logs.pageTitle),
-              ),
              SliverErrorBodyPlaceholder(t.presentShortError(error)),
            ],
          ),
-        );
-
-      case AsyncLoading():
-        return Scaffold(
-          body: CustomScrollView(
+        _ => const CustomScrollView(
            slivers: [
-              NestedTabAppBar(
-                title: Text(t.logs.pageTitle),
-              ),
-              const SliverLoadingBodyPlaceholder(),
+              SliverLoadingBodyPlaceholder(),
            ],
          ),
-        );
-
-      // TODO: remove
-      default:
-        return const Scaffold();
-    }
+      },
+    );
  }
 }
--- a/lib/features/settings/view/config_options_page.dart
+++ b/lib/features/settings/view/config_options_page.dart
@@ -52,13 +52,13 @@ class ConfigOptionsPage extends HookConsumerWidget {
            ),
          ListTile(
            title: Text(t.settings.config.logLevel),
-            subtitle: Text(options.logLevel.name),
+            subtitle: Text(options.logLevel.name.toUpperCase()),
            onTap: () async {
              final logLevel = await SettingsPickerDialog(
                title: t.settings.config.logLevel,
                selected: options.logLevel,
-                options: LogLevel.values,
-                getTitle: (e) => e.name,
+                options: LogLevel.choices,
+                getTitle: (e) => e.name.toUpperCase(),
                resetValue: _default.logLevel,
              ).show(context);
              if (logLevel == null) return;
--- a/lib/features/settings/widgets/advanced_setting_tiles.dart
+++ b/lib/features/settings/widgets/advanced_setting_tiles.dart
@@ -6,6 +6,7 @@ import 'package:hiddify/core/core_providers.dart';
 import 'package:hiddify/core/prefs/prefs.dart';
 import 'package:hiddify/core/router/routes/routes.dart';
 import 'package:hiddify/domain/singbox/singbox.dart';
+import 'package:hiddify/features/common/common.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';

 class AdvancedSettingTiles extends HookConsumerWidget {
@@ -20,6 +21,7 @@ class AdvancedSettingTiles extends HookConsumerWidget {

    return Column(
      children: [
+        const RegionPrefTile(),
        ListTile(
          title: Text(t.settings.config.pageTitle),
          leading: const Icon(Icons.edit_document),
--- a/lib/features/settings/widgets/general_setting_tiles.dart
+++ b/lib/features/settings/widgets/general_setting_tiles.dart
@@ -3,7 +3,6 @@ import 'package:go_router/go_router.dart';
 import 'package:hiddify/core/core_providers.dart';
 import 'package:hiddify/core/prefs/prefs.dart';
 import 'package:hiddify/features/common/common.dart';
-import 'package:hiddify/features/settings/widgets/theme_mode_switch_button.dart';
 import 'package:hiddify/services/auto_start_service.dart';
 import 'package:hiddify/utils/utils.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -44,31 +43,34 @@ class GeneralSettingTiles extends HookConsumerWidget {
        ),
        ListTile(
          title: Text(t.settings.general.themeMode),
-          subtitle: Text(
-            switch (theme.mode) {
-              ThemeMode.system => t.settings.general.themeModes.system,
-              ThemeMode.light => t.settings.general.themeModes.light,
-              ThemeMode.dark => t.settings.general.themeModes.dark,
-            },
-          ),
-          trailing: ThemeModeSwitch(
-            themeMode: theme.mode,
-            onChanged: ref.read(themeModeNotifierProvider.notifier).update,
-          ),
+          subtitle: Text(theme.mode.present(t)),
          leading: const Icon(Icons.light_mode),
          onTap: () async {
-            await ref.read(themeModeNotifierProvider.notifier).update(
-                  Theme.of(context).brightness == Brightness.light
-                      ? ThemeMode.dark
-                      : ThemeMode.light,
+            final selectedThemeMode = await showDialog<AppThemeMode>(
+              context: context,
+              builder: (context) {
+                return SimpleDialog(
+                  title: Text(t.settings.general.themeMode),
+                  children: AppThemeMode.values
+                      .map(
+                        (e) => RadioListTile(
+                          title: Text(e.present(t)),
+                          value: e,
+                          groupValue: theme.mode,
+                          onChanged: (e) => context.pop(e),
+                        ),
+                      )
+                      .toList(),
                );
+              },
+            );
+            if (selectedThemeMode != null) {
+              await ref
+                  .read(themeModeNotifierProvider.notifier)
+                  .update(selectedThemeMode);
+            }
          },
        ),
-        SwitchListTile(
-          title: Text(t.settings.general.trueBlack),
-          value: theme.trueBlack,
-          onChanged: ref.read(trueBlackThemeNotifierProvider.notifier).update,
-        ),
        if (PlatformUtils.isDesktop) ...[
          SwitchListTile(
            title: Text(t.settings.general.autoStart),
--- a/lib/features/settings/widgets/theme_mode_switch_button.dart
+++ b/lib/features/settings/widgets/theme_mode_switch_button.dart
@@ -1,51 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hiddify/core/core_providers.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-
-class ThemeModeSwitch extends HookConsumerWidget {
-  const ThemeModeSwitch({
-    super.key,
-    required this.themeMode,
-    required this.onChanged,
-  });
-  final ThemeMode themeMode;
-  final ValueChanged<ThemeMode> onChanged;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final t = ref.watch(translationsProvider);
-
-    final List<bool> isSelected = <bool>[
-      themeMode == ThemeMode.light,
-      themeMode == ThemeMode.system,
-      themeMode == ThemeMode.dark,
-    ];
-
-    return ToggleButtons(
-      isSelected: isSelected,
-      onPressed: (int newIndex) {
-        if (newIndex == 0) {
-          onChanged(ThemeMode.light);
-        } else if (newIndex == 1) {
-          onChanged(ThemeMode.system);
-        } else {
-          onChanged(ThemeMode.dark);
-        }
-      },
-      children: <Widget>[
-        Icon(
-          Icons.wb_sunny,
-          semanticLabel: t.settings.general.themeModes.light,
-        ),
-        Icon(
-          Icons.phone_iphone,
-          semanticLabel: t.settings.general.themeModes.system,
-        ),
-        Icon(
-          Icons.bedtime,
-          semanticLabel: t.settings.general.themeModes.dark,
-        ),
-      ],
-    );
-  }
-}
--- a/lib/services/singbox/ffi_singbox_service.dart
+++ b/lib/services/singbox/ffi_singbox_service.dart
@@ -8,7 +8,7 @@ import 'package:combine/combine.dart';
 import 'package:ffi/ffi.dart';
 import 'package:fpdart/fpdart.dart';
 import 'package:hiddify/domain/connectivity/connectivity.dart';
-import 'package:hiddify/domain/singbox/config_options.dart';
+import 'package:hiddify/domain/singbox/singbox.dart';
 import 'package:hiddify/gen/singbox_generated_bindings.dart';
 import 'package:hiddify/services/singbox/shared.dart';
 import 'package:hiddify/services/singbox/singbox_service.dart';
@@ -16,6 +16,7 @@ import 'package:hiddify/utils/utils.dart';
 import 'package:loggy/loggy.dart';
 import 'package:path/path.dart' as p;
 import 'package:rxdart/rxdart.dart';
+import 'package:watcher/watcher.dart';

 final _logger = Loggy('FFISingboxService');

@@ -301,33 +302,47 @@ class FFISingboxService
    );
  }

+  final _logBuffer = <String>[];
+  int _logFilePosition = 0;
+
  @override
-  Stream<String> watchLogs(String path) {
-    var linesRead = 0;
-    return Stream.periodic(
-      const Duration(seconds: 1),
-    ).asyncMap((_) async {
-      final result = await _readLogs(path, linesRead);
-      linesRead = result.$2;
-      return result.$1;
-    }).transform(
-      StreamTransformer.fromHandlers(
-        handleData: (data, sink) {
-          for (final item in data) {
-            sink.add(item);
-          }
-        },
-      ),
-    );
+  Stream<List<String>> watchLogs(String path) async* {
+    yield await _readLogFile(File(path));
+    yield* Watcher(path, pollingDelay: const Duration(seconds: 1))
+        .events
+        .asyncMap((event) async {
+      if (event.type == ChangeType.MODIFY) {
+        await _readLogFile(File(path));
+      }
+      return _logBuffer;
+    });
  }

-  Future<(List<String>, int)> _readLogs(String path, int from) async {
-    return CombineWorker().execute(
+  @override
+  TaskEither<String, Unit> clearLogs() {
+    return TaskEither(
      () async {
-        final lines = await File(path).readAsLines();
-        final to = lines.length;
-        return (lines.sublist(from), to);
+        _logBuffer.clear();
+        return right(unit);
      },
    );
  }
+
+  Future<List<String>> _readLogFile(File file) async {
+    if (_logFilePosition == 0 && file.lengthSync() == 0) return [];
+    final content =
+        await file.openRead(_logFilePosition).transform(utf8.decoder).join();
+    _logFilePosition = file.lengthSync();
+    final lines = const LineSplitter().convert(content);
+    if (lines.length > 300) {
+      lines.removeRange(0, lines.length - 300);
+    }
+    for (final line in lines) {
+      _logBuffer.add(line);
+      if (_logBuffer.length > 300) {
+        _logBuffer.removeAt(0);
+      }
+    }
+    return _logBuffer;
+  }
 }
--- a/lib/services/singbox/mobile_singbox_service.dart
+++ b/lib/services/singbox/mobile_singbox_service.dart
@@ -163,11 +163,18 @@ class MobileSingboxService
  }

  @override
-  Stream<String> watchLogs(String path) {
-    return _logsChannel.receiveBroadcastStream().map(
-      (event) {
-        // loggy.debug("received log: $event");
-        return event as String;
+  Stream<List<String>> watchLogs(String path) async* {
+    yield* _logsChannel
+        .receiveBroadcastStream()
+        .map((event) => (event as List).map((e) => e as String).toList());
+  }
+
+  @override
+  TaskEither<String, Unit> clearLogs() {
+    return TaskEither(
+      () async {
+        await _methodChannel.invokeMethod("clear_logs");
+        return right(unit);
      },
    );
  }
--- a/lib/services/singbox/singbox_service.dart
+++ b/lib/services/singbox/singbox_service.dart
@@ -48,5 +48,7 @@ abstract interface class SingboxService {

  Stream<String> watchStats();

-  Stream<String> watchLogs(String path);
+  Stream<List<String>> watchLogs(String path);
+
+  TaskEither<String, Unit> clearLogs();
 }