From 397eaefe9e7ce70181955dfd5d0308c10d636561 Mon Sep 17 00:00:00 2001 From: Ming Ming Date: Fri, 8 Jul 2022 17:38:24 +0800 Subject: [PATCH] Update url_launcher --- app/lib/url_launcher_util.dart | 4 ++++ app/lib/widget/connect.dart | 2 +- app/lib/widget/gps_map.dart | 2 +- app/lib/widget/handler/enhance_handler.dart | 2 +- app/lib/widget/home_app_bar.dart | 2 +- app/lib/widget/people_browser.dart | 2 +- app/lib/widget/settings.dart | 2 +- app/lib/widget/shared_album_info_dialog.dart | 2 +- app/lib/widget/sign_in.dart | 2 +- app/pubspec.lock | 16 ++++++++-------- 10 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 app/lib/url_launcher_util.dart diff --git a/app/lib/url_launcher_util.dart b/app/lib/url_launcher_util.dart new file mode 100644 index 00000000..ef63602d --- /dev/null +++ b/app/lib/url_launcher_util.dart @@ -0,0 +1,4 @@ +import 'package:url_launcher/url_launcher_string.dart'; + +Future launch(String url) => + launchUrlString(url, mode: LaunchMode.externalApplication); diff --git a/app/lib/widget/connect.dart b/app/lib/widget/connect.dart index a7b2b98d..130ec954 100644 --- a/app/lib/widget/connect.dart +++ b/app/lib/widget/connect.dart @@ -22,8 +22,8 @@ import 'package:nc_photos/platform/features.dart' as features; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/string_extension.dart'; import 'package:nc_photos/theme.dart'; +import 'package:nc_photos/url_launcher_util.dart'; import 'package:nc_photos/use_case/ls_single_file.dart'; -import 'package:url_launcher/url_launcher.dart'; class ConnectArguments { ConnectArguments(this.account); diff --git a/app/lib/widget/gps_map.dart b/app/lib/widget/gps_map.dart index 79fc2535..269e728b 100644 --- a/app/lib/widget/gps_map.dart +++ b/app/lib/widget/gps_map.dart @@ -4,8 +4,8 @@ import 'package:latlong2/latlong.dart'; import 'package:nc_photos/mobile/platform.dart' if (dart.library.html) 'package:nc_photos/web/platform.dart' as platform; import 'package:nc_photos/pref.dart'; +import 'package:nc_photos/url_launcher_util.dart'; import 'package:tuple/tuple.dart'; -import 'package:url_launcher/url_launcher.dart'; enum GpsMapProvider { // the order must not be changed diff --git a/app/lib/widget/handler/enhance_handler.dart b/app/lib/widget/handler/enhance_handler.dart index 8d239208..ef5d5374 100644 --- a/app/lib/widget/handler/enhance_handler.dart +++ b/app/lib/widget/handler/enhance_handler.dart @@ -20,11 +20,11 @@ import 'package:nc_photos/platform/k.dart' as platform_k; import 'package:nc_photos/pref.dart'; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/theme.dart'; +import 'package:nc_photos/url_launcher_util.dart'; import 'package:nc_photos/widget/selectable.dart'; import 'package:nc_photos/widget/settings.dart'; import 'package:nc_photos/widget/stateful_slider.dart'; import 'package:nc_photos_plugin/nc_photos_plugin.dart'; -import 'package:url_launcher/url_launcher.dart'; class EnhanceHandler { const EnhanceHandler({ diff --git a/app/lib/widget/home_app_bar.dart b/app/lib/widget/home_app_bar.dart index d20dadf7..eb5f41b1 100644 --- a/app/lib/widget/home_app_bar.dart +++ b/app/lib/widget/home_app_bar.dart @@ -7,9 +7,9 @@ import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/help_utils.dart' as help_utils; import 'package:nc_photos/pref.dart'; import 'package:nc_photos/theme.dart'; +import 'package:nc_photos/url_launcher_util.dart'; import 'package:nc_photos/widget/account_picker_dialog.dart'; import 'package:nc_photos/widget/settings.dart'; -import 'package:url_launcher/url_launcher.dart'; /// AppBar for home screens class HomeSliverAppBar extends StatelessWidget { diff --git a/app/lib/widget/people_browser.dart b/app/lib/widget/people_browser.dart index 31a73fd4..6db9c45e 100644 --- a/app/lib/widget/people_browser.dart +++ b/app/lib/widget/people_browser.dart @@ -18,9 +18,9 @@ import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/theme.dart'; +import 'package:nc_photos/url_launcher_util.dart'; import 'package:nc_photos/widget/empty_list_indicator.dart'; import 'package:nc_photos/widget/person_browser.dart'; -import 'package:url_launcher/url_launcher.dart'; class PeopleBrowserArguments { PeopleBrowserArguments(this.account); diff --git a/app/lib/widget/settings.dart b/app/lib/widget/settings.dart index 442d810e..0e359e21 100644 --- a/app/lib/widget/settings.dart +++ b/app/lib/widget/settings.dart @@ -19,6 +19,7 @@ import 'package:nc_photos/pref.dart'; import 'package:nc_photos/service.dart'; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/theme.dart'; +import 'package:nc_photos/url_launcher_util.dart'; import 'package:nc_photos/widget/fancy_option_picker.dart'; import 'package:nc_photos/widget/gps_map.dart'; import 'package:nc_photos/widget/home.dart'; @@ -28,7 +29,6 @@ import 'package:nc_photos/widget/share_folder_picker.dart'; import 'package:nc_photos/widget/stateful_slider.dart'; import 'package:screen_brightness/screen_brightness.dart'; import 'package:tuple/tuple.dart'; -import 'package:url_launcher/url_launcher.dart'; class SettingsArguments { SettingsArguments(this.account); diff --git a/app/lib/widget/shared_album_info_dialog.dart b/app/lib/widget/shared_album_info_dialog.dart index c02f9ac7..d0429471 100644 --- a/app/lib/widget/shared_album_info_dialog.dart +++ b/app/lib/widget/shared_album_info_dialog.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:nc_photos/app_localizations.dart'; import 'package:nc_photos/help_utils.dart' as help_utils; import 'package:nc_photos/pref.dart'; -import 'package:url_launcher/url_launcher.dart'; +import 'package:nc_photos/url_launcher_util.dart'; class SharedAlbumInfoDialog extends StatefulWidget { const SharedAlbumInfoDialog({ diff --git a/app/lib/widget/sign_in.dart b/app/lib/widget/sign_in.dart index 776f433c..c61122ec 100644 --- a/app/lib/widget/sign_in.dart +++ b/app/lib/widget/sign_in.dart @@ -10,10 +10,10 @@ import 'package:nc_photos/pref.dart'; import 'package:nc_photos/pref_util.dart' as pref_util; import 'package:nc_photos/string_extension.dart'; import 'package:nc_photos/theme.dart'; +import 'package:nc_photos/url_launcher_util.dart'; import 'package:nc_photos/widget/connect.dart'; import 'package:nc_photos/widget/home.dart'; import 'package:nc_photos/widget/root_picker.dart'; -import 'package:url_launcher/url_launcher.dart'; class SignIn extends StatefulWidget { static const routeName = "/sign-in"; diff --git a/app/pubspec.lock b/app/pubspec.lock index 1c456dd9..982d5155 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -1101,56 +1101,56 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.17" + version: "6.1.4" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.17" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.17" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.1" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.1.0" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.12" url_launcher_windows: dependency: transitive description: name: url_launcher_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.1" uuid: dependency: transitive description: