From 143cb1e7c17cbb2555bb181ef203cc915fbc45c7 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Tue, 5 Dec 2023 10:49:14 +0800 Subject: [PATCH] opt.: sync switch --- ios/Podfile.lock | 6 ++--- ios/Runner.xcodeproj/project.pbxproj | 36 ++++++++++++++-------------- lib/data/res/build_data.dart | 6 ++--- lib/view/page/backup.dart | 15 ++++++++---- lib/view/widget/store_switch.dart | 8 ++++--- 5 files changed, 40 insertions(+), 31 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c9335527..ef084de9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - countly_flutter (23.8.3): + - countly_flutter (23.8.4): - Flutter - file_picker (0.0.1): - Flutter @@ -71,7 +71,7 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/watch_connectivity/ios" SPEC CHECKSUMS: - countly_flutter: 5929a8a751abbd19a26e6a667d374eb7b8878636 + countly_flutter: d880b352f212d4f6453a87c85f0455f3b4b9c611 file_picker: 1d63c4949e05e386da864365f8c13e1e64787675 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef @@ -82,7 +82,7 @@ SPEC CHECKSUMS: r_upgrade: 44d715c61914cce3d01ea225abffe894fd51c114 share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 - url_launcher_ios: 68d46cc9766d0c41dbdc884310529557e3cd7a86 + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b watch_connectivity: 715eb484685e05846eab74795348a44bb2809b82 PODFILE CHECKSUM: 7fb15c416f8685fca4966867a8da218ec592ec2e diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index af4bf1a8..e0aa3f74 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -586,7 +586,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 660; + CURRENT_PROJECT_VERSION = 664; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.660; + MARKETING_VERSION = 1.0.664; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -720,7 +720,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 660; + CURRENT_PROJECT_VERSION = 664; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.660; + MARKETING_VERSION = 1.0.664; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -748,7 +748,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 660; + CURRENT_PROJECT_VERSION = 664; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.660; + MARKETING_VERSION = 1.0.664; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -779,7 +779,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 660; + CURRENT_PROJECT_VERSION = 664; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -792,7 +792,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.660; + MARKETING_VERSION = 1.0.664; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -818,7 +818,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 660; + CURRENT_PROJECT_VERSION = 664; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -831,7 +831,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.660; + MARKETING_VERSION = 1.0.664; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -854,7 +854,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 660; + CURRENT_PROJECT_VERSION = 664; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -867,7 +867,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.660; + MARKETING_VERSION = 1.0.664; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -890,7 +890,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 660; + CURRENT_PROJECT_VERSION = 664; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.660; + MARKETING_VERSION = 1.0.664; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -931,7 +931,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 660; + CURRENT_PROJECT_VERSION = 664; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.660; + MARKETING_VERSION = 1.0.664; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -969,7 +969,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 660; + CURRENT_PROJECT_VERSION = 664; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.660; + MARKETING_VERSION = 1.0.664; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index a244145e..2ed6515e 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 = 660; + static const int build = 664; static const String engine = "3.16.2"; - static const String buildAt = "2023-12-04 13:43:20"; - static const int modifications = 11; + static const String buildAt = "2023-12-04 15:12:44"; + static const int modifications = 1; static const int script = 31; } diff --git a/lib/view/page/backup.dart b/lib/view/page/backup.dart index 31051252..029204b1 100644 --- a/lib/view/page/backup.dart +++ b/lib/view/page/backup.dart @@ -44,6 +44,7 @@ class BackupPage extends StatelessWidget { return ListView( padding: const EdgeInsets.all(17), children: [ + _buildTip(), if (isMacOS || isIOS) _buildIcloud(context), _buildWebdav(context), _buildFile(context), @@ -51,6 +52,16 @@ class BackupPage extends StatelessWidget { ); } + Widget _buildTip() { + return CardX( + ListTile( + leading: const Icon(Icons.warning), + title: Text(l10n.attention), + subtitle: Text(l10n.backupTip, style: UIs.textGrey), + ), + ); + } + Widget _buildFile(BuildContext context) { return CardX( ExpandTile( @@ -61,10 +72,6 @@ class BackupPage extends StatelessWidget { ListTile( title: Text(l10n.backup), trailing: const Icon(Icons.save), - subtitle: Text( - l10n.backupTip, - style: UIs.textGrey, - ), onTap: () async { final path = await Backup.backup(); diff --git a/lib/view/widget/store_switch.dart b/lib/view/widget/store_switch.dart index 39b0ef8b..7381edae 100644 --- a/lib/view/widget/store_switch.dart +++ b/lib/view/widget/store_switch.dart @@ -1,3 +1,5 @@ +import 'dart:async'; + import 'package:flutter/material.dart'; import '../../core/persistant_store.dart'; @@ -6,7 +8,7 @@ class StoreSwitch extends StatelessWidget { final StorePropertyBase prop; /// Exec before make change, after validator. - final void Function(bool)? callback; + final FutureOr Function(bool)? callback; /// If return false, the switch will not change. final bool Function(bool)? validator; @@ -25,9 +27,9 @@ class StoreSwitch extends StatelessWidget { builder: (context, bool value, widget) { return Switch( value: value, - onChanged: (value) { + onChanged: (value) async { if (validator != null && validator?.call(value) != true) return; - callback?.call(value); + await callback?.call(value); prop.put(value); }, );