diff --git a/fediverse_archive_browser/lib/src/components/geo/geo_extensions.dart b/fediverse_archive_browser/lib/src/components/geo/geo_extensions.dart index 4eb67a4..a5de5cb 100644 --- a/fediverse_archive_browser/lib/src/components/geo/geo_extensions.dart +++ b/fediverse_archive_browser/lib/src/components/geo/geo_extensions.dart @@ -9,7 +9,7 @@ import 'marker_data.dart'; extension GeoSpatialPostExtensions on TimelineEntry { MarkerData toMarkerData(MapTransformer transformer, Color color) { final latLon = LatLng(locationData.latitude, locationData.longitude); - final offset = transformer.fromLatLngToXYCoords(latLon); + final offset = transformer.toOffset(latLon); return MarkerData(this, offset, color); } } diff --git a/fediverse_archive_browser/lib/src/components/geo/map_bounds.dart b/fediverse_archive_browser/lib/src/components/geo/map_bounds.dart index f39554f..b50cca1 100644 --- a/fediverse_archive_browser/lib/src/components/geo/map_bounds.dart +++ b/fediverse_archive_browser/lib/src/components/geo/map_bounds.dart @@ -20,9 +20,9 @@ class MapBounds { static MapBounds computed(MapTransformer transformer) { final mapSize = transformer.constraints.biggest; - final upperLeft = transformer.fromXYCoordsToLatLng(Offset.zero); + final upperLeft = transformer.toLatLng(Offset.zero); final lowerRight = - transformer.fromXYCoordsToLatLng(Offset(mapSize.width, mapSize.height)); + transformer.toLatLng(Offset(mapSize.width, mapSize.height)); final idealLeftLongitude = max(-180.0, upperLeft.longitude); final idealRightLongitude = min(180.0, lowerRight.longitude); final idealUpperLatitude = min(85.0, upperLeft.latitude); diff --git a/fediverse_archive_browser/lib/src/screens/entries_screen.dart b/fediverse_archive_browser/lib/src/screens/entries_screen.dart index 0ce16fa..d8737cc 100644 --- a/fediverse_archive_browser/lib/src/screens/entries_screen.dart +++ b/fediverse_archive_browser/lib/src/screens/entries_screen.dart @@ -1,4 +1,3 @@ -import 'package:flutter/material.dart'; import 'package:fediverse_archive_browser/src/components/filter_control_component.dart'; import 'package:fediverse_archive_browser/src/components/tree_entry_card.dart'; import 'package:fediverse_archive_browser/src/models/entry_tree_item.dart'; @@ -6,6 +5,7 @@ import 'package:fediverse_archive_browser/src/models/model_utils.dart'; import 'package:fediverse_archive_browser/src/screens/error_screen.dart'; import 'package:fediverse_archive_browser/src/settings/settings_controller.dart'; import 'package:fediverse_archive_browser/src/utils/exec_error.dart'; +import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; import 'package:provider/provider.dart'; import 'package:result_monad/result_monad.dart'; @@ -86,7 +86,7 @@ class _FriendicaEntriesScreenWidget extends StatelessWidget { behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false), child: ListView.separated( - primary: false, + primary: true, physics: const RangeMaintainingScrollPhysics(), restorationId: 'friendicaEntriesListView', itemCount: items.length, diff --git a/fediverse_archive_browser/lib/src/screens/geospatial_screen.dart b/fediverse_archive_browser/lib/src/screens/geospatial_screen.dart index 6ebc486..9e3dd87 100644 --- a/fediverse_archive_browser/lib/src/screens/geospatial_screen.dart +++ b/fediverse_archive_browser/lib/src/screens/geospatial_screen.dart @@ -1,7 +1,5 @@ import 'dart:math'; -import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:fediverse_archive_browser/src/components/geo/geo_extensions.dart'; import 'package:fediverse_archive_browser/src/components/tree_entry_card.dart'; import 'package:fediverse_archive_browser/src/friendica/services/friendica_path_mapping_service.dart'; @@ -14,6 +12,8 @@ import 'package:fediverse_archive_browser/src/services/archive_service_provider. import 'package:fediverse_archive_browser/src/settings/settings_controller.dart'; import 'package:fediverse_archive_browser/src/utils/exec_error.dart'; import 'package:fediverse_archive_browser/src/utils/temp_file_builder.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:latlng/latlng.dart'; import 'package:logging/logging.dart'; @@ -191,7 +191,7 @@ class _GeospatialViewState extends State { postList, ], initialWeights: const [0.3], - minimalWeight: 0.2, + globalMinimalWeight: 0.2, ); return MultiSplitViewTheme( diff --git a/fediverse_archive_browser/linux/flutter/generated_plugins.cmake b/fediverse_archive_browser/linux/flutter/generated_plugins.cmake index d4196a6..93a9532 100644 --- a/fediverse_archive_browser/linux/flutter/generated_plugins.cmake +++ b/fediverse_archive_browser/linux/flutter/generated_plugins.cmake @@ -7,6 +7,9 @@ list(APPEND FLUTTER_PLUGIN_LIST url_launcher_linux ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -15,3 +18,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/fediverse_archive_browser/macos/Flutter/GeneratedPluginRegistrant.swift b/fediverse_archive_browser/macos/Flutter/GeneratedPluginRegistrant.swift index 402cf10..46cab40 100644 --- a/fediverse_archive_browser/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/fediverse_archive_browser/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,14 +5,22 @@ import FlutterMacOS import Foundation +import audio_session import desktop_window +import just_audio import path_provider_macos import shared_preferences_macos +import sqflite import url_launcher_macos +import wakelock_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) DesktopWindowPlugin.register(with: registry.registrar(forPlugin: "DesktopWindowPlugin")) + JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) + SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) + WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin")) } diff --git a/fediverse_archive_browser/pubspec.lock b/fediverse_archive_browser/pubspec.lock index 85e5e80..3b28716 100644 --- a/fediverse_archive_browser/pubspec.lock +++ b/fediverse_archive_browser/pubspec.lock @@ -7,14 +7,21 @@ packages: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.1" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" + audio_session: + dependency: transitive + description: + name: audio_session + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.10" boolean_selector: dependency: transitive description: @@ -22,13 +29,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.0" + cached_network_image: + dependency: transitive + description: + name: cached_network_image + url: "https://pub.dartlang.org" + source: hosted + version: "3.2.2" + cached_network_image_platform_interface: + dependency: transitive + description: + name: cached_network_image_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + cached_network_image_web: + dependency: transitive + description: + name: cached_network_image_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" charcode: dependency: transitive description: @@ -50,34 +78,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.0" + chewie: + dependency: transitive + description: + name: chewie + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.5" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" csslib: dependency: transitive description: name: csslib url: "https://pub.dartlang.org" source: hosted - version: "0.17.1" + version: "0.17.2" + cupertino_icons: + dependency: transitive + description: + name: cupertino_icons + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" desktop_window: dependency: "direct main" description: @@ -91,33 +133,54 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.1" file: dependency: transitive description: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.4" file_picker: dependency: "direct main" description: name: file_picker url: "https://pub.dartlang.org" source: hosted - version: "4.2.7" + version: "4.6.1" + fixnum: + dependency: transitive + description: + name: fixnum + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" + flutter_blurhash: + dependency: transitive + description: + name: flutter_blurhash + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.0" + flutter_cache_manager: + dependency: transitive + description: + name: flutter_cache_manager + url: "https://pub.dartlang.org" + source: hosted + version: "3.3.0" flutter_lints: dependency: "direct dev" description: @@ -136,7 +199,14 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.7" + flutter_svg: + dependency: transitive + description: + name: flutter_svg + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.6" flutter_test: dependency: "direct dev" description: flutter @@ -147,41 +217,90 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_widget_from_html_core: + flutter_widget_from_html: dependency: "direct main" + description: + name: flutter_widget_from_html + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.0" + flutter_widget_from_html_core: + dependency: transitive description: name: flutter_widget_from_html_core url: "https://pub.dartlang.org" source: hosted - version: "0.8.4" + version: "0.9.0" + fwfh_cached_network_image: + dependency: transitive + description: + name: fwfh_cached_network_image + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.0+3" + fwfh_chewie: + dependency: transitive + description: + name: fwfh_chewie + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.0+2" + fwfh_just_audio: + dependency: transitive + description: + name: fwfh_just_audio + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.0" + fwfh_svg: + dependency: transitive + description: + name: fwfh_svg + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.2+1" fwfh_text_style: dependency: transitive description: name: fwfh_text_style url: "https://pub.dartlang.org" source: hosted - version: "2.7.2" + version: "2.22.08+1" + fwfh_url_launcher: + dependency: transitive + description: + name: fwfh_url_launcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.0" + fwfh_webview: + dependency: transitive + description: + name: fwfh_webview + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.2+4" html: dependency: transitive description: name: html url: "https://pub.dartlang.org" source: hosted - version: "0.15.0" + version: "0.15.1" http: dependency: transitive description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.4" + version: "0.13.5" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.2" intl: dependency: "direct main" description: @@ -195,14 +314,35 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" + just_audio: + dependency: transitive + description: + name: just_audio + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.30" + just_audio_platform_interface: + dependency: transitive + description: + name: just_audio_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "4.2.0" + just_audio_web: + dependency: transitive + description: + name: just_audio_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.7" latlng: dependency: "direct main" description: name: latlng url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.1.1" lints: dependency: transitive description: @@ -216,14 +356,14 @@ packages: name: logging url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.1.0" map: dependency: "direct main" description: name: map url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.2.0" markdown: dependency: "direct main" description: @@ -237,21 +377,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" metadata_fetch: dependency: "direct main" description: @@ -265,7 +405,7 @@ packages: name: multi_split_view url: "https://pub.dartlang.org" source: hosted - version: "1.10.0+1" + version: "1.13.0" nested: dependency: transitive description: @@ -279,63 +419,98 @@ packages: name: network_to_file_image url: "https://pub.dartlang.org" source: hosted - version: "3.0.3" + version: "3.1.0" + octo_image: + dependency: transitive + description: + name: octo_image + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" path: dependency: "direct main" description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.2" + path_drawing: + dependency: transitive + description: + name: path_drawing + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + path_parsing: + dependency: transitive + description: + name: path_parsing + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" path_provider: dependency: "direct main" description: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.0.11" path_provider_android: dependency: transitive description: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.21" path_provider_ios: dependency: transitive description: name: path_provider_ios url: "https://pub.dartlang.org" source: hosted - version: "2.0.7" + version: "2.0.11" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.7" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.6" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.5" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.7" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.11.1" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "5.1.0" platform: dependency: transitive description: @@ -349,7 +524,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.1.3" process: dependency: transitive description: @@ -357,13 +532,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.2.4" + protobuf: + dependency: transitive + description: + name: protobuf + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" provider: dependency: "direct main" description: name: provider url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" + version: "6.0.4" result_monad: dependency: "direct main" description: @@ -371,6 +553,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.2" + rxdart: + dependency: transitive + description: + name: rxdart + url: "https://pub.dartlang.org" + source: hosted + version: "0.27.5" scrollable_positioned_list: dependency: "direct main" description: @@ -384,56 +573,56 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.10" + version: "2.0.15" shared_preferences_android: dependency: transitive description: name: shared_preferences_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.14" shared_preferences_ios: dependency: transitive description: name: shared_preferences_ios url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.1" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.1" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.4" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.4" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.1" sky_engine: dependency: transitive description: flutter @@ -445,7 +634,21 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.9.0" + sqflite: + dependency: transitive + description: + name: sqflite + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.0+3" + sqflite_common: + dependency: transitive + description: + name: sqflite_common + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.0+2" stack_trace: dependency: transitive description: @@ -466,7 +669,7 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" string_validator: dependency: transitive description: @@ -474,26 +677,33 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.3.0" + synchronized: + dependency: transitive + description: + name: synchronized + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.0+3" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.12" time_machine: dependency: "direct main" description: path: "." ref: master - resolved-ref: "040de1a261df442538ed97f6de5895465d7ca4dd" + resolved-ref: "246f3608b16d7fa36ee2155b3a21884b48c75b01" url: "https://github.com/Dana-Ferguson/time_machine" source: git version: "0.9.17" @@ -503,91 +713,196 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" url_launcher: dependency: "direct main" description: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.17" + version: "6.1.6" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.21" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.17" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.1" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.1.1" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.13" url_launcher_windows: dependency: transitive description: name: url_launcher_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.1" uuid: dependency: "direct main" description: name: uuid url: "https://pub.dartlang.org" source: hosted - version: "3.0.5" + version: "3.0.6" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" + video_player: + dependency: transitive + description: + name: video_player + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.7" + video_player_android: + dependency: transitive + description: + name: video_player_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.9" + video_player_avfoundation: + dependency: transitive + description: + name: video_player_avfoundation + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.7" + video_player_platform_interface: + dependency: transitive + description: + name: video_player_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "5.1.4" + video_player_web: + dependency: transitive + description: + name: video_player_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.12" + wakelock: + dependency: transitive + description: + name: wakelock + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.2" + wakelock_macos: + dependency: transitive + description: + name: wakelock_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.0" + wakelock_platform_interface: + dependency: transitive + description: + name: wakelock_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.0" + wakelock_web: + dependency: transitive + description: + name: wakelock_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.0" + wakelock_windows: + dependency: transitive + description: + name: wakelock_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.0" + webview_flutter: + dependency: transitive + description: + name: webview_flutter + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.4" + webview_flutter_android: + dependency: transitive + description: + name: webview_flutter_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.10.4" + webview_flutter_platform_interface: + dependency: transitive + description: + name: webview_flutter_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.9.5" + webview_flutter_wkwebview: + dependency: transitive + description: + name: webview_flutter_wkwebview + url: "https://pub.dartlang.org" + source: hosted + version: "2.9.5" win32: dependency: transitive description: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.3.1" + version: "2.6.1" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.0+2" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.0" sdks: - dart: ">=2.14.4 <3.0.0" - flutter: ">=2.6.0-0" + dart: ">=2.18.2 <3.0.0" + flutter: ">=3.3.0" diff --git a/fediverse_archive_browser/pubspec.yaml b/fediverse_archive_browser/pubspec.yaml index 3e085bc..7636dbc 100644 --- a/fediverse_archive_browser/pubspec.yaml +++ b/fediverse_archive_browser/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: 'none' version: 1.0.0 environment: - sdk: ">=2.14.0 <3.0.0" + sdk: '>=2.18.2 <3.0.0' dependencies: desktop_window: ^0.4.0 @@ -17,7 +17,7 @@ dependencies: charts_flutter: ^0.12.0 flutter_localizations: sdk: flutter - flutter_widget_from_html_core: ^0.8.4 + flutter_widget_from_html: ^0.9.0 intl: ^0.17.0 logging: ^1.0.2 latlng: ^0.1.0 diff --git a/fediverse_archive_browser/windows/flutter/generated_plugins.cmake b/fediverse_archive_browser/windows/flutter/generated_plugins.cmake index 431160e..d3bb578 100644 --- a/fediverse_archive_browser/windows/flutter/generated_plugins.cmake +++ b/fediverse_archive_browser/windows/flutter/generated_plugins.cmake @@ -7,6 +7,9 @@ list(APPEND FLUTTER_PLUGIN_LIST url_launcher_windows ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -15,3 +18,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin)