Update application dependencies

2025-06-19 16:25:17 +00:00 · 2022-06-11 15:04:11 +02:00
parent 2c44793def
commit bae83430ab
17 changed files with 168 additions and 140 deletions
--- a/lib/forez/ui/routes/forez_member_profile_route.dart
+++ b/lib/forez/ui/routes/forez_member_profile_route.dart
@ -14,7 +14,7 @@ import 'package:comunic/utils/conversations_utils.dart';
 import 'package:comunic/utils/intl_utils.dart';
 import 'package:comunic/utils/ui_utils.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 /// Show information about a Forez member
 ///
@ -165,7 +165,7 @@ class _ForezMemberProfileRouteState extends State<ForezMemberProfileRoute> {
                subtitle: Text(tr("Website")!),
                trailing: IconButton(
                  icon: Icon(Icons.open_in_new),
-                  onPressed: () => launch(_user.personalWebsite),
+                  onPressed: () => launchUrlString(_user.personalWebsite),
                ),
              ),

--- a/lib/generated_plugin_registrant.dart
+++ b/lib/generated_plugin_registrant.dart
@ -10,7 +10,7 @@ import 'package:connectivity_plus_web/connectivity_plus_web.dart';
 import 'package:file_picker/_internal/file_picker_web.dart';
 import 'package:firebase_core_web/firebase_core_web.dart';
 import 'package:firebase_messaging_web/firebase_messaging_web.dart';
-import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+import 'package:image_cropper_for_web/image_cropper_for_web.dart';
 import 'package:image_picker_for_web/image_picker_for_web.dart';
 import 'package:package_info_plus_web/package_info_plus_web.dart';
 import 'package:shared_preferences_web/shared_preferences_web.dart';
@ -18,12 +18,15 @@ import 'package:url_launcher_web/url_launcher_web.dart';
 import 'package:video_player_web/video_player_web.dart';
 import 'package:wakelock_web/wakelock_web.dart';

+import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+
 // ignore: public_member_api_docs
 void registerPlugins(Registrar registrar) {
  ConnectivityPlusPlugin.registerWith(registrar);
  FilePickerWeb.registerWith(registrar);
  FirebaseCoreWeb.registerWith(registrar);
  FirebaseMessagingWeb.registerWith(registrar);
+  ImageCropperPlugin.registerWith(registrar);
  ImagePickerPlugin.registerWith(registrar);
  PackageInfoPlugin.registerWith(registrar);
  SharedPreferencesPlugin.registerWith(registrar);
--- a/lib/ui/dialogs/deprecation_dialog.dart
+++ b/lib/ui/dialogs/deprecation_dialog.dart
@ -1,7 +1,7 @@
 import 'package:comunic/helpers/server_config_helper.dart';
 import 'package:comunic/utils/intl_utils.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 /// Deprecation dialog
 ///
@ -22,12 +22,12 @@ class _DeprecationDialog extends StatelessWidget {
      actions: [
        MaterialButton(
          onPressed: () =>
-              launch(ServerConfigurationHelper.config!.playStoreURL),
+              launchUrlString(ServerConfigurationHelper.config!.playStoreURL),
          child: Text(tr("Go to the Play Store")!),
        ),
        MaterialButton(
-          onPressed: () =>
-              launch(ServerConfigurationHelper.config!.androidDirectDownloadURL),
+          onPressed: () => launchUrlString(
+              ServerConfigurationHelper.config!.androidDirectDownloadURL),
          child: Text(tr("Download update outside Play Store")!),
        ),
        MaterialButton(
--- a/lib/ui/routes/full_screen_image.dart
+++ b/lib/ui/routes/full_screen_image.dart
@ -2,7 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:comunic/utils/intl_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:photo_view/photo_view.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 /// Full screen image details
 ///
@ -26,7 +26,7 @@ class _FullScreenImageRouteState extends State<FullScreenImageRoute> {
        title: Text(tr("Image")!),
        actions: [
          IconButton(
-              icon: Icon(Icons.launch), onPressed: () => launch(widget.url))
+              icon: Icon(Icons.launch), onPressed: () => launchUrlString(widget.url))
        ],
      ),
      body: PhotoView(
--- a/lib/ui/routes/image_editor_route.dart
+++ b/lib/ui/routes/image_editor_route.dart
@ -19,7 +19,6 @@ import '../../utils/files_utils.dart';
 /// Return original image in case of error / if the user did not crop the image
 Future<BytesFile> showImageCropper(BuildContext context, BytesFile source,
    {CropAspectRatio? aspectRatio}) async {
-
  File? file;
  File? cropped;

@ -27,15 +26,18 @@ Future<BytesFile> showImageCropper(BuildContext context, BytesFile source,
    file = await generateTemporaryFile();
    await file.writeAsBytes(source.bytes!);

-    File? cropped = await ImageCropper().cropImage(
+    var cropped = await ImageCropper().cropImage(
      sourcePath: file.absolute.path,
      compressFormat: ImageCompressFormat.png,
      aspectRatio: aspectRatio,
-      androidUiSettings: AndroidUiSettings(
-        toolbarColor: Colors.black,
-        toolbarTitle: tr("Crop Photo"),
-        toolbarWidgetColor: Colors.white,
-      ),
+      uiSettings: [
+        AndroidUiSettings(
+          toolbarColor: Colors.black,
+          toolbarTitle: tr("Crop Photo"),
+          toolbarWidgetColor: Colors.white,
+        ),
+        IOSUiSettings(title: tr("Crop Photo"))
+      ],
    );

    if (cropped == null) return source;
--- a/lib/ui/routes/settings/about_settings.dart
+++ b/lib/ui/routes/settings/about_settings.dart
@ -5,7 +5,7 @@ import 'package:comunic/utils/intl_utils.dart';
 import 'package:comunic/utils/ui_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_settings_ui/flutter_settings_ui.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 /// About application settings
 ///
@ -24,11 +24,11 @@ class AboutApplicationSettings extends StatelessWidget {
        tiles: [
          SettingsTile(
            title: tr("Privacy policy"),
-            onPressed: (c) => launch(srvConfig!.privacyPolicyURL),
+            onPressed: (c) => launchUrlString(srvConfig!.privacyPolicyURL),
          ),
          SettingsTile(
            title: tr("Terms of Use"),
-            onPressed: (c) => launch(srvConfig!.termsURL),
+            onPressed: (c) => launchUrlString(srvConfig!.termsURL),
          ),
          SettingsTile(
            title: tr("Contact us"),
--- a/lib/ui/screens/group_sections/about_group_section.dart
+++ b/lib/ui/screens/group_sections/about_group_section.dart
@ -4,7 +4,7 @@ import 'package:comunic/models/group.dart';
 import 'package:comunic/utils/date_utils.dart';
 import 'package:comunic/utils/intl_utils.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 /// About group section
 ///
@ -29,7 +29,7 @@ class AboutGroupSection extends StatelessWidget {
                  leading: Icon(Icons.link),
                  title: Text(tr("URL")!),
                  subtitle: Text(group.url),
-                  onTap: () => launch(group.url),
+                  onTap: () => launchUrlString(group.url),
                )
              : Container(),

--- a/lib/ui/screens/user_page_sections/about_user_section.dart
+++ b/lib/ui/screens/user_page_sections/about_user_section.dart
@ -17,7 +17,7 @@ import 'package:comunic/utils/intl_utils.dart';
 ///
 /// @author Pierre Hubert
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 class AboutUserSection extends StatefulWidget {
  final AdvancedUserInfo user;
@ -63,7 +63,7 @@ class _AboutUserSectionState extends State<AboutUserSection> {
                  leading: Icon(Icons.link),
                  title: Text(tr("Personal Website")!),
                  subtitle: Text(widget.user.personalWebsite),
-                  onTap: () => launch(widget.user.personalWebsite),
+                  onTap: () => launchUrlString(widget.user.personalWebsite),
                )
              : Container(),

--- a/lib/ui/tiles/post_tile.dart
+++ b/lib/ui/tiles/post_tile.dart
@ -29,7 +29,7 @@ import 'package:comunic/utils/intl_utils.dart';
 import 'package:comunic/utils/navigation_utils.dart';
 import 'package:comunic/utils/ui_utils.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 import '../../models/api_request.dart';
 import '../../utils/log_utils.dart';
@ -281,8 +281,8 @@ class _PostTileState extends State<PostTile> {
          Text(tr("YouTube movie")!)
        ],
      ),
-      onPressed: () =>
-          launch("https://youtube.com/watch/?v=" + widget.post.filePath!),
+      onPressed: () => launchUrlString(
+          "https://youtube.com/watch/?v=" + widget.post.filePath!),
    );
  }

@ -291,7 +291,7 @@ class _PostTileState extends State<PostTile> {
      color:
          darkTheme() ? darkerAccentColor : Color.fromRGBO(0xf7, 0xf7, 0xf7, 1),
      child: InkWell(
-        onTap: () => launch(widget.post.linkURL!),
+        onTap: () => launchUrlString(widget.post.linkURL!),
        child: Row(
          children: <Widget>[
            Padding(
@ -330,7 +330,7 @@ class _PostTileState extends State<PostTile> {
  Widget _buildPostPDF() {
    return ElevatedButton.icon(
      onPressed: () {
-        launch(widget.post.fileURL!);
+        launchUrlString(widget.post.fileURL!);
      },
      icon: Icon(Icons.picture_as_pdf),
      label: Text(tr("PDF")!),
--- a/lib/ui/widgets/banner_widget.dart
+++ b/lib/ui/widgets/banner_widget.dart
@ -5,7 +5,7 @@ import 'package:comunic/models/server_config.dart';
 import 'package:comunic/utils/date_utils.dart';
 import 'package:comunic/utils/intl_utils.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 bool _bannerDismissed = false;

@ -26,7 +26,7 @@ class _BannerWidgetState extends State<BannerWidget> {
  }

  void _openLink() {
-    launch(srvConfig!.banner!.link!);
+    launchUrlString(srvConfig!.banner!.link!);
  }

  @override
--- a/lib/ui/widgets/conversation_file_tile.dart
+++ b/lib/ui/widgets/conversation_file_tile.dart
@ -9,7 +9,7 @@ import 'package:comunic/ui/routes/video_player_route.dart';
 import 'package:comunic/ui/widgets/network_image_widget.dart';
 import 'package:filesize/filesize.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 const _AreaWidth = 150.0;
 const _AreaHeight = 100.0;
@ -124,7 +124,7 @@ class _ConversationFileWidgetState extends State<ConversationFileWidget> {
        break;

      default:
-        launch(file.url!);
+        launchUrlString(file.url!);
    }
  }
 }
--- a/lib/ui/widgets/create_account_widget.dart
+++ b/lib/ui/widgets/create_account_widget.dart
@ -6,7 +6,7 @@ import 'package:comunic/utils/intl_utils.dart';
 import 'package:comunic/utils/ui_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 import 'new_password_input_widget.dart';

@ -229,7 +229,8 @@ class _CreateAccountWidgetState extends State<CreateAccountWidget> {
    widget.onCreated();
  }

-  void _openTOS() => launch(ServerConfigurationHelper.config!.termsURL);
+  void _openTOS() =>
+      launchUrlString(ServerConfigurationHelper.config!.termsURL);

  void _showCreateAccountError() async {
    await showCupertinoDialog(
--- a/lib/ui/widgets/text_rich_content_widget.dart
+++ b/lib/ui/widgets/text_rich_content_widget.dart
@ -1,7 +1,7 @@
 import 'package:comunic/utils/input_utils.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 /// Text rich content widget
 ///
@ -41,7 +41,7 @@ class TextRichContentWidget extends StatelessWidget {
              text: s,
              recognizer: TapGestureRecognizer()
                ..onTap = () {
-                  launch(s);
+                  launchUrlString(s);
                }));

          currString = "";
--- a/lib/ui/widgets/text_widget.dart
+++ b/lib/ui/widgets/text_widget.dart
@ -2,7 +2,7 @@ import 'package:comunic/models/displayed_content.dart';
 import 'package:comunic/utils/input_utils.dart';
 import 'package:comunic/utils/navigation_utils.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 /// Text widget
 ///
@ -24,13 +24,14 @@ class TextWidget extends StatelessWidget {
    this.textAlign = TextAlign.start,
    this.style,
    this.linksColor = Colors.blueAccent,
-  })  : super(key: key);
+  }) : super(key: key);

  @override
  Widget build(BuildContext context) {
    if (this.content.isNull || this.content.isEmpty) return Text("");

-    var usedStyle = style == null ? Theme.of(context).textTheme.bodyText2 : style;
+    var usedStyle =
+        style == null ? Theme.of(context).textTheme.bodyText2 : style;

    var content = this.content.parsedString!;

@ -78,7 +79,7 @@ class TextWidget extends StatelessWidget {
                word,
                style: style!.copyWith(color: linksColor),
              ),
-              onTap: () => launch(word),
+              onTap: () => launchUrlString(word),
            ),
          ),
        );