Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues brought up by pub.dev score analyzer #1088

Merged
merged 1 commit into from
Jun 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
801 changes: 443 additions & 358 deletions lib/custom_render.dart

Large diffs are not rendered by default.

18 changes: 13 additions & 5 deletions lib/flutter_html.dart
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,19 @@ class _HtmlState extends State<Html> {
@override
void initState() {
super.initState();
documentElement = widget.data != null ? HtmlParser.parseHTML(widget.data!) : widget.documentElement!;
documentElement = widget.data != null
? HtmlParser.parseHTML(widget.data!)
: widget.documentElement!;
}

@override
void didUpdateWidget(Html oldWidget) {
super.didUpdateWidget(oldWidget);
if ((widget.data != null && oldWidget.data != widget.data) || oldWidget.documentElement != widget.documentElement) {
documentElement = widget.data != null ? HtmlParser.parseHTML(widget.data!) : widget.documentElement!;
if ((widget.data != null && oldWidget.data != widget.data) ||
oldWidget.documentElement != widget.documentElement) {
documentElement = widget.data != null
? HtmlParser.parseHTML(widget.data!)
: widget.documentElement!;
}
}

Expand Down Expand Up @@ -333,7 +338,9 @@ class _SelectableHtmlState extends State<SelectableHtml> {
@override
void initState() {
super.initState();
documentElement = widget.data != null ? HtmlParser.parseHTML(widget.data!) : widget.documentElement!;
documentElement = widget.data != null
? HtmlParser.parseHTML(widget.data!)
: widget.documentElement!;
}

@override
Expand All @@ -354,7 +361,8 @@ class _SelectableHtmlState extends State<SelectableHtml> {
customRenders: {}
..addAll(widget.customRenders)
..addAll(defaultRenders),
tagsList: widget.tagsList.isEmpty ? SelectableHtml.tags : widget.tagsList,
tagsList:
widget.tagsList.isEmpty ? SelectableHtml.tags : widget.tagsList,
selectionControls: widget.selectionControls,
scrollPhysics: widget.scrollPhysics,
),
Expand Down
3 changes: 3 additions & 0 deletions packages/flutter_html_all/example/example.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Example

### Coming soon...
2 changes: 2 additions & 0 deletions packages/flutter_html_all/lib/flutter_html_all.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/// Package flutter_html_all is used to get access to all
/// of the extended features of the flutter_html package.
library flutter_html_all;

export 'package:flutter_html_audio/flutter_html_audio.dart';
Expand Down
3 changes: 3 additions & 0 deletions packages/flutter_html_audio/example/example.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Example

### Coming soon...
34 changes: 22 additions & 12 deletions packages/flutter_html_audio/lib/flutter_html_audio.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,24 @@ import 'package:flutter_html/flutter_html.dart';
import 'package:video_player/video_player.dart';
import 'package:html/dom.dart' as dom;

typedef AudioControllerCallback = void Function(dom.Element?, ChewieAudioController, VideoPlayerController);
typedef AudioControllerCallback = void Function(
dom.Element?, ChewieAudioController, VideoPlayerController);

CustomRender audioRender({AudioControllerCallback? onControllerCreated})
=> CustomRender.widget(widget: (context, buildChildren)
=> AudioWidget(context: context, callback: onControllerCreated));
/// The CustomRender function for the `<audio>` tag
CustomRender audioRender({AudioControllerCallback? onControllerCreated}) =>
CustomRender.widget(
widget: (context, buildChildren) => AudioWidget(
context: context,
callback: onControllerCreated,
),
);

/// The CustomRenderMatcher that will match the `<audio>` tag
CustomRenderMatcher audioMatcher() => (context) {
return context.tree.element?.localName == "audio";
};
return context.tree.element?.localName == "audio";
};

/// A widget used for rendering an audio player in the HTML tree
class AudioWidget extends StatefulWidget {
final RenderContext context;
final AudioControllerCallback? callback;
Expand All @@ -39,7 +47,8 @@ class _AudioWidgetState extends State<AudioWidget> {
sources = <String?>[
if (widget.context.tree.element?.attributes['src'] != null)
widget.context.tree.element!.attributes['src'],
...ReplacedElement.parseMediaSources(widget.context.tree.element!.children),
...ReplacedElement.parseMediaSources(
widget.context.tree.element!.children),
];
if (sources.isNotEmpty && sources.first != null) {
audioController = VideoPlayerController.network(
Expand All @@ -49,10 +58,12 @@ class _AudioWidgetState extends State<AudioWidget> {
videoPlayerController: audioController!,
autoPlay: widget.context.tree.element?.attributes['autoplay'] != null,
looping: widget.context.tree.element?.attributes['loop'] != null,
showControls: widget.context.tree.element?.attributes['controls'] != null,
showControls:
widget.context.tree.element?.attributes['controls'] != null,
autoInitialize: true,
);
widget.callback?.call(widget.context.tree.element, chewieAudioController!, audioController!);
widget.callback?.call(widget.context.tree.element, chewieAudioController!,
audioController!);
}
super.initState();
}
Expand All @@ -72,11 +83,10 @@ class _AudioWidgetState extends State<AudioWidget> {
return Container(
key: widget.context.key,
width: widget.context.style.width ?? 300,
height: Theme.of(bContext).platform == TargetPlatform.android
? 48 : 75,
height: Theme.of(bContext).platform == TargetPlatform.android ? 48 : 75,
child: ChewieAudio(
controller: chewieAudioController!,
),
);
}
}
}
2 changes: 1 addition & 1 deletion packages/flutter_html_audio/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: flutter_html_audio
description: Audio widget for flutter_html.
description: This extension package allows the <audio> tag to be rendered using the flutter_html package
version: 3.0.0-alpha.3
homepage: https://github.com/Sub6Resources/flutter_html

Expand Down
3 changes: 3 additions & 0 deletions packages/flutter_html_iframe/example/example.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Example

### Coming soon...
8 changes: 4 additions & 4 deletions packages/flutter_html_iframe/lib/flutter_html_iframe.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ library flutter_html_iframe;
import 'package:flutter_html/custom_render.dart';

export 'iframe_unsupported.dart'
if (dart.library.io) 'iframe_mobile.dart'
if (dart.library.html) 'iframe_web.dart';
if (dart.library.io) 'iframe_mobile.dart'
if (dart.library.html) 'iframe_web.dart';

CustomRenderMatcher iframeMatcher() => (context) {
return context.tree.element?.localName == "iframe";
};
return context.tree.element?.localName == "iframe";
};
55 changes: 30 additions & 25 deletions packages/flutter_html_iframe/lib/iframe_mobile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,33 @@ import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:webview_flutter/webview_flutter.dart';

CustomRender iframeRender({NavigationDelegate? navigationDelegate}) => CustomRender.widget(widget: (context, buildChildren) {
final sandboxMode = context.tree.element?.attributes["sandbox"];
final UniqueKey key = UniqueKey();
final givenWidth = double.tryParse(context.tree.element?.attributes['width'] ?? "");
final givenHeight = double.tryParse(context.tree.element?.attributes['height'] ?? "");
return Container(
width: givenWidth ?? (givenHeight ?? 150) * 2,
height: givenHeight ?? (givenWidth ?? 300) / 2,
child: ContainerSpan(
style: context.style,
newContext: context,
child: WebView(
initialUrl: context.tree.element?.attributes['src'],
key: key,
javascriptMode: sandboxMode == null || sandboxMode == "allow-scripts"
? JavascriptMode.unrestricted
: JavascriptMode.disabled,
navigationDelegate: navigationDelegate,
gestureRecognizers: {
Factory<VerticalDragGestureRecognizer>(() => VerticalDragGestureRecognizer())
},
),
),
);
});
CustomRender iframeRender({NavigationDelegate? navigationDelegate}) =>
CustomRender.widget(widget: (context, buildChildren) {
final sandboxMode = context.tree.element?.attributes["sandbox"];
final UniqueKey key = UniqueKey();
final givenWidth =
double.tryParse(context.tree.element?.attributes['width'] ?? "");
final givenHeight =
double.tryParse(context.tree.element?.attributes['height'] ?? "");
return Container(
width: givenWidth ?? (givenHeight ?? 150) * 2,
height: givenHeight ?? (givenWidth ?? 300) / 2,
child: ContainerSpan(
style: context.style,
newContext: context,
child: WebView(
initialUrl: context.tree.element?.attributes['src'],
key: key,
javascriptMode:
sandboxMode == null || sandboxMode == "allow-scripts"
? JavascriptMode.unrestricted
: JavascriptMode.disabled,
navigationDelegate: navigationDelegate,
gestureRecognizers: {
Factory<VerticalDragGestureRecognizer>(
() => VerticalDragGestureRecognizer())
},
),
),
);
});
11 changes: 6 additions & 5 deletions packages/flutter_html_iframe/lib/iframe_unsupported.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:webview_flutter/webview_flutter.dart';

CustomRender iframeRender({NavigationDelegate? navigationDelegate}) => CustomRender.widget(widget: (context, buildChildren) {
return Container(
child: Text("Iframes are currently not supported in this environment"),
);
});
CustomRender iframeRender({NavigationDelegate? navigationDelegate}) =>
CustomRender.widget(widget: (context, buildChildren) {
return Container(
child: Text("Iframes are currently not supported in this environment"),
);
});
68 changes: 39 additions & 29 deletions packages/flutter_html_iframe/lib/iframe_web.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,46 @@ import 'dart:html' as html;

import 'package:webview_flutter/webview_flutter.dart';

CustomRender iframeRender({NavigationDelegate? navigationDelegate}) => CustomRender.widget(widget: (context, buildChildren) {
final givenWidth = double.tryParse(context.tree.element?.attributes['width'] ?? "");
final givenHeight = double.tryParse(context.tree.element?.attributes['height'] ?? "");
final html.IFrameElement iframe = html.IFrameElement()
..width = (givenWidth ?? (givenHeight ?? 150) * 2).toString()
..height = (givenHeight ?? (givenWidth ?? 300) / 2).toString()
..src = context.tree.element?.attributes['src']
..style.border = 'none';
final String createdViewId = getRandString(10);
ui.platformViewRegistry.registerViewFactory(createdViewId, (int viewId) => iframe);
return Container(
width: double.tryParse(context.tree.element?.attributes['width'] ?? "")
?? (double.tryParse(context.tree.element?.attributes['height'] ?? "") ?? 150) * 2,
height: double.tryParse(context.tree.element?.attributes['height'] ?? "")
?? (double.tryParse(context.tree.element?.attributes['width'] ?? "") ?? 300) / 2,
child: ContainerSpan(
style: context.style,
newContext: context,
child: Directionality(
textDirection: TextDirection.ltr,
child: HtmlElementView(
viewType: createdViewId,
)
),
)
);
});
CustomRender iframeRender({NavigationDelegate? navigationDelegate}) =>
CustomRender.widget(widget: (context, buildChildren) {
final givenWidth =
double.tryParse(context.tree.element?.attributes['width'] ?? "");
final givenHeight =
double.tryParse(context.tree.element?.attributes['height'] ?? "");
final html.IFrameElement iframe = html.IFrameElement()
..width = (givenWidth ?? (givenHeight ?? 150) * 2).toString()
..height = (givenHeight ?? (givenWidth ?? 300) / 2).toString()
..src = context.tree.element?.attributes['src']
..style.border = 'none';
final String createdViewId = getRandString(10);
ui.platformViewRegistry
.registerViewFactory(createdViewId, (int viewId) => iframe);
return Container(
width: double.tryParse(
context.tree.element?.attributes['width'] ?? "") ??
(double.tryParse(
context.tree.element?.attributes['height'] ?? "") ??
150) *
2,
height: double.tryParse(
context.tree.element?.attributes['height'] ?? "") ??
(double.tryParse(
context.tree.element?.attributes['width'] ?? "") ??
300) /
2,
child: ContainerSpan(
style: context.style,
newContext: context,
child: Directionality(
textDirection: TextDirection.ltr,
child: HtmlElementView(
viewType: createdViewId,
)),
));
});

String getRandString(int len) {
var random = Random.secure();
var values = List<int>.generate(len, (i) => random.nextInt(255));
var values = List<int>.generate(len, (i) => random.nextInt(255));
return base64UrlEncode(values);
}
}
2 changes: 1 addition & 1 deletion packages/flutter_html_iframe/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: flutter_html_iframe
description: Iframe widget for flutter_html.
description: This extension package allows the <iframe> tag to be rendered using the flutter_html package
version: 3.0.0-alpha.3
homepage: https://github.com/Sub6Resources/flutter_html

Expand Down
3 changes: 3 additions & 0 deletions packages/flutter_html_math/example/example.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Example

### Coming soon...
Loading