admin/linkding-ios
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Improved webview

Browse Source
This commit is contained in:
Juan Gilsanz Polo
2024-02-22 22:11:41 +01:00
parent 83fe30408f
commit 8d85b80b09
15 changed files with 465 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/screens/webview/model/webview.model.dart
View File

@@ -1,9 +1,15 @@
import 'package:webview_flutter/webview_flutter.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
class WebViewModel {
final WebViewController webViewController;
InAppWebViewController? inAppWebViewController;
int loadProgress;
bool canGoBack;
bool canGoForward;
WebViewModel({
required this.webViewController,
this.inAppWebViewController,
this.loadProgress = 0,
this.canGoBack = false,
this.canGoForward = false,
});
}

38
lib/screens/webview/provider/webview.provider.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:webview_flutter/webview_flutter.dart';
import 'package:linkdy/screens/webview/model/webview.model.dart';
@@ -9,25 +9,25 @@ part 'webview.provider.g.dart';
class WebView extends _$WebView {
@override
WebViewModel build() {
return WebViewModel(
webViewController: WebViewController(
onPermissionRequest: (request) => request.deny(),
)
..setJavaScriptMode(JavaScriptMode.unrestricted)
..setNavigationDelegate(
NavigationDelegate(
onProgress: (int progress) {
// Update loading bar.
},
onPageStarted: (String url) {},
onPageFinished: (String url) {},
onWebResourceError: (WebResourceError error) {},
),
),
);
return WebViewModel();
}
void initialize(String url) {
state.webViewController.loadRequest(Uri.parse(url));
void initializeController(InAppWebViewController controller) {
state.inAppWebViewController = controller;
}
void setLoadProgress(int progress) {
state.loadProgress = progress;
ref.notifyListeners();
}
void setCanGoBack(bool value) {
state.canGoBack = value;
ref.notifyListeners();
}
void setCanGoForward(bool value) {
state.canGoForward = value;
ref.notifyListeners();
}
}

2
lib/screens/webview/provider/webview.provider.g.dart
View File

@@ -6,7 +6,7 @@ part of 'webview.provider.dart';
// RiverpodGenerator
// **************************************************************************
String _$webViewHash() => r'9eb114ec97e04b92aa1e2ec9fc8948b1443c948c';
String _$webViewHash() => r'55d815688ade5764e1b2b4c862f81df45d98ae3b';
/// See also [WebView].
@ProviderFor(WebView)

97
lib/screens/webview/ui/webview.dart
View File

@@ -1,9 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:linkdy/models/data/bookmarks.dart';
import 'package:linkdy/screens/webview/provider/webview.provider.dart';
import 'package:webview_flutter/webview_flutter.dart';
import 'package:linkdy/models/data/bookmarks.dart';
import 'package:linkdy/i18n/strings.g.dart';
class WebView extends ConsumerWidget {
final Bookmark bookmark;
@@ -15,17 +17,92 @@ class WebView extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
WidgetsBinding.instance.addPostFrameCallback((_) {
ref.read(webViewProvider.notifier).initialize(bookmark.url!);
});
final webViewController = ref.watch(webViewProvider).webViewController;
return Scaffold(
appBar: AppBar(
title: Text(bookmark.title != "" ? bookmark.title! : bookmark.websiteTitle!),
elevation: 3,
title: Column(
children: [
Text(
bookmark.title != "" ? bookmark.title! : bookmark.websiteTitle!,
style: const TextStyle(fontSize: 14),
),
const SizedBox(height: 4),
Text(
bookmark.url!,
style: TextStyle(
fontSize: 12,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
],
),
bottom: PreferredSize(
preferredSize: const Size(double.maxFinite, 0),
child: ref.watch(webViewProvider).loadProgress < 100
? LinearProgressIndicator(
value: ref.watch(webViewProvider).loadProgress.toDouble(),
)
: const SizedBox(
height: 4,
),
),
),
body: SafeArea(
child: Column(
children: [
Expanded(
child: InAppWebView(
initialUrlRequest: URLRequest(url: WebUri.uri(Uri.parse(bookmark.url!))),
onWebViewCreated: (controller) {
ref.read(webViewProvider).inAppWebViewController = controller;
},
onPermissionRequest: (controller, request) async {
return PermissionResponse(
resources: request.resources,
action: PermissionResponseAction.DENY,
);
},
onProgressChanged: (controller, progress) {
ref.read(webViewProvider.notifier).setLoadProgress(progress);
},
initialSettings: InAppWebViewSettings(
allowContentAccess: false,
allowFileAccess: false,
applePayAPIEnabled: false,
cacheEnabled: false,
isInspectable: false,
),
onUpdateVisitedHistory: (controller, url, androidIsReload) {
controller.canGoBack().then((value) => ref.read(webViewProvider.notifier).setCanGoBack(value));
controller.canGoForward().then((value) => ref.read(webViewProvider.notifier).setCanGoForward(value));
},
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
children: [
IconButton(
onPressed: ref.watch(webViewProvider).canGoBack == true
? () => ref.watch(webViewProvider).inAppWebViewController?.goBack()
: null,
icon: const Icon(Icons.arrow_back_rounded),
tooltip: t.webview.goForward,
),
const SizedBox(width: 8),
IconButton(
onPressed: ref.watch(webViewProvider).canGoForward == true
? () => ref.watch(webViewProvider).inAppWebViewController?.goForward()
: null,
icon: const Icon(Icons.arrow_forward_rounded),
tooltip: t.webview.goForward,
),
],
),
),
],
),
),
body: webViewController != null ? WebViewWidget(controller: ref.watch(webViewProvider).webViewController!) : null,
);
}
}