Improve navigator rail

LinwoodDev · Jul 29, 2024 · fadfa92 · fadfa92
1 parent 247a93d
commit fadfa92
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 28 deletions.
diff --git a/app/lib/views/navigator/view.dart b/app/lib/views/navigator/view.dart
@@ -122,8 +122,9 @@ class _NavigatorViewState extends State<NavigatorView>
                       ),
                     )
                     .toList(),
-                labelType: NavigationRailLabelType.all,
+                labelType: NavigationRailLabelType.none,
                 selectedIndex: settings.navigatorEnabled ? selected : null,
+                groupAlignment: 0,
                 onDestinationSelected: (index) {
                   final cubit = context.read<SettingsCubit>();
                   if (selected == index) {

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -260,18 +260,18 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: db7a4e143dc72cc3cb2044ef9b052a7ebfe729513e6a82943bc3526f784365b8
+      sha256: "3e7d1d9dbae40ae82cbe6c23c518f0c4ffe32764ee9749b9a99d32cbac8734f6"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.3"
+    version: "6.0.4"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
       name: connectivity_plus_platform_interface
-      sha256: b6a56efe1e6675be240de39107281d4034b64ac23438026355b4234042a35adb
+      sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   convert:
     dependency: transitive
     description:
@@ -341,18 +341,18 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91
+      sha256: "93429694c9253d2871b3af80cf11b3cbb5c65660d402ed7bf69854ce4a089f82"
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.0"
+    version: "10.1.1"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
+      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -817,8 +817,8 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/lw_file_system"
-      ref: "9447d510c9094dc0750e85922ddeaa218ece0485"
-      resolved-ref: "9447d510c9094dc0750e85922ddeaa218ece0485"
+      ref: "509b5800dcf8bad400ab6ae12184631a3db1e189"
+      resolved-ref: "509b5800dcf8bad400ab6ae12184631a3db1e189"
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "1.0.0"
@@ -835,8 +835,8 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/lw_sysapi"
-      ref: abd34d81efae743a55cfa72166a2166def4a0515
-      resolved-ref: abd34d81efae743a55cfa72166a2166def4a0515
+      ref: bf247737e215187d1f643f76d0b3a29ed934ecbd
+      resolved-ref: bf247737e215187d1f643f76d0b3a29ed934ecbd
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "0.0.1"
@@ -943,18 +943,18 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0
+      sha256: "4de6c36df77ffbcef0a5aefe04669d33f2d18397fea228277b852a2d4e58e860"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.0.1"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e
+      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   path:
     dependency: "direct main"
     description:
@@ -1192,18 +1192,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544
+      sha256: "59dfd53f497340a0c3a81909b220cfdb9b8973a91055c4e5ab9b9b9ad7c513c0"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "10.0.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4"
+      sha256: "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   shared_preferences:
     dependency: "direct main"
     description:

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -36,7 +36,7 @@ dependencies:
   file_selector: ^1.0.3
   phosphor_flutter: ^2.1.0
   replay_bloc: ^0.2.7
-  share_plus: ^9.0.0
+  share_plus: ^10.0.0
   package_info_plus: ^8.0.0
   idb_shim: ^2.4.1+1
   go_router: ^14.1.0
@@ -77,7 +77,7 @@ dependencies:
   lw_sysapi:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs.git
-      ref: abd34d81efae743a55cfa72166a2166def4a0515
+      ref: bf247737e215187d1f643f76d0b3a29ed934ecbd
       path: packages/lw_sysapi
   networker:
     git:
@@ -92,7 +92,7 @@ dependencies:
   lw_file_system:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs.git
-      ref: 9447d510c9094dc0750e85922ddeaa218ece0485
+      ref: 509b5800dcf8bad400ab6ae12184631a3db1e189
       path: packages/lw_file_system
   flutter_localized_locales: ^2.0.5
   dynamic_color: ^1.7.0

diff --git a/app/web/index.html b/app/web/index.html
@@ -126,9 +126,9 @@
     <script id="splash-screen-script">
       function removeSplashFromWeb() {
         const splashElement = document.getElementById("splash");
-        splashElement.classList.add("remove");
+        splashElement?.classList.add("remove");
         setTimeout(function () {
-          splashElement.remove();
+          splashElement?.remove();
           document.getElementById("splash-screen-script")?.remove();
         }, 750 /* animation time + wait rendering and others(500ms) */);
       }

diff --git a/app/web_nightly/index.html b/app/web_nightly/index.html
@@ -126,9 +126,9 @@
     <script id="splash-screen-script">
       function removeSplashFromWeb() {
         const splashElement = document.getElementById("splash");
-        splashElement.classList.add("remove");
+        splashElement?.classList.add("remove");
         setTimeout(function () {
-          splashElement.remove();
+          splashElement?.remove();
           document.getElementById("splash-screen-script")?.remove();
         }, 750 /* animation time + wait rendering and others(500ms) */);
       }

diff --git a/metadata/en-US/changelogs/110.txt b/metadata/en-US/changelogs/110.txt
@@ -3,6 +3,7 @@
 * Start adding multi file selection ([#713](https://github.com/LinwoodDev/Butterfly/issues/713))
 * Improve renaming in files view
 * Improve grid view item
+* Improve navigator rail
 * Refactor file system to include it as library
 
 Read more here: https://linwood.dev/butterfly/2.2.0-beta.0