From d0d89dee7c1c45a1929bf4fae2042ac7bb39d378 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Jun 2023 13:19:43 +0200 Subject: [PATCH 1/9] Changed "Quick actions" to "snippets" --- lib/i18n/de.json | 10 +++++----- lib/i18n/en.json | 10 +++++----- lib/i18n/pt.json | 10 +++++----- lib/i18n/zh_CN.json | 10 +++++----- lib/i18n/zh_tw.json | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/i18n/de.json b/lib/i18n/de.json index 7bcf588..9692357 100644 --- a/lib/i18n/de.json +++ b/lib/i18n/de.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "Startverzeichnispfad", "wsldefaultuser-text": "(Optional) Zu verwendender WSL-Standardbenutzer", "emptyfieldsfordefault-text": "(leeren Sie die Felder, um die Standardwerte zu verwenden)", - "runquickaction-text": "Schnellaktion ausführen", + "runquickaction-text": "Codeausschnitte ausführen", "upload-text": "Hochladen", "startstopserving-text": "Bereitstellung im Netzwerk starten/beenden", "startedserving-text": "Bereitstellung von %s im Netzwerk", @@ -90,15 +90,15 @@ "yesoverride-text": "Ja, synchronisieren (überschreiben)", "settingname-text": "Name der Einstellung", "yourcodehere-text": "Ihr Code hier", - "addquickaction-text": "Eine schnelle Aktion hinzufügen", - "addquickactioninfo-text": "Fügen Sie eine Schnelleinstellung hinzu und Sie werden sie hier sehen.", + "addquickaction-text": "Einen Codeausschnitt hinzufügen", + "addquickactioninfo-text": "Fügen Sie einen Codeausschnitt hinzu und Sie werden ihn hier sehen.", "newversion-text": "Neue Version verfügbar!", "downloadnow-text": "Jetzt Ansehen", "orcheck-text": "oder zum", "windowsstore-text": "Windows Store", "homepage-text": "Home", "about-text": "Über diese App", - "managequickactions-text": "Schnellaktionen verwalten", + "managequickactions-text": "Codeausschnitte", "addinstance-text": "Eine Instanz hinzufügen", "editwslconfig-text": ".wslconfig direkt bearbeiten", "stopwsl-text": "WSL stoppen", @@ -124,7 +124,7 @@ "addcommunityactions-text": "Community Actions hinzufügen", "done-text": "Fertig", "search-text": "Suche", - "shareyourquickaction-text": "Teilen Sie Ihre Schnellaktionen", + "shareyourquickaction-text": "Teilen Sie Ihre Codeausschnitte", "wslsettings-text": "WSL-Einstellungen", "boot-text": "Boot", "automount-text": "Automount", diff --git a/lib/i18n/en.json b/lib/i18n/en.json index 56fcb6c..5304b73 100644 --- a/lib/i18n/en.json +++ b/lib/i18n/en.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "Start directory path", "wsldefaultuser-text": "(Optional) WSL default user to use", "emptyfieldsfordefault-text": "(empty the fields for default or if your WSL version does not support it)", - "runquickaction-text": "Run Quick Action", + "runquickaction-text": "Run a snippet", "upload-text": "Upload", "startstopserving-text": "Start/Stop serving on network", "startedserving-text": "Serving %s on network", @@ -90,15 +90,15 @@ "yesoverride-text": "Yes, sync (override)", "settingname-text": "Name of setting", "yourcodehere-text": "Your code here", - "addquickaction-text": "Add a Quick Action", - "addquickactioninfo-text": "Add a quick setting and you will see it here.", + "addquickaction-text": "Add a snippet", + "addquickactioninfo-text": "Add a snippet and you will see it here.", "newversion-text": "A new version available", "downloadnow-text": "Download now", "orcheck-text": "or check the", "windowsstore-text": "Windows Store", "homepage-text": "Home", "about-text": "About this app", - "managequickactions-text": "Manage Quick Actions", + "managequickactions-text": "Snippets", "addinstance-text": "Add an Instance", "editwslconfig-text": "Edit .wslconfig directly", "stopwsl-text": "Stop WSL", @@ -123,7 +123,7 @@ "documentation-text": "Documentation", "addcommunityactions-text": "Add Community Actions", "search-text": "Search", - "shareyourquickaction-text": "Share your Quick Action", + "shareyourquickaction-text": "Share your snippets", "wslsettings-text": "WSL Settings", "boot-text": "Boot", "automount-text": "Automount", diff --git a/lib/i18n/pt.json b/lib/i18n/pt.json index a43d37c..6632507 100644 --- a/lib/i18n/pt.json +++ b/lib/i18n/pt.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "Caminho de diretório inicial", "wsldefaultuser-text": "(Opcional) Usuário padrão do WSL a ser usado", "emptyfieldsfordefault-text": "(esvazie os campos por padrão ou se sua versão do WSL não for compatível)", - "runquickaction-text": "Executar ação rápida", + "runquickaction-text": "Executar snippet", "upload-text": "Carregar", "startstopserving-text": "Iniciar/parar a veiculação na rede", "startedserving-text": "Servindo %s na rede", @@ -90,15 +90,15 @@ "yesoverride-text": "Sim, sincronizar (substituir)", "settingname-text": "Nome da configuração", "yourcodehere-text": "Seu código aqui", - "addquickaction-text": "Adicionar uma ação rápida", - "addquickactioninfo-text": "Adicione uma configuração rápida e você a verá aqui.", + "addquickaction-text": "Adicionar um snippet", + "addquickactioninfo-text": "Adicione um snippet e você o verá aqui.", "newversion-text": "Uma nova versão disponível", "downloadnow-text": "Baixar agora", "orcheck-text": "ou verifique a", "windowsstore-text": "Loja do Windows", "homepage-text": "Casa", "about-text": "Sobre este aplicativo", - "managequickactions-text": "Gerenciar ações rápidas", + "managequickactions-text": "Snippet", "addinstance-text": "Adicionar uma instância", "editwslconfig-text": "Editar .wslconfig diretamente", "stopwsl-text": "Parar WSL", @@ -124,7 +124,7 @@ "addcommunityactions-text": "Adicionar ações da comunidade", "done-text": "Feito", "search-text": "Procurar", - "shareyourquickaction-text": "Compartilhe sua ação rápida", + "shareyourquickaction-text": "Compartilhe seus snippets", "wslsettings-text": "Configurações do WSL", "boot-text": "Boot", "automount-text": "Automount", diff --git a/lib/i18n/zh_CN.json b/lib/i18n/zh_CN.json index 5436f74..15d8be6 100644 --- a/lib/i18n/zh_CN.json +++ b/lib/i18n/zh_CN.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "起始目录路径", "wsldefaultuser-text": "（可选）要使用的 WSL 默认用户", "emptyfieldsfordefault-text": "（如果您的 WSL 版本不支持，请清空默认字段）", - "runquickaction-text": "运行快速操作", + "runquickaction-text": "运行片段", "upload-text": "上传", "startstopserving-text": "开始/停止在网络上提供服务", "startedserving-text": "正在网络上为 %s 提供服务", @@ -90,15 +90,15 @@ "yesoverride-text": "是的，同步（覆盖）", "settingname-text": "设置名称", "yourcodehere-text": "填入你的代码", - "addquickaction-text": "添加快速操作", - "addquickactioninfo-text": "添加快速设置，您将在此处看到它。", + "addquickaction-text": "添加片段", + "addquickactioninfo-text": "添加片段，您将在此处看到它。", "newversion-text": "有新版本可用", "downloadnow-text": "现在下载", "orcheck-text": "或检查", "windowsstore-text": "Windows 商店", "homepage-text": "主界面", "about-text": "关于此软件", - "managequickactions-text": "管理快速操作", + "managequickactions-text": "管理片段", "addinstance-text": "添加实例", "editwslconfig-text": "直接编辑 .wslconfig", "stopwsl-text": "停止 WSL", @@ -124,7 +124,7 @@ "addcommunityactions-text": "添加社区快速操作", "done-text": "完成", "search-text": "搜索", - "shareyourquickaction-text": "分享你的快速操作", + "shareyourquickaction-text": "分享你的片段", "wslsettings-text": "WSL 设置", "boot-text": "启动", "automount-text": "自动挂载", diff --git a/lib/i18n/zh_tw.json b/lib/i18n/zh_tw.json index 015e0ec..866f5c2 100644 --- a/lib/i18n/zh_tw.json +++ b/lib/i18n/zh_tw.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "開始位置", "wsldefaultuser-text": "(選用) 要使用的 WSL 預設使用者帳戶", "emptyfieldsfordefault-text": "(如果您的 WSL 版本不支援，請清空預設字串)", - "runquickaction-text": "執行捷徑", + "runquickaction-text": "執行片段", "upload-text": "上傳", "startstopserving-text": "開始/停止在網路上提供服務", "startedserving-text": "正在網路上為 %s 提供服務", @@ -90,15 +90,15 @@ "yesoverride-text": "繼續同步 (覆蓋)", "settingname-text": "設定名稱", "yourcodehere-text": "輸入你的代碼", - "addquickaction-text": "新增捷徑", - "addquickactioninfo-text": "新增快速捷徑，您會在此處看到它。", + "addquickaction-text": "新增片段", + "addquickactioninfo-text": "新增片段並在此處檢視", "newversion-text": "有可用的更新", "downloadnow-text": "立即下載", "orcheck-text": "或檢查", "windowsstore-text": "Microsoft Store", "homepage-text": "主畫面", "about-text": "關於此軟體", - "managequickactions-text": "管理捷徑", + "managequickactions-text": "管理片段", "addinstance-text": "新增安裝實體", "editwslconfig-text": "直接編輯 .wslconfig", "stopwsl-text": "停止 WSL", @@ -124,7 +124,7 @@ "addcommunityactions-text": "新增社群捷徑", "done-text": "完成", "search-text": "搜尋", - "shareyourquickaction-text": "分享您的捷徑", + "shareyourquickaction-text": "分享你的片段", "wslsettings-text": "WSL 設定", "boot-text": "啟動", "automount-text": "自動掛載", From 72842560c5b2833a3c0e099562bfae1975fbd027 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Jun 2023 14:15:15 +0200 Subject: [PATCH 2/9] Changed Community Actions to Snippets --- lib/i18n/de.json | 2 +- lib/i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/i18n/de.json b/lib/i18n/de.json index 9692357..601be11 100644 --- a/lib/i18n/de.json +++ b/lib/i18n/de.json @@ -121,7 +121,7 @@ "nestedvirtinfo-text": "Boolescher Wert zum Ein- oder Ausschalten der verschachtelten Virtualisierung, sodass andere verschachtelte VMs in WSL 2 ausgeführt werden können. Nur für Windows 11 verfügbar.", "vmidleinfo-text": "Die Anzahl der Millisekunden, die eine VM im Leerlauf ist, bevor sie heruntergefahren wird. Nur verfügbar für Windows 11.", "documentation-text": "Dokumentation", - "addcommunityactions-text": "Community Actions hinzufügen", + "addcommunityactions-text": "Community Codeausschnitte hinzufügen", "done-text": "Fertig", "search-text": "Suche", "shareyourquickaction-text": "Teilen Sie Ihre Codeausschnitte", diff --git a/lib/i18n/en.json b/lib/i18n/en.json index 5304b73..805e3f5 100644 --- a/lib/i18n/en.json +++ b/lib/i18n/en.json @@ -121,7 +121,7 @@ "nestedvirtinfo-text": "Boolean to turn on or off nested virtualization, enabling other nested VMs to run inside WSL 2. Only available for Windows 11.", "vmidleinfo-text": "The number of milliseconds that a VM is idle, before it is shut down. Only available for Windows 11.", "documentation-text": "Documentation", - "addcommunityactions-text": "Add Community Actions", + "addcommunityactions-text": "Add Community snippets", "search-text": "Search", "shareyourquickaction-text": "Share your snippets", "wslsettings-text": "WSL Settings", From dde9b2e57b26145d104813f6fea563e8dcf3dc36 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Jun 2023 14:15:44 +0200 Subject: [PATCH 3/9] Version bump --- lib/components/constants.dart | 2 +- pubspec.lock | 40 ++++++++++++++--------------------- pubspec.yaml | 2 +- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/lib/components/constants.dart b/lib/components/constants.dart index 414fcee..6fbee77 100644 --- a/lib/components/constants.dart +++ b/lib/components/constants.dart @@ -2,7 +2,7 @@ import 'package:fluent_ui/fluent_ui.dart'; const String title = 'WSL Distro Manager by Bostrot'; -const String currentVersion = "1.8.2"; +const String currentVersion = "1.8.4"; const String windowsStoreUrl = "https://www.microsoft.com/store/" "productId/9NWS9K95NMJB"; const String defaultPath = 'C:\\WSL2-Distros'; diff --git a/pubspec.lock b/pubspec.lock index 86bb768..d0d2243 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: cli_util - sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 url: "https://pub.dev" source: hosted - version: "0.3.5" + version: "0.4.0" clock: dependency: transitive description: @@ -149,18 +149,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013 - url: "https://pub.dev" - source: hosted - version: "5.2.6" - file_utils: - dependency: transitive - description: - name: file_utils - sha256: d1e64389a22649095c8405c9e177272caf05139255931c9ff30d53b5c9bcaa34 + sha256: b1729fc96627dd44012d0a901558177418818d6bd428df59dcfeb594e5f66432 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "5.3.2" fluent_ui: dependency: "direct main" description: @@ -249,10 +241,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: feab99a20fd248c658c923ba98f4449ca6e575c3dee9fdf07146f4f33482c6bc + sha256: d687b6129476c92bd75244b8dfc1bb56f9a287ab3d51cdf0baf570afeb923c51 url: "https://pub.dev" source: hosted - version: "6.5.5" + version: "8.0.3" http: dependency: "direct main" description: @@ -385,10 +377,10 @@ packages: dependency: "direct dev" description: name: msix - sha256: "68679afc7d7117467250363dea4fb62db7520a23a9490bf4b65794655235a1d5" + sha256: bf151b9a1648985e7604672ade54c8df693566099d0731e318548c47d54676e6 url: "https://pub.dev" source: hosted - version: "3.9.1" + version: "3.14.2" nested: dependency: transitive description: @@ -409,10 +401,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: cbff87676c352d97116af6dbea05aa28c4d65eb0f6d5677a520c11a69ca9a24d + sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "4.0.2" package_info_plus_platform_interface: dependency: transitive description: @@ -449,10 +441,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130 + sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.1.7" petitparser: dependency: transitive description: @@ -654,10 +646,10 @@ packages: dependency: "direct main" description: name: system_info2 - sha256: af2f948e3f31a3367a049932a8ad59faf0063ecf836a020d975b9f41566d8bc9 + sha256: "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "4.0.0" system_theme: dependency: "direct main" description: @@ -782,10 +774,10 @@ packages: dependency: transitive description: name: win32 - sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46 + sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "5.0.3" window_manager: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 58fcbdf..eaaef28 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: wsl2distromanager description: A GUI to quickly manage your WSL instances. publish_to: 'none' -version: 1.8.4 # Current version +version: 1.8.5 # Current version environment: sdk: '>=2.17.0 <3.0.0' From 7bc0d8abb3e50f25be362dd2db6d28598b5f2217 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Jun 2023 14:15:55 +0200 Subject: [PATCH 4/9] Version bump --- lib/components/constants.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/components/constants.dart b/lib/components/constants.dart index 6fbee77..b04919f 100644 --- a/lib/components/constants.dart +++ b/lib/components/constants.dart @@ -2,7 +2,7 @@ import 'package:fluent_ui/fluent_ui.dart'; const String title = 'WSL Distro Manager by Bostrot'; -const String currentVersion = "1.8.4"; +const String currentVersion = "1.8.5"; const String windowsStoreUrl = "https://www.microsoft.com/store/" "productId/9NWS9K95NMJB"; const String defaultPath = 'C:\\WSL2-Distros'; From b848e594a5c593ca8d5bfee3c70dc5c8973b05b3 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 13 Aug 2023 09:56:36 +0200 Subject: [PATCH 5/9] Changed snippet to code snippet --- lib/i18n/zh_CN.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/i18n/zh_CN.json b/lib/i18n/zh_CN.json index 15d8be6..15c1b6e 100644 --- a/lib/i18n/zh_CN.json +++ b/lib/i18n/zh_CN.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "起始目录路径", "wsldefaultuser-text": "（可选）要使用的 WSL 默认用户", "emptyfieldsfordefault-text": "（如果您的 WSL 版本不支持，请清空默认字段）", - "runquickaction-text": "运行片段", + "runquickaction-text": "运行代码片段", "upload-text": "上传", "startstopserving-text": "开始/停止在网络上提供服务", "startedserving-text": "正在网络上为 %s 提供服务", @@ -90,15 +90,15 @@ "yesoverride-text": "是的，同步（覆盖）", "settingname-text": "设置名称", "yourcodehere-text": "填入你的代码", - "addquickaction-text": "添加片段", - "addquickactioninfo-text": "添加片段，您将在此处看到它。", + "addquickaction-text": "添加代码片段", + "addquickactioninfo-text": "添加代码片段，您将在此处看到它。", "newversion-text": "有新版本可用", "downloadnow-text": "现在下载", "orcheck-text": "或检查", "windowsstore-text": "Windows 商店", "homepage-text": "主界面", "about-text": "关于此软件", - "managequickactions-text": "管理片段", + "managequickactions-text": "管理代码片段", "addinstance-text": "添加实例", "editwslconfig-text": "直接编辑 .wslconfig", "stopwsl-text": "停止 WSL", @@ -124,7 +124,7 @@ "addcommunityactions-text": "添加社区快速操作", "done-text": "完成", "search-text": "搜索", - "shareyourquickaction-text": "分享你的片段", + "shareyourquickaction-text": "分享你的代码片段", "wslsettings-text": "WSL 设置", "boot-text": "启动", "automount-text": "自动挂载", From f0e7ca4d602166e4ea41163beb0f7f55176a85e2 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 13 Aug 2023 11:33:55 +0200 Subject: [PATCH 6/9] Upgraded dependencies --- lib/dialogs/info_dialog.dart | 8 +- lib/dialogs/install_dialog.dart | 2 +- lib/nav/init.dart | 6 +- pubspec.lock | 228 +++++++++--------- pubspec.yaml | 54 +++-- .../flutter/generated_plugin_registrant.cc | 3 + windows/flutter/generated_plugins.cmake | 1 + 7 files changed, 154 insertions(+), 148 deletions(-) diff --git a/lib/dialogs/info_dialog.dart b/lib/dialogs/info_dialog.dart index de1ed08..36eea96 100644 --- a/lib/dialogs/info_dialog.dart +++ b/lib/dialogs/info_dialog.dart @@ -148,11 +148,11 @@ class ClickableDependency extends StatelessWidget { child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - TextButton( + Button( onPressed: () => launchUrl(Uri.parse("https://pub.dev/packages/$name")), child: Text(name)), - TextButton( + Button( onPressed: () => launchUrl( Uri.parse("https://pub.dev/packages/$name/license")), child: const Text("(LICENSE)")), @@ -178,7 +178,7 @@ class ClickableUrl extends StatelessWidget { Widget build(BuildContext context) { return MouseRegion( cursor: SystemMouseCursors.click, - child: TextButton( + child: Button( onPressed: () async { plausible.event(name: clickEvent); launchUrl(Uri.parse(url)); @@ -204,7 +204,7 @@ class ClickableText extends StatelessWidget { Widget build(BuildContext context) { return MouseRegion( cursor: SystemMouseCursors.click, - child: TextButton(onPressed: onPressed, child: Text(text)), + child: Button(onPressed: onPressed, child: Text(text)), ); } } diff --git a/lib/dialogs/install_dialog.dart b/lib/dialogs/install_dialog.dart index 823c849..d237fe3 100644 --- a/lib/dialogs/install_dialog.dart +++ b/lib/dialogs/install_dialog.dart @@ -23,7 +23,7 @@ class InstallDialog extends StatelessWidget { color: const Color.fromRGBO(0, 0, 0, 0.2), child: Padding( padding: const EdgeInsets.only(left: 4.0, right: 4.0), - child: TextButton( + child: Button( onPressed: () { plausible.event(name: "wsl_install"); WSLApi().installWSL(); diff --git a/lib/nav/init.dart b/lib/nav/init.dart index 855f9d6..b6c2937 100644 --- a/lib/nav/init.dart +++ b/lib/nav/init.dart @@ -1,9 +1,7 @@ import 'package:dio/dio.dart'; import 'package:fluent_ui/fluent_ui.dart' hide Page; -import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:localization/localization.dart'; -import 'package:system_theme/system_theme.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:wsl2distromanager/api/app.dart'; import 'package:wsl2distromanager/components/constants.dart'; @@ -104,9 +102,9 @@ initRoot(statusMsg) async { // } // Get system dark mode - if (SystemTheme.isDarkMode) { + if (ThemeMode.system == ThemeMode.dark) { AppTheme().mode = ThemeMode.dark; - } else { + } else if (ThemeMode.system == ThemeMode.light) { AppTheme().mode = ThemeMode.light; } } diff --git a/pubspec.lock b/pubspec.lock index d0d2243..836795a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: args - sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.2" async: dependency: "direct main" description: @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" dart_pubspec_licenses: dependency: transitive description: @@ -117,10 +117,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "3e5c4a94d112540d0c9a6b7f3969832e1604eb8cde0f88d0808382f9f632100b" + sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197 url: "https://pub.dev" source: hosted - version: "5.0.3" + version: "5.3.2" fake_async: dependency: transitive description: @@ -133,10 +133,10 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.0" file: dependency: transitive description: @@ -149,18 +149,18 @@ packages: dependency: "direct main" description: name: file_picker - sha256: b1729fc96627dd44012d0a901558177418818d6bd428df59dcfeb594e5f66432 + sha256: "21145c9c268d54b1f771d8380c195d2d6f655e0567dc1ca2f9c134c02c819e0a" url: "https://pub.dev" source: hosted - version: "5.3.2" + version: "5.3.3" fluent_ui: dependency: "direct main" description: name: fluent_ui - sha256: "456c66be2d1e5eab4c0f81dac1c55e023e65d31e81488ed4463741ce10928417" + sha256: "4a228a8d7dc93a1a8dc339cc99d439cf66ea5816285e76751ac5183f2ea10ced" url: "https://pub.dev" source: hosted - version: "4.6.2" + version: "4.7.2" flutter: dependency: "direct main" description: flutter @@ -170,18 +170,26 @@ packages: dependency: "direct main" description: name: flutter_acrylic - sha256: bff4e1bd4b33a9f9eb5209b42b598b5fdbdf607e332f5c41f6bf2df60648bb6f + sha256: a9a1fdf91ff1fb47858fd82507f57e255a132a5d355056694fdb9fd303633b18 url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.3" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" + flutter_localization: + dependency: "direct main" + description: + name: flutter_localization + sha256: b2b0fe87f4608f5a3e78ed570d5f85ba9f55c746a6aca4981c0ea4bb894d5d00 + url: "https://pub.dev" + source: hosted + version: "0.1.13" flutter_localizations: dependency: "direct main" description: flutter @@ -191,10 +199,10 @@ packages: dependency: "direct main" description: name: flutter_markdown - sha256: "7b25c10de1fea883f3c4f9b8389506b54053cd00807beab69fd65c8653a2711f" + sha256: "2b206d397dd7836ea60035b2d43825c8a303a76a5098e66f42d55a753e18d431" url: "https://pub.dev" source: hosted - version: "0.6.14" + version: "0.6.17+1" flutter_oss_licenses: dependency: "direct dev" description: @@ -207,10 +215,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf + sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360" url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.0.15" flutter_test: dependency: "direct dev" description: flutter @@ -225,10 +233,10 @@ packages: dependency: transitive description: name: get_it - sha256: "290fde3a86072e4b37dbb03c07bec6126f0ecc28dad403c12ffe2e5a2d751ab7" + sha256: "529de303c739fca98cd7ece5fca500d8ff89649f1bb4b4e94fb20954abcd7468" url: "https://pub.dev" source: hosted - version: "7.2.0" + version: "7.6.0" globbing: dependency: transitive description: @@ -241,18 +249,18 @@ packages: dependency: "direct main" description: name: go_router - sha256: d687b6129476c92bd75244b8dfc1bb56f9a287ab3d51cdf0baf570afeb923c51 + sha256: "2cb236ba3f923043fdbe14a6a3a796b8c250e85658e28caee3e86c0c275847e5" url: "https://pub.dev" source: hosted - version: "8.0.3" + version: "8.2.0" http: dependency: "direct main" description: name: http - sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "0.13.5" + version: "1.1.0" http_parser: dependency: transitive description: @@ -265,10 +273,10 @@ packages: dependency: transitive description: name: image - sha256: "483a389d6ccb292b570c31b3a193779b1b0178e7eb571986d9a49904b6861227" + sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf url: "https://pub.dev" source: hosted - version: "4.0.15" + version: "4.0.17" intl: dependency: transitive description: @@ -289,18 +297,18 @@ packages: dependency: transitive description: name: json_annotation - sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.8.1" lints: dependency: transitive description: name: lints - sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.1" localization: dependency: "direct main" description: @@ -313,26 +321,26 @@ packages: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" macos_window_utils: dependency: transitive description: name: macos_window_utils - sha256: d3cffe473b41163d67cdf598fafb6293967d2ca2509341c577644e5082e3aac1 + sha256: "43a90473f8786f00f07203e6819dab67e032f8896dafa4a6f85fbc71fba32c0b" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" markdown: dependency: transitive description: name: markdown - sha256: d95a9d12954aafc97f984ca29baaa7690ed4d9ec4140a23ad40580bcdb6c87f5 + sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd url: "https://pub.dev" source: hosted - version: "7.0.2" + version: "7.1.1" matcher: dependency: transitive description: @@ -377,10 +385,10 @@ packages: dependency: "direct dev" description: name: msix - sha256: bf151b9a1648985e7604672ade54c8df693566099d0731e318548c47d54676e6 + sha256: "76c87b8207323803169626a55afd78bbb8413c984df349a76598b9fbf9224677" url: "https://pub.dev" source: hosted - version: "3.14.2" + version: "3.16.1" nested: dependency: transitive description: @@ -401,10 +409,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b + sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.0" package_info_plus_platform_interface: dependency: transitive description: @@ -425,34 +433,34 @@ packages: dependency: transitive description: name: path_provider_linux - sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3 url: "https://pub.dev" source: hosted - version: "2.1.10" + version: "2.2.0" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84 url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.1.0" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.0" petitparser: dependency: transitive description: name: petitparser - sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.4.0" platform: dependency: transitive description: @@ -473,26 +481,18 @@ packages: dependency: transitive description: name: plugin_platform_interface - sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pointycastle: dependency: transitive description: name: pointycastle - sha256: "57b6b78df14175658f09c5dfcfc51a46ad9561a3504fe679913dab404d0cc0f2" + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" url: "https://pub.dev" source: hosted - version: "3.7.0" - process: - dependency: transitive - description: - name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" - url: "https://pub.dev" - source: hosted - version: "4.2.4" + version: "3.7.3" provider: dependency: "direct main" description: @@ -505,10 +505,10 @@ packages: dependency: transitive description: name: pub_semver - sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" recase: dependency: transitive description: @@ -537,74 +537,74 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: ee6257848f822b8481691f20c3e6d2bfee2e9eccb2a3d249907fcfb198c55b41 + sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1" url: "https://pub.dev" source: hosted - version: "2.0.18" + version: "2.2.0" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521 + sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076 url: "https://pub.dev" source: hosted - version: "2.0.17" + version: "2.2.0" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310" + sha256: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.3.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707" + sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1" url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.3.0" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc" + sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8" + sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a" url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.2.0" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436" + sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.3.0" shelf: dependency: "direct main" description: name: shelf - sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" shelf_static: dependency: "direct main" description: name: shelf_static - sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c + sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" sky_engine: dependency: transitive description: flutter @@ -654,10 +654,10 @@ packages: dependency: "direct main" description: name: system_theme - sha256: "28bb63b997c252eee7fea6dc9e3528a9a6bf4b566ccbc8b49926389ca3e2c96b" + sha256: "1f208db140a3d1e1eac2034b54920d95699c1534df576ced44b3312c5de3975f" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.1" system_theme_web: dependency: transitive description: @@ -686,82 +686,82 @@ packages: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" universal_io: dependency: transitive description: name: universal_io - sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d" + sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.2" url_launcher: dependency: "direct main" description: name: url_launcher - sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e" + sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e" url: "https://pub.dev" source: hosted - version: "6.1.10" + version: "6.1.12" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "845530e5e05db5500c1a4c1446785d60cbd8f9bd45e21e7dd643a3273bb4bbd1" + sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025" url: "https://pub.dev" source: hosted - version: "6.0.25" + version: "6.0.38" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "7ab1e5b646623d6a2537aa59d5d039f90eebef75a7c25e105f6f75de1f7750c3" + sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.4" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc" + sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "3.0.5" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a" + sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1" url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "3.0.6" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370" + sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa" + sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4 url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "2.0.18" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd + sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.7" vector_math: dependency: transitive description: @@ -774,42 +774,42 @@ packages: dependency: transitive description: name: win32 - sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b" + sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0 url: "https://pub.dev" source: hosted - version: "5.0.3" + version: "5.0.6" window_manager: dependency: "direct main" description: name: window_manager - sha256: "2b2572442b2a5178642730442dc625ac088244f5827b1f0811371b1b7485eb62" + sha256: "9eef00e393e7f9308309ce9a8b2398c9ee3ca78b50c96e8b4f9873945693ac88" url: "https://pub.dev" source: hosted - version: "0.3.2" + version: "0.3.5" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247 url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.2" xml: dependency: transitive description: name: xml - sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.dev" source: hosted - version: "6.2.2" + version: "6.3.0" yaml: dependency: "direct main" description: name: yaml - sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" sdks: dart: ">=3.0.0 <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index eaaef28..746aa8b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,47 +1,51 @@ name: wsl2distromanager description: A GUI to quickly manage your WSL instances. -publish_to: 'none' +publish_to: "none" version: 1.8.5 # Current version environment: - sdk: '>=2.17.0 <3.0.0' + sdk: ">=2.17.0 <3.0.0" dependencies: flutter: sdk: flutter flutter_localizations: sdk: flutter - localization: ^2.1.0 - desktop_window: ^0.4.0 - fluent_ui: ^4.4.2 - system_theme: ^2.1.0 - file_picker: ^5.0.1 - url_launcher: ^6.1.6 - dio: ^5.0.3 - package_info_plus: ^4.0.2 - plausible_analytics: ^0.3.0 - shared_preferences: ^2.0.15 - shelf_static: ^1.1.1 - shelf: ^1.4.0 - window_manager: ^0.3.2 - provider: ^6.0.3 - flutter_acrylic: ^1.0.0+2 - system_info2: ^4.0.0 - yaml: ^3.1.1 archive: ^3.3.7 - http: ^0.13.5 - async: ^2.9.0 + async: ^2.11.0 chunked_downloader: ^0.0.2 + desktop_window: ^0.4.0 + dio: ^5.3.2 + file_picker: ^5.3.3 + fluent_ui: ^4.7.2 + flutter_acrylic: ^1.1.3 + flutter_localization: ^0.1.13 + flutter_markdown: ^0.6.17+1 go_router: ^8.0.1 - flutter_markdown: ^0.6.14 + http: ^1.1.0 + localization: ^2.1.0 + package_info_plus: ^4.1.0 + plausible_analytics: ^0.3.0 + provider: ^6.0.5 + shared_preferences: ^2.2.0 + shelf: ^1.4.1 + shelf_static: ^1.1.2 + system_info2: ^4.0.0 + system_theme: ^2.3.1 + url_launcher: ^6.1.12 + window_manager: ^0.3.5 + yaml: ^3.1.2 + +dependency_overrides: + http: ^1.1.0 dev_dependencies: + flutter_lints: ^2.0.1 + flutter_oss_licenses: ^2.0.1 flutter_test: sdk: flutter msix: ^3.14.2 - flutter_lints: ^2.0.1 - flutter_oss_licenses: ^2.0.1 flutter: uses-material-design: true @@ -60,6 +64,6 @@ msix_config: tile_icon_path: .\assets\logo_wsl_manager.png icons_background_color: transparent architecture: x64 - capabilities: 'internetClient' + capabilities: "internetClient" store: true languages: en-US, en-GB, en-AU, de-DE, pt-BR, pt-PT, zh-CN, zh-TW diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 2662b40..e4328bc 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -18,6 +19,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("DesktopWindowPlugin")); FlutterAcrylicPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterAcrylicPlugin")); + FlutterLocalizationPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterLocalizationPluginCApi")); ScreenRetrieverPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("ScreenRetrieverPlugin")); SystemThemePluginRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index d29a60d..bc40a26 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -5,6 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_window flutter_acrylic + flutter_localization screen_retriever system_theme url_launcher_windows From 488272c37c51a671082a94b368503fca834d4508 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 13 Aug 2023 11:35:40 +0200 Subject: [PATCH 7/9] Fixed windows recreating distro folders --- lib/api/wsl.dart | 14 ++++++++------ test/wsl_test.dart | 3 +++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/api/wsl.dart b/lib/api/wsl.dart index 973ab25..26252e1 100644 --- a/lib/api/wsl.dart +++ b/lib/api/wsl.dart @@ -263,13 +263,15 @@ class WSLApi { // Check if folder is empty and delete String path = getInstancePath(distribution).path; - Directory dir = Directory(path); - if (dir.existsSync()) { - if (dir.listSync().isEmpty) { - dir.deleteSync(); + // Wait 10 seconds in async then delete for Windows to release file + Future.delayed(const Duration(seconds: 10), () { + Directory dir = Directory(path); + if (dir.existsSync()) { + if (dir.listSync().isEmpty) { + dir.deleteSync(recursive: true); + } } - } - + }); return results.stdout; } diff --git a/test/wsl_test.dart b/test/wsl_test.dart index 8bec9a2..bf0e0bb 100644 --- a/test/wsl_test.dart +++ b/test/wsl_test.dart @@ -126,6 +126,9 @@ void main() { await WSLApi().remove('test'); expect(await isInstance('test'), false); + // Check if folder is deleted + expect(await Directory('C:/WSL2-Distros/test').exists(), false); + // Test without download // Test creating it await createDistro( From da5383440fe4e1b085fd0623ba16259db4f35351 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 13 Aug 2023 11:55:34 +0200 Subject: [PATCH 8/9] Fixed cleanup path --- lib/api/wsl.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/api/wsl.dart b/lib/api/wsl.dart index 26252e1..c0ba528 100644 --- a/lib/api/wsl.dart +++ b/lib/api/wsl.dart @@ -548,14 +548,14 @@ class WSLApi { /// Clean up WSL distros. Exporting, deleting, and importing. Future cleanup(String distribution) async { - var file = getInstancePath(distribution).file('export.tar.gz'); + var instancePath = getInstancePath(distribution); + var file = instancePath.file('export.tar.gz'); // Export, remove, and import await export(distribution, file); await remove(distribution); - var res = await import(distribution, '', file); - return res; + return await import(distribution, instancePath.path, file); } /// Returns list of WSL distros From 6fe6c3aa878c84f169923c8290d1d22364ece6f0 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 13 Aug 2023 11:55:50 +0200 Subject: [PATCH 9/9] Fixed cleanup text --- lib/i18n/en.json | 2 +- lib/i18n/pt.json | 2 +- lib/i18n/zh_tw.json | 2 +- lib/nav/init.dart | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/i18n/en.json b/lib/i18n/en.json index 805e3f5..1d14588 100644 --- a/lib/i18n/en.json +++ b/lib/i18n/en.json @@ -147,7 +147,7 @@ "language-text": "Language", "languagechange-text": "Language change will take effect after restart.", "notemplates-text": "No templates found", - "cleanuptitle-text": "Clean up WSL instance ($s0)", + "cleanuptitle-text": "Clean up WSL instance (%s0)", "cleanupbody-text": "Do you really want to clean up the distribution? This will export and re-import the distribution. This may take some time.", "continue-text": "Continue", "cleanup-text": "Cleanup", diff --git a/lib/i18n/pt.json b/lib/i18n/pt.json index 6632507..f07794c 100644 --- a/lib/i18n/pt.json +++ b/lib/i18n/pt.json @@ -148,7 +148,7 @@ "language-text": "Idioma", "languagechange-text": "A alteração de idioma terá efeito após o reinício.", "notemplates-text": "Nenhum modelo encontrado", - "cleanuptitle-text": "Limpar instância WSL ($s0)", + "cleanuptitle-text": "Limpar instância WSL (%s0)", "cleanupbody-text": "Você realmente quer limpar a distribuição? Isso exportará e importará a distribuição novamente. Isso pode levar algum tempo.", "continue-text": "Continuar", "cleanuptext-text": "Limpar", diff --git a/lib/i18n/zh_tw.json b/lib/i18n/zh_tw.json index 866f5c2..c919c1c 100644 --- a/lib/i18n/zh_tw.json +++ b/lib/i18n/zh_tw.json @@ -148,7 +148,7 @@ "language-text": "語言", "languagechange-text": "語言變更將在重新啟動後生效。", "notemplates-text": "沒有找到範本", - "cleanuptitle-text": "清理 WSL 安裝實體 ($s0)", + "cleanuptitle-text": "清理 WSL 安裝實體 (%s0)", "cleanupbody-text": "您確定要清理發行版本嗎？這將匯出並重新匯入發行版本。這可能需要一些時間。", "continue-text": "繼續", "cleanup-text": "清理", diff --git a/lib/nav/init.dart b/lib/nav/init.dart index b6c2937..671278f 100644 --- a/lib/nav/init.dart +++ b/lib/nav/init.dart @@ -43,9 +43,9 @@ initRoot(statusMsg) async { // if (kDebugMode) { // prefs.remove('version'); // } - if (kDebugMode) { - prefs.setString('version', '1.8.0'); - } + // if (kDebugMode) { + // prefs.setString('version', '1.8.0'); + // } // Check updates App app = App();