diff --git a/android/app/build.gradle b/android/app/build.gradle index 7aa27b9..2875577 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -60,9 +60,7 @@ android { applicationId "com.network.proxy" ndk { abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64' } // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. -// minSdkVersion flutter.minSdkVersion - // Minimum supported Android version: 21 - minSdkVersion 21 + minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion multiDexEnabled true versionCode flutterVersionCode.toInteger() diff --git a/lib/ui/desktop/left_menus/navigation.dart b/lib/ui/desktop/left_menus/navigation.dart index 516aafd..9040b84 100644 --- a/lib/ui/desktop/left_menus/navigation.dart +++ b/lib/ui/desktop/left_menus/navigation.dart @@ -85,6 +85,7 @@ class _LeftNavigationBarState extends State { message: localizations.preference, preferBelow: false, child: IconButton( + iconSize: 22, onPressed: () { showDialog( context: context, @@ -96,6 +97,7 @@ class _LeftNavigationBarState extends State { preferBelow: true, message: localizations.feedback, child: IconButton( + iconSize: 22, onPressed: () => launchUrl(Uri.parse("https://github.com/wanghongenpin/proxypin/issues")), icon: Icon(Icons.feedback_outlined, color: Colors.grey.shade500), )), diff --git a/lib/ui/desktop/preference.dart b/lib/ui/desktop/preference.dart index 154597a..b092000 100644 --- a/lib/ui/desktop/preference.dart +++ b/lib/ui/desktop/preference.dart @@ -82,7 +82,8 @@ class _PreferenceState extends State { items: [ DropdownMenuItem(value: null, child: Text(localizations.followSystem)), const DropdownMenuItem(value: Locale.fromSubtags(languageCode: "zh"), child: Text("简体中文")), - const DropdownMenuItem(value: Locale.fromSubtags(languageCode: "zh", scriptCode: "Hant"), child: Text("繁體中文")), + const DropdownMenuItem( + value: Locale.fromSubtags(languageCode: "zh", scriptCode: "Hant"), child: Text("繁體中文")), const DropdownMenuItem(value: Locale.fromSubtags(languageCode: "en"), child: Text("English")), ]), ]), @@ -122,7 +123,8 @@ class _PreferenceState extends State { const Divider(), ListTile( contentPadding: EdgeInsets.zero, - title: Text(localizations.autoStartup), //默认是否启动 + title: Text(localizations.autoStartup, style: titleStyle), + //默认是否启动 subtitle: Text(localizations.autoStartupDescribe, style: subtitleStyle), trailing: SwitchWidget( scale: 0.75, @@ -133,7 +135,7 @@ class _PreferenceState extends State { })), ListTile( contentPadding: EdgeInsets.zero, - title: Text(localizations.headerExpanded), + title: Text(localizations.headerExpanded, style: titleStyle), subtitle: Text(localizations.headerExpandedSubtitle, style: subtitleStyle), trailing: SwitchWidget( scale: 0.75, @@ -142,10 +144,9 @@ class _PreferenceState extends State { appConfiguration.headerExpanded = value; appConfiguration.flushConfig(); })), - SizedBox(height: 5), ListTile( contentPadding: EdgeInsets.zero, - title: Text(localizations.memoryCleanup), + title: Text(localizations.memoryCleanup, style: titleStyle), subtitle: Text(localizations.memoryCleanupSubtitle, style: subtitleStyle), trailing: memoryCleanup(context, localizations)), diff --git a/lib/ui/desktop/request/report_servers.dart b/lib/ui/desktop/request/report_servers.dart index 93cd7be..87ce3b8 100644 --- a/lib/ui/desktop/request/report_servers.dart +++ b/lib/ui/desktop/request/report_servers.dart @@ -17,6 +17,8 @@ Future showReportServersDialog(BuildContext context) { barrierDismissible: false, builder: (ctx) => Dialog( insetPadding: const EdgeInsets.all(16), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), + clipBehavior: Clip.antiAlias, child: SizedBox( width: 570, height: 560, @@ -144,7 +146,7 @@ class _ReportServersPageState extends State { SizedBox( width: 100, child: DropdownButtonFormField( - initialValue: compression, + value: compression, decoration: dec(), isDense: true, items: [ diff --git a/lib/ui/desktop/setting/about.dart b/lib/ui/desktop/setting/about.dart index 69404ac..e553520 100644 --- a/lib/ui/desktop/setting/about.dart +++ b/lib/ui/desktop/setting/about.dart @@ -1,4 +1,3 @@ -import 'dart:ui' show FontFeature; import 'package:flutter/material.dart'; import 'package:proxypin/l10n/app_localizations.dart'; import 'package:proxypin/ui/app_update/app_update_repository.dart'; @@ -44,18 +43,11 @@ class _AppUpdateStateChecking extends State { child: Text(isCN ? "全平台开源免费抓包软件" : "Full platform open source free capture HTTP(S) traffic software", textAlign: TextAlign.center, style: const TextStyle(height: 1.3))), const SizedBox(height: 10), - DecoratedBox( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceContainerHighest.withValues(alpha: 0.4), - borderRadius: BorderRadius.circular(8), - ), - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), - child: Text("Version ${AppConfiguration.version}", - style: TextStyle( - fontWeight: FontWeight.w500, - color: Theme.of(context).colorScheme.primary, - fontFeatures: const [FontFeature.tabularFigures()])), + Padding( + padding: const EdgeInsets.symmetric(vertical: 6), + child: Text( + "Version ${AppConfiguration.version}", + style: TextStyle(fontWeight: FontWeight.w500), ), ), const SizedBox(height: 12), @@ -96,10 +88,11 @@ class _AppUpdateStateChecking extends State { showDialog( context: context, builder: (ctx) => AlertDialog( - constraints: const BoxConstraints(maxWidth: 385), title: Text(localizations.privacyPolicy), content: SingleChildScrollView( - child: Text(localizations.privacyContent, style: const TextStyle(height: 1.35))), + child: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 385), + child: Text(localizations.privacyContent, style: const TextStyle(height: 1.35)))), actions: [ TextButton(onPressed: () => Navigator.of(ctx).pop(), child: Text(localizations.close)) ], diff --git a/lib/ui/desktop/setting/request_rewrite.dart b/lib/ui/desktop/setting/request_rewrite.dart index 262d335..a47bf59 100644 --- a/lib/ui/desktop/setting/request_rewrite.dart +++ b/lib/ui/desktop/setting/request_rewrite.dart @@ -604,7 +604,7 @@ class _RewriteRuleEditState extends State { height: 36, child: DropdownButtonFormField( onSaved: (val) => rule.type = val!, - initialValue: ruleType, + value: ruleType, decoration: InputDecoration( errorStyle: const TextStyle(height: 0, fontSize: 0), contentPadding: const EdgeInsets.only(left: 7, right: 7), diff --git a/lib/ui/mobile/setting/report_servers.dart b/lib/ui/mobile/setting/report_servers.dart index 0a02571..3ffadcd 100644 --- a/lib/ui/mobile/setting/report_servers.dart +++ b/lib/ui/mobile/setting/report_servers.dart @@ -268,7 +268,7 @@ class _ReportServerEditPageMobileState extends State SizedBox( width: 120, child: DropdownButtonFormField( - initialValue: _compression, + value: _compression, decoration: dec(), items: [ DropdownMenuItem(value: 'none', child: Text(localizations.compressionNone)), diff --git a/lib/ui/mobile/setting/request_rewrite.dart b/lib/ui/mobile/setting/request_rewrite.dart index 5dc69e7..46d44bf 100644 --- a/lib/ui/mobile/setting/request_rewrite.dart +++ b/lib/ui/mobile/setting/request_rewrite.dart @@ -569,7 +569,7 @@ class _RewriteRuleState extends State { height: 50, child: DropdownButtonFormField( onSaved: (val) => rule.type = val!, - initialValue: ruleType, + value: ruleType, decoration: const InputDecoration( border: OutlineInputBorder(), errorStyle: TextStyle(height: 0, fontSize: 0), diff --git a/lib/ui/mobile/widgets/about.dart b/lib/ui/mobile/widgets/about.dart index b02639d..f0b6387 100644 --- a/lib/ui/mobile/widgets/about.dart +++ b/lib/ui/mobile/widgets/about.dart @@ -52,7 +52,7 @@ class _AboutState extends State { padding: const EdgeInsets.symmetric(horizontal: 10), child: Text(localizations.proxyPinSoftware, textAlign: TextAlign.center))), const SizedBox(height: 8), - Center(child: Text("${localizations.version} ${AppConfiguration.version}")), + Center(child: Text("Version ${AppConfiguration.version}")), const SizedBox(height: 12), Card( color: Colors.transparent, @@ -101,13 +101,15 @@ class _AboutState extends State { onTap: () { showDialog( context: context, - builder: (ctx) => AlertDialog( + builder: (ctx) => ConstrainedBox( constraints: const BoxConstraints(maxWidth: 385), - title: Text(localizations.privacyPolicy), - content: SingleChildScrollView(child: Text(localizations.privacyContent)), - actions: [ - TextButton(onPressed: () => Navigator.of(ctx).pop(), child: Text(localizations.close)) - ], + child: AlertDialog( + title: Text(localizations.privacyPolicy), + content: SingleChildScrollView(child: Text(localizations.privacyContent)), + actions: [ + TextButton(onPressed: () => Navigator.of(ctx).pop(), child: Text(localizations.close)) + ], + ), )); }), Divider(height: 0, thickness: 0.4, color: Theme.of(context).dividerColor.withValues(alpha: 0.22)), diff --git a/linux/build.sh b/linux/build.sh index 601d157..d30e1ed 100644 --- a/linux/build.sh +++ b/linux/build.sh @@ -5,7 +5,7 @@ cd ../build/linux/x64/release rm -rf package mkdir -p package/DEBIAN echo "Package: ProxyPin" >> package/DEBIAN/control -echo "Version: 1.2.2" >> package/DEBIAN/control +echo "Version: 1.2.3" >> package/DEBIAN/control echo "Priority: optional" >> package/DEBIAN/control echo "Architecture: amd64" >> package/DEBIAN/control echo "Depends: ca-certificates" >> package/DEBIAN/control