From 701b1b811f8544f49ffa3e7fcd30cb7daf932833 Mon Sep 17 00:00:00 2001 From: lollipopkit <10864310+lollipopkit@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:18:10 +0800 Subject: [PATCH] feat: beta program --- .gitignore | 1 + ios/Runner.xcodeproj/project.pbxproj | 36 +++++++++++++------------- lib/data/res/build_data.dart | 6 ++--- lib/data/store/setting.dart | 2 ++ lib/l10n/app_de.arb | 1 + lib/l10n/app_en.arb | 1 + lib/l10n/app_es.arb | 1 + lib/l10n/app_fr.arb | 1 + lib/l10n/app_id.arb | 1 + lib/l10n/app_ja.arb | 1 + lib/l10n/app_nl.arb | 1 + lib/l10n/app_pt.arb | 1 + lib/l10n/app_ru.arb | 1 + lib/l10n/app_zh.arb | 1 + lib/l10n/app_zh_tw.arb | 1 + lib/main.dart | 2 ++ lib/view/page/setting/entry.dart | 9 +++++++ macos/Runner.xcodeproj/project.pbxproj | 12 ++++----- 18 files changed, 52 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index acdbea48..d270852d 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ untranlated.json .vscode/settings.json more_build_data.json +trans.txt diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8f402b7c..041826fb 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -690,7 +690,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -700,7 +700,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -826,7 +826,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -836,7 +836,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -854,7 +854,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -864,7 +864,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -885,7 +885,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -898,7 +898,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -924,7 +924,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -937,7 +937,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -960,7 +960,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -973,7 +973,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -996,7 +996,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1008,7 +1008,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -1037,7 +1037,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1049,7 +1049,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -1075,7 +1075,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1087,7 +1087,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; 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 c6e6fba7..bee79146 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 = 934; + static const int build = 935; static const String engine = "3.22.1"; - static const String buildAt = "2024-06-05 19:20:48"; - static const int modifications = 6; + static const String buildAt = "2024-06-06 16:17:37"; + static const int modifications = 18; static const int script = 48; } diff --git a/lib/data/store/setting.dart b/lib/data/store/setting.dart index 8f96547d..ae3a9318 100644 --- a/lib/data/store/setting.dart +++ b/lib/data/store/setting.dart @@ -276,6 +276,8 @@ class SettingStore extends PersistentStore { /// fmt: https://example.com/{DIST}-{BRIGHT}.png late final serverLogoUrl = property('serverLogoUrl', ''); + late final betaTest = property('betaTest', false); + // Never show these settings for users // // ------BEGIN------ diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index cd1a0175..f5c6d372 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -2,6 +2,7 @@ "@@locale": "de", "about": "Über", "aboutThanks": "Vielen Dank an die folgenden Personen, die daran teilgenommen haben.\n", + "acceptBeta": "Akzeptieren Sie Testversion-Updates", "add": "Neu", "addAServer": "Server hinzufügen", "addPrivateKey": "Private key hinzufügen", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 86f52dfd..b0141809 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -2,6 +2,7 @@ "@@locale": "en", "about": "About", "aboutThanks": "Thanks to the following people who participated in.", + "acceptBeta": "Accept test version updates", "add": "Add", "addAServer": "add a server", "addPrivateKey": "Add private key", diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb index 762a1982..60a655dd 100644 --- a/lib/l10n/app_es.arb +++ b/lib/l10n/app_es.arb @@ -2,6 +2,7 @@ "@@locale": "es", "about": "Acerca de", "aboutThanks": "Gracias a los siguientes participantes.", + "acceptBeta": "Aceptar actualizaciones de la versión de prueba", "add": "Añadir", "addAServer": "Agregar un servidor", "addPrivateKey": "Agregar una llave privada", diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb index c291010f..36260378 100644 --- a/lib/l10n/app_fr.arb +++ b/lib/l10n/app_fr.arb @@ -2,6 +2,7 @@ "@@locale": "fr", "about": "À propos", "aboutThanks": "Merci aux personnes suivantes qui ont participé.", + "acceptBeta": "Accepter les mises à jour de la version de test", "add": "Ajouter", "addAServer": "Ajouter un serveur", "addPrivateKey": "Ajouter une clé privée", diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb index e6e18431..ab3e68c2 100644 --- a/lib/l10n/app_id.arb +++ b/lib/l10n/app_id.arb @@ -2,6 +2,7 @@ "@@locale": "id", "about": "Tentang", "aboutThanks": "Terima kasih kepada orang -orang berikut yang berpartisipasi.", + "acceptBeta": "Terima pembaruan versi uji coba", "add": "Menambahkan", "addAServer": "tambahkan server", "addPrivateKey": "Tambahkan kunci pribadi", diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb index 95768a67..1ae7ee15 100644 --- a/lib/l10n/app_ja.arb +++ b/lib/l10n/app_ja.arb @@ -2,6 +2,7 @@ "@@locale": "ja", "about": "約", "aboutThanks": "以下の参加者に感謝します。", + "acceptBeta": "テストバージョンの更新を受け入れる", "add": "追加", "addAServer": "サーバーを追加する", "addPrivateKey": "プライベートキーを追加", diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb index aa225aa2..c954a084 100644 --- a/lib/l10n/app_nl.arb +++ b/lib/l10n/app_nl.arb @@ -2,6 +2,7 @@ "@@locale": "nl", "about": "Over", "aboutThanks": "Met dank aan de volgende mensen die hebben deelgenomen aan.", + "acceptBeta": "Accepteer testversie-updates", "add": "Toevoegen", "addAServer": "een server toevoegen", "addPrivateKey": "Privésleutel toevoegen", diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb index 24d1ed37..692965ee 100644 --- a/lib/l10n/app_pt.arb +++ b/lib/l10n/app_pt.arb @@ -2,6 +2,7 @@ "@@locale": "pt", "about": "Sobre", "aboutThanks": "Agradecimentos a todos os participantes.", + "acceptBeta": "Aceitar atualizações da versão de teste", "add": "Adicionar", "addAServer": "Adicionar um servidor", "addPrivateKey": "Adicionar uma chave privada", diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb index cd4eab81..9d75ff91 100644 --- a/lib/l10n/app_ru.arb +++ b/lib/l10n/app_ru.arb @@ -2,6 +2,7 @@ "@@locale": "ru", "about": "о", "aboutThanks": "Благодарности всем участникам.", + "acceptBeta": "Принять обновления тестовой версии", "add": "добавить", "addAServer": "добавить сервер", "addPrivateKey": "добавить приватный ключ", diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index 3573ce83..143a2715 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -2,6 +2,7 @@ "@@locale": "zh", "about": "关于", "aboutThanks": "感谢以下参与的各位。", + "acceptBeta": "接受测试版更新推送", "add": "新增", "addAServer": "添加服务器", "addPrivateKey": "添加一个私钥", diff --git a/lib/l10n/app_zh_tw.arb b/lib/l10n/app_zh_tw.arb index fdc2e75a..722981cb 100644 --- a/lib/l10n/app_zh_tw.arb +++ b/lib/l10n/app_zh_tw.arb @@ -2,6 +2,7 @@ "@@locale": "zh_TW", "about": "關於", "aboutThanks": "感謝以下參與的各位。", + "acceptBeta": "接受測試版更新推送", "add": "新增", "addAServer": "新增服務器", "addPrivateKey": "新增一個私鑰", diff --git a/lib/main.dart b/lib/main.dart index cab9440a..b2a6a648 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -100,6 +100,8 @@ Future _initData() async { Pros.snippet.load(); Pros.key.load(); await Pros.app.init(); + + if (Stores.setting.betaTest.fetch()) AppUpdate.chan = AppUpdateChan.beta; } void _setupDebug() { diff --git a/lib/view/page/setting/entry.dart b/lib/view/page/setting/entry.dart index 0ed0b931..f1d3eb60 100644 --- a/lib/view/page/setting/entry.dart +++ b/lib/view/page/setting/entry.dart @@ -1066,6 +1066,7 @@ class _SettingPageState extends State { leading: const Icon(MingCute.more_3_fill), title: Text(l10n.more), children: [ + _buildBeta(), _buildWakeLock(), if (isAndroid || isIOS) _buildCollectUsage(), _buildCollapseUI(), @@ -1195,4 +1196,12 @@ class _SettingPageState extends State { }, ); } + + Widget _buildBeta() { + return ListTile( + title: const Text('Beta Program'), + subtitle: Text(l10n.acceptBeta, style: UIs.textGrey), + trailing: StoreSwitch(prop: _setting.betaTest), + ); + } } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index b7c4fbfd..0c2c27e2 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -471,7 +471,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -481,7 +481,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -608,7 +608,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -618,7 +618,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -638,7 +638,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 934; + CURRENT_PROJECT_VERSION = 935; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; @@ -649,7 +649,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.934; + MARKETING_VERSION = 1.0.935; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = "";