fix: update several dependencies

WFCD · Oct 26, 2023 · 13ee282 · 13ee282
1 parent 3111089
commit 13ee282
Show file tree

Hide file tree

Showing 24 changed files with 259 additions and 237 deletions.
diff --git a/lib/codex/views/codex_search_view.dart b/lib/codex/views/codex_search_view.dart
@@ -17,7 +17,6 @@ class CodexSearchView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return TraceableWidget(
-      traceTitle: 'Codex',
       child: BlocProvider(
         create: (_) =>
             SearchBloc(RepositoryProvider.of<WorldstateRepository>(context)),

diff --git a/lib/synthtargets/views/targets.dart b/lib/synthtargets/views/targets.dart
@@ -11,7 +11,6 @@ class SynthTargetsView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return TraceableWidget(
-      traceTitle: 'SynthTargets',
       child: BlocProvider(
         create: (_) => SynthtargetsCubit(
           RepositoryProvider.of<WorldstateRepository>(context),

diff --git a/lib/worldstate/views/bounties.dart b/lib/worldstate/views/bounties.dart
@@ -20,7 +20,6 @@ class BountiesPage extends StatelessWidget {
         syndicateStringToEnum(syndicate.id ?? 'navis').secondryColor;
 
     return TraceableWidget(
-      traceTitle: 'Syndicate Bounties',
       child: Scaffold(
         appBar: AppBar(
           title: Text(syndicate.syndicate.replaceFirst('Syndicate', '')),

diff --git a/lib/worldstate/views/event.dart b/lib/worldstate/views/event.dart
@@ -27,7 +27,6 @@ class EventInformation extends StatelessWidget {
     final event = ModalRoute.of(context)?.settings.arguments as WorldEvent;
 
     return TraceableWidget(
-      traceTitle: 'WorldEvents',
       child: Scaffold(
         body: CustomScrollView(
           slivers: <Widget>[

diff --git a/lib/worldstate/views/invasions.dart b/lib/worldstate/views/invasions.dart
@@ -17,7 +17,6 @@ class InvasionsPage extends StatelessWidget {
         state is SolState ? state.worldstate.invasions : <Invasion>[];
 
     return TraceableWidget(
-      traceTitle: 'Invasions',
       child: ViewLoading(
         isLoading: state is! SolState,
         child: state is! SolState

diff --git a/lib/worldstate/views/nightwaves.dart b/lib/worldstate/views/nightwaves.dart
@@ -13,7 +13,6 @@ class NightwavesPage extends StatelessWidget {
     final nightwave = ModalRoute.of(context)?.settings.arguments as Nightwave?;
 
     return TraceableWidget(
-      traceTitle: 'Nightwaves',
       child: Scaffold(
         appBar: AppBar(
           title: const Text('Nightwave'),

diff --git a/lib/worldstate/views/orbiter_news.dart b/lib/worldstate/views/orbiter_news.dart
@@ -15,7 +15,6 @@ class OrbiterNewsPage extends StatelessWidget {
     final orbitNews = state is SolState ? state.worldstate.news : <News>[];
 
     return TraceableWidget(
-      traceTitle: 'Orbiter News',
       child: ViewLoading(
         isLoading: state is! SolState,
         child: RefreshIndicator(

diff --git a/lib/worldstate/views/syndicates.dart b/lib/worldstate/views/syndicates.dart
@@ -44,7 +44,6 @@ class SyndicatePage extends StatelessWidget {
         final nightwave = state is SolState ? state.worldstate.nightwave : null;
 
         return TraceableWidget(
-          traceTitle: 'Syndicates',
           child: ViewLoading(
             isLoading: state is! SolState,
             child: state is! SolState

diff --git a/lib/worldstate/views/timers.dart b/lib/worldstate/views/timers.dart
@@ -12,7 +12,6 @@ class Timers extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return const TraceableWidget(
-      traceTitle: 'Timers',
       child: _MobileTimers(),
     );
   }

diff --git a/lib/worldstate/views/trader_inventory.dart b/lib/worldstate/views/trader_inventory.dart
@@ -15,7 +15,6 @@ class BaroInventory extends StatelessWidget {
         ModalRoute.of(context)?.settings.arguments as List<TraderItem>?;
 
     return TraceableWidget(
-      traceTitle: "Baro's Inventory",
       child: Scaffold(
         appBar: AppBar(title: Text(context.l10n.baroInventory)),
         body: InventoryDataTable(inventory: inventory ?? []),

diff --git a/packages/market_repository/lib/src/market_repository.dart b/packages/market_repository/lib/src/market_repository.dart
@@ -42,9 +42,12 @@ class MarketRepository {
 
       try {
         final orders = await compute(MarketComputeRunners.searchOrders, req);
-        cache.cacheOrders(itemName, orders.selling);
+        final onSale =
+            orders.where((o) => o.orderType == OrderType.sell).toList();
 
-        return orders.selling;
+        cache.cacheOrders(itemName, onSale);
+
+        return onSale;
       } on SocketException {
         final cached = cache.cachedOrders;
 
@@ -110,7 +113,7 @@ class MarketComputeRunners {
   const MarketComputeRunners._();
 
   /// Retrives a list of both sell and buy orders for an item.
-  static Future<OrderSet<OrderRow>> searchOrders(MarketSearchRequest request) {
+  static Future<List<OrderRow>> searchOrders(MarketSearchRequest request) {
     return compute(_searchOrders, request);
   }
 
@@ -119,24 +122,23 @@ class MarketComputeRunners {
     return compute(_getMarketItems, request);
   }
 
-  static MarketClient _client(MarketPlatform platform, String languageCode) {
+  static ItemsEndpoint _client(MarketPlatform platform, String languageCode) {
     final client = MarketHttpClient(platform: platform, language: languageCode);
-    return MarketClient(client: client);
+    return ItemsEndpoint(client);
   }
 
-  static Future<OrderSet<OrderRow>> _searchOrders(
-      MarketSearchRequest req) async {
+  static Future<List<OrderRow>> _searchOrders(MarketSearchRequest req) async {
     final api = _client(req.$2.marketPlatform, req.$3);
 
     final items = req.$4;
     final itemUrl = items.firstWhere((e) => e.itemName.contains(req.$1));
 
-    return api.items.searchOrders(itemUrl.urlName);
+    return (await api.getItemOrders(itemUrl.urlName)).$1;
   }
 
   static Future<List<ItemShort>> _getMarketItems(MarketItemRequest req) {
     final api = _client(req.$1.marketPlatform, req.$2);
-    return api.items.getMarketItems();
+    return api.getItems();
   }
 }
 // coverage: ignore-end
diff --git a/packages/market_repository/pubspec.lock b/packages/market_repository/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "1a5e13736d59235ce0139621b4bbe29bc89839e202409081bc667eb3cd20674c"
+      sha256: "2d8e8e123ca3675625917f535fcc0d3a50092eef44334168f9b18adc050d4c6e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.6"
   async:
     dependency: transitive
     description:
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: device_info_plus
-      sha256: f52ab3b76b36ede4d135aab80194df8925b553686f0fa12226b4e2d658e45903
+      sha256: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.2"
+    version: "9.0.3"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: firebase_core
-      sha256: c78132175edda4bc532a71e01a32964e4b4fcf53de7853a422d96dac3725f389
+      sha256: "675c209c94a1817649137cbd113fc4c9ae85e48d03dd578629abbec6d8a4d93d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.15.1"
+    version: "2.16.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -125,34 +125,34 @@ packages:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: "4cf4d2161530332ddc3c562f19823fb897ff37a9a774090d28df99f47370e973"
+      sha256: e8c408923cd3a25bd342c576a114f2126769cd1a57106a4edeaa67ea4a84e962
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.8.0"
   firebase_messaging:
     dependency: transitive
     description:
       name: firebase_messaging
-      sha256: db4a38be54fd84849c21be1ae1b44f0d4637eec1069bf5c49ea95e81f582bbc0
+      sha256: "4544524c22de3ffdc7e0ffaeeba212a04d09e76d0549ae6f42ce285d9d8f0513"
       url: "https://pub.dev"
     source: hosted
-    version: "14.6.6"
+    version: "14.6.8"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: "164119eed47ff19284e28bea9165a03da110c56ea09dd996622cfccad14d0efd"
+      sha256: a6e1fae8242a14d5d8f5ab1cf94693511f06bab49ff1d46e3d83c0af3c4becb8
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.5"
+    version: "4.5.7"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: "6196d20731733834d7afb175c4345be57ddbd5daebca83cd52a430d62c2279fe"
+      sha256: a9fe837dc2dcdd3e32e6109a6b0ce62592d7a44cb8f69cb5b73190865c5aa28e
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.5"
+    version: "3.5.7"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -168,14 +168,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  fresh:
-    dependency: transitive
-    description:
-      name: fresh
-      sha256: d0adae5799932b7aed7f17bed05862f994e4f592e9de9f8a9a513377b773fe50
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.2"
   hive:
     dependency: "direct main"
     description:
@@ -188,10 +180,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.6"
+    version: "1.1.0"
   http_parser:
     dependency: transitive
     description:
@@ -228,11 +220,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "2417521468a17f0dc3cf7ed5b2d4265bff15efaf"
-      resolved-ref: "2417521468a17f0dc3cf7ed5b2d4265bff15efaf"
+      ref: "v4.0.2"
+      resolved-ref: "57e94ab37220eea8b485a702daff809304b5eae2"
       url: "https://github.com/SlayerOrnstein/market_client.git"
     source: git
-    version: "2.0.2"
+    version: "4.0.2"
   matcher:
     dependency: transitive
     description:
@@ -253,10 +245,10 @@ packages:
     dependency: transitive
     description:
       name: matomo_tracker
-      sha256: a96ef1e0c03cd8b73db31a50352bbde31a7718333af85afbe36e8ae176cc23a4
+      sha256: de5c08e80b566f8d1f0edf47f5704fe855fbef52377acb2796d28c2a3e36ea41
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "4.1.1"
   meta:
     dependency: transitive
     description:
@@ -276,10 +268,10 @@ packages:
     dependency: transitive
     description:
       name: package_info_plus
-      sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745"
+      sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "4.1.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -340,10 +332,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences
-      sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1"
+      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.2"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -405,6 +397,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   stack_trace:
     dependency: transitive
     description:
@@ -461,13 +461,13 @@ packages:
     source: path
     version: "1.0.0+1"
   uuid:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "4.1.0"
   vector_math:
     dependency: transitive
     description:
@@ -480,11 +480,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "v1.6.4"
-      resolved-ref: bac137e498c6c51e897b1cef8e837bcd615a955c
+      ref: "v1.7.7"
+      resolved-ref: "3a1aa1d2b403ed2487836965647303aedcb421c4"
       url: "https://github.com/SlayerOrnstein/warframestat_client.git"
     source: git
-    version: "1.6.4"
+    version: "1.7.7"
   web:
     dependency: transitive
     description:
@@ -501,6 +501,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.4"
+  win32_registry:
+    dependency: transitive
+    description:
+      name: win32_registry
+      sha256: "1c52f994bdccb77103a6231ad4ea331a244dbcef5d1f37d8462f713143b0bfae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -511,4 +519,4 @@ packages:
     version: "1.0.2"
 sdks:
   dart: ">=3.1.0-185.0.dev <4.0.0"
-  flutter: ">=3.3.0"
+  flutter: ">=3.7.0"
diff --git a/packages/market_repository/pubspec.yaml b/packages/market_repository/pubspec.yaml
@@ -13,13 +13,16 @@ dependencies:
   market_client:
     git:
       url: https://github.com/SlayerOrnstein/market_client.git
-      ref: 2417521468a17f0dc3cf7ed5b2d4265bff15efaf
+      ref: v4.0.2
   user_settings:
     path: ../user_settings
   warframestat_client:
     git:
       url: https://github.com/SlayerOrnstein/warframestat_client.git
-      ref: v1.6.4
+      ref: v1.7.7
+
+dependency_overrides:
+  uuid: 4.1.0
 
 dev_dependencies:
   flutter_test: