Improve importing in editor

Author: CodeDoctorDE

api/lib/src/models/data.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:archive/archive.dart';
 import 'package:crypto/crypto.dart';
 import 'package:lw_file_system_api/lw_file_system_api.dart';
 import 'background.dart';
@@ -205,10 +204,6 @@ class SetonixData extends ArchiveData<SetonixData> {
         return MapEntry(e, translation);
       }).nonNulls;
 
-  @override
-  Uint8List exportAsBytes() => ZipEncoder(password: state.password)
-      .encodeBytes(export(), autoClose: true);
-
   PackTranslation? getTranslation([String id = kFallbackLocale]) {
     final data = getAsset('$kPackTranslationsPath/$id.json');
     if (data == null) return null;

api/pubspec.lock

@@ -310,8 +310,8 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/lw_file_system_api"
-      ref: "2ddfa39ade2cbea314eb51f95b50ecb6bd5469bf"
-      resolved-ref: "2ddfa39ade2cbea314eb51f95b50ecb6bd5469bf"
+      ref: fcac45caf2dc178a1d81c0f0b633fbe8210a81a5
+      resolved-ref: fcac45caf2dc178a1d81c0f0b633fbe8210a81a5
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "1.0.0"

api/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   lw_file_system_api:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs.git
-      ref: 2ddfa39ade2cbea314eb51f95b50ecb6bd5469bf
+      ref: fcac45caf2dc178a1d81c0f0b633fbe8210a81a5
       path: packages/lw_file_system_api
   networker:
     git:

app/lib/pages/packs/editor.dart

@@ -131,11 +131,12 @@ class _EditorPacksViewState extends State<_EditorPacksView> {
             onPressed: () => showLeapBottomSheet(
               context: context,
               titleBuilder: (context) => Text(AppLocalizations.of(context).add),
-              childrenBuilder: (context) => [
+              childrenBuilder: (ctx) => [
                 ListTile(
-                  title: Text(LeapLocalizations.of(context).create),
+                  title: Text(LeapLocalizations.of(ctx).create),
                   leading: const Icon(PhosphorIconsLight.plusCircle),
                   onTap: () async {
+                    Navigator.of(ctx).pop();
                     final name = await showDialog(
                         context: context, builder: (context) => NameDialog());
                     if (name == null) return;
@@ -156,6 +157,7 @@ class _EditorPacksViewState extends State<_EditorPacksView> {
                     if (packs.isEmpty || !context.mounted) {
                       return;
                     }
+                    Navigator.of(ctx).pop();
                     showDialog(
                       context: context,
                       builder: (context) => AlertDialog(
@@ -171,9 +173,9 @@ class _EditorPacksViewState extends State<_EditorPacksView> {
                               title: Text(metadata.name),
                               subtitle: Text(pack.identifier),
                               onTap: () async {
-                                await _fileSystem.editorSystem.createFile(
-                                    metadata.name,
-                                    SetonixData.fromData(data.exportAsBytes()));
+                                Navigator.of(context).pop();
+                                await _fileSystem.editorSystem
+                                    .createFile(metadata.name, data);
                                 _reloadPacks();
                               },
                             );
@@ -193,6 +195,7 @@ class _EditorPacksViewState extends State<_EditorPacksView> {
                   title: Text(AppLocalizations.of(context).import),
                   leading: const Icon(PhosphorIconsLight.arrowSquareIn),
                   onTap: () async {
+                    Navigator.of(ctx).pop();
                     final result = await fs.openFile(
                       acceptedTypeGroups: [
                         fs.XTypeGroup(

app/pubspec.lock

@@ -254,10 +254,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: c3093ce936028bf4b35d0dd54948ee62ed1cf95f6ae4447c7abed07c7cbee38b
+      sha256: "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da"
       url: "https://pub.dev"
     source: hosted
-    version: "11.3.1"
+    version: "11.3.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -381,12 +381,11 @@ packages:
   flame_bloc:
     dependency: "direct main"
     description:
-      path: "packages/flame_bloc"
-      ref: "2d76592b9d40007ede2dc0cb9c87858e1ec50bb5"
-      resolved-ref: "2d76592b9d40007ede2dc0cb9c87858e1ec50bb5"
-      url: "https://github.com/CodeDoctorDE/flame.git"
-    source: git
-    version: "1.12.5"
+      name: flame_bloc
+      sha256: "18d174cc4ab5a3f320b6a54bad1388cc63fc696651d76f227fb1fee1aac62dfd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.7"
   flame_tiled:
     dependency: "direct main"
     description:
@@ -682,17 +681,17 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/lw_file_system"
-      ref: "835828f9e377da7311d28f3f09c26cecc1256e7c"
-      resolved-ref: "835828f9e377da7311d28f3f09c26cecc1256e7c"
+      ref: ec1b82c9fe4d1bf3bd18d7fed311b8ae1301b9d7
+      resolved-ref: ec1b82c9fe4d1bf3bd18d7fed311b8ae1301b9d7
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "1.0.0"
   lw_file_system_api:
     dependency: transitive
     description:
       path: "packages/lw_file_system_api"
-      ref: "2ddfa39ade2cbea314eb51f95b50ecb6bd5469bf"
-      resolved-ref: "2ddfa39ade2cbea314eb51f95b50ecb6bd5469bf"
+      ref: fcac45caf2dc178a1d81c0f0b633fbe8210a81a5
+      resolved-ref: fcac45caf2dc178a1d81c0f0b633fbe8210a81a5
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "1.0.0"
@@ -733,8 +732,8 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/material_leap"
-      ref: "835828f9e377da7311d28f3f09c26cecc1256e7c"
-      resolved-ref: "835828f9e377da7311d28f3f09c26cecc1256e7c"
+      ref: ec1b82c9fe4d1bf3bd18d7fed311b8ae1301b9d7
+      resolved-ref: ec1b82c9fe4d1bf3bd18d7fed311b8ae1301b9d7
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "0.0.1"
@@ -1418,10 +1417,10 @@ packages:
     dependency: transitive
     description:
       name: win32_registry
-      sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
+      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "1.1.5"
   window_manager:
     dependency: "direct main"
     description:

app/pubspec.yaml

@@ -32,7 +32,7 @@ dependencies:
   material_leap:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs.git
-      ref: 835828f9e377da7311d28f3f09c26cecc1256e7c
+      ref: ec1b82c9fe4d1bf3bd18d7fed311b8ae1301b9d7
       path: packages/material_leap
   flex_color_scheme: ^8.1.0
   flutter_svg: ^2.0.10+1
@@ -46,11 +46,7 @@ dependencies:
   flutter_bloc: ^9.0.0
   rxdart: ^0.28.0
   collection: ^1.18.0
-  flame_bloc:
-    git:
-      url: https://github.com/CodeDoctorDE/flame.git
-      ref: 2d76592b9d40007ede2dc0cb9c87858e1ec50bb5
-      path: packages/flame_bloc
+  flame_bloc: ^1.12.7
   flame: ">=1.25.0 <1.26.0"
   flame_tiled: ">=2.0.1 <2.1.0"
   # Networking
@@ -68,7 +64,7 @@ dependencies:
       path: packages/networker/networker_socket
   # System Information
   dynamic_color: ^1.7.0
-  device_info_plus: ^11.0.0
+  device_info_plus: ^11.3.0
   package_info_plus: ^8.0.0
   path_provider: ^2.1.4
   url_launcher: ^6.2.6
@@ -77,7 +73,7 @@ dependencies:
   lw_file_system:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs.git
-      ref: 835828f9e377da7311d28f3f09c26cecc1256e7c
+      ref: ec1b82c9fe4d1bf3bd18d7fed311b8ae1301b9d7
       path: packages/lw_file_system
   lw_sysapi:
     git:

plugin/rust/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [lib]
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 anyhow = { version = "1", features = ["backtrace"] }