From 068089d2074fc3afc43f949f9ca17080a0551d63 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Wed, 1 Feb 2023 10:37:06 +0800 Subject: [PATCH] fix cpu temp padding --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/data/res/build_data.dart | 8 ++++---- lib/data/res/sizedbox.dart | 1 + lib/view/page/home.dart | 24 ++++++++++++++++++------ lib/view/page/server/detail.dart | 3 ++- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b5d2c9fb..971f5be3 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -356,7 +356,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 174; + CURRENT_PROJECT_VERSION = 201; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -364,7 +364,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.174; + MARKETING_VERSION = 1.0.201; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -486,7 +486,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 174; + CURRENT_PROJECT_VERSION = 201; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -494,7 +494,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.174; + MARKETING_VERSION = 1.0.201; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -510,7 +510,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 174; + CURRENT_PROJECT_VERSION = 201; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -518,7 +518,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.174; + MARKETING_VERSION = 1.0.201; 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 0799301d..b07009ce 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 200; + static const int build = 201; static const String engine = - "Flutter 3.7.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision b06b8b2710 (6 days ago) • 2023-01-23 16:55:55 -0800\nEngine • revision b24591ed32\nTools • Dart 2.19.0 • DevTools 2.20.1\n"; - static const String buildAt = "2023-01-29 22:04:40.624479"; - static const int modifications = 0; + "Flutter 3.7.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision b06b8b2710 (7 days ago) • 2023-01-23 16:55:55 -0800\nEngine • revision b24591ed32\nTools • Dart 2.19.0 • DevTools 2.20.1\n"; + static const String buildAt = "2023-01-31 17:36:05.286138"; + static const int modifications = 5; } diff --git a/lib/data/res/sizedbox.dart b/lib/data/res/sizedbox.dart index 08b77fc1..784f0b10 100644 --- a/lib/data/res/sizedbox.dart +++ b/lib/data/res/sizedbox.dart @@ -2,3 +2,4 @@ import 'package:flutter/widgets.dart'; const height13 = SizedBox(height: 13); const width13 = SizedBox(width: 13); +const width7 = SizedBox(width: 7); diff --git a/lib/view/page/home.dart b/lib/view/page/home.dart index 5b7909a0..d6bfddb6 100644 --- a/lib/view/page/home.dart +++ b/lib/view/page/home.dart @@ -170,8 +170,19 @@ class _MyHomePageState extends State mainAxisAlignment: MainAxisAlignment.center, children: [ _buildIcon(), - const Text(BuildData.name), - Text(_versionStr), + TextButton( + onPressed: () => showRoundDialog( + context, + _versionStr, + const Text('${BuildData.buildAt}\n\n${BuildData.engine}'), + [], + ), + child: Text( + '${BuildData.name}\n$_versionStr', + style: TextStyle(color: widget.primaryColor), + textAlign: TextAlign.center, + ), + ), SizedBox( height: MediaQuery.of(context).size.height * 0.07, ), @@ -188,9 +199,10 @@ class _MyHomePageState extends State ListTile( leading: const Icon(Icons.vpn_key), title: Text(_s.privateKey), - onTap: () => - AppRoute(const PrivateKeysListPage(), 'private key list') - .go(context), + onTap: () => AppRoute( + const PrivateKeysListPage(), + 'private key list', + ).go(context), ), ListTile( leading: const Icon(Icons.download), @@ -273,7 +285,7 @@ class _MyHomePageState extends State ConstrainedBox( constraints: const BoxConstraints(maxHeight: 53, maxWidth: 53), child: Container( - color: primaryColor, + color: widget.primaryColor, ), ), ConstrainedBox( diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index c8f43099..034b2adc 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -114,6 +114,7 @@ class _ServerDetailPageState extends State style: textSize27, textScaleFactor: 1.0, ), + width7, tempWidget ], ), @@ -219,7 +220,7 @@ class _ServerDetailPageState extends State Row( children: [ Text('${used.toStringAsFixed(0)}%', style: textSize27), - const SizedBox(width: 7), + width7, Text('of ${(ss.mem.total * 1024).convertBytes}', style: textSize13Grey) ],