From 707793c6b20b1712033ac5287c6e7b5de5a42488 Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Wed, 23 Oct 2024 02:22:04 +1100 Subject: [PATCH] chore: rearrange thermion_flutter_ffi src dir --- .../lib/{ => src}/platform_texture.dart | 0 .../lib/{ => src}/texture_cache_entry.dart | 0 .../thermion_flutter_method_channel_interface.dart | 0 .../thermion_flutter_texture_backed_platform.dart | 2 +- .../lib/{ => src}/thermion_flutter_windows.dart | 9 ++++----- .../thermion_flutter_ffi/lib/thermion_flutter_ffi.dart | 5 +++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename thermion_flutter/thermion_flutter_ffi/lib/{ => src}/platform_texture.dart (100%) rename thermion_flutter/thermion_flutter_ffi/lib/{ => src}/texture_cache_entry.dart (100%) rename thermion_flutter/thermion_flutter_ffi/lib/{ => src}/thermion_flutter_method_channel_interface.dart (100%) rename thermion_flutter/thermion_flutter_ffi/lib/{ => src}/thermion_flutter_texture_backed_platform.dart (96%) rename thermion_flutter/thermion_flutter_ffi/lib/{ => src}/thermion_flutter_windows.dart (95%) diff --git a/thermion_flutter/thermion_flutter_ffi/lib/platform_texture.dart b/thermion_flutter/thermion_flutter_ffi/lib/src/platform_texture.dart similarity index 100% rename from thermion_flutter/thermion_flutter_ffi/lib/platform_texture.dart rename to thermion_flutter/thermion_flutter_ffi/lib/src/platform_texture.dart diff --git a/thermion_flutter/thermion_flutter_ffi/lib/texture_cache_entry.dart b/thermion_flutter/thermion_flutter_ffi/lib/src/texture_cache_entry.dart similarity index 100% rename from thermion_flutter/thermion_flutter_ffi/lib/texture_cache_entry.dart rename to thermion_flutter/thermion_flutter_ffi/lib/src/texture_cache_entry.dart diff --git a/thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_method_channel_interface.dart b/thermion_flutter/thermion_flutter_ffi/lib/src/thermion_flutter_method_channel_interface.dart similarity index 100% rename from thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_method_channel_interface.dart rename to thermion_flutter/thermion_flutter_ffi/lib/src/thermion_flutter_method_channel_interface.dart diff --git a/thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_texture_backed_platform.dart b/thermion_flutter/thermion_flutter_ffi/lib/src/thermion_flutter_texture_backed_platform.dart similarity index 96% rename from thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_texture_backed_platform.dart rename to thermion_flutter/thermion_flutter_ffi/lib/src/thermion_flutter_texture_backed_platform.dart index a28784e0..d261458d 100644 --- a/thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_texture_backed_platform.dart +++ b/thermion_flutter/thermion_flutter_ffi/lib/src/thermion_flutter_texture_backed_platform.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:thermion_dart/thermion_dart.dart'; import 'package:thermion_dart/thermion_dart.dart' as t; -import 'package:thermion_flutter_ffi/thermion_flutter_method_channel_interface.dart'; +import 'package:thermion_flutter_ffi/src/thermion_flutter_method_channel_interface.dart'; import 'package:thermion_flutter_platform_interface/thermion_flutter_platform_interface.dart'; import 'package:logging/logging.dart'; import 'package:thermion_flutter_platform_interface/thermion_flutter_texture.dart'; diff --git a/thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_windows.dart b/thermion_flutter/thermion_flutter_ffi/lib/src/thermion_flutter_windows.dart similarity index 95% rename from thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_windows.dart rename to thermion_flutter/thermion_flutter_ffi/lib/src/thermion_flutter_windows.dart index 5e7269d4..51da65d4 100644 --- a/thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_windows.dart +++ b/thermion_flutter/thermion_flutter_ffi/lib/src/thermion_flutter_windows.dart @@ -1,8 +1,7 @@ import 'dart:async'; import 'package:flutter/services.dart'; import 'package:thermion_dart/thermion_dart.dart'; -import 'package:thermion_dart/src/viewer/src/ffi/thermion_viewer_ffi.dart'; -import 'package:thermion_flutter_ffi/thermion_flutter_method_channel_interface.dart'; +import 'package:thermion_flutter_ffi/src/thermion_flutter_method_channel_interface.dart'; import 'package:thermion_flutter_platform_interface/thermion_flutter_platform_interface.dart'; import 'package:thermion_flutter_platform_interface/thermion_flutter_texture.dart'; import 'package:logging/logging.dart'; @@ -37,6 +36,9 @@ class ThermionFlutterWindows throw Exception("Only one viewer should be instantiated over the life of the app"); } _viewer = await super.createViewer(options: options); + _viewer!.onDispose(() async { + _viewer = null; + }); return _viewer!; } @@ -52,7 +54,6 @@ class ThermionFlutterWindows @override Future createWindow(int width, int height, int offsetLeft, int offsetTop) async { - var result = await _channel .invokeMethod("createWindow", [width, height, offsetLeft, offsetLeft]); @@ -84,8 +85,6 @@ class ThermionFlutterWindowImpl extends ThermionFlutterWindow { int offsetTop = 0; final MethodChannel _channel; - - ThermionFlutterWindowImpl(this.handle, this._channel, this.viewer); @override diff --git a/thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_ffi.dart b/thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_ffi.dart index d4816ed0..6771a5e7 100644 --- a/thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_ffi.dart +++ b/thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_ffi.dart @@ -1,2 +1,3 @@ -export 'thermion_flutter_windows.dart'; -export 'thermion_flutter_texture_backed_platform.dart'; +library; +export 'src/thermion_flutter_windows.dart'; +export 'src/thermion_flutter_texture_backed_platform.dart';