refactor(neon,neon_files,neon_news,neon_notes,neon_notifications,app): Use global instance of NeonPlatform

Signed-off-by: jld3103 <jld3103yt@gmail.com>

packages/app/lib/apps.dart

@@ -1,5 +1,4 @@
 import 'package:neon/models.dart';
-import 'package:neon/platform.dart';
 import 'package:neon_files/neon_files.dart';
 import 'package:neon_news/neon_news.dart';
 import 'package:neon_notes/neon_notes.dart';
@@ -8,11 +7,10 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 List<AppImplementation> getAppImplementations(
   final SharedPreferences sharedPreferences,
-  final NeonPlatform platform,
 ) =>
     [
-      FilesApp(sharedPreferences, platform),
+      FilesApp(sharedPreferences),
-      NewsApp(sharedPreferences, platform),
+      NewsApp(sharedPreferences),
-      NotesApp(sharedPreferences, platform),
+      NotesApp(sharedPreferences),
-      NotificationsApp(sharedPreferences, platform),
+      NotificationsApp(sharedPreferences),
     ];

packages/neon/neon/lib/neon.dart

@@ -9,7 +9,6 @@ import 'package:neon/src/blocs/next_push.dart';
 import 'package:neon/src/blocs/push_notifications.dart';
 import 'package:neon/src/models/account.dart';
 import 'package:neon/src/models/app_implementation.dart';
-import 'package:neon/src/platform/platform.dart';
 import 'package:neon/src/theme/neon.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:neon/src/utils/request_manager.dart';
@@ -19,7 +18,7 @@ import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 Future runNeon({
-  required final Iterable<AppImplementation> Function(SharedPreferences, NeonPlatform) getAppImplementations,
+  required final Iterable<AppImplementation> Function(SharedPreferences) getAppImplementations,
   required final NeonTheme theme,
   @visibleForTesting final WidgetsBinding? bindingOverride,
   @visibleForTesting final Account? account,
@@ -31,9 +30,8 @@ Future runNeon({
 
   final sharedPreferences = await SharedPreferences.getInstance();
 
-  final platform = await getNeonPlatform();
+  await RequestManager.instance.initCache();
-  await RequestManager.instance.initCache(platform);
+  final allAppImplementations = getAppImplementations(sharedPreferences);
-  final allAppImplementations = getAppImplementations(sharedPreferences, platform);
 
   final packageInfo = await PackageInfo.fromPlatform();
   buildUserAgent(packageInfo);
@@ -44,7 +42,6 @@ Future runNeon({
   );
 
   final accountsBloc = AccountsBloc(
-    platform,
     sharedPreferences,
     globalOptions,
     allAppImplementations,
@@ -58,7 +55,6 @@ Future runNeon({
     accountsBloc,
     sharedPreferences,
     globalOptions,
-    platform,
   );
   final firstLaunchBloc = FirstLaunchBloc(
     sharedPreferences,
@@ -76,9 +72,6 @@ Future runNeon({
         Provider<SharedPreferences>(
           create: (final _) => sharedPreferences,
         ),
-        Provider<NeonPlatform>(
-          create: (final _) => platform,
-        ),
         Provider<GlobalOptions>(
           create: (final _) => globalOptions,
         ),

packages/neon/neon/lib/src/app.dart

@@ -44,7 +44,6 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
   final _appRegex = RegExp(r'^app_([a-z]+)$', multiLine: true);
   final _navigatorKey = GlobalKey<NavigatorState>();
   late final Iterable<AppImplementation> _appImplementations;
-  late final NeonPlatform _platform;
   late final GlobalOptions _globalOptions;
   late final AccountsBloc _accountsBloc;
   late final _routerDelegate = AppRouter(
@@ -59,15 +58,14 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
     super.initState();
 
     _appImplementations = Provider.of<Iterable<AppImplementation>>(context, listen: false);
-    _platform = Provider.of<NeonPlatform>(context, listen: false);
     _globalOptions = Provider.of<GlobalOptions>(context, listen: false);
     _accountsBloc = Provider.of<AccountsBloc>(context, listen: false);
 
     WidgetsBinding.instance.addObserver(this);
-    if (_platform.canUseSystemTray) {
+    if (NeonPlatform.instance.canUseSystemTray) {
       tray.trayManager.addListener(this);
     }
-    if (_platform.canUseWindowManager) {
+    if (NeonPlatform.instance.canUseWindowManager) {
       windowManager.addListener(this);
     }
 
@@ -77,7 +75,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
       if (!mounted) {
         return;
       }
-      if (_platform.canUseQuickActions) {
+      if (NeonPlatform.instance.canUseQuickActions) {
         const quickActions = QuickActions();
         await quickActions.setShortcutItems(
           _appImplementations
@@ -93,7 +91,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
         await quickActions.initialize(_handleShortcut);
       }
 
-      if (_platform.canUseWindowManager) {
+      if (NeonPlatform.instance.canUseWindowManager) {
         await windowManager.setPreventClose(true);
 
         if (_globalOptions.startupMinimized.value) {
@@ -101,7 +99,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
         }
       }
 
-      if (_platform.canUseSystemTray) {
+      if (NeonPlatform.instance.canUseSystemTray) {
         _globalOptions.systemTrayEnabled.addListener(() async {
           if (_globalOptions.systemTrayEnabled.value) {
             // TODO: This works on Linux, but maybe not on macOS or Windows
@@ -136,7 +134,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
         });
       }
 
-      if (_platform.canUsePushNotifications) {
+      if (NeonPlatform.instance.canUsePushNotifications) {
         final localNotificationsPlugin = await PushUtils.initLocalNotifications();
         Global.onPushNotificationReceived = (final accountID) async {
           final account = _accountsBloc.accounts.value.tryFind(accountID);
@@ -213,7 +211,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
 
   Future _handleShortcut(final String shortcutType) async {
     if (shortcutType == 'show_hide') {
-      if (_platform.canUseWindowManager) {
+      if (NeonPlatform.instance.canUseWindowManager) {
         if (await windowManager.isVisible()) {
           await _saveAndMinimizeWindow();
         } else {
@@ -249,7 +247,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
   }
 
   Future _showAndRestoreWindow() async {
-    if (!_platform.canUseWindowManager) {
+    if (!NeonPlatform.instance.canUseWindowManager) {
       return;
     }
 
@@ -264,10 +262,10 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
-    if (_platform.canUseSystemTray) {
+    if (NeonPlatform.instance.canUseSystemTray) {
       tray.trayManager.removeListener(this);
     }
-    if (_platform.canUseWindowManager) {
+    if (NeonPlatform.instance.canUseWindowManager) {
       windowManager.removeListener(this);
     }
 

packages/neon/neon/lib/src/blocs/accounts.dart

@@ -10,7 +10,6 @@ import 'package:neon/src/blocs/user_details.dart';
 import 'package:neon/src/blocs/user_statuses.dart';
 import 'package:neon/src/models/account.dart';
 import 'package:neon/src/models/app_implementation.dart';
-import 'package:neon/src/platform/platform.dart';
 import 'package:neon/src/settings/models/storage.dart';
 import 'package:neon/src/utils/account_options.dart';
 import 'package:neon/src/utils/global_options.dart';
@@ -57,7 +56,6 @@ abstract interface class AccountsBlocStates {
 
 class AccountsBloc extends Bloc implements AccountsBlocEvents, AccountsBlocStates {
   AccountsBloc(
-    this._platform,
     this._sharedPreferences,
     this._globalOptions,
     this._allAppImplementations,
@@ -98,7 +96,6 @@ class AccountsBloc extends Bloc implements AccountsBlocEvents, AccountsBlocState
     }
   }
 
-  final NeonPlatform _platform;
   late final AppStorage _storage = AppStorage('accounts', _sharedPreferences);
   final SharedPreferences _sharedPreferences;
   final GlobalOptions _globalOptions;
@@ -287,7 +284,6 @@ class AccountsBloc extends Bloc implements AccountsBlocEvents, AccountsBlocState
     }
 
     return _userStatusesBlocs[account.id] = UserStatusesBloc(
-      _platform,
       account,
     );
   }

packages/neon/neon/lib/src/blocs/push_notifications.dart

@@ -28,9 +28,8 @@ class PushNotificationsBloc extends Bloc implements PushNotificationsBlocEvents,
     this._accountsBloc,
     this._sharedPreferences,
     this._globalOptions,
-    this._platform,
   ) {
-    if (_platform.canUsePushNotifications) {
+    if (NeonPlatform.instance.canUsePushNotifications) {
       unawaited(UnifiedPush.getDistributors().then(_globalOptions.updateDistributors));
 
       _globalOptions.pushNotificationsEnabled.addListener(_pushNotificationsEnabledListener);
@@ -40,7 +39,6 @@ class PushNotificationsBloc extends Bloc implements PushNotificationsBlocEvents,
   }
 
   final AccountsBloc _accountsBloc;
-  final NeonPlatform _platform;
   final SharedPreferences _sharedPreferences;
   late final _storage = AppStorage(AppIDs.notifications, _sharedPreferences);
   final GlobalOptions _globalOptions;

packages/neon/neon/lib/src/blocs/user_statuses.dart

@@ -2,11 +2,11 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:meta/meta.dart';
+import 'package:neon/platform.dart';
 import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/bloc/result.dart';
 import 'package:neon/src/blocs/timer.dart';
 import 'package:neon/src/models/account.dart';
-import 'package:neon/src/platform/platform.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:window_manager/window_manager.dart';
@@ -22,14 +22,12 @@ abstract class UserStatusesBlocStates {
 @internal
 class UserStatusesBloc extends InteractiveBloc implements UserStatusesBlocEvents, UserStatusesBlocStates {
   UserStatusesBloc(
-    this._platform,
     this._account,
   ) {
     unawaited(refresh());
     _timer = TimerBloc().registerTimer(const Duration(minutes: 5), refresh);
   }
 
-  final NeonPlatform _platform;
   final Account _account;
   late final NeonTimer _timer;
 
@@ -63,8 +61,12 @@ class UserStatusesBloc extends InteractiveBloc implements UserStatusesBlocEvents
       UserStatusPublic? data;
 
       if (_account.username == username) {
-        final isAway =
+        var isAway = false;
-            _platform.canUseWindowManager && (!(await windowManager.isFocused()) || !(await windowManager.isVisible()));
+        if (NeonPlatform.instance.canUseWindowManager) {
+          final focused = await windowManager.isFocused();
+          final visible = await windowManager.isFocused();
+          isAway = !focused || !visible;
+        }
         try {
           final response = await _account.client.userStatus.heartbeat.heartbeat(
             status: isAway ? 'away' : 'online',

packages/neon/neon/lib/src/models/app_implementation.dart

@@ -6,7 +6,6 @@ import 'package:neon/l10n/localizations.dart';
 import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
-import 'package:neon/src/platform/platform.dart';
 import 'package:neon/src/settings/models/nextcloud_app_options.dart';
 import 'package:neon/src/settings/models/storage.dart';
 import 'package:neon/src/widgets/drawer_destination.dart';
@@ -17,7 +16,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 abstract class AppImplementation<T extends Bloc, R extends NextcloudAppOptions> {
   AppImplementation(
     final SharedPreferences sharedPreferences,
-    this.platform,
   ) {
     final storage = AppStorage('app-$id', sharedPreferences);
     options = buildOptions(storage);
@@ -26,7 +24,6 @@ abstract class AppImplementation<T extends Bloc, R extends NextcloudAppOptions>
   String get id;
   LocalizationsDelegate get localizationsDelegate;
   List<Locale> get supportedLocales;
-  final NeonPlatform platform;
 
   String nameFromLocalization(final AppLocalizations localizations) => localizations.appImplementationName(id);
   String name(final BuildContext context) => nameFromLocalization(AppLocalizations.of(context));

packages/neon/neon/lib/src/models/notifications_interface.dart

@@ -4,10 +4,7 @@ import 'package:neon/src/settings/models/nextcloud_app_options.dart';
 
 abstract interface class NotificationsAppInterface<T extends NotificationsBlocInterface,
     R extends NotificationsOptionsInterface> extends AppImplementation<T, R> {
-  NotificationsAppInterface(
+  NotificationsAppInterface(super.sharedPreferences);
-    super.sharedPreferences,
-    super.platform,
-  );
 }
 
 abstract interface class NotificationsBlocInterface extends InteractiveBloc {

packages/neon/neon/lib/src/pages/login.dart

@@ -6,7 +6,6 @@ import 'package:neon/src/theme/branding.dart';
 import 'package:neon/src/theme/dialog.dart';
 import 'package:neon/src/utils/validators.dart';
 import 'package:neon/src/widgets/nextcloud_logo.dart';
-import 'package:provider/provider.dart';
 
 class LoginPage extends StatefulWidget {
   const LoginPage({
@@ -40,7 +39,6 @@ class _LoginPageState extends State<LoginPage> {
   @override
   Widget build(final BuildContext context) {
     final branding = Branding.of(context);
-    final platform = Provider.of<NeonPlatform>(context, listen: false);
 
     return Scaffold(
       resizeToAvoidBottomInset: true,
@@ -101,7 +99,7 @@ class _LoginPageState extends State<LoginPage> {
                       onFieldSubmitted: login,
                     ),
                   ),
-                  if (platform.canUseCamera) ...[
+                  if (NeonPlatform.instance.canUseCamera) ...[
                     const SizedBox(
                       height: 50,
                     ),

packages/neon/neon/lib/src/pages/settings.dart

@@ -86,9 +86,8 @@ class _SettingsPageState extends State<SettingsPage> {
       builder: (
         final context,
         final accountsSnapshot,
-      ) {
+      ) =>
-        final platform = Provider.of<NeonPlatform>(context, listen: false);
+          ValueListenableBuilder<bool>(
-        return ValueListenableBuilder<bool>(
         valueListenable: globalOptions.pushNotificationsEnabled,
         builder: (
           final context,
@@ -139,7 +138,7 @@ class _SettingsPageState extends State<SettingsPage> {
                 ),
               ],
             ),
-              if (platform.canUsePushNotifications) ...[
+            if (NeonPlatform.instance.canUsePushNotifications) ...[
               SettingsCategory(
                 title: Text(AppLocalizations.of(context).optionsCategoryPushNotifications),
                 key: ValueKey(SettingsCageories.pushNotifications.name),
@@ -163,7 +162,7 @@ class _SettingsPageState extends State<SettingsPage> {
                 ],
               ),
             ],
-              if (platform.canUseWindowManager) ...[
+            if (NeonPlatform.instance.canUseWindowManager) ...[
               SettingsCategory(
                 title: Text(AppLocalizations.of(context).optionsCategoryStartup),
                 key: ValueKey(SettingsCageories.startup.name),
@@ -177,7 +176,7 @@ class _SettingsPageState extends State<SettingsPage> {
                 ],
               ),
             ],
-              if (platform.canUseWindowManager && platform.canUseSystemTray) ...[
+            if (NeonPlatform.instance.canUseWindowManager && NeonPlatform.instance.canUseSystemTray) ...[
               SettingsCategory(
                 title: Text(AppLocalizations.of(context).optionsCategorySystemTray),
                 key: ValueKey(SettingsCageories.systemTray.name),
@@ -314,8 +313,7 @@ class _SettingsPageState extends State<SettingsPage> {
             ),
           ],
         ),
-        );
+      ),
-      },
     );
 
     return Scaffold(

packages/neon/neon/lib/src/platform/platform.dart

@@ -5,22 +5,42 @@ import 'package:meta/meta.dart';
 import 'package:neon/src/platform/android.dart';
 import 'package:neon/src/platform/linux.dart';
 
-Future<NeonPlatform> getNeonPlatform() async {
+/// Implements platform specific functionality and exposes the availability of certain features.
-  final NeonPlatform platform;
+@immutable
+abstract interface class NeonPlatform {
+  @visibleForTesting
+  factory NeonPlatform.mocked(final NeonPlatform platform) => _platform = platform;
+
+  static NeonPlatform? _platform;
+
+  /// Infers and configures the platform automatically.
+  ///
+  /// Required to be called before accessing [NeonPlatform.instance].
+  static Future setup() async {
     if (Platform.isAndroid) {
-    platform = const AndroidNeonPlatform();
+      _platform = const AndroidNeonPlatform();
     } else if (Platform.isLinux) {
-    platform = const LinuxNeonPlatform();
+      _platform = const LinuxNeonPlatform();
     } else {
       throw UnimplementedError('No implementation for platform ${Platform.operatingSystem} found');
     }
 
-  await platform.init.call();
+    await _platform!.init();
-  return platform;
+  }
+
+  /// Gets the current instance of [NeonPlatform].
+  ///
+  /// Make sure [NeonPlatform.setup] has been called before accessing the instance.
+  static NeonPlatform get instance {
+    if (_platform == null) {
+      throw StateError(
+        'NeonPlatform has not been set up yet. Please make sure NeonPlatform.setup() has been called before and completed.',
+      );
+    }
+
+    return _platform!;
   }
 
-@immutable
-abstract interface class NeonPlatform {
   abstract final bool canUseWebView;
 
   abstract final bool canUseQuickActions;

packages/neon/neon/lib/src/utils/global_popups.dart

@@ -45,10 +45,9 @@ class GlobalPopups {
     final globalOptions = Provider.of<GlobalOptions>(context, listen: false);
     final firstLaunchBloc = Provider.of<FirstLaunchBloc>(context, listen: false);
     final nextPushBloc = Provider.of<NextPushBloc>(context, listen: false);
-    final platform = Provider.of<NeonPlatform>(context, listen: false);
 
     _subscriptions.addAll([
-      if (platform.canUsePushNotifications) ...[
+      if (NeonPlatform.instance.canUsePushNotifications) ...[
         firstLaunchBloc.onFirstLaunch.listen((final _) {
           assert(context.mounted, 'Context should be mounted');
           if (!globalOptions.pushNotificationsEnabled.enabled) {

packages/neon/neon/lib/src/utils/request_manager.dart

@@ -22,8 +22,8 @@ class RequestManager {
   // ignore: prefer_constructors_over_static_methods
   static RequestManager get instance => _requestManager ??= RequestManager();
 
-  Future initCache(final NeonPlatform platform) async {
+  Future initCache() async {
-    _cache = Cache(platform);
+    _cache = Cache();
     await _cache!.init();
   }
 
@@ -187,9 +187,6 @@ class RequestManager {
 
 @internal
 class Cache {
-  Cache(this._platform);
-
-  final NeonPlatform _platform;
   Database? _database;
 
   Future init() async {
@@ -199,7 +196,7 @@ class Cache {
 
     _database = await openDatabase(
       p.join(
-        await _platform.getApplicationCachePath(),
+        await NeonPlatform.instance.getApplicationCachePath(),
         'cache.db',
       ),
       version: 1,

packages/neon/neon_files/lib/blocs/files.dart

@@ -28,7 +28,6 @@ class FilesBloc extends InteractiveBloc implements FilesBlocEvents, FilesBlocSta
   FilesBloc(
     this.options,
     this.account,
-    this._platform,
   ) {
     options.uploadQueueParallelism.addListener(_uploadParalelismListener);
     options.downloadQueueParallelism.addListener(_downloadParalelismListener);
@@ -36,7 +35,6 @@ class FilesBloc extends InteractiveBloc implements FilesBlocEvents, FilesBlocSta
 
   final FilesAppSpecificOptions options;
   final Account account;
-  final NeonPlatform _platform;
   late final browser = getNewFilesBrowserBloc();
 
   final _uploadQueue = Queue();
@@ -86,7 +84,7 @@ class FilesBloc extends InteractiveBloc implements FilesBlocEvents, FilesBlocSta
       () async {
         final file = File(
           p.join(
-            await _platform.getApplicationCachePath(),
+            await NeonPlatform.instance.getApplicationCachePath(),
             'files',
             etag.replaceAll('"', ''),
             path.last,
@@ -139,7 +137,7 @@ class FilesBloc extends InteractiveBloc implements FilesBlocEvents, FilesBlocSta
       () async {
         final file = File(
           p.join(
-            await _platform.getUserAccessibleAppDataPath(),
+            await NeonPlatform.instance.getUserAccessibleAppDataPath(),
             account.humanReadableID,
             'files',
             path.join(Platform.pathSeparator),

packages/neon/neon_files/lib/dialogs/choose_create.dart

@@ -77,7 +77,7 @@ class _FilesChooseCreateDialogState extends State<FilesChooseCreateDialog> {
               }
             },
           ),
-          if (Provider.of<NeonPlatform>(context, listen: false).canUseCamera) ...[
+          if (NeonPlatform.instance.canUseCamera) ...[
             ListTile(
               leading: Icon(
                 MdiIcons.cameraPlus,

packages/neon/neon_files/lib/neon_files.dart

@@ -44,7 +44,7 @@ part 'widgets/browser_view.dart';
 part 'widgets/file_preview.dart';
 
 class FilesApp extends AppImplementation<FilesBloc, FilesAppSpecificOptions> {
-  FilesApp(super.sharedPreferences, super.platform);
+  FilesApp(super.sharedPreferences);
 
   @override
   String id = AppIDs.files;
@@ -62,7 +62,6 @@ class FilesApp extends AppImplementation<FilesBloc, FilesAppSpecificOptions> {
   FilesBloc buildBloc(final Account account) => FilesBloc(
         options,
         account,
-        platform,
       );
 
   @override

packages/neon/neon_news/lib/neon_news.dart

@@ -52,7 +52,7 @@ part 'widgets/folder_view.dart';
 part 'widgets/folders_view.dart';
 
 class NewsApp extends AppImplementation<NewsBloc, NewsAppSpecificOptions> {
-  NewsApp(super.sharedPreferences, super.platform);
+  NewsApp(super.sharedPreferences);
 
   @override
   String id = AppIDs.news;
@@ -64,7 +64,7 @@ class NewsApp extends AppImplementation<NewsBloc, NewsAppSpecificOptions> {
   List<Locale> supportedLocales = AppLocalizations.supportedLocales;
 
   @override
-  NewsAppSpecificOptions buildOptions(final AppStorage storage) => NewsAppSpecificOptions(storage, platform);
+  NewsAppSpecificOptions buildOptions(final AppStorage storage) => NewsAppSpecificOptions(storage);
 
   @override
   NewsBloc buildBloc(final Account account) => NewsBloc(

packages/neon/neon_news/lib/options.dart

@@ -1,7 +1,7 @@
 part of 'neon_news.dart';
 
 class NewsAppSpecificOptions extends NextcloudAppOptions {
-  NewsAppSpecificOptions(super.storage, this._platform) {
+  NewsAppSpecificOptions(super.storage) {
     super.categories = [
       generalCategory,
       articlesCategory,
@@ -23,8 +23,6 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
     ];
   }
 
-  final NeonPlatform _platform;
-
   final generalCategory = OptionsCategory(
     name: (final context) => AppLocalizations.of(context).general,
   );
@@ -62,7 +60,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
     defaultValue: ArticleViewType.direct,
     values: {
       ArticleViewType.direct: (final context) => AppLocalizations.of(context).optionsArticleViewTypeDirect,
-      if (_platform.canUseWebView)
+      if (NeonPlatform.instance.canUseWebView)
         ArticleViewType.internalBrowser: (final context) =>
             AppLocalizations.of(context).optionsArticleViewTypeInternalBrowser,
       ArticleViewType.externalBrowser: (final context) =>

packages/neon/neon_news/lib/widgets/articles_view.dart

@@ -203,7 +203,7 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
             );
           } else if (viewType == ArticleViewType.internalBrowser &&
               article.url != null &&
-              Provider.of<NeonPlatform>(context, listen: false).canUseWebView) {
+              NeonPlatform.instance.canUseWebView) {
             await Navigator.of(context).push(
               MaterialPageRoute(
                 builder: (final context) => NewsArticlePage(

packages/neon/neon_notes/lib/neon_notes.dart

@@ -42,7 +42,7 @@ part 'widgets/notes_floating_action_button.dart';
 part 'widgets/notes_view.dart';
 
 class NotesApp extends AppImplementation<NotesBloc, NotesAppSpecificOptions> {
-  NotesApp(super.sharedPreferences, super.platform);
+  NotesApp(super.sharedPreferences);
 
   @override
   String id = AppIDs.notes;

packages/neon/neon_notifications/lib/neon_notifications.dart

@@ -22,7 +22,7 @@ part 'pages/main.dart';
 
 class NotificationsApp extends AppImplementation<NotificationsBloc, NotificationsAppSpecificOptions>
     implements NotificationsAppInterface<NotificationsBloc, NotificationsAppSpecificOptions> {
-  NotificationsApp(super.sharedPreferences, super.platform);
+  NotificationsApp(super.sharedPreferences);
 
   @override
   String id = AppIDs.notifications;