diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4af541e3..c5a6d5e6 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -359,7 +359,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 233; + CURRENT_PROJECT_VERSION = 237; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -367,7 +367,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.233; + MARKETING_VERSION = 1.0.237; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -490,7 +490,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 233; + CURRENT_PROJECT_VERSION = 237; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -498,7 +498,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.233; + MARKETING_VERSION = 1.0.237; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -515,7 +515,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 233; + CURRENT_PROJECT_VERSION = 237; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -523,7 +523,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.233; + MARKETING_VERSION = 1.0.237; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/data/provider/server.dart b/lib/data/provider/server.dart index 32327c44..ad1014ec 100644 --- a/lib/data/provider/server.dart +++ b/lib/data/provider/server.dart @@ -157,9 +157,7 @@ class ServerProvider extends BusyProvider { // after connected s.cs = ServerState.connected; - final writeResult = await s.client! - .run(installShellCmd) - .string; + final writeResult = await s.client!.run(installShellCmd).string; // if write failed if (writeResult.isNotEmpty) { diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index e704f8c7..178f8bbe 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 = 233; - static const String engine = - "Flutter 3.7.7 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 2ad6cd72c0 (7 days ago) • 2023-03-08 09:41:59 -0800\nEngine • revision 1837b5be5f\nTools • Dart 2.19.4 • DevTools 2.20.1\n"; - static const String buildAt = "2023-03-15 23:00:21.075300"; - static const int modifications = 2; + static const int build = 237; + static const String engine = "Flutter 3.7.7 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 2ad6cd72c0 (10 days ago) • 2023-03-08 09:41:59 -0800\nEngine • revision 1837b5be5f\nTools • Dart 2.19.4 • DevTools 2.20.1\n"; + static const String buildAt = "2023-03-18 17:38:10.546482"; + static const int modifications = 4; } diff --git a/lib/view/page/setting.dart b/lib/view/page/setting.dart index 2d0d11fa..37013283 100644 --- a/lib/view/page/setting.dart +++ b/lib/view/page/setting.dart @@ -94,14 +94,17 @@ class _SettingPageState extends State { } Widget _buildApp() { + final children = [ + _buildThemeMode(), + _buildAppColorPreview(), + _buildLaunchPage(), + _buildCheckUpdate(), + ]; + if (isIOS) { + children.add(_buildPushToken()); + } return Column( - children: [ - _buildThemeMode(), - _buildAppColorPreview(), - _buildLaunchPage(), - _buildCheckUpdate(), - _buildPushToken(), - ].map((e) => RoundRectCard(e)).toList(), + children: children.map((e) => RoundRectCard(e)).toList(), ); } @@ -432,14 +435,8 @@ class _SettingPageState extends State { noData: Text(_s.nullToken), success: (text) { _pushToken = text; - if (_pushToken == null) { - text = _s.nullToken; - } - if (!isIOS) { - text = _s.onlyIOS; - } return Text( - text!, + text ?? _s.nullToken, style: grey, overflow: TextOverflow.ellipsis, maxLines: 1,