Update riverpod to 1.0

pebble-dev · Jan 10, 2024 · 3be26b8 · 3be26b8
1 parent d74c772
commit 3be26b8
Show file tree

Hide file tree

Showing 54 changed files with 190 additions and 195 deletions.
diff --git a/lib/background/actions/calendar_action_handler.dart b/lib/background/actions/calendar_action_handler.dart
@@ -210,7 +210,7 @@ class CalendarActionHandler implements ActionHandler {
   }
 }
 
-final calendarActionHandlerProvider = Provider((ref) =>
+final calendarActionHandlerProvider = Provider<CalendarActionHandler>((ref) =>
     CalendarActionHandler(
       ref.read(timelinePinDaoProvider),
       ref.read(calendarSyncerProvider),

diff --git a/lib/background/main_background.dart b/lib/background/main_background.dart
@@ -52,10 +52,9 @@ class BackgroundReceiver implements TimelineCallbacks {
 
     masterActionHandler = container.read(masterActionHandlerProvider);
 
-    connectionSubscription = container.listen(
-      connectionStateProvider,
-      mayHaveChanged: (sub) {
-        final currentConnectedWatch = sub.read().currentConnectedWatch;
+    connectionSubscription = container.listen<WatchConnectionState>(
+      connectionStateProvider, (previous, sub) {
+        final currentConnectedWatch = sub.currentConnectedWatch;
         if (isConnectedToWatch()! && currentConnectedWatch!.name!.isNotEmpty) {
           onWatchConnected(currentConnectedWatch);
         }

diff --git a/lib/background/modules/apps_background.dart b/lib/background/modules/apps_background.dart
@@ -27,15 +27,15 @@ class AppsBackground implements BackgroundAppInstallCallbacks {
   AppsBackground(this.container);
 
   void init() async {
-    watchAppsSyncer = container.listen(watchAppSyncerProvider).read();
-    appDao = container.listen(appDaoProvider).read();
-    appLifecycleManager = container.listen(appLifecycleManagerProvider).read();
-    preferences = container.listen(preferencesProvider.future).read();
+    watchAppsSyncer = container.listen<WatchAppsSyncer>(watchAppSyncerProvider, (previous, value) {}).read();
+    appDao = container.listen<AppDao>(appDaoProvider, (previous, value) {}).read();
+    appLifecycleManager = container.listen<AppLifecycleManager>(appLifecycleManagerProvider, (previous, value) {}).read();
+    preferences = container.listen<Future<Preferences>>(preferencesProvider.future, (previous, value) {}).read();
 
     BackgroundAppInstallCallbacks.setup(this);
 
-    connectionSubscription = container.listen(
-      connectionStateProvider,
+    connectionSubscription = container.listen<WatchConnectionState>(
+      connectionStateProvider, (previous, value) {},
     );
   }
 

diff --git a/lib/background/modules/calendar_background.dart b/lib/background/modules/calendar_background.dart
@@ -21,14 +21,14 @@ class CalendarBackground implements CalendarCallbacks {
   CalendarBackground(this.container);
 
   void init() async {
-    calendarSyncer = container.listen(calendarSyncerProvider).read();
-    watchTimelineSyncer = container.listen(watchTimelineSyncerProvider).read();
-    timelinePinDao = container.listen(timelinePinDaoProvider).read();
+    calendarSyncer = container.listen<CalendarSyncer>(calendarSyncerProvider, (previous, value) {}).read();
+    watchTimelineSyncer = container.listen<WatchTimelineSyncer>(watchTimelineSyncerProvider, (previous, value) {}).read();
+    timelinePinDao = container.listen<TimelinePinDao>(timelinePinDaoProvider, (previous, value) {}).read();
 
     CalendarCallbacks.setup(this);
 
-    connectionSubscription = container.listen(
-      connectionStateProvider,
+    connectionSubscription = container.listen<WatchConnectionState>(
+      connectionStateProvider, (previous, value) {},
     );
   }
 

diff --git a/lib/background/modules/notifications_background.dart b/lib/background/modules/notifications_background.dart
@@ -14,8 +14,8 @@ class NotificationsBackground implements NotificationListening {
   NotificationsBackground(this.container);
 
   void init() async {
-    notificationManager = container.listen(notificationManagerProvider).read();
-    _notificationChannelDao = container.listen(notifChannelDaoProvider).read();
+    notificationManager = container.listen<NotificationManager>(notificationManagerProvider, (previous, value) {}).read();
+    _notificationChannelDao = container.listen<NotificationChannelDao>(notifChannelDaoProvider, (previous, value) {}).read();
 
     NotificationListening.setup(this);
   }

diff --git a/lib/background/notification/notification_manager.dart b/lib/background/notification/notification_manager.dart
@@ -232,7 +232,7 @@ class NotificationManager {
   }
 }
 
-final notificationManagerProvider = Provider((ref) => NotificationManager(ref.read(activeNotifDaoProvider), ref.read(notifChannelDaoProvider), ref.read(sharedPreferencesProvider)));
+final notificationManagerProvider = Provider<NotificationManager>((ref) => NotificationManager(ref.read(activeNotifDaoProvider), ref.read(notifChannelDaoProvider), ref.read(sharedPreferencesProvider)));
 
 final disabledActionPackagesKey = "disabledActionPackages";
 

diff --git a/lib/domain/api/appstore/appstore.dart b/lib/domain/api/appstore/appstore.dart
@@ -6,7 +6,7 @@ import 'package:cobble/infrastructure/datasources/secure_storage.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:cobble/infrastructure/datasources/web_services/appstore.dart';
 
-final appstoreServiceProvider = FutureProvider((ref) async {
+final appstoreServiceProvider = FutureProvider<AppstoreService>((ref) async {
   final boot = await (await ref.watch(bootServiceProvider.future)).config;
   final token = await (await ref.watch(tokenProvider.last));
   final oauth = await ref.watch(oauthClientProvider.future);

diff --git a/lib/domain/api/auth/auth.dart b/lib/domain/api/auth/auth.dart
@@ -1,12 +1,13 @@
 import 'package:cobble/domain/api/auth/oauth.dart';
+import 'package:cobble/domain/api/auth/user.dart';
 import 'package:cobble/domain/api/boot/boot.dart';
 import 'package:cobble/domain/api/no_token_exception.dart';
 import 'package:cobble/infrastructure/datasources/preferences.dart';
 import 'package:cobble/infrastructure/datasources/secure_storage.dart';
 import 'package:cobble/infrastructure/datasources/web_services/auth.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-final authServiceProvider = FutureProvider((ref) async {
+final authServiceProvider = FutureProvider<AuthService>((ref) async {
   final boot = await (await ref.watch(bootServiceProvider.future)).config;
   final token = await (await ref.watch(tokenProvider.last));
   final oauth = await ref.watch(oauthClientProvider.future);
@@ -17,11 +18,11 @@ final authServiceProvider = FutureProvider((ref) async {
   return AuthService(boot.auth.base, prefs, oauth, token);
 });
 
-final authUserProvider = FutureProvider((ref) async {
+final authUserProvider = FutureProvider<User?>((ref) async {
   try {
     final auth = await ref.watch(authServiceProvider.future);
     return await auth.user;
   } on NoTokenException {
     return null;
   }
-});
+});
diff --git a/lib/domain/api/auth/oauth.dart b/lib/domain/api/auth/oauth.dart
@@ -186,7 +186,7 @@ class OAuthException implements Exception {
   String toString() => "OAuthException: $errorCode";
 }
 
-final oauthClientProvider = FutureProvider((ref) async {
+final oauthClientProvider = FutureProvider<OAuthClient>((ref) async {
   final boot = await (await ref.watch(bootServiceProvider.future)).config;
   final prefs = await ref.watch(preferencesProvider.future);
   final secureStorage = ref.watch(secureStorageProvider);

diff --git a/lib/domain/api/boot/boot.dart b/lib/domain/api/boot/boot.dart
@@ -2,6 +2,6 @@ import 'package:cobble/infrastructure/datasources/preferences.dart';
 import 'package:cobble/infrastructure/datasources/web_services/boot.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-final bootServiceProvider = FutureProvider(
+final bootServiceProvider = FutureProvider<BootService>(
   (ref) async => BootService(await ref.watch(bootUrlProvider.last) ?? ""),
 );
diff --git a/lib/domain/apps/app_logs.dart b/lib/domain/apps/app_logs.dart
@@ -27,7 +27,7 @@ class AppLogReceiver extends StateNotifier<List<AppLogEntry>>
   }
 }
 
-final recievedLogsProvider = StateNotifierProvider.autoDispose((ref) {
+final recievedLogsProvider = StateNotifierProvider.autoDispose<AppLogReceiver, dynamic>((ref) {
   final receiver = AppLogReceiver();
 
   ref.onDispose(() {

diff --git a/lib/domain/calendar/device_calendar_plugin_provider.dart b/lib/domain/calendar/device_calendar_plugin_provider.dart
@@ -2,6 +2,6 @@ import 'package:cobble/infrastructure/pigeons/pigeons.g.dart';
 import 'package:device_calendar/device_calendar.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-final deviceCalendarPluginProvider = Provider((ref) => DeviceCalendarPlugin());
+final deviceCalendarPluginProvider = Provider<DeviceCalendarPlugin>((ref) => DeviceCalendarPlugin());
 
-final calendarControlProvider = Provider((ref) => CalendarControl());
+final calendarControlProvider = Provider<CalendarControl>((ref) => CalendarControl());
diff --git a/lib/domain/connection/raw_incoming_packets_provider.dart b/lib/domain/connection/raw_incoming_packets_provider.dart
@@ -36,5 +36,5 @@ class RawIncomingPacketsProvider implements RawIncomingPacketsCallbacks {
   Stream<Uint8List> get stream => _streamController.stream;
 }
 
-final Provider<Stream<Uint8List>> rawPacketStreamProvider = Provider((ref) => RawIncomingPacketsProvider().stream);
+final Provider<Stream<Uint8List>> rawPacketStreamProvider = Provider<Stream<Uint8List>>((ref) => RawIncomingPacketsProvider().stream);
 
diff --git a/lib/domain/db/dao/active_notification_dao.dart b/lib/domain/db/dao/active_notification_dao.dart
@@ -67,7 +67,7 @@ class ActiveNotificationDao {
   }
 }
 
-final AutoDisposeProvider<ActiveNotificationDao> activeNotifDaoProvider = Provider.autoDispose((ref) {
+final AutoDisposeProvider<ActiveNotificationDao> activeNotifDaoProvider = Provider.autoDispose<ActiveNotificationDao>((ref) {
   final dbFuture = ref.watch(databaseProvider.future);
   return ActiveNotificationDao(dbFuture);
 });
diff --git a/lib/domain/db/dao/app_dao.dart b/lib/domain/db/dao/app_dao.dart
@@ -213,7 +213,7 @@ class AppDao {
   }
 }
 
-final AutoDisposeProvider<AppDao> appDaoProvider = Provider.autoDispose((ref) {
+final AutoDisposeProvider<AppDao> appDaoProvider = Provider.autoDispose<AppDao>((ref) {
   final dbFuture = ref.watch(databaseProvider.future);
   return AppDao(dbFuture);
 });

diff --git a/lib/domain/db/dao/locker_cache_dao.dart b/lib/domain/db/dao/locker_cache_dao.dart
@@ -54,7 +54,7 @@ class LockerCacheDao {
   }
 }
 
-final AutoDisposeProvider<LockerCacheDao> lockerCacheDaoProvider = Provider.autoDispose((ref) {
+final AutoDisposeProvider<LockerCacheDao> lockerCacheDaoProvider = Provider.autoDispose<LockerCacheDao>((ref) {
   final dbFuture = ref.watch(databaseProvider.future);
   return LockerCacheDao(dbFuture);
 });

diff --git a/lib/domain/db/dao/notification_channel_dao.dart b/lib/domain/db/dao/notification_channel_dao.dart
@@ -61,7 +61,7 @@ class NotificationChannelDao {
   }
 }
 
-final AutoDisposeProvider<NotificationChannelDao> notifChannelDaoProvider = Provider.autoDispose((ref) {
+final AutoDisposeProvider<NotificationChannelDao> notifChannelDaoProvider = Provider.autoDispose<NotificationChannelDao>((ref) {
   final dbFuture = ref.watch(databaseProvider!.future);
   return NotificationChannelDao(dbFuture);
 });
diff --git a/lib/domain/db/dao/timeline_pin_dao.dart b/lib/domain/db/dao/timeline_pin_dao.dart
@@ -136,7 +136,7 @@ class TimelinePinDao {
 }
 
 final AutoDisposeProvider<TimelinePinDao> timelinePinDaoProvider =
-    Provider.autoDispose((ref) {
+    Provider.autoDispose<TimelinePinDao>((ref) {
   final dbFuture = ref.watch(databaseProvider.future);
   return TimelinePinDao(dbFuture);
 });

diff --git a/lib/domain/package_details.dart b/lib/domain/package_details.dart
@@ -2,4 +2,4 @@ import 'package:cobble/infrastructure/pigeons/pigeons.g.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 final packageDetailsProvider =
-  Provider((ref) => PackageDetails());
+  Provider<PackageDetails>((ref) => PackageDetails());
diff --git a/lib/domain/permissions.dart b/lib/domain/permissions.dart
@@ -1,5 +1,5 @@
 import 'package:cobble/infrastructure/pigeons/pigeons.g.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-final permissionControlProvider = Provider((ref) => PermissionControl());
-final permissionCheckProvider = Provider((ref) => PermissionCheck());
+final permissionControlProvider = Provider<PermissionControl>((ref) => PermissionControl());
+final permissionCheckProvider = Provider<PermissionCheck>((ref) => PermissionCheck());
diff --git a/lib/domain/preferences.dart b/lib/domain/preferences.dart
@@ -2,4 +2,4 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 final sharedPreferencesProvider =
-    Provider((ref) => SharedPreferences.getInstance());
+    Provider<Future<SharedPreferences>>((ref) => SharedPreferences.getInstance());
diff --git a/lib/domain/secure_storage.dart b/lib/domain/secure_storage.dart
@@ -3,4 +3,4 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 const _androidOptions = AndroidOptions(encryptedSharedPreferences: true);
 final flutterSecureStorageProvider =
-  Provider((ref) => const FlutterSecureStorage(aOptions: _androidOptions));
+  Provider<FlutterSecureStorage>((ref) => const FlutterSecureStorage(aOptions: _androidOptions));
diff --git a/lib/domain/timeline/watch_apps_syncer.dart b/lib/domain/timeline/watch_apps_syncer.dart
@@ -160,4 +160,4 @@ Provider.autoDispose<WatchAppsSyncer>((ref) {
   );
 });
 
-final appInstallControlProvider = Provider((ref) => AppInstallControl());
+final appInstallControlProvider = Provider<AppInstallControl>((ref) => AppInstallControl());
diff --git a/lib/domain/timeline/watch_timeline_syncer.dart b/lib/domain/timeline/watch_timeline_syncer.dart
@@ -168,4 +168,4 @@ final AutoDisposeProvider<WatchTimelineSyncer> watchTimelineSyncerProvider =
   );
 });
 
-final timelineSyncControlProvider = Provider((ref) => TimelineSyncControl());
+final timelineSyncControlProvider = Provider<TimelineSyncControl>((ref) => TimelineSyncControl());
diff --git a/lib/infrastructure/backgroundcomm/BackgroundRpc.dart b/lib/infrastructure/backgroundcomm/BackgroundRpc.dart
@@ -71,7 +71,7 @@ class BackgroundRpc {
       } else if (receivedMessage.errorResult != null) {
         result = AsyncValue.error(
           receivedMessage.errorResult!,
-          receivedMessage.errorStacktrace,
+          stackTrace: receivedMessage.errorStacktrace,
         );
       } else {
         result = AsyncValue.error("Received result without any data.");

diff --git a/lib/infrastructure/datasources/paired_storage.dart b/lib/infrastructure/datasources/paired_storage.dart
@@ -86,12 +86,12 @@ class PairedStorage extends StateNotifier<List<StoredDevice>> {
 }
 
 final pairedStorageProvider = StateNotifierProvider<PairedStorage, List<StoredDevice>>((ref) => PairedStorage());
-final defaultWatchProvider = Provider((ref) => ref
+final defaultWatchProvider = Provider<PebbleScanDevice?>((ref) => ref
     .watch(pairedStorageProvider)
     .firstWhereOrNull((element) => element.isDefault!)
     ?.device);
 final ProviderFamily<PebbleScanDevice, dynamic>? specificWatchProvider =
     Provider.family(((ref, dynamic address) => ref
         .watch(pairedStorageProvider)
         .firstWhereOrNull((element) => element.device.address == address)
-        ?.device) as PebbleScanDevice Function(ProviderReference, dynamic));
+        ?.device) as PebbleScanDevice Function(Ref, dynamic));
diff --git a/lib/infrastructure/datasources/preferences.dart b/lib/infrastructure/datasources/preferences.dart
@@ -166,23 +166,23 @@ final preferencesProvider = FutureProvider<Preferences>((ref) async {
   return Preferences(sharedPreferences);
 });
 
-final calendarSyncEnabledProvider = _createPreferenceProvider(
+final calendarSyncEnabledProvider = _createPreferenceProvider<bool?>(
   (preferences) => preferences.isCalendarSyncEnabled(),
 );
 
-final phoneNotificationsMuteProvider = _createPreferenceProvider(
+final phoneNotificationsMuteProvider = _createPreferenceProvider<bool?>(
   (preferences) => preferences.isPhoneNotificationMuteEnabled(),
 );
 
-final phoneCallsMuteProvider = _createPreferenceProvider(
+final phoneCallsMuteProvider = _createPreferenceProvider<bool?>(
   (preferences) => preferences.isPhoneCallMuteEnabled(),
 );
 
-final notificationToggleProvider = _createPreferenceProvider(
+final notificationToggleProvider = _createPreferenceProvider<bool?>(
   (preferences) => preferences.areNotificationsEnabled(),
 );
 
-final notificationsMutedPackagesProvider = _createPreferenceProvider(
+final notificationsMutedPackagesProvider = _createPreferenceProvider<List<String?>>(
   (preferences) => preferences.getNotificationsMutedPackages(),
 );
 
@@ -197,29 +197,29 @@ final notificationsMutedPackagesProvider = _createPreferenceProvider(
 ///   hasBeenConnected.then((value) => /*...*/);
 /// }, []);
 /// ```
-final hasBeenConnectedProvider = _createPreferenceProvider(
+final hasBeenConnectedProvider = _createPreferenceProvider<bool>(
   (preferences) => preferences.hasBeenConnected(),
 );
 
-final wasSetupSuccessfulProvider = _createPreferenceProvider(
+final wasSetupSuccessfulProvider = _createPreferenceProvider<bool>(
   (preferences) => preferences.wasSetupSuccessful(),
 );
 
-final bootUrlProvider = _createPreferenceProvider(
+final bootUrlProvider = _createPreferenceProvider<String?>(
   (preferences) {
     return preferences.getBoot();
   },
 );
 
-final overrideBootValueProvider = _createPreferenceProvider(
+final overrideBootValueProvider = _createPreferenceProvider<String?>(
   (preferences) => preferences.getOverrideBootValue(),
 );
 
-final shouldOverrideBootProvider = _createPreferenceProvider(
+final shouldOverrideBootProvider = _createPreferenceProvider<bool?>(
   (preferences) => preferences.shouldOverrideBoot(),
 );
 
-final oauthTokenCreationDateProvider = _createPreferenceProvider(
+final oauthTokenCreationDateProvider = _createPreferenceProvider<DateTime?>(
   (preferences) => preferences.getOAuthTokenCreationDate(),
 );
 

diff --git a/lib/infrastructure/datasources/secure_storage.dart b/lib/infrastructure/datasources/secure_storage.dart
@@ -38,10 +38,10 @@ class SecureStorage {
 }
 
 final secureStorageProvider =
-  Provider((ref) => SecureStorage(ref.watch(flutterSecureStorageProvider)));
+  Provider<SecureStorage>((ref) => SecureStorage(ref.watch(flutterSecureStorageProvider)));
 
 final tokenProvider =
-  _createSecureStorageItemProvider((secureStorage) => secureStorage.getToken());
+  _createSecureStorageItemProvider<Future<OAuthToken?>>((secureStorage) => secureStorage.getToken());
 
 StreamProvider<T> _createSecureStorageItemProvider<T>(
     T Function(SecureStorage secureStorage) mapper,
@@ -54,4 +54,4 @@ StreamProvider<T> _createSecureStorageItemProvider<T>(
         .map(mapper)
         .distinct();
   });
-}
+}
diff --git a/lib/main.dart b/lib/main.dart
@@ -46,13 +46,13 @@ void initBackground() {
   BackgroundSetupControl().setupBackground(wrapper);
 }
 
-class MyApp extends HookWidget {
+class MyApp extends HookConsumerWidget {
   @override
-  Widget build(BuildContext context) {
-    final permissionControl = useProvider(permissionControlProvider);
-    final permissionCheck = useProvider(permissionCheckProvider);
-    final defaultWatch = useProvider(defaultWatchProvider);
-    final preferences = useProvider(preferencesProvider.future);
+  Widget build(BuildContext context, WidgetRef ref) {
+    final permissionControl = ref.watch(permissionControlProvider);
+    final permissionCheck = ref.watch(permissionCheckProvider);
+    final defaultWatch = ref.watch(defaultWatchProvider);
+    final preferences = ref.watch(preferencesProvider.future);
 
     useEffect(() {
       Future.microtask(() async {