Fix android notification icon error

2024-06-08 22:51:58 +08:00
23 changed files with 332 additions and 493 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: build
 on:
  push:
    tags:
-      - 'v*'
+      - '*'

 jobs:
  build:
@@ -82,7 +82,7 @@ jobs:


  upload-release:
-    if: ${{ !contains(github.ref, '+') }}
+    if: ${{ !endsWith(github.ref, '-debug') }}
    permissions: write-all
    needs: [ build ]
    runs-on: ubuntu-latest
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
    <application
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
-        android:extractNativeLibs="true"
        android:networkSecurityConfig="@xml/network_security_config"
        android:label="FlClash">
        <activity
--- a/core/common.go
+++ b/core/common.go
@@ -336,8 +336,8 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
-	//targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
-	//targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
+	targetConfig.Tun.Stack = patchConfig.Tun.Stack
 	targetConfig.GeodataLoader = "standard"
 	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -1,6 +1,6 @@
 // ignore_for_file: constant_identifier_names

-enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
+enum GroupType { Selector, URLTest, Fallback }

 enum GroupName { GLOBAL, Proxy, Auto, Fallback }

@@ -61,4 +61,4 @@ enum MessageType { log, tun, delay, process, now }
 enum RecoveryOption {
  all,
  onlyProfiles,
-}
+}
--- a/lib/fragments/access.dart
+++ b/lib/fragments/access.dart
@@ -8,13 +8,6 @@ import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

-extension AccessControlExtension on AccessControl {
-  List<String> get currentList => switch (mode) {
-        AccessControlMode.acceptSelected => acceptList,
-        AccessControlMode.rejectSelected => rejectList,
-      };
-}
-
 class AccessFragment extends StatefulWidget {
  const AccessFragment({super.key});

@@ -90,64 +83,137 @@ class _AccessFragmentState extends State<AccessFragment> {
    );
  }

-  Widget _buildSearchButton(List<Package> packages) {
-    return IconButton(
-      tooltip: appLocalizations.search,
-      onPressed: () {
-        showSearch(
-          context: context,
-          delegate: AccessControlSearchDelegate(
-            packages: packages,
-          ),
-        ).then((_) => {setState(() {})});
+  Widget _buildSelectedAllButton({
+    required bool isSelectedAll,
+    required List<String> allValueList,
+  }) {
+    return Builder(
+      builder: (context) {
+        final tooltip = isSelectedAll
+            ? appLocalizations.cancelSelectAll
+            : appLocalizations.selectAll;
+        return IconButton(
+          tooltip: tooltip,
+          onPressed: () {
+            final config = globalState.appController.config;
+            final isAccept =
+                config.accessControl.mode == AccessControlMode.acceptSelected;
+
+            if (isSelectedAll) {
+              config.accessControl = switch (isAccept) {
+                true => config.accessControl.copyWith(
+                    acceptList: [],
+                  ),
+                false => config.accessControl.copyWith(
+                    rejectList: [],
+                  ),
+              };
+            } else {
+              config.accessControl = switch (isAccept) {
+                true => config.accessControl.copyWith(
+                    acceptList: allValueList,
+                  ),
+                false => config.accessControl.copyWith(
+                    rejectList: allValueList,
+                  ),
+              };
+            }
+          },
+          icon: isSelectedAll
+              ? const Icon(Icons.deselect)
+              : const Icon(Icons.select_all),
+        );
      },
-      icon: const Icon(Icons.search),
    );
  }

-  // Widget _buildSelectedAllButton({
-  //   required bool isSelectedAll,
-  //   required List<String> allValueList,
-  // }) {
-  //   return Builder(
-  //     builder: (context) {
-  //       final tooltip = isSelectedAll
-  //           ? appLocalizations.cancelSelectAll
-  //           : appLocalizations.selectAll;
-  //       return IconButton(
-  //         tooltip: tooltip,
-  //         onPressed: () {
-  //           final config = globalState.appController.config;
-  //           final isAccept =
-  //               config.accessControl.mode == AccessControlMode.acceptSelected;
-  //
-  //           if (isSelectedAll) {
-  //             config.accessControl = switch (isAccept) {
-  //               true => config.accessControl.copyWith(
-  //                   acceptList: [],
-  //                 ),
-  //               false => config.accessControl.copyWith(
-  //                   rejectList: [],
-  //                 ),
-  //             };
-  //           } else {
-  //             config.accessControl = switch (isAccept) {
-  //               true => config.accessControl.copyWith(
-  //                   acceptList: allValueList,
-  //                 ),
-  //               false => config.accessControl.copyWith(
-  //                   rejectList: allValueList,
-  //                 ),
-  //             };
-  //           }
-  //         },
-  //         icon: isSelectedAll
-  //             ? const Icon(Icons.deselect)
-  //             : const Icon(Icons.select_all),
-  //       );
-  //     },
-  //   );
-  // }
+  Widget _actionHeader({
+    required bool isAccessControl,
+    required List<String> valueList,
+    required String describe,
+    required List<String> packageNameList,
+  }) {
+    return AbsorbPointer(
+      absorbing: !isAccessControl,
+      child: Padding(
+        padding: const EdgeInsets.only(
+          top: 4,
+          bottom: 4,
+          left: 16,
+          right: 8,
+        ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Expanded(
+              child: IntrinsicHeight(
+                child: Column(
+                  mainAxisSize: MainAxisSize.max,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: Row(
+                        children: [
+                          Flexible(
+                            child: Text(
+                              appLocalizations.selected,
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelLarge
+                                  ?.copyWith(
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                  ),
+                            ),
+                          ),
+                          const Flexible(
+                            child: SizedBox(
+                              width: 8,
+                            ),
+                          ),
+                          Flexible(
+                            child: Text(
+                              "${valueList.length}",
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelLarge
+                                  ?.copyWith(
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                  ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    Flexible(
+                      child: Text(describe),
+                    )
+                  ],
+                ),
+              ),
+            ),
+            Row(
+              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                Flexible(
+                  child: _buildSelectedAllButton(
+                    isSelectedAll: const ListEquality<String>()
+                        .equals(valueList, packageNameList),
+                    allValueList: packageNameList,
+                  ),
+                ),
+                Flexible(child: _buildFilterSystemAppButton()),
+                Flexible(child: _buildAppProxyModePopup()),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }

  Widget _buildPackageList() {
    return ValueListenableBuilder(
@@ -186,11 +252,14 @@ class _AccessFragmentState extends State<AccessFragment> {
                accessControlMode == AccessControlMode.acceptSelected
                    ? acceptPackages
                    : rejectPackages;
-            final currentList = accessControl.currentList;
+            final currentList =
+                accessControlMode == AccessControlMode.acceptSelected
+                    ? accessControl.acceptList
+                    : accessControl.rejectList;
            final currentPackages = isFilterSystemApp
                ? packages
-                    .where((element) => element.isSystem == false)
-                    .toList()
+                .where((element) => element.isSystem == false)
+                .toList()
                : packages;
            final packageNameList =
                currentPackages.map((e) => e.packageName).toList();
@@ -203,82 +272,11 @@ class _AccessFragmentState extends State<AccessFragment> {
              status: !isAccessControl,
              child: Column(
                children: [
-                  AbsorbPointer(
-                    absorbing: !isAccessControl,
-                    child: Padding(
-                      padding: const EdgeInsets.only(
-                        top: 4,
-                        bottom: 4,
-                        left: 16,
-                        right: 8,
-                      ),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        mainAxisSize: MainAxisSize.max,
-                        children: [
-                          Expanded(
-                            child: IntrinsicHeight(
-                              child: Column(
-                                mainAxisSize: MainAxisSize.max,
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Expanded(
-                                    child: Row(
-                                      children: [
-                                        Flexible(
-                                          child: Text(
-                                            appLocalizations.selected,
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .labelLarge
-                                                ?.copyWith(
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .primary,
-                                                ),
-                                          ),
-                                        ),
-                                        const Flexible(
-                                          child: SizedBox(
-                                            width: 8,
-                                          ),
-                                        ),
-                                        Flexible(
-                                          child: Text(
-                                            "${valueList.length}",
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .labelLarge
-                                                ?.copyWith(
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .primary,
-                                                ),
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                  Flexible(
-                                    child: Text(describe),
-                                  )
-                                ],
-                              ),
-                            ),
-                          ),
-                          Row(
-                            mainAxisSize: MainAxisSize.min,
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            children: [
-                              Flexible(
-                                  child: _buildSearchButton(currentPackages)),
-                              Flexible(child: _buildFilterSystemAppButton()),
-                              Flexible(child: _buildAppProxyModePopup()),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
+                  _actionHeader(
+                    isAccessControl: isAccessControl,
+                    valueList: valueList,
+                    describe: describe,
+                    packageNameList: packageNameList,
                  ),
                  Expanded(
                    flex: 1,
@@ -431,111 +429,3 @@ class PackageListItem extends StatelessWidget {
    );
  }
 }
-
-class AccessControlSearchDelegate extends SearchDelegate {
-  final List<Package> packages;
-
-  AccessControlSearchDelegate({
-    required this.packages,
-  });
-
-  List<Package> get _results {
-    final lowQuery = query.toLowerCase();
-    return packages
-        .where(
-          (package) =>
-              package.label.toLowerCase().contains(lowQuery) ||
-              package.packageName.contains(lowQuery),
-        )
-        .toList();
-  }
-
-  @override
-  List<Widget>? buildActions(BuildContext context) {
-    return [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  Widget _packageList(List<Package> packages) {
-    return Selector<Config, PackageListSelectorState>(
-      selector: (_, config) => PackageListSelectorState(
-        accessControl: config.accessControl,
-        isAccessControl: config.isAccessControl,
-      ),
-      builder: (context, state, __) {
-        final accessControl = state.accessControl;
-        final isAccessControl = state.isAccessControl;
-        final accessControlMode = accessControl.mode;
-        final currentList = accessControl.currentList;
-        final packageNameList = this.packages.map((e) => e.packageName).toList();
-        final valueList = currentList.intersection(packageNameList);
-        return DisabledMask(
-          status: !isAccessControl,
-          child: ListView.builder(
-            itemCount: packages.length,
-            itemBuilder: (_, index) {
-              final package = packages[index];
-              return PackageListItem(
-                key: Key(package.packageName),
-                package: package,
-                value: valueList.contains(package.packageName),
-                isActive: isAccessControl,
-                onChanged: (value) {
-                  if (value == true) {
-                    valueList.add(package.packageName);
-                  } else {
-                    valueList.remove(package.packageName);
-                  }
-                  final config = globalState.appController.config;
-                  if (accessControlMode == AccessControlMode.acceptSelected) {
-                    config.accessControl = config.accessControl.copyWith(
-                      acceptList: valueList,
-                    );
-                  } else {
-                    config.accessControl = config.accessControl.copyWith(
-                      rejectList: valueList,
-                    );
-                  }
-                },
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return _packageList(packages);
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    final packages = _results;
-    return _packageList(packages);
-  }
-}
--- a/lib/fragments/profiles/profiles.dart
+++ b/lib/fragments/profiles/profiles.dart
@@ -17,16 +17,9 @@ enum ProfileActions {
  delete,
 }

-class ProfilesFragment extends StatefulWidget {
+class ProfilesFragment extends StatelessWidget {
  const ProfilesFragment({super.key});

-  @override
-  State<ProfilesFragment> createState() => _ProfilesFragmentState();
-}
-
-class _ProfilesFragmentState extends State<ProfilesFragment> {
-  final hasPadding = ValueNotifier<bool>(false);
-
  _handleShowAddExtendPage() {
    showExtendPage(
      globalState.navigatorKey.currentState!.context,
@@ -48,7 +41,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
    }
  }

-  _initScaffoldState() {
+  _initScaffoldState(BuildContext context) {
    WidgetsBinding.instance.addPostFrameCallback(
      (_) {
        final commonScaffoldState =
@@ -85,7 +78,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
      selector: (_, appState) => appState.currentLabel == 'profiles',
      builder: (_, isCurrent, child) {
        if (isCurrent) {
-          _initScaffoldState();
+          _initScaffoldState(context);
        }
        return child!;
      },
@@ -105,46 +98,27 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
          final isMobile = state.viewMode == ViewMode.mobile;
          return Align(
            alignment: Alignment.topCenter,
-            child: NotificationListener<ScrollNotification>(
-              onNotification: (scrollNotification) {
-                WidgetsBinding.instance.addPostFrameCallback((_) {
-                  hasPadding.value =
-                      scrollNotification.metrics.maxScrollExtent > 0;
-                });
-                return true;
-              },
-              child: ValueListenableBuilder(
-                valueListenable: hasPadding,
-                builder: (_, hasPadding, __) {
-                  return SingleChildScrollView(
-                    padding: !isMobile
-                        ? EdgeInsets.only(
-                            left: 16,
-                            right: 16,
-                            top: 16,
-                            bottom: 16 + (hasPadding ? 56 : 0),
-                          )
-                        : EdgeInsets.only(
-                            bottom: 0 + (hasPadding ? 56 : 0),
-                          ),
-                    child: Grid(
-                      mainAxisSpacing: isMobile ? 8 : 16,
-                      crossAxisSpacing: 16,
-                      crossAxisCount: columns,
-                      children: [
-                        for (final profile in state.profiles)
-                          GridItem(
-                            child: ProfileItem(
-                              profile: profile,
-                              groupValue: state.currentProfileId,
-                              onChanged:
-                                  globalState.appController.changeProfile,
-                            ),
-                          ),
-                      ],
+            child: SingleChildScrollView(
+              padding: !isMobile
+                  ? const EdgeInsets.symmetric(
+                      horizontal: 16,
+                      vertical: 16,
+                    )
+                  : EdgeInsets.zero,
+              child: Grid(
+                mainAxisSpacing: isMobile ? 8 : 16,
+                crossAxisSpacing: 16,
+                crossAxisCount: columns,
+                children: [
+                  for (final profile in state.profiles)
+                    GridItem(
+                      child: ProfileItem(
+                        profile: profile,
+                        groupValue: state.currentProfileId,
+                        onChanged: globalState.appController.changeProfile,
+                      ),
                    ),
-                  );
-                },
+                ],
              ),
            ),
          );
--- a/lib/fragments/proxies.dart
+++ b/lib/fragments/proxies.dart
@@ -199,15 +199,10 @@ class ProxiesTabView extends StatelessWidget {

  _delayTest(List<Proxy> proxies) async {
    for (final proxy in proxies) {
-      final appController = globalState.appController;
-      final proxyName = appController.appState.getRealProxyName(proxy.name) ?? proxy.name;
      globalState.appController.setDelay(
-        Delay(
-          name: proxyName,
-          value: 0,
-        ),
+        Delay(name: proxy.name, value: 0),
      );
-      clashCore.getDelay(proxyName).then((delay) {
+      clashCore.getDelay(proxy.name).then((delay) {
        globalState.appController.setDelay(delay);
      });
    }
@@ -439,7 +434,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
    _controller = AnimationController(
      vsync: this,
      duration: const Duration(
-        milliseconds: 200,
+        milliseconds: 600,
      ),
    );
    _scale = Tween<double>(
--- a/lib/l10n/arb/intl_en.arb
+++ b/lib/l10n/arb/intl_en.arb
@@ -160,6 +160,5 @@
  "checking": "Checking...",
  "country": "Country",
  "checkError": "Check error",
-  "ipCheckTimeout": "Ip check timeout",
-  "search": "Search"
+  "ipCheckTimeout": "Ip check timeout"
 }
--- a/lib/l10n/arb/intl_zh_CN.arb
+++ b/lib/l10n/arb/intl_zh_CN.arb
@@ -160,6 +160,5 @@
  "checking": "检测中...",
  "country": "区域",
  "checkError": "检测失败",
-  "ipCheckTimeout": "Ip检测超时",
-  "search": "搜索"
+  "ipCheckTimeout": "Ip检测超时"
 }
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -212,7 +212,6 @@ class MessageLookup extends MessageLookupByLibrary {
            "External resource related info"),
        "rule": MessageLookupByLibrary.simpleMessage("Rule"),
        "save": MessageLookupByLibrary.simpleMessage("Save"),
-        "search": MessageLookupByLibrary.simpleMessage("Search"),
        "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
        "selected": MessageLookupByLibrary.simpleMessage("Selected"),
        "settings": MessageLookupByLibrary.simpleMessage("Settings"),
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/lib/l10n/intl/messages_zh_CN.dart
@@ -171,7 +171,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
        "rule": MessageLookupByLibrary.simpleMessage("规则"),
        "save": MessageLookupByLibrary.simpleMessage("保存"),
-        "search": MessageLookupByLibrary.simpleMessage("搜索"),
        "selectAll": MessageLookupByLibrary.simpleMessage("全选"),
        "selected": MessageLookupByLibrary.simpleMessage("已选择"),
        "settings": MessageLookupByLibrary.simpleMessage("设置"),
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -1669,16 +1669,6 @@ class AppLocalizations {
      args: [],
    );
  }
-
-  /// `Search`
-  String get search {
-    return Intl.message(
-      'Search',
-      name: 'search',
-      desc: '',
-      args: [],
-    );
-  }
 }

 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {
--- a/lib/models/app.dart
+++ b/lib/models/app.dart
@@ -107,7 +107,7 @@ class AppState with ChangeNotifier {
    } else {
      final index = groups.indexWhere((element) => element.name == proxyName);
      if (index == -1) return type;
-      return "$type(${groups[index].now ?? '*'})";
+      return "$type(${groups[index].now})";
    }
  }

--- a/lib/models/clash_config.dart
+++ b/lib/models/clash_config.dart
@@ -16,7 +16,7 @@ class Tun with _$Tun {
  const factory Tun({
    @Default(false) bool enable,
    @Default(appName) String device,
-    @Default(TunStack.gvisor) TunStack stack,
+    @Default(TunStack.mixed) TunStack stack,
    @JsonKey(name: "dns-hijack") @Default(["any:53"]) List<String> dnsHijack,
  }) = _Tun;

--- a/lib/models/config.dart
+++ b/lib/models/config.dart
@@ -8,7 +8,6 @@ import '../common/common.dart';
 import 'models.dart';

 part 'generated/config.g.dart';
-
 part 'generated/config.freezed.dart';

@freezed
--- a/lib/models/generated/clash_config.freezed.dart
+++ b/lib/models/generated/clash_config.freezed.dart
@@ -135,7 +135,7 @@ class _$TunImpl implements _Tun {
  const _$TunImpl(
      {this.enable = false,
      this.device = appName,
-      this.stack = TunStack.gvisor,
+      this.stack = TunStack.mixed,
      @JsonKey(name: "dns-hijack")
      final List<String> dnsHijack = const ["any:53"]})
      : _dnsHijack = dnsHijack;
--- a/lib/models/generated/clash_config.g.dart
+++ b/lib/models/generated/clash_config.g.dart
@@ -79,7 +79,7 @@ _$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
      enable: json['enable'] as bool? ?? false,
      device: json['device'] as String? ?? appName,
      stack: $enumDecodeNullable(_$TunStackEnumMap, json['stack']) ??
-          TunStack.gvisor,
+          TunStack.mixed,
      dnsHijack: (json['dns-hijack'] as List<dynamic>?)
              ?.map((e) => e as String)
              .toList() ??
--- a/lib/models/generated/proxy.g.dart
+++ b/lib/models/generated/proxy.g.dart
@@ -28,8 +28,6 @@ const _$GroupTypeEnumMap = {
  GroupType.Selector: 'Selector',
  GroupType.URLTest: 'URLTest',
  GroupType.Fallback: 'Fallback',
-  GroupType.LoadBalance: 'LoadBalance',
-  GroupType.Relay: 'Relay',
 };

 _$ProxyImpl _$$ProxyImplFromJson(Map<String, dynamic> json) => _$ProxyImpl(
--- a/lib/widgets/scaffold.dart
+++ b/lib/widgets/scaffold.dart
@@ -122,6 +122,7 @@ class CommonScaffoldState extends State<CommonScaffold> {
            return floatingActionButton ?? Container();
          },
        ),
+        floatingActionButtonAnimator: FloatingActionButtonAnimator.scaling,
        appBar: PreferredSize(
          preferredSize: const Size.fromHeight(kToolbarHeight),
          child: Stack(
--- a/plugins/flutter_distributor
+++ b/plugins/flutter_distributor
--- a/pubspec.lock
+++ b/pubspec.lock
--- 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.18
+version: 0.8.16
 environment:
  sdk: '>=3.1.0 <4.0.0'

--- a/setup.dart
+++ b/setup.dart
@@ -12,7 +12,10 @@ enum PlatformType {
  macos,
 }

-enum Arch { amd64, arm64, arm }
+enum Arch {
+  amd64,
+  arm64,
+}

 class BuildLibItem {
  PlatformType platform;
@@ -61,11 +64,6 @@ class Build {
          arch: Arch.amd64,
          archName: 'amd64',
        ),
-        BuildLibItem(
-          platform: PlatformType.android,
-          arch: Arch.arm,
-          archName: 'armeabi-v7a',
-        ),
        BuildLibItem(
          platform: PlatformType.android,
          arch: Arch.arm64,
@@ -336,7 +334,7 @@ class BuildCommand extends Command {
    final archName = argResults?['arch'];
    final currentArches =
        arches.where((element) => element.name == archName).toList();
-    final arch = currentArches.isEmpty ? null : currentArches.first;
+    final arch = currentArches.isEmpty ? null : arches.first;
    await _buildLib(arch);
    if (build != "all") {
      return;
@@ -359,11 +357,10 @@ class BuildCommand extends Command {
        break;
      case PlatformType.android:
        final targetMap = {
-          Arch.arm: "android-arm",
-          Arch.arm64: "android-arm64",
          Arch.amd64: "android-x64",
+          Arch.arm64: "android-arm64"
        };
-        final defaultArches = [Arch.arm, Arch.arm64, Arch.amd64];
+        final defaultArches = [Arch.amd64, Arch.arm64];
        final defaultTargets = defaultArches
            .where((element) => arch == null ? true : element == arch)
            .map((e) => targetMap[e])