chore: update version numbers and adjust UI dimensions

VariantConst · Jan 7, 2025 · 2e962f6 · 2e962f6
1 parent d40f677
commit 2e962f6
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -488,7 +488,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 3B84D2645W;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -499,7 +499,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "variantconst.marchkov-ios";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -677,7 +677,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 3B84D2645W;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -688,7 +688,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "variantconst.marchkov-ios";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -704,7 +704,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 3B84D2645W;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -715,7 +715,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "variantconst.marchkov-ios";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

diff --git a/lib/providers/theme_provider.dart b/lib/providers/theme_provider.dart
@@ -53,7 +53,7 @@ class ThemeProvider with ChangeNotifier {
     if (colorValue == null) {
       _selectedColor = Colors.blue;
     } else {
-      _selectedColor = Color(colorValue | 0xFF000000);
+      _selectedColor = Color(colorValue);
     }
     notifyListeners();
   }
@@ -78,10 +78,10 @@ class ThemeProvider with ChangeNotifier {
     _selectedColor = color;
     notifyListeners();
 
-    // 先保存设置
+    // 保存颜色的完整 value
     final prefs = await SharedPreferences.getInstance();
-    await prefs.setInt('selectedColor',
-        (color.r.toInt() << 16) | (color.g.toInt() << 8) | color.b.toInt());
+    // ignore: deprecated_member_use
+    await prefs.setInt('selectedColor', color.value);
 
     // 如果提供了 context 并且它仍然有效，则更新系统UI
     if (context != null) {

diff --git a/lib/screens/visualization/yearly_summary/random_percentage_widget.dart b/lib/screens/visualization/yearly_summary/random_percentage_widget.dart
@@ -33,17 +33,13 @@ class RandomPercentageWidgetState extends State<RandomPercentageWidget> {
           generateRandomPercentage();
         },
         child: Container(
-          padding: EdgeInsets.symmetric(
-            horizontal: 2,
-            vertical: 4,
-          ),
-          height: 36,
+          height: 60,
           child: AnimatedSwitcher(
             duration: Duration(milliseconds: 200),
             child: randomPercentage == null
                 ? SizedBox(
                     key: ValueKey('initial'),
-                    width: 60,
+                    width: 65,
                     child: ClipRRect(
                       borderRadius: BorderRadius.circular(6),
                       child: Stack(
@@ -75,7 +71,7 @@ class RandomPercentageWidgetState extends State<RandomPercentageWidget> {
                     ),
                   )
                 : SizedBox(
-                    width: 60,
+                    width: 65,
                     child: Text(
                       key: ValueKey('percentage'),
                       '$randomPercentage%',

diff --git a/lib/screens/visualization/yearly_summary/summary_monthly_bar_chart.dart b/lib/screens/visualization/yearly_summary/summary_monthly_bar_chart.dart
@@ -33,7 +33,7 @@ class SummaryMonthlyBarChart extends StatelessWidget {
     final primaryColor = theme.colorScheme.primary;
 
     return Container(
-      height: 200.0,
+      height: 240.0,
       padding: EdgeInsets.fromLTRB(8, 12, 16, 8),
       child: GridView.builder(
         physics: NeverScrollableScrollPhysics(),

diff --git a/lib/screens/visualization/yearly_summary/summary_violation_pie_chart.dart b/lib/screens/visualization/yearly_summary/summary_violation_pie_chart.dart
@@ -20,7 +20,7 @@ class SummaryViolationPieChart extends StatelessWidget {
         ((checkedInCount) / totalRides * 100).toStringAsFixed(1);
 
     return SizedBox(
-      height: 120,
+      height: 150,
       child: Row(
         children: [
           Expanded(

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -11,6 +11,8 @@ PODS:
     - FlutterMacOS
   - screen_brightness_macos (0.1.0):
     - FlutterMacOS
+  - share_plus (0.0.1):
+    - FlutterMacOS
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -24,6 +26,7 @@ DEPENDENCIES:
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
   - screen_brightness_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos`)
+  - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
   - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
   - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
 
@@ -40,6 +43,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
   screen_brightness_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos
+  share_plus:
+    :path: Flutter/ephemeral/.symlinks/plugins/share_plus/macos
   shared_preferences_foundation:
     :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
   url_launcher_macos:
@@ -49,9 +54,10 @@ SPEC CHECKSUMS:
   emoji_picker_flutter: 533634326b1c5de9a181ba14b9758e6dfe967a20
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   geolocator_apple: 72a78ae3f3e4ec0db62117bd93e34523f5011d58
-  package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
+  package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   screen_brightness_macos: 2d6d3af2165592d9a55ffcd95b7550970e41ebda
+  share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
 

diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift
@@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
   }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.3.2+1
+version: 2.3.3+1
 
 environment:
   sdk: ">=2.17.0 <3.0.0"