diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n.dart b/.dart_tool/flutter_gen/gen_l10n/l10n.dart index d3087936..405d65ea 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n.dart @@ -104,7 +104,7 @@ abstract class S { /// No description provided for @aboutThanks. /// /// In en, this message translates to: - /// **'\nThanks to the following people who participated in the test.'** + /// **'Thanks to the following people who participated in.'** String get aboutThanks; /// No description provided for @addAServer. @@ -215,12 +215,6 @@ abstract class S { /// **'Clear'** String get clear; - /// No description provided for @clickSee. - /// - /// In en, this message translates to: - /// **'Click here'** - String get clickSee; - /// No description provided for @close. /// /// In en, this message translates to: @@ -1115,6 +1109,12 @@ abstract class S { /// **'Current: v1.0.{build}, is up to date'** String versionUpdated(Object build); + /// No description provided for @viewErr. + /// + /// In en, this message translates to: + /// **'See error'** + String get viewErr; + /// No description provided for @waitConnection. /// /// In en, this message translates to: diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart index 1716aacc..29746f46 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart @@ -8,7 +8,7 @@ class SDe extends S { String get about => 'Über'; @override - String get aboutThanks => '\nVielen Dank an die folgenden Personen, die zu dieser App beigetragen haben.\n'; + String get aboutThanks => 'Vielen Dank an die folgenden Personen, die daran teilgenommen haben.\n'; @override String get addAServer => 'Server hinzufügen'; @@ -64,9 +64,6 @@ class SDe extends S { @override String get clear => 'Entfernen'; - @override - String get clickSee => 'Hier klicken'; - @override String get close => 'Schließen'; @@ -558,6 +555,9 @@ class SDe extends S { return 'v1.0.$build ist bereits die neueste Version'; } + @override + String get viewErr => 'Fehler anzeigen'; + @override String get waitConnection => 'Bitte warte, bis die Verbindung hergestellt wurde.'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart index 3b8a360d..6a72e3ba 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart @@ -8,7 +8,7 @@ class SEn extends S { String get about => 'About'; @override - String get aboutThanks => '\nThanks to the following people who participated in the test.'; + String get aboutThanks => 'Thanks to the following people who participated in.'; @override String get addAServer => 'add a server'; @@ -64,9 +64,6 @@ class SEn extends S { @override String get clear => 'Clear'; - @override - String get clickSee => 'Click here'; - @override String get close => 'Close'; @@ -558,6 +555,9 @@ class SEn extends S { return 'Current: v1.0.$build, is up to date'; } + @override + String get viewErr => 'See error'; + @override String get waitConnection => 'Please wait for the connection to be established.'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart index 757be8b3..5fd34182 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart @@ -8,7 +8,7 @@ class SZh extends S { String get about => '关于'; @override - String get aboutThanks => '\n感谢以下参与软件测试的各位。'; + String get aboutThanks => '感谢以下参与的各位。'; @override String get addAServer => '添加服务器'; @@ -64,9 +64,6 @@ class SZh extends S { @override String get clear => '清除'; - @override - String get clickSee => '点击查看'; - @override String get close => '关闭'; @@ -558,6 +555,9 @@ class SZh extends S { return '当前：v1.0.$build, 已是最新版本'; } + @override + String get viewErr => '查看错误'; + @override String get waitConnection => '请等待连接建立'; diff --git a/.metadata b/.metadata index 484e7737..aa7708c2 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: f72efea43c3013323d1b95cff571f3c1caa37583 + revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 channel: stable project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: f72efea43c3013323d1b95cff571f3c1caa37583 - base_revision: f72efea43c3013323d1b95cff571f3c1caa37583 + create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 - platform: macos - create_revision: f72efea43c3013323d1b95cff571f3c1caa37583 - base_revision: f72efea43c3013323d1b95cff571f3c1caa37583 + create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 # User provided section diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 9fd5d521..e6e10f2c 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -360,7 +360,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 306; + CURRENT_PROJECT_VERSION = 310; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -368,7 +368,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.306; + MARKETING_VERSION = 1.0.310; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -491,7 +491,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 306; + CURRENT_PROJECT_VERSION = 310; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -499,7 +499,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.306; + MARKETING_VERSION = 1.0.310; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -516,7 +516,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 306; + CURRENT_PROJECT_VERSION = 310; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -524,7 +524,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.306; + MARKETING_VERSION = 1.0.310; 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 24aeaa28..6d307696 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 306; + static const int build = 310; static const String engine = "3.10.0"; - static const String buildAt = "2023-05-12 22:39:42.911728"; - static const int modifications = 5; + static const String buildAt = "2023-05-14 17:02:42.374273"; + static const int modifications = 20; } diff --git a/lib/data/res/ui.dart b/lib/data/res/ui.dart index 3a2849ac..3ac0b4e6 100644 --- a/lib/data/res/ui.dart +++ b/lib/data/res/ui.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; /// Font style const textSize11 = TextStyle(fontSize: 11); +const textSize12Grey = TextStyle(color: Colors.grey, fontSize: 11); const textSize13 = TextStyle(fontSize: 13); const textSize13Grey = TextStyle(color: Colors.grey, fontSize: 13); const textSize15 = TextStyle(fontSize: 15); diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index 10b08aa1..f1b93d23 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -1,6 +1,6 @@ { "about": "Über", - "aboutThanks": "\nVielen Dank an die folgenden Personen, die zu dieser App beigetragen haben.\n", + "aboutThanks": "Vielen Dank an die folgenden Personen, die daran teilgenommen haben.\n", "addAServer": "Server hinzufügen", "addOne": "Hinzufügen", "addPrivateKey": "Private key hinzufügen", @@ -19,7 +19,6 @@ "chooseFontFile": "Schriftart auswählen", "choosePrivateKey": "Private key auswählen", "clear": "Entfernen", - "clickSee": "Hier klicken", "close": "Schließen", "cmd": "Command", "containerName": "Container Name", @@ -169,6 +168,7 @@ "versionHaveUpdate": "Gefunden: v1.0.{build}, klicke zum Aktualisieren", "versionUnknownUpdate": "Aktuell: v1.0.{build}", "versionUpdated": "v1.0.{build} ist bereits die neueste Version", + "viewErr": "Fehler anzeigen", "waitConnection": "Bitte warte, bis die Verbindung hergestellt wurde.", "willTakEeffectImmediately": "Wird sofort angewendet" } \ No newline at end of file diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index bce7f1f0..72ca3857 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -1,6 +1,6 @@ { "about": "About", - "aboutThanks": "\nThanks to the following people who participated in the test.", + "aboutThanks": "Thanks to the following people who participated in.", "addAServer": "add a server", "addOne": "Add one", "addPrivateKey": "Add private key", @@ -19,7 +19,6 @@ "chooseFontFile": "Choose a font file", "choosePrivateKey": "Choose private key", "clear": "Clear", - "clickSee": "Click here", "close": "Close", "cmd": "Command", "containerName": "Container name", @@ -169,6 +168,7 @@ "versionHaveUpdate": "Found: v1.0.{build}, click to update", "versionUnknownUpdate": "Current: v1.0.{build}", "versionUpdated": "Current: v1.0.{build}, is up to date", + "viewErr": "See error", "waitConnection": "Please wait for the connection to be established.", "willTakEeffectImmediately": "Will take effect immediately" } \ No newline at end of file diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index 0f75120b..75effee6 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -1,6 +1,6 @@ { "about": "关于", - "aboutThanks": "\n感谢以下参与软件测试的各位。", + "aboutThanks": "感谢以下参与的各位。", "addAServer": "添加服务器", "addOne": "前去新增", "addPrivateKey": "添加一个私钥", @@ -19,7 +19,6 @@ "chooseFontFile": "选择字体文件", "choosePrivateKey": "选择私钥", "clear": "清除", - "clickSee": "点击查看", "close": "关闭", "cmd": "命令", "containerName": "容器名", @@ -169,6 +168,7 @@ "versionHaveUpdate": "找到新版本：v1.0.{build}, 点击更新", "versionUnknownUpdate": "当前：v1.0.{build}", "versionUpdated": "当前：v1.0.{build}, 已是最新版本", + "viewErr": "查看错误", "waitConnection": "请等待连接建立", "willTakEeffectImmediately": "更改将会立即生效" } \ No newline at end of file diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 5ae9ca57..ff382a0c 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -115,7 +115,7 @@ class _ServerPageState extends State GestureDetector( child: Padding( padding: const EdgeInsets.all(13), - child: _buildRealServerCard(si.status, si.spi.name, si.state, si.spi), + child: _buildRealServerCard(si.status, si.state, si.spi), ), onTap: () => AppRoute( ServerDetailPage(si.spi.id), @@ -126,70 +126,17 @@ class _ServerPageState extends State ); } - Widget _buildRealServerCard(ServerStatus ss, String serverName, - ServerState cs, ServerPrivateInfo spi) { + Widget _buildRealServerCard( + ServerStatus ss, + ServerState cs, + ServerPrivateInfo spi, + ) { final rootDisk = ss.disk.firstWhere((element) => element.loc == '/'); - final topRightStr = - getTopRightStr(cs, ss.cpu.temp, ss.uptime, ss.failedInfo); - final hasError = cs == ServerState.failed && ss.failedInfo != null; - final style = TextStyle( - color: _theme.textTheme.bodyLarge!.color!.withAlpha(100), fontSize: 11); - return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 7), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - Text( - serverName, - style: const TextStyle( - fontWeight: FontWeight.bold, fontSize: 12), - textScaleFactor: 1.0, - ), - const Icon( - Icons.keyboard_arrow_right, - size: 17, - color: Colors.grey, - ) - ], - ), - Row( - children: [ - hasError - ? GestureDetector( - onTap: () => showRoundDialog( - context: context, - title: Text(_s.error), - child: Text(ss.failedInfo ?? _s.unknownError), - actions: [ - TextButton( - onPressed: () => copy2Clipboard( - ss.failedInfo ?? _s.unknownError), - child: Text(_s.copy), - ) - ], - ), - child: Text( - _s.clickSee, - style: style, - textScaleFactor: 1.0, - ), - ) - : Text(topRightStr, style: style, textScaleFactor: 1.0), - const SizedBox(width: 9), - _buildSSHBtn(spi), - _buildMoreBtn(spi), - ], - ) - ], - ), - ), + _buildServerCardTitle(ss, cs, spi), const SizedBox( height: 17, ), @@ -218,6 +165,71 @@ class _ServerPageState extends State ); } + Widget _buildServerCardTitle( + ServerStatus ss, + ServerState cs, + ServerPrivateInfo spi, + ) { + final topRightStr = + getTopRightStr(cs, ss.cpu.temp, ss.uptime, ss.failedInfo); + final hasError = cs == ServerState.failed && ss.failedInfo != null; + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 7), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Text( + spi.name, + style: + const TextStyle(fontWeight: FontWeight.bold, fontSize: 12), + textScaleFactor: 1.0, + ), + const Icon( + Icons.keyboard_arrow_right, + size: 17, + color: Colors.grey, + ) + ], + ), + Row( + children: [ + hasError + ? GestureDetector( + onTap: () => showRoundDialog( + context: context, + title: Text(_s.error), + child: Text(ss.failedInfo ?? _s.unknownError), + actions: [ + TextButton( + onPressed: () => copy2Clipboard( + ss.failedInfo ?? _s.unknownError), + child: Text(_s.copy), + ) + ], + ), + child: Text( + _s.viewErr, + style: textSize12Grey, + textScaleFactor: 1.0, + ), + ) + : Text( + topRightStr, + style: textSize12Grey, + textScaleFactor: 1.0, + ), + const SizedBox(width: 9), + _buildSSHBtn(spi), + _buildMoreBtn(spi), + ], + ) + ], + ), + ); + } + Widget _buildSSHBtn(ServerPrivateInfo spi) { return GestureDetector( child: const Icon( diff --git a/macos/Podfile b/macos/Podfile index 049abe29..c795730d 100644 --- a/macos/Podfile +++ b/macos/Podfile @@ -31,6 +31,9 @@ target 'Runner' do use_modular_headers! flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end end post_install do |installer| diff --git a/macos/Podfile.lock b/macos/Podfile.lock index c740e770..5897f40e 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -30,6 +30,6 @@ SPEC CHECKSUMS: share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7 url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451 -PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 +PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 7183ed08..97cda78f 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -21,15 +21,24 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - 3B06435D86013FED76321AF8 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9511BF8F638F8AEACFB475BD /* Pods_Runner.framework */; }; + D874F4AF921F439E81CF7293 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FFF2DE54D5055D5B946114D7 /* Pods_RunnerTests.framework */; }; + E2CD3CED802387D5E56F06CD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B1B5C0D431C7ED686B9704F /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 33CC10E52044A3C60003C045 /* Project object */; @@ -53,6 +62,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0CA3C900AA7C73CA8287C8EB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* server_box.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = server_box.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -67,26 +80,44 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 444EFF4D60463B05BBDB9C0C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 3CD98CCF87C10BB088EF42D1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 9511BF8F638F8AEACFB475BD /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 8B1B5C0D431C7ED686B9704F /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - B4C292940D0588699A5B6436 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - E1450961FD967E0CDCB70166 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + E5004715DDBC0F274A8B776F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + FFF2DE54D5055D5B946114D7 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D874F4AF921F439E81CF7293 /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 33CC10EA2044A3C60003C045 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3B06435D86013FED76321AF8 /* Pods_Runner.framework in Frameworks */, + E2CD3CED802387D5E56F06CD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; 33BA886A226E78AF003329D5 /* Configs */ = { isa = PBXGroup; children = ( @@ -103,9 +134,10 @@ children = ( 33FAB671232836740065AC1E /* Runner */, 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - FF9AA82BDB552F59097F9612 /* Pods */, + D29F91BB271305884DC23479 /* Pods */, ); sourceTree = ""; }; @@ -113,6 +145,7 @@ isa = PBXGroup; children = ( 33CC10ED2044A3C60003C045 /* server_box.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; sourceTree = ""; @@ -152,39 +185,62 @@ path = Runner; sourceTree = ""; }; - D73912EC22F37F3D000D13A0 /* Frameworks */ = { + D29F91BB271305884DC23479 /* Pods */ = { isa = PBXGroup; children = ( - 9511BF8F638F8AEACFB475BD /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - FF9AA82BDB552F59097F9612 /* Pods */ = { - isa = PBXGroup; - children = ( - E1450961FD967E0CDCB70166 /* Pods-Runner.debug.xcconfig */, - B4C292940D0588699A5B6436 /* Pods-Runner.release.xcconfig */, - 444EFF4D60463B05BBDB9C0C /* Pods-Runner.profile.xcconfig */, + E5004715DDBC0F274A8B776F /* Pods-Runner.debug.xcconfig */, + 3CD98CCF87C10BB088EF42D1 /* Pods-Runner.release.xcconfig */, + 0CA3C900AA7C73CA8287C8EB /* Pods-Runner.profile.xcconfig */, + C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */, + 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */, + 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 8B1B5C0D431C7ED686B9704F /* Pods_Runner.framework */, + FFF2DE54D5055D5B946114D7 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + B8BC17602664977976F5119B /* [CP] Check Pods Manifest.lock */, + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 33CC10EC2044A3C60003C045 /* Runner */ = { isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 6A402DAACE84DB6BA6F12E1E /* [CP] Check Pods Manifest.lock */, + 439BC61F32B3B58C253BB26F /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 5E892DA063C97E6AD9FF2DA0 /* [CP] Embed Pods Frameworks */, + A2D88927034E1CC0A311A663 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -206,6 +262,10 @@ LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; 33CC10EC2044A3C60003C045 = { CreatedOnToolsVersion = 9.2; LastSwiftMigration = 1100; @@ -236,12 +296,20 @@ projectRoot = ""; targets = ( 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, 33CC111A2044C6BA0003C045 /* Flutter Assemble */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 33CC10EB2044A3C60003C045 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -292,24 +360,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 5E892DA063C97E6AD9FF2DA0 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 6A402DAACE84DB6BA6F12E1E /* [CP] Check Pods Manifest.lock */ = { + 439BC61F32B3B58C253BB26F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -331,9 +382,56 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + A2D88927034E1CC0A311A663 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + B8BC17602664977976F5119B /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 33CC10E92044A3C60003C045 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -347,6 +445,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; @@ -367,6 +470,51 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 310; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0.310; + PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/server_box.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/server_box"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 310; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0.310; + PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/server_box.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/server_box"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 310; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0.310; + PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/server_box.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/server_box"; + }; + name = Profile; + }; 338D0CE9231458BD00FA5F75 /* Profile */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; @@ -597,6 +745,16 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 901b0542..d66a89e7 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -37,6 +37,17 @@ + + + +