From 0310919c10112b860432445774b4255e40599452 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 18 Sep 2023 15:03:54 -0700 Subject: [PATCH] chore: update libtokyo --- flake.nix | 2 +- lib/views/library.dart | 14 ------------ pubspec.lock | 50 +++++++++++++++++++++--------------------- pubspec.yaml | 6 ++--- 4 files changed, 29 insertions(+), 43 deletions(-) diff --git a/flake.nix b/flake.nix index 1528f3c..15686b5 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ ]; depsListFile = ./deps.json; - vendorHash = "sha256-oLtMLOEErwKUMhPamRfvAK6XAc1Hh/9ix/Yac3o7OII="; + vendorHash = "sha256-IikMgLdqGafV/jIPzp3yh31BqAkceYfKAdo3AsIWFYk="; postInstall = '' rm $out/bin/file_manager diff --git a/lib/views/library.dart b/lib/views/library.dart index 9b91422..233c4bf 100644 --- a/lib/views/library.dart +++ b/lib/views/library.dart @@ -465,16 +465,9 @@ class _LibraryViewState extends State with FileManagerLogic AdaptiveScaffold.toRailDestination(_)).toList(), - backgroundColor: Theme.of(context).colorScheme.background, selectedIndex: currentLibrary != null ? libraryEntries.indexOf(currentLibrary!) : null, selectedLabelTextStyle: Theme.of(context).textTheme.bodyLarge, unSelectedLabelTextStyle: Theme.of(context).textTheme.bodyLarge, - selectedIconTheme: IconTheme.of(context).copyWith( - color: Theme.of(context).colorScheme.secondary, - ), - unselectedIconTheme: IconTheme.of(context).copyWith( - color: Theme.of(context).colorScheme.primary, - ), onDestinationSelected: _onDestinationSelected, ) ), @@ -487,16 +480,9 @@ class _LibraryViewState extends State with FileManagerLogic AdaptiveScaffold.toRailDestination(_)).toList(), - backgroundColor: Theme.of(context).colorScheme.background, selectedIndex: currentLibrary != null ? libraryEntries.indexOf(currentLibrary!) : null, selectedLabelTextStyle: Theme.of(context).textTheme.bodyLarge, unSelectedLabelTextStyle: Theme.of(context).textTheme.bodyLarge, - selectedIconTheme: IconTheme.of(context).copyWith( - color: Theme.of(context).colorScheme.secondary, - ), - unselectedIconTheme: IconTheme.of(context).copyWith( - color: Theme.of(context).colorScheme.primary, - ), onDestinationSelected: _onDestinationSelected, extended: true, ) diff --git a/pubspec.lock b/pubspec.lock index 6ade0ee..686676e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: "direct main" description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" crypto: dependency: transitive description: @@ -217,24 +217,16 @@ packages: dependency: "direct main" description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" + version: "0.18.1" libtokyo: dependency: "direct main" description: path: "packages/libtokyo" - ref: "2713b388d1e80a24fd440227845a22e64e06d71e" - resolved-ref: "2713b388d1e80a24fd440227845a22e64e06d71e" + ref: bc5d988f32b67a9f91ff34248f69c45cfb4efcca + resolved-ref: bc5d988f32b67a9f91ff34248f69c45cfb4efcca url: "https://github.com/ExpidusOS/libtokyo.git" source: git version: "0.1.0" @@ -242,8 +234,8 @@ packages: dependency: "direct main" description: path: "packages/libtokyo_flutter" - ref: "2713b388d1e80a24fd440227845a22e64e06d71e" - resolved-ref: "2713b388d1e80a24fd440227845a22e64e06d71e" + ref: bc5d988f32b67a9f91ff34248f69c45cfb4efcca + resolved-ref: bc5d988f32b67a9f91ff34248f69c45cfb4efcca url: "https://github.com/ExpidusOS/libtokyo.git" source: git version: "0.1.0" @@ -267,18 +259,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" material_theme_builder: dependency: transitive description: @@ -560,10 +552,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -600,10 +592,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" typed_data: dependency: transitive description: @@ -708,6 +700,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" win32: dependency: "direct main" description: @@ -741,5 +741,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 00191a3..779c502 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,12 +18,12 @@ dependencies: libtokyo: git: url: https://github.com/ExpidusOS/libtokyo.git - ref: 2713b388d1e80a24fd440227845a22e64e06d71e + ref: bc5d988f32b67a9f91ff34248f69c45cfb4efcca path: packages/libtokyo libtokyo_flutter: git: url: https://github.com/ExpidusOS/libtokyo.git - ref: 2713b388d1e80a24fd440227845a22e64e06d71e + ref: bc5d988f32b67a9f91ff34248f69c45cfb4efcca path: packages/libtokyo_flutter path_provider: ^2.0.15 url_launcher: ^6.1.11 @@ -53,7 +53,7 @@ dependency_overrides: libtokyo: git: url: https://github.com/ExpidusOS/libtokyo.git - ref: 2713b388d1e80a24fd440227845a22e64e06d71e + ref: bc5d988f32b67a9f91ff34248f69c45cfb4efcca path: packages/libtokyo dev_dependencies: