improve readerability handling
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
|
||||
import 'package:lensai/features/settings/data/models/settings.dart';
|
||||
import 'package:lensai/features/settings/data/repositories/settings_repository.dart';
|
||||
import 'package:lensai/features/web_view/domain/entities/consistent_controller.dart';
|
||||
import 'package:lensai/features/web_view/domain/providers.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
||||
@@ -8,11 +9,13 @@ part 'readerability_script.g.dart';
|
||||
|
||||
@Riverpod()
|
||||
class ReaderabilityScriptService extends _$ReaderabilityScriptService {
|
||||
late InAppWebViewController? _controller;
|
||||
late Future<String> _readerabilityScript;
|
||||
late bool _enableReadability;
|
||||
|
||||
@override
|
||||
Future<void> build(InAppWebViewController? controller) async {
|
||||
Future<void> build(ConsistentController controller) async {
|
||||
_controller = controller.value;
|
||||
_readerabilityScript = ref.watch(readerabilityScriptProvider.future);
|
||||
_enableReadability = ref.watch(
|
||||
settingsRepositoryProvider.select(
|
||||
@@ -23,15 +26,15 @@ class ReaderabilityScriptService extends _$ReaderabilityScriptService {
|
||||
}
|
||||
|
||||
Future<void> _injectScript() async {
|
||||
if (controller != null) {
|
||||
if (_controller != null) {
|
||||
await _readerabilityScript
|
||||
.then((script) => controller!.evaluateJavascript(source: script));
|
||||
.then((script) => _controller!.evaluateJavascript(source: script));
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _ensureScriptInjected() async {
|
||||
if (controller != null) {
|
||||
final injected = await controller!.evaluateJavascript(
|
||||
if (_controller != null) {
|
||||
final injected = await _controller!.evaluateJavascript(
|
||||
source:
|
||||
"(typeof window !== 'undefined' && typeof window.isReaderable === 'function')",
|
||||
) as bool;
|
||||
@@ -46,8 +49,8 @@ class ReaderabilityScriptService extends _$ReaderabilityScriptService {
|
||||
if (_enableReadability) {
|
||||
await _ensureScriptInjected();
|
||||
|
||||
if (controller != null) {
|
||||
return await controller!.evaluateJavascript(
|
||||
if (_controller != null) {
|
||||
return await _controller!.evaluateJavascript(
|
||||
source: 'isReaderable();',
|
||||
) as bool;
|
||||
}
|
||||
@@ -60,8 +63,8 @@ class ReaderabilityScriptService extends _$ReaderabilityScriptService {
|
||||
if (_enableReadability) {
|
||||
await _ensureScriptInjected();
|
||||
|
||||
if (controller != null) {
|
||||
await controller!.evaluateJavascript(source: 'applyReaderable();');
|
||||
if (_controller != null) {
|
||||
await _controller!.evaluateJavascript(source: 'applyReaderable();');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ part of 'readerability_script.dart';
|
||||
// **************************************************************************
|
||||
|
||||
String _$readerabilityScriptServiceHash() =>
|
||||
r'7a4fe65f683c31545b2f2bcb3ea199619be4bf4b';
|
||||
r'bb38e2934ed124502b70faed11b6921c40d0eec2';
|
||||
|
||||
/// Copied from Dart SDK
|
||||
class _SystemHash {
|
||||
@@ -32,10 +32,10 @@ class _SystemHash {
|
||||
|
||||
abstract class _$ReaderabilityScriptService
|
||||
extends BuildlessAutoDisposeAsyncNotifier<void> {
|
||||
late final InAppWebViewController? controller;
|
||||
late final ConsistentController controller;
|
||||
|
||||
FutureOr<void> build(
|
||||
InAppWebViewController? controller,
|
||||
ConsistentController controller,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ class ReaderabilityScriptServiceFamily extends Family<AsyncValue<void>> {
|
||||
|
||||
/// See also [ReaderabilityScriptService].
|
||||
ReaderabilityScriptServiceProvider call(
|
||||
InAppWebViewController? controller,
|
||||
ConsistentController controller,
|
||||
) {
|
||||
return ReaderabilityScriptServiceProvider(
|
||||
controller,
|
||||
@@ -87,7 +87,7 @@ class ReaderabilityScriptServiceProvider
|
||||
void> {
|
||||
/// See also [ReaderabilityScriptService].
|
||||
ReaderabilityScriptServiceProvider(
|
||||
InAppWebViewController? controller,
|
||||
ConsistentController controller,
|
||||
) : this._internal(
|
||||
() => ReaderabilityScriptService()..controller = controller,
|
||||
from: readerabilityScriptServiceProvider,
|
||||
@@ -112,7 +112,7 @@ class ReaderabilityScriptServiceProvider
|
||||
required this.controller,
|
||||
}) : super.internal();
|
||||
|
||||
final InAppWebViewController? controller;
|
||||
final ConsistentController controller;
|
||||
|
||||
@override
|
||||
FutureOr<void> runNotifierBuild(
|
||||
@@ -163,7 +163,7 @@ class ReaderabilityScriptServiceProvider
|
||||
mixin ReaderabilityScriptServiceRef
|
||||
on AutoDisposeAsyncNotifierProviderRef<void> {
|
||||
/// The parameter `controller` of this provider.
|
||||
InAppWebViewController? get controller;
|
||||
ConsistentController get controller;
|
||||
}
|
||||
|
||||
class _ReaderabilityScriptServiceProviderElement
|
||||
@@ -172,7 +172,7 @@ class _ReaderabilityScriptServiceProviderElement
|
||||
_ReaderabilityScriptServiceProviderElement(super.provider);
|
||||
|
||||
@override
|
||||
InAppWebViewController? get controller =>
|
||||
ConsistentController get controller =>
|
||||
(origin as ReaderabilityScriptServiceProvider).controller;
|
||||
}
|
||||
// ignore_for_file: type=lint
|
||||
|
||||
Reference in New Issue
Block a user