From 4588d829f60d1af4faec6c4acdf6b3c1892a0b5b Mon Sep 17 00:00:00 2001 From: wanghongenpin Date: Fri, 25 Oct 2024 17:57:20 +0800 Subject: [PATCH] Change the project name to 'proxypin' --- README_EN.md | 2 +- ios/Runner.xcodeproj/project.pbxproj | 8 +-- lib/main.dart | 18 +++---- lib/native/app_lifecycle.dart | 2 +- lib/native/pip.dart | 10 ++-- lib/native/process_info.dart | 2 +- lib/native/vpn.dart | 2 +- lib/network/bin/configuration.dart | 12 ++--- lib/network/bin/server.dart | 14 ++--- lib/network/channel.dart | 22 ++++---- lib/network/components/interceptor.dart | 2 +- lib/network/components/js/file.dart | 2 +- lib/network/components/js/md5.dart | 2 +- .../components/request_rewrite_component.dart | 12 ++--- .../rewrite/request_rewrite_manager.dart | 10 ++-- .../components/rewrite/rewrite_rule.dart | 4 +- lib/network/components/script_manager.dart | 16 +++--- lib/network/handler.dart | 24 ++++----- lib/network/host_port.dart | 4 +- lib/network/http/body_reader.dart | 4 +- lib/network/http/codec.dart | 12 ++--- lib/network/http/content_type.dart | 2 +- lib/network/http/h2/codec.dart | 12 ++--- lib/network/http/h2/hpack.dart | 4 +- lib/network/http/h2/setting.dart | 6 +-- lib/network/http/http.dart | 12 ++--- lib/network/http/http_parser.dart | 6 +-- lib/network/http_client.dart | 10 ++-- lib/network/network.dart | 16 +++--- lib/network/proxy_helper.dart | 20 +++---- lib/network/util/cert/der.dart | 2 +- lib/network/util/cert/x509.dart | 4 +- lib/network/util/crts.dart | 14 ++--- lib/network/util/file_read.dart | 2 +- lib/network/util/localizations.dart | 2 +- lib/network/util/process_info.dart | 6 +-- lib/network/util/system_proxy.dart | 6 +-- lib/storage/favorites.dart | 6 +-- lib/storage/histories.dart | 15 +++--- lib/ui/component/cert_hash.dart | 28 +++++++--- lib/ui/component/encoder.dart | 2 +- lib/ui/component/history_cache_time.dart | 2 +- lib/ui/component/js_run.dart | 4 +- lib/ui/component/json/json_text.dart | 4 +- lib/ui/component/json/json_viewer.dart | 4 +- lib/ui/component/memory_cleanup.dart | 4 +- lib/ui/component/multi_window.dart | 38 ++++++------- lib/ui/component/qr_code_page.dart | 6 +-- lib/ui/component/regexp.dart | 4 +- lib/ui/component/share.dart | 8 +-- lib/ui/component/toolbox.dart | 18 +++---- lib/ui/component/utils.dart | 4 +- lib/ui/component/widgets.dart | 2 +- lib/ui/configuration.dart | 4 +- lib/ui/content/body.dart | 30 +++++------ lib/ui/content/panel.dart | 26 ++++----- lib/ui/desktop/common.dart | 6 +-- lib/ui/desktop/desktop.dart | 34 ++++++------ lib/ui/desktop/left_menus/favorite.dart | 22 ++++---- lib/ui/desktop/left_menus/history.dart | 22 ++++---- lib/ui/desktop/left_menus/navigation.dart | 8 +-- lib/ui/desktop/preference.dart | 8 +-- lib/ui/desktop/request/list.dart | 32 +++++------ .../desktop/request/model/search_model.dart | 4 +- lib/ui/desktop/request/request.dart | 30 +++++------ lib/ui/desktop/request/request_editor.dart | 18 +++---- lib/ui/desktop/request/request_sequence.dart | 14 ++--- lib/ui/desktop/request/search.dart | 6 +-- lib/ui/desktop/request/search_condition.dart | 8 +-- lib/ui/desktop/toolbar/phone_connect.dart | 2 +- .../toolbar/setting/external_proxy.dart | 6 +-- lib/ui/desktop/toolbar/setting/filter.dart | 10 ++-- .../toolbar/setting/request_block.dart | 6 +-- .../toolbar/setting/request_rewrite.dart | 20 +++---- .../setting/rewrite/rewrite_replace.dart | 8 +-- .../setting/rewrite/rewrite_update.dart | 12 ++--- lib/ui/desktop/toolbar/setting/script.dart | 14 ++--- lib/ui/desktop/toolbar/setting/setting.dart | 16 +++--- lib/ui/desktop/toolbar/ssl/ssl.dart | 12 ++--- lib/ui/desktop/toolbar/toolbar.dart | 12 ++--- lib/ui/desktop/window_listener.dart | 4 +- lib/ui/launch/launch.dart | 8 +-- lib/ui/mobile/menu/drawer.dart | 40 +++++++------- lib/ui/mobile/menu/me.dart | 32 +++++------ lib/ui/mobile/menu/menu.dart | 12 ++--- lib/ui/mobile/mobile.dart | 54 +++++++++---------- lib/ui/mobile/request/domians.dart | 18 +++---- lib/ui/mobile/request/favorite.dart | 34 ++++++------ lib/ui/mobile/request/history.dart | 26 ++++----- lib/ui/mobile/request/list.dart | 16 +++--- lib/ui/mobile/request/request.dart | 40 +++++++------- lib/ui/mobile/request/request_editor.dart | 16 +++--- lib/ui/mobile/request/request_sequence.dart | 12 ++--- lib/ui/mobile/request/search.dart | 4 +- lib/ui/mobile/setting/app_filter.dart | 10 ++-- lib/ui/mobile/setting/filter.dart | 6 +-- lib/ui/mobile/setting/preference.dart | 14 ++--- lib/ui/mobile/setting/proxy.dart | 6 +-- lib/ui/mobile/setting/request_block.dart | 6 +-- lib/ui/mobile/setting/request_rewrite.dart | 16 +++--- .../setting/rewrite/rewrite_replace.dart | 10 ++-- .../setting/rewrite/rewrite_update.dart | 10 ++-- lib/ui/mobile/setting/script.dart | 14 ++--- lib/ui/mobile/setting/ssl.dart | 12 ++--- lib/ui/mobile/setting/theme.dart | 2 +- lib/ui/mobile/setting/video_player.dart | 2 +- lib/ui/mobile/widgets/about.dart | 2 +- lib/ui/mobile/widgets/highlight.dart | 4 +- lib/ui/mobile/widgets/pip.dart | 14 ++--- lib/ui/mobile/widgets/remote_device.dart | 24 ++++----- lib/utils/compress.dart | 2 +- lib/utils/curl.dart | 6 +-- lib/utils/har.dart | 10 ++-- lib/utils/python.dart | 2 +- linux/build.sh | 2 +- macos/Runner.xcodeproj/project.pbxproj | 6 +-- macos/Runner/Configs/AppInfo.xcconfig | 4 +- pubspec.yaml | 2 +- test/cert_test.dart | 6 +-- test/js_test.dart | 4 +- test/pk12_test.dart | 2 +- test/web_test.dart | 4 +- test/widget_test.dart | 8 +-- test/x509_test.dart | 4 +- windows/runner/Runner.rc | 6 +-- 125 files changed, 700 insertions(+), 683 deletions(-) diff --git a/README_EN.md b/README_EN.md index 3d526af..5da4208 100644 --- a/README_EN.md +++ b/README_EN.md @@ -14,7 +14,7 @@ and easy to use. * Others: Favorites, history, toolbox, etc. **Mac will prompt untrusted developers when first opened, you need to go to System Preferences-Security & Privacy-Allow any source.** -Download： https://github.com/wanghongenpin/network_proxy_flutter/releases +Download： https://github.com/wanghongenpin/proxypin/releases iOS App Store：https://apps.apple.com/app/proxypin/id6450932949 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 2784af9..bc06b4f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 55; objects = { /* Begin PBXBuildFile section */ @@ -764,7 +764,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.network.networkProxyFlutter.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.proxy.pin.networkProxyFlutter.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -782,7 +782,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.network.networkProxyFlutter.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.proxy.pin.networkProxyFlutter.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -798,7 +798,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.network.networkProxyFlutter.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.proxy.pin.networkProxyFlutter.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; diff --git a/lib/main.dart b/lib/main.dart index d9b876d..e1d009b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -19,15 +19,15 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/ui/component/chinese_font.dart'; -import 'package:network_proxy/ui/component/multi_window.dart'; -import 'package:network_proxy/ui/configuration.dart'; -import 'package:network_proxy/ui/desktop/desktop.dart'; -import 'package:network_proxy/ui/desktop/window_listener.dart'; -import 'package:network_proxy/ui/mobile/mobile.dart'; -import 'package:network_proxy/utils/navigator.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/ui/component/chinese_font.dart'; +import 'package:proxypin/ui/component/multi_window.dart'; +import 'package:proxypin/ui/configuration.dart'; +import 'package:proxypin/ui/desktop/desktop.dart'; +import 'package:proxypin/ui/desktop/window_listener.dart'; +import 'package:proxypin/ui/mobile/mobile.dart'; +import 'package:proxypin/utils/navigator.dart'; +import 'package:proxypin/utils/platform.dart'; import 'package:window_manager/window_manager.dart'; ///主入口 diff --git a/lib/native/app_lifecycle.dart b/lib/native/app_lifecycle.dart index 2afc650..cb59f68 100644 --- a/lib/native/app_lifecycle.dart +++ b/lib/native/app_lifecycle.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:network_proxy/network/util/logger.dart'; +import 'package:proxypin/network/util/logger.dart'; abstract interface class LifecycleListener { void onUserLeaveHint() {} diff --git a/lib/native/pip.dart b/lib/native/pip.dart index 6dba226..c700464 100644 --- a/lib/native/pip.dart +++ b/lib/native/pip.dart @@ -1,11 +1,11 @@ import 'dart:io'; import 'package:flutter/services.dart'; -import 'package:network_proxy/native/vpn.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/launch/launch.dart'; -import 'package:network_proxy/ui/mobile/mobile.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/native/vpn.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/launch/launch.dart'; +import 'package:proxypin/ui/mobile/mobile.dart'; +import 'package:proxypin/utils/lang.dart'; ///画中画 class PictureInPicture { diff --git a/lib/native/process_info.dart b/lib/native/process_info.dart index b80bc09..975e096 100644 --- a/lib/native/process_info.dart +++ b/lib/native/process_info.dart @@ -1,5 +1,5 @@ import 'package:flutter/services.dart'; -import 'package:network_proxy/network/util/process_info.dart'; +import 'package:proxypin/network/util/process_info.dart'; class ProcessInfoPlugin { static const MethodChannel _methodChannel = MethodChannel('com.proxy/processInfo'); diff --git a/lib/native/vpn.dart b/lib/native/vpn.dart index 4e269f5..6641d29 100644 --- a/lib/native/vpn.dart +++ b/lib/native/vpn.dart @@ -1,5 +1,5 @@ import 'package:flutter/services.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/configuration.dart'; class Vpn { static const MethodChannel proxyVpnChannel = MethodChannel('com.proxy/proxyVpn'); diff --git a/lib/network/bin/configuration.dart b/lib/network/bin/configuration.dart index 842974b..65ebefe 100644 --- a/lib/network/bin/configuration.dart +++ b/lib/network/bin/configuration.dart @@ -17,12 +17,12 @@ import 'dart:convert'; import 'dart:io'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/util/file_read.dart'; -import 'package:network_proxy/network/components/host_filter.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/network/util/system_proxy.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/util/file_read.dart'; +import 'package:proxypin/network/components/host_filter.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/network/util/system_proxy.dart'; +import 'package:proxypin/utils/platform.dart'; class Configuration { ///代理相关配置 diff --git a/lib/network/bin/server.dart b/lib/network/bin/server.dart index 8776e5b..92904a7 100644 --- a/lib/network/bin/server.dart +++ b/lib/network/bin/server.dart @@ -17,13 +17,13 @@ import 'dart:async'; import 'dart:io'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/components/request_rewrite_component.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/websocket.dart'; -import 'package:network_proxy/network/util/crts.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/components/request_rewrite_component.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/websocket.dart'; +import 'package:proxypin/network/util/crts.dart'; +import 'package:proxypin/utils/platform.dart'; import '../handler.dart'; import '../http/codec.dart'; diff --git a/lib/network/channel.dart b/lib/network/channel.dart index 95dbe7b..388b239 100644 --- a/lib/network/channel.dart +++ b/lib/network/channel.dart @@ -19,17 +19,17 @@ import 'dart:io'; import 'dart:math'; import 'dart:typed_data'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/codec.dart'; -import 'package:network_proxy/network/http/h2/setting.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/network/util/attribute_keys.dart'; -import 'package:network_proxy/network/util/byte_buf.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/network/util/process_info.dart'; -import 'package:network_proxy/network/util/socket_address.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/codec.dart'; +import 'package:proxypin/network/http/h2/setting.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/network/util/attribute_keys.dart'; +import 'package:proxypin/network/util/byte_buf.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/network/util/process_info.dart'; +import 'package:proxypin/network/util/socket_address.dart'; +import 'package:proxypin/utils/lang.dart'; import 'handler.dart'; diff --git a/lib/network/components/interceptor.dart b/lib/network/components/interceptor.dart index b0cebfc..1e356eb 100644 --- a/lib/network/components/interceptor.dart +++ b/lib/network/components/interceptor.dart @@ -1,4 +1,4 @@ -import 'package:network_proxy/network/http/http.dart'; +import 'package:proxypin/network/http/http.dart'; /// A Interceptor that can intercept and modify the request and response. /// @author Hongen Wang diff --git a/lib/network/components/js/file.dart b/lib/network/components/js/file.dart index 6a18447..cfcb082 100644 --- a/lib/network/components/js/file.dart +++ b/lib/network/components/js/file.dart @@ -17,7 +17,7 @@ import 'dart:io'; import 'package:flutter_js/flutter_js.dart'; -import 'package:network_proxy/network/util/logger.dart'; +import 'package:proxypin/network/util/logger.dart'; /// FileBridge for file operation /// @Author: Hongen Wang diff --git a/lib/network/components/js/md5.dart b/lib/network/components/js/md5.dart index 9757579..85c06fd 100644 --- a/lib/network/components/js/md5.dart +++ b/lib/network/components/js/md5.dart @@ -18,7 +18,7 @@ import 'dart:convert'; import 'package:crypto/crypto.dart'; import 'package:flutter_js/flutter_js.dart'; -import 'package:network_proxy/network/util/lists.dart'; +import 'package:proxypin/network/util/lists.dart'; /// JsMd5 /// @author Hongen Wang diff --git a/lib/network/components/request_rewrite_component.dart b/lib/network/components/request_rewrite_component.dart index 0bc01d4..2386d38 100644 --- a/lib/network/components/request_rewrite_component.dart +++ b/lib/network/components/request_rewrite_component.dart @@ -17,12 +17,12 @@ import 'dart:collection'; import 'dart:convert'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/http/constants.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/network/util/file_read.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/http/constants.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/network/util/file_read.dart'; +import 'package:proxypin/utils/lang.dart'; import 'rewrite/rewrite_rule.dart'; diff --git a/lib/network/components/rewrite/request_rewrite_manager.dart b/lib/network/components/rewrite/request_rewrite_manager.dart index fbf2833..c896e6e 100644 --- a/lib/network/components/rewrite/request_rewrite_manager.dart +++ b/lib/network/components/rewrite/request_rewrite_manager.dart @@ -17,11 +17,11 @@ import 'dart:convert'; import 'dart:io'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/util/file_read.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/network/util/random.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/util/file_read.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/network/util/random.dart'; /// @author wanghongen /// 2023/7/26 diff --git a/lib/network/components/rewrite/rewrite_rule.dart b/lib/network/components/rewrite/rewrite_rule.dart index 813c9f9..cc04b34 100644 --- a/lib/network/components/rewrite/rewrite_rule.dart +++ b/lib/network/components/rewrite/rewrite_rule.dart @@ -14,8 +14,8 @@ * limitations under the License. */ -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/utils/lang.dart'; ///重写规则 ///@author: wanghongen diff --git a/lib/network/components/script_manager.dart b/lib/network/components/script_manager.dart index a0ce93d..7efa42a 100644 --- a/lib/network/components/script_manager.dart +++ b/lib/network/components/script_manager.dart @@ -19,14 +19,14 @@ import 'dart:io'; import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:flutter_js/flutter_js.dart'; -import 'package:network_proxy/network/components/js/file.dart'; -import 'package:network_proxy/network/components/js/md5.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/network/util/lists.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/network/util/random.dart'; -import 'package:network_proxy/ui/component/device.dart'; +import 'package:proxypin/network/components/js/file.dart'; +import 'package:proxypin/network/components/js/md5.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/network/util/lists.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/network/util/random.dart'; +import 'package:proxypin/ui/component/device.dart'; import 'package:path_provider/path_provider.dart'; /// @author wanghongen diff --git a/lib/network/handler.dart b/lib/network/handler.dart index 65f975a..8580244 100644 --- a/lib/network/handler.dart +++ b/lib/network/handler.dart @@ -18,18 +18,18 @@ import 'dart:async'; import 'dart:convert'; import 'dart:typed_data'; -import 'package:network_proxy/network/components/host_filter.dart'; -import 'package:network_proxy/network/components/request_rewrite_component.dart'; -import 'package:network_proxy/network/components/script_manager.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/network/http/websocket.dart'; -import 'package:network_proxy/network/proxy_helper.dart'; -import 'package:network_proxy/network/util/attribute_keys.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/network/util/uri.dart'; -import 'package:network_proxy/utils/ip.dart'; +import 'package:proxypin/network/components/host_filter.dart'; +import 'package:proxypin/network/components/request_rewrite_component.dart'; +import 'package:proxypin/network/components/script_manager.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/network/http/websocket.dart'; +import 'package:proxypin/network/proxy_helper.dart'; +import 'package:proxypin/network/util/attribute_keys.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/network/util/uri.dart'; +import 'package:proxypin/utils/ip.dart'; import 'channel.dart'; import 'components/request_block_manager.dart'; diff --git a/lib/network/host_port.dart b/lib/network/host_port.dart index fab5557..622bd92 100644 --- a/lib/network/host_port.dart +++ b/lib/network/host_port.dart @@ -14,8 +14,8 @@ * limitations under the License. */ -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; /// 获取主机和端口 HostAndPort getHostAndPort(HttpRequest request, {bool? ssl}) { diff --git a/lib/network/http/body_reader.dart b/lib/network/http/body_reader.dart index 5fb9f91..b8f7efd 100644 --- a/lib/network/http/body_reader.dart +++ b/lib/network/http/body_reader.dart @@ -17,8 +17,8 @@ import 'dart:math'; import 'dart:typed_data'; -import 'package:network_proxy/network/http/constants.dart'; -import 'package:network_proxy/network/http/http.dart'; +import 'package:proxypin/network/http/constants.dart'; +import 'package:proxypin/network/http/http.dart'; import '../../utils/num.dart'; import 'codec.dart'; diff --git a/lib/network/http/codec.dart b/lib/network/http/codec.dart index 44ba307..710f901 100644 --- a/lib/network/http/codec.dart +++ b/lib/network/http/codec.dart @@ -18,12 +18,12 @@ import 'dart:io'; import 'dart:math'; import 'dart:typed_data'; -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/http/body_reader.dart'; -import 'package:network_proxy/network/http/constants.dart'; -import 'package:network_proxy/network/http/h2/codec.dart'; -import 'package:network_proxy/network/http/http_parser.dart'; -import 'package:network_proxy/network/util/byte_buf.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/http/body_reader.dart'; +import 'package:proxypin/network/http/constants.dart'; +import 'package:proxypin/network/http/h2/codec.dart'; +import 'package:proxypin/network/http/http_parser.dart'; +import 'package:proxypin/network/util/byte_buf.dart'; import '../../utils/compress.dart'; import 'http.dart'; diff --git a/lib/network/http/content_type.dart b/lib/network/http/content_type.dart index 4d2ff15..732cd6f 100644 --- a/lib/network/http/content_type.dart +++ b/lib/network/http/content_type.dart @@ -14,7 +14,7 @@ * limitations under the License. */ -import 'package:network_proxy/network/util/cache.dart'; +import 'package:proxypin/network/util/cache.dart'; ///content type ///@author WangHongEn diff --git a/lib/network/http/h2/codec.dart b/lib/network/http/h2/codec.dart index b5c8d24..a8b6fb8 100644 --- a/lib/network/http/h2/codec.dart +++ b/lib/network/http/h2/codec.dart @@ -17,12 +17,12 @@ import 'dart:math'; import 'dart:typed_data'; -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/http/codec.dart'; -import 'package:network_proxy/network/http/h2/hpack.dart'; -import 'package:network_proxy/network/http/h2/setting.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/util/byte_buf.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/http/codec.dart'; +import 'package:proxypin/network/http/h2/hpack.dart'; +import 'package:proxypin/network/http/h2/setting.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/util/byte_buf.dart'; import 'frame.dart'; diff --git a/lib/network/http/h2/hpack.dart b/lib/network/http/h2/hpack.dart index 7a23401..8786b10 100644 --- a/lib/network/http/h2/hpack.dart +++ b/lib/network/http/h2/hpack.dart @@ -17,8 +17,8 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:network_proxy/network/http/h2/huffman.dart'; -import 'package:network_proxy/network/util/byte_buf.dart'; +import 'package:proxypin/network/http/h2/huffman.dart'; +import 'package:proxypin/network/util/byte_buf.dart'; class HPACKDecoder { // static const int _maxHeaderTableSize = 12288; diff --git a/lib/network/http/h2/setting.dart b/lib/network/http/h2/setting.dart index b46ffc4..22cef1a 100644 --- a/lib/network/http/h2/setting.dart +++ b/lib/network/http/h2/setting.dart @@ -14,9 +14,9 @@ * limitations under the License. */ -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/http/h2/frame.dart'; -import 'package:network_proxy/network/util/byte_buf.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/http/h2/frame.dart'; +import 'package:proxypin/network/util/byte_buf.dart'; class StreamSetting { /// 允许发送方通知远程端点用于解码头块的头压缩表的最大大小（以八位字节为单位）。 diff --git a/lib/network/http/http.dart b/lib/network/http/http.dart index 8f08605..b391c9e 100644 --- a/lib/network/http/http.dart +++ b/lib/network/http/http.dart @@ -17,12 +17,12 @@ import 'dart:convert'; import 'dart:math'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/content_type.dart'; -import 'package:network_proxy/network/http/websocket.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/network/util/process_info.dart'; -import 'package:network_proxy/utils/compress.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/content_type.dart'; +import 'package:proxypin/network/http/websocket.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/network/util/process_info.dart'; +import 'package:proxypin/utils/compress.dart'; import 'http_headers.dart'; diff --git a/lib/network/http/http_parser.dart b/lib/network/http/http_parser.dart index 4d035bf..4ad5fc9 100644 --- a/lib/network/http/http_parser.dart +++ b/lib/network/http/http_parser.dart @@ -1,8 +1,8 @@ import 'dart:typed_data'; -import 'package:network_proxy/network/http/constants.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/network/util/byte_buf.dart'; +import 'package:proxypin/network/http/constants.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/network/util/byte_buf.dart'; /// http解析器 class HttpParse { diff --git a/lib/network/http_client.dart b/lib/network/http_client.dart index 148e3cb..dddc7fb 100644 --- a/lib/network/http_client.dart +++ b/lib/network/http_client.dart @@ -17,11 +17,11 @@ import 'dart:async'; import 'dart:convert'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/network/network.dart'; -import 'package:network_proxy/network/util/system_proxy.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/network/network.dart'; +import 'package:proxypin/network/util/system_proxy.dart'; import 'package:proxy_manager/proxy_manager.dart'; import 'channel.dart'; diff --git a/lib/network/network.dart b/lib/network/network.dart index 846f0d1..d50e9dc 100644 --- a/lib/network/network.dart +++ b/lib/network/network.dart @@ -18,14 +18,14 @@ import 'dart:async'; import 'dart:io'; import 'dart:typed_data'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/components/host_filter.dart'; -import 'package:network_proxy/network/handler.dart'; -import 'package:network_proxy/network/util/attribute_keys.dart'; -import 'package:network_proxy/network/util/crts.dart'; -import 'package:network_proxy/network/util/process_info.dart'; -import 'package:network_proxy/network/util/tls.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/components/host_filter.dart'; +import 'package:proxypin/network/handler.dart'; +import 'package:proxypin/network/util/attribute_keys.dart'; +import 'package:proxypin/network/util/crts.dart'; +import 'package:proxypin/network/util/process_info.dart'; +import 'package:proxypin/network/util/tls.dart'; import 'host_port.dart'; diff --git a/lib/network/proxy_helper.dart b/lib/network/proxy_helper.dart index 0d2fdf3..49d70f9 100644 --- a/lib/network/proxy_helper.dart +++ b/lib/network/proxy_helper.dart @@ -17,16 +17,16 @@ import 'dart:convert'; import 'dart:io'; -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/components/script_manager.dart'; -import 'package:network_proxy/network/handler.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/codec.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/network/util/crts.dart'; -import 'package:network_proxy/network/util/localizations.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/components/script_manager.dart'; +import 'package:proxypin/network/handler.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/codec.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/network/util/crts.dart'; +import 'package:proxypin/network/util/localizations.dart'; import 'components/host_filter.dart'; diff --git a/lib/network/util/cert/der.dart b/lib/network/util/cert/der.dart index ba9782a..d899c3e 100644 --- a/lib/network/util/cert/der.dart +++ b/lib/network/util/cert/der.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; import 'dart:convert'; -import 'package:network_proxy/network/util/byte_buf.dart'; +import 'package:proxypin/network/util/byte_buf.dart'; import 'package:pointycastle/asn1.dart'; import 'package:pointycastle/src//utils.dart'; diff --git a/lib/network/util/cert/x509.dart b/lib/network/util/cert/x509.dart index 1887e84..779cf56 100644 --- a/lib/network/util/cert/x509.dart +++ b/lib/network/util/cert/x509.dart @@ -5,8 +5,8 @@ import 'dart:typed_data'; import 'package:basic_utils/basic_utils.dart'; import 'package:crypto/crypto.dart'; -import 'package:network_proxy/network/util/cert/extension.dart'; -import 'package:network_proxy/network/util/cert/key_usage.dart' as x509; +import 'package:proxypin/network/util/cert/extension.dart'; +import 'package:proxypin/network/util/cert/key_usage.dart' as x509; import 'package:pointycastle/asn1/unsupported_object_identifier_exception.dart'; import 'package:pointycastle/pointycastle.dart'; diff --git a/lib/network/util/crts.dart b/lib/network/util/crts.dart index 9fe1dc8..0373146 100644 --- a/lib/network/util/crts.dart +++ b/lib/network/util/crts.dart @@ -21,14 +21,14 @@ import 'dart:math'; import 'dart:typed_data'; import 'package:basic_utils/basic_utils.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/network/util/cert/basic_constraints.dart'; -import 'package:network_proxy/network/util/cert/pkcs12.dart'; -import 'package:network_proxy/network/util/cert/x509.dart'; -import 'package:network_proxy/network/util/random.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/network/util/cert/basic_constraints.dart'; +import 'package:proxypin/network/util/cert/pkcs12.dart'; +import 'package:proxypin/network/util/cert/x509.dart'; +import 'package:proxypin/network/util/random.dart'; +import 'package:proxypin/utils/lang.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:network_proxy/network/util/cert/key_usage.dart' as x509; +import 'package:proxypin/network/util/cert/key_usage.dart' as x509; import 'file_read.dart'; diff --git a/lib/network/util/file_read.dart b/lib/network/util/file_read.dart index 2ea4027..c4cd79f 100644 --- a/lib/network/util/file_read.dart +++ b/lib/network/util/file_read.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:flutter/services.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/utils/platform.dart'; import 'package:path_provider/path_provider.dart'; class FileRead { diff --git a/lib/network/util/localizations.dart b/lib/network/util/localizations.dart index 4628d10..cd61702 100644 --- a/lib/network/util/localizations.dart +++ b/lib/network/util/localizations.dart @@ -1,6 +1,6 @@ import 'dart:ui'; -import 'package:network_proxy/ui/configuration.dart'; +import 'package:proxypin/ui/configuration.dart'; /// @author wanghongen class Localizations { diff --git a/lib/network/util/process_info.dart b/lib/network/util/process_info.dart index 026ad3b..d19e795 100644 --- a/lib/network/util/process_info.dart +++ b/lib/network/util/process_info.dart @@ -17,9 +17,9 @@ import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; -import 'package:network_proxy/native/installed_apps.dart'; -import 'package:network_proxy/native/process_info.dart'; -import 'package:network_proxy/network/util/socket_address.dart'; +import 'package:proxypin/native/installed_apps.dart'; +import 'package:proxypin/native/process_info.dart'; +import 'package:proxypin/network/util/socket_address.dart'; import 'package:win32audio/win32audio.dart'; import 'cache.dart'; diff --git a/lib/network/util/system_proxy.dart b/lib/network/util/system_proxy.dart index f84058b..fcb65e3 100644 --- a/lib/network/util/system_proxy.dart +++ b/lib/network/util/system_proxy.dart @@ -16,9 +16,9 @@ import 'dart:io'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/utils/ip.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/utils/ip.dart'; +import 'package:proxypin/utils/lang.dart'; import 'package:proxy_manager/proxy_manager.dart'; /// @author wanghongen diff --git a/lib/storage/favorites.dart b/lib/storage/favorites.dart index 8e3c7ab..fe254a4 100644 --- a/lib/storage/favorites.dart +++ b/lib/storage/favorites.dart @@ -16,9 +16,9 @@ import 'dart:collection'; import 'dart:convert'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/storage/path.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/storage/path.dart'; /// 收藏存储 /// @author WangHongEn diff --git a/lib/storage/histories.dart b/lib/storage/histories.dart index 7384af9..a3defa2 100644 --- a/lib/storage/histories.dart +++ b/lib/storage/histories.dart @@ -21,13 +21,13 @@ import 'dart:io'; import 'package:date_format/date_format.dart'; import 'package:file_selector/file_selector.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/storage/path.dart'; -import 'package:network_proxy/utils/files.dart'; -import 'package:network_proxy/utils/har.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/storage/path.dart'; +import 'package:proxypin/utils/files.dart'; +import 'package:proxypin/utils/har.dart'; +import 'package:proxypin/utils/listenable_list.dart'; import 'package:path_provider/path_provider.dart'; ///历史存储 @@ -70,6 +70,7 @@ class HistoryStorage { static Future _homePath() async { final home = await getApplicationSupportDirectory(); + print(home); return '${home.path}${Platform.pathSeparator}history'; } diff --git a/lib/ui/component/cert_hash.dart b/lib/ui/component/cert_hash.dart index cdd03f7..b0cc3d5 100644 --- a/lib/ui/component/cert_hash.dart +++ b/lib/ui/component/cert_hash.dart @@ -15,14 +15,15 @@ */ import 'dart:io'; +import 'dart:typed_data'; import 'package:basic_utils/basic_utils.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/util/cert/x509.dart'; -import 'package:network_proxy/ui/component/text_field.dart'; +import 'package:proxypin/network/util/cert/x509.dart'; +import 'package:proxypin/ui/component/text_field.dart'; ///证书哈希名称查看 ///@author Hongen Wang @@ -58,11 +59,12 @@ class _CertHashPageState extends State { ElevatedButton.icon( onPressed: () async { FilePickerResult? result = await FilePicker.platform - .pickFiles(type: FileType.custom, allowedExtensions: ['crt', 'pem', 'cer']); + .pickFiles(type: FileType.custom, allowedExtensions: ['crt', 'pem', 'cer', 'der']); if (result == null) return; + File file = File(result.files.single.path!); - String content = await file.readAsString(); - input.text = content; + var bytes = await file.readAsBytes(); + input.text = tryDerFormat(bytes) ?? String.fromCharCodes(bytes); getSubjectName(); }, style: buttonStyle, @@ -115,7 +117,6 @@ class _CertHashPageState extends State { if (content.isEmpty) return; try { var caCert = X509Utils.x509CertificateFromPem(content); - var subject = caCert.tbsCertificate?.subject; if (subject == null) return; var subjectHashName = X509Generate.getSubjectHashName(subject); @@ -125,6 +126,21 @@ class _CertHashPageState extends State { } } + String? tryDerFormat(Uint8List data) { + try { + final bytes = data.sublist(0, 4); + + // Check if the bytes match the DER format (ASN.1 encoding) + // DER encoded certificates typically start with 0x30 (SEQUENCE) or 0xA0 (APPLICATION) + if (bytes[0] == 0x30 || bytes[0] == 0xA0) { + return X509Utils.crlDerToPem(data); + } + return null; + } catch (e) { + return null; + } + } + ButtonStyle get buttonStyle => ButtonStyle( padding: WidgetStateProperty.all(EdgeInsets.symmetric(horizontal: 15, vertical: 8)), textStyle: WidgetStateProperty.all(TextStyle(fontSize: 14)), diff --git a/lib/ui/component/encoder.dart b/lib/ui/component/encoder.dart index 814916c..b4c7c4d 100644 --- a/lib/ui/component/encoder.dart +++ b/lib/ui/component/encoder.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/util/logger.dart'; +import 'package:proxypin/network/util/logger.dart'; ///编码类型 enum EncoderType { diff --git a/lib/ui/component/history_cache_time.dart b/lib/ui/component/history_cache_time.dart index 68ed316..cbc93f7 100644 --- a/lib/ui/component/history_cache_time.dart +++ b/lib/ui/component/history_cache_time.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/configuration.dart'; ///缓存时间菜单 /// @author wanghongen diff --git a/lib/ui/component/js_run.dart b/lib/ui/component/js_run.dart index fb9cfd9..439dbf3 100644 --- a/lib/ui/component/js_run.dart +++ b/lib/ui/component/js_run.dart @@ -6,8 +6,8 @@ import 'package:flutter_code_editor/flutter_code_editor.dart'; import 'package:flutter_js/flutter_js.dart'; import 'package:highlight/languages/javascript.dart'; import 'package:flutter_highlight/themes/monokai-sublime.dart'; -import 'package:network_proxy/network/components/js/file.dart'; -import 'package:network_proxy/network/components/js/md5.dart'; +import 'package:proxypin/network/components/js/file.dart'; +import 'package:proxypin/network/components/js/md5.dart'; class JavaScript extends StatefulWidget { const JavaScript({super.key}); diff --git a/lib/ui/component/json/json_text.dart b/lib/ui/component/json/json_text.dart index 7aed595..fa25742 100644 --- a/lib/ui/component/json/json_text.dart +++ b/lib/ui/component/json/json_text.dart @@ -15,8 +15,8 @@ */ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:network_proxy/ui/component/json/theme.dart'; -import 'package:network_proxy/ui/component/utils.dart'; +import 'package:proxypin/ui/component/json/theme.dart'; +import 'package:proxypin/ui/component/utils.dart'; class JsonText extends StatefulWidget { final ColorTheme colorTheme; diff --git a/lib/ui/component/json/json_viewer.dart b/lib/ui/component/json/json_viewer.dart index f828cf4..5ac981c 100644 --- a/lib/ui/component/json/json_viewer.dart +++ b/lib/ui/component/json/json_viewer.dart @@ -20,8 +20,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/ui/component/json/theme.dart'; -import 'package:network_proxy/ui/component/json/toast.dart'; +import 'package:proxypin/ui/component/json/theme.dart'; +import 'package:proxypin/ui/component/json/toast.dart'; class JsonViewer extends StatelessWidget { final dynamic jsonObj; diff --git a/lib/ui/component/memory_cleanup.dart b/lib/ui/component/memory_cleanup.dart index d50ab41..b0e8741 100644 --- a/lib/ui/component/memory_cleanup.dart +++ b/lib/ui/component/memory_cleanup.dart @@ -16,8 +16,8 @@ import 'dart:io'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/configuration.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/configuration.dart'; /// Memory cleanup handle /// @author wanghongen diff --git a/lib/ui/component/multi_window.dart b/lib/ui/component/multi_window.dart index 37ed370..14d0849 100644 --- a/lib/ui/component/multi_window.dart +++ b/lib/ui/component/multi_window.dart @@ -22,25 +22,25 @@ import 'package:file_picker/file_picker.dart'; import 'package:file_selector/file_selector.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/components/script_manager.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/util/lists.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/cert_hash.dart'; -import 'package:network_proxy/ui/component/device.dart'; -import 'package:network_proxy/ui/component/encoder.dart'; -import 'package:network_proxy/ui/component/js_run.dart'; -import 'package:network_proxy/ui/component/qr_code_page.dart'; -import 'package:network_proxy/ui/component/regexp.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/content/body.dart'; -import 'package:network_proxy/ui/desktop/request/request_editor.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/request_rewrite.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/script.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/components/script_manager.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/util/lists.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/cert_hash.dart'; +import 'package:proxypin/ui/component/device.dart'; +import 'package:proxypin/ui/component/encoder.dart'; +import 'package:proxypin/ui/component/js_run.dart'; +import 'package:proxypin/ui/component/qr_code_page.dart'; +import 'package:proxypin/ui/component/regexp.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/content/body.dart'; +import 'package:proxypin/ui/desktop/request/request_editor.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/request_rewrite.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/script.dart'; +import 'package:proxypin/utils/platform.dart'; import 'package:path_provider/path_provider.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:window_manager/window_manager.dart'; diff --git a/lib/ui/component/qr_code_page.dart b/lib/ui/component/qr_code_page.dart index fd3e4d6..70178cc 100644 --- a/lib/ui/component/qr_code_page.dart +++ b/lib/ui/component/qr_code_page.dart @@ -25,9 +25,9 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_qr_reader/flutter_qr_reader.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; import 'package:image_pickers/image_pickers.dart'; -import 'package:network_proxy/ui/component/qrcode/qr_scan_view.dart'; -import 'package:network_proxy/ui/component/text_field.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/ui/component/qrcode/qr_scan_view.dart'; +import 'package:proxypin/ui/component/text_field.dart'; +import 'package:proxypin/utils/platform.dart'; import 'package:qr_flutter/qr_flutter.dart'; ///二维码 diff --git a/lib/ui/component/regexp.dart b/lib/ui/component/regexp.dart index c262705..9866d3e 100644 --- a/lib/ui/component/regexp.dart +++ b/lib/ui/component/regexp.dart @@ -17,7 +17,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/ui/component/text_field.dart'; +import 'package:proxypin/ui/component/text_field.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; ///正则表达式工具 @@ -66,7 +66,7 @@ class _RegExpPageState extends State { return Scaffold( appBar: PreferredSize( - preferredSize: Size.fromHeight(40), + preferredSize: Size.fromHeight(50), child: AppBar( title: Text(localizations.regExp, style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500)), centerTitle: true)), diff --git a/lib/ui/component/share.dart b/lib/ui/component/share.dart index cf258c7..0c929b6 100644 --- a/lib/ui/component/share.dart +++ b/lib/ui/component/share.dart @@ -3,10 +3,10 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/utils/curl.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/utils/curl.dart'; import 'package:share_plus/share_plus.dart'; ///分享按钮 diff --git a/lib/ui/component/toolbox.dart b/lib/ui/component/toolbox.dart index 1e28b4a..e659a27 100644 --- a/lib/ui/component/toolbox.dart +++ b/lib/ui/component/toolbox.dart @@ -4,15 +4,15 @@ import 'dart:io'; import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/ui/component/cert_hash.dart'; -import 'package:network_proxy/ui/component/encoder.dart'; -import 'package:network_proxy/ui/component/js_run.dart'; -import 'package:network_proxy/ui/component/multi_window.dart'; -import 'package:network_proxy/ui/component/qr_code_page.dart'; -import 'package:network_proxy/ui/component/regexp.dart'; -import 'package:network_proxy/ui/mobile/request/request_editor.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/ui/component/cert_hash.dart'; +import 'package:proxypin/ui/component/encoder.dart'; +import 'package:proxypin/ui/component/js_run.dart'; +import 'package:proxypin/ui/component/multi_window.dart'; +import 'package:proxypin/ui/component/qr_code_page.dart'; +import 'package:proxypin/ui/component/regexp.dart'; +import 'package:proxypin/ui/mobile/request/request_editor.dart'; +import 'package:proxypin/utils/platform.dart'; import 'package:window_manager/window_manager.dart'; class Toolbox extends StatefulWidget { diff --git a/lib/ui/component/utils.dart b/lib/ui/component/utils.dart index 24fd7f8..7094190 100644 --- a/lib/ui/component/utils.dart +++ b/lib/ui/component/utils.dart @@ -21,8 +21,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/http/content_type.dart'; -import 'package:network_proxy/network/http/http.dart'; +import 'package:proxypin/network/http/content_type.dart'; +import 'package:proxypin/network/http/http.dart'; const contentMap = { ContentType.json: Icons.data_object, diff --git a/lib/ui/component/widgets.dart b/lib/ui/component/widgets.dart index 455e47c..309b54d 100644 --- a/lib/ui/component/widgets.dart +++ b/lib/ui/component/widgets.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/utils/lang.dart'; class CustomPopupMenuItem extends PopupMenuItem { final Color? color; diff --git a/lib/ui/configuration.dart b/lib/ui/configuration.dart index ad4d803..4c9ddd3 100644 --- a/lib/ui/configuration.dart +++ b/lib/ui/configuration.dart @@ -19,8 +19,8 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/utils/platform.dart'; import 'package:path_provider/path_provider.dart'; /// @author wanghongen diff --git a/lib/ui/content/body.dart b/lib/ui/content/body.dart index 86836ef..9bebbec 100644 --- a/lib/ui/content/body.dart +++ b/lib/ui/content/body.dart @@ -21,21 +21,21 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/http/content_type.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/encoder.dart'; -import 'package:network_proxy/ui/component/json/json_viewer.dart'; -import 'package:network_proxy/ui/component/json/theme.dart'; -import 'package:network_proxy/ui/component/multi_window.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/request_rewrite.dart'; -import 'package:network_proxy/ui/mobile/setting/request_rewrite.dart'; -import 'package:network_proxy/utils/lang.dart'; -import 'package:network_proxy/utils/num.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/http/content_type.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/encoder.dart'; +import 'package:proxypin/ui/component/json/json_viewer.dart'; +import 'package:proxypin/ui/component/json/theme.dart'; +import 'package:proxypin/ui/component/multi_window.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/request_rewrite.dart'; +import 'package:proxypin/ui/mobile/setting/request_rewrite.dart'; +import 'package:proxypin/utils/lang.dart'; +import 'package:proxypin/utils/num.dart'; +import 'package:proxypin/utils/platform.dart'; import 'package:window_manager/window_manager.dart'; import '../component/json/json_text.dart'; diff --git a/lib/ui/content/panel.dart b/lib/ui/content/panel.dart index 8da6ea6..c21cd9d 100644 --- a/lib/ui/content/panel.dart +++ b/lib/ui/content/panel.dart @@ -17,19 +17,19 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/websocket.dart'; -import 'package:network_proxy/storage/favorites.dart'; -import 'package:network_proxy/ui/component/share.dart'; -import 'package:network_proxy/ui/component/state_component.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/configuration.dart'; -import 'package:network_proxy/ui/mobile/request/request_editor.dart'; -import 'package:network_proxy/utils/lang.dart'; -import 'package:network_proxy/utils/platform.dart'; -import 'package:network_proxy/utils/python.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/websocket.dart'; +import 'package:proxypin/storage/favorites.dart'; +import 'package:proxypin/ui/component/share.dart'; +import 'package:proxypin/ui/component/state_component.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/configuration.dart'; +import 'package:proxypin/ui/mobile/request/request_editor.dart'; +import 'package:proxypin/utils/lang.dart'; +import 'package:proxypin/utils/platform.dart'; +import 'package:proxypin/utils/python.dart'; import 'body.dart'; diff --git a/lib/ui/desktop/common.dart b/lib/ui/desktop/common.dart index 1abb8bc..c2aab13 100644 --- a/lib/ui/desktop/common.dart +++ b/lib/ui/desktop/common.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/http/http.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/http/http.dart'; import 'toolbar/setting/request_rewrite.dart'; diff --git a/lib/ui/desktop/desktop.dart b/lib/ui/desktop/desktop.dart index 9eb3f1c..a1fbcee 100644 --- a/lib/ui/desktop/desktop.dart +++ b/lib/ui/desktop/desktop.dart @@ -16,23 +16,23 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/handler.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/websocket.dart'; -import 'package:network_proxy/ui/component/memory_cleanup.dart'; -import 'package:network_proxy/ui/component/toolbox.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/configuration.dart'; -import 'package:network_proxy/ui/content/panel.dart'; -import 'package:network_proxy/ui/desktop/left_menus/favorite.dart'; -import 'package:network_proxy/ui/desktop/left_menus/history.dart'; -import 'package:network_proxy/ui/desktop/left_menus/navigation.dart'; -import 'package:network_proxy/ui/desktop/request/list.dart'; -import 'package:network_proxy/ui/desktop/toolbar/toolbar.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/handler.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/websocket.dart'; +import 'package:proxypin/ui/component/memory_cleanup.dart'; +import 'package:proxypin/ui/component/toolbox.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/configuration.dart'; +import 'package:proxypin/ui/content/panel.dart'; +import 'package:proxypin/ui/desktop/left_menus/favorite.dart'; +import 'package:proxypin/ui/desktop/left_menus/history.dart'; +import 'package:proxypin/ui/desktop/left_menus/navigation.dart'; +import 'package:proxypin/ui/desktop/request/list.dart'; +import 'package:proxypin/ui/desktop/toolbar/toolbar.dart'; +import 'package:proxypin/utils/listenable_list.dart'; import '../component/split_view.dart'; diff --git a/lib/ui/desktop/left_menus/favorite.dart b/lib/ui/desktop/left_menus/favorite.dart index 5907f81..621ef27 100644 --- a/lib/ui/desktop/left_menus/favorite.dart +++ b/lib/ui/desktop/left_menus/favorite.dart @@ -25,17 +25,17 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/storage/favorites.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/content/panel.dart'; -import 'package:network_proxy/ui/desktop/request/repeat.dart'; -import 'package:network_proxy/utils/curl.dart'; -import 'package:network_proxy/utils/lang.dart'; -import 'package:network_proxy/utils/python.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/storage/favorites.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/content/panel.dart'; +import 'package:proxypin/ui/desktop/request/repeat.dart'; +import 'package:proxypin/utils/curl.dart'; +import 'package:proxypin/utils/lang.dart'; +import 'package:proxypin/utils/python.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:window_manager/window_manager.dart'; diff --git a/lib/ui/desktop/left_menus/history.dart b/lib/ui/desktop/left_menus/history.dart index df8d476..d0c3eac 100644 --- a/lib/ui/desktop/left_menus/history.dart +++ b/lib/ui/desktop/left_menus/history.dart @@ -22,17 +22,17 @@ import 'package:file_selector/file_selector.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/storage/histories.dart'; -import 'package:network_proxy/ui/component/history_cache_time.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/utils/har.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/storage/histories.dart'; +import 'package:proxypin/ui/component/history_cache_time.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/utils/har.dart'; +import 'package:proxypin/utils/listenable_list.dart'; import '../../content/panel.dart'; import '../request/list.dart'; diff --git a/lib/ui/desktop/left_menus/navigation.dart b/lib/ui/desktop/left_menus/navigation.dart index 1135f61..9e4c673 100644 --- a/lib/ui/desktop/left_menus/navigation.dart +++ b/lib/ui/desktop/left_menus/navigation.dart @@ -15,9 +15,9 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/ui/configuration.dart'; -import 'package:network_proxy/ui/desktop/preference.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/ui/configuration.dart'; +import 'package:proxypin/ui/desktop/preference.dart'; import 'package:url_launcher/url_launcher.dart'; ///左侧导航栏 @@ -96,7 +96,7 @@ class _LeftNavigationBarState extends State { message: localizations.feedback, child: IconButton( onPressed: () => - launchUrl(Uri.parse("https://github.com/wanghongenpin/network_proxy_flutter/issues")), + launchUrl(Uri.parse("https://github.com/wanghongenpin/proxypin/issues")), icon: Icon(Icons.feedback_outlined, color: Colors.grey.shade500), )), const SizedBox(height: 10), diff --git a/lib/ui/desktop/preference.dart b/lib/ui/desktop/preference.dart index 539058e..ca21d7c 100644 --- a/lib/ui/desktop/preference.dart +++ b/lib/ui/desktop/preference.dart @@ -16,10 +16,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/configuration.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/configuration.dart'; /// @author wanghongen /// 2024/1/2 diff --git a/lib/ui/desktop/request/list.dart b/lib/ui/desktop/request/list.dart index 5de9456..a39fc7f 100644 --- a/lib/ui/desktop/request/list.dart +++ b/lib/ui/desktop/request/list.dart @@ -22,22 +22,22 @@ import 'package:flutter/services.dart'; import 'package:flutter_desktop_context_menu/flutter_desktop_context_menu.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/components/host_filter.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/ui/component/transition.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/content/panel.dart'; -import 'package:network_proxy/ui/desktop/request/model/search_model.dart'; -import 'package:network_proxy/ui/desktop/request/request.dart'; -import 'package:network_proxy/ui/desktop/request/request_sequence.dart'; -import 'package:network_proxy/ui/desktop/request/search.dart'; -import 'package:network_proxy/utils/har.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/components/host_filter.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/ui/component/transition.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/content/panel.dart'; +import 'package:proxypin/ui/desktop/request/model/search_model.dart'; +import 'package:proxypin/ui/desktop/request/request.dart'; +import 'package:proxypin/ui/desktop/request/request_sequence.dart'; +import 'package:proxypin/ui/desktop/request/search.dart'; +import 'package:proxypin/utils/har.dart'; +import 'package:proxypin/utils/listenable_list.dart'; /// @author wanghongen class DesktopRequestListWidget extends StatefulWidget { diff --git a/lib/ui/desktop/request/model/search_model.dart b/lib/ui/desktop/request/model/search_model.dart index 86e667b..63c7162 100644 --- a/lib/ui/desktop/request/model/search_model.dart +++ b/lib/ui/desktop/request/model/search_model.dart @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import 'package:network_proxy/network/http/content_type.dart'; -import 'package:network_proxy/network/http/http.dart'; +import 'package:proxypin/network/http/content_type.dart'; +import 'package:proxypin/network/http/http.dart'; /// @author wanghongen /// 2023/8/4 diff --git a/lib/ui/desktop/request/request.dart b/lib/ui/desktop/request/request.dart index eaf6e3d..867104e 100644 --- a/lib/ui/desktop/request/request.dart +++ b/lib/ui/desktop/request/request.dart @@ -23,21 +23,21 @@ import 'package:flutter/services.dart'; import 'package:flutter_desktop_context_menu/flutter_desktop_context_menu.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/components/script_manager.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/storage/favorites.dart'; -import 'package:network_proxy/ui/component/state_component.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/content/panel.dart'; -import 'package:network_proxy/ui/desktop/request/repeat.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/script.dart'; -import 'package:network_proxy/utils/curl.dart'; -import 'package:network_proxy/utils/lang.dart'; -import 'package:network_proxy/utils/python.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/components/script_manager.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/storage/favorites.dart'; +import 'package:proxypin/ui/component/state_component.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/content/panel.dart'; +import 'package:proxypin/ui/desktop/request/repeat.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/script.dart'; +import 'package:proxypin/utils/curl.dart'; +import 'package:proxypin/utils/lang.dart'; +import 'package:proxypin/utils/python.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:window_manager/window_manager.dart'; diff --git a/lib/ui/desktop/request/request_editor.dart b/lib/ui/desktop/request/request_editor.dart index 07aabb2..8274338 100644 --- a/lib/ui/desktop/request/request_editor.dart +++ b/lib/ui/desktop/request/request_editor.dart @@ -22,15 +22,15 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/ui/component/split_view.dart'; -import 'package:network_proxy/ui/component/state_component.dart'; -import 'package:network_proxy/ui/content/body.dart'; -import 'package:network_proxy/utils/curl.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/ui/component/split_view.dart'; +import 'package:proxypin/ui/component/state_component.dart'; +import 'package:proxypin/ui/content/body.dart'; +import 'package:proxypin/utils/curl.dart'; +import 'package:proxypin/utils/lang.dart'; /// @author wanghongen class RequestEditor extends StatefulWidget { diff --git a/lib/ui/desktop/request/request_sequence.dart b/lib/ui/desktop/request/request_sequence.dart index 5078132..b32abbd 100644 --- a/lib/ui/desktop/request/request_sequence.dart +++ b/lib/ui/desktop/request/request_sequence.dart @@ -17,13 +17,13 @@ import 'dart:collection'; import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/desktop/request/model/search_model.dart'; -import 'package:network_proxy/ui/desktop/request/request.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/desktop/request/model/search_model.dart'; +import 'package:proxypin/ui/desktop/request/request.dart'; +import 'package:proxypin/utils/listenable_list.dart'; ///请求序列 列表 /// @author wanghongen diff --git a/lib/ui/desktop/request/search.dart b/lib/ui/desktop/request/search.dart index 22d6a42..5a18ee5 100644 --- a/lib/ui/desktop/request/search.dart +++ b/lib/ui/desktop/request/search.dart @@ -15,9 +15,9 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/http/content_type.dart'; -import 'package:network_proxy/ui/desktop/request/model/search_model.dart'; -import 'package:network_proxy/ui/desktop/request/search_condition.dart'; +import 'package:proxypin/network/http/content_type.dart'; +import 'package:proxypin/ui/desktop/request/model/search_model.dart'; +import 'package:proxypin/ui/desktop/request/search_condition.dart'; /// @author wanghongen /// 2023/10/8 diff --git a/lib/ui/desktop/request/search_condition.dart b/lib/ui/desktop/request/search_condition.dart index 1d6b9e7..8538cce 100644 --- a/lib/ui/desktop/request/search_condition.dart +++ b/lib/ui/desktop/request/search_condition.dart @@ -16,10 +16,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/http/content_type.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/ui/desktop/request/model/search_model.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/http/content_type.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/ui/desktop/request/model/search_model.dart'; +import 'package:proxypin/utils/lang.dart'; /// @author wanghongen /// 2023/8/6 diff --git a/lib/ui/desktop/toolbar/phone_connect.dart b/lib/ui/desktop/toolbar/phone_connect.dart index aa2a822..c638de5 100644 --- a/lib/ui/desktop/toolbar/phone_connect.dart +++ b/lib/ui/desktop/toolbar/phone_connect.dart @@ -15,7 +15,7 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/server.dart'; +import 'package:proxypin/network/bin/server.dart'; import 'package:qr_flutter/qr_flutter.dart'; /// @author wanghongen diff --git a/lib/ui/desktop/toolbar/setting/external_proxy.dart b/lib/ui/desktop/toolbar/setting/external_proxy.dart index c67220e..7828d37 100644 --- a/lib/ui/desktop/toolbar/setting/external_proxy.dart +++ b/lib/ui/desktop/toolbar/setting/external_proxy.dart @@ -18,9 +18,9 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/ui/component/widgets.dart'; /// @author wanghongen /// 2023/10/8 diff --git a/lib/ui/desktop/toolbar/setting/filter.dart b/lib/ui/desktop/toolbar/setting/filter.dart index 6e0020b..bae1970 100644 --- a/lib/ui/desktop/toolbar/setting/filter.dart +++ b/lib/ui/desktop/toolbar/setting/filter.dart @@ -21,11 +21,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/components/host_filter.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/components/host_filter.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; /// @author wanghongen /// 2023/10/8 diff --git a/lib/ui/desktop/toolbar/setting/request_block.dart b/lib/ui/desktop/toolbar/setting/request_block.dart index 9dbfe52..fdc2eb9 100644 --- a/lib/ui/desktop/toolbar/setting/request_block.dart +++ b/lib/ui/desktop/toolbar/setting/request_block.dart @@ -15,9 +15,9 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/components/request_block_manager.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; +import 'package:proxypin/network/components/request_block_manager.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; class RequestBlock extends StatefulWidget { final RequestBlockManager requestBlockManager; diff --git a/lib/ui/desktop/toolbar/setting/request_rewrite.dart b/lib/ui/desktop/toolbar/setting/request_rewrite.dart index f395f85..b36a217 100644 --- a/lib/ui/desktop/toolbar/setting/request_rewrite.dart +++ b/lib/ui/desktop/toolbar/setting/request_rewrite.dart @@ -23,15 +23,15 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/multi_window.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/rewrite/rewrite_replace.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/rewrite/rewrite_update.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/multi_window.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/rewrite/rewrite_replace.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/rewrite/rewrite_update.dart'; /// @author wanghongen /// 2023/10/8 @@ -515,7 +515,7 @@ class _RewriteRuleEditState extends State { "launchUrl", isCN ? 'https://gitee.com/wanghongenpin/network-proxy-flutter/wikis/%E8%AF%B7%E6%B1%82%E9%87%8D%E5%86%99' - : 'https://github.com/wanghongenpin/network_proxy_flutter/wiki/Request-Rewrite'))), + : 'https://github.com/wanghongenpin/proxypin/wiki/Request-Rewrite'))), ]), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10.0)), content: Container( diff --git a/lib/ui/desktop/toolbar/setting/rewrite/rewrite_replace.dart b/lib/ui/desktop/toolbar/setting/rewrite/rewrite_replace.dart index 3565d90..979983f 100644 --- a/lib/ui/desktop/toolbar/setting/rewrite/rewrite_replace.dart +++ b/lib/ui/desktop/toolbar/setting/rewrite/rewrite_replace.dart @@ -18,10 +18,10 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/ui/component/state_component.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/ui/component/state_component.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/utils/lang.dart'; /// 重写替换 /// @author wanghongen diff --git a/lib/ui/desktop/toolbar/setting/rewrite/rewrite_update.dart b/lib/ui/desktop/toolbar/setting/rewrite/rewrite_update.dart index 80625a6..1324585 100644 --- a/lib/ui/desktop/toolbar/setting/rewrite/rewrite_update.dart +++ b/lib/ui/desktop/toolbar/setting/rewrite/rewrite_update.dart @@ -16,14 +16,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/http/http.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/http/http.dart'; -import 'package:network_proxy/ui/component/text_field.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; +import 'package:proxypin/ui/component/text_field.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/utils/lang.dart'; /// @author wanghongen /// 2023/10/8 diff --git a/lib/ui/desktop/toolbar/setting/script.dart b/lib/ui/desktop/toolbar/setting/script.dart index 9b0e3d3..9f8d16b 100644 --- a/lib/ui/desktop/toolbar/setting/script.dart +++ b/lib/ui/desktop/toolbar/setting/script.dart @@ -27,12 +27,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_highlight/themes/monokai-sublime.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; import 'package:highlight/languages/javascript.dart'; -import 'package:network_proxy/network/components/script_manager.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/multi_window.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/components/script_manager.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/multi_window.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/utils/lang.dart'; bool _refresh = false; @@ -352,7 +352,7 @@ class _ScriptEditState extends State { "launchUrl", isCN ? 'https://gitee.com/wanghongenpin/network-proxy-flutter/wikis/%E8%84%9A%E6%9C%AC' - : 'https://github.com/wanghongenpin/network_proxy_flutter/wiki/Script'))), + : 'https://github.com/wanghongenpin/proxypin/wiki/Script'))), const Expanded(child: Align(alignment: Alignment.topRight, child: CloseButton())) ]), actionsPadding: const EdgeInsets.only(right: 10, bottom: 10), diff --git a/lib/ui/desktop/toolbar/setting/setting.dart b/lib/ui/desktop/toolbar/setting/setting.dart index de4418c..4a84599 100644 --- a/lib/ui/desktop/toolbar/setting/setting.dart +++ b/lib/ui/desktop/toolbar/setting/setting.dart @@ -17,13 +17,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/components/request_block_manager.dart'; -import 'package:network_proxy/network/util/system_proxy.dart'; -import 'package:network_proxy/ui/component/multi_window.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/external_proxy.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/request_block.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/components/request_block_manager.dart'; +import 'package:proxypin/network/util/system_proxy.dart'; +import 'package:proxypin/ui/component/multi_window.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/external_proxy.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/request_block.dart'; import 'package:url_launcher/url_launcher.dart'; import 'filter.dart'; @@ -74,7 +74,7 @@ class _SettingState extends State { item(localizations.script, onPressed: () => MultiWindow.openWindow(localizations.script, 'ScriptWidget', size: const Size(800, 700))), item(localizations.externalProxy, onPressed: setExternalProxy), - item("Github", onPressed: () => launchUrl(Uri.parse("https://github.com/wanghongenpin/network_proxy_flutter"))), + item("Github", onPressed: () => launchUrl(Uri.parse("https://github.com/wanghongenpin/proxypin"))), ], ); } diff --git a/lib/ui/desktop/toolbar/ssl/ssl.dart b/lib/ui/desktop/toolbar/ssl/ssl.dart index 8d57d46..91866d5 100644 --- a/lib/ui/desktop/toolbar/ssl/ssl.dart +++ b/lib/ui/desktop/toolbar/ssl/ssl.dart @@ -4,11 +4,11 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/util/crts.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/utils/ip.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/util/crts.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/utils/ip.dart'; import 'package:url_launcher/url_launcher.dart'; class SslWidget extends StatefulWidget { @@ -376,7 +376,7 @@ class _SslState extends State { onPressed: () { launchUrl(Uri.parse(isCN ? "https://gitee.com/wanghongenpin/network-proxy-flutter/wikis/%E5%AE%89%E5%8D%93%E6%97%A0ROOT%E4%BD%BF%E7%94%A8Xposed%E6%A8%A1%E5%9D%97%E6%8A%93%E5%8C%85" - : "https://github.com/wanghongenpin/network_proxy_flutter/wiki/Android-without-ROOT-uses-Xposed-module-to-capture-packets")); + : "https://github.com/wanghongenpin/proxypin/wiki/Android-without-ROOT-uses-Xposed-module-to-capture-packets")); }, child: Text(" ${localizations.androidUserXposed}")), const SizedBox(height: 10), diff --git a/lib/ui/desktop/toolbar/toolbar.dart b/lib/ui/desktop/toolbar/toolbar.dart index f000bde..08cd4dd 100644 --- a/lib/ui/desktop/toolbar/toolbar.dart +++ b/lib/ui/desktop/toolbar/toolbar.dart @@ -17,12 +17,12 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/ui/desktop/toolbar/phone_connect.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/setting.dart'; -import 'package:network_proxy/ui/desktop/toolbar/ssl/ssl.dart'; -import 'package:network_proxy/ui/launch/launch.dart'; -import 'package:network_proxy/utils/ip.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/ui/desktop/toolbar/phone_connect.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/setting.dart'; +import 'package:proxypin/ui/desktop/toolbar/ssl/ssl.dart'; +import 'package:proxypin/ui/launch/launch.dart'; +import 'package:proxypin/utils/ip.dart'; import 'package:window_manager/window_manager.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/lib/ui/desktop/window_listener.dart b/lib/ui/desktop/window_listener.dart index 1d6779b..d417756 100644 --- a/lib/ui/desktop/window_listener.dart +++ b/lib/ui/desktop/window_listener.dart @@ -14,8 +14,8 @@ * limitations under the License. */ -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/configuration.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/configuration.dart'; import 'package:window_manager/window_manager.dart'; /// 监听窗口变化 diff --git a/lib/ui/launch/launch.dart b/lib/ui/launch/launch.dart index f1f4427..328df81 100644 --- a/lib/ui/launch/launch.dart +++ b/lib/ui/launch/launch.dart @@ -19,10 +19,10 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/utils/lang.dart'; -import 'package:network_proxy/utils/platform.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/utils/lang.dart'; +import 'package:proxypin/utils/platform.dart'; import 'package:window_manager/window_manager.dart'; ///启动按钮 diff --git a/lib/ui/mobile/menu/drawer.dart b/lib/ui/mobile/menu/drawer.dart index 621a3c0..29f9a16 100644 --- a/lib/ui/mobile/menu/drawer.dart +++ b/lib/ui/mobile/menu/drawer.dart @@ -17,26 +17,26 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/components/host_filter.dart'; -import 'package:network_proxy/network/components/request_block_manager.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/storage/histories.dart'; -import 'package:network_proxy/ui/component/toolbox.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/configuration.dart'; -import 'package:network_proxy/ui/mobile/setting/preference.dart'; -import 'package:network_proxy/ui/mobile/request/favorite.dart'; -import 'package:network_proxy/ui/mobile/request/history.dart'; -import 'package:network_proxy/ui/mobile/setting/app_filter.dart'; -import 'package:network_proxy/ui/mobile/setting/filter.dart'; -import 'package:network_proxy/ui/mobile/setting/request_block.dart'; -import 'package:network_proxy/ui/mobile/setting/request_rewrite.dart'; -import 'package:network_proxy/ui/mobile/setting/script.dart'; -import 'package:network_proxy/ui/mobile/setting/ssl.dart'; -import 'package:network_proxy/ui/mobile/widgets/about.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/components/host_filter.dart'; +import 'package:proxypin/network/components/request_block_manager.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/storage/histories.dart'; +import 'package:proxypin/ui/component/toolbox.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/configuration.dart'; +import 'package:proxypin/ui/mobile/setting/preference.dart'; +import 'package:proxypin/ui/mobile/request/favorite.dart'; +import 'package:proxypin/ui/mobile/request/history.dart'; +import 'package:proxypin/ui/mobile/setting/app_filter.dart'; +import 'package:proxypin/ui/mobile/setting/filter.dart'; +import 'package:proxypin/ui/mobile/setting/request_block.dart'; +import 'package:proxypin/ui/mobile/setting/request_rewrite.dart'; +import 'package:proxypin/ui/mobile/setting/script.dart'; +import 'package:proxypin/ui/mobile/setting/ssl.dart'; +import 'package:proxypin/ui/mobile/widgets/about.dart'; +import 'package:proxypin/utils/listenable_list.dart'; ///左侧抽屉 class DrawerWidget extends StatelessWidget { diff --git a/lib/ui/mobile/menu/me.dart b/lib/ui/mobile/menu/me.dart index 0d620b2..8678f57 100644 --- a/lib/ui/mobile/menu/me.dart +++ b/lib/ui/mobile/menu/me.dart @@ -16,22 +16,22 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/components/request_block_manager.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/storage/histories.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/configuration.dart'; -import 'package:network_proxy/ui/mobile/menu/drawer.dart'; -import 'package:network_proxy/ui/mobile/setting/preference.dart'; -import 'package:network_proxy/ui/mobile/mobile.dart'; -import 'package:network_proxy/ui/mobile/request/favorite.dart'; -import 'package:network_proxy/ui/mobile/request/history.dart'; -import 'package:network_proxy/ui/mobile/setting/request_block.dart'; -import 'package:network_proxy/ui/mobile/setting/request_rewrite.dart'; -import 'package:network_proxy/ui/mobile/setting/script.dart'; -import 'package:network_proxy/ui/mobile/setting/ssl.dart'; -import 'package:network_proxy/ui/mobile/widgets/about.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/components/request_block_manager.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/storage/histories.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/configuration.dart'; +import 'package:proxypin/ui/mobile/menu/drawer.dart'; +import 'package:proxypin/ui/mobile/setting/preference.dart'; +import 'package:proxypin/ui/mobile/mobile.dart'; +import 'package:proxypin/ui/mobile/request/favorite.dart'; +import 'package:proxypin/ui/mobile/request/history.dart'; +import 'package:proxypin/ui/mobile/setting/request_block.dart'; +import 'package:proxypin/ui/mobile/setting/request_rewrite.dart'; +import 'package:proxypin/ui/mobile/setting/script.dart'; +import 'package:proxypin/ui/mobile/setting/ssl.dart'; +import 'package:proxypin/ui/mobile/widgets/about.dart'; /// @author wanghongen /// 2024/9/30 diff --git a/lib/ui/mobile/menu/menu.dart b/lib/ui/mobile/menu/menu.dart index 0d208fd..ae9e072 100644 --- a/lib/ui/mobile/menu/menu.dart +++ b/lib/ui/mobile/menu/menu.dart @@ -18,12 +18,12 @@ import 'dart:io'; import 'package:date_format/date_format.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/ui/mobile/mobile.dart'; -import 'package:network_proxy/ui/mobile/setting/app_filter.dart'; -import 'package:network_proxy/ui/mobile/setting/ssl.dart'; -import 'package:network_proxy/ui/mobile/widgets/highlight.dart'; -import 'package:network_proxy/ui/mobile/widgets/remote_device.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/ui/mobile/mobile.dart'; +import 'package:proxypin/ui/mobile/setting/app_filter.dart'; +import 'package:proxypin/ui/mobile/setting/ssl.dart'; +import 'package:proxypin/ui/mobile/widgets/highlight.dart'; +import 'package:proxypin/ui/mobile/widgets/remote_device.dart'; /// +号菜单 class MoreMenu extends StatelessWidget { diff --git a/lib/ui/mobile/mobile.dart b/lib/ui/mobile/mobile.dart index 78873da..8d3e216 100644 --- a/lib/ui/mobile/mobile.dart +++ b/lib/ui/mobile/mobile.dart @@ -21,33 +21,33 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/native/app_lifecycle.dart'; -import 'package:network_proxy/native/pip.dart'; -import 'package:network_proxy/native/vpn.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/handler.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/websocket.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/ui/component/memory_cleanup.dart'; -import 'package:network_proxy/ui/component/toolbox.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/configuration.dart'; -import 'package:network_proxy/ui/content/panel.dart'; -import 'package:network_proxy/ui/launch/launch.dart'; -import 'package:network_proxy/ui/mobile/menu/drawer.dart'; -import 'package:network_proxy/ui/mobile/menu/me.dart'; -import 'package:network_proxy/ui/mobile/menu/menu.dart'; -import 'package:network_proxy/ui/mobile/request/list.dart'; -import 'package:network_proxy/ui/mobile/request/search.dart'; -import 'package:network_proxy/ui/mobile/widgets/pip.dart'; -import 'package:network_proxy/ui/mobile/widgets/remote_device.dart'; -import 'package:network_proxy/utils/ip.dart'; -import 'package:network_proxy/utils/lang.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; -import 'package:network_proxy/utils/navigator.dart'; +import 'package:proxypin/native/app_lifecycle.dart'; +import 'package:proxypin/native/pip.dart'; +import 'package:proxypin/native/vpn.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/handler.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/websocket.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/ui/component/memory_cleanup.dart'; +import 'package:proxypin/ui/component/toolbox.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/configuration.dart'; +import 'package:proxypin/ui/content/panel.dart'; +import 'package:proxypin/ui/launch/launch.dart'; +import 'package:proxypin/ui/mobile/menu/drawer.dart'; +import 'package:proxypin/ui/mobile/menu/me.dart'; +import 'package:proxypin/ui/mobile/menu/menu.dart'; +import 'package:proxypin/ui/mobile/request/list.dart'; +import 'package:proxypin/ui/mobile/request/search.dart'; +import 'package:proxypin/ui/mobile/widgets/pip.dart'; +import 'package:proxypin/ui/mobile/widgets/remote_device.dart'; +import 'package:proxypin/utils/ip.dart'; +import 'package:proxypin/utils/lang.dart'; +import 'package:proxypin/utils/listenable_list.dart'; +import 'package:proxypin/utils/navigator.dart'; ///移动端首页 ///@author wanghongen diff --git a/lib/ui/mobile/request/domians.dart b/lib/ui/mobile/request/domians.dart index 193f404..9a32679 100644 --- a/lib/ui/mobile/request/domians.dart +++ b/lib/ui/mobile/request/domians.dart @@ -21,15 +21,15 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/components/host_filter.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/mobile/request/request_sequence.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/components/host_filter.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/mobile/request/request_sequence.dart'; +import 'package:proxypin/utils/listenable_list.dart'; ///域名列表 ///@author wanghongen diff --git a/lib/ui/mobile/request/favorite.dart b/lib/ui/mobile/request/favorite.dart index 3dac4c3..27986dd 100644 --- a/lib/ui/mobile/request/favorite.dart +++ b/lib/ui/mobile/request/favorite.dart @@ -22,23 +22,23 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/components/script_manager.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/storage/favorites.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/content/panel.dart'; -import 'package:network_proxy/ui/mobile/request/repeat.dart'; -import 'package:network_proxy/ui/mobile/request/request_editor.dart'; -import 'package:network_proxy/ui/mobile/setting/request_rewrite.dart'; -import 'package:network_proxy/ui/mobile/setting/script.dart'; -import 'package:network_proxy/utils/curl.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/components/script_manager.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/storage/favorites.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/content/panel.dart'; +import 'package:proxypin/ui/mobile/request/repeat.dart'; +import 'package:proxypin/ui/mobile/request/request_editor.dart'; +import 'package:proxypin/ui/mobile/setting/request_rewrite.dart'; +import 'package:proxypin/ui/mobile/setting/script.dart'; +import 'package:proxypin/utils/curl.dart'; +import 'package:proxypin/utils/lang.dart'; import 'package:shared_preferences/shared_preferences.dart'; /// 收藏列表页面 diff --git a/lib/ui/mobile/request/history.dart b/lib/ui/mobile/request/history.dart index 09063a4..aefe2ce 100644 --- a/lib/ui/mobile/request/history.dart +++ b/lib/ui/mobile/request/history.dart @@ -23,19 +23,19 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/storage/histories.dart'; -import 'package:network_proxy/ui/component/history_cache_time.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/mobile/request/list.dart'; -import 'package:network_proxy/ui/mobile/request/search.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/storage/histories.dart'; +import 'package:proxypin/ui/component/history_cache_time.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/mobile/request/list.dart'; +import 'package:proxypin/ui/mobile/request/search.dart'; +import 'package:proxypin/utils/listenable_list.dart'; import 'package:share_plus/share_plus.dart'; import '../../../utils/har.dart'; diff --git a/lib/ui/mobile/request/list.dart b/lib/ui/mobile/request/list.dart index dde91aa..dfdee82 100644 --- a/lib/ui/mobile/request/list.dart +++ b/lib/ui/mobile/request/list.dart @@ -18,14 +18,14 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/channel.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/ui/desktop/request/model/search_model.dart'; -import 'package:network_proxy/ui/mobile/request/domians.dart'; -import 'package:network_proxy/ui/mobile/request/request_sequence.dart'; -import 'package:network_proxy/utils/har.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/channel.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/ui/desktop/request/model/search_model.dart'; +import 'package:proxypin/ui/mobile/request/domians.dart'; +import 'package:proxypin/ui/mobile/request/request_sequence.dart'; +import 'package:proxypin/utils/har.dart'; +import 'package:proxypin/utils/listenable_list.dart'; import 'package:share_plus/share_plus.dart'; /// 请求列表 diff --git a/lib/ui/mobile/request/request.dart b/lib/ui/mobile/request/request.dart index 6015446..0175769 100644 --- a/lib/ui/mobile/request/request.dart +++ b/lib/ui/mobile/request/request.dart @@ -20,26 +20,26 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/components/script_manager.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/network/util/cache.dart'; -import 'package:network_proxy/storage/favorites.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/content/panel.dart'; -import 'package:network_proxy/ui/mobile/request/repeat.dart'; -import 'package:network_proxy/ui/mobile/request/request_editor.dart'; -import 'package:network_proxy/ui/mobile/setting/request_rewrite.dart'; -import 'package:network_proxy/ui/mobile/setting/script.dart'; -import 'package:network_proxy/ui/mobile/widgets/highlight.dart'; -import 'package:network_proxy/utils/curl.dart'; -import 'package:network_proxy/utils/lang.dart'; -import 'package:network_proxy/utils/navigator.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/components/script_manager.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/network/util/cache.dart'; +import 'package:proxypin/storage/favorites.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/content/panel.dart'; +import 'package:proxypin/ui/mobile/request/repeat.dart'; +import 'package:proxypin/ui/mobile/request/request_editor.dart'; +import 'package:proxypin/ui/mobile/setting/request_rewrite.dart'; +import 'package:proxypin/ui/mobile/setting/script.dart'; +import 'package:proxypin/ui/mobile/widgets/highlight.dart'; +import 'package:proxypin/utils/curl.dart'; +import 'package:proxypin/utils/lang.dart'; +import 'package:proxypin/utils/navigator.dart'; import 'package:shared_preferences/shared_preferences.dart'; ///请求行 diff --git a/lib/ui/mobile/request/request_editor.dart b/lib/ui/mobile/request/request_editor.dart index 428e04a..4ce8ad6 100644 --- a/lib/ui/mobile/request/request_editor.dart +++ b/lib/ui/mobile/request/request_editor.dart @@ -20,14 +20,14 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/ui/content/body.dart'; -import 'package:network_proxy/utils/curl.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/ui/content/body.dart'; +import 'package:proxypin/utils/curl.dart'; +import 'package:proxypin/utils/lang.dart'; /// @author wanghongen class MobileRequestEditor extends StatefulWidget { diff --git a/lib/ui/mobile/request/request_sequence.dart b/lib/ui/mobile/request/request_sequence.dart index 88f1f79..24fb481 100644 --- a/lib/ui/mobile/request/request_sequence.dart +++ b/lib/ui/mobile/request/request_sequence.dart @@ -1,12 +1,12 @@ import 'dart:collection'; import 'package:flutter/material.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/ui/desktop/request/model/search_model.dart'; -import 'package:network_proxy/ui/mobile/request/request.dart'; -import 'package:network_proxy/ui/mobile/widgets/highlight.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/ui/desktop/request/model/search_model.dart'; +import 'package:proxypin/ui/mobile/request/request.dart'; +import 'package:proxypin/ui/mobile/widgets/highlight.dart'; +import 'package:proxypin/utils/listenable_list.dart'; ///请求序列 列表 ///@author wanghongen diff --git a/lib/ui/mobile/request/search.dart b/lib/ui/mobile/request/search.dart index e6891e5..a12c944 100644 --- a/lib/ui/mobile/request/search.dart +++ b/lib/ui/mobile/request/search.dart @@ -14,8 +14,8 @@ * limitations under the License. */ import 'package:flutter/material.dart'; -import 'package:network_proxy/ui/desktop/request/model/search_model.dart'; -import 'package:network_proxy/ui/desktop/request/search_condition.dart'; +import 'package:proxypin/ui/desktop/request/model/search_model.dart'; +import 'package:proxypin/ui/desktop/request/search_condition.dart'; class MobileSearch extends StatefulWidget { final Function(SearchModel searchModel)? onSearch; diff --git a/lib/ui/mobile/setting/app_filter.dart b/lib/ui/mobile/setting/app_filter.dart index 307dff0..f82c2a9 100644 --- a/lib/ui/mobile/setting/app_filter.dart +++ b/lib/ui/mobile/setting/app_filter.dart @@ -17,11 +17,11 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/native/installed_apps.dart'; -import 'package:network_proxy/native/vpn.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; +import 'package:proxypin/native/installed_apps.dart'; +import 'package:proxypin/native/vpn.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/ui/component/widgets.dart'; ///应用白名单 目前只支持安卓 ios没办法获取安装的列表 ///@author wang diff --git a/lib/ui/mobile/setting/filter.dart b/lib/ui/mobile/setting/filter.dart index 4192c59..9da853f 100644 --- a/lib/ui/mobile/setting/filter.dart +++ b/lib/ui/mobile/setting/filter.dart @@ -22,9 +22,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/utils.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/utils.dart'; import 'package:share_plus/share_plus.dart'; import '../../../network/components/host_filter.dart'; diff --git a/lib/ui/mobile/setting/preference.dart b/lib/ui/mobile/setting/preference.dart index 59f208b..3193de2 100644 --- a/lib/ui/mobile/setting/preference.dart +++ b/lib/ui/mobile/setting/preference.dart @@ -3,13 +3,13 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/configuration.dart'; -import 'package:network_proxy/ui/desktop/toolbar/setting/setting.dart'; -import 'package:network_proxy/ui/mobile/setting/proxy.dart'; -import 'package:network_proxy/ui/mobile/setting/theme.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/configuration.dart'; +import 'package:proxypin/ui/desktop/toolbar/setting/setting.dart'; +import 'package:proxypin/ui/mobile/setting/proxy.dart'; +import 'package:proxypin/ui/mobile/setting/theme.dart'; ///设置 ///@author wanghongen diff --git a/lib/ui/mobile/setting/proxy.dart b/lib/ui/mobile/setting/proxy.dart index aa235bb..27edeee 100644 --- a/lib/ui/mobile/setting/proxy.dart +++ b/lib/ui/mobile/setting/proxy.dart @@ -3,9 +3,9 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/ui/component/widgets.dart'; class ExternalProxyDialog extends StatefulWidget { final Configuration configuration; diff --git a/lib/ui/mobile/setting/request_block.dart b/lib/ui/mobile/setting/request_block.dart index 8634789..ac16ab8 100644 --- a/lib/ui/mobile/setting/request_block.dart +++ b/lib/ui/mobile/setting/request_block.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/components/request_block_manager.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/components/request_block_manager.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/utils/lang.dart'; class MobileRequestBlock extends StatefulWidget { final RequestBlockManager requestBlockManager; diff --git a/lib/ui/mobile/setting/request_rewrite.dart b/lib/ui/mobile/setting/request_rewrite.dart index a43566a..4c1a585 100644 --- a/lib/ui/mobile/setting/request_rewrite.dart +++ b/lib/ui/mobile/setting/request_rewrite.dart @@ -21,13 +21,13 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/mobile/setting/rewrite/rewrite_update.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/mobile/setting/rewrite/rewrite_update.dart'; import 'package:share_plus/share_plus.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -465,7 +465,7 @@ class _RewriteRuleState extends State { recognizer: TapGestureRecognizer() ..onTap = () => launchUrl(Uri.parse(isCN ? 'https://gitee.com/wanghongenpin/network-proxy-flutter/wikis/%E8%AF%B7%E6%B1%82%E9%87%8D%E5%86%99' - : 'https://github.com/wanghongenpin/network_proxy_flutter/wiki/Request-Rewrite')))), + : 'https://github.com/wanghongenpin/proxypin/wiki/Request-Rewrite')))), ]), actions: [ TextButton( diff --git a/lib/ui/mobile/setting/rewrite/rewrite_replace.dart b/lib/ui/mobile/setting/rewrite/rewrite_replace.dart index 3577768..9c81b84 100644 --- a/lib/ui/mobile/setting/rewrite/rewrite_replace.dart +++ b/lib/ui/mobile/setting/rewrite/rewrite_replace.dart @@ -18,11 +18,11 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/ui/component/state_component.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/ui/component/state_component.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/utils/lang.dart'; /// 重写替换 /// @author wanghongen diff --git a/lib/ui/mobile/setting/rewrite/rewrite_update.dart b/lib/ui/mobile/setting/rewrite/rewrite_update.dart index 9dcde4f..62244df 100644 --- a/lib/ui/mobile/setting/rewrite/rewrite_update.dart +++ b/lib/ui/mobile/setting/rewrite/rewrite_update.dart @@ -17,11 +17,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/components/rewrite/rewrite_rule.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/ui/component/text_field.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/components/rewrite/rewrite_rule.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/ui/component/text_field.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/utils/lang.dart'; class MobileRewriteUpdate extends StatefulWidget { final RuleType ruleType; diff --git a/lib/ui/mobile/setting/script.dart b/lib/ui/mobile/setting/script.dart index 0a0e5c3..8a71b41 100644 --- a/lib/ui/mobile/setting/script.dart +++ b/lib/ui/mobile/setting/script.dart @@ -23,12 +23,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_highlight/themes/monokai-sublime.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; import 'package:highlight/languages/javascript.dart'; -import 'package:network_proxy/network/components/script_manager.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/ui/mobile/widgets/floating_window.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/components/script_manager.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/ui/mobile/widgets/floating_window.dart'; +import 'package:proxypin/utils/lang.dart'; import 'package:share_plus/share_plus.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -423,7 +423,7 @@ class _ScriptEditState extends State { recognizer: TapGestureRecognizer() ..onTap = () => launchUrl(Uri.parse(isCN ? 'https://gitee.com/wanghongenpin/network-proxy-flutter/wikis/%E8%84%9A%E6%9C%AC' - : 'https://github.com/wanghongenpin/network_proxy_flutter/wiki/Script')))), + : 'https://github.com/wanghongenpin/proxypin/wiki/Script')))), ]), actions: [ TextButton( diff --git a/lib/ui/mobile/setting/ssl.dart b/lib/ui/mobile/setting/ssl.dart index 0f5cad2..14857d7 100644 --- a/lib/ui/mobile/setting/ssl.dart +++ b/lib/ui/mobile/setting/ssl.dart @@ -20,11 +20,11 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/util/crts.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/util/crts.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/utils/lang.dart'; import 'package:url_launcher/url_launcher.dart'; class MobileSslWidget extends StatefulWidget { @@ -331,7 +331,7 @@ class _AndroidCaInstallState extends State with SingleTickerPr onPressed: () { launchUrl(Uri.parse(isCN ? "https://gitee.com/wanghongenpin/network-proxy-flutter/wikis/%E5%AE%89%E5%8D%93%E6%97%A0ROOT%E4%BD%BF%E7%94%A8Xposed%E6%A8%A1%E5%9D%97%E6%8A%93%E5%8C%85" - : "https://github.com/wanghongenpin/network_proxy_flutter/wiki/Android-without-ROOT-uses-Xposed-module-to-capture-packets")); + : "https://github.com/wanghongenpin/proxypin/wiki/Android-without-ROOT-uses-Xposed-module-to-capture-packets")); }, child: Text(localizations.androidUserXposed)), ClipRRect( diff --git a/lib/ui/mobile/setting/theme.dart b/lib/ui/mobile/setting/theme.dart index 5c5102e..a222af2 100644 --- a/lib/ui/mobile/setting/theme.dart +++ b/lib/ui/mobile/setting/theme.dart @@ -15,7 +15,7 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/ui/configuration.dart'; +import 'package:proxypin/ui/configuration.dart'; class MobileThemeSetting extends StatelessWidget { final AppConfiguration appConfiguration; diff --git a/lib/ui/mobile/setting/video_player.dart b/lib/ui/mobile/setting/video_player.dart index 101d7bc..265505c 100644 --- a/lib/ui/mobile/setting/video_player.dart +++ b/lib/ui/mobile/setting/video_player.dart @@ -33,7 +33,7 @@ // super.initState(); // // _controller = VideoPlayerController.network( -// 'https://github.com/wanghongenpin/network_proxy_flutter/assets/24794200/38bc5a83-999f-4af2-9d74-863532a81cef', +// 'https://github.com/wanghongenpin/proxypin/assets/24794200/38bc5a83-999f-4af2-9d74-863532a81cef', // videoPlayerOptions: VideoPlayerOptions(mixWithOthers: true, allowBackgroundPlayback: true), // ); // _initializeVideoPlayerFuture = _controller.initialize(); diff --git a/lib/ui/mobile/widgets/about.dart b/lib/ui/mobile/widgets/about.dart index 3ce20db..747a289 100644 --- a/lib/ui/mobile/widgets/about.dart +++ b/lib/ui/mobile/widgets/about.dart @@ -27,7 +27,7 @@ class About extends StatelessWidget { AppLocalizations localizations = AppLocalizations.of(context)!; bool isCN = Localizations.localeOf(context) == const Locale.fromSubtags(languageCode: 'zh'); - String gitHub = "https://github.com/wanghongenpin/network_proxy_flutter"; + String gitHub = "https://github.com/wanghongenpin/proxypin"; return Scaffold( appBar: AppBar(title: Text(localizations.about, style: const TextStyle(fontSize: 16)), centerTitle: true), body: Column( diff --git a/lib/ui/mobile/widgets/highlight.dart b/lib/ui/mobile/widgets/highlight.dart index 575a014..55432f6 100644 --- a/lib/ui/mobile/widgets/highlight.dart +++ b/lib/ui/mobile/widgets/highlight.dart @@ -15,8 +15,8 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/ui/component/state_component.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; +import 'package:proxypin/ui/component/state_component.dart'; +import 'package:proxypin/ui/component/widgets.dart'; class KeywordHighlight extends StatefulWidget { static Map keywords = {}; diff --git a/lib/ui/mobile/widgets/pip.dart b/lib/ui/mobile/widgets/pip.dart index 90e6b11..c32bb84 100644 --- a/lib/ui/mobile/widgets/pip.dart +++ b/lib/ui/mobile/widgets/pip.dart @@ -17,13 +17,13 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:network_proxy/native/pip.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/ui/configuration.dart'; -import 'package:network_proxy/utils/ip.dart'; -import 'package:network_proxy/utils/lang.dart'; -import 'package:network_proxy/utils/listenable_list.dart'; +import 'package:proxypin/native/pip.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/ui/configuration.dart'; +import 'package:proxypin/utils/ip.dart'; +import 'package:proxypin/utils/lang.dart'; +import 'package:proxypin/utils/listenable_list.dart'; /// Picture in Picture Window class PictureInPictureWindow extends StatefulWidget { diff --git a/lib/ui/mobile/widgets/remote_device.dart b/lib/ui/mobile/widgets/remote_device.dart index 6372f9c..7b999c2 100644 --- a/lib/ui/mobile/widgets/remote_device.dart +++ b/lib/ui/mobile/widgets/remote_device.dart @@ -20,18 +20,18 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_toastr/flutter_toastr.dart'; -import 'package:network_proxy/native/vpn.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/network/bin/server.dart'; -import 'package:network_proxy/network/components/host_filter.dart'; -import 'package:network_proxy/network/components/rewrite/request_rewrite_manager.dart'; -import 'package:network_proxy/network/components/script_manager.dart'; -import 'package:network_proxy/network/http_client.dart'; -import 'package:network_proxy/network/util/logger.dart'; -import 'package:network_proxy/ui/component/qrcode/qr_scan_view.dart'; -import 'package:network_proxy/ui/component/utils.dart'; -import 'package:network_proxy/ui/component/widgets.dart'; -import 'package:network_proxy/utils/ip.dart'; +import 'package:proxypin/native/vpn.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/network/bin/server.dart'; +import 'package:proxypin/network/components/host_filter.dart'; +import 'package:proxypin/network/components/rewrite/request_rewrite_manager.dart'; +import 'package:proxypin/network/components/script_manager.dart'; +import 'package:proxypin/network/http_client.dart'; +import 'package:proxypin/network/util/logger.dart'; +import 'package:proxypin/ui/component/qrcode/qr_scan_view.dart'; +import 'package:proxypin/ui/component/utils.dart'; +import 'package:proxypin/ui/component/widgets.dart'; +import 'package:proxypin/utils/ip.dart'; import 'package:qr_flutter/qr_flutter.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/utils/compress.dart b/lib/utils/compress.dart index af0f05b..df53ed0 100644 --- a/lib/utils/compress.dart +++ b/lib/utils/compress.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:brotli/brotli.dart'; -import 'package:network_proxy/network/util/logger.dart'; +import 'package:proxypin/network/util/logger.dart'; ///GZIP 解压缩 List gzipDecode(List byteBuffer) { diff --git a/lib/utils/curl.dart b/lib/utils/curl.dart index 2114141..82350cc 100644 --- a/lib/utils/curl.dart +++ b/lib/utils/curl.dart @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/utils/lang.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/utils/lang.dart'; ///复制cURL请求 String curlRequest(HttpRequest request) { diff --git a/lib/utils/har.dart b/lib/utils/har.dart index 12598ea..73cae60 100644 --- a/lib/utils/har.dart +++ b/lib/utils/har.dart @@ -16,11 +16,11 @@ import 'dart:convert'; import 'dart:io'; -import 'package:network_proxy/network/host_port.dart'; -import 'package:network_proxy/network/http/content_type.dart'; -import 'package:network_proxy/network/http/http.dart'; -import 'package:network_proxy/network/http/http_headers.dart'; -import 'package:network_proxy/network/util/process_info.dart'; +import 'package:proxypin/network/host_port.dart'; +import 'package:proxypin/network/http/content_type.dart'; +import 'package:proxypin/network/http/http.dart'; +import 'package:proxypin/network/http/http_headers.dart'; +import 'package:proxypin/network/util/process_info.dart'; class Har { static int maxBodyLength = 1024 * 1024 * 4; diff --git a/lib/utils/python.dart b/lib/utils/python.dart index 62e5829..f78d7ad 100644 --- a/lib/utils/python.dart +++ b/lib/utils/python.dart @@ -1,4 +1,4 @@ -import 'package:network_proxy/network/http/http.dart'; +import 'package:proxypin/network/http/http.dart'; // 复制为 Python Requests 请求 String copyAsPythonRequests(HttpRequest request) { diff --git a/linux/build.sh b/linux/build.sh index 27fee43..c0077be 100644 --- a/linux/build.sh +++ b/linux/build.sh @@ -11,7 +11,7 @@ echo "Architecture: amd64" >> package/DEBIAN/control echo "Depends: ca-certificates" >> package/DEBIAN/control echo "Section: utils" >> package/DEBIAN/control echo "Maintainer: wanghongenpin@gmail.com" >> package/DEBIAN/control -echo "Homepage: https://github.com/wanghongenpin/network_proxy_flutter" >> package/DEBIAN/control +echo "Homepage: https://github.com/wanghongenpin/proxypin" >> package/DEBIAN/control echo "Description: http/https Capture packets" >> package/DEBIAN/control echo "" >> package/DEBIAN/control mkdir -p package/usr/share/applications diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index e9a532a..87e0f1b 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -495,7 +495,7 @@ ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.network.network.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.proxy.pin.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/RunnerTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -520,7 +520,7 @@ ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.network.network.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.proxy.pin.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/RunnerTests-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -544,7 +544,7 @@ ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.network.network.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.proxy.pin.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/RunnerTests-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 9cd8356..09007d3 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = ProxyPin // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.network.proxy +PRODUCT_BUNDLE_IDENTIFIER = com.proxypin // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2023 com.network. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2023 Hongen Wang. All rights reserved. diff --git a/pubspec.yaml b/pubspec.yaml index b834eee..990af21 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: network_proxy +name: proxypin description: ProxyPin publish_to: 'none' # Remove this line if you wish to publish to pub.dev diff --git a/test/cert_test.dart b/test/cert_test.dart index 817f82b..94c39c0 100644 --- a/test/cert_test.dart +++ b/test/cert_test.dart @@ -2,9 +2,9 @@ import 'dart:io'; import 'dart:math'; import 'package:basic_utils/basic_utils.dart'; -import 'package:network_proxy/network/util/cert/basic_constraints.dart'; -import 'package:network_proxy/network/util/cert/key_usage.dart' as x509; -import 'package:network_proxy/network/util/cert/x509.dart'; +import 'package:proxypin/network/util/cert/basic_constraints.dart'; +import 'package:proxypin/network/util/cert/key_usage.dart' as x509; +import 'package:proxypin/network/util/cert/x509.dart'; void main() async { var caPem = await File('assets/certs/ca.crt').readAsString(); diff --git a/test/js_test.dart b/test/js_test.dart index db6d860..e0e6b4d 100644 --- a/test/js_test.dart +++ b/test/js_test.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_js/flutter_js.dart'; -import 'package:network_proxy/network/components/js/file.dart'; -import 'package:network_proxy/network/components/js/md5.dart'; +import 'package:proxypin/network/components/js/file.dart'; +import 'package:proxypin/network/components/js/md5.dart'; // Convert JS request // Map convertJsRequest(HttpRequest request) { diff --git a/test/pk12_test.dart b/test/pk12_test.dart index 11eebcf..405683b 100644 --- a/test/pk12_test.dart +++ b/test/pk12_test.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:network_proxy/network/util/cert/pkcs12.dart'; +import 'package:proxypin/network/util/cert/pkcs12.dart'; void main() { File file = File('C:\\Users\\wanghongen\\Downloads\\new_key.p12'); diff --git a/test/web_test.dart b/test/web_test.dart index a73c798..a02378b 100644 --- a/test/web_test.dart +++ b/test/web_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:network_proxy/network/http/codec.dart'; -import 'package:network_proxy/network/http/http.dart'; +import 'package:proxypin/network/http/codec.dart'; +import 'package:proxypin/network/http/http.dart'; main() async { await socketTest(); diff --git a/test/widget_test.dart b/test/widget_test.dart index b684227..65aba9e 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,10 +8,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:network_proxy/main.dart'; -import 'package:network_proxy/network/bin/configuration.dart'; -import 'package:network_proxy/ui/desktop/desktop.dart'; -import 'package:network_proxy/ui/configuration.dart'; +import 'package:proxypin/main.dart'; +import 'package:proxypin/network/bin/configuration.dart'; +import 'package:proxypin/ui/desktop/desktop.dart'; +import 'package:proxypin/ui/configuration.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/test/x509_test.dart b/test/x509_test.dart index df4c60e..bbdfc41 100644 --- a/test/x509_test.dart +++ b/test/x509_test.dart @@ -2,8 +2,8 @@ import 'dart:io'; import 'dart:typed_data'; import 'package:basic_utils/basic_utils.dart'; -import 'package:network_proxy/network/util/cert/basic_constraints.dart'; -import 'package:network_proxy/network/util/cert/x509.dart'; +import 'package:proxypin/network/util/cert/basic_constraints.dart'; +import 'package:proxypin/network/util/cert/x509.dart'; import 'package:pointycastle/pointycastle.dart'; void main() async { diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 3b098b4..8575c4b 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -89,11 +89,11 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "com.proxy.pin" "\0" - VALUE "FileDescription", "ProxyPin" "\0" + VALUE "CompanyName", "ProxyPin" "\0" + VALUE "FileDescription", "Capture HTTP(S) traffic software ProxyPin" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "ProxyPin" "\0" - VALUE "LegalCopyright", "Copyright (C) 2023 com.proxy.pin. All rights reserved." "\0" + VALUE "LegalCopyright", "Copyright (C) 2023 Hongen Wang. All rights reserved." "\0" VALUE "OriginalFilename", "ProxyPin.exe" "\0" VALUE "ProductName", "ProxyPin" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0"