From 1913c7f16ec956ce717f0b2fd65f2d8a0df4dc9d Mon Sep 17 00:00:00 2001 From: Sharjeel Yunus <61178058+sharjeelyunus@users.noreply.github.com> Date: Mon, 30 Dec 2024 00:35:42 +0500 Subject: [PATCH 1/6] refactor: changes need to publish the package to pub.dev [jsparser => parsejs_null_safety] --- modules/auth/pubspec_overrides.yaml | 16 ++++++++++ modules/bracket/pubspec_overrides.yaml | 16 ++++++++++ modules/camera/pubspec_overrides.yaml | 16 ++++++++++ modules/chat/pubspec_overrides.yaml | 17 +++++++++++ modules/connect/pubspec_overrides.yaml | 16 ++++++++++ modules/contacts/pubspec_overrides.yaml | 16 ++++++++++ modules/deeplink/pubspec_overrides.yaml | 16 ++++++++++ .../example/pubspec_overrides.yaml | 4 +++ modules/ensemble/lib/ensemble.dart | 4 ++- .../ensemble/lib/framework/data_context.dart | 2 +- modules/ensemble/pubspec_overrides.yaml | 15 ++++++++++ .../ensemble_bluetooth/pubspec_overrides.yaml | 16 ++++++++++ modules/ensemble_icons/CHANGELOG.md | 5 ++++ modules/ensemble_icons/LICENSE | 29 +++++++++++++++++++ modules/ensemble_icons/pubspec.yaml | 6 +++- .../pubspec_overrides.yaml | 16 ++++++++++ .../lib/parser/newjs_interpreter.dart | 11 ++++--- modules/ensemble_ts_interpreter/pubspec.yaml | 8 ++--- .../pubspec_overrides.yaml | 4 +++ .../test/new_interpreter_tests.dart | 26 ++++++++++------- modules/file_manager/pubspec_overrides.yaml | 16 ++++++++++ .../firebase_analytics/pubspec_overrides.yaml | 16 ++++++++++ .../example/chartjs/pubspec_overrides.yaml | 4 +++ modules/location/pubspec_overrides.yaml | 16 ++++++++++ .../example/pubspec_overrides.yaml | 4 +++ modules/parsejs_null_safety/CHANGELOG.md | 14 +++++++++ modules/parsejs_null_safety/README.md | 4 ++- .../parsejs_null_safety/example/example.dart | 2 +- ...jsparser.dart => parsejs_null_safety.dart} | 2 +- .../parsejs_null_safety/lib/src/parser.dart | 10 +++---- modules/parsejs_null_safety/pubspec.yaml | 13 +++++---- .../parsejs_null_safety/test/ast_json.dart | 7 ++--- .../parsejs_null_safety/test/json_viewer.dart | 2 +- .../parsejs_null_safety/test/lexer_test.dart | 2 +- .../parsejs_null_safety/test/parser_test.dart | 2 +- starter/pubspec_overrides.yaml | 16 ++++++++++ 36 files changed, 344 insertions(+), 45 deletions(-) create mode 100644 modules/auth/pubspec_overrides.yaml create mode 100644 modules/bracket/pubspec_overrides.yaml create mode 100644 modules/camera/pubspec_overrides.yaml create mode 100644 modules/chat/pubspec_overrides.yaml create mode 100644 modules/connect/pubspec_overrides.yaml create mode 100644 modules/contacts/pubspec_overrides.yaml create mode 100644 modules/deeplink/pubspec_overrides.yaml create mode 100644 modules/device_preview/example/pubspec_overrides.yaml create mode 100644 modules/ensemble/pubspec_overrides.yaml create mode 100644 modules/ensemble_bluetooth/pubspec_overrides.yaml create mode 100644 modules/ensemble_icons/CHANGELOG.md create mode 100644 modules/ensemble_icons/LICENSE create mode 100644 modules/ensemble_network_info/pubspec_overrides.yaml create mode 100644 modules/ensemble_ts_interpreter/pubspec_overrides.yaml create mode 100644 modules/file_manager/pubspec_overrides.yaml create mode 100644 modules/firebase_analytics/pubspec_overrides.yaml create mode 100644 modules/js_widget/example/chartjs/pubspec_overrides.yaml create mode 100644 modules/location/pubspec_overrides.yaml create mode 100644 modules/otp_pin_field/example/pubspec_overrides.yaml rename modules/parsejs_null_safety/lib/{jsparser.dart => parsejs_null_safety.dart} (98%) create mode 100644 starter/pubspec_overrides.yaml diff --git a/modules/auth/pubspec_overrides.yaml b/modules/auth/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/auth/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/bracket/pubspec_overrides.yaml b/modules/bracket/pubspec_overrides.yaml new file mode 100644 index 000000000..5331cfa56 --- /dev/null +++ b/modules/bracket/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,jsparser,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/camera/pubspec_overrides.yaml b/modules/camera/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/camera/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/chat/pubspec_overrides.yaml b/modules/chat/pubspec_overrides.yaml new file mode 100644 index 000000000..c7a99a92f --- /dev/null +++ b/modules/chat/pubspec_overrides.yaml @@ -0,0 +1,17 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field,web_socket_channel +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field + web_socket_channel: 2.3.0 diff --git a/modules/connect/pubspec_overrides.yaml b/modules/connect/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/connect/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/contacts/pubspec_overrides.yaml b/modules/contacts/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/contacts/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/deeplink/pubspec_overrides.yaml b/modules/deeplink/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/deeplink/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/device_preview/example/pubspec_overrides.yaml b/modules/device_preview/example/pubspec_overrides.yaml new file mode 100644 index 000000000..f9a0dca6e --- /dev/null +++ b/modules/device_preview/example/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: device_preview +dependency_overrides: + device_preview: + path: .. diff --git a/modules/ensemble/lib/ensemble.dart b/modules/ensemble/lib/ensemble.dart index fb568d083..8445ac697 100644 --- a/modules/ensemble/lib/ensemble.dart +++ b/modules/ensemble/lib/ensemble.dart @@ -36,7 +36,7 @@ import 'package:get_it/get_it.dart'; import 'package:yaml/yaml.dart'; import 'package:firebase_core/firebase_core.dart'; import 'html_shim.dart' if (dart.library.html) 'dart:html' show window; -import 'package:jsparser/jsparser.dart'; +import 'package:parsejs_null_safety/parsejs_null_safety.dart'; import 'framework/theme/theme_loader.dart'; import 'layout/ensemble_page_route.dart'; @@ -452,9 +452,11 @@ class EnsembleConfig { ThemeData getAppTheme() { return ThemeManager().getAppTheme(appBundle?.theme); } + bool hasLegacyCustomAppTheme() { return ThemeManager().hasLegacyCustomAppTheme(appBundle?.theme); } + /// retrieve the global widgets/codes/APIs Map? getResources() { return appBundle?.resources; diff --git a/modules/ensemble/lib/framework/data_context.dart b/modules/ensemble/lib/framework/data_context.dart index dafa62024..cd00c2728 100644 --- a/modules/ensemble/lib/framework/data_context.dart +++ b/modules/ensemble/lib/framework/data_context.dart @@ -53,7 +53,7 @@ import 'package:walletconnect_dart/walletconnect_dart.dart'; import 'package:workmanager/workmanager.dart'; import 'package:yaml/yaml.dart'; import 'package:collection/collection.dart'; -import 'package:jsparser/jsparser.dart'; +import 'package:parsejs_null_safety/parsejs_null_safety.dart'; /// manages Data and Invokables within the current data scope. /// This class can evaluate expressions based on the data scope diff --git a/modules/ensemble/pubspec_overrides.yaml b/modules/ensemble/pubspec_overrides.yaml new file mode 100644 index 000000000..9176a7182 --- /dev/null +++ b/modules/ensemble/pubspec_overrides.yaml @@ -0,0 +1,15 @@ +# melos_managed_dependency_overrides: device_preview,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field,http +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field + http: ^0.13.5 diff --git a/modules/ensemble_bluetooth/pubspec_overrides.yaml b/modules/ensemble_bluetooth/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/ensemble_bluetooth/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/ensemble_icons/CHANGELOG.md b/modules/ensemble_icons/CHANGELOG.md new file mode 100644 index 000000000..0722aa7a0 --- /dev/null +++ b/modules/ensemble_icons/CHANGELOG.md @@ -0,0 +1,5 @@ +# Changelog + +## [0.0.1+1] - 2024-12-28 + +- Initial release of the ensemble_icons package. diff --git a/modules/ensemble_icons/LICENSE b/modules/ensemble_icons/LICENSE new file mode 100644 index 000000000..98ad8cf90 --- /dev/null +++ b/modules/ensemble_icons/LICENSE @@ -0,0 +1,29 @@ +# BSD 3-Clause License + +Copyright (c) 2024, Ensemble Technologies Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/modules/ensemble_icons/pubspec.yaml b/modules/ensemble_icons/pubspec.yaml index 50d0bfcc5..e7c398440 100644 --- a/modules/ensemble_icons/pubspec.yaml +++ b/modules/ensemble_icons/pubspec.yaml @@ -18,7 +18,7 @@ description: A new Flutter module project. version: 0.0.1+1 environment: - sdk: '>=3.5.0' + sdk: ">=3.5.0 <4.0.0" dependencies: flutter: @@ -54,3 +54,7 @@ flutter: androidX: true androidPackage: com.example.ensemble_icons iosBundleIdentifier: com.example.ensembleIcons + +homepage: https://github.com/EnsembleUI/ensemble/tree/main/modules/ensemble_icons +repository: https://github.com/EnsembleUI/ensemble +issue_tracker: https://github.com/EnsembleUI/ensemble/issues diff --git a/modules/ensemble_network_info/pubspec_overrides.yaml b/modules/ensemble_network_info/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/ensemble_network_info/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/ensemble_ts_interpreter/lib/parser/newjs_interpreter.dart b/modules/ensemble_ts_interpreter/lib/parser/newjs_interpreter.dart index 346af2427..e3ac842b6 100644 --- a/modules/ensemble_ts_interpreter/lib/parser/newjs_interpreter.dart +++ b/modules/ensemble_ts_interpreter/lib/parser/newjs_interpreter.dart @@ -4,7 +4,7 @@ import 'package:ensemble_ts_interpreter/invokables/context.dart'; import 'package:ensemble_ts_interpreter/invokables/invokable.dart'; import 'package:ensemble_ts_interpreter/invokables/invokablecommons.dart'; import 'package:ensemble_ts_interpreter/invokables/invokablecontroller.dart'; -import 'package:jsparser/jsparser.dart'; +import 'package:parsejs_null_safety/parsejs_null_safety.dart'; import 'package:ensemble_ts_interpreter/parser/regex_ext.dart'; class Bindings extends RecursiveVisitor { @@ -1204,6 +1204,7 @@ class JSInterpreter extends RecursiveVisitor { visitName(Name node) { return node; } + @override visitThrow(ThrowStatement node) { dynamic argumentValue = getValueFromExpression(node.argument); @@ -1217,7 +1218,8 @@ class JSInterpreter extends RecursiveVisitor { @override visitTry(TryStatement node) { if (node.handler == null && node.finalizer == null) { - throw JSException(node.line ?? 0, "Syntax Error: a try block must have a corresponding catch or finally"); + throw JSException(node.line ?? 0, + "Syntax Error: a try block must have a corresponding catch or finally"); } try { node.block.visitBy(this); @@ -1236,7 +1238,8 @@ class JSInterpreter extends RecursiveVisitor { } Context context = SimpleContext(ctxMap); // Clone the interpreter with this new context - JSInterpreter interpreter = cloneForContext(node.handler!, context, true); + JSInterpreter interpreter = + cloneForContext(node.handler!, context, true); interpreter.visitCatchClause(node.handler!); } } finally { @@ -1261,6 +1264,7 @@ class JSInterpreter extends RecursiveVisitor { return exception.toString(); } } + dynamic getValueFromExpression(Expression exp) { return getValueFromNode(exp); } @@ -1336,4 +1340,3 @@ class JavascriptFunction { } } } - diff --git a/modules/ensemble_ts_interpreter/pubspec.yaml b/modules/ensemble_ts_interpreter/pubspec.yaml index b30a26bb3..2bd792133 100644 --- a/modules/ensemble_ts_interpreter/pubspec.yaml +++ b/modules/ensemble_ts_interpreter/pubspec.yaml @@ -24,7 +24,7 @@ documentation: https://github.com/EnsembleUI/ensemble_ts_interpreter version: 1.0.0+1 environment: - sdk: ">=3.5.0" + sdk: ">=3.5.0 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -49,11 +49,7 @@ dependencies: ref: master #flutter_js: ^0.5.0+6 #dartjsengine: ^1.0.1 - jsparser: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/parsejs_null_safety + parsejs_null_safety: ^2.0.3 source_span: ^1.9.1 intl: '>=0.18.1 <=0.19.0' diff --git a/modules/ensemble_ts_interpreter/pubspec_overrides.yaml b/modules/ensemble_ts_interpreter/pubspec_overrides.yaml new file mode 100644 index 000000000..c48629538 --- /dev/null +++ b/modules/ensemble_ts_interpreter/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: parsejs_null_safety +dependency_overrides: + parsejs_null_safety: + path: ..\\parsejs_null_safety diff --git a/modules/ensemble_ts_interpreter/test/new_interpreter_tests.dart b/modules/ensemble_ts_interpreter/test/new_interpreter_tests.dart index 74c698b1d..f4d76b1c6 100644 --- a/modules/ensemble_ts_interpreter/test/new_interpreter_tests.dart +++ b/modules/ensemble_ts_interpreter/test/new_interpreter_tests.dart @@ -7,7 +7,7 @@ import 'package:json_path/json_path.dart'; import 'dart:convert'; import 'dart:io'; import 'package:test/test.dart'; -import 'package:jsparser/jsparser.dart'; +import 'package:parsejs_null_safety/parsejs_null_safety.dart'; class Ensemble extends Object with Invokable { String? name, date, firstName, lastName, text; @@ -369,7 +369,7 @@ void main() { .evaluate(); expect(rtn, false); }); - test('jsparser', () async { + test('parsejs_null_safety', () async { String codeToEvaluate = """ var arr = ['worked!']; users.map(function(user) { @@ -533,8 +533,8 @@ void main() { """; Map context = initContext(); dynamic rtnValue = - JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)) - .evaluate(); + JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)) + .evaluate(); //expect(context['indices'][2], 2); }); test('whilelooptest', () async { @@ -2727,7 +2727,8 @@ function createRandomizedTiles() { Map context = initContext(); JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)).evaluate(); expect(context['caughtError'], 'An error'); - expect(context.containsKey('e'), false); // 'e' should not be accessible outside + expect(context.containsKey('e'), + false); // 'e' should not be accessible outside }); test('variable scope in try', () { @@ -2796,7 +2797,7 @@ function createRandomizedTiles() { // () => JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)).evaluate(), // throwsA(isA())); expect(context['exceptionVar'], 'An error'); - expect(context['outsideE'],null); + expect(context['outsideE'], null); }); test('variables outside accessible inside try', () { @@ -2823,7 +2824,8 @@ function createRandomizedTiles() { Map context = initContext(); //JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)).evaluate(); expect( - () => JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)).evaluate(), + () => JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)) + .evaluate(), throwsA(isA())); }); @@ -2856,7 +2858,8 @@ function createRandomizedTiles() { """; Map context = initContext(); expect( - () => JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)).evaluate(), + () => JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)) + .evaluate(), throwsA(isA())); }); @@ -2873,7 +2876,8 @@ function createRandomizedTiles() { """; Map context = initContext(); expect( - () => JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)).evaluate(), + () => JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)) + .evaluate(), throwsA(isA())); expect(context['inFinally'], true); }); @@ -3105,9 +3109,9 @@ function createRandomizedTiles() { Map context = initContext(); // ES5 syntax error: 'try' without 'catch' or 'finally' is invalid expect( - () => JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)).evaluate(), + () => JSInterpreter.fromCode(codeToEvaluate, SimpleContext(context)) + .evaluate(), throwsA(isA())); }); }); - } diff --git a/modules/file_manager/pubspec_overrides.yaml b/modules/file_manager/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/file_manager/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/firebase_analytics/pubspec_overrides.yaml b/modules/firebase_analytics/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/firebase_analytics/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/js_widget/example/chartjs/pubspec_overrides.yaml b/modules/js_widget/example/chartjs/pubspec_overrides.yaml new file mode 100644 index 000000000..3008a7df0 --- /dev/null +++ b/modules/js_widget/example/chartjs/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: js_widget +dependency_overrides: + js_widget: + path: ..\\.. diff --git a/modules/location/pubspec_overrides.yaml b/modules/location/pubspec_overrides.yaml new file mode 100644 index 000000000..3ac775106 --- /dev/null +++ b/modules/location/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\device_preview + ensemble: + path: ..\\ensemble + ensemble_icons: + path: ..\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\ensemble_ts_interpreter + js_widget: + path: ..\\js_widget + parsejs_null_safety: + path: ..\\parsejs_null_safety + otp_pin_field: + path: ..\\otp_pin_field diff --git a/modules/otp_pin_field/example/pubspec_overrides.yaml b/modules/otp_pin_field/example/pubspec_overrides.yaml new file mode 100644 index 000000000..ba9255265 --- /dev/null +++ b/modules/otp_pin_field/example/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: otp_pin_field +dependency_overrides: + otp_pin_field: + path: .. diff --git a/modules/parsejs_null_safety/CHANGELOG.md b/modules/parsejs_null_safety/CHANGELOG.md index 437308784..619d1bdca 100644 --- a/modules/parsejs_null_safety/CHANGELOG.md +++ b/modules/parsejs_null_safety/CHANGELOG.md @@ -1,6 +1,20 @@ +# ChangeLog + +## 2.0.3 (2024-12-29) + +- Fixes + +## 2.0.2 (2024-12-29) + +- Migrated to null safety (Dart SDK >=3.5.0). +- Updated dependencies and constraints. + ## 2.0.1 (2019-08-06) + - Amended Pub analysis suggestions + ## 2.0.0 (2019-08-06) + - Updated for Dart 2.4 ## 1.2.0 (2017-05-06) diff --git a/modules/parsejs_null_safety/README.md b/modules/parsejs_null_safety/README.md index 5a31cc788..f52a4dc29 100644 --- a/modules/parsejs_null_safety/README.md +++ b/modules/parsejs_null_safety/README.md @@ -5,8 +5,9 @@ Original project : https://github.com/asgerf/parsejs.dart This project is intended to migrate it to dart 2.4 or above ## Example Usage + ```dart -import 'package:jsparser/jsparser.dart'; +import 'package:parsejs_null_safety/parsejs_null_safety.dart'; import 'dart:io'; void main() { @@ -29,6 +30,7 @@ The `jsparser` function takes the following optional arguments: ## To run test cases + 1. Open terminal and cd to parsejs.dart/test/util directory 2. Do `npm install` 3. CD to parsejs.dart/test/ director and run `./runtest` \ No newline at end of file diff --git a/modules/parsejs_null_safety/example/example.dart b/modules/parsejs_null_safety/example/example.dart index 1d9921f29..2accf61bb 100644 --- a/modules/parsejs_null_safety/example/example.dart +++ b/modules/parsejs_null_safety/example/example.dart @@ -1,4 +1,4 @@ -import 'package:jsparser/jsparser.dart'; +import 'package:parsejs_null_safety/parsejs_null_safety.dart'; import 'dart:io'; void main() { diff --git a/modules/parsejs_null_safety/lib/jsparser.dart b/modules/parsejs_null_safety/lib/parsejs_null_safety.dart similarity index 98% rename from modules/parsejs_null_safety/lib/jsparser.dart rename to modules/parsejs_null_safety/lib/parsejs_null_safety.dart index ee269d4d7..1fbfd2ee1 100644 --- a/modules/parsejs_null_safety/lib/jsparser.dart +++ b/modules/parsejs_null_safety/lib/parsejs_null_safety.dart @@ -1,4 +1,4 @@ -library jsparser; +library parsejs_null_safety; import 'src/ast.dart'; import 'src/lexer.dart'; diff --git a/modules/parsejs_null_safety/lib/src/parser.dart b/modules/parsejs_null_safety/lib/src/parser.dart index a3c2e8d71..105782a41 100644 --- a/modules/parsejs_null_safety/lib/src/parser.dart +++ b/modules/parsejs_null_safety/lib/src/parser.dart @@ -1,6 +1,6 @@ -library parser; +library parsejs_null_safety; -import 'package:jsparser/jsparser.dart'; +import 'package:parsejs_null_safety/parsejs_null_safety.dart'; import 'lexer.dart'; import 'ast.dart'; @@ -541,7 +541,7 @@ class Parser { return exp; } - Expression parseAssignment({bool allowIn= true}) { + Expression parseAssignment({bool allowIn = true}) { int? start = token!.startOffset; Expression exp = parseConditional(allowIn); if (token!.type == Token.ASSIGN) { @@ -555,7 +555,7 @@ class Parser { return exp; } - Expression parseExpression({bool allowIn= true}) { + Expression parseExpression({bool allowIn = true}) { int? start = token!.startOffset; Expression exp = parseAssignment(allowIn: allowIn); if (token!.type == Token.COMMA) { @@ -589,7 +589,7 @@ class Parser { ..line = line; } - VariableDeclaration parseVariableDeclarationList({bool allowIn= true}) { + VariableDeclaration parseVariableDeclarationList({bool allowIn = true}) { int? start = token!.startOffset; int? line = token!.line; assert(token!.text == 'var'); diff --git a/modules/parsejs_null_safety/pubspec.yaml b/modules/parsejs_null_safety/pubspec.yaml index 491a542f0..908a5c325 100644 --- a/modules/parsejs_null_safety/pubspec.yaml +++ b/modules/parsejs_null_safety/pubspec.yaml @@ -1,14 +1,15 @@ -name: jsparser -version: 2.0.1 -author: Khurram Mahmood (original - Anurag Vohra ) +name: parsejs_null_safety +version: 2.0.3 description: >- JavaScript parser originally written by Asger Feldthaus Upgraded to Dart 2.12 with null safety. -homepage: https://ensembleui.com -repository: https://github.com/kmahmood74/parsejs_null_safety.dart + +homepage: https://github.com/EnsembleUI/ensemble +repository: https://github.com/EnsembleUI/ensemble/tree/main/modules/parsejs_null_safety +issue_tracker: https://github.com/EnsembleUI/ensemble/issues environment: - sdk: '>=3.5.0' + sdk: ">=3.5.0 <4.0.0" dependencies: unicode: '>=0.0.8 <1.0.0' diff --git a/modules/parsejs_null_safety/test/ast_json.dart b/modules/parsejs_null_safety/test/ast_json.dart index 9e6427594..ed72d7572 100644 --- a/modules/parsejs_null_safety/test/ast_json.dart +++ b/modules/parsejs_null_safety/test/ast_json.dart @@ -1,6 +1,6 @@ library ast_json; -import 'package:jsparser/src/ast.dart'; +import 'package:parsejs_null_safety/src/ast.dart'; /// Converts an AST to a JSON object matching the AST structure emitted by the Esprima parser. /// This is for testing purposes, so the output can be compared against another well-tested parser. @@ -8,7 +8,7 @@ class Ast2Json extends Visitor { bool ranges; bool lines; - Ast2Json({this.ranges= false, this.lines= false}); + Ast2Json({this.ranges = false, this.lines = false}); // NOTE: The order in which properties are mentioned is significant, since properties // must be mentioned in the same order for our JSON comparator to work. @@ -257,6 +257,5 @@ class Ast2Json extends Visitor { {'type': 'Literal', 'value': {}, 'raw': node.regexp}; @override - Object? visitArrowFunctionNode(ArrowFunctionNode node) { - } + Object? visitArrowFunctionNode(ArrowFunctionNode node) {} } diff --git a/modules/parsejs_null_safety/test/json_viewer.dart b/modules/parsejs_null_safety/test/json_viewer.dart index 57ad12626..17b0b048f 100644 --- a/modules/parsejs_null_safety/test/json_viewer.dart +++ b/modules/parsejs_null_safety/test/json_viewer.dart @@ -1,6 +1,6 @@ import 'ast_json.dart'; import 'dart:io'; -import 'package:jsparser/jsparser.dart'; +import 'package:parsejs_null_safety/parsejs_null_safety.dart'; Program parseInput(String text) { try { diff --git a/modules/parsejs_null_safety/test/lexer_test.dart b/modules/parsejs_null_safety/test/lexer_test.dart index 3c6e9e61f..a3df042c0 100644 --- a/modules/parsejs_null_safety/test/lexer_test.dart +++ b/modules/parsejs_null_safety/test/lexer_test.dart @@ -1,5 +1,5 @@ import 'dart:io'; -import 'package:jsparser/src/lexer.dart'; +import 'package:parsejs_null_safety/src/lexer.dart'; void main(List args) { if (args.length != 1) { diff --git a/modules/parsejs_null_safety/test/parser_test.dart b/modules/parsejs_null_safety/test/parser_test.dart index 94693709d..bd0ec7025 100644 --- a/modules/parsejs_null_safety/test/parser_test.dart +++ b/modules/parsejs_null_safety/test/parser_test.dart @@ -1,6 +1,6 @@ // Parses the given FILE and prints it as JSON so it can be compared against Esprima's output. -import 'package:jsparser/jsparser.dart'; +import 'package:parsejs_null_safety/parsejs_null_safety.dart'; import 'ast_json.dart'; import 'dart:io'; diff --git a/starter/pubspec_overrides.yaml b/starter/pubspec_overrides.yaml new file mode 100644 index 000000000..2c282f246 --- /dev/null +++ b/starter/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field +dependency_overrides: + device_preview: + path: ..\\modules\\device_preview + ensemble: + path: ..\\modules\\ensemble + ensemble_icons: + path: ..\\modules\\ensemble_icons + ensemble_ts_interpreter: + path: ..\\modules\\ensemble_ts_interpreter + js_widget: + path: ..\\modules\\js_widget + parsejs_null_safety: + path: ..\\modules\\parsejs_null_safety + otp_pin_field: + path: ..\\modules\\otp_pin_field From d567f59d9c0aa0aca9c7bc0091d9e116b6a83801 Mon Sep 17 00:00:00 2001 From: Sharjeel Yunus <61178058+sharjeelyunus@users.noreply.github.com> Date: Mon, 30 Dec 2024 00:42:19 +0500 Subject: [PATCH 2/6] remove pubsepc_overrides --- modules/auth/pubspec_overrides.yaml | 16 ---------------- modules/bracket/pubspec_overrides.yaml | 16 ---------------- modules/camera/pubspec_overrides.yaml | 16 ---------------- modules/chat/pubspec_overrides.yaml | 17 ----------------- modules/connect/pubspec_overrides.yaml | 16 ---------------- modules/contacts/pubspec_overrides.yaml | 16 ---------------- modules/deeplink/pubspec_overrides.yaml | 16 ---------------- .../example/pubspec_overrides.yaml | 4 ---- modules/ensemble/pubspec_overrides.yaml | 15 --------------- .../ensemble_bluetooth/pubspec_overrides.yaml | 16 ---------------- .../pubspec_overrides.yaml | 16 ---------------- .../pubspec_overrides.yaml | 4 ---- modules/file_manager/pubspec_overrides.yaml | 16 ---------------- .../firebase_analytics/pubspec_overrides.yaml | 16 ---------------- .../example/chartjs/pubspec_overrides.yaml | 4 ---- modules/location/pubspec_overrides.yaml | 16 ---------------- .../example/pubspec_overrides.yaml | 4 ---- starter/pubspec_overrides.yaml | 16 ---------------- 18 files changed, 240 deletions(-) delete mode 100644 modules/auth/pubspec_overrides.yaml delete mode 100644 modules/bracket/pubspec_overrides.yaml delete mode 100644 modules/camera/pubspec_overrides.yaml delete mode 100644 modules/chat/pubspec_overrides.yaml delete mode 100644 modules/connect/pubspec_overrides.yaml delete mode 100644 modules/contacts/pubspec_overrides.yaml delete mode 100644 modules/deeplink/pubspec_overrides.yaml delete mode 100644 modules/device_preview/example/pubspec_overrides.yaml delete mode 100644 modules/ensemble/pubspec_overrides.yaml delete mode 100644 modules/ensemble_bluetooth/pubspec_overrides.yaml delete mode 100644 modules/ensemble_network_info/pubspec_overrides.yaml delete mode 100644 modules/ensemble_ts_interpreter/pubspec_overrides.yaml delete mode 100644 modules/file_manager/pubspec_overrides.yaml delete mode 100644 modules/firebase_analytics/pubspec_overrides.yaml delete mode 100644 modules/js_widget/example/chartjs/pubspec_overrides.yaml delete mode 100644 modules/location/pubspec_overrides.yaml delete mode 100644 modules/otp_pin_field/example/pubspec_overrides.yaml delete mode 100644 starter/pubspec_overrides.yaml diff --git a/modules/auth/pubspec_overrides.yaml b/modules/auth/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/auth/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/bracket/pubspec_overrides.yaml b/modules/bracket/pubspec_overrides.yaml deleted file mode 100644 index 5331cfa56..000000000 --- a/modules/bracket/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,jsparser,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/camera/pubspec_overrides.yaml b/modules/camera/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/camera/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/chat/pubspec_overrides.yaml b/modules/chat/pubspec_overrides.yaml deleted file mode 100644 index c7a99a92f..000000000 --- a/modules/chat/pubspec_overrides.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field,web_socket_channel -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field - web_socket_channel: 2.3.0 diff --git a/modules/connect/pubspec_overrides.yaml b/modules/connect/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/connect/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/contacts/pubspec_overrides.yaml b/modules/contacts/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/contacts/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/deeplink/pubspec_overrides.yaml b/modules/deeplink/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/deeplink/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/device_preview/example/pubspec_overrides.yaml b/modules/device_preview/example/pubspec_overrides.yaml deleted file mode 100644 index f9a0dca6e..000000000 --- a/modules/device_preview/example/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: device_preview -dependency_overrides: - device_preview: - path: .. diff --git a/modules/ensemble/pubspec_overrides.yaml b/modules/ensemble/pubspec_overrides.yaml deleted file mode 100644 index 9176a7182..000000000 --- a/modules/ensemble/pubspec_overrides.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field,http -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field - http: ^0.13.5 diff --git a/modules/ensemble_bluetooth/pubspec_overrides.yaml b/modules/ensemble_bluetooth/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/ensemble_bluetooth/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/ensemble_network_info/pubspec_overrides.yaml b/modules/ensemble_network_info/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/ensemble_network_info/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/ensemble_ts_interpreter/pubspec_overrides.yaml b/modules/ensemble_ts_interpreter/pubspec_overrides.yaml deleted file mode 100644 index c48629538..000000000 --- a/modules/ensemble_ts_interpreter/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: parsejs_null_safety -dependency_overrides: - parsejs_null_safety: - path: ..\\parsejs_null_safety diff --git a/modules/file_manager/pubspec_overrides.yaml b/modules/file_manager/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/file_manager/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/firebase_analytics/pubspec_overrides.yaml b/modules/firebase_analytics/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/firebase_analytics/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/js_widget/example/chartjs/pubspec_overrides.yaml b/modules/js_widget/example/chartjs/pubspec_overrides.yaml deleted file mode 100644 index 3008a7df0..000000000 --- a/modules/js_widget/example/chartjs/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: js_widget -dependency_overrides: - js_widget: - path: ..\\.. diff --git a/modules/location/pubspec_overrides.yaml b/modules/location/pubspec_overrides.yaml deleted file mode 100644 index 3ac775106..000000000 --- a/modules/location/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\device_preview - ensemble: - path: ..\\ensemble - ensemble_icons: - path: ..\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\ensemble_ts_interpreter - js_widget: - path: ..\\js_widget - parsejs_null_safety: - path: ..\\parsejs_null_safety - otp_pin_field: - path: ..\\otp_pin_field diff --git a/modules/otp_pin_field/example/pubspec_overrides.yaml b/modules/otp_pin_field/example/pubspec_overrides.yaml deleted file mode 100644 index ba9255265..000000000 --- a/modules/otp_pin_field/example/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: otp_pin_field -dependency_overrides: - otp_pin_field: - path: .. diff --git a/starter/pubspec_overrides.yaml b/starter/pubspec_overrides.yaml deleted file mode 100644 index 2c282f246..000000000 --- a/starter/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: device_preview,ensemble,ensemble_icons,ensemble_ts_interpreter,js_widget,parsejs_null_safety,otp_pin_field -dependency_overrides: - device_preview: - path: ..\\modules\\device_preview - ensemble: - path: ..\\modules\\ensemble - ensemble_icons: - path: ..\\modules\\ensemble_icons - ensemble_ts_interpreter: - path: ..\\modules\\ensemble_ts_interpreter - js_widget: - path: ..\\modules\\js_widget - parsejs_null_safety: - path: ..\\modules\\parsejs_null_safety - otp_pin_field: - path: ..\\modules\\otp_pin_field From c48fc2bfedba7f4b1960aed15202f64882b54edb Mon Sep 17 00:00:00 2001 From: Sharjeel Yunus <61178058+sharjeelyunus@users.noreply.github.com> Date: Mon, 30 Dec 2024 01:06:46 +0500 Subject: [PATCH 3/6] feat: release ensemble_icons package version 1.0.0 with updated description --- modules/ensemble/pubspec.yaml | 6 +----- modules/ensemble_icons/CHANGELOG.md | 4 ++++ modules/ensemble_icons/pubspec.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/ensemble/pubspec.yaml b/modules/ensemble/pubspec.yaml index a0fe6a2d6..5bb46616c 100644 --- a/modules/ensemble/pubspec.yaml +++ b/modules/ensemble/pubspec.yaml @@ -42,11 +42,7 @@ dependencies: fl_chart: ^0.69.0 signature: ^5.5.0 - ensemble_icons: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/ensemble_icons + ensemble_icons: ^1.0.0 ensemble_ts_interpreter: git: diff --git a/modules/ensemble_icons/CHANGELOG.md b/modules/ensemble_icons/CHANGELOG.md index 0722aa7a0..47fdb490a 100644 --- a/modules/ensemble_icons/CHANGELOG.md +++ b/modules/ensemble_icons/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [1.0.0] - 2024-12-30 + +- Release of the ensemble_icons package. + ## [0.0.1+1] - 2024-12-28 - Initial release of the ensemble_icons package. diff --git a/modules/ensemble_icons/pubspec.yaml b/modules/ensemble_icons/pubspec.yaml index e7c398440..16e4cc8ee 100644 --- a/modules/ensemble_icons/pubspec.yaml +++ b/modules/ensemble_icons/pubspec.yaml @@ -1,5 +1,5 @@ name: ensemble_icons -description: A new Flutter module project. +description: Ensemble Icons is a collection of icons from Remix/Font Awesome and other sources. It is a Flutter package that provides a set of icons that can be used in Ensemble apps. # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -15,7 +15,7 @@ description: A new Flutter module project. # This version is used _only_ for the Runner app, which is used if you just do # a `flutter run` or a `flutter make-host-app-editable`. It has no impact # on any other native host app that you embed your Flutter project into. -version: 0.0.1+1 +version: 1.0.0 environment: sdk: ">=3.5.0 <4.0.0" From 49c05609d7d9254f522ba5f9c9b20690e045f78e Mon Sep 17 00:00:00 2001 From: Sharjeel Yunus <61178058+sharjeelyunus@users.noreply.github.com> Date: Mon, 30 Dec 2024 01:40:04 +0500 Subject: [PATCH 4/6] chore: publish ensemble_ts_interpreter --- modules/auth/pubspec.yaml | 6 +----- modules/camera/pubspec.yaml | 6 +----- modules/chat/pubspec.yaml | 6 +----- modules/ensemble/pubspec.yaml | 6 +----- modules/ensemble_bluetooth/pubspec.yaml | 6 +----- modules/ensemble_ts_interpreter/CHANGELOG.md | 15 +++++++++++++-- modules/ensemble_ts_interpreter/README.md | 5 +---- modules/ensemble_ts_interpreter/lib/api.dart | 1 - .../ensemble_ts_interpreter/lib/extensions.dart | 1 - .../lib/invokables/invokableprimitives.dart | 1 - modules/ensemble_ts_interpreter/pubspec.yaml | 7 ++----- modules/file_manager/pubspec.yaml | 6 +----- modules/location/pubspec.yaml | 6 +----- 13 files changed, 23 insertions(+), 49 deletions(-) diff --git a/modules/auth/pubspec.yaml b/modules/auth/pubspec.yaml index da8b3a25a..024c51bc2 100644 --- a/modules/auth/pubspec.yaml +++ b/modules/auth/pubspec.yaml @@ -31,11 +31,7 @@ dependencies: ref: ensemble-v1.1.12 path: modules/ensemble - ensemble_ts_interpreter: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/ensemble_ts_interpreter + ensemble_ts_interpreter: ^1.0.1 get_it: ^8.0.0 google_sign_in: ^6.1.4 diff --git a/modules/camera/pubspec.yaml b/modules/camera/pubspec.yaml index 0ea11be4c..85dc32fc9 100644 --- a/modules/camera/pubspec.yaml +++ b/modules/camera/pubspec.yaml @@ -17,11 +17,7 @@ dependencies: url: https://github.com/EnsembleUI/ensemble.git ref: ensemble-v1.1.12 path: modules/ensemble - ensemble_ts_interpreter: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/ensemble_ts_interpreter + ensemble_ts_interpreter: ^1.0.1 collection: ^1.17.1 geolocator: ^9.0.2 diff --git a/modules/chat/pubspec.yaml b/modules/chat/pubspec.yaml index 0ab295689..5c2959ab4 100644 --- a/modules/chat/pubspec.yaml +++ b/modules/chat/pubspec.yaml @@ -16,11 +16,7 @@ dependencies: ref: ensemble-v1.1.12 path: modules/ensemble - ensemble_ts_interpreter: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/ensemble_ts_interpreter + ensemble_ts_interpreter: ^1.0.1 web_socket_client: 0.1.0 yaml: ^3.1.2 diff --git a/modules/ensemble/pubspec.yaml b/modules/ensemble/pubspec.yaml index 5bb46616c..f6bf7b82c 100644 --- a/modules/ensemble/pubspec.yaml +++ b/modules/ensemble/pubspec.yaml @@ -44,11 +44,7 @@ dependencies: ensemble_icons: ^1.0.0 - ensemble_ts_interpreter: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/ensemble_ts_interpreter + ensemble_ts_interpreter: ^1.0.1 event_bus: ^2.0.0 flutter_layout_grid: ^2.0.3 diff --git a/modules/ensemble_bluetooth/pubspec.yaml b/modules/ensemble_bluetooth/pubspec.yaml index 86e0bdd24..0685cdb8b 100644 --- a/modules/ensemble_bluetooth/pubspec.yaml +++ b/modules/ensemble_bluetooth/pubspec.yaml @@ -17,11 +17,7 @@ dependencies: url: https://github.com/EnsembleUI/ensemble.git ref: ensemble-v1.1.12 path: modules/ensemble - ensemble_ts_interpreter: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/ensemble_ts_interpreter + ensemble_ts_interpreter: ^1.0.1 collection: ^1.17.1 flutter_blue_plus: ^1.33.4 diff --git a/modules/ensemble_ts_interpreter/CHANGELOG.md b/modules/ensemble_ts_interpreter/CHANGELOG.md index 90280cf56..b48f55136 100644 --- a/modules/ensemble_ts_interpreter/CHANGELOG.md +++ b/modules/ensemble_ts_interpreter/CHANGELOG.md @@ -1,7 +1,18 @@ -### Version 1.0.0+1 +# Changelog + +## [1.0.1] + +- Removed unused imports + +## [1.0.0] + +- Initial release + +## [1.0.0+1] + - Initial Package - Support for javascript (ES5) syntax -- Supports most of the Javascript primitive types such as string, number, arrays and maps. +- Supports most of the Javascript primitive types such as string, number, arrays and maps. - Supports declaring javascript functions and calling them - Does not support declaring classes or interfaces or instantiating them. - Does not support import or require diff --git a/modules/ensemble_ts_interpreter/README.md b/modules/ensemble_ts_interpreter/README.md index 7f4b39687..ff1940c27 100644 --- a/modules/ensemble_ts_interpreter/README.md +++ b/modules/ensemble_ts_interpreter/README.md @@ -12,10 +12,7 @@ This is a javascript [ES5](https://www.geeksforgeeks.org/difference-between-es5- - in your pubspec.yaml, add the following line under dependencies - ``` - ensemble_ts_interpreter: - git: - url: https://github.com/EnsembleUI/ensemble_ts_interpreter.git - ref: master + ensemble_ts_interpreter: ^1.0.1 ``` - run ```flutter pub upgrade``` - Simply call the ```JSInterpreter``` with the code you want to evaluate while passing it the context. diff --git a/modules/ensemble_ts_interpreter/lib/api.dart b/modules/ensemble_ts_interpreter/lib/api.dart index 9497cab8b..fcf4a3ffc 100644 --- a/modules/ensemble_ts_interpreter/lib/api.dart +++ b/modules/ensemble_ts_interpreter/lib/api.dart @@ -1,5 +1,4 @@ import 'dart:collection'; -import 'dart:convert' as convert; import 'package:http/http.dart' as http; import 'package:yaml/yaml.dart'; diff --git a/modules/ensemble_ts_interpreter/lib/extensions.dart b/modules/ensemble_ts_interpreter/lib/extensions.dart index b89eea173..d787044a3 100644 --- a/modules/ensemble_ts_interpreter/lib/extensions.dart +++ b/modules/ensemble_ts_interpreter/lib/extensions.dart @@ -2,7 +2,6 @@ import 'dart:collection'; import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:http/http.dart'; extension Value on TextFormField { diff --git a/modules/ensemble_ts_interpreter/lib/invokables/invokableprimitives.dart b/modules/ensemble_ts_interpreter/lib/invokables/invokableprimitives.dart index 9baee585f..214466646 100644 --- a/modules/ensemble_ts_interpreter/lib/invokables/invokableprimitives.dart +++ b/modules/ensemble_ts_interpreter/lib/invokables/invokableprimitives.dart @@ -2,7 +2,6 @@ import 'dart:io'; import 'dart:ui'; import 'package:duration/locale.dart'; -import 'package:ensemble_ts_interpreter/invokables/invokable.dart'; import 'package:flutter/widgets.dart'; import 'package:intl/intl.dart'; import 'package:duration/duration.dart' as lib; diff --git a/modules/ensemble_ts_interpreter/pubspec.yaml b/modules/ensemble_ts_interpreter/pubspec.yaml index 2bd792133..19de9aa22 100644 --- a/modules/ensemble_ts_interpreter/pubspec.yaml +++ b/modules/ensemble_ts_interpreter/pubspec.yaml @@ -21,7 +21,7 @@ documentation: https://github.com/EnsembleUI/ensemble_ts_interpreter # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.0+1 +version: 1.0.1 environment: sdk: ">=3.5.0 <4.0.0" @@ -43,10 +43,7 @@ dependencies: http: ^1.2.1 json_path: ^0.7.2 duration: ^3.0.11 - dart_date: - git: - url: https://github.com/EnsembleUI/dart_date.git - ref: master + dart_date: ^1.4.0 #flutter_js: ^0.5.0+6 #dartjsengine: ^1.0.1 parsejs_null_safety: ^2.0.3 diff --git a/modules/file_manager/pubspec.yaml b/modules/file_manager/pubspec.yaml index 77120fae1..4db44a2da 100644 --- a/modules/file_manager/pubspec.yaml +++ b/modules/file_manager/pubspec.yaml @@ -16,11 +16,7 @@ dependencies: url: https://github.com/EnsembleUI/ensemble.git ref: ensemble-v1.1.12 path: modules/ensemble - ensemble_ts_interpreter: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/ensemble_ts_interpreter + ensemble_ts_interpreter: ^1.0.1 file_picker: ^5.2.10 dev_dependencies: diff --git a/modules/location/pubspec.yaml b/modules/location/pubspec.yaml index 32ce376b0..c63aa58b7 100644 --- a/modules/location/pubspec.yaml +++ b/modules/location/pubspec.yaml @@ -17,11 +17,7 @@ dependencies: ref: ensemble-v1.1.12 path: modules/ensemble - ensemble_ts_interpreter: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/ensemble_ts_interpreter + ensemble_ts_interpreter: ^1.0.1 get_it: ^8.0.0 google_maps_flutter: ^2.6.0 From 45ca047eeaeb5f7943b1c9f8ce49120cded7f796 Mon Sep 17 00:00:00 2001 From: Sharjeel Yunus <61178058+sharjeelyunus@users.noreply.github.com> Date: Mon, 30 Dec 2024 04:25:09 +0500 Subject: [PATCH 5/6] feat: release js_widget package --- modules/ensemble/pubspec.yaml | 6 +----- modules/js_widget/CHANGELOG.md | 5 +++++ modules/js_widget/example/chartjs/pubspec.yaml | 3 +-- modules/js_widget/lib/src/mobile/js_widget.dart | 1 - modules/js_widget/pubspec.yaml | 13 +++++++++---- 5 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 modules/js_widget/CHANGELOG.md diff --git a/modules/ensemble/pubspec.yaml b/modules/ensemble/pubspec.yaml index f6bf7b82c..6d039441d 100644 --- a/modules/ensemble/pubspec.yaml +++ b/modules/ensemble/pubspec.yaml @@ -65,11 +65,7 @@ dependencies: video_player: ^2.6.1 lottie: ^3.0.0 cookie_jar: ^4.0.8 - js_widget: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/js_widget + js_widget: ^1.0.0 flutter_markdown: ^0.6.10+5 provider: ^6.0.3 cloud_firestore: ^5.4.4 diff --git a/modules/js_widget/CHANGELOG.md b/modules/js_widget/CHANGELOG.md new file mode 100644 index 000000000..57348d267 --- /dev/null +++ b/modules/js_widget/CHANGELOG.md @@ -0,0 +1,5 @@ +# JS Widget + +## 1.0.0 + +- Initial release diff --git a/modules/js_widget/example/chartjs/pubspec.yaml b/modules/js_widget/example/chartjs/pubspec.yaml index faa1a314c..5e58fdc85 100644 --- a/modules/js_widget/example/chartjs/pubspec.yaml +++ b/modules/js_widget/example/chartjs/pubspec.yaml @@ -30,8 +30,7 @@ dependencies: flutter: sdk: flutter - js_widget: - git: https://github.com/EnsembleUI/js_widget.git + js_widget: ^1.0.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. diff --git a/modules/js_widget/lib/src/mobile/js_widget.dart b/modules/js_widget/lib/src/mobile/js_widget.dart index a80bf3f50..18523dc61 100644 --- a/modules/js_widget/lib/src/mobile/js_widget.dart +++ b/modules/js_widget/lib/src/mobile/js_widget.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher_string.dart'; // Import for Android features. import 'package:webview_flutter_android/webview_flutter_android.dart'; // Import for iOS features. diff --git a/modules/js_widget/pubspec.yaml b/modules/js_widget/pubspec.yaml index 7e9bde27f..bf9c81294 100644 --- a/modules/js_widget/pubspec.yaml +++ b/modules/js_widget/pubspec.yaml @@ -1,9 +1,12 @@ name: js_widget -description: A new Flutter project. +description: A Flutter package to render HTML and CSS as Flutter widgets. + +homepage: https://github.com/EnsembleUI/ensemble +repository: https://github.com/EnsembleUI/ensemble/blob/main/modules/js_widget +issue_tracker: https://github.com/EnsembleUI/ensemble/issues # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -15,10 +18,10 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.0+1 +version: 1.0.0 environment: - sdk: ">=3.5.0" + sdk: ">=3.5.0 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -34,6 +37,8 @@ dependencies: js: ^0.6.3 url_launcher: ^6.1.0 webview_flutter: ^4.0.1 + webview_flutter_android: ^4.2.0 + webview_flutter_wkwebview: ^3.16.3 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. From eaf77d26db17081bf79d799dfab2d90aeda3a885 Mon Sep 17 00:00:00 2001 From: Sharjeel Yunus <61178058+sharjeelyunus@users.noreply.github.com> Date: Mon, 30 Dec 2024 04:47:29 +0500 Subject: [PATCH 6/6] feat: published ensemble_device_preview --- modules/device_preview/README.md | 4 +- modules/device_preview/example/lib/basic.dart | 2 +- .../example/lib/custom_plugin.dart | 2 +- modules/device_preview/example/lib/main.dart | 2 +- modules/device_preview/example/pubspec.yaml | 2 +- ...view.dart => ensemble_device_preview.dart} | 1 - .../lib/src/device_preview.dart | 22 +-- .../lib/src/state/custom_device.dart | 2 +- .../device_preview/lib/src/state/state.dart | 2 +- .../device_preview/lib/src/state/store.dart | 4 +- .../lib/src/storage/file/file_io.dart | 2 +- .../lib/src/storage/file/file_mock.dart | 2 +- .../lib/src/storage/file/file_web.dart | 2 +- .../storage/preferences/preferences_io.dart | 2 +- .../storage/preferences/preferences_mock.dart | 2 +- .../storage/preferences/preferences_web.dart | 2 +- .../lib/src/storage/storage.dart | 2 +- .../device_preview/lib/src/views/large.dart | 6 +- .../device_preview/lib/src/views/small.dart | 4 +- .../device_preview/lib/src/views/theme.dart | 144 ++++++++++++------ .../tool_panel/sections/accessibility.dart | 2 +- .../src/views/tool_panel/sections/device.dart | 8 +- .../views/tool_panel/sections/settings.dart | 6 +- .../sections/subsections/device_model.dart | 6 +- .../sections/subsections/locale.dart | 6 +- .../src/views/tool_panel/sections/system.dart | 4 +- .../lib/src/views/tool_panel/tool_panel.dart | 4 +- .../tool_panel/widgets/device_type_icon.dart | 2 +- modules/device_preview/pubspec.yaml | 8 +- modules/ensemble/lib/ensemble_app.dart | 35 +++-- modules/ensemble/pubspec.yaml | 8 +- 31 files changed, 173 insertions(+), 127 deletions(-) rename modules/device_preview/lib/{device_preview.dart => ensemble_device_preview.dart} (94%) diff --git a/modules/device_preview/README.md b/modules/device_preview/README.md index 3e38b3234..ccbb43846 100644 --- a/modules/device_preview/README.md +++ b/modules/device_preview/README.md @@ -33,7 +33,7 @@ Since Device Preview is a simple Dart package, you have to declare it as any oth ```yaml dependencies: - device_preview: + ensemble_device_preview: ``` ### Add DevicePreview @@ -47,7 +47,7 @@ Wrap your app's root widget in a `DevicePreview` and make sure to : > Make sure to override the previous properties as described. If not defined, `MediaQuery` won't be simulated for the selected device. ```dart -import 'package:device_preview/device_preview.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; void main() => runApp( DevicePreview( diff --git a/modules/device_preview/example/lib/basic.dart b/modules/device_preview/example/lib/basic.dart index cbb7fc54f..528e8f6aa 100644 --- a/modules/device_preview/example/lib/basic.dart +++ b/modules/device_preview/example/lib/basic.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/device_preview.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; diff --git a/modules/device_preview/example/lib/custom_plugin.dart b/modules/device_preview/example/lib/custom_plugin.dart index 3a78c8902..35650fdb2 100644 --- a/modules/device_preview/example/lib/custom_plugin.dart +++ b/modules/device_preview/example/lib/custom_plugin.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/device_preview.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; import 'package:flutter/material.dart'; class CustomPlugin extends StatelessWidget { diff --git a/modules/device_preview/example/lib/main.dart b/modules/device_preview/example/lib/main.dart index 8c0a228e8..c77719a6a 100644 --- a/modules/device_preview/example/lib/main.dart +++ b/modules/device_preview/example/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/device_preview.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/modules/device_preview/example/pubspec.yaml b/modules/device_preview/example/pubspec.yaml index 24b3be76c..6b7e6b27b 100644 --- a/modules/device_preview/example/pubspec.yaml +++ b/modules/device_preview/example/pubspec.yaml @@ -27,7 +27,7 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - device_preview: + ensemble_device_preview: path: ../ flutter: sdk: flutter diff --git a/modules/device_preview/lib/device_preview.dart b/modules/device_preview/lib/ensemble_device_preview.dart similarity index 94% rename from modules/device_preview/lib/device_preview.dart rename to modules/device_preview/lib/ensemble_device_preview.dart index 58e6240ea..032fc0128 100644 --- a/modules/device_preview/lib/device_preview.dart +++ b/modules/device_preview/lib/ensemble_device_preview.dart @@ -8,7 +8,6 @@ export 'src/state/store.dart'; export 'src/storage/file/file.dart'; export 'src/storage/preferences/preferences.dart'; export 'src/storage/storage.dart'; -export 'src/storage/file/file.dart'; export 'src/locales/locales.dart'; export 'src/locales/default_locales.dart'; diff --git a/modules/device_preview/lib/src/device_preview.dart b/modules/device_preview/lib/src/device_preview.dart index 12edcabd3..6bb6f42db 100644 --- a/modules/device_preview/lib/src/device_preview.dart +++ b/modules/device_preview/lib/src/device_preview.dart @@ -1,17 +1,17 @@ import 'dart:async'; import 'package:device_frame/device_frame.dart'; -import 'package:device_preview/src/state/state.dart'; -import 'package:device_preview/src/state/store.dart'; -import 'package:device_preview/src/storage/storage.dart'; -import 'package:device_preview/src/utilities/assert_inherited_media_query.dart'; -import 'package:device_preview/src/utilities/media_query_observer.dart'; -import 'package:device_preview/src/views/theme.dart'; -import 'package:device_preview/src/views/tool_panel/sections/accessibility.dart'; -import 'package:device_preview/src/views/tool_panel/sections/device.dart'; -import 'package:device_preview/src/views/tool_panel/sections/settings.dart'; -import 'package:device_preview/src/views/tool_panel/sections/system.dart'; -import 'package:device_preview/src/views/tool_panel/tool_panel.dart'; +import 'package:ensemble_device_preview/src/state/state.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/storage/storage.dart'; +import 'package:ensemble_device_preview/src/utilities/assert_inherited_media_query.dart'; +import 'package:ensemble_device_preview/src/utilities/media_query_observer.dart'; +import 'package:ensemble_device_preview/src/views/theme.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/sections/accessibility.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/sections/device.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/sections/settings.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/sections/system.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/tool_panel.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; diff --git a/modules/device_preview/lib/src/state/custom_device.dart b/modules/device_preview/lib/src/state/custom_device.dart index 3192a7b39..dc65f2236 100644 --- a/modules/device_preview/lib/src/state/custom_device.dart +++ b/modules/device_preview/lib/src/state/custom_device.dart @@ -1,6 +1,6 @@ import 'dart:ui'; -import 'package:device_preview/device_preview.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; import 'package:flutter/material.dart'; import 'state.dart'; diff --git a/modules/device_preview/lib/src/state/state.dart b/modules/device_preview/lib/src/state/state.dart index 6885ec6bb..a774d05d8 100644 --- a/modules/device_preview/lib/src/state/state.dart +++ b/modules/device_preview/lib/src/state/state.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/device_preview.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; import 'package:flutter/widgets.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; diff --git a/modules/device_preview/lib/src/state/store.dart b/modules/device_preview/lib/src/state/store.dart index 261b91dd0..1e7de7911 100644 --- a/modules/device_preview/lib/src/state/store.dart +++ b/modules/device_preview/lib/src/state/store.dart @@ -5,11 +5,11 @@ import 'package:device_frame/device_frame.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import '../../device_preview.dart'; +import '../../ensemble_device_preview.dart'; import '../storage/storage.dart'; import 'custom_device.dart'; import 'state.dart'; -import '../../device_preview.dart' as device_preview; +import '../../ensemble_device_preview.dart' as device_preview; /// The store is a container for the current [state] of the device preview. /// diff --git a/modules/device_preview/lib/src/storage/file/file_io.dart b/modules/device_preview/lib/src/storage/file/file_io.dart index 23d6be1ea..632f14931 100644 --- a/modules/device_preview/lib/src/storage/file/file_io.dart +++ b/modules/device_preview/lib/src/storage/file/file_io.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:device_preview/src/state/state.dart'; +import 'package:ensemble_device_preview/src/state/state.dart'; import '../storage.dart'; diff --git a/modules/device_preview/lib/src/storage/file/file_mock.dart b/modules/device_preview/lib/src/storage/file/file_mock.dart index 4d95bf941..0b9674cb4 100644 --- a/modules/device_preview/lib/src/storage/file/file_mock.dart +++ b/modules/device_preview/lib/src/storage/file/file_mock.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/src/state/state.dart'; +import 'package:ensemble_device_preview/src/state/state.dart'; import '../storage.dart'; diff --git a/modules/device_preview/lib/src/storage/file/file_web.dart b/modules/device_preview/lib/src/storage/file/file_web.dart index befaffd61..9bdbbcaea 100644 --- a/modules/device_preview/lib/src/storage/file/file_web.dart +++ b/modules/device_preview/lib/src/storage/file/file_web.dart @@ -1,6 +1,6 @@ import 'dart:developer'; -import 'package:device_preview/src/state/state.dart'; +import 'package:ensemble_device_preview/src/state/state.dart'; import '../storage.dart'; diff --git a/modules/device_preview/lib/src/storage/preferences/preferences_io.dart b/modules/device_preview/lib/src/storage/preferences/preferences_io.dart index eea157e1e..1f4a8e0b4 100644 --- a/modules/device_preview/lib/src/storage/preferences/preferences_io.dart +++ b/modules/device_preview/lib/src/storage/preferences/preferences_io.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:device_preview/src/state/state.dart'; +import 'package:ensemble_device_preview/src/state/state.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../storage.dart'; diff --git a/modules/device_preview/lib/src/storage/preferences/preferences_mock.dart b/modules/device_preview/lib/src/storage/preferences/preferences_mock.dart index 4eb952109..e51fc5b4e 100644 --- a/modules/device_preview/lib/src/storage/preferences/preferences_mock.dart +++ b/modules/device_preview/lib/src/storage/preferences/preferences_mock.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/src/state/state.dart'; +import 'package:ensemble_device_preview/src/state/state.dart'; import '../storage.dart'; diff --git a/modules/device_preview/lib/src/storage/preferences/preferences_web.dart b/modules/device_preview/lib/src/storage/preferences/preferences_web.dart index 952d402b6..78aaf6cb5 100644 --- a/modules/device_preview/lib/src/storage/preferences/preferences_web.dart +++ b/modules/device_preview/lib/src/storage/preferences/preferences_web.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'dart:convert' show jsonDecode, jsonEncode; import 'dart:html' as html; -import 'package:device_preview/src/state/state.dart'; +import 'package:ensemble_device_preview/src/state/state.dart'; import '../storage.dart'; diff --git a/modules/device_preview/lib/src/storage/storage.dart b/modules/device_preview/lib/src/storage/storage.dart index 380bf196a..a3a26beb3 100644 --- a/modules/device_preview/lib/src/storage/storage.dart +++ b/modules/device_preview/lib/src/storage/storage.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/src/state/state.dart'; +import 'package:ensemble_device_preview/src/state/state.dart'; import 'preferences/preferences.dart'; diff --git a/modules/device_preview/lib/src/views/large.dart b/modules/device_preview/lib/src/views/large.dart index 043759547..aed0f1853 100644 --- a/modules/device_preview/lib/src/views/large.dart +++ b/modules/device_preview/lib/src/views/large.dart @@ -1,6 +1,6 @@ -import 'package:device_preview/src/state/store.dart'; -import 'package:device_preview/src/views/theme.dart'; -import 'package:device_preview/src/views/tool_panel/tool_panel.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/views/theme.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/tool_panel.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; diff --git a/modules/device_preview/lib/src/views/small.dart b/modules/device_preview/lib/src/views/small.dart index ac0eff8bd..31cafb696 100644 --- a/modules/device_preview/lib/src/views/small.dart +++ b/modules/device_preview/lib/src/views/small.dart @@ -1,5 +1,5 @@ -import 'package:device_preview/src/state/store.dart'; -import 'package:device_preview/src/views/theme.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/views/theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; diff --git a/modules/device_preview/lib/src/views/theme.dart b/modules/device_preview/lib/src/views/theme.dart index 4f368b380..10ec7cd79 100644 --- a/modules/device_preview/lib/src/views/theme.dart +++ b/modules/device_preview/lib/src/views/theme.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/src/state/state.dart'; +import 'package:ensemble_device_preview/src/state/state.dart'; import 'package:flutter/material.dart'; extension ThemeBackgroundExtension on DevicePreviewBackgroundThemeData { @@ -36,30 +36,53 @@ extension ThemeToolbarExtension on DevicePreviewToolBarThemeData { activeTickMarkColor: accentColor, inactiveTickMarkColor: accentColor, overlayColor: accentColor.withOpacity(0.12), - ), checkboxTheme: CheckboxThemeData( - fillColor: MaterialStateProperty.resolveWith((Set states) { - if (states.contains(MaterialState.disabled)) { return null; } - if (states.contains(MaterialState.selected)) { return accentColor; } - return null; - }), - ), radioTheme: RadioThemeData( - fillColor: MaterialStateProperty.resolveWith((Set states) { - if (states.contains(MaterialState.disabled)) { return null; } - if (states.contains(MaterialState.selected)) { return accentColor; } - return null; - }), - ), switchTheme: SwitchThemeData( - thumbColor: MaterialStateProperty.resolveWith((Set states) { - if (states.contains(MaterialState.disabled)) { return null; } - if (states.contains(MaterialState.selected)) { return accentColor; } - return null; - }), - trackColor: MaterialStateProperty.resolveWith((Set states) { - if (states.contains(MaterialState.disabled)) { return null; } - if (states.contains(MaterialState.selected)) { return accentColor; } - return null; - }), - ), + ), + checkboxTheme: CheckboxThemeData( + fillColor: MaterialStateProperty.resolveWith( + (Set states) { + if (states.contains(MaterialState.disabled)) { + return null; + } + if (states.contains(MaterialState.selected)) { + return accentColor; + } + return null; + }), + ), + radioTheme: RadioThemeData( + fillColor: MaterialStateProperty.resolveWith( + (Set states) { + if (states.contains(MaterialState.disabled)) { + return null; + } + if (states.contains(MaterialState.selected)) { + return accentColor; + } + return null; + }), + ), + switchTheme: SwitchThemeData( + thumbColor: MaterialStateProperty.resolveWith( + (Set states) { + if (states.contains(MaterialState.disabled)) { + return null; + } + if (states.contains(MaterialState.selected)) { + return accentColor; + } + return null; + }), + trackColor: MaterialStateProperty.resolveWith( + (Set states) { + if (states.contains(MaterialState.disabled)) { + return null; + } + if (states.contains(MaterialState.selected)) { + return accentColor; + } + return null; + }), + ), ); case DevicePreviewToolBarThemeData.light: final base = ThemeData.light(); @@ -84,30 +107,53 @@ extension ThemeToolbarExtension on DevicePreviewToolBarThemeData { activeTickMarkColor: accentColor, inactiveTickMarkColor: accentColor, overlayColor: accentColor.withOpacity(0.12), - ), checkboxTheme: CheckboxThemeData( - fillColor: MaterialStateProperty.resolveWith((Set states) { - if (states.contains(MaterialState.disabled)) { return null; } - if (states.contains(MaterialState.selected)) { return accentColor; } - return null; - }), - ), radioTheme: RadioThemeData( - fillColor: MaterialStateProperty.resolveWith((Set states) { - if (states.contains(MaterialState.disabled)) { return null; } - if (states.contains(MaterialState.selected)) { return accentColor; } - return null; - }), - ), switchTheme: SwitchThemeData( - thumbColor: MaterialStateProperty.resolveWith((Set states) { - if (states.contains(MaterialState.disabled)) { return null; } - if (states.contains(MaterialState.selected)) { return accentColor; } - return null; - }), - trackColor: MaterialStateProperty.resolveWith((Set states) { - if (states.contains(MaterialState.disabled)) { return null; } - if (states.contains(MaterialState.selected)) { return accentColor; } - return null; - }), - ), + ), + checkboxTheme: CheckboxThemeData( + fillColor: MaterialStateProperty.resolveWith( + (Set states) { + if (states.contains(MaterialState.disabled)) { + return null; + } + if (states.contains(MaterialState.selected)) { + return accentColor; + } + return null; + }), + ), + radioTheme: RadioThemeData( + fillColor: MaterialStateProperty.resolveWith( + (Set states) { + if (states.contains(MaterialState.disabled)) { + return null; + } + if (states.contains(MaterialState.selected)) { + return accentColor; + } + return null; + }), + ), + switchTheme: SwitchThemeData( + thumbColor: MaterialStateProperty.resolveWith( + (Set states) { + if (states.contains(MaterialState.disabled)) { + return null; + } + if (states.contains(MaterialState.selected)) { + return accentColor; + } + return null; + }), + trackColor: MaterialStateProperty.resolveWith( + (Set states) { + if (states.contains(MaterialState.disabled)) { + return null; + } + if (states.contains(MaterialState.selected)) { + return accentColor; + } + return null; + }), + ), ); } } diff --git a/modules/device_preview/lib/src/views/tool_panel/sections/accessibility.dart b/modules/device_preview/lib/src/views/tool_panel/sections/accessibility.dart index 3c3c19209..c2ff967ff 100644 --- a/modules/device_preview/lib/src/views/tool_panel/sections/accessibility.dart +++ b/modules/device_preview/lib/src/views/tool_panel/sections/accessibility.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; diff --git a/modules/device_preview/lib/src/views/tool_panel/sections/device.dart b/modules/device_preview/lib/src/views/tool_panel/sections/device.dart index fb2aaadb6..31285f307 100644 --- a/modules/device_preview/lib/src/views/tool_panel/sections/device.dart +++ b/modules/device_preview/lib/src/views/tool_panel/sections/device.dart @@ -1,7 +1,7 @@ -import 'package:device_preview/src/state/store.dart'; -import 'package:device_preview/src/views/tool_panel/sections/subsections/device_model.dart'; -import 'package:device_preview/src/views/tool_panel/widgets/device_type_icon.dart'; -import 'package:device_preview/src/views/tool_panel/widgets/target_platform_icon.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/sections/subsections/device_model.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/widgets/device_type_icon.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/widgets/target_platform_icon.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; diff --git a/modules/device_preview/lib/src/views/tool_panel/sections/settings.dart b/modules/device_preview/lib/src/views/tool_panel/sections/settings.dart index dadf1d5a9..e08134f9d 100644 --- a/modules/device_preview/lib/src/views/tool_panel/sections/settings.dart +++ b/modules/device_preview/lib/src/views/tool_panel/sections/settings.dart @@ -1,6 +1,6 @@ -import 'package:device_preview/device_preview.dart'; -import 'package:device_preview/src/state/store.dart'; -import 'package:device_preview/src/views/theme.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/views/theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; diff --git a/modules/device_preview/lib/src/views/tool_panel/sections/subsections/device_model.dart b/modules/device_preview/lib/src/views/tool_panel/sections/subsections/device_model.dart index a50ee934f..9b48278cd 100644 --- a/modules/device_preview/lib/src/views/tool_panel/sections/subsections/device_model.dart +++ b/modules/device_preview/lib/src/views/tool_panel/sections/subsections/device_model.dart @@ -1,7 +1,7 @@ import 'package:device_frame/device_frame.dart'; -import 'package:device_preview/src/state/store.dart'; -import 'package:device_preview/src/views/tool_panel/widgets/device_type_icon.dart'; -import 'package:device_preview/src/views/tool_panel/widgets/target_platform_icon.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/widgets/device_type_icon.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/widgets/target_platform_icon.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:collection/collection.dart'; diff --git a/modules/device_preview/lib/src/views/tool_panel/sections/subsections/locale.dart b/modules/device_preview/lib/src/views/tool_panel/sections/subsections/locale.dart index 72b33282e..8fb55dcd8 100644 --- a/modules/device_preview/lib/src/views/tool_panel/sections/subsections/locale.dart +++ b/modules/device_preview/lib/src/views/tool_panel/sections/subsections/locale.dart @@ -1,6 +1,6 @@ -import 'package:device_preview/device_preview.dart'; -import 'package:device_preview/src/state/store.dart'; -import 'package:device_preview/src/views/tool_panel/widgets/search_field.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/widgets/search_field.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; diff --git a/modules/device_preview/lib/src/views/tool_panel/sections/system.dart b/modules/device_preview/lib/src/views/tool_panel/sections/system.dart index d4dd5c524..cc7405c05 100644 --- a/modules/device_preview/lib/src/views/tool_panel/sections/system.dart +++ b/modules/device_preview/lib/src/views/tool_panel/sections/system.dart @@ -1,5 +1,5 @@ -import 'package:device_preview/src/state/store.dart'; -import 'package:device_preview/src/views/tool_panel/sections/subsections/locale.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/views/tool_panel/sections/subsections/locale.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; diff --git a/modules/device_preview/lib/src/views/tool_panel/tool_panel.dart b/modules/device_preview/lib/src/views/tool_panel/tool_panel.dart index d9d7b5f4d..137470ddd 100644 --- a/modules/device_preview/lib/src/views/tool_panel/tool_panel.dart +++ b/modules/device_preview/lib/src/views/tool_panel/tool_panel.dart @@ -1,5 +1,5 @@ -import 'package:device_preview/src/state/store.dart'; -import 'package:device_preview/src/views/theme.dart'; +import 'package:ensemble_device_preview/src/state/store.dart'; +import 'package:ensemble_device_preview/src/views/theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; diff --git a/modules/device_preview/lib/src/views/tool_panel/widgets/device_type_icon.dart b/modules/device_preview/lib/src/views/tool_panel/widgets/device_type_icon.dart index 1e0eec336..f3d732132 100644 --- a/modules/device_preview/lib/src/views/tool_panel/widgets/device_type_icon.dart +++ b/modules/device_preview/lib/src/views/tool_panel/widgets/device_type_icon.dart @@ -1,4 +1,4 @@ -import 'package:device_preview/device_preview.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; diff --git a/modules/device_preview/pubspec.yaml b/modules/device_preview/pubspec.yaml index 09f04d246..2add19b38 100644 --- a/modules/device_preview/pubspec.yaml +++ b/modules/device_preview/pubspec.yaml @@ -1,10 +1,12 @@ -name: device_preview +name: ensemble_device_preview version: 1.1.0 description: Approximate how your Flutter app looks and performs on another device. -homepage: https://github.com/aloisdeniel/flutter_device_preview + +homepage: https://github.com/EnsembleUI/ensemble +repository: https://github.com/EnsembleUI/ensemble/tree/main/modules/device_preview environment: - sdk: '>=3.5.0' + sdk: '>=3.5.0 <4.0.0' dependencies: flutter: diff --git a/modules/ensemble/lib/ensemble_app.dart b/modules/ensemble/lib/ensemble_app.dart index 7d1c8b741..7fd4c14ae 100644 --- a/modules/ensemble/lib/ensemble_app.dart +++ b/modules/ensemble/lib/ensemble_app.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'dart:ui'; import 'dart:async'; -import 'package:device_preview/device_preview.dart'; +import 'package:ensemble_device_preview/ensemble_device_preview.dart'; import 'package:ensemble/deep_link_manager.dart'; import 'package:ensemble/ensemble.dart'; import 'package:ensemble/framework/apiproviders/api_provider.dart'; @@ -32,7 +32,8 @@ import 'package:workmanager/workmanager.dart'; import 'package:yaml/yaml.dart'; const String backgroundUploadTask = 'backgroundUploadTask'; -const String backgroundBluetoothSubscribeTask = 'backgroundBluetoothSubscribeTask'; +const String backgroundBluetoothSubscribeTask = + 'backgroundBluetoothSubscribeTask'; const String ensembleMethodChannelName = 'com.ensembleui.host.platform'; GlobalKey? externalAppNavigateKey; @@ -299,7 +300,8 @@ class EnsembleAppState extends State with WidgetsBindingObserver { if (foundSelectedTheme && savedTheme != null) { defaultTheme = savedTheme; } - EnsembleThemeManager().init(context, themes, defaultTheme, localeThemes: doc["LocaleThemes"]); + EnsembleThemeManager() + .init(context, themes, defaultTheme, localeThemes: doc["LocaleThemes"]); } Locale? resolveLocale(Locale? systemLocale, @@ -324,7 +326,8 @@ class EnsembleAppState extends State with WidgetsBindingObserver { configureThemes(doc, AppConfig(context, AppInfo().appId)); } } - EnsembleThemeManager().setCurrentLocale(Ensemble().locale?.languageCode,notifyListeners: false); + EnsembleThemeManager().setCurrentLocale(Ensemble().locale?.languageCode, + notifyListeners: false); // notify external app once of EnsembleApp loading status if (widget.onAppLoad != null && !notifiedAppLoad) { widget.onAppLoad!.call(); @@ -363,9 +366,9 @@ class EnsembleAppState extends State with WidgetsBindingObserver { return Ensemble().locale; }, home: Scaffold( - // this outer scaffold is where the background image would be (if - // specified). We do not want it to resize on keyboard popping up. - // The Page's Scaffold can handle the resizing. + // this outer scaffold is where the background image would be (if + // specified). We do not want it to resize on keyboard popping up. + // The Page's Scaffold can handle the resizing. resizeToAvoidBottomInset: false, body: screen), useInheritedMediaQuery: widget.isPreview, @@ -433,15 +436,15 @@ class EnsembleAppState extends State with WidgetsBindingObserver { Widget _appPlaceholderWrapper( {Widget? placeholderWidget, Color? placeholderBackgroundColor}) { return MaterialApp( - // even when this is the placeholder and will be replaced later, we still - // need to either set supportedLocales or handle localeResolutionCallback. - // Without this the system locale will be incorrect the first time. - // - // Also note we pass in the definitionProvider. This is only needed when - // the EnsembleConfig is passed in directly (without fetching it) and - // might contain the forcedLocale. For some reason localeResolutionCallback() - // will only be called once here and not again when the actual App is loaded. - // An example is when running integration test with another locale. + // even when this is the placeholder and will be replaced later, we still + // need to either set supportedLocales or handle localeResolutionCallback. + // Without this the system locale will be incorrect the first time. + // + // Also note we pass in the definitionProvider. This is only needed when + // the EnsembleConfig is passed in directly (without fetching it) and + // might contain the forcedLocale. For some reason localeResolutionCallback() + // will only be called once here and not again when the actual App is loaded. + // An example is when running integration test with another locale. localeResolutionCallback: (systemLocale, _) { Ensemble().locale = resolveLocale(systemLocale, definitionProvider: widget.ensembleConfig?.definitionProvider); diff --git a/modules/ensemble/pubspec.yaml b/modules/ensemble/pubspec.yaml index 6d039441d..08eb3dbb9 100644 --- a/modules/ensemble/pubspec.yaml +++ b/modules/ensemble/pubspec.yaml @@ -25,11 +25,7 @@ dependencies: flutter: sdk: flutter - device_preview: - git: - url: https://github.com/EnsembleUI/ensemble.git - ref: main - path: modules/device_preview + ensemble_device_preview: ^1.1.0 yaml: ^3.1.2 intl: '>=0.18.1 <=0.19.0' @@ -93,7 +89,7 @@ dependencies: firebase_messaging: ^15.1.3 firebase_core: ^3.6.0 custom_refresh_indicator: ^2.2.1 - youtube_player_iframe: ^4.0.4 + youtube_player_iframe: ^5.2.1 web_socket_client: ^0.1.0 app_links: ^6.3.2 share_plus: ^10.0.3