diff --git a/integration_tests/lib/bridge/from_native.dart b/integration_tests/lib/bridge/from_native.dart index 3a3eb69327..aee0635177 100644 --- a/integration_tests/lib/bridge/from_native.dart +++ b/integration_tests/lib/bridge/from_native.dart @@ -11,9 +11,9 @@ import 'dart:io' show Platform; import 'dart:typed_data'; import 'package:ffi/ffi.dart'; import 'package:flutter/material.dart'; -import 'package:kraken/launcher.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/bridge.dart'; +import 'package:webf/launcher.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/bridge.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:test/test.dart'; diff --git a/integration_tests/lib/bridge/to_native.dart b/integration_tests/lib/bridge/to_native.dart index 0eb96bc5c1..c1c347b234 100644 --- a/integration_tests/lib/bridge/to_native.dart +++ b/integration_tests/lib/bridge/to_native.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:ffi'; import 'package:ffi/ffi.dart'; -import 'package:kraken/bridge.dart'; +import 'package:webf/bridge.dart'; // Steps for using dart:ffi to call a C function from Dart: // 1. Import dart:ffi. diff --git a/integration_tests/lib/custom/custom_element.dart b/integration_tests/lib/custom/custom_element.dart index 3ee787ea03..a53a9bb894 100644 --- a/integration_tests/lib/custom/custom_element.dart +++ b/integration_tests/lib/custom/custom_element.dart @@ -2,9 +2,9 @@ * Copyright (C) 2022-present The Kraken authors. All rights reserved. */ import 'dart:async'; -import 'package:kraken/dom.dart' as dom; -import 'package:kraken/foundation.dart'; -import 'package:kraken/widget.dart'; +import 'package:webf/dom.dart' as dom; +import 'package:webf/foundation.dart'; +import 'package:webf/widget.dart'; import 'package:waterfall_flow/waterfall_flow.dart'; import 'package:flutter/material.dart'; diff --git a/integration_tests/lib/custom/custom_object_element.dart b/integration_tests/lib/custom/custom_object_element.dart index bce2739b26..a75a7bdca6 100644 --- a/integration_tests/lib/custom/custom_object_element.dart +++ b/integration_tests/lib/custom/custom_object_element.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:flutter/rendering.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/dom.dart'; import 'package:kraken_video_player/video_player.dart'; class CustomObjectElement implements ObjectElementClient { diff --git a/integration_tests/lib/main.dart b/integration_tests/lib/main.dart index b4da5d49d6..57d23aff68 100644 --- a/integration_tests/lib/main.dart +++ b/integration_tests/lib/main.dart @@ -5,10 +5,10 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/kraken.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/kraken.dart'; import 'package:ansicolor/ansicolor.dart'; import 'package:path/path.dart' as path; diff --git a/integration_tests/pubspec.yaml b/integration_tests/pubspec.yaml index 4368321462..f599e59f08 100644 --- a/integration_tests/pubspec.yaml +++ b/integration_tests/pubspec.yaml @@ -17,15 +17,15 @@ environment: sdk: '>=2.12.0 <3.0.0' dependency_overrides: - kraken: - path: ../kraken + webf: + path: ../webf dependencies: ffi: ^1.0.0 colorize: ^3.0.0 flutter: sdk: flutter - kraken: 0.8.0-dev.1 + webf: ^0.0.1 image: ^3.0.2 kraken_video_player: ^2.4.0 kraken_websocket: ^2.0.0 diff --git a/package.json b/package.json index 3f9eed2557..feca1ba621 100644 --- a/package.json +++ b/package.json @@ -21,13 +21,13 @@ "pretest": "npm install && ENABLE_ASAN=true node scripts/build_darwin_dylib", "posttest": "npm run lint", "benchmark": "npm install && ENABLE_PROFILE=true KRAKEN_BUILD=Release node scripts/run_benchmark.js", - "start": "cd kraken/example && flutter run", + "start": "cd webf/example && flutter run", "test": "node scripts/run_test.js", "plugin_test": "node scripts/run_plugin_test.js", - "lint": "cd kraken && flutter pub get && flutter analyze", - "format": "cd kraken && flutter format . --line-length=120", + "lint": "cd webf && flutter pub get && flutter analyze", + "format": "cd webf && flutter format . --line-length=120", "ci": "npm install && npm run lint", - "test:unit:report": "lcov-summary kraken/coverage/lcov.info" + "test:unit:report": "lcov-summary webf/coverage/lcov.info" }, "devDependencies": { "ali-oss": "^6.13.2", diff --git a/webf/android/src/main/java/com/openwebf/webf/Webf.java b/webf/android/src/main/java/com/openwebf/webf/WebF.java similarity index 86% rename from webf/android/src/main/java/com/openwebf/webf/Webf.java rename to webf/android/src/main/java/com/openwebf/webf/WebF.java index 824911ff8c..7bd6e47d66 100644 --- a/webf/android/src/main/java/com/openwebf/webf/Webf.java +++ b/webf/android/src/main/java/com/openwebf/webf/WebF.java @@ -2,15 +2,14 @@ import android.os.Handler; import android.os.Looper; - -import java.util.HashMap; -import java.util.Map; - import io.flutter.embedding.engine.FlutterEngine; import io.flutter.embedding.engine.plugins.PluginRegistry; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; +import java.util.HashMap; +import java.util.Map; + public class WebF { private String url; @@ -18,9 +17,9 @@ public class WebF { private FlutterEngine flutterEngine; private MethodChannel.MethodCallHandler handler; - private static Map sdkMap = new HashMap<>(); + private static Map sdkMap = new HashMap<>(); - public Kraken(FlutterEngine flutterEngine) { + public WebF(FlutterEngine flutterEngine) { if (flutterEngine != null) { this.flutterEngine = flutterEngine; sdkMap.put(flutterEngine, this); @@ -29,15 +28,17 @@ public Kraken(FlutterEngine flutterEngine) { } } - public static Kraken get(FlutterEngine engine) { + public static WebF get(FlutterEngine engine) { return sdkMap.get(engine); } public void registerMethodCallHandler(MethodChannel.MethodCallHandler handler) { this.handler = handler; } + /** * Load url. + * * @param url */ public void loadUrl(String url) { @@ -46,6 +47,7 @@ public void loadUrl(String url) { /** * Set the dynamic library path. + * * @param value */ public void setDynamicLibraryPath(String value) { @@ -74,7 +76,7 @@ public void invokeMethod(final String method, final Object arguments) { public void run() { if (flutterEngine != null) { PluginRegistry pluginRegistry = flutterEngine.getPlugins(); - KrakenPlugin krakenSDKPlugin = (KrakenPlugin) pluginRegistry.get(KrakenPlugin.class); + WebfPlugin krakenSDKPlugin = (WebfPlugin) pluginRegistry.get(WebfPlugin.class); if (krakenSDKPlugin != null && krakenSDKPlugin.channel != null) { krakenSDKPlugin.channel.invokeMethod(method, arguments); } @@ -86,7 +88,7 @@ public void run() { public void reload() { if (flutterEngine != null) { PluginRegistry pluginRegistry = flutterEngine.getPlugins(); - KrakenPlugin krakenSDKPlugin = (KrakenPlugin) pluginRegistry.get(KrakenPlugin.class); + WebfPlugin krakenSDKPlugin = (WebfPlugin) pluginRegistry.get(WebfPlugin.class); if (krakenSDKPlugin != null) { krakenSDKPlugin.reload(); } diff --git a/webf/android/src/main/java/com/openwebf/webf/WebfPlugin.java b/webf/android/src/main/java/com/openwebf/webf/WebfPlugin.java index 70d8a5e33c..08795490d0 100644 --- a/webf/android/src/main/java/com/openwebf/webf/WebfPlugin.java +++ b/webf/android/src/main/java/com/openwebf/webf/WebfPlugin.java @@ -1,4 +1,4 @@ -package com.openkraken.kraken; +package com.openwebf.webf; import android.content.Context; import io.flutter.embedding.engine.FlutterEngine; @@ -12,101 +12,101 @@ /** * KrakenPlugin */ -public class KrakenPlugin implements FlutterPlugin, MethodCallHandler { - /// The MethodChannel that will the communication between Flutter and native Android - /// - /// This local reference serves to register the plugin with the Flutter Engine and unregister it - /// when the Flutter Engine is detached from the Activity - public MethodChannel channel; - private FlutterEngine flutterEngine; - private Context mContext; - private Kraken mKraken; +public class WebfPlugin implements FlutterPlugin, MethodCallHandler { + /// The MethodChannel that will the communication between Flutter and native Android + /// + /// This local reference serves to register the plugin with the Flutter Engine and unregister it + /// when the Flutter Engine is detached from the Activity + public MethodChannel channel; + private FlutterEngine flutterEngine; + private Context mContext; + private WebF mKraken; - // This static function is optional and equivalent to onAttachedToEngine. It supports the old - // pre-Flutter-1.12 Android projects. You are encouraged to continue supporting - // plugin registration via this function while apps migrate to use the new Android APIs - // post-flutter-1.12 via https://flutter.dev/go/android-project-migration. - // - // It is encouraged to share logic between onAttachedToEngine and registerWith to keep - // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called - // depending on the user's project. onAttachedToEngine or registerWith must both be defined - // in the same class. - public static void registerWith(Registrar registrar) { - final MethodChannel channel = new MethodChannel(registrar.messenger(), "kraken"); - KrakenPlugin plugin = new KrakenPlugin(); - plugin.mContext = registrar.context(); - channel.setMethodCallHandler(plugin); - } + // This static function is optional and equivalent to onAttachedToEngine. It supports the old + // pre-Flutter-1.12 Android projects. You are encouraged to continue supporting + // plugin registration via this function while apps migrate to use the new Android APIs + // post-flutter-1.12 via https://flutter.dev/go/android-project-migration. + // + // It is encouraged to share logic between onAttachedToEngine and registerWith to keep + // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called + // depending on the user's project. onAttachedToEngine or registerWith must both be defined + // in the same class. + public static void registerWith(Registrar registrar) { + final MethodChannel channel = new MethodChannel(registrar.messenger(), "kraken"); + WebfPlugin plugin = new WebfPlugin(); + plugin.mContext = registrar.context(); + channel.setMethodCallHandler(plugin); + } - @Override - public void onAttachedToEngine(FlutterPluginBinding flutterPluginBinding) { - mContext = flutterPluginBinding.getApplicationContext(); - channel = new MethodChannel(flutterPluginBinding.getFlutterEngine().getDartExecutor(), "kraken"); - flutterEngine = flutterPluginBinding.getFlutterEngine(); - channel.setMethodCallHandler(this); - } + @Override + public void onAttachedToEngine(FlutterPluginBinding flutterPluginBinding) { + mContext = flutterPluginBinding.getApplicationContext(); + channel = new MethodChannel(flutterPluginBinding.getFlutterEngine().getDartExecutor(), "kraken"); + flutterEngine = flutterPluginBinding.getFlutterEngine(); + channel.setMethodCallHandler(this); + } - public void reload() { - if (channel != null) { - channel.invokeMethod("reload", null); - } + public void reload() { + if (channel != null) { + channel.invokeMethod("reload", null); } + } - Kraken getKraken() { - if (mKraken == null) { - mKraken = Kraken.get(flutterEngine); - } - return mKraken; + WebF getKraken() { + if (mKraken == null) { + mKraken = WebF.get(flutterEngine); } + return mKraken; + } - @Override - public void onMethodCall(MethodCall call, Result result) { - switch (call.method) { - case "getUrl": { - Kraken kraken = getKraken(); - result.success(kraken == null ? "" : kraken.getUrl()); - break; - } + @Override + public void onMethodCall(MethodCall call, Result result) { + switch (call.method) { + case "getUrl": { + WebF kraken = getKraken(); + result.success(kraken == null ? "" : kraken.getUrl()); + break; + } - case "getDynamicLibraryPath": { - Kraken kraken = getKraken(); - result.success(kraken == null ? "" : kraken.getDynamicLibraryPath()); - break; - } + case "getDynamicLibraryPath": { + WebF kraken = getKraken(); + result.success(kraken == null ? "" : kraken.getDynamicLibraryPath()); + break; + } - case "invokeMethod": { - Kraken kraken = getKraken(); - if (kraken != null) { - String method = call.argument("method"); - Object args = call.argument("args"); - assert method != null; - MethodCall callWrap = new MethodCall(method, args); - kraken._handleMethodCall(callWrap, result); - } else { - result.error("Kraken instance not found.", null, null); - } - break; - } + case "invokeMethod": { + WebF kraken = getKraken(); + if (kraken != null) { + String method = call.argument("method"); + Object args = call.argument("args"); + assert method != null; + MethodCall callWrap = new MethodCall(method, args); + kraken._handleMethodCall(callWrap, result); + } else { + result.error("Kraken instance not found.", null, null); + } + break; + } - case "getTemporaryDirectory": - result.success(getTemporaryDirectory()); - break; + case "getTemporaryDirectory": + result.success(getTemporaryDirectory()); + break; - default: - result.notImplemented(); - } + default: + result.notImplemented(); } + } - @Override - public void onDetachedFromEngine(FlutterPluginBinding binding) { - channel.setMethodCallHandler(null); - Kraken kraken = Kraken.get(flutterEngine); - if (kraken == null) return; - kraken.destroy(); - flutterEngine = null; - } + @Override + public void onDetachedFromEngine(FlutterPluginBinding binding) { + channel.setMethodCallHandler(null); + WebF kraken = WebF.get(flutterEngine); + if (kraken == null) return; + kraken.destroy(); + flutterEngine = null; + } - private String getTemporaryDirectory() { - return mContext.getCacheDir().getPath() + "/Kraken"; - } + private String getTemporaryDirectory() { + return mContext.getCacheDir().getPath() + "/Kraken"; + } } diff --git a/webf/example/android/gradle.properties b/webf/example/android/gradle.properties index a6738207fd..f62002efd2 100644 --- a/webf/example/android/gradle.properties +++ b/webf/example/android/gradle.properties @@ -2,3 +2,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true android.enableR8=true + +android.native.buildOutput=verbose diff --git a/webf/example/lib/main.dart b/webf/example/lib/main.dart index 1e9a1ca5b1..b6e6715211 100644 --- a/webf/example/lib/main.dart +++ b/webf/example/lib/main.dart @@ -2,12 +2,12 @@ * Copyright (C) 2022-present The Kraken authors. All rights reserved. */ import 'package:flutter/material.dart'; -import 'package:kraken/kraken.dart'; -import 'package:kraken/devtools.dart'; -import 'package:kraken_websocket/kraken_websocket.dart'; +import 'package:webf/kraken.dart'; +import 'package:webf/devtools.dart'; +// import 'package:kraken_websocket/kraken_websocket.dart'; void main() { - KrakenWebsocket.initialize(); + // KrakenWebsocket.initialize(); runApp(MyApp()); } diff --git a/webf/example/pubspec.yaml b/webf/example/pubspec.yaml index 2dfb5429e4..7f64fa72b7 100644 --- a/webf/example/pubspec.yaml +++ b/webf/example/pubspec.yaml @@ -11,8 +11,8 @@ environment: dependencies: flutter: sdk: flutter - webf: ^0.10.0 - kraken_websocket: ^2.0.0 + webf: ^0.0.1 +# kraken_websocket: ^2.0.0 # When depending on this package from a real application, # you should remove the following overrides. diff --git a/webf/lib/cli.dart b/webf/lib/cli.dart index 3fdcf818ae..5f0a2a95a9 100644 --- a/webf/lib/cli.dart +++ b/webf/lib/cli.dart @@ -1,7 +1,7 @@ /* * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/kraken.dart'; +import 'package:webf/kraken.dart'; void main() { launch(); diff --git a/webf/lib/src/bridge/binding.dart b/webf/lib/src/bridge/binding.dart index 93d545d8d0..62d08555a0 100644 --- a/webf/lib/src/bridge/binding.dart +++ b/webf/lib/src/bridge/binding.dart @@ -9,9 +9,9 @@ import 'dart:ffi'; import 'package:ffi/ffi.dart'; import 'package:flutter/foundation.dart'; -import 'package:kraken/bridge.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/bridge.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; // We have some integrated built-in behavior starting with string prefix reuse the callNativeMethod implements. const String AnonymousFunctionCallPreFix = '_anonymous_fn_'; diff --git a/webf/lib/src/bridge/bridge.dart b/webf/lib/src/bridge/bridge.dart index 47d93d66ea..9ddcdbd1e3 100644 --- a/webf/lib/src/bridge/bridge.dart +++ b/webf/lib/src/bridge/bridge.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/scheduler.dart'; -import 'package:kraken/module.dart'; +import 'package:webf/module.dart'; import 'binding.dart'; import 'from_native.dart'; diff --git a/webf/lib/src/bridge/dynamic_library.dart b/webf/lib/src/bridge/dynamic_library.dart index f9672de2e9..7eab2edd7a 100644 --- a/webf/lib/src/bridge/dynamic_library.dart +++ b/webf/lib/src/bridge/dynamic_library.dart @@ -18,7 +18,7 @@ abstract class KrakenDynamicLibrary { } // The kraken library name. - static String libName = 'libkraken'; + static String libName = 'libwebf'; static String get _nativeDynamicLibraryName { if (Platform.isMacOS) { diff --git a/webf/lib/src/bridge/from_native.dart b/webf/lib/src/bridge/from_native.dart index c742ebebbb..f30186c3a7 100644 --- a/webf/lib/src/bridge/from_native.dart +++ b/webf/lib/src/bridge/from_native.dart @@ -9,10 +9,10 @@ import 'dart:ui'; import 'package:ffi/ffi.dart'; import 'package:flutter/foundation.dart'; -import 'package:kraken/bridge.dart'; -import 'package:kraken/launcher.dart'; -import 'package:kraken/module.dart'; -import 'package:kraken/src/module/performance_timing.dart'; +import 'package:webf/bridge.dart'; +import 'package:webf/launcher.dart'; +import 'package:webf/module.dart'; +import 'package:webf/src/module/performance_timing.dart'; // An native struct can be directly convert to javaScript String without any conversion cost. class NativeString extends Struct { diff --git a/webf/lib/src/bridge/native_value.dart b/webf/lib/src/bridge/native_value.dart index 711b641a00..983f3b85dc 100644 --- a/webf/lib/src/bridge/native_value.dart +++ b/webf/lib/src/bridge/native_value.dart @@ -6,7 +6,7 @@ import 'dart:convert'; import 'dart:ffi'; import 'package:ffi/ffi.dart'; -import 'package:kraken/bridge.dart'; +import 'package:webf/bridge.dart'; class NativeValue extends Struct { @Double() diff --git a/webf/lib/src/bridge/to_native.dart b/webf/lib/src/bridge/to_native.dart index 7668dd1d01..d30f1048ee 100644 --- a/webf/lib/src/bridge/to_native.dart +++ b/webf/lib/src/bridge/to_native.dart @@ -10,8 +10,8 @@ import 'dart:typed_data'; import 'package:ffi/ffi.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/scheduler.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/kraken.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/kraken.dart'; // Steps for using dart:ffi to call a C function from Dart: // 1. Import dart:ffi. diff --git a/webf/lib/src/css/animation.dart b/webf/lib/src/css/animation.dart index 266ede4aad..d0b1ed1fd5 100644 --- a/webf/lib/src/css/animation.dart +++ b/webf/lib/src/css/animation.dart @@ -8,9 +8,9 @@ import 'dart:math'; import 'package:flutter/animation.dart'; import 'package:flutter/scheduler.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/rendering.dart'; // https://drafts.csswg.org/web-animations/#enumdef-animationplaystate enum AnimationPlayState { idle, running, paused, finished } diff --git a/webf/lib/src/css/background.dart b/webf/lib/src/css/background.dart index 53277d7ad6..82fb72bc4e 100644 --- a/webf/lib/src/css/background.dart +++ b/webf/lib/src/css/background.dart @@ -6,10 +6,10 @@ import 'dart:math' as math; import 'package:flutter/painting.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/painting.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/launcher.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/painting.dart'; +import 'package:webf/css.dart'; +import 'package:webf/launcher.dart'; +import 'package:webf/rendering.dart'; // CSS Backgrounds: https://drafts.csswg.org/css-backgrounds/ // CSS Images: https://drafts.csswg.org/css-images-3/ diff --git a/webf/lib/src/css/border.dart b/webf/lib/src/css/border.dart index ef3ed101fa..3207921b8e 100644 --- a/webf/lib/src/css/border.dart +++ b/webf/lib/src/css/border.dart @@ -4,7 +4,7 @@ import 'dart:core'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; final RegExp _splitRegExp = RegExp(r'\s+'); diff --git a/webf/lib/src/css/border_radius.dart b/webf/lib/src/css/border_radius.dart index 14bb74703f..ab05573b12 100644 --- a/webf/lib/src/css/border_radius.dart +++ b/webf/lib/src/css/border_radius.dart @@ -3,7 +3,7 @@ */ import 'dart:ui'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; mixin CSSBorderRadiusMixin on RenderStyle { CSSBorderRadius? _borderTopLeftRadius; diff --git a/webf/lib/src/css/box.dart b/webf/lib/src/css/box.dart index 35940437c8..986ea2fd1f 100644 --- a/webf/lib/src/css/box.dart +++ b/webf/lib/src/css/box.dart @@ -5,7 +5,7 @@ import 'dart:core'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; // CSS Box Model: https://drafts.csswg.org/css-box-4/ mixin CSSBoxMixin on RenderStyle { diff --git a/webf/lib/src/css/box_shadow.dart b/webf/lib/src/css/box_shadow.dart index 54b0284411..11fff5af94 100644 --- a/webf/lib/src/css/box_shadow.dart +++ b/webf/lib/src/css/box_shadow.dart @@ -1,7 +1,7 @@ /* * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; mixin CSSBoxShadowMixin on RenderStyle { List? _boxShadow; diff --git a/webf/lib/src/css/content_visibility.dart b/webf/lib/src/css/content_visibility.dart index 0f19adae2e..a99af537ab 100644 --- a/webf/lib/src/css/content_visibility.dart +++ b/webf/lib/src/css/content_visibility.dart @@ -2,7 +2,7 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; // CSS Content Visibility: https://www.w3.org/TR/css-contain-2/#content-visibility diff --git a/webf/lib/src/css/display.dart b/webf/lib/src/css/display.dart index cfb09fc367..57699eb790 100644 --- a/webf/lib/src/css/display.dart +++ b/webf/lib/src/css/display.dart @@ -2,8 +2,8 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; enum CSSDisplay { inline, diff --git a/webf/lib/src/css/filter.dart b/webf/lib/src/css/filter.dart index 4bb1d016ba..48200f6bc9 100644 --- a/webf/lib/src/css/filter.dart +++ b/webf/lib/src/css/filter.dart @@ -6,8 +6,8 @@ import 'dart:ui' show ImageFilter; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; const String GRAYSCALE = 'grayscale'; const String SEPIA = 'sepia'; diff --git a/webf/lib/src/css/flexbox.dart b/webf/lib/src/css/flexbox.dart index 515f88025a..4311d6109f 100644 --- a/webf/lib/src/css/flexbox.dart +++ b/webf/lib/src/css/flexbox.dart @@ -2,8 +2,8 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; // CSS Flexible Box Layout: https://drafts.csswg.org/css-flexbox-1/ diff --git a/webf/lib/src/css/inline.dart b/webf/lib/src/css/inline.dart index 6f4abbf7db..9515cb22a4 100644 --- a/webf/lib/src/css/inline.dart +++ b/webf/lib/src/css/inline.dart @@ -5,7 +5,7 @@ // https://www.w3.org/TR/css-inline-3/ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; /// Sets vertical alignment of an inline, inline-block enum VerticalAlign { diff --git a/webf/lib/src/css/margin.dart b/webf/lib/src/css/margin.dart index e5b913179d..bf5cdd19af 100644 --- a/webf/lib/src/css/margin.dart +++ b/webf/lib/src/css/margin.dart @@ -4,8 +4,8 @@ import 'dart:math' as math; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; mixin CSSMarginMixin on RenderStyle { diff --git a/webf/lib/src/css/matrix.dart b/webf/lib/src/css/matrix.dart index 536d2abf61..d996a22dd8 100644 --- a/webf/lib/src/css/matrix.dart +++ b/webf/lib/src/css/matrix.dart @@ -5,7 +5,7 @@ import 'dart:math'; import 'dart:typed_data'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; import 'package:vector_math/vector_math_64.dart'; double? _determinant(m) { diff --git a/webf/lib/src/css/object_fit.dart b/webf/lib/src/css/object_fit.dart index 8a9f3d1f6f..027b638af7 100644 --- a/webf/lib/src/css/object_fit.dart +++ b/webf/lib/src/css/object_fit.dart @@ -3,7 +3,7 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; mixin CSSObjectFitMixin on RenderStyle { diff --git a/webf/lib/src/css/object_position.dart b/webf/lib/src/css/object_position.dart index 63c57c1263..3f0f1c7585 100644 --- a/webf/lib/src/css/object_position.dart +++ b/webf/lib/src/css/object_position.dart @@ -3,7 +3,7 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; mixin CSSObjectPositionMixin on RenderStyle { @override diff --git a/webf/lib/src/css/opacity.dart b/webf/lib/src/css/opacity.dart index 24c2c8f731..0b71504e72 100644 --- a/webf/lib/src/css/opacity.dart +++ b/webf/lib/src/css/opacity.dart @@ -4,8 +4,8 @@ import 'dart:ui' as ui; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; mixin CSSOpacityMixin on RenderStyle { diff --git a/webf/lib/src/css/origin.dart b/webf/lib/src/css/origin.dart index 640edbdfdd..dfa72e0be9 100644 --- a/webf/lib/src/css/origin.dart +++ b/webf/lib/src/css/origin.dart @@ -2,7 +2,7 @@ * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; final RegExp _spaceRegExp = RegExp(r'\s+(?![^(]*\))'); diff --git a/webf/lib/src/css/overflow.dart b/webf/lib/src/css/overflow.dart index b780744828..2524fec508 100644 --- a/webf/lib/src/css/overflow.dart +++ b/webf/lib/src/css/overflow.dart @@ -5,10 +5,10 @@ import 'package:flutter/animation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/rendering.dart'; // CSS Overflow: https://drafts.csswg.org/css-overflow-3/ diff --git a/webf/lib/src/css/padding.dart b/webf/lib/src/css/padding.dart index ea8e1e7fd8..cc544c7e37 100644 --- a/webf/lib/src/css/padding.dart +++ b/webf/lib/src/css/padding.dart @@ -2,8 +2,8 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; mixin CSSPaddingMixin on RenderStyle { /// The amount to pad the child in each dimension. diff --git a/webf/lib/src/css/parser/parser.dart b/webf/lib/src/css/parser/parser.dart index 0a7bf4ca54..f8a1f152aa 100644 --- a/webf/lib/src/css/parser/parser.dart +++ b/webf/lib/src/css/parser/parser.dart @@ -1,7 +1,7 @@ /* * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; const int SLASH_CODE = 47; // / const int NEWLINE_CODE = 10; // \n diff --git a/webf/lib/src/css/parser/style_rule_parser.dart b/webf/lib/src/css/parser/style_rule_parser.dart index 90242f0543..b16dd433c8 100644 --- a/webf/lib/src/css/parser/style_rule_parser.dart +++ b/webf/lib/src/css/parser/style_rule_parser.dart @@ -1,7 +1,7 @@ /* * Copyright (C) 2022-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; const int _SELECTOR = 0; const int _NAME = 1; diff --git a/webf/lib/src/css/parser/style_sheet_parser.dart b/webf/lib/src/css/parser/style_sheet_parser.dart index db4b599abb..4bb958790b 100644 --- a/webf/lib/src/css/parser/style_sheet_parser.dart +++ b/webf/lib/src/css/parser/style_sheet_parser.dart @@ -1,7 +1,7 @@ /* * Copyright (C) 2022-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; const int _BEFORE_SELECTOR = 0; const int _SELECTOR = 1; diff --git a/webf/lib/src/css/position.dart b/webf/lib/src/css/position.dart index 7dd7898576..f9bb9b81e2 100644 --- a/webf/lib/src/css/position.dart +++ b/webf/lib/src/css/position.dart @@ -4,8 +4,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; enum CSSPositionType { static, diff --git a/webf/lib/src/css/positioned.dart b/webf/lib/src/css/positioned.dart index b2f2835567..01834c7a6c 100644 --- a/webf/lib/src/css/positioned.dart +++ b/webf/lib/src/css/positioned.dart @@ -4,9 +4,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/rendering.dart'; // CSS Positioned Layout: https://drafts.csswg.org/css-position/ diff --git a/webf/lib/src/css/render_style.dart b/webf/lib/src/css/render_style.dart index ec8b4c1b57..2ccc65a2ce 100644 --- a/webf/lib/src/css/render_style.dart +++ b/webf/lib/src/css/render_style.dart @@ -6,9 +6,9 @@ import 'dart:ui'; import 'dart:math' as math; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/rendering.dart'; typedef RenderStyleVisitor = void Function(T renderStyle); diff --git a/webf/lib/src/css/rule.dart b/webf/lib/src/css/rule.dart index 19d49e77b1..57c6238cbb 100644 --- a/webf/lib/src/css/rule.dart +++ b/webf/lib/src/css/rule.dart @@ -1,7 +1,7 @@ /* * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; abstract class CSSRule { String cssText = ''; diff --git a/webf/lib/src/css/sizing.dart b/webf/lib/src/css/sizing.dart index 7f475ea6be..d63b9c557e 100644 --- a/webf/lib/src/css/sizing.dart +++ b/webf/lib/src/css/sizing.dart @@ -2,8 +2,8 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; // CSS Box Sizing: https://drafts.csswg.org/css-sizing-3/ diff --git a/webf/lib/src/css/sliver.dart b/webf/lib/src/css/sliver.dart index d07b734f2e..d17ddc3c32 100644 --- a/webf/lib/src/css/sliver.dart +++ b/webf/lib/src/css/sliver.dart @@ -3,7 +3,7 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; mixin CSSSliverMixin on RenderStyle { diff --git a/webf/lib/src/css/style_declaration.dart b/webf/lib/src/css/style_declaration.dart index ffa0be913f..124f4401dd 100644 --- a/webf/lib/src/css/style_declaration.dart +++ b/webf/lib/src/css/style_declaration.dart @@ -2,9 +2,9 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/rendering.dart'; import 'package:quiver/collection.dart'; typedef StyleChangeListener = void Function(String property, String? original, String present); diff --git a/webf/lib/src/css/style_property.dart b/webf/lib/src/css/style_property.dart index c2299a52ec..68c8ad7a33 100644 --- a/webf/lib/src/css/style_property.dart +++ b/webf/lib/src/css/style_property.dart @@ -2,7 +2,7 @@ * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; final RegExp _spaceRegExp = RegExp(r'\s+(?![^(]*\))'); final RegExp _commaRegExp = RegExp(r',(?![^\(]*\))'); diff --git a/webf/lib/src/css/style_rule.dart b/webf/lib/src/css/style_rule.dart index ed7c60b75f..89b4f75d6f 100644 --- a/webf/lib/src/css/style_rule.dart +++ b/webf/lib/src/css/style_rule.dart @@ -2,7 +2,7 @@ * Copyright (C) 2020-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; /// https://drafts.csswg.org/cssom/#the-cssstylerule-interface class CSSStyleRule extends CSSRule { diff --git a/webf/lib/src/css/style_sheet.dart b/webf/lib/src/css/style_sheet.dart index 7699716f11..d1afbb5ec7 100644 --- a/webf/lib/src/css/style_sheet.dart +++ b/webf/lib/src/css/style_sheet.dart @@ -2,7 +2,7 @@ * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; abstract class StyleSheet { } diff --git a/webf/lib/src/css/text.dart b/webf/lib/src/css/text.dart index fa5f9ce16c..0ab1f51ee0 100644 --- a/webf/lib/src/css/text.dart +++ b/webf/lib/src/css/text.dart @@ -3,8 +3,8 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; final RegExp _commaRegExp = RegExp(r'\s*,\s*'); diff --git a/webf/lib/src/css/transform.dart b/webf/lib/src/css/transform.dart index 447d907864..4dee6d97cd 100644 --- a/webf/lib/src/css/transform.dart +++ b/webf/lib/src/css/transform.dart @@ -3,8 +3,8 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; const Offset _DEFAULT_TRANSFORM_OFFSET = Offset.zero; const Alignment _DEFAULT_TRANSFORM_ALIGNMENT = Alignment.center; diff --git a/webf/lib/src/css/transition.dart b/webf/lib/src/css/transition.dart index 5b8231d584..a8938573a4 100644 --- a/webf/lib/src/css/transition.dart +++ b/webf/lib/src/css/transition.dart @@ -4,8 +4,8 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/animation.dart' show Curve; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; // CSS Transitions: https://drafts.csswg.org/css-transitions/ const String _0s = '0s'; diff --git a/webf/lib/src/css/value.dart b/webf/lib/src/css/value.dart index f9c85bb4a6..6291d10d15 100644 --- a/webf/lib/src/css/value.dart +++ b/webf/lib/src/css/value.dart @@ -1,7 +1,7 @@ /* * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; // https://github.com/WebKit/webkit/blob/master/Source/WebCore/css/CSSProperties.json Map CSSInitialValues = { diff --git a/webf/lib/src/css/values/color.dart b/webf/lib/src/css/values/color.dart index 42cabfa732..690d8539f3 100644 --- a/webf/lib/src/css/values/color.dart +++ b/webf/lib/src/css/values/color.dart @@ -7,7 +7,7 @@ import 'dart:math'; import 'package:quiver/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter/painting.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; /// Only support Basic color keywords and Extended color keywords, /// for CSS system colors is not recommended for use after CSS3 diff --git a/webf/lib/src/css/values/length.dart b/webf/lib/src/css/values/length.dart index 5d599eb1b0..7eb36cb87b 100644 --- a/webf/lib/src/css/values/length.dart +++ b/webf/lib/src/css/values/length.dart @@ -5,8 +5,8 @@ import 'dart:ui'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; import 'package:quiver/collection.dart'; // https://drafts.csswg.org/css-values-3/#absolute-lengths diff --git a/webf/lib/src/css/values/position.dart b/webf/lib/src/css/values/position.dart index deca0e39da..2d2c3f480c 100644 --- a/webf/lib/src/css/values/position.dart +++ b/webf/lib/src/css/values/position.dart @@ -3,7 +3,7 @@ */ import 'package:flutter/painting.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; import 'package:quiver/collection.dart'; final RegExp _splitRegExp = RegExp(r'\s+'); diff --git a/webf/lib/src/css/values/variable.dart b/webf/lib/src/css/values/variable.dart index 0040f92f65..7892ac2c1d 100644 --- a/webf/lib/src/css/values/variable.dart +++ b/webf/lib/src/css/values/variable.dart @@ -2,7 +2,7 @@ * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; const int _HYPHEN_CODE = 45; // - diff --git a/webf/lib/src/css/visibility.dart b/webf/lib/src/css/visibility.dart index 4eb1507556..c794c443c3 100644 --- a/webf/lib/src/css/visibility.dart +++ b/webf/lib/src/css/visibility.dart @@ -1,7 +1,7 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; enum Visibility { visible, diff --git a/webf/lib/src/devtools/inspector.dart b/webf/lib/src/devtools/inspector.dart index f48e8f9b4e..38b8caabc1 100644 --- a/webf/lib/src/devtools/inspector.dart +++ b/webf/lib/src/devtools/inspector.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:kraken/devtools.dart'; +import 'package:webf/devtools.dart'; const String INSPECTOR_URL = 'devtools://devtools/bundled/inspector.html'; const int INSPECTOR_DEFAULT_PORT = 9222; diff --git a/webf/lib/src/devtools/module.dart b/webf/lib/src/devtools/module.dart index c9d0c72fbc..d0c9ec9e86 100644 --- a/webf/lib/src/devtools/module.dart +++ b/webf/lib/src/devtools/module.dart @@ -4,7 +4,7 @@ import 'dart:convert'; -import 'package:kraken/devtools.dart'; +import 'package:webf/devtools.dart'; abstract class _InspectorModule { String get name; diff --git a/webf/lib/src/devtools/modules/css.dart b/webf/lib/src/devtools/modules/css.dart index 5bb4bd75aa..c9e9130275 100644 --- a/webf/lib/src/devtools/modules/css.dart +++ b/webf/lib/src/devtools/modules/css.dart @@ -2,9 +2,9 @@ * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/devtools.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/css.dart'; +import 'package:webf/devtools.dart'; +import 'package:webf/dom.dart'; const int INLINED_STYLESHEET_ID = 1; const String ZERO_PX = '0px'; diff --git a/webf/lib/src/devtools/modules/debugger.dart b/webf/lib/src/devtools/modules/debugger.dart index 318a1c4da9..30a72ed0b8 100644 --- a/webf/lib/src/devtools/modules/debugger.dart +++ b/webf/lib/src/devtools/modules/debugger.dart @@ -2,7 +2,7 @@ * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/devtools.dart'; +import 'package:webf/devtools.dart'; class InspectDebuggerModule extends IsolateInspectorModule { InspectDebuggerModule(IsolateInspectorServer server): super(server); diff --git a/webf/lib/src/devtools/modules/dom.dart b/webf/lib/src/devtools/modules/dom.dart index af124c9724..a4f2a71b5b 100644 --- a/webf/lib/src/devtools/modules/dom.dart +++ b/webf/lib/src/devtools/modules/dom.dart @@ -3,9 +3,9 @@ */ import 'dart:ui' as ui; -import 'package:kraken/devtools.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/devtools.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/rendering.dart'; import 'package:flutter/rendering.dart'; const int DOCUMENT_NODE_ID = 0; diff --git a/webf/lib/src/devtools/modules/log.dart b/webf/lib/src/devtools/modules/log.dart index a32fb6e6a8..5c9a0944cc 100644 --- a/webf/lib/src/devtools/modules/log.dart +++ b/webf/lib/src/devtools/modules/log.dart @@ -2,7 +2,7 @@ * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/devtools.dart'; +import 'package:webf/devtools.dart'; class InspectLogModule extends UIInspectorModule { InspectLogModule(ChromeDevToolsService server) : super(server) { diff --git a/webf/lib/src/devtools/modules/network.dart b/webf/lib/src/devtools/modules/network.dart index cbe81c8b07..beab1f5d63 100644 --- a/webf/lib/src/devtools/modules/network.dart +++ b/webf/lib/src/devtools/modules/network.dart @@ -7,8 +7,8 @@ import 'dart:io'; import 'dart:typed_data'; import 'package:flutter/foundation.dart'; -import 'package:kraken/devtools.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/devtools.dart'; +import 'package:webf/foundation.dart'; class InspectNetworkModule extends UIInspectorModule implements HttpClientInterceptor { InspectNetworkModule(ChromeDevToolsService devtoolsService) : super(devtoolsService) { diff --git a/webf/lib/src/devtools/modules/overlay.dart b/webf/lib/src/devtools/modules/overlay.dart index 6d067f0180..62efb8859b 100644 --- a/webf/lib/src/devtools/modules/overlay.dart +++ b/webf/lib/src/devtools/modules/overlay.dart @@ -2,8 +2,8 @@ * Copyright (C) 2020-present The Kraken authors. All rights reserved. */ -import 'package:kraken/dom.dart'; -import 'package:kraken/devtools.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/devtools.dart'; class InspectOverlayModule extends UIInspectorModule { @override diff --git a/webf/lib/src/devtools/modules/page.dart b/webf/lib/src/devtools/modules/page.dart index 67ae667866..5c33ba04dc 100644 --- a/webf/lib/src/devtools/modules/page.dart +++ b/webf/lib/src/devtools/modules/page.dart @@ -7,8 +7,8 @@ import 'dart:typed_data'; import 'package:meta/meta.dart'; import 'package:flutter/scheduler.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/devtools.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/devtools.dart'; String enumKey(String key) { diff --git a/webf/lib/src/devtools/modules/runtime.dart b/webf/lib/src/devtools/modules/runtime.dart index c20cd5afab..2cf808f1e9 100644 --- a/webf/lib/src/devtools/modules/runtime.dart +++ b/webf/lib/src/devtools/modules/runtime.dart @@ -2,7 +2,7 @@ * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/devtools.dart'; +import 'package:webf/devtools.dart'; class InspectRuntimeModule extends IsolateInspectorModule { InspectRuntimeModule(IsolateInspectorServer server): super(server); diff --git a/webf/lib/src/devtools/server.dart b/webf/lib/src/devtools/server.dart index e43d13f581..2b9961d678 100644 --- a/webf/lib/src/devtools/server.dart +++ b/webf/lib/src/devtools/server.dart @@ -8,8 +8,8 @@ import 'dart:isolate'; import 'dart:ffi'; import 'dart:typed_data'; -import 'package:kraken/kraken.dart'; -import 'package:kraken/devtools.dart'; +import 'package:webf/kraken.dart'; +import 'package:webf/devtools.dart'; import 'package:ffi/ffi.dart'; const String CONTENT_TYPE = 'Content-Type'; diff --git a/webf/lib/src/devtools/service.dart b/webf/lib/src/devtools/service.dart index ea6255a114..bae88fecb9 100644 --- a/webf/lib/src/devtools/service.dart +++ b/webf/lib/src/devtools/service.dart @@ -7,8 +7,8 @@ import 'dart:ffi'; import 'dart:typed_data'; import 'package:ffi/ffi.dart'; -import 'package:kraken/kraken.dart'; -import 'package:kraken/devtools.dart'; +import 'package:webf/kraken.dart'; +import 'package:webf/devtools.dart'; typedef NativePostTaskToInspectorThread = Void Function(Int32 contextId, Pointer context, Pointer callback); typedef DartPostTaskToInspectorThread = void Function(int contextId, Pointer context, Pointer callback); diff --git a/webf/lib/src/dom/bounding_client_rect.dart b/webf/lib/src/dom/bounding_client_rect.dart index f7f0a32c3c..e895e827ed 100644 --- a/webf/lib/src/dom/bounding_client_rect.dart +++ b/webf/lib/src/dom/bounding_client_rect.dart @@ -4,7 +4,7 @@ import 'dart:ffi'; import 'package:ffi/ffi.dart'; -import 'package:kraken/bridge.dart'; +import 'package:webf/bridge.dart'; class BoundingClientRect { static const BoundingClientRect zero = BoundingClientRect(0, 0, 0, 0, 0, 0, 0, 0); diff --git a/webf/lib/src/dom/comment.dart b/webf/lib/src/dom/comment.dart index a2ed6cd3f5..46e87e02e2 100644 --- a/webf/lib/src/dom/comment.dart +++ b/webf/lib/src/dom/comment.dart @@ -2,7 +2,7 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/dom.dart'; class Comment extends Node { Comment([context]) : super(NodeType.COMMENT_NODE, context); diff --git a/webf/lib/src/dom/document.dart b/webf/lib/src/dom/document.dart index ad08a6e3e9..8df520d253 100644 --- a/webf/lib/src/dom/document.dart +++ b/webf/lib/src/dom/document.dart @@ -2,14 +2,14 @@ * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/launcher.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/src/dom/element_registry.dart' as element_registry; -import 'package:kraken/widget.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/launcher.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/src/dom/element_registry.dart' as element_registry; +import 'package:webf/widget.dart'; class Document extends Node { diff --git a/webf/lib/src/dom/document_fragment.dart b/webf/lib/src/dom/document_fragment.dart index 483f6d9941..d94478f8b2 100644 --- a/webf/lib/src/dom/document_fragment.dart +++ b/webf/lib/src/dom/document_fragment.dart @@ -3,7 +3,7 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/dom.dart'; const String DOCUMENT_FRAGMENT = 'DOCUMENTFRAGMENT'; diff --git a/webf/lib/src/dom/element.dart b/webf/lib/src/dom/element.dart index ec839b038c..c8d1d2e623 100644 --- a/webf/lib/src/dom/element.dart +++ b/webf/lib/src/dom/element.dart @@ -9,10 +9,10 @@ import 'dart:ui'; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/rendering.dart'; final RegExp _splitRegExp = RegExp(r'\s+'); const String _ONE_SPACE = ' '; diff --git a/webf/lib/src/dom/element_registry.dart b/webf/lib/src/dom/element_registry.dart index 36d43bf620..8d5dfe2eb0 100644 --- a/webf/lib/src/dom/element_registry.dart +++ b/webf/lib/src/dom/element_registry.dart @@ -1,8 +1,8 @@ /* * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; typedef ElementCreator = Element Function(BindingContext? context); diff --git a/webf/lib/src/dom/elements/a.dart b/webf/lib/src/dom/elements/a.dart index 6158318c07..217e712f65 100644 --- a/webf/lib/src/dom/elements/a.dart +++ b/webf/lib/src/dom/elements/a.dart @@ -1,8 +1,8 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/dom.dart'; -import 'package:kraken/kraken.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/kraken.dart'; const String ANCHOR = 'A'; const String _TARGET_SELF = 'self'; diff --git a/webf/lib/src/dom/elements/body.dart b/webf/lib/src/dom/elements/body.dart index b0e126873e..fd2bcab08a 100644 --- a/webf/lib/src/dom/elements/body.dart +++ b/webf/lib/src/dom/elements/body.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; const String BODY = 'BODY'; diff --git a/webf/lib/src/dom/elements/canvas/canvas.dart b/webf/lib/src/dom/elements/canvas/canvas.dart index f84ef7d260..482f61fbf4 100644 --- a/webf/lib/src/dom/elements/canvas/canvas.dart +++ b/webf/lib/src/dom/elements/canvas/canvas.dart @@ -4,10 +4,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/foundation.dart'; const String CANVAS = 'CANVAS'; const int _ELEMENT_DEFAULT_WIDTH_IN_PIXEL = 300; diff --git a/webf/lib/src/dom/elements/canvas/canvas_context_2d.dart b/webf/lib/src/dom/elements/canvas/canvas_context_2d.dart index 340f135aad..bfd3e5488d 100644 --- a/webf/lib/src/dom/elements/canvas/canvas_context_2d.dart +++ b/webf/lib/src/dom/elements/canvas/canvas_context_2d.dart @@ -8,10 +8,10 @@ import 'dart:ui'; import 'package:ffi/ffi.dart'; import 'package:flutter/painting.dart'; -import 'package:kraken/bridge.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/bridge.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; import 'package:vector_math/vector_math_64.dart'; import 'canvas_context.dart'; diff --git a/webf/lib/src/dom/elements/edits.dart b/webf/lib/src/dom/elements/edits.dart index 0b24b3257d..d0220db5cf 100644 --- a/webf/lib/src/dom/elements/edits.dart +++ b/webf/lib/src/dom/elements/edits.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; // https://developer.mozilla.org/en-US/docs/Web/HTML/Element#demarcating_edits const String DEL = 'DEL'; diff --git a/webf/lib/src/dom/elements/forms.dart b/webf/lib/src/dom/elements/forms.dart index cdfc5496c2..36bc9eb323 100644 --- a/webf/lib/src/dom/elements/forms.dart +++ b/webf/lib/src/dom/elements/forms.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; const String LABEL = 'LABEL'; const String BUTTON = 'BUTTON'; diff --git a/webf/lib/src/dom/elements/grouping_content.dart b/webf/lib/src/dom/elements/grouping_content.dart index 61fa070d55..224476d326 100644 --- a/webf/lib/src/dom/elements/grouping_content.dart +++ b/webf/lib/src/dom/elements/grouping_content.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; // https://developer.mozilla.org/en-US/docs/Web/HTML/Element#text_content const String UL = 'UL'; diff --git a/webf/lib/src/dom/elements/head.dart b/webf/lib/src/dom/elements/head.dart index 70eec0bfd4..8c76a288c5 100644 --- a/webf/lib/src/dom/elements/head.dart +++ b/webf/lib/src/dom/elements/head.dart @@ -3,9 +3,9 @@ */ import 'package:flutter/scheduler.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/kraken.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/kraken.dart'; // Children of the element all have display:none const Map _defaultStyle = { diff --git a/webf/lib/src/dom/elements/headings.dart b/webf/lib/src/dom/elements/headings.dart index c393cdd8e2..4864910ab2 100644 --- a/webf/lib/src/dom/elements/headings.dart +++ b/webf/lib/src/dom/elements/headings.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; const String H1 = 'H1'; const String H2 = 'H2'; diff --git a/webf/lib/src/dom/elements/html.dart b/webf/lib/src/dom/elements/html.dart index 6017295d65..5423662f28 100644 --- a/webf/lib/src/dom/elements/html.dart +++ b/webf/lib/src/dom/elements/html.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; const String HTML = 'HTML'; const Map _defaultStyle = { diff --git a/webf/lib/src/dom/elements/img.dart b/webf/lib/src/dom/elements/img.dart index 3860c2bd62..f4ac64729e 100644 --- a/webf/lib/src/dom/elements/img.dart +++ b/webf/lib/src/dom/elements/img.dart @@ -6,11 +6,11 @@ import 'dart:typed_data'; import 'dart:ui' as ui; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/painting.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/painting.dart'; +import 'package:webf/rendering.dart'; const String IMAGE = 'IMG'; const String NATURAL_WIDTH = 'naturalWidth'; diff --git a/webf/lib/src/dom/elements/input.dart b/webf/lib/src/dom/elements/input.dart index 55aa8550fd..ba3ee21729 100644 --- a/webf/lib/src/dom/elements/input.dart +++ b/webf/lib/src/dom/elements/input.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/foundation.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; const String INPUT = 'INPUT'; const String SIZE = 'size'; diff --git a/webf/lib/src/dom/elements/object.dart b/webf/lib/src/dom/elements/object.dart index 7f07a721e5..2504a75395 100644 --- a/webf/lib/src/dom/elements/object.dart +++ b/webf/lib/src/dom/elements/object.dart @@ -2,9 +2,9 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; const String OBJECT = 'OBJECT'; const String PARAM = 'PARAM'; diff --git a/webf/lib/src/dom/elements/script.dart b/webf/lib/src/dom/elements/script.dart index 03c78fe841..421377cfc3 100644 --- a/webf/lib/src/dom/elements/script.dart +++ b/webf/lib/src/dom/elements/script.dart @@ -6,9 +6,9 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/scheduler.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/kraken.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/kraken.dart'; +import 'package:webf/css.dart'; import 'package:path/path.dart'; // Children of the element all have display:none diff --git a/webf/lib/src/dom/elements/sections.dart b/webf/lib/src/dom/elements/sections.dart index 344617be40..908db4d76e 100644 --- a/webf/lib/src/dom/elements/sections.dart +++ b/webf/lib/src/dom/elements/sections.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; // https://developer.mozilla.org/en-US/docs/Web/HTML/Element#content_sectioning diff --git a/webf/lib/src/dom/elements/semantics_text.dart b/webf/lib/src/dom/elements/semantics_text.dart index 66fc8d5576..8cbe819309 100644 --- a/webf/lib/src/dom/elements/semantics_text.dart +++ b/webf/lib/src/dom/elements/semantics_text.dart @@ -2,10 +2,10 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/foundation.dart'; // https://developer.mozilla.org/en-US/docs/Web/HTML/Element#inline_text_semantics const String SPAN = 'SPAN'; diff --git a/webf/lib/src/dom/elements/template.dart b/webf/lib/src/dom/elements/template.dart index ba7a6d704d..4170e0d0c9 100644 --- a/webf/lib/src/dom/elements/template.dart +++ b/webf/lib/src/dom/elements/template.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; const String TEMPLATE = 'TEMPLATE'; diff --git a/webf/lib/src/dom/elements/text_form_control.dart b/webf/lib/src/dom/elements/text_form_control.dart index eab669748b..2ce7874e29 100644 --- a/webf/lib/src/dom/elements/text_form_control.dart +++ b/webf/lib/src/dom/elements/text_form_control.dart @@ -12,11 +12,11 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart' show TextSelectionOverlay, TextSelectionControls, ClipboardStatusNotifier, TextEditingActionTarget; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/widget.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/widget.dart'; const String VALUE = 'value'; const String DEFAULT_VALUE = 'defaultValue'; diff --git a/webf/lib/src/dom/elements/textarea.dart b/webf/lib/src/dom/elements/textarea.dart index 761034c1d9..c49e2e65d1 100644 --- a/webf/lib/src/dom/elements/textarea.dart +++ b/webf/lib/src/dom/elements/textarea.dart @@ -1,9 +1,9 @@ /* * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ -import 'package:kraken/foundation.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; const String TEXTAREA = 'TEXTAREA'; const String ROWS = 'rows'; diff --git a/webf/lib/src/dom/event.dart b/webf/lib/src/dom/event.dart index ac8d673535..3bdc7d4a64 100644 --- a/webf/lib/src/dom/event.dart +++ b/webf/lib/src/dom/event.dart @@ -6,10 +6,10 @@ import 'dart:ffi'; import 'dart:typed_data'; import 'package:ffi/ffi.dart'; -import 'package:kraken/bridge.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/bridge.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/rendering.dart'; enum AppearEventType { none, diff --git a/webf/lib/src/dom/event_target.dart b/webf/lib/src/dom/event_target.dart index 92563ab913..4ec3e9de53 100644 --- a/webf/lib/src/dom/event_target.dart +++ b/webf/lib/src/dom/event_target.dart @@ -2,9 +2,9 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ import 'package:flutter/foundation.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/module.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/module.dart'; typedef EventHandler = void Function(Event event); diff --git a/webf/lib/src/dom/node.dart b/webf/lib/src/dom/node.dart index 816cb645d2..78e148f3e0 100644 --- a/webf/lib/src/dom/node.dart +++ b/webf/lib/src/dom/node.dart @@ -3,9 +3,9 @@ */ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/widget.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/widget.dart'; enum NodeType { ELEMENT_NODE, diff --git a/webf/lib/src/dom/object_element_client.dart b/webf/lib/src/dom/object_element_client.dart index 17e4ee416d..f975cd5d61 100644 --- a/webf/lib/src/dom/object_element_client.dart +++ b/webf/lib/src/dom/object_element_client.dart @@ -3,7 +3,7 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/dom.dart'; typedef ObjectElementClientFactory = ObjectElementClient Function(ObjectElementHost objectElementHost); diff --git a/webf/lib/src/dom/screen.dart b/webf/lib/src/dom/screen.dart index 5febe0ea8f..4a53c54e10 100644 --- a/webf/lib/src/dom/screen.dart +++ b/webf/lib/src/dom/screen.dart @@ -4,7 +4,7 @@ */ import 'dart:ui'; -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; // As its name suggests, the Screen interface represents information about the screen of the output device. // https://drafts.csswg.org/cssom-view/#the-screen-interface diff --git a/webf/lib/src/dom/sliver_manager.dart b/webf/lib/src/dom/sliver_manager.dart index bc4bf52832..44dac10cb4 100644 --- a/webf/lib/src/dom/sliver_manager.dart +++ b/webf/lib/src/dom/sliver_manager.dart @@ -2,8 +2,8 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/dom.dart'; /// An implementation of [RenderSliverBoxChildManager] for sliver, /// manage element to implement lifecycles for sliver list, generate diff --git a/webf/lib/src/dom/text_node.dart b/webf/lib/src/dom/text_node.dart index a28a867be3..c252787c8b 100644 --- a/webf/lib/src/dom/text_node.dart +++ b/webf/lib/src/dom/text_node.dart @@ -2,9 +2,9 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/foundation.dart'; const String WHITE_SPACE_CHAR = ' '; const String NEW_LINE_CHAR = '\n'; diff --git a/webf/lib/src/dom/window.dart b/webf/lib/src/dom/window.dart index a89deae991..b0d3ca132c 100644 --- a/webf/lib/src/dom/window.dart +++ b/webf/lib/src/dom/window.dart @@ -3,11 +3,11 @@ */ import 'dart:ui'; -import 'package:kraken/bridge.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/module.dart'; +import 'package:webf/bridge.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/module.dart'; const String WINDOW = 'WINDOW'; diff --git a/webf/lib/src/foundation/bundle.dart b/webf/lib/src/foundation/bundle.dart index 923470d443..1114481164 100644 --- a/webf/lib/src/foundation/bundle.dart +++ b/webf/lib/src/foundation/bundle.dart @@ -8,9 +8,9 @@ import 'dart:typed_data'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/launcher.dart'; -import 'package:kraken/module.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/launcher.dart'; +import 'package:webf/module.dart'; const String DEFAULT_URL = 'about:blank'; const String UTF_8 = 'utf-8'; diff --git a/webf/lib/src/foundation/http_cache.dart b/webf/lib/src/foundation/http_cache.dart index 58e76eba3e..b100ee7b8d 100644 --- a/webf/lib/src/foundation/http_cache.dart +++ b/webf/lib/src/foundation/http_cache.dart @@ -6,7 +6,7 @@ import 'dart:collection'; import 'dart:io'; import 'package:async/async.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; import 'package:path/path.dart' as path; enum HttpCacheMode { diff --git a/webf/lib/src/foundation/http_overrides.dart b/webf/lib/src/foundation/http_overrides.dart index 792562fea8..9420116111 100644 --- a/webf/lib/src/foundation/http_overrides.dart +++ b/webf/lib/src/foundation/http_overrides.dart @@ -3,7 +3,7 @@ */ import 'dart:io'; -import 'package:kraken/kraken.dart'; +import 'package:webf/kraken.dart'; // TODO: Don't use header to mark context. const String HttpHeaderContext = 'x-context'; diff --git a/webf/lib/src/gesture/gesture_dispatcher.dart b/webf/lib/src/gesture/gesture_dispatcher.dart index 72af41cc32..0deca545df 100644 --- a/webf/lib/src/gesture/gesture_dispatcher.dart +++ b/webf/lib/src/gesture/gesture_dispatcher.dart @@ -6,9 +6,9 @@ import 'dart:async'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/src/scheduler/throttle.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/src/scheduler/throttle.dart'; const int _MAX_STEP_MS = 16; diff --git a/webf/lib/src/gesture/monodrag.dart b/webf/lib/src/gesture/monodrag.dart index 880b96e944..88552a0d4e 100644 --- a/webf/lib/src/gesture/monodrag.dart +++ b/webf/lib/src/gesture/monodrag.dart @@ -8,7 +8,7 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/dom.dart'; typedef IsAcceptedDragCallback = bool Function(AxisDirection direction); diff --git a/webf/lib/src/launcher/controller.dart b/webf/lib/src/launcher/controller.dart index 47d07085fd..c22f959c75 100644 --- a/webf/lib/src/launcher/controller.dart +++ b/webf/lib/src/launcher/controller.dart @@ -17,13 +17,13 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/widgets.dart' show RouteInformation, WidgetsBinding, WidgetsBindingObserver, AnimationController; -import 'package:kraken/bridge.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/module.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/widget.dart'; +import 'package:webf/bridge.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/module.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/widget.dart'; const int WINDOW_ID = -1; const int DOCUMENT_ID = -2; diff --git a/webf/lib/src/launcher/launcher.dart b/webf/lib/src/launcher/launcher.dart index 619409ea87..0606a92fef 100644 --- a/webf/lib/src/launcher/launcher.dart +++ b/webf/lib/src/launcher/launcher.dart @@ -6,8 +6,8 @@ import 'dart:io'; import 'dart:ui'; import 'dart:async'; import 'package:flutter/rendering.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/kraken.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/kraken.dart'; typedef ConnectedCallback = void Function(); diff --git a/webf/lib/src/module/async_storage.dart b/webf/lib/src/module/async_storage.dart index 1175d2c744..edd2dffa7d 100644 --- a/webf/lib/src/module/async_storage.dart +++ b/webf/lib/src/module/async_storage.dart @@ -5,7 +5,7 @@ import 'dart:async'; -import 'package:kraken/src/module/module_manager.dart'; +import 'package:webf/src/module/module_manager.dart'; import 'package:shared_preferences/shared_preferences.dart'; class AsyncStorageModule extends BaseModule { diff --git a/webf/lib/src/module/clipboard.dart b/webf/lib/src/module/clipboard.dart index 580c848f67..0b58c6eb46 100644 --- a/webf/lib/src/module/clipboard.dart +++ b/webf/lib/src/module/clipboard.dart @@ -4,7 +4,7 @@ import 'package:flutter/services.dart'; -import 'package:kraken/src/module/module_manager.dart'; +import 'package:webf/src/module/module_manager.dart'; class ClipBoardModule extends BaseModule { @override diff --git a/webf/lib/src/module/fetch.dart b/webf/lib/src/module/fetch.dart index 1053a36601..dda4b443db 100644 --- a/webf/lib/src/module/fetch.dart +++ b/webf/lib/src/module/fetch.dart @@ -6,8 +6,8 @@ import 'dart:io'; import 'dart:typed_data'; import 'package:flutter/foundation.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/module.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/module.dart'; String EMPTY_STRING = ''; diff --git a/webf/lib/src/module/history.dart b/webf/lib/src/module/history.dart index fcc699c287..38c4bf4598 100644 --- a/webf/lib/src/module/history.dart +++ b/webf/lib/src/module/history.dart @@ -5,8 +5,8 @@ import 'dart:collection'; import 'dart:convert'; import 'dart:async'; -import 'package:kraken/dom.dart'; -import 'package:kraken/kraken.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/kraken.dart'; class HistoryItem { HistoryItem(this.bundle, this.state, this.needJump); diff --git a/webf/lib/src/module/location.dart b/webf/lib/src/module/location.dart index a785f96d7e..5308a27aee 100644 --- a/webf/lib/src/module/location.dart +++ b/webf/lib/src/module/location.dart @@ -1,7 +1,7 @@ /* * Copyright (C) 2021-present The Kraken authors. All rights reserved. */ -import 'package:kraken/module.dart'; +import 'package:webf/module.dart'; class LocationModule extends BaseModule { @override diff --git a/webf/lib/src/module/method_channel.dart b/webf/lib/src/module/method_channel.dart index 0998145ec3..4992c637ab 100644 --- a/webf/lib/src/module/method_channel.dart +++ b/webf/lib/src/module/method_channel.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:kraken/kraken.dart'; +import 'package:webf/kraken.dart'; typedef MethodCallCallback = Future Function(String method, Object? arguments); const String METHOD_CHANNEL_NOT_INITIALIZED = 'MethodChannel not initialized.'; diff --git a/webf/lib/src/module/module_manager.dart b/webf/lib/src/module/module_manager.dart index 3acf17c944..8e4c26c5e6 100644 --- a/webf/lib/src/module/module_manager.dart +++ b/webf/lib/src/module/module_manager.dart @@ -3,9 +3,9 @@ */ import 'dart:convert'; -import 'package:kraken/bridge.dart' as bridge; -import 'package:kraken/dom.dart'; -import 'package:kraken/kraken.dart'; +import 'package:webf/bridge.dart' as bridge; +import 'package:webf/dom.dart'; +import 'package:webf/kraken.dart'; abstract class BaseModule { String get name; diff --git a/webf/lib/src/module/navigator.dart b/webf/lib/src/module/navigator.dart index e9e28c2242..3bb2db208f 100644 --- a/webf/lib/src/module/navigator.dart +++ b/webf/lib/src/module/navigator.dart @@ -4,8 +4,8 @@ import 'dart:io' show Platform; import 'dart:ui'; -import 'package:kraken/bridge.dart'; -import 'package:kraken/src/module/module_manager.dart'; +import 'package:webf/bridge.dart'; +import 'package:webf/src/module/module_manager.dart'; String? _customUserAgent; diff --git a/webf/lib/src/module/performance_timing.dart b/webf/lib/src/module/performance_timing.dart index 32ac1e646f..906f09a1af 100644 --- a/webf/lib/src/module/performance_timing.dart +++ b/webf/lib/src/module/performance_timing.dart @@ -5,7 +5,7 @@ import 'dart:ffi'; import 'dart:typed_data'; import 'package:ffi/ffi.dart'; -import 'package:kraken/bridge.dart'; +import 'package:webf/bridge.dart'; final String PERF_CONTROLLER_INIT_START = 'controller_init_start'; final String PERF_CONTROLLER_INIT_END = 'controller_init_end'; diff --git a/webf/lib/src/painting/box_fit_image.dart b/webf/lib/src/painting/box_fit_image.dart index b2c2d071fc..9c23a329ec 100644 --- a/webf/lib/src/painting/box_fit_image.dart +++ b/webf/lib/src/painting/box_fit_image.dart @@ -8,7 +8,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; class BoxFitImageKey { const BoxFitImageKey({ diff --git a/webf/lib/src/painting/cached_network_image.dart b/webf/lib/src/painting/cached_network_image.dart index 3d788879a4..684b796bb9 100644 --- a/webf/lib/src/painting/cached_network_image.dart +++ b/webf/lib/src/painting/cached_network_image.dart @@ -10,7 +10,7 @@ import 'dart:ui'; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; class CachedNetworkImageKey { const CachedNetworkImageKey({ diff --git a/webf/lib/src/painting/image_provider_factory.dart b/webf/lib/src/painting/image_provider_factory.dart index 7c1b910e41..cea232c109 100644 --- a/webf/lib/src/painting/image_provider_factory.dart +++ b/webf/lib/src/painting/image_provider_factory.dart @@ -8,9 +8,9 @@ import 'dart:typed_data'; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; -import 'package:kraken/foundation.dart'; -import 'package:kraken/painting.dart'; -import 'package:kraken/src/module/navigator.dart'; +import 'package:webf/foundation.dart'; +import 'package:webf/painting.dart'; +import 'package:webf/src/module/navigator.dart'; /// This class allows user to customize Kraken's image loading. diff --git a/webf/lib/src/rendering/box_decoration.dart b/webf/lib/src/rendering/box_decoration.dart index c4b2677f4e..5abb1ecb85 100644 --- a/webf/lib/src/rendering/box_decoration.dart +++ b/webf/lib/src/rendering/box_decoration.dart @@ -4,8 +4,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; enum BackgroundBoundary { borderBox, diff --git a/webf/lib/src/rendering/box_decoration_painter.dart b/webf/lib/src/rendering/box_decoration_painter.dart index 170e61a4ca..c0acd68e76 100644 --- a/webf/lib/src/rendering/box_decoration_painter.dart +++ b/webf/lib/src/rendering/box_decoration_painter.dart @@ -7,8 +7,8 @@ import 'dart:ui' as ui show Image; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; enum _BorderDirection { top, diff --git a/webf/lib/src/rendering/box_model.dart b/webf/lib/src/rendering/box_model.dart index 0253842e86..a5daf00e76 100644 --- a/webf/lib/src/rendering/box_model.dart +++ b/webf/lib/src/rendering/box_model.dart @@ -8,11 +8,11 @@ import 'dart:ui'; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/kraken.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/kraken.dart'; +import 'package:webf/rendering.dart'; import 'debug_overlay.dart'; diff --git a/webf/lib/src/rendering/content_visibility.dart b/webf/lib/src/rendering/content_visibility.dart index 716d134900..dd3cae16c1 100644 --- a/webf/lib/src/rendering/content_visibility.dart +++ b/webf/lib/src/rendering/content_visibility.dart @@ -3,8 +3,8 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; /// Lays the child out as if it was in the tree, but without painting anything, /// without making the child available for hit testing, and without taking any diff --git a/webf/lib/src/rendering/event.dart b/webf/lib/src/rendering/event.dart index 724ffd7879..6afe56aafa 100644 --- a/webf/lib/src/rendering/event.dart +++ b/webf/lib/src/rendering/event.dart @@ -3,8 +3,8 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/src/gesture/gesture_dispatcher.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/src/gesture/gesture_dispatcher.dart'; typedef HandleGetEventTarget = EventTarget Function(); diff --git a/webf/lib/src/rendering/flex.dart b/webf/lib/src/rendering/flex.dart index 44324117ae..863c790d37 100644 --- a/webf/lib/src/rendering/flex.dart +++ b/webf/lib/src/rendering/flex.dart @@ -5,9 +5,9 @@ import 'dart:math' as math; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/module.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/css.dart'; +import 'package:webf/module.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/css.dart'; // Position and size info of each run (flex line) in flex layout. // https://www.w3.org/TR/css-flexbox-1/#flex-lines diff --git a/webf/lib/src/rendering/flow.dart b/webf/lib/src/rendering/flow.dart index 61dcd27148..66b2446c9e 100644 --- a/webf/lib/src/rendering/flow.dart +++ b/webf/lib/src/rendering/flow.dart @@ -5,9 +5,9 @@ import 'dart:math' as math; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/module.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/module.dart'; +import 'package:webf/rendering.dart'; // Position and size of each run (line box) in flow layout. // https://www.w3.org/TR/css-inline-3/#line-boxes diff --git a/webf/lib/src/rendering/line_break.dart b/webf/lib/src/rendering/line_break.dart index 915120f891..bb8770ae65 100644 --- a/webf/lib/src/rendering/line_break.dart +++ b/webf/lib/src/rendering/line_break.dart @@ -3,8 +3,8 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/rendering.dart'; class RenderLineBreak extends RenderReplaced { RenderLineBreak( diff --git a/webf/lib/src/rendering/overflow.dart b/webf/lib/src/rendering/overflow.dart index 46955ab622..3100c7ae78 100644 --- a/webf/lib/src/rendering/overflow.dart +++ b/webf/lib/src/rendering/overflow.dart @@ -4,9 +4,9 @@ import 'dart:math' as math; import 'package:flutter/rendering.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/gesture.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/gesture.dart'; mixin RenderOverflowMixin on RenderBoxModelBase { ScrollListener? scrollListener; diff --git a/webf/lib/src/rendering/preferred_size.dart b/webf/lib/src/rendering/preferred_size.dart index ca96a6df3c..fcccc41046 100644 --- a/webf/lib/src/rendering/preferred_size.dart +++ b/webf/lib/src/rendering/preferred_size.dart @@ -4,7 +4,7 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/rendering.dart'; /// [RenderPreferredSize] Render a box with preferred size, /// if no child provided, size is exactly what preferred size diff --git a/webf/lib/src/rendering/replaced.dart b/webf/lib/src/rendering/replaced.dart index ed95923e63..47712150d3 100644 --- a/webf/lib/src/rendering/replaced.dart +++ b/webf/lib/src/rendering/replaced.dart @@ -4,10 +4,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/module.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/module.dart'; +import 'package:webf/rendering.dart'; /// RenderBox of a replaced element whose content is outside the scope of the CSS formatting model, /// such as an image or embedded document. diff --git a/webf/lib/src/rendering/sliver_list.dart b/webf/lib/src/rendering/sliver_list.dart index 4c6ab31193..c212007908 100644 --- a/webf/lib/src/rendering/sliver_list.dart +++ b/webf/lib/src/rendering/sliver_list.dart @@ -7,11 +7,11 @@ import 'dart:ui'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/module.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/src/dom/sliver_manager.dart'; +import 'package:webf/css.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/module.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/src/dom/sliver_manager.dart'; class RenderSliverListLayout extends RenderLayoutBox { // Expose viewport for sliver mixin. diff --git a/webf/lib/src/rendering/text.dart b/webf/lib/src/rendering/text.dart index fa6669005d..67f0b3fbcb 100644 --- a/webf/lib/src/rendering/text.dart +++ b/webf/lib/src/rendering/text.dart @@ -3,9 +3,9 @@ */ import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/rendering.dart'; // White space processing in CSS affects only the document white space characters: // spaces (U+0020), tabs (U+0009), and segment breaks. diff --git a/webf/lib/src/rendering/text_control.dart b/webf/lib/src/rendering/text_control.dart index de6cc69105..6c3e32a96e 100644 --- a/webf/lib/src/rendering/text_control.dart +++ b/webf/lib/src/rendering/text_control.dart @@ -5,10 +5,10 @@ import 'dart:math' as math; import 'package:flutter/gestures.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/rendering.dart'; /// RenderLeaderLayer of [TextFormControlElement] used for toolbar overlay /// which includes [Cut], [Copy], [Paste], [Select All] shortcuts to float with. diff --git a/webf/lib/src/rendering/transform.dart b/webf/lib/src/rendering/transform.dart index 1b8f026510..201569a8ee 100644 --- a/webf/lib/src/rendering/transform.dart +++ b/webf/lib/src/rendering/transform.dart @@ -2,7 +2,7 @@ * Copyright (C) 2019-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/rendering.dart'; mixin RenderTransformMixin on RenderBoxModelBase { final LayerHandle _transformLayer = LayerHandle(); diff --git a/webf/lib/src/rendering/viewport.dart b/webf/lib/src/rendering/viewport.dart index 3bdae36001..fadd925bee 100644 --- a/webf/lib/src/rendering/viewport.dart +++ b/webf/lib/src/rendering/viewport.dart @@ -2,8 +2,8 @@ * Copyright (C) 2020-present The Kraken authors. All rights reserved. */ import 'package:flutter/rendering.dart'; -import 'package:kraken/launcher.dart'; -import 'package:kraken/rendering.dart'; +import 'package:webf/launcher.dart'; +import 'package:webf/rendering.dart'; class RenderViewportBox extends RenderProxyBox with RenderObjectWithControllerMixin, RenderEventListenerMixin { diff --git a/webf/lib/src/scheduler/fps.dart b/webf/lib/src/scheduler/fps.dart index 480266d831..3ed53d6e76 100644 --- a/webf/lib/src/scheduler/fps.dart +++ b/webf/lib/src/scheduler/fps.dart @@ -5,8 +5,8 @@ import 'dart:ui'; import 'package:flutter/rendering.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart'; /// Fps callback. typedef FpsCallback = void Function(List fps); diff --git a/webf/lib/src/widget/element_to_widget_adaptor.dart b/webf/lib/src/widget/element_to_widget_adaptor.dart index 378dfb292c..80df51fd0a 100644 --- a/webf/lib/src/widget/element_to_widget_adaptor.dart +++ b/webf/lib/src/widget/element_to_widget_adaptor.dart @@ -2,9 +2,9 @@ * Copyright (C) 2022-present The Kraken authors. All rights reserved. */ import 'package:flutter/widgets.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/dom.dart' as dom; -import 'package:kraken/rendering.dart'; +import 'package:webf/css.dart'; +import 'package:webf/dom.dart' as dom; +import 'package:webf/rendering.dart'; class KrakenElementToWidgetAdaptor extends RenderObjectWidget { final dom.Node _krakenNode; diff --git a/webf/lib/src/widget/kraken.dart b/webf/lib/src/widget/kraken.dart index 03948fcbe6..16a6f7b16a 100644 --- a/webf/lib/src/widget/kraken.dart +++ b/webf/lib/src/widget/kraken.dart @@ -8,10 +8,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/kraken.dart'; -import 'package:kraken/gesture.dart'; -import 'package:kraken/css.dart'; -import 'package:kraken/src/dom/element_registry.dart'; +import 'package:webf/kraken.dart'; +import 'package:webf/gesture.dart'; +import 'package:webf/css.dart'; +import 'package:webf/src/dom/element_registry.dart'; class Kraken extends StatefulWidget { // The background color for viewport, default to transparent. diff --git a/webf/lib/src/widget/text_control.dart b/webf/lib/src/widget/text_control.dart index c68b7b9077..f2a3877d88 100644 --- a/webf/lib/src/widget/text_control.dart +++ b/webf/lib/src/widget/text_control.dart @@ -4,10 +4,10 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/kraken.dart'; -import 'package:kraken/rendering.dart'; -import 'package:kraken/dom.dart' as dom; -import 'package:kraken/css.dart'; +import 'package:webf/kraken.dart'; +import 'package:webf/rendering.dart'; +import 'package:webf/dom.dart' as dom; +import 'package:webf/css.dart'; /// Get context of current widget. typedef GetContext = BuildContext Function(); diff --git a/webf/lib/src/widget/widget_to_element_adaptor.dart b/webf/lib/src/widget/widget_to_element_adaptor.dart index 49b95df254..9ba8e45a05 100644 --- a/webf/lib/src/widget/widget_to_element_adaptor.dart +++ b/webf/lib/src/widget/widget_to_element_adaptor.dart @@ -5,8 +5,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:kraken/kraken.dart'; -import 'package:kraken/dom.dart' as dom; +import 'package:webf/kraken.dart'; +import 'package:webf/dom.dart' as dom; class KrakenRenderObjectToWidgetAdapter extends RenderObjectWidget { /// Creates a bridge from a [RenderObject] to an [Element] tree. diff --git a/webf/macos/Classes/Kraken.h b/webf/macos/Classes/WebF.h similarity index 82% rename from webf/macos/Classes/Kraken.h rename to webf/macos/Classes/WebF.h index c8d9a5056d..1053017c49 100644 --- a/webf/macos/Classes/Kraken.h +++ b/webf/macos/Classes/WebF.h @@ -1,12 +1,11 @@ #import -#import "Kraken.h" -#import "KrakenPlugin.h" +#import "WebfPlugin.h" typedef void(^MethodHandler)(FlutterMethodCall* _Nonnull , FlutterResult _Nonnull); -@interface Kraken : NSObject +@interface WebF : NSObject -+ (Kraken* _Nonnull) instanceByBinaryMessenger: (NSObject* _Nonnull) messenger; ++ (WebF* _Nonnull) instanceByBinaryMessenger: (NSObject* _Nonnull) messenger; @property NSString* _Nullable bundleUrl; @property FlutterEngine* _Nonnull flutterEngine; diff --git a/webf/macos/Classes/Kraken.m b/webf/macos/Classes/WebF.m similarity index 86% rename from webf/macos/Classes/Kraken.m rename to webf/macos/Classes/WebF.m index fb21fc83be..b4ffaa121e 100644 --- a/webf/macos/Classes/Kraken.m +++ b/webf/macos/Classes/WebF.m @@ -1,13 +1,13 @@ #import -#import "Kraken.h" -#import "KrakenPlugin.h" +#import "WebF.h" +#import "WebfPlugin.h" static NSMutableArray *engineList = nil; -static NSMutableArray *instanceList = nil; +static NSMutableArray *instanceList = nil; -@implementation Kraken +@implementation WebF -+ (Kraken*) instanceByBinaryMessenger: (NSObject*) messenger { ++ (WebF*) instanceByBinaryMessenger: (NSObject*) messenger { // Return last instance, multi instance not supported yet. if (instanceList != nil && instanceList.count > 0) { return [instanceList objectAtIndex: instanceList.count - 1]; @@ -18,7 +18,7 @@ + (Kraken*) instanceByBinaryMessenger: (NSObject*) messe - (instancetype)initWithFlutterEngine: (FlutterEngine*) engine { self.flutterEngine = engine; - FlutterMethodChannel *channel = [KrakenPlugin getMethodChannel]; + FlutterMethodChannel *channel = [WebfPlugin getMethodChannel]; if (channel == nil) { NSException* exception = [NSException diff --git a/webf/macos/Classes/KrakenPlugin.h b/webf/macos/Classes/WebfPlugin.h similarity index 85% rename from webf/macos/Classes/KrakenPlugin.h rename to webf/macos/Classes/WebfPlugin.h index b1d8f7e65f..ca6f1b9041 100644 --- a/webf/macos/Classes/KrakenPlugin.h +++ b/webf/macos/Classes/WebfPlugin.h @@ -2,7 +2,7 @@ #define NAME_METHOD_SPLIT @"!!" -@interface KrakenPlugin : NSObject +@interface WebfPlugin : NSObject @property NSObject *registrar; @property FlutterMethodChannel *channel; diff --git a/webf/macos/Classes/KrakenPlugin.m b/webf/macos/Classes/WebfPlugin.m similarity index 78% rename from webf/macos/Classes/KrakenPlugin.m rename to webf/macos/Classes/WebfPlugin.m index cbe965f791..d3cc2afc2f 100644 --- a/webf/macos/Classes/KrakenPlugin.m +++ b/webf/macos/Classes/WebfPlugin.m @@ -1,9 +1,9 @@ -#import "Kraken.h" -#import "KrakenPlugin.h" +#import "WebF.h" +#import "WebfPlugin.h" static FlutterMethodChannel *methodChannel = nil; -@implementation KrakenPlugin +@implementation WebfPlugin + (FlutterMethodChannel *) getMethodChannel { return methodChannel; @@ -16,7 +16,7 @@ + (void)registerWithRegistrar:(NSObject*)registrar { binaryMessenger:messager]; methodChannel = channel; - KrakenPlugin* instance = [[KrakenPlugin alloc] initWithRegistrar: registrar]; + WebfPlugin* instance = [[WebfPlugin alloc] initWithRegistrar: registrar]; [registrar addMethodCallDelegate:instance channel:channel]; } @@ -28,14 +28,14 @@ - (instancetype) initWithRegistrar: (NSObject*)registrar - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { if ([@"getUrl" isEqualToString:call.method]) { - Kraken* krakenInstance = [Kraken instanceByBinaryMessenger: [self.registrar messenger]]; + WebF* krakenInstance = [WebF instanceByBinaryMessenger: [self.registrar messenger]]; if (krakenInstance != nil) { result([krakenInstance getUrl]); } else { result(nil); } } else if ([@"invokeMethod" isEqualToString: call.method]) { - Kraken* krakenInstance = [Kraken instanceByBinaryMessenger: [self.registrar messenger]]; + WebF* krakenInstance = [WebF instanceByBinaryMessenger: [self.registrar messenger]]; FlutterMethodCall* callWrap = [FlutterMethodCall methodCallWithMethodName: call.arguments[@"method"] arguments: call.arguments[@"args"]]; [krakenInstance _handleMethodCall:callWrap result:result]; } else if ([@"getTemporaryDirectory" isEqualToString: call.method]) { @@ -47,7 +47,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { - (NSString*) getTemporaryDirectory { NSArray* paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES); - return [paths.firstObject stringByAppendingString: @"/Kraken"]; + return [paths.firstObject stringByAppendingString: @"/WebF"]; } @end diff --git a/webf/macos/prepare.sh b/webf/macos/prepare.sh index b00f0e37c1..76f5e539cb 100755 --- a/webf/macos/prepare.sh +++ b/webf/macos/prepare.sh @@ -1,14 +1,14 @@ read_version() { - VERSION_STR=$(cat kraken.podspec | grep s.version | awk '{print $3}') + VERSION_STR=$(cat webf.podspec | grep s.version | awk '{print $3}') END_POS=$(echo ${#VERSION_STR} - 2 | bc) export VERSION=${VERSION_STR:1:$END_POS} } ROOT=$(pwd) -if [ -L "libkraken.dylib" ]; then - rm libkraken.dylib - ln -s $ROOT/../../bridge/build/macos/lib/x86_64/libkraken.dylib +if [ -L "libwebf.dylib" ]; then + rm libwebf.dylib + ln -s $ROOT/../../bridge/build/macos/lib/x86_64/libwebf.dylib fi if [ -L "libquickjs.dylib" ]; then diff --git a/webf/pubspec.yaml b/webf/pubspec.yaml index 8f50b2cb41..d8abfd1607 100644 --- a/webf/pubspec.yaml +++ b/webf/pubspec.yaml @@ -38,10 +38,10 @@ flutter: platforms: android: package: com.openwebf.webf - pluginClass: KrakenPlugin + pluginClass: WebfPlugin ios: - pluginClass: KrakenPlugin + pluginClass: WebfPlugin macos: - pluginClass: KrakenPlugin + pluginClass: WebfPlugin linux: - pluginClass: KrakenPlugin + pluginClass: WebfPlugin diff --git a/webf/test/kraken_test.dart b/webf/test/kraken_test.dart index 019a2fe165..25991aa907 100644 --- a/webf/test/kraken_test.dart +++ b/webf/test/kraken_test.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:flutter/widgets.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:kraken/kraken.dart'; +import 'package:webf/kraken.dart'; import 'local_http_server.dart'; diff --git a/webf/test/src/css/style_rule_parser.dart b/webf/test/src/css/style_rule_parser.dart index f83990cd6d..79124310ff 100644 --- a/webf/test/src/css/style_rule_parser.dart +++ b/webf/test/src/css/style_rule_parser.dart @@ -1,5 +1,5 @@ -import 'package:kraken/css.dart'; import 'package:test/test.dart'; +import 'package:webf/css.dart'; void main() { group('CSSStyleRuleParser', () { diff --git a/webf/test/src/css/style_sheet_parser.dart b/webf/test/src/css/style_sheet_parser.dart index ff5000483d..b17274d3e1 100644 --- a/webf/test/src/css/style_sheet_parser.dart +++ b/webf/test/src/css/style_sheet_parser.dart @@ -1,4 +1,4 @@ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; import 'package:test/test.dart'; void main() { diff --git a/webf/test/src/css/values.dart b/webf/test/src/css/values.dart index 7c3718d7b7..437cd8dd63 100644 --- a/webf/test/src/css/values.dart +++ b/webf/test/src/css/values.dart @@ -1,4 +1,4 @@ -import 'package:kraken/css.dart'; +import 'package:webf/css.dart'; import 'package:test/test.dart'; void main() { diff --git a/webf/test/src/foundation/bundle.dart b/webf/test/src/foundation/bundle.dart index 652678cafd..b2414c1dd9 100644 --- a/webf/test/src/foundation/bundle.dart +++ b/webf/test/src/foundation/bundle.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:typed_data'; import 'dart:io'; -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; import 'package:test/test.dart'; import '../../local_http_server.dart'; diff --git a/webf/test/src/foundation/convert.dart b/webf/test/src/foundation/convert.dart index 9738f5863d..cc66322277 100644 --- a/webf/test/src/foundation/convert.dart +++ b/webf/test/src/foundation/convert.dart @@ -1,4 +1,4 @@ -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; import 'package:test/test.dart'; diff --git a/webf/test/src/foundation/environment.dart b/webf/test/src/foundation/environment.dart index 0b2dca5062..3eaf038c45 100644 --- a/webf/test/src/foundation/environment.dart +++ b/webf/test/src/foundation/environment.dart @@ -1,4 +1,4 @@ -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; import 'package:test/test.dart'; void main() { diff --git a/webf/test/src/foundation/http_cache.dart b/webf/test/src/foundation/http_cache.dart index 4cbae5df52..55f29e919c 100644 --- a/webf/test/src/foundation/http_cache.dart +++ b/webf/test/src/foundation/http_cache.dart @@ -4,7 +4,7 @@ import 'dart:typed_data'; import 'package:flutter/foundation.dart'; import 'package:test/test.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; import '../../local_http_server.dart'; void main() { diff --git a/webf/test/src/foundation/http_client.dart b/webf/test/src/foundation/http_client.dart index 8deafd0bd8..43355597ab 100644 --- a/webf/test/src/foundation/http_client.dart +++ b/webf/test/src/foundation/http_client.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:test/test.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; import '../../local_http_server.dart'; diff --git a/webf/test/src/foundation/http_client_interceptor.dart b/webf/test/src/foundation/http_client_interceptor.dart index d7006dcd75..de5974e245 100644 --- a/webf/test/src/foundation/http_client_interceptor.dart +++ b/webf/test/src/foundation/http_client_interceptor.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:test/test.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; import '../../local_http_server.dart'; const int contextId = 2; diff --git a/webf/test/src/foundation/uri_parser.dart b/webf/test/src/foundation/uri_parser.dart index f247c41af1..5384859bfc 100644 --- a/webf/test/src/foundation/uri_parser.dart +++ b/webf/test/src/foundation/uri_parser.dart @@ -1,5 +1,5 @@ import 'package:test/test.dart'; -import 'package:kraken/foundation.dart'; +import 'package:webf/foundation.dart'; void main() { group('UriParser', () { diff --git a/webf/test/src/gesture/scroll_physics.dart b/webf/test/src/gesture/scroll_physics.dart index edf05c1eb5..fb907499a8 100644 --- a/webf/test/src/gesture/scroll_physics.dart +++ b/webf/test/src/gesture/scroll_physics.dart @@ -1,5 +1,5 @@ import 'dart:io' show Platform; -import 'package:kraken/src/gesture/scroll_physics.dart'; +import 'package:webf/src/gesture/scroll_physics.dart'; import 'package:test/test.dart'; // Only for test. diff --git a/webf/test/src/module/fetch.dart b/webf/test/src/module/fetch.dart index 2041e34595..28443f0b30 100644 --- a/webf/test/src/module/fetch.dart +++ b/webf/test/src/module/fetch.dart @@ -1,4 +1,4 @@ -import 'package:kraken/module.dart'; +import 'package:webf/module.dart'; import 'package:test/test.dart'; import '../../local_http_server.dart';