From 1e452f2374d31f87f5ae862f10cbd4976cc6617b Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sun, 2 Jul 2023 10:54:31 +0200 Subject: [PATCH] neon: Move sort_box to it's own library and export the package --- packages/neon/neon/lib/sort_box.dart | 3 +++ .../neon/lib/src/{utils => sort_box}/sort_box_builder.dart | 0 .../src/{utils => sort_box}/sort_box_order_option_values.dart | 0 packages/neon/neon/lib/utils.dart | 2 -- packages/neon/neon_files/lib/neon_files.dart | 2 +- packages/neon/neon_files/pubspec.yaml | 4 ---- packages/neon/neon_news/lib/neon_news.dart | 2 +- packages/neon/neon_news/pubspec.yaml | 4 ---- packages/neon/neon_notes/lib/neon_notes.dart | 2 +- packages/neon/neon_notes/pubspec.yaml | 4 ---- 10 files changed, 6 insertions(+), 17 deletions(-) create mode 100644 packages/neon/neon/lib/sort_box.dart rename packages/neon/neon/lib/src/{utils => sort_box}/sort_box_builder.dart (100%) rename packages/neon/neon/lib/src/{utils => sort_box}/sort_box_order_option_values.dart (100%) diff --git a/packages/neon/neon/lib/sort_box.dart b/packages/neon/neon/lib/sort_box.dart new file mode 100644 index 00000000..e66072f2 --- /dev/null +++ b/packages/neon/neon/lib/sort_box.dart @@ -0,0 +1,3 @@ +export 'package:neon/src/sort_box/sort_box_builder.dart'; +export 'package:neon/src/sort_box/sort_box_order_option_values.dart'; +export 'package:sort_box/sort_box.dart'; diff --git a/packages/neon/neon/lib/src/utils/sort_box_builder.dart b/packages/neon/neon/lib/src/sort_box/sort_box_builder.dart similarity index 100% rename from packages/neon/neon/lib/src/utils/sort_box_builder.dart rename to packages/neon/neon/lib/src/sort_box/sort_box_builder.dart diff --git a/packages/neon/neon/lib/src/utils/sort_box_order_option_values.dart b/packages/neon/neon/lib/src/sort_box/sort_box_order_option_values.dart similarity index 100% rename from packages/neon/neon/lib/src/utils/sort_box_order_option_values.dart rename to packages/neon/neon/lib/src/sort_box/sort_box_order_option_values.dart diff --git a/packages/neon/neon/lib/utils.dart b/packages/neon/neon/lib/utils.dart index 465d3f1f..a51944c8 100644 --- a/packages/neon/neon/lib/utils.dart +++ b/packages/neon/neon/lib/utils.dart @@ -3,6 +3,4 @@ export 'package:neon/src/utils/exceptions.dart'; export 'package:neon/src/utils/hex_color.dart'; export 'package:neon/src/utils/rename_dialog.dart'; export 'package:neon/src/utils/request_manager.dart'; -export 'package:neon/src/utils/sort_box_builder.dart'; -export 'package:neon/src/utils/sort_box_order_option_values.dart'; export 'package:neon/src/utils/validators.dart'; diff --git a/packages/neon/neon_files/lib/neon_files.dart b/packages/neon/neon_files/lib/neon_files.dart index 51d94161..68280d18 100644 --- a/packages/neon/neon_files/lib/neon_files.dart +++ b/packages/neon/neon_files/lib/neon_files.dart @@ -16,6 +16,7 @@ import 'package:neon/blocs.dart'; import 'package:neon/models.dart'; import 'package:neon/platform.dart'; import 'package:neon/settings.dart'; +import 'package:neon/sort_box.dart'; import 'package:neon/utils.dart'; import 'package:neon/widgets.dart'; import 'package:neon_files/l10n/localizations.dart'; @@ -25,7 +26,6 @@ import 'package:path/path.dart' as p; import 'package:provider/provider.dart'; import 'package:queue/queue.dart'; import 'package:rxdart/rxdart.dart'; -import 'package:sort_box/sort_box.dart'; part 'blocs/browser.dart'; part 'blocs/files.dart'; diff --git a/packages/neon/neon_files/pubspec.yaml b/packages/neon/neon_files/pubspec.yaml index 813944b6..a2c729cb 100644 --- a/packages/neon/neon_files/pubspec.yaml +++ b/packages/neon/neon_files/pubspec.yaml @@ -33,10 +33,6 @@ dependencies: queue: ^3.1.0+2 rxdart: ^0.27.7 share_plus: ^7.0.0 - sort_box: - git: - url: https://github.com/provokateurin/nextcloud-neon - path: packages/sort_box dev_dependencies: nit_picking: diff --git a/packages/neon/neon_news/lib/neon_news.dart b/packages/neon/neon_news/lib/neon_news.dart index d81d1881..6a7c4f62 100644 --- a/packages/neon/neon_news/lib/neon_news.dart +++ b/packages/neon/neon_news/lib/neon_news.dart @@ -12,6 +12,7 @@ import 'package:neon/blocs.dart'; import 'package:neon/models.dart'; import 'package:neon/platform.dart'; import 'package:neon/settings.dart'; +import 'package:neon/sort_box.dart'; import 'package:neon/utils.dart'; import 'package:neon/widgets.dart'; import 'package:neon_news/l10n/localizations.dart'; @@ -19,7 +20,6 @@ import 'package:nextcloud/nextcloud.dart'; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; import 'package:share_plus/share_plus.dart'; -import 'package:sort_box/sort_box.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:wakelock/wakelock.dart'; import 'package:webview_flutter/webview_flutter.dart'; diff --git a/packages/neon/neon_news/pubspec.yaml b/packages/neon/neon_news/pubspec.yaml index 157b47ef..7e0b3289 100644 --- a/packages/neon/neon_news/pubspec.yaml +++ b/packages/neon/neon_news/pubspec.yaml @@ -23,10 +23,6 @@ dependencies: provider: ^6.0.5 rxdart: ^0.27.7 share_plus: ^7.0.0 - sort_box: - git: - url: https://github.com/provokateurin/nextcloud-neon - path: packages/sort_box url_launcher: ^6.1.11 wakelock: ^0.6.2 webview_flutter: ^4.2.0 diff --git a/packages/neon/neon_notes/lib/neon_notes.dart b/packages/neon/neon_notes/lib/neon_notes.dart index a908c4d3..41e73862 100644 --- a/packages/neon/neon_notes/lib/neon_notes.dart +++ b/packages/neon/neon_notes/lib/neon_notes.dart @@ -12,6 +12,7 @@ import 'package:neon/blocs.dart'; import 'package:neon/models.dart'; import 'package:neon/platform.dart'; import 'package:neon/settings.dart'; +import 'package:neon/sort_box.dart'; import 'package:neon/utils.dart'; import 'package:neon/widgets.dart'; import 'package:neon_notes/l10n/localizations.dart'; @@ -19,7 +20,6 @@ import 'package:nextcloud/nextcloud.dart'; import 'package:provider/provider.dart'; import 'package:queue/queue.dart'; import 'package:rxdart/rxdart.dart'; -import 'package:sort_box/sort_box.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:wakelock/wakelock.dart'; diff --git a/packages/neon/neon_notes/pubspec.yaml b/packages/neon/neon_notes/pubspec.yaml index 4c50e577..5952d3f1 100644 --- a/packages/neon/neon_notes/pubspec.yaml +++ b/packages/neon/neon_notes/pubspec.yaml @@ -24,10 +24,6 @@ dependencies: provider: ^6.0.5 queue: ^3.1.0+2 rxdart: ^0.27.7 - sort_box: - git: - url: https://github.com/provokateurin/nextcloud-neon - path: packages/sort_box url_launcher: ^6.1.11 wakelock: ^0.6.2