Skip to content

Commit 18da2a6

Browse files
authored
[webview_flutter] Update code by flutter version-up (flutter-tizen#49)
* Update the code by the header name changes in flutter engine * Add an unimplemented function for flutter sdk * Add a cookie-enabled lightweight-web-engine library * Fix a rpath bug * Code cleanup
1 parent 1b6eeed commit 18da2a6

9 files changed

+297
-329
lines changed

packages/webview_flutter/lib/webview_flutter_tizen.dart

+23-26
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ class TizenViewController extends PlatformViewController {
145145

146146
set pointTransformer(PointTransformer transformer) {
147147
assert(transformer != null);
148-
// _motionEventConverter._pointTransformer = transformer;
149148
}
150149

151150
bool get isCreated => _state == _TizenViewState.created;
@@ -167,12 +166,16 @@ class TizenViewController extends PlatformViewController {
167166
assert(_state != _TizenViewState.disposed,
168167
'trying to set a layout direction for a disposed UIView. View id: $viewId');
169168

170-
if (layoutDirection == _layoutDirection) return;
169+
if (layoutDirection == _layoutDirection) {
170+
return;
171+
}
171172

172173
assert(layoutDirection != null);
173174
_layoutDirection = layoutDirection;
174175

175-
if (_state == _TizenViewState.waitingForSize) return;
176+
if (_state == _TizenViewState.waitingForSize) {
177+
return;
178+
}
176179

177180
await SystemChannels.platform_views
178181
.invokeMethod<void>('setDirection', <String, dynamic>{
@@ -183,6 +186,10 @@ class TizenViewController extends PlatformViewController {
183186

184187
@override
185188
Future<void> dispatchPointerEvent(PointerEvent event) async {
189+
if (event is PointerHoverEvent) {
190+
return;
191+
}
192+
186193
int eventType = 0;
187194
if (event is PointerDownEvent) {
188195
eventType = 0;
@@ -191,8 +198,7 @@ class TizenViewController extends PlatformViewController {
191198
} else if (event is PointerUpEvent) {
192199
eventType = 2;
193200
} else {
194-
// TODO: Not implemented.
195-
return;
201+
throw UnimplementedError('Not Implemented');
196202
}
197203
await SystemChannels.platform_views
198204
.invokeMethod<dynamic>('touch', <String, dynamic>{
@@ -456,7 +462,9 @@ class RenderTizenView extends RenderBox with _PlatformViewGestureMixin {
456462
set viewController(TizenViewController viewController) {
457463
assert(_viewController != null);
458464
assert(viewController != null);
459-
if (_viewController == viewController) return;
465+
if (_viewController == viewController) {
466+
return;
467+
}
460468
_viewController.removeOnPlatformViewCreatedListener(_onPlatformViewCreated);
461469
_viewController = viewController;
462470
_sizePlatformView();
@@ -513,8 +521,9 @@ class RenderTizenView extends RenderBox with _PlatformViewGestureMixin {
513521

514522
@override
515523
void paint(PaintingContext context, Offset offset) {
516-
if (_viewController.textureId == null) return;
517-
524+
if (_viewController.textureId == null) {
525+
return;
526+
}
518527
if (size.width < _currentTizenViewSize.width ||
519528
size.height < _currentTizenViewSize.height) {
520529
context.pushClipRect(true, offset, offset & size, _paintTexture);
@@ -705,18 +714,6 @@ class _TizenWebViewState extends State<TizenView> {
705714
}
706715
}
707716

708-
// class TizenMethodChannelWebViewPlatform extends MethodChannelWebViewPlatform {
709-
// TizenMethodChannelWebViewPlatform(
710-
// int id, WebViewPlatformCallbacksHandler handler)
711-
// : super(id, handler) {
712-
// print("[MONG] TizenMethodChannelWebViewPlatform : " + id.toString());
713-
// }
714-
// static Map<String, dynamic> creationParamsToMap(
715-
// CreationParams creationParams) {
716-
// return MethodChannelWebViewPlatform.creationParamsToMap(creationParams);
717-
// }
718-
// }
719-
720717
class TizenWebView implements WebViewPlatform {
721718
@override
722719
Widget build({
@@ -825,23 +822,23 @@ mixin _PlatformViewGestureMixin on RenderBox implements MouseTrackerAnnotation {
825822
@override
826823
PointerEnterEventListener get onEnter => null;
827824

828-
@override
829-
PointerHoverEventListener get onHover => _handleHover;
830-
void _handleHover(PointerHoverEvent event) {
831-
if (_handlePointerEvent != null) _handlePointerEvent(event);
832-
}
833-
834825
@override
835826
PointerExitEventListener get onExit => null;
836827

837828
@override
838829
MouseCursor get cursor => MouseCursor.uncontrolled;
839830

831+
@override
832+
bool get validForMouseTracker => true;
833+
840834
@override
841835
void handleEvent(PointerEvent event, HitTestEntry entry) {
842836
if (event is PointerDownEvent) {
843837
_gestureRecognizer.addPointer(event);
844838
}
839+
if (event is PointerHoverEvent) {
840+
_handlePointerEvent?.call(event);
841+
}
845842
}
846843

847844
@override

packages/webview_flutter/pubspec.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: webview_flutter_tizen
22
description: Tizen implementation of the webview plugin
3-
version: 0.0.1
3+
homepage: https://github.com/flutter-tizen/plugins
4+
version: 1.0.0
45

56
environment:
67
sdk: ">=2.2.2 <3.0.0"
@@ -9,6 +10,7 @@ environment:
910
dependencies:
1011
flutter:
1112
sdk: flutter
13+
webview_flutter: ^1.0.5
1214

1315
dev_dependencies:
1416
flutter_test:
Binary file not shown.

packages/webview_flutter/tizen/project_def.prop

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ USER_CPP_UNDEFS =
1717
# Compiler/linker flags
1818
USER_CFLAGS_MISC =
1919
USER_CPPFLAGS_MISC = -c -fmessage-length=0
20-
USER_LFLAGS = -llightweight-web-engine.mobile -Wl,-rpath=/opt/usr/globalapps/org.tizen.webview_flutter_tizen_example/lib/arm
20+
USER_LFLAGS = -llightweight-web-engine.mobile -Wl,-rpath=/opt/usr/home/owner/apps_rw/org.tizen.webview_flutter_tizen_example/lib/arm
2121

2222
# Libraries and objects
2323
USER_LIB_DIRS = lib

0 commit comments

Comments
 (0)