Support custom text scaling

Optimize the display of different text scale Optimize windows setup experience
2025-04-23 14:56:20 +08:00
29 changed files with 217 additions and 554 deletions
--- a/android/app/src/main/kotlin/com/follow/clash/models/Package.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/models/Package.kt
@@ -3,7 +3,6 @@ package com.follow.clash.models
 data class Package(
    val packageName: String,
    val label: String,
-    val system: Boolean,
-    val internet: Boolean,
+    val isSystem: Boolean,
    val lastUpdateTime: Long,
 )
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
@@ -293,17 +293,19 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
        if (packages.isNotEmpty()) return packages
        packageManager?.getInstalledPackages(PackageManager.GET_META_DATA or PackageManager.GET_PERMISSIONS)
            ?.filter {
-                it.packageName != FlClashApplication.getAppContext().packageName || it.packageName == "android"
+                it.packageName != FlClashApplication.getAppContext().packageName && (
+                        it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
+                                || it.packageName == "android"
+                        )

            }?.map {
-                Package(
-                    packageName = it.packageName,
-                    label = it.applicationInfo?.loadLabel(packageManager).toString(),
-                    system = (it.applicationInfo?.flags?.and(ApplicationInfo.FLAG_SYSTEM)) == 1,
-                    lastUpdateTime = it.lastUpdateTime,
-                    internet = it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
-                )
-            }?.let { packages.addAll(it) }
+            Package(
+                packageName = it.packageName,
+                label = it.applicationInfo?.loadLabel(packageManager).toString(),
+                isSystem = (it.applicationInfo?.flags?.and(ApplicationInfo.FLAG_SYSTEM)) == 1,
+                lastUpdateTime = it.lastUpdateTime
+            )
+        }?.let { packages.addAll(it) }
        return packages
    }

--- a/android/app/src/main/kotlin/com/follow/clash/services/BaseServiceInterface.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/BaseServiceInterface.kt
@@ -84,6 +84,7 @@ fun Service.startForeground(notification: Notification) {
        }
    }

+    Log.d("[FlClash]","startForeground===>")
    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
        try {
            startForeground(
--- a/arb/intl_en.arb
+++ b/arb/intl_en.arb
@@ -392,8 +392,5 @@
  "messageTestTip": "This is a message.",
  "crashTest": "Crash test",
  "clearData": "Clear Data",
-  "textScale": "Text Scaling",
-  "internet": "Internet",
-  "systemApp": "System APP",
-  "noNetworkApp": "No network App"
+  "textScale": "Text Scaling"
 }
--- a/arb/intl_ja.arb
+++ b/arb/intl_ja.arb
@@ -393,8 +393,5 @@
  "crashTest": "クラッシュテスト",
  "clearData": "データを消去",
  "zoom": "ズーム",
-  "textScale": "テキストスケーリング",
-  "internet": "インターネット",
-  "systemApp": "システムアプリ",
-  "noNetworkApp": "ネットワークなしアプリ"
+  "textScale": "テキストスケーリング"
 }
--- a/arb/intl_ru.arb
+++ b/arb/intl_ru.arb
@@ -393,8 +393,5 @@
  "crashTest": "Тест на сбои",
  "clearData": "Очистить данные",
  "zoom": "Масштаб",
-  "textScale": "Масштабирование текста",
-  "internet": "Интернет",
-  "systemApp": "Системное приложение",
-  "noNetworkApp": "Приложение без сети"
+  "textScale": "Масштабирование текста"
 }
--- a/arb/intl_zh_CN.arb
+++ b/arb/intl_zh_CN.arb
@@ -393,8 +393,5 @@
  "crashTest": "崩溃测试",
  "clearData": "清除数据",
  "zoom": "缩放",
-  "textScale": "文本缩放",
-  "internet": "互联网",
-  "systemApp": "系统应用",
-  "noNetworkApp": "无网络应用"
+  "textScale": "文本缩放"
 }
--- a/core/state/state.go
+++ b/core/state/state.go
@@ -24,6 +24,7 @@ type AccessControl struct {
 	Mode              string   `json:"mode"`
 	AcceptList        []string `json:"acceptList"`
 	RejectList        []string `json:"rejectList"`
+	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
 }

 type AndroidVpnRawOptions struct {
--- a/lib/common/constant.dart
+++ b/lib/common/constant.dart
@@ -56,7 +56,6 @@ final commonFilter = ImageFilter.blur(
 const navigationItemListEquality = ListEquality<NavigationItem>();
 const connectionListEquality = ListEquality<Connection>();
 const stringListEquality = ListEquality<String>();
-const intListEquality = ListEquality<int>();
 const logListEquality = ListEquality<Log>();
 const groupListEquality = ListEquality<Group>();
 const externalProviderListEquality = ListEquality<ExternalProvider>();
--- a/lib/fragments/access.dart
+++ b/lib/fragments/access.dart
@@ -113,11 +113,15 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
  }

  _intelligentSelected() async {
-    final packageNames = ref.read(
-      packageListSelectorStateProvider.select(
-        (state) => state.list.map((item) => item.packageName),
-      ),
-    );
+    final appState = globalState.appState;
+    final config = globalState.config;
+    final accessControl = config.vpnProps.accessControl;
+    final packageNames = appState.packages
+        .where(
+          (item) =>
+              accessControl.isFilterSystemApp ? item.isSystem == false : true,
+        )
+        .map((item) => item.packageName);
    final commonScaffoldState = context.commonScaffoldState;
    if (commonScaffoldState?.mounted != true) return;
    final selectedPackageNames =
@@ -190,7 +194,7 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
    final state = ref.watch(packageListSelectorStateProvider);
    final accessControl = state.accessControl;
    final accessControlMode = accessControl.mode;
-    final packages = state.getSortList(
+    final packages = state.getList(
      accessControlMode == AccessControlMode.acceptSelected
          ? acceptList
          : rejectList,
@@ -478,20 +482,14 @@ class AccessControlSearchDelegate extends SearchDelegate {
    final lowQuery = query.toLowerCase();
    return Consumer(
      builder: (context, ref, __) {
-        final vm3 = ref.watch(
-          packageListSelectorStateProvider.select(
-            (state) => VM3(
-              a: state.getSortList(
-                state.accessControl.mode == AccessControlMode.acceptSelected
-                    ? acceptList
-                    : rejectList,
-              ),
-              b: state.accessControl.enable,
-              c: state.accessControl.currentList,
-            ),
-          ),
+        final state = ref.watch(packageListSelectorStateProvider);
+        final accessControl = state.accessControl;
+        final accessControlMode = accessControl.mode;
+        final packages = state.getList(
+          accessControlMode == AccessControlMode.acceptSelected
+              ? acceptList
+              : rejectList,
        );
-        final packages = vm3.a;
        final queryPackages = packages
            .where(
              (package) =>
@@ -499,8 +497,8 @@ class AccessControlSearchDelegate extends SearchDelegate {
                  package.packageName.contains(lowQuery),
            )
            .toList();
-        final isAccessControl = vm3.b;
-        final currentList = vm3.c;
+        final isAccessControl = state.accessControl.enable;
+        final currentList = accessControl.currentList;
        final packageNameList = packages.map((e) => e.packageName).toList();
        final valueList = currentList.intersection(packageNameList);
        return DisabledMask(
@@ -581,6 +579,13 @@ class _AccessControlPanelState extends ConsumerState<AccessControlPanel> {
    };
  }

+  String _getTextWithIsFilterSystemApp(bool isFilterSystemApp) {
+    return switch (isFilterSystemApp) {
+      true => appLocalizations.onlyOtherApps,
+      false => appLocalizations.allApps,
+    };
+  }
+
  List<Widget> _buildModeSetting() {
    return generateSection(
      title: appLocalizations.mode,
@@ -668,39 +673,25 @@ class _AccessControlPanelState extends ConsumerState<AccessControlPanel> {
          scrollDirection: Axis.horizontal,
          child: Consumer(
            builder: (_, ref, __) {
-              final vm2 = ref.watch(
-                vpnSettingProvider.select(
-                  (state) => VM2(
-                    a: state.accessControl.isFilterSystemApp,
-                    b: state.accessControl.isFilterNonInternetApp,
-                  ),
-                ),
+              final isFilterSystemApp = ref.watch(
+                vpnSettingProvider
+                    .select((state) => state.accessControl.isFilterSystemApp),
              );
              return Wrap(
                spacing: 16,
                children: [
-                  SettingTextCard(
-                    appLocalizations.systemApp,
-                    isSelected: vm2.a == false,
-                    onPressed: () {
-                      ref.read(vpnSettingProvider.notifier).updateState(
-                            (state) => state.copyWith.accessControl(
-                              isFilterSystemApp: !vm2.a,
-                            ),
-                          );
-                    },
-                  ),
-                  SettingTextCard(
-                    appLocalizations.noNetworkApp,
-                    isSelected: vm2.b == false,
-                    onPressed: () {
-                      ref.read(vpnSettingProvider.notifier).updateState(
-                            (state) => state.copyWith.accessControl(
-                              isFilterNonInternetApp: !vm2.b,
-                            ),
-                          );
-                    },
-                  )
+                  for (final item in [false, true])
+                    SettingTextCard(
+                      _getTextWithIsFilterSystemApp(item),
+                      isSelected: isFilterSystemApp == item,
+                      onPressed: () {
+                        ref.read(vpnSettingProvider.notifier).updateState(
+                              (state) => state.copyWith.accessControl(
+                                isFilterSystemApp: item,
+                              ),
+                            );
+                      },
+                    )
                ],
              );
            },
--- a/lib/fragments/dashboard/widgets/outbound_mode.dart
+++ b/lib/fragments/dashboard/widgets/outbound_mode.dart
@@ -24,9 +24,10 @@ class OutboundMode extends StatelessWidget {
          );
          return Theme(
              data: Theme.of(context).copyWith(
-                  splashColor: Colors.transparent,
-                  highlightColor: Colors.transparent,
-                  hoverColor: Colors.transparent),
+                splashColor: Colors.transparent,
+                highlightColor: Colors.transparent,
+                hoverColor: Colors.transparent
+              ),
              child: CommonCard(
                onPressed: () {},
                info: Info(
@@ -131,12 +132,10 @@ class OutboundModeV2 extends StatelessWidget {
                              .titleSmall
                              ?.adjustSize(1)
                              .copyWith(
-                                color: item == mode
-                                    ? _getTextColor(
-                                        context,
-                                        item,
-                                      )
-                                    : null,
+                                color: _getTextColor(
+                                  context,
+                                  mode,
+                                ),
                              ),
                        ),
                      ),
--- a/lib/fragments/proxies/common.dart
+++ b/lib/fragments/proxies/common.dart
@@ -6,7 +6,7 @@ import 'package:fl_clash/state.dart';

 double get listHeaderHeight {
  final measure = globalState.measure;
-  return 28 + measure.titleMediumHeight + 4 + measure.bodyMediumHeight;
+  return 24 + measure.titleMediumHeight + 4 + measure.bodyMediumHeight;
 }

 double getItemHeight(ProxyCardType proxyCardType) {
--- a/lib/fragments/proxies/list.dart
+++ b/lib/fragments/proxies/list.dart
@@ -414,10 +414,7 @@ class _ListHeaderState extends State<ListHeader>
    return Consumer(
      builder: (_, ref, child) {
        final iconStyle = ref.watch(
-          proxiesStyleSettingProvider.select(
-            (state) => state.iconStyle,
-          ),
-        );
+            proxiesStyleSettingProvider.select((state) => state.iconStyle));
        final icon = ref.watch(proxiesStyleSettingProvider.select((state) {
          final iconMapEntryList = state.iconMap.entries.toList();
          final index = iconMapEntryList.indexWhere((item) {
@@ -433,44 +430,30 @@ class _ListHeaderState extends State<ListHeader>
          return this.icon;
        }));
        return switch (iconStyle) {
-          ProxiesIconStyle.standard => LayoutBuilder(
-              builder: (_, constraints) {
-                return Container(
-                  margin: const EdgeInsets.only(
-                    right: 16,
-                  ),
-                  child: AspectRatio(
-                    aspectRatio: 1,
-                    child: Container(
-                      height: constraints.maxHeight,
-                      width: constraints.maxWidth,
-                      alignment: Alignment.center,
-                      padding: EdgeInsets.all(6.ap),
-                      decoration: BoxDecoration(
-                        color: context.colorScheme.secondaryContainer,
-                        borderRadius: BorderRadius.circular(12),
-                      ),
-                      clipBehavior: Clip.antiAlias,
-                      child: CommonTargetIcon(
-                        src: icon,
-                        size: constraints.maxHeight - 12.ap,
-                      ),
-                    ),
-                  ),
-                );
-              },
+          ProxiesIconStyle.standard => Container(
+              height: 48,
+              width: 48,
+              margin: const EdgeInsets.only(
+                right: 16,
+              ),
+              padding: const EdgeInsets.all(8),
+              decoration: BoxDecoration(
+                color: context.colorScheme.secondaryContainer,
+                borderRadius: BorderRadius.circular(12),
+              ),
+              clipBehavior: Clip.antiAlias,
+              child: CommonTargetIcon(
+                src: icon,
+                size: 32,
+              ),
            ),
          ProxiesIconStyle.icon => Container(
              margin: const EdgeInsets.only(
                right: 16,
              ),
-              child: LayoutBuilder(
-                builder: (_, constraints) {
-                  return CommonTargetIcon(
-                    src: icon,
-                    size: constraints.maxHeight - 8,
-                  );
-                },
+              child: CommonTargetIcon(
+                src: icon,
+                size: 42,
              ),
            ),
          ProxiesIconStyle.none => Container(),
--- a/lib/fragments/proxies/proxies.dart
+++ b/lib/fragments/proxies/proxies.dart
@@ -78,7 +78,7 @@ class _ProxiesFragmentState extends ConsumerState<ProxiesFragment>
                return AdaptiveSheetScaffold(
                  type: type,
                  body: const ProxiesSetting(),
-                  title: appLocalizations.settings,
+                  title: appLocalizations.proxiesSetting,
                );
              },
            );
--- a/lib/fragments/theme.dart
+++ b/lib/fragments/theme.dart
@@ -41,7 +41,6 @@ class ThemeFragment extends StatelessWidget {
  Widget build(BuildContext context) {
    return SingleChildScrollView(
      child: Column(
-        spacing: 24,
        children: [
          _ThemeModeItem(),
          _PrimaryColorItem(),
@@ -70,15 +69,20 @@ class ItemCard extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return Wrap(
-      runSpacing: 16,
-      children: [
-        InfoHeader(
-          info: info,
-          actions: actions,
-        ),
-        child,
-      ],
+    return Padding(
+      padding: const EdgeInsets.only(
+        top: 16,
+      ),
+      child: Wrap(
+        runSpacing: 16,
+        children: [
+          InfoHeader(
+            info: info,
+            actions: actions,
+          ),
+          child,
+        ],
+      ),
    );
  }
 }
@@ -281,21 +285,18 @@ class _PrimaryColorItemState extends ConsumerState<_PrimaryColorItem> {

  @override
  Widget build(BuildContext context) {
-    final vm4 = ref.watch(
+    final vm3 = ref.watch(
      themeSettingProvider.select(
-        (state) => VM4(
+        (state) => VM3(
          a: state.primaryColor,
          b: state.primaryColors,
          c: state.schemeVariant,
-          d: state.primaryColor == defaultPrimaryColor &&
-              intListEquality.equals(state.primaryColors, defaultPrimaryColors),
        ),
      ),
    );
-    final primaryColor = vm4.a;
-    final primaryColors = [null, ...vm4.b];
-    final schemeVariant = vm4.c;
-    final isEquals = vm4.d;
+    final primaryColor = vm3.a;
+    final primaryColors = [null, ...vm3.b];
+    final schemeVariant = vm3.c;

    return CommonPopScope(
      onPop: () {
@@ -322,32 +323,33 @@ class _PrimaryColorItemState extends ConsumerState<_PrimaryColorItem> {
                onPressed: _handleChangeSchemeVariant,
                child: Text(Intl.message("${schemeVariant.name}Scheme")),
              ),
-            if (_removablePrimaryColor != null)
-              FilledButton(
-                style: ButtonStyle(
-                  visualDensity: VisualDensity.compact,
-                ),
-                onPressed: () {
-                  setState(() {
-                    _removablePrimaryColor = null;
-                  });
-                },
-                child: Text(appLocalizations.cancel),
-              ),
-            if (_removablePrimaryColor == null && !isEquals)
-              IconButton.filledTonal(
-                iconSize: 20,
-                padding: EdgeInsets.all(4),
-                visualDensity: VisualDensity.compact,
-                onPressed: _handleReset,
-                icon: Icon(Icons.replay),
-              )
+            _removablePrimaryColor != null
+                ? FilledButton(
+                    style: ButtonStyle(
+                      visualDensity: VisualDensity.compact,
+                    ),
+                    onPressed: () {
+                      setState(() {
+                        _removablePrimaryColor = null;
+                      });
+                    },
+                    child: Text(appLocalizations.cancel),
+                  )
+                : IconButton.filledTonal(
+                    iconSize: 20,
+                    padding: EdgeInsets.all(4),
+                    visualDensity: VisualDensity.compact,
+                    onPressed: _handleReset,
+                    icon: Icon(Icons.replay),
+                  )
          ],
          space: 8,
        ),
        child: Container(
-          margin: const EdgeInsets.symmetric(
-            horizontal: 16,
+          margin: const EdgeInsets.only(
+            left: 16,
+            right: 16,
+            bottom: 16,
          ),
          child: LayoutBuilder(
            builder: (_, constraints) {
@@ -439,31 +441,31 @@ class _PrueBlackItem extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final prueBlack = ref.watch(
-      themeSettingProvider.select(
-        (state) => state.pureBlack,
-      ),
-    );
-    return ListItem.switchItem(
-      leading: Icon(
-        Icons.contrast,
-      ),
-      horizontalTitleGap: 12,
-      title: Text(
-        appLocalizations.pureBlackMode,
-        style: Theme.of(context).textTheme.titleSmall?.copyWith(
-              color: context.colorScheme.onSurfaceVariant,
-            ),
-      ),
-      delegate: SwitchDelegate(
-        value: prueBlack,
-        onChanged: (value) {
-          ref.read(themeSettingProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  pureBlack: value,
-                ),
-              );
-        },
+    final prueBlack =
+        ref.watch(themeSettingProvider.select((state) => state.pureBlack));
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 16),
+      child: ListItem.switchItem(
+        leading: Icon(
+          Icons.contrast,
+        ),
+        horizontalTitleGap: 12,
+        title: Text(
+          appLocalizations.pureBlackMode,
+          style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                color: context.colorScheme.onSurfaceVariant,
+              ),
+        ),
+        delegate: SwitchDelegate(
+          value: prueBlack,
+          onChanged: (value) {
+            ref.read(themeSettingProvider.notifier).updateState(
+                  (state) => state.copyWith(
+                    pureBlack: value,
+                  ),
+                );
+          },
+        ),
      ),
    );
  }
@@ -479,12 +481,13 @@ class _TextScaleFactorItem extends ConsumerWidget {
        (state) => state.textScale,
      ),
    );
-    final String process = "${((textScale.scale * 100) as double).round()}%";
+    final String process =
+        "${((textScale.scale * 100) as double).round()}%";
    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        Padding(
-          padding: EdgeInsets.only(bottom: 8),
+          padding: const EdgeInsets.symmetric(vertical: 16),
          child: ListItem.switchItem(
            leading: Icon(
              Icons.text_fields,
@@ -508,39 +511,30 @@ class _TextScaleFactorItem extends ConsumerWidget {
            ),
          ),
        ),
-        Padding(
-          padding: EdgeInsets.symmetric(horizontal: 16),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            mainAxisSize: MainAxisSize.max,
-            spacing: 16,
-            children: [
-              Text(process,style: context.textTheme.titleMedium,),
-              Expanded(
-                child: DisabledMask(
-                  status: !textScale.enable,
-                  child: ActivateBox(
-                    active: textScale.enable,
-                    child: SliderTheme(
-                      data: _SliderDefaultsM3(context),
-                      child: Slider(
-                        padding: EdgeInsets.zero,
-                        min: 0.8,
-                        max: 1.2,
-                        value: textScale.scale,
-                        onChanged: (value) {
-                          ref.read(themeSettingProvider.notifier).updateState(
-                                (state) => state.copyWith.textScale(
-                                  scale: value,
-                                ),
-                              );
-                        },
-                      ),
-                    ),
-                  ),
+        DisabledMask(
+          status: !textScale.enable,
+          child: ActivateBox(
+            active: textScale.enable,
+            child: SliderTheme(
+              data: _SliderDefaultsM3(context),
+              child: Slider(
+                min: 0.8,
+                divisions: 8,
+                padding: EdgeInsets.symmetric(
+                  horizontal: 16,
                ),
-              )
-            ],
+                max: 1.2,
+                label: process,
+                value: textScale.scale,
+                onChanged: (value) {
+                  ref.read(themeSettingProvider.notifier).updateState(
+                        (state) => state.copyWith.textScale(
+                          scale: value,
+                        ),
+                      );
+                },
+              ),
+            ),
          ),
        ),
      ],
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -326,7 +326,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "intelligentSelected": MessageLookupByLibrary.simpleMessage(
      "Intelligent selection",
    ),
-    "internet": MessageLookupByLibrary.simpleMessage("Internet"),
    "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
    "ipcidr": MessageLookupByLibrary.simpleMessage("Ipcidr"),
    "ipv6Desc": MessageLookupByLibrary.simpleMessage(
@@ -410,7 +409,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "noInfo": MessageLookupByLibrary.simpleMessage("No info"),
    "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("No more info"),
    "noNetwork": MessageLookupByLibrary.simpleMessage("No network"),
-    "noNetworkApp": MessageLookupByLibrary.simpleMessage("No network App"),
    "noProxy": MessageLookupByLibrary.simpleMessage("No proxy"),
    "noProxyDesc": MessageLookupByLibrary.simpleMessage(
      "Please create a profile or add a valid profile",
@@ -624,7 +622,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "submit": MessageLookupByLibrary.simpleMessage("Submit"),
    "sync": MessageLookupByLibrary.simpleMessage("Sync"),
    "system": MessageLookupByLibrary.simpleMessage("System"),
-    "systemApp": MessageLookupByLibrary.simpleMessage("System APP"),
    "systemFont": MessageLookupByLibrary.simpleMessage("System font"),
    "systemProxy": MessageLookupByLibrary.simpleMessage("System proxy"),
    "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
--- a/lib/l10n/intl/messages_ja.dart
+++ b/lib/l10n/intl/messages_ja.dart
@@ -236,7 +236,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "init": MessageLookupByLibrary.simpleMessage("初期化"),
    "inputCorrectHotkey": MessageLookupByLibrary.simpleMessage("正しいホットキーを入力"),
    "intelligentSelected": MessageLookupByLibrary.simpleMessage("インテリジェント選択"),
-    "internet": MessageLookupByLibrary.simpleMessage("インターネット"),
    "intranetIP": MessageLookupByLibrary.simpleMessage("イントラネットIP"),
    "ipcidr": MessageLookupByLibrary.simpleMessage("IPCIDR"),
    "ipv6Desc": MessageLookupByLibrary.simpleMessage("有効化するとIPv6トラフィックを受信可能"),
@@ -296,7 +295,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "noInfo": MessageLookupByLibrary.simpleMessage("情報なし"),
    "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("追加情報なし"),
    "noNetwork": MessageLookupByLibrary.simpleMessage("ネットワークなし"),
-    "noNetworkApp": MessageLookupByLibrary.simpleMessage("ネットワークなしアプリ"),
    "noProxy": MessageLookupByLibrary.simpleMessage("プロキシなし"),
    "noProxyDesc": MessageLookupByLibrary.simpleMessage(
      "プロファイルを作成するか、有効なプロファイルを追加してください",
@@ -462,7 +460,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "submit": MessageLookupByLibrary.simpleMessage("送信"),
    "sync": MessageLookupByLibrary.simpleMessage("同期"),
    "system": MessageLookupByLibrary.simpleMessage("システム"),
-    "systemApp": MessageLookupByLibrary.simpleMessage("システムアプリ"),
    "systemFont": MessageLookupByLibrary.simpleMessage("システムフォント"),
    "systemProxy": MessageLookupByLibrary.simpleMessage("システムプロキシ"),
    "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
--- a/lib/l10n/intl/messages_ru.dart
+++ b/lib/l10n/intl/messages_ru.dart
@@ -348,7 +348,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "intelligentSelected": MessageLookupByLibrary.simpleMessage(
      "Интеллектуальный выбор",
    ),
-    "internet": MessageLookupByLibrary.simpleMessage("Интернет"),
    "intranetIP": MessageLookupByLibrary.simpleMessage("Внутренний IP"),
    "ipcidr": MessageLookupByLibrary.simpleMessage("IPCIDR"),
    "ipv6Desc": MessageLookupByLibrary.simpleMessage(
@@ -438,7 +437,6 @@ class MessageLookup extends MessageLookupByLibrary {
      "Нет дополнительной информации",
    ),
    "noNetwork": MessageLookupByLibrary.simpleMessage("Нет сети"),
-    "noNetworkApp": MessageLookupByLibrary.simpleMessage("Приложение без сети"),
    "noProxy": MessageLookupByLibrary.simpleMessage("Нет прокси"),
    "noProxyDesc": MessageLookupByLibrary.simpleMessage(
      "Пожалуйста, создайте профиль или добавьте действительный профиль",
@@ -662,7 +660,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "submit": MessageLookupByLibrary.simpleMessage("Отправить"),
    "sync": MessageLookupByLibrary.simpleMessage("Синхронизация"),
    "system": MessageLookupByLibrary.simpleMessage("Система"),
-    "systemApp": MessageLookupByLibrary.simpleMessage("Системное приложение"),
    "systemFont": MessageLookupByLibrary.simpleMessage("Системный шрифт"),
    "systemProxy": MessageLookupByLibrary.simpleMessage("Системный прокси"),
    "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/lib/l10n/intl/messages_zh_CN.dart
@@ -210,7 +210,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "init": MessageLookupByLibrary.simpleMessage("初始化"),
    "inputCorrectHotkey": MessageLookupByLibrary.simpleMessage("请输入正确的快捷键"),
    "intelligentSelected": MessageLookupByLibrary.simpleMessage("智能选择"),
-    "internet": MessageLookupByLibrary.simpleMessage("互联网"),
    "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
    "ipcidr": MessageLookupByLibrary.simpleMessage("IP/掩码"),
    "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
@@ -264,7 +263,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "noInfo": MessageLookupByLibrary.simpleMessage("暂无信息"),
    "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("暂无更多信息"),
    "noNetwork": MessageLookupByLibrary.simpleMessage("无网络"),
-    "noNetworkApp": MessageLookupByLibrary.simpleMessage("无网络应用"),
    "noProxy": MessageLookupByLibrary.simpleMessage("暂无代理"),
    "noProxyDesc": MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"),
    "noResolve": MessageLookupByLibrary.simpleMessage("不解析IP"),
@@ -406,7 +404,6 @@ class MessageLookup extends MessageLookupByLibrary {
    "submit": MessageLookupByLibrary.simpleMessage("提交"),
    "sync": MessageLookupByLibrary.simpleMessage("同步"),
    "system": MessageLookupByLibrary.simpleMessage("系统"),
-    "systemApp": MessageLookupByLibrary.simpleMessage("系统应用"),
    "systemFont": MessageLookupByLibrary.simpleMessage("系统字体"),
    "systemProxy": MessageLookupByLibrary.simpleMessage("系统代理"),
    "systemProxyDesc": MessageLookupByLibrary.simpleMessage("设置系统代理"),
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -3059,26 +3059,6 @@ class AppLocalizations {
  String get textScale {
    return Intl.message('Text Scaling', name: 'textScale', desc: '', args: []);
  }
-
-  /// `Internet`
-  String get internet {
-    return Intl.message('Internet', name: 'internet', desc: '', args: []);
-  }
-
-  /// `System APP`
-  String get systemApp {
-    return Intl.message('System APP', name: 'systemApp', desc: '', args: []);
-  }
-
-  /// `No network App`
-  String get noNetworkApp {
-    return Intl.message(
-      'No network App',
-      name: 'noNetworkApp',
-      desc: '',
-      args: [],
-    );
-  }
 }

 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {
--- a/lib/models/common.dart
+++ b/lib/models/common.dart
@@ -30,8 +30,7 @@ class Package with _$Package {
  const factory Package({
    required String packageName,
    required String label,
-    required bool system,
-    required bool internet,
+    required bool isSystem,
    required int lastUpdateTime,
  }) = _Package;

--- a/lib/models/config.dart
+++ b/lib/models/config.dart
@@ -106,7 +106,6 @@ class AccessControl with _$AccessControl {
    @Default([]) List<String> rejectList,
    @Default(AccessSortType.none) AccessSortType sort,
    @Default(true) bool isFilterSystemApp,
-    @Default(true) bool isFilterNonInternetApp,
  }) = _AccessControl;

  factory AccessControl.fromJson(Map<String, Object?> json) =>
--- a/lib/models/generated/common.freezed.dart
+++ b/lib/models/generated/common.freezed.dart
@@ -289,8 +289,7 @@ Package _$PackageFromJson(Map<String, dynamic> json) {
 mixin _$Package {
  String get packageName => throw _privateConstructorUsedError;
  String get label => throw _privateConstructorUsedError;
-  bool get system => throw _privateConstructorUsedError;
-  bool get internet => throw _privateConstructorUsedError;
+  bool get isSystem => throw _privateConstructorUsedError;
  int get lastUpdateTime => throw _privateConstructorUsedError;

  /// Serializes this Package to a JSON map.
@@ -308,11 +307,7 @@ abstract class $PackageCopyWith<$Res> {
      _$PackageCopyWithImpl<$Res, Package>;
  @useResult
  $Res call(
-      {String packageName,
-      String label,
-      bool system,
-      bool internet,
-      int lastUpdateTime});
+      {String packageName, String label, bool isSystem, int lastUpdateTime});
 }

 /// @nodoc
@@ -332,8 +327,7 @@ class _$PackageCopyWithImpl<$Res, $Val extends Package>
  $Res call({
    Object? packageName = null,
    Object? label = null,
-    Object? system = null,
-    Object? internet = null,
+    Object? isSystem = null,
    Object? lastUpdateTime = null,
  }) {
    return _then(_value.copyWith(
@@ -345,13 +339,9 @@ class _$PackageCopyWithImpl<$Res, $Val extends Package>
          ? _value.label
          : label // ignore: cast_nullable_to_non_nullable
              as String,
-      system: null == system
-          ? _value.system
-          : system // ignore: cast_nullable_to_non_nullable
-              as bool,
-      internet: null == internet
-          ? _value.internet
-          : internet // ignore: cast_nullable_to_non_nullable
+      isSystem: null == isSystem
+          ? _value.isSystem
+          : isSystem // ignore: cast_nullable_to_non_nullable
              as bool,
      lastUpdateTime: null == lastUpdateTime
          ? _value.lastUpdateTime
@@ -369,11 +359,7 @@ abstract class _$$PackageImplCopyWith<$Res> implements $PackageCopyWith<$Res> {
  @override
  @useResult
  $Res call(
-      {String packageName,
-      String label,
-      bool system,
-      bool internet,
-      int lastUpdateTime});
+      {String packageName, String label, bool isSystem, int lastUpdateTime});
 }

 /// @nodoc
@@ -391,8 +377,7 @@ class __$$PackageImplCopyWithImpl<$Res>
  $Res call({
    Object? packageName = null,
    Object? label = null,
-    Object? system = null,
-    Object? internet = null,
+    Object? isSystem = null,
    Object? lastUpdateTime = null,
  }) {
    return _then(_$PackageImpl(
@@ -404,13 +389,9 @@ class __$$PackageImplCopyWithImpl<$Res>
          ? _value.label
          : label // ignore: cast_nullable_to_non_nullable
              as String,
-      system: null == system
-          ? _value.system
-          : system // ignore: cast_nullable_to_non_nullable
-              as bool,
-      internet: null == internet
-          ? _value.internet
-          : internet // ignore: cast_nullable_to_non_nullable
+      isSystem: null == isSystem
+          ? _value.isSystem
+          : isSystem // ignore: cast_nullable_to_non_nullable
              as bool,
      lastUpdateTime: null == lastUpdateTime
          ? _value.lastUpdateTime
@@ -426,8 +407,7 @@ class _$PackageImpl implements _Package {
  const _$PackageImpl(
      {required this.packageName,
      required this.label,
-      required this.system,
-      required this.internet,
+      required this.isSystem,
      required this.lastUpdateTime});

  factory _$PackageImpl.fromJson(Map<String, dynamic> json) =>
@@ -438,15 +418,13 @@ class _$PackageImpl implements _Package {
  @override
  final String label;
  @override
-  final bool system;
-  @override
-  final bool internet;
+  final bool isSystem;
  @override
  final int lastUpdateTime;

  @override
  String toString() {
-    return 'Package(packageName: $packageName, label: $label, system: $system, internet: $internet, lastUpdateTime: $lastUpdateTime)';
+    return 'Package(packageName: $packageName, label: $label, isSystem: $isSystem, lastUpdateTime: $lastUpdateTime)';
  }

  @override
@@ -457,17 +435,16 @@ class _$PackageImpl implements _Package {
            (identical(other.packageName, packageName) ||
                other.packageName == packageName) &&
            (identical(other.label, label) || other.label == label) &&
-            (identical(other.system, system) || other.system == system) &&
-            (identical(other.internet, internet) ||
-                other.internet == internet) &&
+            (identical(other.isSystem, isSystem) ||
+                other.isSystem == isSystem) &&
            (identical(other.lastUpdateTime, lastUpdateTime) ||
                other.lastUpdateTime == lastUpdateTime));
  }

  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
-  int get hashCode => Object.hash(
-      runtimeType, packageName, label, system, internet, lastUpdateTime);
+  int get hashCode =>
+      Object.hash(runtimeType, packageName, label, isSystem, lastUpdateTime);

  /// Create a copy of Package
  /// with the given fields replaced by the non-null parameter values.
@@ -489,8 +466,7 @@ abstract class _Package implements Package {
  const factory _Package(
      {required final String packageName,
      required final String label,
-      required final bool system,
-      required final bool internet,
+      required final bool isSystem,
      required final int lastUpdateTime}) = _$PackageImpl;

  factory _Package.fromJson(Map<String, dynamic> json) = _$PackageImpl.fromJson;
@@ -500,9 +476,7 @@ abstract class _Package implements Package {
  @override
  String get label;
  @override
-  bool get system;
-  @override
-  bool get internet;
+  bool get isSystem;
  @override
  int get lastUpdateTime;

--- a/lib/models/generated/common.g.dart
+++ b/lib/models/generated/common.g.dart
@@ -10,8 +10,7 @@ _$PackageImpl _$$PackageImplFromJson(Map<String, dynamic> json) =>
    _$PackageImpl(
      packageName: json['packageName'] as String,
      label: json['label'] as String,
-      system: json['system'] as bool,
-      internet: json['internet'] as bool,
+      isSystem: json['isSystem'] as bool,
      lastUpdateTime: (json['lastUpdateTime'] as num).toInt(),
    );

@@ -19,8 +18,7 @@ Map<String, dynamic> _$$PackageImplToJson(_$PackageImpl instance) =>
    <String, dynamic>{
      'packageName': instance.packageName,
      'label': instance.label,
-      'system': instance.system,
-      'internet': instance.internet,
+      'isSystem': instance.isSystem,
      'lastUpdateTime': instance.lastUpdateTime,
    };

--- a/lib/models/generated/config.freezed.dart
+++ b/lib/models/generated/config.freezed.dart
@@ -539,7 +539,6 @@ mixin _$AccessControl {
  List<String> get rejectList => throw _privateConstructorUsedError;
  AccessSortType get sort => throw _privateConstructorUsedError;
  bool get isFilterSystemApp => throw _privateConstructorUsedError;
-  bool get isFilterNonInternetApp => throw _privateConstructorUsedError;

  /// Serializes this AccessControl to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -563,8 +562,7 @@ abstract class $AccessControlCopyWith<$Res> {
      List<String> acceptList,
      List<String> rejectList,
      AccessSortType sort,
-      bool isFilterSystemApp,
-      bool isFilterNonInternetApp});
+      bool isFilterSystemApp});
 }

 /// @nodoc
@@ -588,7 +586,6 @@ class _$AccessControlCopyWithImpl<$Res, $Val extends AccessControl>
    Object? rejectList = null,
    Object? sort = null,
    Object? isFilterSystemApp = null,
-    Object? isFilterNonInternetApp = null,
  }) {
    return _then(_value.copyWith(
      enable: null == enable
@@ -615,10 +612,6 @@ class _$AccessControlCopyWithImpl<$Res, $Val extends AccessControl>
          ? _value.isFilterSystemApp
          : isFilterSystemApp // ignore: cast_nullable_to_non_nullable
              as bool,
-      isFilterNonInternetApp: null == isFilterNonInternetApp
-          ? _value.isFilterNonInternetApp
-          : isFilterNonInternetApp // ignore: cast_nullable_to_non_nullable
-              as bool,
    ) as $Val);
  }
 }
@@ -637,8 +630,7 @@ abstract class _$$AccessControlImplCopyWith<$Res>
      List<String> acceptList,
      List<String> rejectList,
      AccessSortType sort,
-      bool isFilterSystemApp,
-      bool isFilterNonInternetApp});
+      bool isFilterSystemApp});
 }

 /// @nodoc
@@ -660,7 +652,6 @@ class __$$AccessControlImplCopyWithImpl<$Res>
    Object? rejectList = null,
    Object? sort = null,
    Object? isFilterSystemApp = null,
-    Object? isFilterNonInternetApp = null,
  }) {
    return _then(_$AccessControlImpl(
      enable: null == enable
@@ -687,10 +678,6 @@ class __$$AccessControlImplCopyWithImpl<$Res>
          ? _value.isFilterSystemApp
          : isFilterSystemApp // ignore: cast_nullable_to_non_nullable
              as bool,
-      isFilterNonInternetApp: null == isFilterNonInternetApp
-          ? _value.isFilterNonInternetApp
-          : isFilterNonInternetApp // ignore: cast_nullable_to_non_nullable
-              as bool,
    ));
  }
 }
@@ -704,8 +691,7 @@ class _$AccessControlImpl implements _AccessControl {
      final List<String> acceptList = const [],
      final List<String> rejectList = const [],
      this.sort = AccessSortType.none,
-      this.isFilterSystemApp = true,
-      this.isFilterNonInternetApp = true})
+      this.isFilterSystemApp = true})
      : _acceptList = acceptList,
        _rejectList = rejectList;

@@ -742,13 +728,10 @@ class _$AccessControlImpl implements _AccessControl {
  @override
  @JsonKey()
  final bool isFilterSystemApp;
-  @override
-  @JsonKey()
-  final bool isFilterNonInternetApp;

  @override
  String toString() {
-    return 'AccessControl(enable: $enable, mode: $mode, acceptList: $acceptList, rejectList: $rejectList, sort: $sort, isFilterSystemApp: $isFilterSystemApp, isFilterNonInternetApp: $isFilterNonInternetApp)';
+    return 'AccessControl(enable: $enable, mode: $mode, acceptList: $acceptList, rejectList: $rejectList, sort: $sort, isFilterSystemApp: $isFilterSystemApp)';
  }

  @override
@@ -764,9 +747,7 @@ class _$AccessControlImpl implements _AccessControl {
                .equals(other._rejectList, _rejectList) &&
            (identical(other.sort, sort) || other.sort == sort) &&
            (identical(other.isFilterSystemApp, isFilterSystemApp) ||
-                other.isFilterSystemApp == isFilterSystemApp) &&
-            (identical(other.isFilterNonInternetApp, isFilterNonInternetApp) ||
-                other.isFilterNonInternetApp == isFilterNonInternetApp));
+                other.isFilterSystemApp == isFilterSystemApp));
  }

  @JsonKey(includeFromJson: false, includeToJson: false)
@@ -778,8 +759,7 @@ class _$AccessControlImpl implements _AccessControl {
      const DeepCollectionEquality().hash(_acceptList),
      const DeepCollectionEquality().hash(_rejectList),
      sort,
-      isFilterSystemApp,
-      isFilterNonInternetApp);
+      isFilterSystemApp);

  /// Create a copy of AccessControl
  /// with the given fields replaced by the non-null parameter values.
@@ -804,8 +784,7 @@ abstract class _AccessControl implements AccessControl {
      final List<String> acceptList,
      final List<String> rejectList,
      final AccessSortType sort,
-      final bool isFilterSystemApp,
-      final bool isFilterNonInternetApp}) = _$AccessControlImpl;
+      final bool isFilterSystemApp}) = _$AccessControlImpl;

  factory _AccessControl.fromJson(Map<String, dynamic> json) =
      _$AccessControlImpl.fromJson;
@@ -822,8 +801,6 @@ abstract class _AccessControl implements AccessControl {
  AccessSortType get sort;
  @override
  bool get isFilterSystemApp;
-  @override
-  bool get isFilterNonInternetApp;

  /// Create a copy of AccessControl
  /// with the given fields replaced by the non-null parameter values.
--- a/lib/models/generated/config.g.dart
+++ b/lib/models/generated/config.g.dart
@@ -80,7 +80,6 @@ _$AccessControlImpl _$$AccessControlImplFromJson(Map<String, dynamic> json) =>
      sort: $enumDecodeNullable(_$AccessSortTypeEnumMap, json['sort']) ??
          AccessSortType.none,
      isFilterSystemApp: json['isFilterSystemApp'] as bool? ?? true,
-      isFilterNonInternetApp: json['isFilterNonInternetApp'] as bool? ?? true,
    );

 Map<String, dynamic> _$$AccessControlImplToJson(_$AccessControlImpl instance) =>
@@ -91,7 +90,6 @@ Map<String, dynamic> _$$AccessControlImplToJson(_$AccessControlImpl instance) =>
      'rejectList': instance.rejectList,
      'sort': _$AccessSortTypeEnumMap[instance.sort]!,
      'isFilterSystemApp': instance.isFilterSystemApp,
-      'isFilterNonInternetApp': instance.isFilterNonInternetApp,
    };

 const _$AccessControlModeEnumMap = {
--- a/lib/models/generated/selector.freezed.dart
+++ b/lib/models/generated/selector.freezed.dart
@@ -327,193 +327,6 @@ abstract class _VM3<A, B, C> implements VM3<A, B, C> {
      throw _privateConstructorUsedError;
 }

-/// @nodoc
-mixin _$VM4<A, B, C, D> {
-  A get a => throw _privateConstructorUsedError;
-  B get b => throw _privateConstructorUsedError;
-  C get c => throw _privateConstructorUsedError;
-  D get d => throw _privateConstructorUsedError;
-
-  /// Create a copy of VM4
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  $VM4CopyWith<A, B, C, D, VM4<A, B, C, D>> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $VM4CopyWith<A, B, C, D, $Res> {
-  factory $VM4CopyWith(
-          VM4<A, B, C, D> value, $Res Function(VM4<A, B, C, D>) then) =
-      _$VM4CopyWithImpl<A, B, C, D, $Res, VM4<A, B, C, D>>;
-  @useResult
-  $Res call({A a, B b, C c, D d});
-}
-
-/// @nodoc
-class _$VM4CopyWithImpl<A, B, C, D, $Res, $Val extends VM4<A, B, C, D>>
-    implements $VM4CopyWith<A, B, C, D, $Res> {
-  _$VM4CopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of VM4
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? a = freezed,
-    Object? b = freezed,
-    Object? c = freezed,
-    Object? d = freezed,
-  }) {
-    return _then(_value.copyWith(
-      a: freezed == a
-          ? _value.a
-          : a // ignore: cast_nullable_to_non_nullable
-              as A,
-      b: freezed == b
-          ? _value.b
-          : b // ignore: cast_nullable_to_non_nullable
-              as B,
-      c: freezed == c
-          ? _value.c
-          : c // ignore: cast_nullable_to_non_nullable
-              as C,
-      d: freezed == d
-          ? _value.d
-          : d // ignore: cast_nullable_to_non_nullable
-              as D,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$VM4ImplCopyWith<A, B, C, D, $Res>
-    implements $VM4CopyWith<A, B, C, D, $Res> {
-  factory _$$VM4ImplCopyWith(_$VM4Impl<A, B, C, D> value,
-          $Res Function(_$VM4Impl<A, B, C, D>) then) =
-      __$$VM4ImplCopyWithImpl<A, B, C, D, $Res>;
-  @override
-  @useResult
-  $Res call({A a, B b, C c, D d});
-}
-
-/// @nodoc
-class __$$VM4ImplCopyWithImpl<A, B, C, D, $Res>
-    extends _$VM4CopyWithImpl<A, B, C, D, $Res, _$VM4Impl<A, B, C, D>>
-    implements _$$VM4ImplCopyWith<A, B, C, D, $Res> {
-  __$$VM4ImplCopyWithImpl(
-      _$VM4Impl<A, B, C, D> _value, $Res Function(_$VM4Impl<A, B, C, D>) _then)
-      : super(_value, _then);
-
-  /// Create a copy of VM4
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? a = freezed,
-    Object? b = freezed,
-    Object? c = freezed,
-    Object? d = freezed,
-  }) {
-    return _then(_$VM4Impl<A, B, C, D>(
-      a: freezed == a
-          ? _value.a
-          : a // ignore: cast_nullable_to_non_nullable
-              as A,
-      b: freezed == b
-          ? _value.b
-          : b // ignore: cast_nullable_to_non_nullable
-              as B,
-      c: freezed == c
-          ? _value.c
-          : c // ignore: cast_nullable_to_non_nullable
-              as C,
-      d: freezed == d
-          ? _value.d
-          : d // ignore: cast_nullable_to_non_nullable
-              as D,
-    ));
-  }
-}
-
-/// @nodoc
-
-class _$VM4Impl<A, B, C, D> implements _VM4<A, B, C, D> {
-  const _$VM4Impl(
-      {required this.a, required this.b, required this.c, required this.d});
-
-  @override
-  final A a;
-  @override
-  final B b;
-  @override
-  final C c;
-  @override
-  final D d;
-
-  @override
-  String toString() {
-    return 'VM4<$A, $B, $C, $D>(a: $a, b: $b, c: $c, d: $d)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$VM4Impl<A, B, C, D> &&
-            const DeepCollectionEquality().equals(other.a, a) &&
-            const DeepCollectionEquality().equals(other.b, b) &&
-            const DeepCollectionEquality().equals(other.c, c) &&
-            const DeepCollectionEquality().equals(other.d, d));
-  }
-
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      const DeepCollectionEquality().hash(a),
-      const DeepCollectionEquality().hash(b),
-      const DeepCollectionEquality().hash(c),
-      const DeepCollectionEquality().hash(d));
-
-  /// Create a copy of VM4
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$VM4ImplCopyWith<A, B, C, D, _$VM4Impl<A, B, C, D>> get copyWith =>
-      __$$VM4ImplCopyWithImpl<A, B, C, D, _$VM4Impl<A, B, C, D>>(
-          this, _$identity);
-}
-
-abstract class _VM4<A, B, C, D> implements VM4<A, B, C, D> {
-  const factory _VM4(
-      {required final A a,
-      required final B b,
-      required final C c,
-      required final D d}) = _$VM4Impl<A, B, C, D>;
-
-  @override
-  A get a;
-  @override
-  B get b;
-  @override
-  C get c;
-  @override
-  D get d;
-
-  /// Create a copy of VM4
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$VM4ImplCopyWith<A, B, C, D, _$VM4Impl<A, B, C, D>> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
 /// @nodoc
 mixin _$StartButtonSelectorState {
  bool get isInit => throw _privateConstructorUsedError;
--- a/lib/models/selector.dart
+++ b/lib/models/selector.dart
@@ -24,17 +24,6 @@ class VM3<A, B, C> with _$VM3<A, B, C> {
  }) = _VM3;
 }

-@freezed
-class VM4<A, B, C,D> with _$VM4<A, B, C,D> {
-  const factory VM4({
-    required A a,
-    required B b,
-    required C c,
-    required D d,
-  }) = _VM4;
-}
-
-
@freezed
 class StartButtonSelectorState with _$StartButtonSelectorState {
  const factory StartButtonSelectorState({
@@ -157,21 +146,12 @@ class PackageListSelectorState with _$PackageListSelectorState {
 }

 extension PackageListSelectorStateExt on PackageListSelectorState {
-  List<Package> get list {
+  List<Package> getList(List<String> selectedList) {
    final isFilterSystemApp = accessControl.isFilterSystemApp;
-    final isFilterNonInternetApp = accessControl.isFilterNonInternetApp;
-    return packages
-        .where(
-          (item) =>
-              (isFilterSystemApp ? item.system == false : true) &&
-              (isFilterNonInternetApp ? item.internet == true : true),
-        )
-        .toList();
-  }
-
-  List<Package> getSortList(List<String> selectedList) {
    final sort = accessControl.sort;
-    return list.sorted(
+    return packages
+        .where((item) => isFilterSystemApp ? item.isSystem == false : true)
+        .sorted(
      (a, b) {
        return switch (sort) {
          AccessSortType.none => 0,
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.83+202504251
+version: 0.8.83+202504231
 environment:
  sdk: '>=3.1.0 <4.0.0'