use NSDataDetector to extract URI on macOS (#1638)

Author: boyan01

lib/utils/reg_exp_utils.dart

@@ -1,6 +1,5 @@
 final mentionRegExp = RegExp(r'@(\S*)$');
 final mentionNumberRegExp = RegExp(r'@(\d{4,})');
-// ignore: avoid-non-ascii-symbols
 final uriRegExp = RegExp(
     r'\b[a-zA-z+]+:(?://)?[\w-]+(?:\.[\w-]+)*(?:[\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?\b/?');
 final botNumberRegExp = RegExp(r'(?<!\d)7000\d{6}(?!\d)');

lib/widgets/high_light_text.dart

@@ -1,6 +1,7 @@
 import 'dart:math';
 import 'dart:ui' as ui;
 
+import 'package:data_detector/data_detector.dart';
 import 'package:emojis/emoji.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
@@ -507,8 +508,16 @@ class _MatchedSpans {
 
 class UrlTextMatcher extends TextMatcher implements EquatableMixin {
   UrlTextMatcher(BuildContext context)
-      : super.regExp(
-          regExp: uriRegExp,
+      : super.textRangesFromText(
+          textRangesFromText: (text) {
+            if (kPlatformIsDarwin) {
+              final dataDetector =
+                  DataDetector(NSTextCheckingType.NSTextCheckingTypeLink);
+              return dataDetector.matchesInString(text).map((e) => e.range);
+            } else {
+              return TextMatcher._textRangesFromText(text, uriRegExp);
+            }
+          },
           matchBuilder: (
             span,
             displayString,

macos/Podfile.lock

@@ -27,6 +27,8 @@ PODS:
     - FlutterMacOS
   - network_info_plus (0.0.1):
     - FlutterMacOS
+  - objective_c (0.0.1):
+    - FlutterMacOS
   - ogg_opus_player (0.0.1):
     - FlutterMacOS
   - package_info_plus (0.0.1):
@@ -90,6 +92,7 @@ DEPENDENCIES:
   - local_auth_darwin (from `Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin`)
   - mixin_logger (from `Flutter/ephemeral/.symlinks/plugins/mixin_logger/macos`)
   - network_info_plus (from `Flutter/ephemeral/.symlinks/plugins/network_info_plus/macos`)
+  - objective_c (from `Flutter/ephemeral/.symlinks/plugins/objective_c/macos`)
   - ogg_opus_player (from `Flutter/ephemeral/.symlinks/plugins/ogg_opus_player/macos`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
@@ -140,6 +143,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/mixin_logger/macos
   network_info_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/network_info_plus/macos
+  objective_c:
+    :path: Flutter/ephemeral/.symlinks/plugins/objective_c/macos
   ogg_opus_player:
     :path: Flutter/ephemeral/.symlinks/plugins/ogg_opus_player/macos
   package_info_plus:
@@ -184,6 +189,7 @@ SPEC CHECKSUMS:
   local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
   mixin_logger: 5e5bd35ba38da1ff4939ee5ec83260d7fc5258fc
   network_info_plus: aeb9c4ed699cae128bc94b9d0f04f2389a414cbb
+  objective_c: c13d3306e0fbf006bad001fd523e4bf8ebda8953
   ogg_opus_player: 67fc56771b16586b9b2478f848e632f751400604
   package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46

macos/Runner.xcodeproj/project.pbxproj

@@ -343,6 +343,7 @@
 				"${BUILT_PRODUCTS_DIR}/local_auth_darwin/local_auth_darwin.framework",
 				"${BUILT_PRODUCTS_DIR}/mixin_logger/mixin_logger.framework",
 				"${BUILT_PRODUCTS_DIR}/network_info_plus/network_info_plus.framework",
+				"${BUILT_PRODUCTS_DIR}/objective_c/objective_c.framework",
 				"${BUILT_PRODUCTS_DIR}/ogg_opus_player/ogg_opus_player.framework",
 				"${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
@@ -374,6 +375,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth_darwin.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/mixin_logger.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/network_info_plus.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/objective_c.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ogg_opus_player.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",

pubspec.lock

@@ -360,6 +360,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.6"
+  data_detector:
+    dependency: "direct main"
+    description:
+      path: "packages/data_detector"
+      ref: "66a8ed5f955fa35c9aaac76842b9dab83c51db92"
+      resolved-ref: "66a8ed5f955fa35c9aaac76842b9dab83c51db92"
+      url: "https://github.com/MixinNetwork/flutter-plugins.git"
+    source: git
+    version: "0.0.1"
   dbus:
     dependency: "direct main"
     description:
@@ -1344,6 +1353,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "77c341fce45bb3865a7bc3ddee4201605799e3de2f7af200e8dae26369d210ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   octo_image:
     dependency: "direct main"
     description:
@@ -1873,8 +1890,8 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/string_tokenizer"
-      ref: "0334bbaa7293c72398eaf4571ba7ba2b5df2302d"
-      resolved-ref: "0334bbaa7293c72398eaf4571ba7ba2b5df2302d"
+      ref: "66a8ed5f955fa35c9aaac76842b9dab83c51db92"
+      resolved-ref: "66a8ed5f955fa35c9aaac76842b9dab83c51db92"
       url: "https://github.com/MixinNetwork/flutter-plugins.git"
     source: git
     version: "0.0.1"
@@ -2313,5 +2330,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.5.0-259.0.dev <4.0.0"
+  dart: ">=3.5.0 <4.0.0"
   flutter: ">=3.22.0"

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: none
 version: 1.10.1+285
 
 environment:
-  sdk: '^3.2.0'
+  sdk: '^3.5.0'
 
 dependencies:
   android_id: ^0.4.0
@@ -121,7 +121,7 @@ dependencies:
     git:
       url: https://github.com/MixinNetwork/flutter-plugins.git
       path: packages/string_tokenizer
-      ref: 0334bbaa7293c72398eaf4571ba7ba2b5df2302d
+      ref: 66a8ed5f955fa35c9aaac76842b9dab83c51db92
   super_clipboard: ^0.8.19
   super_context_menu: ^0.8.19
   super_native_extensions: ^0.8.19
@@ -158,6 +158,12 @@ dependencies:
       ref: 210839e1e9311bcddeb733297a565721692033ee
   hexagon: ^0.2.0
   breakpad_client: ^0.0.2
+  data_detector:
+    git:
+      url: https://github.com/MixinNetwork/flutter-plugins.git
+      ref: 66a8ed5f955fa35c9aaac76842b9dab83c51db92
+      path: packages/data_detector
+
 dev_dependencies:
   build_runner: ^2.4.8
   debug_info_collector: