From b9c4a377984cae84c3ac1368e26ea360ec0ec7c7 Mon Sep 17 00:00:00 2001 From: Lukas Klingsbo Date: Wed, 23 Oct 2024 11:47:44 +0200 Subject: [PATCH] fix: Use generic Riverpod `Ref` in providers --- packages/app_center/lib/deb/deb_providers.dart | 3 ++- packages/app_center/lib/manage/updates_model.dart | 4 ++-- .../app_center/lib/providers/error_stream_provider.dart | 3 ++- packages/app_center/pubspec.yaml | 6 +++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/app_center/lib/deb/deb_providers.dart b/packages/app_center/lib/deb/deb_providers.dart index 2dacdc9cb..ad21b12a6 100644 --- a/packages/app_center/lib/deb/deb_providers.dart +++ b/packages/app_center/lib/deb/deb_providers.dart @@ -1,11 +1,12 @@ import 'package:app_center/packagekit/packagekit.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:ubuntu_service/ubuntu_service.dart'; part 'deb_providers.g.dart'; @riverpod -Stream transaction(TransactionRef ref, int id) { +Stream transaction(Ref ref, int id) { final transaction = getService().getTransaction(id); if (transaction == null) return const Stream.empty(); diff --git a/packages/app_center/lib/manage/updates_model.dart b/packages/app_center/lib/manage/updates_model.dart index a8bfc033e..943f28485 100644 --- a/packages/app_center/lib/manage/updates_model.dart +++ b/packages/app_center/lib/manage/updates_model.dart @@ -38,7 +38,7 @@ final currentlyRefreshAllSnapsProvider = StateProvider>((_) => []); final isSilentlyCheckingUpdatesProvider = StateProvider((_) => false); @Riverpod(keepAlive: true) -bool hasUpdate(HasUpdateRef ref, String snapName) { +bool hasUpdate(Ref ref, String snapName) { final updatesModel = ref.watch(updatesModelProvider); return updatesModel.whenOrNull( data: (updatesData) => updatesData.snaps.any((s) => s.name == snapName), @@ -49,7 +49,7 @@ bool hasUpdate(HasUpdateRef ref, String snapName) { /// Used to see which snaps that are installed but need to be restarted to be /// refreshed (or be forced to restart after the proceedTime). @riverpod -Future> refreshInhibitSnaps(RefreshInhibitSnapsRef ref) async { +Future> refreshInhibitSnaps(Ref ref) async { final snapd = getService(); return snapd.getSnaps(filter: SnapsFilter.refreshInhibited); } diff --git a/packages/app_center/lib/providers/error_stream_provider.dart b/packages/app_center/lib/providers/error_stream_provider.dart index 62a1528ac..3b8eda1f8 100644 --- a/packages/app_center/lib/providers/error_stream_provider.dart +++ b/packages/app_center/lib/providers/error_stream_provider.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:ubuntu_service/ubuntu_service.dart'; @@ -11,7 +12,7 @@ final errorStreamProvider = StreamProvider( ); @Riverpod(keepAlive: true) -ErrorStreamController errorStreamController(ErrorStreamControllerRef ref) { +ErrorStreamController errorStreamController(Ref ref) { return getService(); } diff --git a/packages/app_center/pubspec.yaml b/packages/app_center/pubspec.yaml index 6d0f48a06..68330a2f8 100644 --- a/packages/app_center/pubspec.yaml +++ b/packages/app_center/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: flutter_localizations: sdk: flutter flutter_markdown: ^0.7.3+1 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 flutter_svg: ^2.0.10+1 freezed_annotation: ^2.4.4 github: ^9.24.0 @@ -40,7 +40,7 @@ dependencies: package_info_plus: ^8.0.2 packagekit: ^0.2.6 path: ^1.9.0 - riverpod_annotation: ^2.3.5 + riverpod_annotation: ^2.6.1 shimmer: ^3.0.0 snapcraft_launcher: ^0.1.0 snapd: ^0.6.4 @@ -67,7 +67,7 @@ dev_dependencies: sdk: flutter json_serializable: ^6.8.0 mockito: ^5.4.4 - riverpod_generator: ^2.4.3 + riverpod_generator: ^2.6.1 ubuntu_lints: ^0.4.1 flutter: