From 713dfce550666daba96af889307eb00819e30de5 Mon Sep 17 00:00:00 2001 From: Jagandeep Brar Date: Sun, 1 May 2022 16:43:12 -0400 Subject: [PATCH] chore(state): export Riverpod over Provider for cleaner transition [skip ci] --- lib/core.dart | 12 +++++++++++- lib/main.dart | 1 - lib/modules/dashboard/core/api/data/radarr.dart | 1 + lib/modules/dashboard/core/api/data/sonarr.dart | 1 + .../dashboard/routes/dashboard/pages/calendar.dart | 1 + .../routes/dashboard/widgets/calendar_view.dart | 1 + .../routes/dashboard/widgets/schedule_view.dart | 2 +- .../routes/dashboard/widgets/switch_view_action.dart | 1 + lib/vendor.dart | 5 ++--- 9 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/core.dart b/lib/core.dart index 1d3450d5..ba793fb5 100644 --- a/lib/core.dart +++ b/lib/core.dart @@ -1,4 +1,3 @@ -export 'vendor.dart'; export 'core/assets.dart'; export 'core/cache.dart'; export 'core/database.dart'; @@ -15,3 +14,14 @@ export 'core/state.dart'; export 'core/system.dart'; export 'core/ui.dart'; export 'core/utilities.dart'; + +export 'vendor.dart' + hide + StreamProvider, + Provider, + FutureProvider, + ChangeNotifierProvider, + Consumer, + Locator, + Create; +export 'package:provider/provider.dart'; diff --git a/lib/main.dart b/lib/main.dart index aa1db766..d6b25cd0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,4 @@ import 'package:device_preview/device_preview.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/modules/dashboard/core/api/data/radarr.dart b/lib/modules/dashboard/core/api/data/radarr.dart index c715de1b..2308a0e6 100644 --- a/lib/modules/dashboard/core/api/data/radarr.dart +++ b/lib/modules/dashboard/core/api/data/radarr.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import '../../../../../core/system/profile.dart'; import '../../../../../core/extensions.dart'; diff --git a/lib/modules/dashboard/core/api/data/sonarr.dart b/lib/modules/dashboard/core/api/data/sonarr.dart index a3de45d1..5343c5f3 100644 --- a/lib/modules/dashboard/core/api/data/sonarr.dart +++ b/lib/modules/dashboard/core/api/data/sonarr.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import '../../../../../core/database/luna_database.dart'; import '../../../../../core/system/profile.dart'; diff --git a/lib/modules/dashboard/routes/dashboard/pages/calendar.dart b/lib/modules/dashboard/routes/dashboard/pages/calendar.dart index c6a3cb28..3881e5a6 100644 --- a/lib/modules/dashboard/routes/dashboard/pages/calendar.dart +++ b/lib/modules/dashboard/routes/dashboard/pages/calendar.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import '../../../../../core/mixins/load_callback.dart'; import '../../../../../core/extensions.dart'; diff --git a/lib/modules/dashboard/routes/dashboard/widgets/calendar_view.dart b/lib/modules/dashboard/routes/dashboard/widgets/calendar_view.dart index 67f73db1..97b7c741 100644 --- a/lib/modules/dashboard/routes/dashboard/widgets/calendar_view.dart +++ b/lib/modules/dashboard/routes/dashboard/widgets/calendar_view.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:provider/provider.dart'; import '../../../../../core/database/database.dart'; import '../../../../../core/extensions.dart'; diff --git a/lib/modules/dashboard/routes/dashboard/widgets/schedule_view.dart b/lib/modules/dashboard/routes/dashboard/widgets/schedule_view.dart index 2daf774d..011e379b 100644 --- a/lib/modules/dashboard/routes/dashboard/widgets/schedule_view.dart +++ b/lib/modules/dashboard/routes/dashboard/widgets/schedule_view.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import '../../../../../core/extensions.dart'; import '../../../../../core/ui.dart'; -import '../../../../../vendor.dart'; import '../../../core/api/data/abstract.dart'; import '../../../core/database.dart'; import '../../../core/state.dart'; diff --git a/lib/modules/dashboard/routes/dashboard/widgets/switch_view_action.dart b/lib/modules/dashboard/routes/dashboard/widgets/switch_view_action.dart index 37d52fe5..ce4dfda9 100644 --- a/lib/modules/dashboard/routes/dashboard/widgets/switch_view_action.dart +++ b/lib/modules/dashboard/routes/dashboard/widgets/switch_view_action.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import '../../../../../core/mixins/load_callback.dart'; import '../../../../../core/ui.dart'; diff --git a/lib/vendor.dart b/lib/vendor.dart index 4830d4ca..de69e6e7 100644 --- a/lib/vendor.dart +++ b/lib/vendor.dart @@ -9,6 +9,8 @@ export 'package:easy_localization/easy_localization.dart'; export 'package:expandable/expandable.dart'; export 'package:fading_edge_scrollview/fading_edge_scrollview.dart'; export 'package:flash/flash.dart'; +export 'package:fluro/fluro.dart'; +export 'package:flutter_riverpod/flutter_riverpod.dart'; export 'package:go_router/go_router.dart'; export 'package:hive/hive.dart'; export 'package:hive_flutter/hive_flutter.dart'; @@ -24,6 +26,3 @@ export 'package:table_calendar/table_calendar.dart'; export 'package:transparent_image/transparent_image.dart'; export 'package:tuple/tuple.dart'; export 'package:xml/xml.dart'; -// Deprecated - Should eventually be removed -export 'package:fluro/fluro.dart'; -export 'package:provider/provider.dart';