Fix lock collection wrongly labeled as Layer

LinwoodDev · Jan 17, 2025 · 7f325ec · 7f325ec
1 parent 9c387b1
commit 7f325ec
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 41 deletions.
diff --git a/api/pubspec.lock b/api/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "88399e291da5f7e889359681a8f64b18c5123e03576b01f32a6a276611e511c3"
+      sha256: "03f6da266a27a4538a69295ec142cb5717d7d4e5727b84658b63e1e1509bac9c"
       url: "https://pub.dev"
     source: hosted
-    version: "78.0.0"
+    version: "79.0.0"
   _macros:
     dependency: transitive
     description: dart
@@ -18,10 +18,10 @@ packages:
     dependency: "direct dev"
     description:
       name: analyzer
-      sha256: "62899ef43d0b962b056ed2ebac6b47ec76ffd003d5f7c4e4dc870afe63188e33"
+      sha256: c9040fc56483c22a5e04a9f6a251313118b1a3c42423770623128fa484115643
       url: "https://pub.dev"
     source: hosted
-    version: "7.1.0"
+    version: "7.2.0"
   archive:
     dependency: "direct main"
     description:
@@ -307,10 +307,10 @@ packages:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: "8f52361c07497a7f2c16c13aac159f9be6fb12b1d67719eac98a21d9a205d571"
+      sha256: b0a98230538fe5d0b60a22fb6bf1b6cb03471b53e3324ff6069c591679dd59c9
       url: "https://pub.dev"
     source: hosted
-    version: "6.9.2"
+    version: "6.9.3"
   lints:
     dependency: "direct dev"
     description:

diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
@@ -10,17 +10,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1036.0)
-    aws-sdk-core (3.215.0)
+    aws-partitions (1.1039.0)
+    aws-sdk-core (3.216.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.97.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.177.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.178.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.11.0)
@@ -111,7 +111,7 @@ GEM
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.76.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-core (0.15.1)
+    google-apis-core (0.16.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
       httpclient (>= 2.8.3, < 3.a)
@@ -224,4 +224,4 @@ DEPENDENCIES
   screengrab
 
 BUNDLED WITH
-   2.6.2
+   2.6.3
diff --git a/app/lib/selections/tools/shape.dart b/app/lib/selections/tools/shape.dart
@@ -57,7 +57,8 @@ class ShapeToolSelection extends ToolSelection<ShapeTool> {
                                   .toList()),
                         ))
                     .toList(),
-              )
+              ),
+              const SizedBox(width: 4),
             ],
           ),
           value: tool.constrainedAspectRatio,

diff --git a/app/lib/views/edit.dart b/app/lib/views/edit.dart
@@ -423,7 +423,7 @@ class _EditToolbarState extends State<EditToolbar> {
                             lockCollection: !utilitiesState.lockCollection,
                           ),
                           PhosphorIconsLight.folder,
-                          AppLocalizations.of(context).layer,
+                          AppLocalizations.of(context).collection,
                         ),
                         buildButton(
                           utilitiesState.lockZoom,

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "88399e291da5f7e889359681a8f64b18c5123e03576b01f32a6a276611e511c3"
+      sha256: "03f6da266a27a4538a69295ec142cb5717d7d4e5727b84658b63e1e1509bac9c"
       url: "https://pub.dev"
     source: hosted
-    version: "78.0.0"
+    version: "79.0.0"
   _macros:
     dependency: transitive
     description: dart
@@ -18,10 +18,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "62899ef43d0b962b056ed2ebac6b47ec76ffd003d5f7c4e4dc870afe63188e33"
+      sha256: c9040fc56483c22a5e04a9f6a251313118b1a3c42423770623128fa484115643
       url: "https://pub.dev"
     source: hosted
-    version: "7.1.0"
+    version: "7.2.0"
   animations:
     dependency: "direct main"
     description:

diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
diff --git a/metadata/en-US/changelogs/129.txt b/metadata/en-US/changelogs/129.txt
@@ -7,7 +7,8 @@
 * Fix export button in data settings not working
 * Fix export button for file view not visible
 * Fix file view showing wrong aspect ratio for thumbnails
-* Fix line transform changes rotation and scaling not working correctly
+* Fix line transform changes rotation and scaling not working correctly ([#786](https://github.com/LinwoodDev/Butterfly/issues/786))
+* Fix lock collection wrongly labeled as Layer
 * Update secure storage dependency
 * Use minSdkVersion 23 instead of 21 (The minimum version of android is 6.0 (Marshmallow))