MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

implement open in app feature

Browse Source
This commit is contained in:
Fabian Freund
2026-01-25 17:09:48 +01:00
parent 8b844119c8
commit a1e599f0ab
12 changed files with 345 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
+1 -1
View File
@@ -600,7 +600,7 @@ class ShareMenuButton extends HookConsumerWidget {
controller: menuController,
menuChildren: [
CopyAddressMenuItemButton(selectedTabId: selectedTabId),
LaunchExternalMenuItemButton(selectedTabId: selectedTabId),
OpenInAppMenuItemButton(selectedTabId: selectedTabId),
ShareScreenshotMenuItemButton(selectedTabId: selectedTabId),
ShareMenuItemButton(selectedTabId: selectedTabId),
ShowQrCodeMenuItemButton(selectedTabId: selectedTabId),
app/lib/features/geckoview/features/browser/presentation/widgets/menu_item_buttons.dart
+23 -8
View File
@@ -22,6 +22,7 @@ import 'dart:ui' as ui;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:nullability/nullability.dart';
import 'package:share_plus/share_plus.dart';
@@ -31,7 +32,7 @@ import 'package:weblibre/features/geckoview/features/browser/presentation/dialog
import 'package:weblibre/features/geckoview/features/browser/presentation/dialogs/qr_code.dart';
import 'package:weblibre/features/geckoview/features/tabs/data/database/definitions.drift.dart';
import 'package:weblibre/features/geckoview/features/tabs/domain/repositories/tab.dart';
import 'package:weblibre/utils/ui_helper.dart' as ui_helper;
import 'package:weblibre/presentation/hooks/cached_future.dart';
class ShareMenuItemButton extends HookConsumerWidget {
const ShareMenuItemButton({super.key, required this.selectedTabId});
@@ -225,23 +226,37 @@ class ShareScreenshotMenuItemButton extends HookConsumerWidget {
}
}
class LaunchExternalMenuItemButton extends HookConsumerWidget {
const LaunchExternalMenuItemButton({super.key, required this.selectedTabId});
class OpenInAppMenuItemButton extends HookConsumerWidget {
const OpenInAppMenuItemButton({super.key, required this.selectedTabId});
static final _service = GeckoAppLinksService();
final String? selectedTabId;
@override
Widget build(BuildContext context, WidgetRef ref) {
final tabState = ref.watch(tabStateProvider(selectedTabId));
final url = tabState?.url;
final hasExternalApp = useCachedFuture(
// ignore: discarded_futures useFuture
() => url != null ? _service.hasExternalApp(url) : Future.value(false),
[url],
);
if (hasExternalApp.data != true) {
return const SizedBox.shrink();
}
return MenuItemButton(
leadingIcon: const Icon(Icons.open_in_browser),
leadingIcon: const Icon(Icons.open_in_new),
closeOnActivate: false,
child: const Text('Launch External'),
child: const Text('Open in App'),
onPressed: () async {
final tabState = ref.read(tabStateProvider(selectedTabId))!;
if (url == null) return;
await ui_helper.launchUrlFeedback(context, tabState.url);
final success = await _service.openAppLink(url);
if (context.mounted) {
if (success && context.mounted) {
MenuController.maybeOf(context)?.close();
}
},
app/lib/features/geckoview/features/browser/presentation/widgets/tab_menu.dart
+1 -1
View File
@@ -388,7 +388,7 @@ class TabMenu extends HookConsumerWidget {
SubmenuButton(
menuChildren: [
CopyAddressMenuItemButton(selectedTabId: selectedTabId),
LaunchExternalMenuItemButton(selectedTabId: selectedTabId),
OpenInAppMenuItemButton(selectedTabId: selectedTabId),
ShareScreenshotMenuItemButton(selectedTabId: selectedTabId),
ShareMenuItemButton(selectedTabId: selectedTabId),
ShowQrCodeMenuItemButton(selectedTabId: selectedTabId),
app/lib/features/geckoview/features/contextmenu/presentation/candidates/launch_external.dart
+9 -7
View File
@@ -22,30 +22,32 @@ import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:nullability/nullability.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:weblibre/features/geckoview/features/contextmenu/extensions/hit_result.dart';
import 'package:weblibre/utils/ui_helper.dart';
class LaunchExternal extends HookConsumerWidget {
final HitResult hitResult;
const LaunchExternal({super.key, required this.hitResult});
static final _service = GeckoAppLinksService();
static Future<bool> isSupported(HitResult hitResult) async {
return hitResult.tryGetLink().mapNotNull((url) => canLaunchUrl(url)) ??
return hitResult.tryGetLink().mapNotNull(
(url) => _service.hasExternalApp(url),
) ??
false;
}
@override
Widget build(BuildContext context, WidgetRef ref) {
return ListTile(
leading: const Icon(Icons.open_in_browser),
title: const Text('Launch External'),
leading: const Icon(Icons.open_in_new),
title: const Text('Open in App'),
onTap: () async {
await hitResult.tryGetLink().mapNotNull((url) async {
await launchUrlFeedback(context, url);
final success = await _service.openAppLink(url);
if (context.mounted) {
if (success && context.mounted) {
context.pop();
}
});
app/lib/features/geckoview/features/contextmenu/presentation/context_menu_dialog.dart
+1
View File
@@ -74,6 +74,7 @@ class ContextMenuDialog extends HookConsumerWidget {
final isSupported = useCachedFuture(
// ignore: discarded_futures useFuture
() => LaunchExternal.isSupported(hitResult),
[hitResult],
);
if (isSupported.data == false) {