Fix android repeated request notification issues

Fix memory overflow issues
Optimize proxies expansion panel 2
2024-06-28 21:16:47 +08:00 · 2024-06-28 07:49:06 +08:00 · 2024-06-27 19:39:49 +08:00 · 2024-06-27 15:54:10 +08:00
24 changed files with 4809 additions and 134 deletions
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
@@ -44,6 +44,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
    private var props: Props? = null
    private lateinit var title: String
    private lateinit var content: String
+    var isBlockNotification: Boolean = false

    private val connection = object : ServiceConnection {
        override fun onServiceConnected(className: ComponentName, service: IBinder) {
@@ -152,13 +153,14 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
            if (permission == PackageManager.PERMISSION_GRANTED) {
                startForeground()
            } else {
-                activity?.let {
-                    ActivityCompat.requestPermissions(
-                        it,
-                        arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                        NOTIFICATION_PERMISSION_REQUEST_CODE
-                    )
-                }
+                if (isBlockNotification) return
+                if (activity == null) return
+                ActivityCompat.requestPermissions(
+                    activity!!,
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                    NOTIFICATION_PERMISSION_REQUEST_CODE
+                )
+
            }
        } else {
            startForeground()
@@ -192,11 +194,14 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
        grantResults: IntArray
    ): Boolean {
        if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                startForeground()
+            isBlockNotification = true
+            if (grantResults.isNotEmpty()) {
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    startForeground()
+                }
            }
        }
-        return true;
+        return false;
    }


--- a/core/dart-bridge/lib.go
+++ b/core/dart-bridge/lib.go
@@ -1,6 +1,7 @@
 package dart_bridge

 /*
+#include <stdlib.h>
 #include "stdint.h"
 #include "include/dart_api_dl.h"
 #include "include/dart_api_dl.c"
@@ -28,6 +29,7 @@ func SendToPort(port int64, msg string) {
 	var obj C.Dart_CObject
 	obj._type = C.Dart_CObject_kString
 	msgString := C.CString(msg)
+	defer C.free(unsafe.Pointer(msgString))
 	ptr := unsafe.Pointer(&obj.value[0])
 	*(**C.char)(ptr) = msgString
 	isSuccess := C.GoDart_PostCObject(C.Dart_Port_DL(port), &obj)
--- a/core/hub.go
+++ b/core/hub.go
@@ -1,5 +1,8 @@
 package main

+/*
+#include <stdlib.h>
+*/
 import "C"
 import (
 	bridge "core/dart-bridge"
@@ -71,8 +74,8 @@ func forceGc() {
 //export validateConfig
 func validateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
+	bytes := []byte(C.GoString(s))
 	go func() {
-		bytes := []byte(C.GoString(s))
 		_, err := config.UnmarshalRawConfig(bytes)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
@@ -85,8 +88,8 @@ func validateConfig(s *C.char, port C.longlong) {
 //export updateConfig
 func updateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &GenerateConfigParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -148,8 +151,8 @@ func getProxies() *C.char {

 //export changeProxy
 func changeProxy(s *C.char) bool {
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &ChangeProxyParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -211,8 +214,8 @@ func resetTraffic() {
 //export asyncTestDelay
 func asyncTestDelay(s *C.char, port C.longlong) {
 	i := int64(port)
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -296,7 +299,6 @@ func closeConnections() bool {
 //export closeConnection
 func closeConnection(id *C.char) bool {
 	connectionId := C.GoString(id)
-
 	err := statistic.DefaultManager.Get(connectionId).Close()
 	if err != nil {
 		return false
@@ -307,10 +309,13 @@ func closeConnection(id *C.char) bool {
 //export getProviders
 func getProviders() *C.char {
 	data, err := json.Marshal(tunnel.Providers())
+	var msg *C.char
 	if err != nil {
-		return C.CString("")
+		msg = C.CString("")
+		return msg
 	}
-	return C.CString(string(data))
+	msg = C.CString(string(data))
+	return msg
 }

 //export getProvider
@@ -360,10 +365,9 @@ func getExternalProviders() *C.char {
 //export updateExternalProvider
 func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
 	i := int64(port)
+	providerNameString := C.GoString(providerName)
+	providerTypeString := C.GoString(providerType)
 	go func() {
-		providerNameString := C.GoString(providerName)
-		providerTypeString := C.GoString(providerType)
-
 		switch providerTypeString {
 		case "Proxy":
 			providers := tunnel.Providers()
@@ -409,6 +413,11 @@ func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
 	bridge.Port = &i
 }

+//export freeCString
+func freeCString(s *C.char) {
+	C.free(unsafe.Pointer(s))
+}
+
 func init() {
 	provider.HealthcheckHook = func(name string, delay uint16) {
 		delayData := &Delay{
--- a/core/process.go
+++ b/core/process.go
@@ -71,8 +71,8 @@ func setProcessMap(s *C.char) {
 	if s == nil {
 		return
 	}
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var processMapItem = &ProcessMapItem{}
 		err := json.Unmarshal([]byte(paramsString), processMapItem)
 		if err == nil {
--- a/lib/application.dart
+++ b/lib/application.dart
@@ -164,7 +164,6 @@ class ApplicationState extends State<Application> {
                    themeMode: state.themeMode,
                    theme: ThemeData(
                      useMaterial3: true,
-                      fontFamily: '',
                      pageTransitionsTheme: _pageTransitionsTheme,
                      colorScheme: _getAppColorScheme(
                        brightness: Brightness.light,
@@ -174,7 +173,6 @@ class ApplicationState extends State<Application> {
                    ),
                    darkTheme: ThemeData(
                      useMaterial3: true,
-                      fontFamily: '',
                      pageTransitionsTheme: _pageTransitionsTheme,
                      colorScheme: _getAppColorScheme(
                        brightness: Brightness.dark,
--- a/lib/clash/core.dart
+++ b/lib/clash/core.dart
@@ -45,10 +45,10 @@ class ClashCore {
  }

  bool init(String homeDir) {
-    return clashFFI.initClash(
-      homeDir.toNativeUtf8().cast(),
-    ) ==
-        1;
+    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
+    final isInit = clashFFI.initClash(homeDirChar) == 1;
+    malloc.free(homeDirChar);
+    return isInit;
  }

  shutdown() {
@@ -67,10 +67,12 @@ class ClashCore {
        receiver.close();
      }
    });
+    final dataChar = data.toNativeUtf8().cast<Char>();
    clashFFI.validateConfig(
-      data.toNativeUtf8().cast(),
+      dataChar,
      receiver.sendPort.nativePort,
    );
+    malloc.free(dataChar);
    return completer.future;
  }

@@ -84,20 +86,23 @@ class ClashCore {
      }
    });
    final params = json.encode(updateConfigParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
    clashFFI.updateConfig(
-      params.toNativeUtf8().cast(),
+      paramsChar,
      receiver.sendPort.nativePort,
    );
+    malloc.free(paramsChar);
    return completer.future;
  }

  Future<List<Group>> getProxiesGroups() {
    final proxiesRaw = clashFFI.getProxies();
    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(proxiesRaw);
    return Isolate.run<List<Group>>(() {
-      if(proxiesRawString.isEmpty) return [];
-      final proxies = json.decode(proxiesRawString) as Map;
-      if(proxies.isEmpty) return [];
+      if (proxiesRawString.isEmpty) return [];
+      final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
+      if (proxies.isEmpty) return [];
      final groupNames = [
        UsedProxy.GLOBAL.name,
        ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
@@ -111,7 +116,7 @@ class ClashCore {
        group["all"] = ((group["all"] ?? []) as List)
            .map(
              (name) => proxies[name],
-        )
+            )
            .toList();
        return group;
      }).toList();
@@ -122,14 +127,15 @@ class ClashCore {
  Future<List<ExternalProvider>> getExternalProviders() {
    final externalProvidersRaw = clashFFI.getExternalProviders();
    final externalProvidersRawString =
-    externalProvidersRaw.cast<Utf8>().toDartString();
+        externalProvidersRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(externalProvidersRaw);
    return Isolate.run<List<ExternalProvider>>(() {
      final externalProviders =
-      (json.decode(externalProvidersRawString) as List<dynamic>)
-          .map(
-            (item) => ExternalProvider.fromJson(item),
-      )
-          .toList();
+          (json.decode(externalProvidersRawString) as List<dynamic>)
+              .map(
+                (item) => ExternalProvider.fromJson(item),
+              )
+              .toList();
      return externalProviders;
    });
  }
@@ -146,17 +152,24 @@ class ClashCore {
        receiver.close();
      }
    });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
    clashFFI.updateExternalProvider(
-      providerName.toNativeUtf8().cast(),
-      providerType.toNativeUtf8().cast(),
+      providerNameChar,
+      providerTypeChar,
      receiver.sendPort.nativePort,
    );
+    malloc.free(providerNameChar);
+    malloc.free(providerTypeChar);
    return completer.future;
  }

  bool changeProxy(ChangeProxyParams changeProxyParams) {
    final params = json.encode(changeProxyParams);
-    return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
+    final paramsChar = params.toNativeUtf8().cast<Char>();
+    final isInit = clashFFI.changeProxy(paramsChar) == 1;
+    malloc.free(paramsChar);
+    return isInit;
  }

  Future<Delay> getDelay(String proxyName) {
@@ -172,13 +185,15 @@ class ClashCore {
        receiver.close();
      }
    });
+    final delayParamsChar = json.encode(delayParams).toNativeUtf8().cast<Char>();
    clashFFI.asyncTestDelay(
-      json.encode(delayParams).toNativeUtf8().cast(),
+      delayParamsChar,
      receiver.sendPort.nativePort,
    );
+    malloc.free(delayParamsChar);
    Future.delayed(httpTimeoutDuration + moreDuration, () {
      receiver.close();
-      if(!completer.isCompleted){
+      if (!completer.isCompleted) {
        completer.complete(
          Delay(name: proxyName, value: -1),
        );
@@ -188,28 +203,33 @@ class ClashCore {
  }

  clearEffect(String path) {
-    clashFFI.clearEffect(path.toNativeUtf8().cast());
+    final pathChar = path.toNativeUtf8().cast<Char>();
+    clashFFI.clearEffect(pathChar);
+    malloc.free(pathChar);
  }

  VersionInfo getVersionInfo() {
    final versionInfoRaw = clashFFI.getVersionInfo();
    final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(versionInfoRaw);
    return VersionInfo.fromJson(versionInfo);
  }

  Traffic getTraffic() {
    final trafficRaw = clashFFI.getTraffic();
    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(trafficRaw);
    return Traffic.fromMap(trafficMap);
  }

  Traffic getTotalTraffic() {
    final trafficRaw = clashFFI.getTotalTraffic();
    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(trafficRaw);
    return Traffic.fromMap(trafficMap);
  }

-  void resetTraffic(){
+  void resetTraffic() {
    clashFFI.resetTraffic();
  }

@@ -234,7 +254,9 @@ class ClashCore {
  }

  void setProcessMap(ProcessMapItem processMapItem) {
-    clashFFI.setProcessMap(json.encode(processMapItem).toNativeUtf8().cast());
+    final processMapItemChar = json.encode(processMapItem).toNativeUtf8().cast<Char>();
+    clashFFI.setProcessMap(processMapItemChar);
+    malloc.free(processMapItemChar);
  }

  // DateTime? getRunTime() {
@@ -246,13 +268,16 @@ class ClashCore {
  List<Connection> getConnections() {
    final connectionsDataRaw = clashFFI.getConnections();
    final connectionsData =
-    json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
+        json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
+    clashFFI.freeCString(connectionsDataRaw);
    final connectionsRaw = connectionsData['connections'] as List? ?? [];
    return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
  }

  closeConnections(String id) {
-    clashFFI.closeConnection(id.toNativeUtf8().cast());
+    final idChar = id.toNativeUtf8().cast<Char>();
+    clashFFI.closeConnection(idChar);
+    malloc.free(idChar);
  }
 }

--- a/lib/clash/generated/clash_ffi.dart
+++ b/lib/clash/generated/clash_ffi.dart
--- a/lib/common/android.dart
+++ b/lib/common/android.dart
@@ -7,7 +7,6 @@ class Android {
  init() async {
    app?.onExit = () {
      clashCore.shutdown();
-      print("adsadda==>");
      exit(0);
    };
  }
--- a/lib/common/context.dart
+++ b/lib/common/context.dart
@@ -7,8 +7,12 @@ extension BuildContextExtension on BuildContext {
    return findAncestorStateOfType<CommonScaffoldState>();
  }

+  Size get appSize{
+    return MediaQuery.of(this).size;
+  }
+
  double get width {
-    return MediaQuery.of(this).size.width;
+    return appSize.width;
  }

  ColorScheme get colorScheme => Theme.of(this).colorScheme;
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -359,7 +359,9 @@ class AppController {
  }

  addProfileFormURL(String url) async {
-    globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
+    if (globalState.navigatorKey.currentState?.canPop() ?? false) {
+      globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
+    }
    toProfiles();
    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
    if (commonScaffoldState?.mounted != true) return;
@@ -421,18 +423,17 @@ class AppController {
    });
  }

-
  List<Proxy> _sortOfName(List<Proxy> proxies) {
    return List.of(proxies)
      ..sort(
-            (a, b) => other.sortByChar(a.name, b.name),
+        (a, b) => other.sortByChar(a.name, b.name),
      );
  }

  List<Proxy> _sortOfDelay(List<Proxy> proxies) {
    return proxies = List.of(proxies)
      ..sort(
-            (a, b) {
+        (a, b) {
          final aDelay = appState.getDelay(a.name);
          final bDelay = appState.getDelay(b.name);
          if (aDelay == null && bDelay == null) {
@@ -449,11 +450,11 @@ class AppController {
      );
  }

-  List<Proxy> getSortProxies(List<Proxy> proxies){
-    return switch(config.proxiesSortType){
+  List<Proxy> getSortProxies(List<Proxy> proxies) {
+    return switch (config.proxiesSortType) {
      ProxiesSortType.none => proxies,
      ProxiesSortType.delay => _sortOfDelay(proxies),
-      ProxiesSortType.name =>_sortOfName(proxies),
+      ProxiesSortType.name => _sortOfName(proxies),
    };
  }
 }
--- a/lib/fragments/connections.dart
+++ b/lib/fragments/connections.dart
@@ -198,7 +198,7 @@ class ConnectionItem extends StatelessWidget {
  }

  String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}:://";
+    var text = "${metadata.network}://";
    final ips = [
      metadata.host,
      metadata.destinationIP,
--- a/lib/fragments/dashboard/dashboard.dart
+++ b/lib/fragments/dashboard/dashboard.dart
@@ -56,7 +56,7 @@ class _DashboardFragmentState extends State<DashboardFragment> {
                  ),
                  GridItem(
                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const IntranetIp(),
+                    child: const IntranetIP(),
                  ),
                ],
              );
--- a/lib/fragments/dashboard/intranet_ip.dart
+++ b/lib/fragments/dashboard/intranet_ip.dart
@@ -5,14 +5,14 @@ import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';

-class IntranetIp extends StatefulWidget {
-  const IntranetIp({super.key});
+class IntranetIP extends StatefulWidget {
+  const IntranetIP({super.key});

  @override
-  State<IntranetIp> createState() => _IntranetIpState();
+  State<IntranetIP> createState() => _IntranetIPState();
 }

-class _IntranetIpState extends State<IntranetIp> {
+class _IntranetIPState extends State<IntranetIP> {
  final ipNotifier = ValueNotifier<String>("");

  Future<String?> getLocalIpAddress() async {
@@ -45,7 +45,7 @@ class _IntranetIpState extends State<IntranetIp> {
  Widget build(BuildContext context) {
    return CommonCard(
      info: Info(
-        label: appLocalizations.intranetIp,
+        label: appLocalizations.intranetIP,
        iconData: Icons.devices,
      ),
      onPressed: (){
--- a/lib/fragments/profiles/add_profile.dart
+++ b/lib/fragments/profiles/add_profile.dart
@@ -25,7 +25,9 @@ class AddProfile extends StatelessWidget {
    final url = await Navigator.of(context)
        .push<String>(MaterialPageRoute(builder: (_) => const ScanPage()));
    if (url != null) {
-      _handleAddProfileFormURL(url);
+      WidgetsBinding.instance.addPostFrameCallback((_){
+        _handleAddProfileFormURL(url);
+      });
    }
  }

@@ -91,7 +93,8 @@ class _URLFormDialogState extends State<URLFormDialog> {
          runSpacing: 16,
          children: [
            TextField(
-              maxLines: null,
+              maxLines: 5,
+              minLines: 1,
              controller: urlController,
              decoration: InputDecoration(
                border: const OutlineInputBorder(),
--- a/lib/fragments/profiles/edit_profile.dart
+++ b/lib/fragments/profiles/edit_profile.dart
@@ -94,7 +94,8 @@ class _EditProfileState extends State<EditProfile> {
        ListItem(
          title: TextFormField(
            controller: urlController,
-            maxLines: null,
+            maxLines: 5,
+            minLines: 1,
            decoration: InputDecoration(
              border: const OutlineInputBorder(),
              labelText: appLocalizations.url,
--- a/lib/fragments/profiles/profiles.dart
+++ b/lib/fragments/profiles/profiles.dart
@@ -55,7 +55,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
  _updateProfiles() async {
    final updateProfiles = profileItemKeys.map<Future>(
        (key) async => await key.currentState?.updateProfile(false));
-    final result = await Future.wait(updateProfiles);
+    await Future.wait(updateProfiles);
  }

  _initScaffoldState() {
@@ -437,16 +437,16 @@ class _ProfileItemState extends State<ProfileItem> {
                                label: appLocalizations.update,
                                iconData: Icons.sync,
                              ),
-                            CommonPopupMenuItem(
-                              action: ProfileActions.delete,
-                              label: appLocalizations.delete,
-                              iconData: Icons.delete,
-                            ),
                            CommonPopupMenuItem(
                              action: ProfileActions.view,
                              label: appLocalizations.view,
                              iconData: Icons.visibility,
                            ),
+                            CommonPopupMenuItem(
+                              action: ProfileActions.delete,
+                              label: appLocalizations.delete,
+                              iconData: Icons.delete,
+                            ),
                          ],
                          onSelected: (ProfileActions? action) async {
                            switch (action) {
--- a/lib/fragments/proxies.dart
+++ b/lib/fragments/proxies.dart
@@ -1,3 +1,6 @@
+import 'dart:io';
+import 'dart:math';
+
 import 'package:collection/collection.dart';
 import 'package:fl_clash/clash/core.dart';
 import 'package:fl_clash/common/common.dart';
@@ -245,7 +248,7 @@ class _ProxiesExpansionPanelFragmentState
          itemBuilder: (_, index) {
            final groupName = state.groupNames[index];
            return ProxyGroupView(
-              key: Key(groupName),
+              key: PageStorageKey(groupName),
              groupName: groupName,
              type: ProxiesType.expansion,
            );
@@ -277,6 +280,9 @@ class ProxyGroupView extends StatefulWidget {

 class _ProxyGroupViewState extends State<ProxyGroupView> {
  var isLock = false;
+  final isBoundaryNotifier = ValueNotifier<bool>(false);
+  final scrollController = ScrollController();
+  var isEnd = false;

  String get groupName => widget.groupName;

@@ -368,6 +374,53 @@ class _ProxyGroupViewState extends State<ProxyGroupView> {
    );
  }

+  Widget _androidExpansionHandle(Widget child) {
+    // return NotificationListener<ScrollNotification>(
+    //   onNotification: (ScrollNotification notification) {
+    //     if (notification is ScrollEndNotification) {
+    //       if (notification.metrics.atEdge) {
+    //         isEnd = notification.metrics.pixels ==
+    //             notification.metrics.maxScrollExtent;
+    //         isBoundaryNotifier.value = true;
+    //       }
+    //     }
+    //     return false;
+    //   },
+    //   child: Listener(
+    //     onPointerMove: (details) {
+    //       double yOffset = details.delta.dy;
+    //       final isEnd = scrollController.position.maxScrollExtent == scrollController.position.pixels;
+    //       final isTop = scrollController.position.minScrollExtent == scrollController.position.pixels;
+    //       if(isEnd || isTop){
+    //         isBoundaryNotifier.value = true;
+    //       } else if (yOffset > 0 && scrollController.position.maxScrollExtent == scrollController.position.pixels) {
+    //         isBoundaryNotifier.value = false;
+    //       } else if (yOffset < 0 && !isEnd) {
+    //         isBoundaryNotifier.value = false;
+    //       }
+    //     },
+    //     child: child,
+    //   ),
+    // );
+    return Listener(
+      onPointerMove: (details) {
+        double yOffset = details.delta.dy;
+        final isEnd = scrollController.position.maxScrollExtent ==
+            scrollController.position.pixels;
+        final isTop = scrollController.position.minScrollExtent ==
+            scrollController.position.pixels;
+        if (isEnd && yOffset < 0) {
+          isBoundaryNotifier.value = true;
+        } else if (isTop && yOffset > 0) {
+          isBoundaryNotifier.value = true;
+        } else {
+          isBoundaryNotifier.value = false;
+        }
+      },
+      child: child,
+    );
+  }
+
  Widget _buildExpansionGroupView({
    required List<Proxy> proxies,
    required int columns,
@@ -376,11 +429,21 @@ class _ProxyGroupViewState extends State<ProxyGroupView> {
    final sortedProxies = globalState.appController.getSortProxies(
      proxies,
    );
+    final group =
+        globalState.appController.appState.getGroupWithName(groupName)!;
+    final itemHeight = _getItemHeight(proxyCardType);
+    final innerHeight = context.appSize.height - 200;
+    final lines = (sortedProxies.length / columns).ceil();
+    final minLines =
+        innerHeight >= 200 ? (innerHeight / itemHeight).floor() : 3;
+    final hasScrollable = lines > minLines;
+    final height = (itemHeight + 8) * min(lines, minLines) - 8;
    return Selector<Config, Set<String>>(
      selector: (_, config) => config.currentUnfoldSet,
      builder: (_, currentUnfoldSet, __) {
        return CommonCard(
          child: ExpansionTile(
+            childrenPadding: const EdgeInsets.all(8),
            initiallyExpanded: currentUnfoldSet.contains(groupName),
            iconColor: context.colorScheme.onSurfaceVariant,
            onExpansionChanged: (value) {
@@ -417,7 +480,7 @@ class _ProxyGroupViewState extends State<ProxyGroupView> {
                          crossAxisAlignment: CrossAxisAlignment.center,
                          children: [
                            Text(
-                              groupName,
+                              group.type.name,
                              style: context.textTheme.labelMedium?.toLight,
                            ),
                            Flexible(
@@ -478,32 +541,78 @@ class _ProxyGroupViewState extends State<ProxyGroupView> {
            collapsedShape: const RoundedRectangleBorder(
              side: BorderSide.none,
            ),
-            childrenPadding: const EdgeInsets.only(
-              top: 8,
-              bottom: 8,
-              left: 8,
-              right: 8,
-            ),
            children: [
-              Grid(
-                mainAxisSpacing: 8,
-                crossAxisSpacing: 8,
-                crossAxisCount: columns,
-                children: [
-                  for (final proxy in sortedProxies)
-                    _currentProxyNameBuilder(
-                      builder: (value) {
-                        return ProxyCard(
-                          style: CommonCardType.filled,
-                          type: proxyCardType,
-                          isSelected: value == proxy.name,
-                          key: ValueKey('$groupName.${proxy.name}'),
-                          proxy: proxy,
-                          groupName: groupName,
-                        );
-                      },
-                    ),
-                ],
+              SizedBox(
+                height: height,
+                child: Platform.isAndroid
+                    ? _androidExpansionHandle(
+                        ValueListenableBuilder(
+                          valueListenable: isBoundaryNotifier,
+                          builder: (_, isBoundary, child) {
+                            return Scrollbar(
+                              thickness: 6,
+                              interactive: true,
+                              radius: const Radius.circular(6),
+                              child: GridView.builder(
+                                key: widget.key,
+                                controller: scrollController,
+                                physics: isBoundary || !hasScrollable
+                                    ? const NeverScrollableScrollPhysics()
+                                    : const AlwaysScrollableScrollPhysics(),
+                                gridDelegate:
+                                    SliverGridDelegateWithFixedCrossAxisCount(
+                                  crossAxisCount: columns,
+                                  mainAxisSpacing: 8,
+                                  crossAxisSpacing: 8,
+                                  mainAxisExtent: _getItemHeight(proxyCardType),
+                                ),
+                                itemCount: sortedProxies.length,
+                                itemBuilder: (_, index) {
+                                  final proxy = sortedProxies[index];
+                                  return _currentProxyNameBuilder(
+                                      builder: (value) {
+                                    return ProxyCard(
+                                      style: CommonCardType.filled,
+                                      type: proxyCardType,
+                                      isSelected: value == proxy.name,
+                                      key: ValueKey('$groupName.${proxy.name}'),
+                                      proxy: proxy,
+                                      groupName: groupName,
+                                    );
+                                  });
+                                },
+                              ),
+                            );
+                          },
+                        ),
+                      )
+                    : GridView.builder(
+                        key: widget.key,
+                        controller: scrollController,
+                        physics: !hasScrollable
+                            ? const NeverScrollableScrollPhysics()
+                            : const AlwaysScrollableScrollPhysics(),
+                        gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                          crossAxisCount: columns,
+                          mainAxisSpacing: 8,
+                          crossAxisSpacing: 8,
+                          mainAxisExtent: _getItemHeight(proxyCardType),
+                        ),
+                        itemCount: sortedProxies.length,
+                        itemBuilder: (_, index) {
+                          final proxy = sortedProxies[index];
+                          return _currentProxyNameBuilder(builder: (value) {
+                            return ProxyCard(
+                              style: CommonCardType.filled,
+                              type: proxyCardType,
+                              isSelected: value == proxy.name,
+                              key: ValueKey('$groupName.${proxy.name}'),
+                              proxy: proxy,
+                              groupName: groupName,
+                            );
+                          });
+                        },
+                      ),
              ),
            ],
          ),
@@ -512,6 +621,13 @@ class _ProxyGroupViewState extends State<ProxyGroupView> {
    );
  }

+  @override
+  void dispose() {
+    super.dispose();
+    isBoundaryNotifier.dispose();
+    scrollController.dispose();
+  }
+
  @override
  Widget build(BuildContext context) {
    return Selector2<AppState, Config, ProxyGroupSelectorState>(
--- a/lib/fragments/requests.dart
+++ b/lib/fragments/requests.dart
@@ -193,7 +193,7 @@ class RequestItem extends StatelessWidget {
  }

  String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}:://";
+    var text = "${metadata.network}://";
    final ips = [
      metadata.host,
      metadata.destinationIP,
--- a/lib/l10n/arb/intl_en.arb
+++ b/lib/l10n/arb/intl_en.arb
@@ -161,7 +161,6 @@
  "checking": "Checking...",
  "country": "Country",
  "checkError": "Check error",
-  "ipCheckTimeout": "Ip check timeout",
  "search": "Search",
  "allowBypass": "Allow applications to bypass VPN",
  "allowBypassDesc": "Some apps can bypass VPN when turned on",
@@ -173,8 +172,8 @@
  "systemProxyDesc": "Attach HTTP proxy to VpnService",
  "unifiedDelay": "Unified delay",
  "unifiedDelayDesc": "Remove extra delays such as handshaking",
-  "tcpConcurrent": "Tcp concurrent",
-  "tcpConcurrentDesc": "Enabling it will allow tcp concurrency",
+  "tcpConcurrent": "TCP concurrent",
+  "tcpConcurrentDesc": "Enabling it will allow TCP concurrency",
  "geodataLoader": "Geo Low Memory Mode",
  "geodataLoaderDesc": "Enabling will use the Geo low memory loader",
  "requests": "Requests",
@@ -188,7 +187,7 @@
  "connectionsDesc": "View current connection",
  "nullRequestsDesc": "No requests",
  "nullConnectionsDesc": "No connections",
-  "intranetIp": "Intranet IP",
+  "intranetIP": "Intranet IP",
  "view": "View",
  "cut": "Cut",
  "copy": "Copy",
--- a/lib/l10n/arb/intl_zh_CN.arb
+++ b/lib/l10n/arb/intl_zh_CN.arb
@@ -161,7 +161,6 @@
  "checking": "检测中...",
  "country": "区域",
  "checkError": "检测失败",
-  "ipCheckTimeout": "Ip检测超时",
  "search": "搜索",
  "allowBypass": "允许应用绕过VPN",
  "allowBypassDesc": "开启后部分应用可绕过VPN",
@@ -174,7 +173,7 @@
  "unifiedDelay": "统一延迟",
  "unifiedDelayDesc": "去除握手等额外延迟",
  "tcpConcurrent": "TCP并发",
-  "tcpConcurrentDesc": "开启后允许tcp并发",
+  "tcpConcurrentDesc": "开启后允许TCP并发",
  "geodataLoader": "Geo低内存模式",
  "geodataLoaderDesc": "开启将使用Geo低内存加载器",
  "requests": "请求",
@@ -188,7 +187,7 @@
  "connectionsDesc": "查看当前连接",
  "nullRequestsDesc": "暂无请求",
  "nullConnectionsDesc": "暂无连接",
-  "intranetIp": "内网 IP",
+  "intranetIP": "内网 IP",
  "view": "查看",
  "cut": "剪切",
  "copy": "复制",
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -152,9 +152,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "infiniteTime":
            MessageLookupByLibrary.simpleMessage("Long term effective"),
        "init": MessageLookupByLibrary.simpleMessage("Init"),
-        "intranetIp": MessageLookupByLibrary.simpleMessage("Intranet IP"),
-        "ipCheckTimeout":
-            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
+        "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
        "ipv6Desc": MessageLookupByLibrary.simpleMessage(
            "When turned on it will be able to receive IPv6 traffic"),
        "just": MessageLookupByLibrary.simpleMessage("Just"),
@@ -268,9 +266,9 @@ class MessageLookup extends MessageLookupByLibrary {
        "tabAnimation": MessageLookupByLibrary.simpleMessage("Tab animation"),
        "tabAnimationDesc": MessageLookupByLibrary.simpleMessage(
            "When enabled, the home tab will add a toggle animation"),
-        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("Tcp concurrent"),
+        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP concurrent"),
        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage(
-            "Enabling it will allow tcp concurrency"),
+            "Enabling it will allow TCP concurrency"),
        "theme": MessageLookupByLibrary.simpleMessage("Theme"),
        "themeColor": MessageLookupByLibrary.simpleMessage("Theme color"),
        "themeDesc": MessageLookupByLibrary.simpleMessage(
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/lib/l10n/intl/messages_zh_CN.dart
@@ -123,8 +123,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
        "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
        "init": MessageLookupByLibrary.simpleMessage("初始化"),
-        "intranetIp": MessageLookupByLibrary.simpleMessage("内网 IP"),
-        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
+        "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
        "just": MessageLookupByLibrary.simpleMessage("刚刚"),
        "language": MessageLookupByLibrary.simpleMessage("语言"),
@@ -217,7 +216,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "tabAnimationDesc":
            MessageLookupByLibrary.simpleMessage("开启后，主页选项卡将添加切换动画"),
        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP并发"),
-        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage("开启后允许tcp并发"),
+        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage("开启后允许TCP并发"),
        "theme": MessageLookupByLibrary.simpleMessage("主题"),
        "themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"),
        "themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式，调整色彩"),
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -1670,16 +1670,6 @@ class AppLocalizations {
    );
  }

-  /// `Ip check timeout`
-  String get ipCheckTimeout {
-    return Intl.message(
-      'Ip check timeout',
-      name: 'ipCheckTimeout',
-      desc: '',
-      args: [],
-    );
-  }
-
  /// `Search`
  String get search {
    return Intl.message(
@@ -1790,20 +1780,20 @@ class AppLocalizations {
    );
  }

-  /// `Tcp concurrent`
+  /// `TCP concurrent`
  String get tcpConcurrent {
    return Intl.message(
-      'Tcp concurrent',
+      'TCP concurrent',
      name: 'tcpConcurrent',
      desc: '',
      args: [],
    );
  }

-  /// `Enabling it will allow tcp concurrency`
+  /// `Enabling it will allow TCP concurrency`
  String get tcpConcurrentDesc {
    return Intl.message(
-      'Enabling it will allow tcp concurrency',
+      'Enabling it will allow TCP concurrency',
      name: 'tcpConcurrentDesc',
      desc: '',
      args: [],
@@ -1941,10 +1931,10 @@ class AppLocalizations {
  }

  /// `Intranet IP`
-  String get intranetIp {
+  String get intranetIP {
    return Intl.message(
      'Intranet IP',
-      name: 'intranetIp',
+      name: 'intranetIP',
      desc: '',
      args: [],
    );
--- 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.28
+version: 0.8.32
 environment:
  sdk: '>=3.1.0 <4.0.0'
Author	SHA1	Message	Date
chen08209	07bd21580b	Fix android repeated request notification issues	2024-06-28 21:16:47 +08:00
chen08209	57ceb64a5e	Fix memory overflow issues	2024-06-28 07:49:06 +08:00
chen08209	713e83d9d8	Optimize proxies expansion panel 2 Fix android scan qrcode error	2024-06-27 19:39:49 +08:00
chen08209	5e3b0e4929	Optimize proxies expansion panel Fix text error	2024-06-27 15:54:10 +08:00