From eae5f4b761ebc5738fe21e305e4994850237e6ab Mon Sep 17 00:00:00 2001 From: gianlucaparadise Date: Fri, 15 Nov 2019 06:10:09 +0100 Subject: [PATCH] Code re-organization --- example/lib/main.dart | 6 ++---- lib/cast.dart | 5 +++++ lib/{ => src}/MethodNames.dart | 0 lib/{ => src}/cast/CastContext.dart | 4 ++-- lib/{ => src}/cast/SessionManager.dart | 2 +- lib/{ => src}/cast/widgets/CastButton.dart | 5 +++-- lib/{ => src}/cast/widgets/CastIcon.dart | 4 ++-- lib/{ => src}/flutter_cast_framework.dart | 5 +++-- lib/widgets.dart | 4 ++++ 9 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 lib/cast.dart rename lib/{ => src}/MethodNames.dart (100%) rename lib/{ => src}/cast/CastContext.dart (86%) rename lib/{ => src}/cast/SessionManager.dart (97%) rename lib/{ => src}/cast/widgets/CastButton.dart (66%) rename lib/{ => src}/cast/widgets/CastIcon.dart (95%) rename lib/{ => src}/flutter_cast_framework.dart (94%) create mode 100644 lib/widgets.dart diff --git a/example/lib/main.dart b/example/lib/main.dart index 3c05932..1f1a64b 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter_cast_framework/cast/CastContext.dart'; -import 'package:flutter_cast_framework/cast/SessionManager.dart'; -import 'package:flutter_cast_framework/cast/widgets/CastButton.dart'; -import 'package:flutter_cast_framework/flutter_cast_framework.dart'; +import 'package:flutter_cast_framework/cast.dart'; +import 'package:flutter_cast_framework/widgets.dart'; void main() => runApp(MyApp()); diff --git a/lib/cast.dart b/lib/cast.dart new file mode 100644 index 0000000..75200a4 --- /dev/null +++ b/lib/cast.dart @@ -0,0 +1,5 @@ +library cast; + +export 'src/cast/CastContext.dart'; +export 'src/cast/SessionManager.dart'; +export 'src/flutter_cast_framework.dart'; \ No newline at end of file diff --git a/lib/MethodNames.dart b/lib/src/MethodNames.dart similarity index 100% rename from lib/MethodNames.dart rename to lib/src/MethodNames.dart diff --git a/lib/cast/CastContext.dart b/lib/src/cast/CastContext.dart similarity index 86% rename from lib/cast/CastContext.dart rename to lib/src/cast/CastContext.dart index 2ecfa42..212b3b1 100644 --- a/lib/cast/CastContext.dart +++ b/lib/src/cast/CastContext.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_cast_framework/MethodNames.dart'; -import 'package:flutter_cast_framework/cast/SessionManager.dart'; +import '../MethodNames.dart'; +import 'SessionManager.dart'; class CastContext { final ValueNotifier state = ValueNotifier(CastState.unavailable); diff --git a/lib/cast/SessionManager.dart b/lib/src/cast/SessionManager.dart similarity index 97% rename from lib/cast/SessionManager.dart rename to lib/src/cast/SessionManager.dart index f0cca88..70859fc 100644 --- a/lib/cast/SessionManager.dart +++ b/lib/src/cast/SessionManager.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_cast_framework/MethodNames.dart'; +import '../MethodNames.dart'; class SessionManager { final MethodChannel _channel; diff --git a/lib/cast/widgets/CastButton.dart b/lib/src/cast/widgets/CastButton.dart similarity index 66% rename from lib/cast/widgets/CastButton.dart rename to lib/src/cast/widgets/CastButton.dart index 3a4ad8e..1fb6416 100644 --- a/lib/cast/widgets/CastButton.dart +++ b/lib/src/cast/widgets/CastButton.dart @@ -1,6 +1,7 @@ import 'package:flutter/widgets.dart'; -import 'package:flutter_cast_framework/cast/widgets/CastIcon.dart'; -import 'package:flutter_cast_framework/flutter_cast_framework.dart'; + +import '../../flutter_cast_framework.dart'; +import 'CastIcon.dart'; class CastButton extends StatelessWidget { @override diff --git a/lib/cast/widgets/CastIcon.dart b/lib/src/cast/widgets/CastIcon.dart similarity index 95% rename from lib/cast/widgets/CastIcon.dart rename to lib/src/cast/widgets/CastIcon.dart index cc6116f..865f920 100644 --- a/lib/cast/widgets/CastIcon.dart +++ b/lib/src/cast/widgets/CastIcon.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import 'package:flutter_cast_framework/cast/CastContext.dart'; -import 'package:flutter_cast_framework/flutter_cast_framework.dart'; +import '../CastContext.dart'; +import '../../flutter_cast_framework.dart'; import 'package:flutter_svg/flutter_svg.dart'; class CastIcon extends StatefulWidget { diff --git a/lib/flutter_cast_framework.dart b/lib/src/flutter_cast_framework.dart similarity index 94% rename from lib/flutter_cast_framework.dart rename to lib/src/flutter_cast_framework.dart index 77a174d..5cc31e7 100644 --- a/lib/flutter_cast_framework.dart +++ b/lib/src/flutter_cast_framework.dart @@ -1,7 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_cast_framework/MethodNames.dart'; -import 'package:flutter_cast_framework/cast/CastContext.dart'; + +import 'MethodNames.dart'; +import 'cast/CastContext.dart'; class FlutterCastFramework { static const MethodChannel _channel = diff --git a/lib/widgets.dart b/lib/widgets.dart new file mode 100644 index 0000000..8b0ea75 --- /dev/null +++ b/lib/widgets.dart @@ -0,0 +1,4 @@ +library widgets; + +export 'src/cast/widgets/CastButton.dart'; +export 'src/cast/widgets/CastIcon.dart'; \ No newline at end of file