Skip to content

Commit

Permalink
feat(share_plus): remove direct dependence of url_launcher (#1295)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SirusCodes
SirusCodes committed Oct 31, 2022
1 parent 994fef7 commit 055a19b
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 27 deletions.
15 changes: 12 additions & 3 deletions packages/share_plus/share_plus/lib/src/share_plus_linux.dart
View file
Expand Up @@ -4,13 +4,18 @@ library share_plus_linux;
import 'dart:ui';

import 'package:share_plus_platform_interface/share_plus_platform_interface.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:url_launcher_linux/url_launcher_linux.dart';
import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart';

/// The Linux implementation of SharePlatform.
class SharePlusLinuxPlugin extends SharePlatform {
SharePlusLinuxPlugin(this.urlLauncher);

final UrlLauncherPlatform urlLauncher;

/// Register this dart class as the platform implementation for linux
static void registerWith() {
SharePlatform.instance = SharePlusLinuxPlugin();
SharePlatform.instance = SharePlusLinuxPlugin(UrlLauncherLinux());
}

/// Share text.
Expand All @@ -35,7 +40,11 @@ class SharePlusLinuxPlugin extends SharePlatform {
.join('&'),
);

await launchUrl(uri);
if (await urlLauncher.canLaunch(uri.toString())) {
await urlLauncher.launchUrl(uri.toString(), const LaunchOptions());
} else {
throw Exception('Unable to share on web');
}
}

/// Share files.
Expand Down
17 changes: 11 additions & 6 deletions packages/share_plus/share_plus/lib/src/share_plus_web.dart
View file
Expand Up @@ -5,20 +5,25 @@ import 'package:flutter/widgets.dart';
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
import 'package:mime/mime.dart' show lookupMimeType;
import 'package:share_plus_platform_interface/share_plus_platform_interface.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart';
import 'package:url_launcher_web/url_launcher_web.dart';

/// The web implementation of [SharePlatform].
class SharePlusWebPlugin extends SharePlatform {
final UrlLauncherPlatform urlLauncher;

/// Registers this class as the default instance of [SharePlatform].
static void registerWith(Registrar registrar) {
SharePlatform.instance = SharePlusWebPlugin();
SharePlatform.instance = SharePlusWebPlugin(UrlLauncherPlugin());
}

final html.Navigator _navigator;

/// A constructor that allows tests to override the window object used by the plugin.
SharePlusWebPlugin({@visibleForTesting html.Navigator? debugNavigator})
: _navigator = debugNavigator ?? html.window.navigator;
SharePlusWebPlugin(
this.urlLauncher, {
@visibleForTesting html.Navigator? debugNavigator,
}) : _navigator = debugNavigator ?? html.window.navigator;

/// Share text
@override
Expand All @@ -45,8 +50,8 @@ class SharePlusWebPlugin extends SharePlatform {
.join('&'),
);

if (await canLaunchUrl(uri)) {
await launchUrl(uri);
if (await urlLauncher.canLaunch(uri.toString())) {
await urlLauncher.launchUrl(uri.toString(), const LaunchOptions());
} else {
throw Exception('Unable to share on web');
}
Expand Down
13 changes: 9 additions & 4 deletions packages/share_plus/share_plus/lib/src/share_plus_windows.dart
View file
Expand Up @@ -5,16 +5,21 @@ import 'dart:ui';

import 'package:share_plus/src/windows_version_helper.dart';
import 'package:share_plus_platform_interface/share_plus_platform_interface.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart';
import 'package:url_launcher_windows/url_launcher_windows.dart';

/// The fallback Windows implementation of [SharePlatform], for older Windows versions.
///
class SharePlusWindowsPlugin extends SharePlatform {
SharePlusWindowsPlugin(this.urlLauncher);

final UrlLauncherPlatform urlLauncher;

/// If the modern Share UI i.e. `DataTransferManager` is not available, then use this Dart class instead of platform specific implementation.
///
static void registerWith() {
if (!VersionHelper.instance.isWindows10RS5OrGreater) {
SharePlatform.instance = SharePlusWindowsPlugin();
SharePlatform.instance = SharePlusWindowsPlugin(UrlLauncherWindows());
}
}

Expand All @@ -39,8 +44,8 @@ class SharePlusWindowsPlugin extends SharePlatform {
.join('&'),
);

if (await canLaunchUrl(uri)) {
await launchUrl(uri);
if (await urlLauncher.canLaunch(uri.toString())) {
await urlLauncher.launchUrl(uri.toString(), const LaunchOptions());
} else {
throw Exception('Unable to share on windows');
}
Expand Down
6 changes: 4 additions & 2 deletions packages/share_plus/share_plus/pubspec.yaml
View file
Expand Up @@ -34,15 +34,17 @@ dependencies:
sdk: flutter
share_plus_platform_interface: ^3.2.0
file: ^6.0.0
url_launcher: ^6.1.2
url_launcher_web: ^2.0.13
url_launcher_windows: ^3.0.1
url_launcher_linux: ^3.0.1
url_launcher_platform_interface: ^2.1.1
ffi: ^2.0.1
win32: ^3.0.0

dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^2.0.1
url_launcher_platform_interface: ^2.0.2

environment:
sdk: ">=2.12.0 <3.0.0"
Expand Down
9 changes: 3 additions & 6 deletions packages/share_plus/share_plus/test/share_plus_linux_test.dart
View file
Expand Up @@ -11,29 +11,26 @@ void main() {
});
test('url encoding is correct for &', () async {
final mock = MockUrlLauncherPlatform();
UrlLauncherPlatform.instance = mock;

await SharePlusLinuxPlugin().share('foo&bar', subject: 'bar&foo');
await SharePlusLinuxPlugin(mock).share('foo&bar', subject: 'bar&foo');

expect(mock.url, 'mailto:?subject=bar%26foo&body=foo%26bar');
});

// see https://github.com/dart-lang/sdk/issues/43838#issuecomment-823551891
test('url encoding is correct for spaces', () async {
final mock = MockUrlLauncherPlatform();
UrlLauncherPlatform.instance = mock;

await SharePlusLinuxPlugin().share('foo bar', subject: 'bar foo');
await SharePlusLinuxPlugin(mock).share('foo bar', subject: 'bar foo');

expect(mock.url, 'mailto:?subject=bar%20foo&body=foo%20bar');
});

test('throws when url_launcher can\'t launch uri', () async {
final mock = MockUrlLauncherPlatform();
mock.canLaunchMockValue = false;
UrlLauncherPlatform.instance = mock;

expect(() async => await SharePlusLinuxPlugin().share('foo bar'),
expect(() async => await SharePlusLinuxPlugin(mock).share('foo bar'),
throwsException);
});
}
Expand Down
9 changes: 3 additions & 6 deletions packages/share_plus/share_plus/test/share_plus_windows_test.dart
View file
Expand Up @@ -31,9 +31,8 @@ void main() {
'url encoding is correct for &',
() async {
final mock = MockUrlLauncherPlatform();
UrlLauncherPlatform.instance = mock;

await SharePlusWindowsPlugin().share('foo&bar', subject: 'bar&foo');
await SharePlusWindowsPlugin(mock).share('foo&bar', subject: 'bar&foo');

expect(mock.url, 'mailto:?subject=bar%26foo&body=foo%26bar');
},
Expand All @@ -45,9 +44,8 @@ void main() {
'url encoding is correct for spaces',
() async {
final mock = MockUrlLauncherPlatform();
UrlLauncherPlatform.instance = mock;

await SharePlusWindowsPlugin().share('foo bar', subject: 'bar foo');
await SharePlusWindowsPlugin(mock).share('foo bar', subject: 'bar foo');

expect(mock.url, 'mailto:?subject=bar%20foo&body=foo%20bar');
},
Expand All @@ -59,9 +57,8 @@ void main() {
() async {
final mock = MockUrlLauncherPlatform();
mock.canLaunchMockValue = false;
UrlLauncherPlatform.instance = mock;

expect(() async => await SharePlusWindowsPlugin().share('foo bar'),
expect(() async => await SharePlusWindowsPlugin(mock).share('foo bar'),
throwsException);
},
skip: VersionHelper.instance.isWindows10RS5OrGreater,
Expand Down

0 comments on commit 055a19b

Please sign in to comment.