Merge pull request #185 from provokateurin/feature/flutter-3.7.0

Update to flutter 3.7.0
2 years ago · c8939b808f
27 changed files with 474 additions and 289 deletions
--- a/.fvm/fvm_config.json
+++ b/.fvm/fvm_config.json
@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.3.10@stable",
+  "flutterSdkVersion": "3.7.0@stable",
  "flavors": {}
 }
--- a/packages/dynamite/pubspec.yaml
+++ b/packages/dynamite/pubspec.yaml
@ -2,7 +2,7 @@ name: dynamite
 version: 1.0.0

 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'

 dependencies:
  build: ^2.3.1
--- a/packages/file_icons/pubspec.yaml
+++ b/packages/file_icons/pubspec.yaml
@ -2,8 +2,8 @@ name: file_icons
 version: 1.0.0

 environment:
-  sdk: '>=2.18.0 <3.0.0'
-  flutter: '>=3.3.10'
+  sdk: '>=2.19.0 <3.0.0'
+  flutter: '>=3.7.0'

 dependencies:
  flutter:
--- a/packages/neon/android/build.gradle
+++ b/packages/neon/android/build.gradle
@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.0'
    repositories {
        google()
        mavenCentral()
@ -15,6 +15,7 @@ allprojects {
    repositories {
        google()
        mavenCentral()
+        maven { url "https://jitpack.io" }
    }
 }

--- a/packages/neon/lib/src/apps/files/dialogs/choose_create.dart
+++ b/packages/neon/lib/src/apps/files/dialogs/choose_create.dart
@ -32,8 +32,10 @@ class _FilesChooseCreateDialogState extends State<FilesChooseCreateDialog> {
    if (sizeWarning != null) {
      final stat = file.statSync();
      if (stat.size > sizeWarning) {
+        // ignore: use_build_context_synchronously
        if (!(await showConfirmationDialog(
          context,
+          // ignore: use_build_context_synchronously
          AppLocalizations.of(context).filesConfirmUploadSizeWarning(
            filesize(sizeWarning),
            filesize(stat.size),
--- a/packages/neon/lib/src/apps/files/pages/main.dart
+++ b/packages/neon/lib/src/apps/files/pages/main.dart
@ -29,8 +29,10 @@ class _FilesMainPageState extends State<FilesMainPage> {
        onPickFile: (final details) async {
          final sizeWarning = widget.bloc.options.downloadSizeWarning.value;
          if (sizeWarning != null && details.size > sizeWarning) {
+            // ignore: use_build_context_synchronously
            if (!(await showConfirmationDialog(
              context,
+              // ignore: use_build_context_synchronously
              AppLocalizations.of(context).filesConfirmDownloadSizeWarning(
                filesize(sizeWarning),
                filesize(details.size),
--- a/packages/neon/lib/src/apps/files/widgets/browser_view.dart
+++ b/packages/neon/lib/src/apps/files/widgets/browser_view.dart
@ -382,8 +382,10 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
                    case FilesFileAction.sync:
                      final sizeWarning = widget.bloc.options.downloadSizeWarning.value;
                      if (sizeWarning != null && details.size > sizeWarning) {
+                        // ignore: use_build_context_synchronously
                        if (!(await showConfirmationDialog(
                          context,
+                          // ignore: use_build_context_synchronously
                          AppLocalizations.of(context).filesConfirmDownloadSizeWarning(
                            filesize(sizeWarning),
                            filesize(details.size),
@ -395,10 +397,13 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
                      widget.filesBloc.syncFile(details.path);
                      break;
                    case FilesFileAction.delete:
+                      // ignore: use_build_context_synchronously
                      if (await showConfirmationDialog(
                        context,
                        details.isDirectory
+                            // ignore: use_build_context_synchronously
                            ? AppLocalizations.of(context).filesDeleteFolderConfirm(details.name)
+                            // ignore: use_build_context_synchronously
                            : AppLocalizations.of(context).filesDeleteFileConfirm(details.name),
                      )) {
                        widget.filesBloc.delete(details.path);
--- a/packages/neon/lib/src/apps/news/pages/article.dart
+++ b/packages/neon/lib/src/apps/news/pages/article.dart
@ -89,7 +89,7 @@ class _NewsArticlePageState extends State<NewsArticlePage> {
            return false;
          }

-          if (Provider.of<NeonPlatform>(context, listen: false).canUseWakelock) {
+          if (mounted && Provider.of<NeonPlatform>(context, listen: false).canUseWakelock) {
            await Wakelock.disable();
          }
          return true;
--- a/packages/neon/lib/src/apps/news/widgets/articles_view.dart
+++ b/packages/neon/lib/src/apps/news/widgets/articles_view.dart
@ -115,7 +115,7 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
                article.title,
                style: article.unread
                    ? null
-                    : Theme.of(context).textTheme.subtitle1!.copyWith(color: Theme.of(context).disabledColor),
+                    : Theme.of(context).textTheme.titleMedium!.copyWith(color: Theme.of(context).disabledColor),
              ),
            ),
            if (article.mediaThumbnail != null) ...[
--- a/packages/neon/lib/src/apps/news/widgets/feeds_view.dart
+++ b/packages/neon/lib/src/apps/news/widgets/feeds_view.dart
@ -66,7 +66,7 @@ class NewsFeedsView extends StatelessWidget {
        title: Text(
          feed.title,
          style: feed.unreadCount! == 0
-              ? Theme.of(context).textTheme.subtitle1!.copyWith(color: Theme.of(context).disabledColor)
+              ? Theme.of(context).textTheme.titleMedium!.copyWith(color: Theme.of(context).disabledColor)
              : null,
        ),
        subtitle: feed.unreadCount! > 0
@ -130,8 +130,10 @@ class NewsFeedsView extends StatelessWidget {
                    );
                    break;
                  case NewsFeedAction.delete:
+                    // ignore: use_build_context_synchronously
                    if (await showConfirmationDialog(
                      context,
+                      // ignore: use_build_context_synchronously
                      AppLocalizations.of(context).newsRemoveFeedConfirm(feed.title),
                    )) {
                      bloc.removeFeed(feed.id);
--- a/packages/neon/lib/src/apps/news/widgets/folders_view.dart
+++ b/packages/neon/lib/src/apps/news/widgets/folders_view.dart
@ -64,7 +64,7 @@ class NewsFoldersView extends StatelessWidget {
      title: Text(
        folderFeedsWrapper.folder.name,
        style: unreadCount == 0
-            ? Theme.of(context).textTheme.subtitle1!.copyWith(color: Theme.of(context).disabledColor)
+            ? Theme.of(context).textTheme.titleMedium!.copyWith(color: Theme.of(context).disabledColor)
            : null,
      ),
      subtitle: unreadCount > 0
@ -107,8 +107,10 @@ class NewsFoldersView extends StatelessWidget {
        onSelected: (final action) async {
          switch (action) {
            case NewsFolderAction.delete:
+              // ignore: use_build_context_synchronously
              if (await showConfirmationDialog(
                context,
+                // ignore: use_build_context_synchronously
                AppLocalizations.of(context).newsDeleteFolderConfirm(folderFeedsWrapper.folder.name),
              )) {
                bloc.deleteFolder(folderFeedsWrapper.folder.id);
--- a/packages/neon/lib/src/pages/account_settings.dart
+++ b/packages/neon/lib/src/pages/account_settings.dart
@ -22,11 +22,14 @@ class AccountSettingsPage extends StatelessWidget {
          actions: [
            IconButton(
              onPressed: () async {
+                // ignore: use_build_context_synchronously
                if (await showConfirmationDialog(
                  context,
+                  // ignore: use_build_context_synchronously
                  AppLocalizations.of(context).accountOptionsRemoveConfirm(account.client.humanReadableID),
                )) {
                  bloc.removeAccount(account);
+                  // ignore: use_build_context_synchronously
                  Navigator.of(context).pop();
                }
              },
@ -34,8 +37,10 @@ class AccountSettingsPage extends StatelessWidget {
            ),
            IconButton(
              onPressed: () async {
+                // ignore: use_build_context_synchronously
                if (await showConfirmationDialog(
                  context,
+                  // ignore: use_build_context_synchronously
                  AppLocalizations.of(context).settingsResetForConfirmation(_name),
                )) {
                  await _options.reset();
--- a/packages/neon/lib/src/pages/nextcloud_app_settings.dart
+++ b/packages/neon/lib/src/pages/nextcloud_app_settings.dart
@ -16,8 +16,10 @@ class NextcloudAppSettingsPage extends StatelessWidget {
          actions: [
            IconButton(
              onPressed: () async {
+                // ignore: use_build_context_synchronously
                if (await showConfirmationDialog(
                  context,
+                  // ignore: use_build_context_synchronously
                  AppLocalizations.of(context).settingsResetForConfirmation(appImplementation.name(context)),
                )) {
                  await appImplementation.options.reset();
--- a/packages/neon/lib/src/pages/settings.dart
+++ b/packages/neon/lib/src/pages/settings.dart
@ -22,6 +22,7 @@ class _SettingsPageState extends State<SettingsPage> {
        actions: [
          IconButton(
            onPressed: () async {
+              // ignore: use_build_context_synchronously
              if (await showConfirmationDialog(context, AppLocalizations.of(context).settingsResetAllConfirmation)) {
                await globalOptions.reset();

--- a/packages/neon/lib/src/widgets/neon_logo.dart
+++ b/packages/neon/lib/src/widgets/neon_logo.dart
@ -19,7 +19,7 @@ class NeonLogo extends StatelessWidget {
          if (!withoutText) ...[
            Text(
              AppLocalizations.of(context).appName,
-              style: Theme.of(context).textTheme.headline6,
+              style: Theme.of(context).textTheme.titleLarge,
            ),
          ],
        ],
--- a/packages/neon/pubspec.lock
+++ b/packages/neon/pubspec.lock
--- a/packages/neon/pubspec.yaml
+++ b/packages/neon/pubspec.yaml
@ -3,8 +3,8 @@ version: 1.0.0
 publish_to: 'none'

 environment:
-  sdk: '>=2.18.0 <3.0.0'
-  flutter: '>=3.3.10'
+  sdk: '>=2.19.0 <3.0.0'
+  flutter: '>=3.7.0'

 dependencies:
  collection: ^1.16.0
--- a/packages/nextcloud/lib/nextcloud.dart
+++ b/packages/nextcloud/lib/nextcloud.dart
@ -11,7 +11,7 @@ import 'package:nextcloud/src/nextcloud.openapi.dart' as openapi;
 import 'package:version/version.dart';
 import 'package:xml/xml.dart' as xml;

-export 'package:crypton/crypton.dart' show RSAKeypair, RSAPublicKey, RSAPrivateKey;
+export 'package:crypton/crypton.dart' show RSAKeypair, RSAPrivateKey, RSAPublicKey;

 export 'src/nextcloud.openapi.dart' hide NextcloudClient;

--- a/packages/nextcloud/pubspec.yaml
+++ b/packages/nextcloud/pubspec.yaml
@ -2,7 +2,7 @@ name: nextcloud
 version: 1.0.0

 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'

 dependencies:
  cookie_jar: ^3.0.1
--- a/packages/nextcloud_push_proxy/lib/nextcloud_push_proxy.dart
+++ b/packages/nextcloud_push_proxy/lib/nextcloud_push_proxy.dart
@ -1,7 +1,5 @@
 // ignore_for_file: public_member_api_docs

-library nextcloud_push_proxy;
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
@ -86,7 +84,7 @@ class NextcloudPushProxy {
    _onNewDeviceStream = _onNewDeviceController.stream.asBroadcastStream();
    _onNewNotificationStream = _onNewNotificationController.stream.asBroadcastStream();

-    var handler = Cascade().add(_router).handler;
+    var handler = Cascade().add(_router.call).handler;
    if (logging) {
      handler = logRequests().addHandler(handler);
    }
--- a/packages/nextcloud_push_proxy/pubspec.yaml
+++ b/packages/nextcloud_push_proxy/pubspec.yaml
@ -2,7 +2,7 @@ name: nextcloud_push_proxy
 version: 1.0.0

 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'

 dependencies:
  crypto: ^3.0.2
--- a/packages/nextcloud_test/pubspec.yaml
+++ b/packages/nextcloud_test/pubspec.yaml
@ -3,7 +3,7 @@ version: 1.0.0
 publish_to: 'none'

 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'

 dependencies:
  nextcloud:
--- a/packages/settings/lib/src/widgets/dropdown_button_settings_tile.dart
+++ b/packages/settings/lib/src/widgets/dropdown_button_settings_tile.dart
@ -31,7 +31,7 @@ class DropdownButtonSettingsTile<T> extends InputSettingsTile<SelectOption<T>> {
                  option.label(context),
                  style: enabledSnapshot.data ?? false
                      ? null
-                      : Theme.of(context).textTheme.subtitle1!.copyWith(color: Theme.of(context).disabledColor),
+                      : Theme.of(context).textTheme.titleMedium!.copyWith(color: Theme.of(context).disabledColor),
                ),
                trailing: valuesSnapshot.hasData
                    ? Container(
--- a/packages/settings/pubspec.yaml
+++ b/packages/settings/pubspec.yaml
@ -2,8 +2,8 @@ name: settings
 version: 1.0.0

 environment:
-  sdk: '>=2.18.0 <3.0.0'
-  flutter: '>=3.3.10'
+  sdk: '>=2.19.0 <3.0.0'
+  flutter: '>=3.7.0'

 dependencies:
  flutter:
--- a/packages/sort_box/lib/sort_box.dart
+++ b/packages/sort_box/lib/sort_box.dart
@ -1,7 +1,5 @@
 // ignore_for_file: public_member_api_docs

-library sort_box;
-
 class SortBox<T extends Enum, R> {
  SortBox(
    this._properties,
--- a/packages/sort_box/pubspec.yaml
+++ b/packages/sort_box/pubspec.yaml
@ -2,7 +2,7 @@ name: sort_box
 version: 1.0.0

 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'

 dev_dependencies:
  nit_picking:
--- a/packages/spec_templates/pubspec.yaml
+++ b/packages/spec_templates/pubspec.yaml
@ -3,7 +3,7 @@ version: 1.0.0
 publish_to: 'none'

 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'

 dependencies: 
  path: ^1.8.1