Move implementations

ubuntu-flutter-community · Nov 7, 2024 · 1f569f3 · 1f569f3
1 parent 2351cfb
commit 1f569f3
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 23 deletions.
diff --git a/packages/sane/example/main.dart b/packages/sane/example/main.dart
@@ -12,7 +12,7 @@ void main(List<String> args) async {
     print('${record.level.name}: ${record.time}: ${record.message}');
   });
 
-  final sane = SaneIsolate(sane: SaneDev());
+  final sane = SaneNative(sane: SaneDev());
   await sane.spawn();
 
   await sane.init();

diff --git a/packages/sane/lib/sane.dart b/packages/sane/lib/sane.dart
@@ -1,8 +1,8 @@
 library;
 
 export 'src/exceptions.dart';
-export 'src/sane_dev.dart';
-export 'src/sane_native.dart';
-export 'src/sane_sync.dart';
+export 'src/impl/sane_dev.dart';
+export 'src/impl/sane_native.dart';
+export 'src/impl/sane_sync.dart';
 export 'src/structures.dart';
 export 'src/utils.dart';
diff --git a/packages/sane/lib/src/sane_dev.dart → packages/sane/lib/src/impl/sane_dev.dart b/packages/sane/lib/src/sane_dev.dart → packages/sane/lib/src/impl/sane_dev.dart
diff --git a/packages/sane/lib/src/sane_native.dart → packages/sane/lib/src/impl/sane_native.dart b/packages/sane/lib/src/sane_native.dart → packages/sane/lib/src/impl/sane_native.dart
@@ -19,8 +19,8 @@ import 'package:sane/src/isolate_messages/read.dart';
 import 'package:sane/src/isolate_messages/set_io_mode.dart';
 import 'package:sane/src/isolate_messages/start.dart';
 
-class SaneIsolate implements Sane {
-  SaneIsolate({
+class SaneNative implements Sane {
+  SaneNative({
     required Sane sane,
   }) : _sane = sane;
 

diff --git a/packages/sane/lib/src/sane_sync.dart → packages/sane/lib/src/impl/sane_sync.dart b/packages/sane/lib/src/sane_sync.dart → packages/sane/lib/src/impl/sane_sync.dart
diff --git a/packages/sane/lib/src/isolate_messages/cancel.dart b/packages/sane/lib/src/isolate_messages/cancel.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class CancelMessage implements IsolateMessage {

diff --git a/packages/sane/lib/src/isolate_messages/control_button_option.dart b/packages/sane/lib/src/isolate_messages/control_button_option.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class ControlButtonOptionMessage

diff --git a/packages/sane/lib/src/isolate_messages/control_option.dart b/packages/sane/lib/src/isolate_messages/control_option.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class ControlValueOptionMessage<T>

diff --git a/packages/sane/lib/src/isolate_messages/exit.dart b/packages/sane/lib/src/isolate_messages/exit.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 
 class ExitMessage implements IsolateMessage {
   @override

diff --git a/packages/sane/lib/src/isolate_messages/get_all_option_descriptors.dart b/packages/sane/lib/src/isolate_messages/get_all_option_descriptors.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class GetAllOptionDescriptorsMessage

diff --git a/packages/sane/lib/src/isolate_messages/get_devices.dart b/packages/sane/lib/src/isolate_messages/get_devices.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class GetDevicesMessage implements IsolateMessage<GetDevicesResponse> {

diff --git a/packages/sane/lib/src/isolate_messages/get_option_descriptor.dart b/packages/sane/lib/src/isolate_messages/get_option_descriptor.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class GetOptionDescriptorMessage

diff --git a/packages/sane/lib/src/isolate_messages/get_parameters.dart b/packages/sane/lib/src/isolate_messages/get_parameters.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class GetParametersMessage implements IsolateMessage<GetParametersResponse> {

diff --git a/packages/sane/lib/src/isolate_messages/init.dart b/packages/sane/lib/src/isolate_messages/init.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 
 class InitMessage implements IsolateMessage<InitResponse> {
   @override

diff --git a/packages/sane/lib/src/isolate_messages/interface.dart b/packages/sane/lib/src/isolate_messages/interface.dart
@@ -1,4 +1,4 @@
-import 'package:sane/src/sane_sync.dart';
+import 'package:sane/src/impl/sane_sync.dart';
 
 abstract interface class IsolateMessage<T extends IsolateResponse> {
   Future<T> handle(Sane sane);

diff --git a/packages/sane/lib/src/isolate_messages/open.dart b/packages/sane/lib/src/isolate_messages/open.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class OpenMessage implements IsolateMessage<OpenResponse> {

diff --git a/packages/sane/lib/src/isolate_messages/read.dart b/packages/sane/lib/src/isolate_messages/read.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class ReadMessage implements IsolateMessage<ReadResponse> {

diff --git a/packages/sane/lib/src/isolate_messages/set_io_mode.dart b/packages/sane/lib/src/isolate_messages/set_io_mode.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class SetIOModeMessage implements IsolateMessage {

diff --git a/packages/sane/lib/src/isolate_messages/start.dart b/packages/sane/lib/src/isolate_messages/start.dart
@@ -1,5 +1,5 @@
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
-import 'package:sane/src/sane_sync.dart';
 import 'package:sane/src/structures.dart';
 
 class StartMessage implements IsolateMessage {

diff --git a/packages/sane/test/sane_test.dart b/packages/sane/test/sane_test.dart
@@ -1,9 +1,8 @@
-import 'package:sane/src/sane_sync.dart';
+import 'package:sane/src/impl/sane_sync.dart';
 import 'package:test/test.dart';
 
 void main() {
   test('Sane init test', () {
-    final sane = Sane();
-    expect(sane.init, returnsNormally);
+    expect(Sane.new, returnsNormally);
   });
 }