From 58f0a1fade2eab8d1b77519e816dc645389f4f2c Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Fri, 8 Mar 2024 00:06:19 -0600 Subject: [PATCH] fix #298 --- lib/data/res/github_id.dart | 1 + lib/view/page/server/tab.dart | 34 ++++++++++++-------------- macos/Runner.xcodeproj/project.pbxproj | 30 +++++++++++++++++++++++ 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/lib/data/res/github_id.dart b/lib/data/res/github_id.dart index 11862f26..09663100 100644 --- a/lib/data/res/github_id.dart +++ b/lib/data/res/github_id.dart @@ -61,5 +61,6 @@ abstract final class GithubIds { 'L-Super', 'Tridays', 'Nebulosa-Cat', + 'dani7959', }; } diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 10ed1fc0..2d01485e 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -368,25 +368,23 @@ class _ServerPageState extends State child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Row( - children: [ - Text( - spi.name, - style: UIs.text13Bold, - ), - const Icon( - Icons.keyboard_arrow_right, - size: 17, - color: Colors.grey, - ) - ], + ConstrainedBox( + constraints: BoxConstraints(maxWidth: _media.size.width / 2.3), + child: Text( + spi.name, + style: UIs.text13Bold, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), ), - Row( - children: [ - _buildTopRightText(ss, cs), - rightCorner, - ], - ) + const Icon( + Icons.keyboard_arrow_right, + size: 17, + color: Colors.grey, + ), + const Spacer(), + _buildTopRightText(ss, cs), + rightCorner, ], ), ); diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 512feaa4..6df66d40 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -78,6 +78,15 @@ B4428BFC11DD7EDA01918FBB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BFB2C4CAFA221419C2D3A5FB /* 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 = ""; }; C80488AEAD11AE69952819A3 /* 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 = ""; }; + E3D26BD42B99689700D83425 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/MainMenu.strings"; sourceTree = ""; }; + E3D26BD52B99689B00D83425 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/MainMenu.strings"; sourceTree = ""; }; + E3D26BD62B9968A000D83425 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/MainMenu.strings; sourceTree = ""; }; + E3D26BD72B9968A500D83425 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainMenu.strings; sourceTree = ""; }; + E3D26BD82B9968AB00D83425 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/MainMenu.strings; sourceTree = ""; }; + E3D26BD92B9968B200D83425 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/MainMenu.strings; sourceTree = ""; }; + E3D26BDA2B9968B800D83425 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/MainMenu.strings; sourceTree = ""; }; + E3D26BDB2B9968C400D83425 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/MainMenu.strings; sourceTree = ""; }; + E3D26BDC2B9968D000D83425 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/MainMenu.strings"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -245,6 +254,15 @@ knownRegions = ( en, Base, + "zh-Hans", + "zh-Hant", + fr, + de, + ja, + ru, + es, + id, + "pt-BR", ); mainGroup = 33CC10E42044A3C60003C045; productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; @@ -375,6 +393,15 @@ isa = PBXVariantGroup; children = ( 33CC10F52044A3C60003C045 /* Base */, + E3D26BD42B99689700D83425 /* zh-Hans */, + E3D26BD52B99689B00D83425 /* zh-Hant */, + E3D26BD62B9968A000D83425 /* fr */, + E3D26BD72B9968A500D83425 /* de */, + E3D26BD82B9968AB00D83425 /* ja */, + E3D26BD92B9968B200D83425 /* ru */, + E3D26BDA2B9968B800D83425 /* es */, + E3D26BDB2B9968C400D83425 /* id */, + E3D26BDC2B9968D000D83425 /* pt-BR */, ); name = MainMenu.xib; path = Runner; @@ -388,6 +415,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -470,6 +498,7 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -523,6 +552,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";