From 7f8fbfead3c2707791ba6ee3dab7ad8f37e79eb2 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Wed, 19 Jul 2023 19:23:05 +0800 Subject: [PATCH] #26 new & fix - new: click to refresh - fix: SharedPreference setPrefix --- .../tech/lolli/toolbox/widget/HomeWidget.kt | 12 ++++++++++ ios/Podfile.lock | 7 ++++++ ios/Runner.xcodeproj/project.pbxproj | 24 +++++++++---------- lib/data/res/build_data.dart | 6 ++--- lib/main.dart | 3 +++ lib/view/page/setting.dart | 1 - macos/Runner.xcodeproj/project.pbxproj | 12 +++++----- 7 files changed, 43 insertions(+), 22 deletions(-) diff --git a/android/app/src/main/kotlin/tech/lolli/toolbox/widget/HomeWidget.kt b/android/app/src/main/kotlin/tech/lolli/toolbox/widget/HomeWidget.kt index 64c4e2a8..7f2fa854 100644 --- a/android/app/src/main/kotlin/tech/lolli/toolbox/widget/HomeWidget.kt +++ b/android/app/src/main/kotlin/tech/lolli/toolbox/widget/HomeWidget.kt @@ -32,6 +32,18 @@ class HomeWidget : AppWidgetProvider() { url = gUrl } + val intentUpdate = Intent(context, HomeWidget::class.java) + intentUpdate.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE + val ids = intArrayOf(appWidgetId) + intentUpdate.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids) + + val pendingUpdate: PendingIntent = PendingIntent.getBroadcast( + context, + appWidgetId, + intentUpdate, + PendingIntent.FLAG_UPDATE_CURRENT) + views.setOnClickPendingIntent(R.id.widget_container, pendingUpdate) + if (url.isNullOrEmpty()) { views.setViewVisibility(R.id.widget_cpu_label, View.INVISIBLE) views.setViewVisibility(R.id.widget_mem_label, View.INVISIBLE) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f47959d9..1feeaed0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -17,6 +17,9 @@ PODS: - Flutter - share_plus (0.0.1): - Flutter + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS - url_launcher_ios (0.0.1): - Flutter @@ -30,6 +33,7 @@ DEPENDENCIES: - plain_notification_token (from `.symlinks/plugins/plain_notification_token/ios`) - r_upgrade (from `.symlinks/plugins/r_upgrade/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) EXTERNAL SOURCES: @@ -51,6 +55,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/r_upgrade/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" @@ -64,6 +70,7 @@ SPEC CHECKSUMS: plain_notification_token: b36467dc91939a7b6754267c701bbaca14996ee1 r_upgrade: 44d715c61914cce3d01ea225abffe894fd51c114 share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 PODFILE CHECKSUM: 7fb15c416f8685fca4966867a8da218ec592ec2e diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 5091e2dc..9726006a 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -470,7 +470,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 377; + CURRENT_PROJECT_VERSION = 379; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -478,7 +478,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.377; + MARKETING_VERSION = 1.0.379; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -602,7 +602,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 377; + CURRENT_PROJECT_VERSION = 379; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -610,7 +610,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.377; + MARKETING_VERSION = 1.0.379; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -628,7 +628,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 377; + CURRENT_PROJECT_VERSION = 379; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -636,7 +636,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.377; + MARKETING_VERSION = 1.0.379; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -657,7 +657,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 377; + CURRENT_PROJECT_VERSION = 379; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -670,7 +670,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.377; + MARKETING_VERSION = 1.0.379; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -696,7 +696,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 377; + CURRENT_PROJECT_VERSION = 379; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -709,7 +709,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.377; + MARKETING_VERSION = 1.0.379; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -732,7 +732,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 377; + CURRENT_PROJECT_VERSION = 379; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -745,7 +745,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.377; + MARKETING_VERSION = 1.0.379; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 374139b5..2b8bbdcb 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 = 377; + static const int build = 379; static const String engine = "3.10.6"; - static const String buildAt = "2023-07-16 23:02:53.506145"; - static const int modifications = 3; + static const String buildAt = "2023-07-19 19:18:31.520465"; + static const int modifications = 7; } diff --git a/lib/main.dart b/lib/main.dart index 9c1463b3..078c1095 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:logging/logging.dart'; import 'package:provider/provider.dart'; +import 'package:shared_preferences/shared_preferences.dart'; import 'package:toolbox/data/model/ssh/virtual_key.dart'; import 'app.dart'; @@ -38,6 +39,8 @@ Future initApp() async { final settings = locator(); await loadFontFile(settings.fontPath.fetch()); + SharedPreferences.setPrefix(''); + Logger.root.level = Level.ALL; Logger.root.onRecord.listen((record) { // ignore: avoid_print diff --git a/lib/view/page/setting.dart b/lib/view/page/setting.dart index e4edff05..5e3ad318 100644 --- a/lib/view/page/setting.dart +++ b/lib/view/page/setting.dart @@ -91,7 +91,6 @@ class _SettingPageState extends State { _editorDarkTheme.value = _setting.editorDarkTheme.fetch()!; _keyboardType.value = _setting.keyboardType.fetch()!; _rotateQuarter.value = _setting.fullScreenRotateQuarter.fetch()!; - SharedPreferences.setPrefix(''); SharedPreferences.getInstance().then((value) => _sp = value); } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 8763239f..6b06b5ec 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -475,9 +475,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 377; + CURRENT_PROJECT_VERSION = 379; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.377; + MARKETING_VERSION = 1.0.379; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -490,9 +490,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 377; + CURRENT_PROJECT_VERSION = 379; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.377; + MARKETING_VERSION = 1.0.379; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -505,9 +505,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 377; + CURRENT_PROJECT_VERSION = 379; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.377; + MARKETING_VERSION = 1.0.379; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;