diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 0000000000..7d2a608dfa --- /dev/null +++ b/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.32.6" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 188d2e1fa5..3734711996 100644 --- a/.gitignore +++ b/.gitignore @@ -156,4 +156,7 @@ packages/**/pubspec_overrides.yaml ./pubspec_overrides.yaml /example/pubspec_overrides.yaml -coverage/ \ No newline at end of file +coverage/ + +# FVM Version Cache +.fvm/ \ No newline at end of file diff --git a/example/ios/Flutter/ephemeral/flutter_lldb_helper.py b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py new file mode 100644 index 0000000000..a88caf99df --- /dev/null +++ b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py @@ -0,0 +1,32 @@ +# +# Generated file, do not edit. +# + +import lldb + +def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict): + """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages.""" + base = frame.register["x0"].GetValueAsAddress() + page_len = frame.register["x1"].GetValueAsUnsigned() + + # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the + # first page to see if handled it correctly. This makes diagnosing + # misconfiguration (e.g. missing breakpoint) easier. + data = bytearray(page_len) + data[0:8] = b'IHELPED!' + + error = lldb.SBError() + frame.GetThread().GetProcess().WriteMemory(base, data, error) + if not error.Success(): + print(f'Failed to write into {base}[+{page_len}]', error) + return + +def __lldb_init_module(debugger: lldb.SBDebugger, _): + target = debugger.GetDummyTarget() + # Caveat: must use BreakpointCreateByRegEx here and not + # BreakpointCreateByName. For some reasons callback function does not + # get carried over from dummy target for the later. + bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$") + bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__)) + bp.SetAutoContinue(True) + print("-- LLDB integration loaded --") diff --git a/example/ios/Flutter/ephemeral/flutter_lldbinit b/example/ios/Flutter/ephemeral/flutter_lldbinit new file mode 100644 index 0000000000..e3ba6fbedc --- /dev/null +++ b/example/ios/Flutter/ephemeral/flutter_lldbinit @@ -0,0 +1,5 @@ +# +# Generated file, do not edit. +# + +command script import --relative-to-command-file flutter_lldb_helper.py diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index 1c2c9b0787..cccf817a52 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,8 +5,6 @@ import FlutterMacOS import Foundation -import wakelock_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin")) } diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 71e0332d40..98f526d07a 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,13 +4,11 @@ publish_to: none version: 1.0.0+1 environment: - sdk: '>=2.17.0 <3.0.0' + sdk: ">=2.17.0 <3.0.0" dependencies: flutter_html: - path: .. - flutter_html_all: - path: ../packages/flutter_html_all + path: ../ flutter: sdk: flutter @@ -20,9 +18,8 @@ dev_dependencies: flutter_lints: ^2.0.1 flutter: - uses-material-design: true assets: - assets/html5.png - - assets/mac.svg \ No newline at end of file + - assets/mac.svg diff --git a/lib/src/style.dart b/lib/src/style.dart index 004b32f4e7..4a7956d43b 100644 --- a/lib/src/style.dart +++ b/lib/src/style.dart @@ -562,9 +562,9 @@ extension _MarginRelativeValues on Margin { Margin? getRelativeValue(double remValue, double emValue) { double? calculatedValue = calculateRelativeValue(remValue, emValue); if (calculatedValue != null) { - return Margin(calculatedValue); + return Margin(calculatedValue); } - + return null; } } @@ -575,7 +575,6 @@ extension _PaddingRelativeValues on HtmlPadding { if (calculatedValue != null) { return HtmlPadding(calculatedValue); } - return null; } } diff --git a/packages/flutter_html_all/pubspec.yaml b/packages/flutter_html_all/pubspec.yaml index ae6a082b17..998cb01cd6 100644 --- a/packages/flutter_html_all/pubspec.yaml +++ b/packages/flutter_html_all/pubspec.yaml @@ -2,6 +2,7 @@ name: flutter_html_all description: All optional flutter_html widgets, bundled into a single package. version: 3.0.0-beta.2 homepage: https://github.com/Sub6Resources/flutter_html +publish_to: none # Remove this line if you wish to publish to pub.dev environment: sdk: ">=2.12.0 <4.0.0" @@ -10,14 +11,21 @@ environment: dependencies: flutter: sdk: flutter - html: '>=0.15.0 <1.0.0' - flutter_html: ^3.0.0-beta.2 - flutter_html_audio: ^3.0.0-beta.2 - flutter_html_iframe: ^3.0.0-beta.2 - flutter_html_math: ^3.0.0-beta.2 - flutter_html_svg: ^3.0.0-beta.2 - flutter_html_table: ^3.0.0-beta.2 - flutter_html_video: ^3.0.0-beta.2 + html: ">=0.15.0 <1.0.0" + flutter_html: + path: ../.. + flutter_html_audio: + path: ../flutter_html_audio + flutter_html_iframe: + path: ../flutter_html_iframe + flutter_html_math: + path: ../flutter_html_math + flutter_html_svg: + path: ../flutter_html_svg + flutter_html_table: + path: ../flutter_html_table + flutter_html_video: + path: ../flutter_html_video dev_dependencies: flutter_test: diff --git a/packages/flutter_html_audio/pubspec.yaml b/packages/flutter_html_audio/pubspec.yaml index 3c414a36f1..b1085a89b1 100644 --- a/packages/flutter_html_audio/pubspec.yaml +++ b/packages/flutter_html_audio/pubspec.yaml @@ -2,6 +2,7 @@ name: flutter_html_audio description: This extension package allows the