From d4af3ef0bb5842ac3b9793faf6cbdf229436703c Mon Sep 17 00:00:00 2001 From: Ashita Prasad Date: Thu, 27 Jun 2024 21:10:37 +0530 Subject: [PATCH] Update version of dependencies to support latest flutter --- lib/widgets/splitview_dashboard.dart | 15 +++-- lib/widgets/splitview_equal.dart | 15 +++-- pubspec.lock | 94 ++++++++++++++-------------- pubspec.yaml | 25 ++++---- 4 files changed, 78 insertions(+), 71 deletions(-) diff --git a/lib/widgets/splitview_dashboard.dart b/lib/widgets/splitview_dashboard.dart index 4fd718e8..339f3aee 100644 --- a/lib/widgets/splitview_dashboard.dart +++ b/lib/widgets/splitview_dashboard.dart @@ -19,8 +19,8 @@ class DashboardSplitView extends StatefulWidget { class DashboardSplitViewState extends State { final MultiSplitViewController _controller = MultiSplitViewController( areas: [ - Area(size: 250, minimalSize: 200), - Area(minimalWeight: 0.7), + Area(id: "sidebar", size: 250, min: 200), + Area(id: "main", min: 0.7), ], ); @@ -44,10 +44,13 @@ class DashboardSplitViewState extends State { ), child: MultiSplitView( controller: _controller, - children: [ - widget.sidebarWidget, - widget.mainWidget, - ], + builder: (context, area) { + return switch (area.id) { + "sidebar" => widget.sidebarWidget, + "main" => widget.mainWidget, + _ => Container(), + }; + }, ), ); } diff --git a/lib/widgets/splitview_equal.dart b/lib/widgets/splitview_equal.dart index affdf45b..28f85a76 100644 --- a/lib/widgets/splitview_equal.dart +++ b/lib/widgets/splitview_equal.dart @@ -19,8 +19,8 @@ class EqualSplitView extends StatefulWidget { class _EqualSplitViewState extends State { final MultiSplitViewController _controller = MultiSplitViewController( areas: [ - Area(minimalSize: kMinRequestEditorDetailsCardPaneSize), - Area(minimalSize: kMinRequestEditorDetailsCardPaneSize), + Area(id: "left", min: kMinRequestEditorDetailsCardPaneSize), + Area(id: "right", min: kMinRequestEditorDetailsCardPaneSize), ], ); @@ -39,10 +39,13 @@ class _EqualSplitViewState extends State { ), child: MultiSplitView( controller: _controller, - children: [ - widget.leftWidget, - widget.rightWidget, - ], + builder: (context, area) { + return switch (area.id) { + "left" => widget.leftWidget, + "right" => widget.rightWidget, + _ => Container(), + }; + }, ), ); } diff --git a/pubspec.lock b/pubspec.lock index 7973e264..13ee81cf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -109,10 +109,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" + sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" url: "https://pub.dev" source: hosted - version: "2.4.9" + version: "2.4.11" build_runner_core: dependency: transitive description: @@ -245,10 +245,10 @@ packages: dependency: "direct main" description: name: data_table_2 - sha256: e403de6d9a58dddf27700114b614ea8ea5aa8442d7fbdfbe8b3d11b0512e7a49 + sha256: f02ec9b24f44420816a87370ff4f4e533e15b274f6267e4c9a88a585ad1a0473 url: "https://pub.dev" source: hosted - version: "2.5.12" + version: "2.5.15" eventify: dependency: transitive description: @@ -261,10 +261,10 @@ packages: dependency: transitive description: name: extended_text_field - sha256: d064097c774eab3a7f2aad1db32533611a71ed52305b3afd3e0364642a1a61f7 + sha256: "954c7eea1e82728a742f7ddf09b9a51cef087d4f52b716ba88cb3eb78ccd7c6e" url: "https://pub.dev" source: hosted - version: "13.1.0" + version: "15.0.0" extended_text_library: dependency: transitive description: @@ -458,18 +458,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "4.0.0" flutter_markdown: dependency: "direct main" description: name: flutter_markdown - sha256: "04c4722cc36ec5af38acc38ece70d22d3c2123c61305d555750a091517bbe504" + sha256: "85cc6f7daeae537844c92e2d56e2aff61b00095f8f77913b529ea4be12fc45ea" url: "https://pub.dev" source: hosted - version: "0.6.23" + version: "0.7.2+1" flutter_portal: dependency: "direct main" description: @@ -660,10 +660,10 @@ packages: dependency: "direct main" description: name: jinja - sha256: bec5ecbc8f067d2092d8f25c7f861c7875a29c935cffb7628acd4038aef0f129 + sha256: ee379abb8106faec4898d7a8b712f7085474c8d8dea43d06c52def04fbe5aa67 url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.6.0" js: dependency: transitive description: @@ -701,10 +701,10 @@ packages: dependency: "direct main" description: name: json_text_field - sha256: "2d5500550a50323e20105960449378e1ac6c05404298ebf23b5d212b29b45085" + sha256: d922cf02d5807c3971d57e1ba5463c68b98650e8913163e7391cdb31c6af3ae4 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" just_audio: dependency: "direct main" description: @@ -749,34 +749,34 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lints: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" logging: dependency: transitive description: @@ -829,10 +829,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mime: dependency: transitive description: @@ -861,10 +861,10 @@ packages: dependency: "direct main" description: name: multi_split_view - sha256: d68e129bff71fc9e6b66de59e1b79deaf4b91f30940130bfbd2d704c1c713499 + sha256: "2ef6a7ff9d0957bf559075d2703507ea898c8b70e37ff5ac3636298370513b7a" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "3.2.1" nested: dependency: transitive description: @@ -893,18 +893,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "8.0.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" path: dependency: "direct main" description: @@ -978,13 +978,13 @@ packages: source: hosted version: "3.10.8" pdf_widget_wrapper: - dependency: transitive + dependency: "direct overridden" description: name: pdf_widget_wrapper - sha256: "9c3ca36e5000c9682d52bbdc486867ba7c5ee4403d1a5d6d03ed72157753377b" + sha256: c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5 url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" petitparser: dependency: transitive description: @@ -1258,34 +1258,34 @@ packages: dependency: "direct dev" description: name: test - sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f + sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" url: "https://pub.dev" source: hosted - version: "1.24.9" + version: "1.25.2" test_api: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" test_core: dependency: transitive description: name: test_core - sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a + sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" url: "https://pub.dev" source: hosted - version: "0.5.9" + version: "0.6.0" textwrap: dependency: transitive description: name: textwrap - sha256: "342fb85c503a27c68e0dd21f7be35360acf3231f929e0dcb23cc8593d2919c36" + sha256: "780b164d83dfed30b475b1310d288145c5e0109193c3c507cf015d38e4adc844" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "2.0.0" timing: dependency: transitive description: @@ -1410,10 +1410,10 @@ packages: dependency: "direct main" description: name: video_player - sha256: db6a72d8f4fd155d0189845678f55ad2fd54b02c10dcafd11c068dbb631286c0 + sha256: aced48e701e24c02b0b7f881a8819e4937794e46b5a5821005e2bf3b40a324cc url: "https://pub.dev" source: hosted - version: "2.8.6" + version: "2.8.7" video_player_android: dependency: transitive description: @@ -1450,10 +1450,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" watcher: dependency: transitive description: @@ -1536,5 +1536,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.4 <4.0.0" - flutter: ">=3.19.2" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 477f7f58..883128b2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,18 +10,18 @@ environment: dependencies: flutter: sdk: flutter - multi_split_view: ^2.4.0 + multi_split_view: ^3.2.1 url_launcher: ^6.2.5 flutter_riverpod: ^2.5.1 riverpod: ^2.5.1 uuid: ^4.3.3 http: ^1.2.1 http_parser: ^4.0.2 - collection: ^1.17.2 + collection: ^1.18.0 google_fonts: ^6.2.1 highlighter: ^0.1.1 xml: ^6.3.0 - jinja: ^0.5.0 + jinja: ^0.6.0 window_size: git: url: https://github.com/google/flutter-desktop-embedding.git @@ -32,7 +32,7 @@ dependencies: path_provider: ^2.1.2 window_manager: ^0.3.8 path: ^1.8.3 - flutter_markdown: ^0.6.21 + flutter_markdown: ^0.7.2+1 markdown: ^7.2.2 just_audio: ^0.9.34 just_audio_mpv: ^0.1.7 @@ -40,11 +40,11 @@ dependencies: freezed_annotation: ^2.4.1 json_annotation: ^4.8.1 printing: ^5.12.0 - package_info_plus: ^5.0.1 + package_info_plus: ^8.0.0 flutter_typeahead: ^5.2.0 provider: ^6.1.2 fvp: ^0.17.0 - video_player: ^2.3.2 + video_player: ^2.8.7 video_player_platform_interface: ^6.2.2 json_data_explorer: git: @@ -55,10 +55,10 @@ dependencies: vector_graphics_compiler: ^1.1.9+1 code_builder: ^4.10.0 dart_style: ^2.3.6 - json_text_field: ^1.1.0 + json_text_field: ^1.2.0 csv: ^6.0.0 flex_color_scheme: ^7.3.1 - data_table_2: ^2.5.11 + data_table_2: ^2.5.15 file_selector: ^1.0.3 hooks_riverpod: ^2.5.1 flutter_hooks: ^0.20.5 @@ -67,15 +67,16 @@ dependencies: dependency_overrides: web: ^0.5.0 + pdf_widget_wrapper: ^1.0.4 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^3.0.1 + flutter_lints: ^4.0.0 flutter_launcher_icons: ^0.13.1 - test: ^1.24.9 - build_runner: ^2.4.8 - freezed: ^2.4.7 + test: ^1.25.2 + build_runner: ^2.4.11 + freezed: ^2.5.2 json_serializable: ^6.7.1 flutter: