diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0ac817f7..76af022d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,6 +2,8 @@ PODS: - countly_flutter (20.11.4): - Flutter - Flutter (1.0.0) + - flutter_icmp_ping (0.0.1): + - Flutter - path_provider_ios (0.0.1): - Flutter - r_upgrade (0.0.1): @@ -12,6 +14,7 @@ PODS: DEPENDENCIES: - countly_flutter (from `.symlinks/plugins/countly_flutter/ios`) - Flutter (from `Flutter`) + - flutter_icmp_ping (from `.symlinks/plugins/flutter_icmp_ping/ios`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - r_upgrade (from `.symlinks/plugins/r_upgrade/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) @@ -21,6 +24,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/countly_flutter/ios" Flutter: :path: Flutter + flutter_icmp_ping: + :path: ".symlinks/plugins/flutter_icmp_ping/ios" path_provider_ios: :path: ".symlinks/plugins/path_provider_ios/ios" r_upgrade: @@ -31,6 +36,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: countly_flutter: 38419412e193a1faa5babeb5d28a63fda260687d Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + flutter_icmp_ping: 07e508847df7fa9262d050bb0b203de074bbe517 path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5 r_upgrade: 44d715c61914cce3d01ea225abffe894fd51c114 url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 2157d395..7af7ebd9 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 84; + CURRENT_PROJECT_VERSION = 85; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -362,7 +362,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.84; + MARKETING_VERSION = 1.0.85; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -484,7 +484,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 84; + CURRENT_PROJECT_VERSION = 85; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.84; + MARKETING_VERSION = 1.0.85; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -508,7 +508,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 84; + CURRENT_PROJECT_VERSION = 85; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -516,7 +516,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.84; + MARKETING_VERSION = 1.0.85; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 3f1f5e90..a97c6fdb 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 84; - static const String engine = - "Flutter 2.8.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 77d935af4d (4 weeks ago) • 2021-12-16 08:37:33 -0800\nEngine • revision 890a5fca2e\nTools • Dart 2.15.1\n"; - static const String buildAt = "2022-01-16 15:21:07.640484"; - static const int modifications = 3; + static const int build = 85; + static const String engine = "Flutter 2.8.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 77d935af4d (5 weeks ago) • 2021-12-16 08:37:33 -0800\nEngine • revision 890a5fca2e\nTools • Dart 2.15.1\n"; + static const String buildAt = "2022-01-18 13:38:59.083528"; + static const int modifications = 1; } diff --git a/lib/view/page/ping.dart b/lib/view/page/ping.dart index 82122b6e..5b61a515 100644 --- a/lib/view/page/ping.dart +++ b/lib/view/page/ping.dart @@ -17,9 +17,8 @@ class _PingPageState extends State with AutomaticKeepAliveClientMixin { late TextEditingController _textEditingController; late TextEditingController _textEditingControllerResult; - late MediaQueryData _media; late String _result; - late Ping _ping; + Ping? _ping; @override void initState() { @@ -34,7 +33,6 @@ class _PingPageState extends State @override void didChangeDependencies() { super.didChangeDependencies(); - _media = MediaQuery.of(context); } @override @@ -58,7 +56,7 @@ class _PingPageState extends State void doPing() { _result = ''; _ping = Ping(_textEditingController.text.trim()); - _ping.stream.listen((event) { + _ping!.stream.listen((event) { final resp = event.response.toString(); if (resp == 'null') return; _result += '$resp\n'; @@ -86,7 +84,7 @@ class _PingPageState extends State ], ), onPressed: () { - _ping.stop(); + if (_ping != null) _ping!.stop(); }, ), TextButton( @@ -120,10 +118,7 @@ class _PingPageState extends State } Widget _buildResult() { - return SizedBox( - height: _media.size.height * 0.47, - child: _buildInput(_textEditingControllerResult, hint: 'Result here.'), - ); + return _buildInput(_textEditingControllerResult, hint: 'Result here.'); } Widget _buildInput(TextEditingController controller, {int maxLines = 20, String? hint}) { diff --git a/lib/view/page/setting.dart b/lib/view/page/setting.dart index 5ea752ad..a4d7f75b 100644 --- a/lib/view/page/setting.dart +++ b/lib/view/page/setting.dart @@ -182,6 +182,7 @@ class _SettingPageState extends State { Widget _buildLaunchPage() { return ExpansionTile( + textColor: priColor, tilePadding: EdgeInsets.zero, childrenPadding: EdgeInsets.zero, title: const Text( @@ -192,6 +193,7 @@ class _SettingPageState extends State { constraints: BoxConstraints(maxWidth: _media.size.width * 0.35), child: Text( tabs[_launchPageIdx], + style: textStyle, textScaleFactor: 1.0, textAlign: TextAlign.right, ), @@ -202,6 +204,7 @@ class _SettingPageState extends State { title: Text( e, style: TextStyle( + fontSize: 14, color: _theme.textTheme.bodyText2!.color!.withAlpha(177)), ), trailing: _buildRadio(tabs.indexOf(e)),