From 6696e6ead1751462e233afb5eab22a458e0c9e73 Mon Sep 17 00:00:00 2001 From: Nikolas Rimikis Date: Mon, 5 Aug 2024 12:01:35 +0200 Subject: [PATCH 1/2] refactor: change package file structure Signed-off-by: Nikolas Rimikis Signed-off-by: provokateurin --- .github/renovate.json | 2 +- .github/workflows/publish.yaml | 18 +-- .gitignore | 2 +- .idea/runConfigurations/Debug.xml | 2 +- .idea/runConfigurations/Release.xml | 2 +- .vscode/launch.json | 6 +- CONTRIBUTING.md | 4 +- README.md | 38 +++---- commitlint.yaml | 17 ++- cspell.json | 14 +-- docs/architecture.puml | 34 +++--- docs/architecture.svg | 2 +- docs/login.svg | 2 +- melos.yaml | 5 +- packages/app/pubspec_overrides.yaml | 30 ----- .../cookie_store_conformance_tests/LICENSE | 1 + .../analysis_options.yaml | 0 .../lib/cookie_store_conformance_tests.dart | 0 .../lib/src/deletion_tests.dart | 0 .../lib/src/domain_matching_tests.dart | 0 .../lib/src/expiration_tests.dart | 0 .../lib/src/http_only_cookie_tests.dart | 0 .../lib/src/path_matching_tests.dart | 0 .../lib/src/persist_cookies_tests.dart | 0 .../lib/src/secure_cookie_tests.dart | 0 .../lib/src/sorting_tests.dart | 0 .../lib/src/utils.dart | 0 .../pubspec.yaml | 0 .../pubspec_overrides.yaml | 4 +- packages/cookie_store/pubspec.yaml | 2 +- packages/cookie_store/pubspec_overrides.yaml | 2 +- .../cookie_store_conformance_tests/LICENSE | 1 - packages/dynamite/.pubignore | 1 + packages/dynamite/{dynamite => }/CHANGELOG.md | 0 packages/{app => dynamite}/LICENSE | 0 packages/dynamite/{dynamite => }/README.md | 2 +- .../{dynamite => }/analysis_options.yaml | 0 packages/dynamite/{dynamite => }/build.yaml | 0 packages/dynamite/dynamite/example/README.md | 3 - packages/dynamite/dynamite_runtime/LICENSE | 1 - .../dynamite/{dynamite => example}/LICENSE | 0 packages/dynamite/example/README.md | 3 + .../example/analysis_options.yaml | 0 .../{dynamite => }/example/build.yaml | 0 .../example/lib/petstore.openapi.dart | 0 .../example/lib/petstore.openapi.g.dart | 0 .../example/lib/petstore.openapi.json | 0 .../{dynamite => }/example/pubspec.yaml | 0 .../pubspec_overrides.yaml | 4 +- .../dynamite/{dynamite => }/lib/builder.dart | 0 .../dynamite/{dynamite => }/lib/dynamite.dart | 0 .../lib/src/builder/client.dart | 0 .../lib/src/builder/generate_ofs.dart | 0 .../lib/src/builder/generate_schemas.dart | 0 .../lib/src/builder/resolve_enum.dart | 0 .../lib/src/builder/resolve_interface.dart | 0 .../lib/src/builder/resolve_mime_type.dart | 0 .../lib/src/builder/resolve_object.dart | 0 .../lib/src/builder/resolve_ofs.dart | 0 .../lib/src/builder/resolve_type.dart | 0 .../lib/src/builder/serializer.dart | 0 .../{dynamite => }/lib/src/builder/state.dart | 0 .../lib/src/helpers/built_value.dart | 0 .../lib/src/helpers/dart_helpers.dart | 0 .../lib/src/helpers/default_value.dart | 0 .../{dynamite => }/lib/src/helpers/docs.dart | 0 .../lib/src/helpers/dynamite.dart | 0 .../lib/src/helpers/logger.dart | 0 .../lib/src/helpers/pattern_check.dart | 0 .../lib/src/helpers/version_checker.dart | 0 .../{dynamite => }/lib/src/models/config.dart | 0 .../src/models/dynamite_config/config.dart | 0 .../src/models/dynamite_config/config.g.dart | 0 .../lib/src/models/exceptions.dart | 0 .../lib/src/models/json_schema.dart | 0 .../lib/src/models/json_schema.g.dart | 0 .../src/models/json_schema/annotations.dart | 0 .../lib/src/models/json_schema/schema.dart | 0 .../lib/src/models/json_schema/schema.g.dart | 0 .../src/models/json_schema/type_result.dart | 0 .../src/models/json_schema/validators.dart | 0 .../lib/src/models/openapi.dart | 0 .../lib/src/models/openapi.g.dart | 0 .../lib/src/models/openapi/components.dart | 0 .../lib/src/models/openapi/components.g.dart | 0 .../lib/src/models/openapi/contact.dart | 0 .../lib/src/models/openapi/contact.g.dart | 0 .../lib/src/models/openapi/discriminator.dart | 0 .../src/models/openapi/discriminator.g.dart | 0 .../lib/src/models/openapi/header.dart | 0 .../lib/src/models/openapi/header.g.dart | 0 .../lib/src/models/openapi/info.dart | 0 .../lib/src/models/openapi/info.g.dart | 0 .../lib/src/models/openapi/license.dart | 0 .../lib/src/models/openapi/license.g.dart | 0 .../lib/src/models/openapi/media_type.dart | 0 .../lib/src/models/openapi/media_type.g.dart | 0 .../lib/src/models/openapi/open_api.dart | 0 .../lib/src/models/openapi/open_api.g.dart | 0 .../lib/src/models/openapi/operation.dart | 0 .../lib/src/models/openapi/operation.g.dart | 0 .../lib/src/models/openapi/parameter.dart | 0 .../lib/src/models/openapi/parameter.g.dart | 0 .../lib/src/models/openapi/path_item.dart | 0 .../lib/src/models/openapi/path_item.g.dart | 0 .../lib/src/models/openapi/request_body.dart | 0 .../src/models/openapi/request_body.g.dart | 0 .../lib/src/models/openapi/response.dart | 0 .../lib/src/models/openapi/response.g.dart | 0 .../src/models/openapi/security_scheme.dart | 0 .../src/models/openapi/security_scheme.g.dart | 0 .../lib/src/models/openapi/server.dart | 0 .../lib/src/models/openapi/server.g.dart | 0 .../src/models/openapi/server_variable.dart | 0 .../src/models/openapi/server_variable.g.dart | 0 .../lib/src/models/openapi/tag.dart | 0 .../lib/src/models/openapi/tag.g.dart | 0 .../lib/src/models/type_result.dart | 0 .../lib/src/models/type_result/base.dart | 0 .../lib/src/models/type_result/enum.dart | 0 .../lib/src/models/type_result/list.dart | 0 .../lib/src/models/type_result/map.dart | 0 .../lib/src/models/type_result/object.dart | 0 .../lib/src/models/type_result/some_of.dart | 0 .../src/models/type_result/type_result.dart | 0 .../lib/src/openapi_builder.dart | 0 .../dynamite_end_to_end_test}/LICENSE | 0 .../dynamite_end_to_end_test/README.md | 2 +- .../analysis_options.yaml | 0 .../dynamite_end_to_end_test/build.yaml | 0 .../lib/all_of.openapi.dart | 0 .../lib/all_of.openapi.g.dart | 0 .../lib/all_of.openapi.json | 0 .../lib/any_of.openapi.dart | 0 .../lib/any_of.openapi.g.dart | 0 .../lib/any_of.openapi.json | 0 .../lib/authentication.openapi.dart | 0 .../lib/authentication.openapi.json | 0 .../lib/deprecation.openapi.dart | 0 .../lib/deprecation.openapi.g.dart | 0 .../lib/deprecation.openapi.json | 0 .../lib/documentation.openapi.dart | 0 .../lib/documentation.openapi.g.dart | 0 .../lib/documentation.openapi.json | 0 .../lib/enum.openapi.dart | 0 .../lib/enum.openapi.g.dart | 0 .../lib/enum.openapi.json | 0 .../lib/headers.openapi.dart | 0 .../lib/headers.openapi.g.dart | 0 .../lib/headers.openapi.json | 0 .../lib/interfaces.openapi.dart | 0 .../lib/interfaces.openapi.g.dart | 0 .../lib/interfaces.openapi.json | 0 .../lib/nested_ofs.openapi.dart | 0 .../lib/nested_ofs.openapi.g.dart | 0 .../lib/nested_ofs.openapi.json | 0 .../lib/one_of.openapi.dart | 0 .../lib/one_of.openapi.g.dart | 0 .../lib/one_of.openapi.json | 0 .../lib/parameters.openapi.dart | 0 .../lib/parameters.openapi.g.dart | 0 .../lib/parameters.openapi.json | 0 .../lib/pattern_check.openapi.dart | 0 .../lib/pattern_check.openapi.g.dart | 0 .../lib/pattern_check.openapi.json | 0 .../lib/request_body.openapi.dart | 0 .../lib/request_body.openapi.g.dart | 0 .../lib/request_body.openapi.json | 0 .../lib/responses.openapi.dart | 0 .../lib/responses.openapi.json | 0 .../lib/some_of.openapi.dart | 0 .../lib/some_of.openapi.g.dart | 0 .../lib/some_of.openapi.json | 0 .../lib/tags.openapi.dart | 0 .../lib/tags.openapi.json | 0 .../lib/type_defs.openapi.dart | 0 .../lib/type_defs.openapi.g.dart | 0 .../lib/type_defs.openapi.json | 0 .../lib/types.openapi.dart | 0 .../lib/types.openapi.g.dart | 0 .../lib/types.openapi.json | 0 .../dynamite_end_to_end_test/pubspec.yaml | 0 .../pubspec_overrides.yaml | 4 +- .../test/all_of_test.dart | 0 .../test/any_of_test.dart | 0 .../test/authentication_test.dart | 0 .../test/enum_test.dart | 0 .../test/interfaces_test.dart | 0 .../test/nested_ofs_test.dart | 0 .../test/one_of_test.dart | 0 .../test/parameters_test.dart | 0 .../test/pattern_check_test.dart | 0 .../test/request_body_test.dart | 0 .../test/some_of_test.dart | 0 .../test/tags_test.dart | 0 .../test/type_defs_test.dart | 0 .../test/types_test.dart | 0 .../dynamite_runtime/CHANGELOG.md | 0 .../packages/dynamite_runtime/LICENSE | 1 + .../{ => packages}/dynamite_runtime/README.md | 2 +- .../dynamite_runtime/analysis_options.yaml | 0 .../dynamite_runtime/example/README.md | 4 +- .../dynamite_runtime/lib/built_value.dart | 0 .../dynamite_runtime/lib/http_client.dart | 0 .../dynamite_runtime/lib/models.dart | 0 .../content_string_serializer.dart | 0 .../src/built_value/double_serializer.dart | 0 .../src/built_value/header_serializer.dart | 0 .../lib/src/client/authentication.dart | 0 .../lib/src/client/client.dart | 0 .../lib/src/client/exception.dart | 0 .../lib/src/client/response.dart | 0 .../lib/src/models/content_string.dart | 0 .../lib/src/models/content_string.g.dart | 0 .../lib/src/models/header.dart | 0 .../lib/src/models/header.g.dart | 0 .../lib/src/utils/codecs.dart | 0 .../lib/src/utils/json_schema_validation.dart | 0 .../lib/src/utils/some_of_validators.dart | 0 .../dynamite_runtime/lib/src/utils/uri.dart | 0 .../dynamite_runtime/lib/utils.dart | 0 .../dynamite_runtime/pubspec.yaml | 2 +- .../dynamite_runtime/pubspec_overrides.yaml | 2 +- .../test/content_string_test.dart | 0 .../test/content_string_test.g.dart | 0 .../test/double_serializer_test.dart | 0 .../dynamite_runtime/test/header_test.dart | 0 .../dynamite_runtime/test/header_test.g.dart | 0 .../test/json_schema_validation_test.dart | 0 .../dynamite_runtime/test/uri_test.dart | 0 packages/dynamite/{dynamite => }/pubspec.yaml | 2 +- .../pubspec_overrides.yaml | 0 .../test/dart_helpers_test.dart | 0 .../{dynamite => }/test/json_schema_test.dart | 0 .../test/openapi_spec_test.dart | 0 .../{dynamite => }/test/type_result_test.dart | 0 packages/file_icons/LICENSE | 1 - packages/neon/neon_dashboard/LICENSE | 1 - packages/neon/neon_files/LICENSE | 1 - .../neon/neon_files/pubspec_overrides.yaml | 18 --- packages/neon/neon_news/LICENSE | 1 - packages/neon/neon_notes/LICENSE | 1 - packages/neon/neon_notifications/LICENSE | 1 - packages/neon/neon_talk/LICENSE | 1 - .../neon/neon_talk/pubspec_overrides.yaml | 18 --- packages/neon_framework/.pubignore | 1 + .../example}/.gitattributes | 0 .../{app => neon_framework/example}/.metadata | 0 packages/neon_framework/example/.pubignore | 1 + .../example}/LICENSE | 0 .../{app => neon_framework/example}/README.md | 8 +- .../example}/analysis_options.yaml | 0 .../example}/android/.gitignore | 0 .../example}/android/app/build.gradle | 0 .../android/app/src/debug/AndroidManifest.xml | 0 .../app/src/debug/res/values/string.xml | 0 .../android/app/src/main/AndroidManifest.xml | 0 .../provokateurin/neon/EmbeddedDistributor.kt | 0 .../de/provokateurin/neon/MainActivity.kt | 0 .../res/drawable-hdpi/android12splash.png | Bin .../app/src/main/res/drawable-hdpi/splash.png | Bin .../res/drawable-mdpi/android12splash.png | Bin .../app/src/main/res/drawable-mdpi/splash.png | Bin .../drawable-night-hdpi/android12splash.png | Bin .../drawable-night-mdpi/android12splash.png | Bin .../res/drawable-night-v21/background.png | Bin .../drawable-night-v21/launch_background.xml | 0 .../drawable-night-xhdpi/android12splash.png | Bin .../drawable-night-xxhdpi/android12splash.png | Bin .../android12splash.png | Bin .../main/res/drawable-night/background.png | Bin .../res/drawable-night/launch_background.xml | 0 .../src/main/res/drawable-v21/background.png | Bin .../res/drawable-v21/launch_background.xml | 0 .../res/drawable-xhdpi/android12splash.png | Bin .../src/main/res/drawable-xhdpi/splash.png | Bin .../res/drawable-xxhdpi/android12splash.png | Bin .../src/main/res/drawable-xxhdpi/splash.png | Bin .../res/drawable-xxxhdpi/android12splash.png | Bin .../src/main/res/drawable-xxxhdpi/splash.png | Bin .../app/src/main/res/drawable/background.png | Bin .../main/res/drawable/launch_background.xml | 0 .../main/res/mipmap-hdpi/dashboard_app.png} | Bin .../src/main/res/mipmap-hdpi/files_app.png} | Bin .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-hdpi/news_app.png} | Bin .../src/main/res/mipmap-hdpi/notes_app.png} | Bin .../res/mipmap-hdpi/notifications_app.png} | Bin .../src/main/res/mipmap-hdpi/talk_app.png} | Bin .../main/res/mipmap-mdpi/dashboard_app.png} | Bin .../src/main/res/mipmap-mdpi/files_app.png} | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/news_app.png} | Bin .../src/main/res/mipmap-mdpi/notes_app.png} | Bin .../res/mipmap-mdpi/notifications_app.png} | Bin .../src/main/res/mipmap-mdpi/talk_app.png} | Bin .../main/res/mipmap-xhdpi/dashboard_app.png} | Bin .../src/main/res/mipmap-xhdpi/files_app.png} | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/news_app.png} | Bin .../src/main/res/mipmap-xhdpi/notes_app.png} | Bin .../res/mipmap-xhdpi/notifications_app.png} | Bin .../src/main/res/mipmap-xhdpi/talk_app.png} | Bin .../main/res/mipmap-xxhdpi/dashboard_app.png} | Bin .../src/main/res/mipmap-xxhdpi/files_app.png} | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xxhdpi/news_app.png} | Bin .../src/main/res/mipmap-xxhdpi/notes_app.png} | Bin .../res/mipmap-xxhdpi/notifications_app.png} | Bin .../src/main/res/mipmap-xxhdpi/talk_app.png} | Bin .../res/mipmap-xxxhdpi/dashboard_app.png} | Bin .../main/res/mipmap-xxxhdpi/files_app.png} | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xxxhdpi/news_app.png} | Bin .../main/res/mipmap-xxxhdpi/notes_app.png} | Bin .../res/mipmap-xxxhdpi/notifications_app.png} | Bin .../src/main/res/mipmap-xxxhdpi/talk_app.png} | Bin .../android/app/src/main/res/raw/keep.xml | 2 +- .../src/main/res/values-night-v31/styles.xml | 0 .../app/src/main/res/values-night/styles.xml | 0 .../app/src/main/res/values-v31/styles.xml | 0 .../app/src/main/res/values/string.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../app/src/profile/AndroidManifest.xml | 0 .../example}/android/build.gradle | 0 .../example}/android/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 .../example}/android/settings.gradle | 0 .../example}/assets/logo.svg | 0 .../example}/assets/logo.svg.vec | Bin .../example}/de.provokateurin.neon.desktop | 0 .../example}/de.provokateurin.neon.yaml | 0 .../example}/flutter_native_splash.yaml | 0 .../example}/img/splash_icon.png | Bin .../example}/img/splash_icon_android_12.png | Bin .../example}/lib/apps.dart | 12 +- .../example}/lib/branding.dart | 0 .../example}/lib/main.dart | 4 +- .../example}/linux/.gitignore | 0 .../example}/linux/CMakeLists.txt | 0 .../example}/linux/flutter/CMakeLists.txt | 0 .../flutter/generated_plugin_registrant.cc | 0 .../flutter/generated_plugin_registrant.h | 0 .../linux/flutter/generated_plugins.cmake | 0 .../example}/linux/main.cc | 0 .../example}/linux/my_application.cc | 0 .../example}/linux/my_application.h | 0 .../example}/pubspec.lock | 104 +++++++++--------- .../example}/pubspec.yaml | 30 ++--- .../example/pubspec_overrides.yaml | 30 +++++ .../example}/screenshots/files_actions.png | Bin .../example}/screenshots/files_create.png | Bin .../example}/screenshots/files_details.png | Bin .../example}/screenshots/files_photos.png | Bin .../example}/screenshots/files_root.png | Bin .../example}/screenshots/home_drawer.png | Bin .../screenshots/login_server_selection.png | Bin .../news_articles_starred_list.png | Bin .../screenshots/news_articles_unread_list.png | Bin .../example}/screenshots/news_feed_add.png | Bin .../screenshots/news_feed_articles_list.png | Bin .../example}/screenshots/news_feeds_list.png | Bin .../screenshots/news_folders_list.png | Bin .../screenshots/notes_categories_list.png | Bin .../screenshots/notes_note_create.png | Bin .../example}/screenshots/notes_note_edit.png | Bin .../screenshots/notes_note_preview.png | Bin .../example}/screenshots/notes_notes_list.png | Bin .../screenshots/notifications_list.png | Bin .../example}/screenshots/settings_account.png | Bin .../screenshots/settings_accounts.png | Bin .../screenshots/settings_app_files.png | Bin .../screenshots/settings_app_news.png | Bin .../screenshots/settings_app_notes.png | Bin .../example}/screenshots/settings_dark.png | Bin .../example}/screenshots/settings_light.png | Bin .../example}/screenshots/settings_oled.png | Bin .../example}/web/favicon.png | Bin .../example}/web/flutter_bootstrap.js | 0 .../example}/web/icons/Icon-192.png | Bin .../example}/web/icons/Icon-512.png | Bin .../example}/web/index.html | 0 .../example}/web/manifest.json | 0 .../example}/web/splash/img/dark-1x.png | Bin .../example}/web/splash/img/dark-2x.png | Bin .../example}/web/splash/img/dark-3x.png | Bin .../example}/web/splash/img/dark-4x.png | Bin .../example}/web/splash/img/light-1x.png | Bin .../example}/web/splash/img/light-2x.png | Bin .../example}/web/splash/img/light-3x.png | Bin .../example}/web/splash/img/light-4x.png | Bin .../example}/web/sqflite_sw.js | 0 .../example}/web/sqlite3.wasm | Bin packages/neon_framework/lib/src/app.dart | 6 +- .../lib/src/models/app_implementation.dart | 2 +- .../lib/src/utils/push_utils.dart | 2 +- .../packages/dashboard_app}/.metadata | 0 .../packages/dashboard_app/LICENSE | 1 + .../dashboard_app}/analysis_options.yaml | 0 .../dashboard_app}/assets/app.svg.vec | Bin .../packages/dashboard_app}/build.yaml | 0 .../packages/dashboard_app}/l10n.yaml | 0 .../dashboard_app/lib/dashboard_app.dart} | 10 +- .../packages/dashboard_app}/lib/l10n/en.arb | 0 .../lib/l10n/localizations.dart | 0 .../lib/l10n/localizations_en.dart | 0 .../lib/src/blocs/dashboard.dart | 0 .../dashboard_app}/lib/src/options.dart | 0 .../dashboard_app}/lib/src/pages/main.dart | 14 +-- .../dashboard_app}/lib/src/routes.dart | 2 +- .../dashboard_app}/lib/src/routes.g.dart | 0 .../lib/src/widgets/dry_intrinsic_height.dart | 0 .../widgets/set_weather_location_dialog.dart | 2 +- .../lib/src/widgets/widget.dart | 2 +- .../lib/src/widgets/widget_button.dart | 0 .../lib/src/widgets/widget_item.dart | 0 .../packages/dashboard_app}/pubspec.yaml | 2 +- .../dashboard_app}/pubspec_overrides.yaml | 14 +-- .../dashboard_app}/test/bloc_test.dart | 2 +- .../dashboard_app}/test/goldens/widget.png | Bin .../test/goldens/widget_button_invalid.png | Bin .../test/goldens/widget_button_more.png | Bin .../test/goldens/widget_button_new.png | Bin .../test/goldens/widget_button_setup.png | Bin .../test/goldens/widget_item.png | Bin .../test/goldens/widget_item_not_round.png | Bin .../test/goldens/widget_not_round.png | Bin .../test/goldens/widget_with_empty.png | Bin .../widget_with_empty_and_half_empty.png | Bin .../test/goldens/widget_with_half_empty.png | Bin .../goldens/widget_with_multiple_buttons.png | Bin .../test/goldens/widget_without_buttons.png | Bin .../test/goldens/widget_without_items.png | Bin .../set_weather_location_dialog_test.dart | 4 +- .../dashboard_app}/test/widget_test.dart | 10 +- .../packages/files_app}/.metadata | 0 .../neon_framework/packages/files_app/LICENSE | 1 + .../packages/files_app}/analysis_options.yaml | 0 .../packages/files_app}/assets/app.svg.vec | Bin .../packages/files_app}/build.yaml | 0 .../packages/files_app}/l10n.yaml | 0 .../packages/files_app/lib/files_app.dart} | 10 +- .../packages/files_app}/lib/l10n/en.arb | 0 .../files_app}/lib/l10n/localizations.dart | 0 .../files_app}/lib/l10n/localizations_en.dart | 0 .../files_app}/lib/src/blocs/browser.dart | 2 +- .../files_app}/lib/src/blocs/files.dart | 8 +- .../lib/src/models/file_details.dart | 2 +- .../packages/files_app}/lib/src/options.dart | 2 +- .../files_app}/lib/src/pages/details.dart | 8 +- .../files_app}/lib/src/pages/main.dart | 8 +- .../packages/files_app}/lib/src/routes.dart | 2 +- .../packages/files_app}/lib/src/routes.g.dart | 0 .../files_app}/lib/src/sort/files.dart | 2 +- .../files_app}/lib/src/utils/dialog.dart | 10 +- .../files_app}/lib/src/utils/task.dart | 0 .../files_app}/lib/src/widgets/actions.dart | 10 +- .../lib/src/widgets/browser_view.dart | 16 +-- .../files_app}/lib/src/widgets/dialog.dart | 12 +- .../lib/src/widgets/file_list_tile.dart | 16 +-- .../lib/src/widgets/file_preview.dart | 8 +- .../files_app}/lib/src/widgets/navigator.dart | 4 +- .../packages/files_app}/pubspec.yaml | 8 +- .../packages/files_app/pubspec_overrides.yaml | 18 +++ .../packages/files_icons}/.metadata | 0 .../packages/files_icons/LICENSE | 1 + .../packages/files_icons}/README.md | 2 +- .../files_icons}/analysis_options.yaml | 4 + .../packages/files_icons}/assets/seti.ttf | Bin .../files_icons/bin/files_icons.dart} | 6 +- .../files_icons/lib/files_icons.dart} | 2 +- .../packages/files_icons}/lib/src/data.dart | 4 +- .../packages/files_icons}/lib/src/meta.dart | 0 .../packages/files_icons}/pubspec.yaml | 2 +- .../files_icons}/pubspec_overrides.yaml | 2 +- .../packages/neon_http_client/LICENSE | 1 + .../neon_http_client/analysis_options.yaml | 6 + .../packages}/neon_http_client/dart_test.yaml | 0 .../lib/neon_http_client.dart | 0 .../interceptors/base_header_interceptor.dart | 0 .../src/interceptors/cookie_interceptor.dart | 0 .../src/interceptors/csrf_interceptor.dart | 0 .../src/interceptors/http_interceptor.dart | 0 .../lib/src/interceptors/interceptors.dart | 0 .../lib/src/neon_http_client.dart | 0 .../lib/src/utils/defaults.dart | 0 .../lib/src/utils/future_timeout.dart | 0 .../neon_http_client/lib/src/utils/utils.dart | 0 .../packages}/neon_http_client/pubspec.yaml | 0 .../neon_http_client/pubspec_overrides.yaml | 8 +- .../test/client_conformance_test.dart | 0 .../base_header_interceptor_test.dart | 0 .../interceptors/cookie_interceptor_test.dart | 0 .../interceptors/csrf_interceptor_test.dart | 0 .../interceptors/http_interceptor_test.dart | 0 .../test/neon_http_client_test.dart | 0 .../test/utils/future_timeout_test.dart | 0 .../packages/news_app}/.metadata | 0 .../neon_framework/packages/news_app/LICENSE | 1 + .../packages/news_app}/analysis_options.yaml | 0 .../packages/news_app}/assets/app.svg.vec | Bin .../packages/news_app}/build.yaml | 0 .../packages/news_app}/l10n.yaml | 0 .../packages/news_app}/lib/l10n/en.arb | 0 .../news_app}/lib/l10n/localizations.dart | 0 .../news_app}/lib/l10n/localizations_en.dart | 0 .../packages/news_app/lib/news_app.dart} | 10 +- .../news_app}/lib/src/blocs/article.dart | 2 +- .../news_app}/lib/src/blocs/articles.dart | 4 +- .../news_app}/lib/src/blocs/news.dart | 4 +- .../packages/news_app}/lib/src/options.dart | 4 +- .../news_app}/lib/src/pages/article.dart | 8 +- .../news_app}/lib/src/pages/feed.dart | 8 +- .../news_app}/lib/src/pages/folder.dart | 6 +- .../news_app}/lib/src/pages/main.dart | 16 +-- .../packages/news_app}/lib/src/routes.dart | 2 +- .../packages/news_app}/lib/src/routes.g.dart | 0 .../news_app}/lib/src/sort/articles.dart | 2 +- .../news_app}/lib/src/sort/feeds.dart | 2 +- .../news_app}/lib/src/sort/folders.dart | 2 +- .../news_app}/lib/src/utils/dialog.dart | 4 +- .../lib/src/widgets/articles_view.dart | 16 +-- .../news_app}/lib/src/widgets/dialog.dart | 6 +- .../widgets/feed_floating_action_button.dart | 6 +- .../news_app}/lib/src/widgets/feed_icon.dart | 0 .../news_app}/lib/src/widgets/feeds_view.dart | 16 +-- .../folder_floating_action_button.dart | 6 +- .../lib/src/widgets/folder_select.dart | 2 +- .../lib/src/widgets/folder_view.dart | 10 +- .../lib/src/widgets/folders_view.dart | 12 +- .../packages/news_app}/pubspec.yaml | 2 +- .../packages/news_app}/pubspec_overrides.yaml | 14 +-- .../packages/notes_app}/.metadata | 0 .../neon_framework/packages/notes_app/LICENSE | 1 + .../packages/notes_app}/analysis_options.yaml | 0 .../packages/notes_app}/assets/app.svg.vec | Bin .../packages/notes_app}/build.yaml | 0 .../packages/notes_app}/l10n.yaml | 0 .../packages/notes_app}/lib/l10n/en.arb | 0 .../notes_app}/lib/l10n/localizations.dart | 0 .../notes_app}/lib/l10n/localizations_en.dart | 0 .../packages/notes_app/lib/notes_app.dart} | 10 +- .../notes_app}/lib/src/blocs/note.dart | 2 +- .../notes_app}/lib/src/blocs/notes.dart | 0 .../packages/notes_app}/lib/src/options.dart | 2 +- .../notes_app}/lib/src/pages/category.dart | 10 +- .../notes_app}/lib/src/pages/main.dart | 14 +-- .../notes_app}/lib/src/pages/note.dart | 14 +-- .../packages/notes_app}/lib/src/routes.dart | 2 +- .../packages/notes_app}/lib/src/routes.g.dart | 0 .../notes_app}/lib/src/sort/categories.dart | 2 +- .../notes_app}/lib/src/sort/notes.dart | 2 +- .../lib/src/utils/category_color.dart | 0 .../lib/src/utils/exception_handler.dart | 2 +- .../lib/src/widgets/categories_view.dart | 12 +- .../lib/src/widgets/category_select.dart | 4 +- .../notes_app}/lib/src/widgets/dialog.dart | 6 +- .../widgets/notes_floating_action_button.dart | 6 +- .../lib/src/widgets/notes_view.dart | 14 +-- .../packages/notes_app}/pubspec.yaml | 2 +- .../notes_app}/pubspec_overrides.yaml | 14 +-- .../packages/notifications_app}/.metadata | 0 .../packages/notifications_app/LICENSE | 1 + .../notifications_app}/analysis_options.yaml | 0 .../notifications_app}/assets/app.svg.vec | Bin .../packages/notifications_app}/build.yaml | 0 .../packages/notifications_app}/l10n.yaml | 0 .../notifications_app}/lib/l10n/en.arb | 0 .../lib/l10n/localizations.dart | 0 .../lib/l10n/localizations_en.dart | 0 .../lib/notifications_app.dart} | 10 +- .../lib/src/blocs/notifications.dart | 0 .../notifications_app}/lib/src/options.dart | 0 .../lib/src/pages/main.dart | 6 +- .../notifications_app}/lib/src/routes.dart | 2 +- .../notifications_app}/lib/src/routes.g.dart | 0 .../lib/src/widgets/action.dart | 0 .../lib/src/widgets/notification.dart | 2 +- .../packages/notifications_app}/pubspec.yaml | 2 +- .../notifications_app}/pubspec_overrides.yaml | 14 +-- .../notifications_app}/test/action_test.dart | 2 +- .../notifications_app}/test/bloc_test.dart | 2 +- .../test/goldens/action_primary.png | Bin .../test/goldens/action_secondary.png | Bin .../test/goldens/main_page_error.png | Bin .../goldens/main_page_with_notifications.png | Bin .../main_page_without_notifications.png | Bin .../test/goldens/notification.png | Bin .../test/main_page_test.dart | 8 +- .../test/notification_test.dart | 6 +- .../notifications_app}/test/testing.dart | 2 +- .../neon_framework/packages/sort_box/LICENSE | 1 + .../packages}/sort_box/README.md | 0 .../packages/sort_box/analysis_options.yaml | 5 + .../packages}/sort_box/lib/sort_box.dart | 0 .../packages}/sort_box/lib/src/sort_box.dart | 0 .../packages}/sort_box/pubspec.yaml | 0 .../packages/sort_box}/pubspec_overrides.yaml | 2 +- .../sort_box/test/sort_box_test.dart | 0 .../packages/talk_app}/.metadata | 0 .../neon_framework/packages/talk_app/LICENSE | 1 + .../packages/talk_app}/analysis_options.yaml | 0 .../packages/talk_app}/assets/app.svg.vec | Bin .../packages/talk_app}/build.yaml | 0 .../packages/talk_app}/l10n.yaml | 0 .../packages/talk_app}/lib/l10n/en.arb | 0 .../talk_app}/lib/l10n/localizations.dart | 0 .../talk_app}/lib/l10n/localizations_en.dart | 0 .../talk_app}/lib/src/blocs/message_bloc.dart | 0 .../talk_app}/lib/src/blocs/room.dart | 4 +- .../talk_app}/lib/src/blocs/talk.dart | 0 .../lib/src/dialogs/create_room.dart | 2 +- .../packages/talk_app}/lib/src/options.dart | 0 .../talk_app}/lib/src/pages/main.dart | 20 ++-- .../talk_app}/lib/src/pages/room.dart | 12 +- .../packages/talk_app}/lib/src/routes.dart | 2 +- .../packages/talk_app}/lib/src/routes.g.dart | 0 .../packages/talk_app}/lib/src/theme.dart | 0 .../talk_app}/lib/src/utils/helpers.dart | 0 .../lib/src/widgets/actor_avatar.dart | 0 .../talk_app}/lib/src/widgets/message.dart | 24 ++-- .../lib/src/widgets/message_input.dart | 6 +- .../talk_app}/lib/src/widgets/reactions.dart | 4 +- .../lib/src/widgets/read_indicator.dart | 0 .../lib/src/widgets/reference_preview.dart | 0 .../src/widgets/rich_object/deck_card.dart | 0 .../lib/src/widgets/rich_object/fallback.dart | 0 .../lib/src/widgets/rich_object/file.dart | 4 +- .../src/widgets/rich_object/file_preview.dart | 0 .../lib/src/widgets/rich_object/mention.dart | 0 .../lib/src/widgets/room_avatar.dart | 0 .../lib/src/widgets/unread_indicator.dart | 0 .../packages/talk_app/lib/talk_app.dart} | 12 +- .../packages/talk_app}/pubspec.yaml | 6 +- .../packages/talk_app/pubspec_overrides.yaml | 18 +++ .../talk_app}/test/actor_avatar_test.dart | 2 +- .../packages/talk_app}/test/bloc_test.dart | 2 +- .../test/create_room_dialog_test.dart | 6 +- .../test/goldens/main_page_error.png | Bin ...h_message_preview_with_unread_messages.png | Bin ..._preview_without_unread_messages_other.png | Bin ...e_preview_without_unread_messages_self.png | Bin .../main_page_without_message_preview.png | Bin .../message_comment_message_as_parent.png | Bin .../message_comment_message_deleted.png | Bin .../goldens/message_comment_message_other.png | Bin .../goldens/message_comment_message_self.png | Bin ...message_comment_message_separate_actor.png | Bin ...essage_comment_message_separate_edited.png | Bin ...omment_message_separate_system_message.png | Bin .../message_comment_message_separate_time.png | Bin .../message_comment_message_with_parent.png | Bin ...essage_comment_message_with_references.png | Bin .../test/goldens/message_input_edit.png | Bin .../test/goldens/message_input_emoji.png | Bin .../message_input_mention_suggestions.png | Bin .../test/goldens/message_input_multiline.png | Bin .../goldens/message_input_no_emoji_button.png | Bin .../test/goldens/message_input_reply.png | Bin .../test/goldens/message_parent_message.png | Bin .../message_system_message_grouping.png | Bin .../goldens/message_system_message_show.png | Bin .../talk_app}/test/goldens/reactions.png | Bin .../test/goldens/reference_preview.png | Bin .../reference_preview_with_description.png | Bin .../goldens/reference_preview_with_thumb.png | Bin .../test/goldens/rich_object_deck_card.png | Bin .../rich_object_fallback_with_icon.png | Bin .../rich_object_fallback_without_icon.png | Bin .../rich_object_file_without_preview.png | Bin .../test/goldens/rich_object_mention_call.png | Bin .../rich_object_mention_group_highlight.png | Bin .../rich_object_mention_group_other.png | Bin .../goldens/rich_object_mention_guest.png | Bin ...ch_object_mention_user-group_highlight.png | Bin .../rich_object_mention_user-group_other.png | Bin .../rich_object_mention_user_highlight.png | Bin .../rich_object_mention_user_other.png | Bin .../test/goldens/room_page_error.png | Bin .../test/goldens/room_page_messages.png | Bin .../test/goldens/room_page_read_only.png | Bin .../unread_indicator_unread_mention.png | Bin ...unread_indicator_unread_mention_direct.png | Bin .../unread_indicator_unread_messages.png | Bin ..._indicator_unread_single_user_messages.png | Bin .../talk_app}/test/main_page_test.dart | 16 +-- .../talk_app}/test/message_bloc_test.dart | 2 +- .../talk_app}/test/message_input_test.dart | 8 +- .../packages/talk_app}/test/message_test.dart | 24 ++-- .../talk_app}/test/reactions_test.dart | 6 +- .../talk_app}/test/read_indicator_test.dart | 2 +- .../test/reference_preview_test.dart | 2 +- .../talk_app}/test/rich_object_test.dart | 12 +- .../talk_app}/test/room_avatar_test.dart | 2 +- .../talk_app}/test/room_bloc_test.dart | 4 +- .../talk_app}/test/room_page_test.dart | 10 +- .../packages/talk_app}/test/testing.dart | 4 +- .../talk_app}/test/unread_indicator_test.dart | 2 +- packages/neon_framework/pubspec.yaml | 2 +- .../neon_framework/pubspec_overrides.yaml | 8 +- packages/neon_http_client/LICENSE | 1 - packages/nextcloud/.pubignore | 6 +- packages/nextcloud/doc/development.md | 2 +- .../nextcloud/packages/nextcloud_test/LICENSE | 1 + .../packages}/nextcloud_test/README.md | 0 .../nextcloud_test}/analysis_options.yaml | 0 .../nextcloud_test/bin/generate_presets.dart | 0 .../nextcloud_test/docker/Dockerfile | 0 .../Bauernbrot mit Sauerteig/recipe.json | 0 .../Recipes/Blaubeer Cluster/recipe.json | 0 .../Chantal's New York Cheesecake/recipe.json | 0 .../Recipes/Chef John's Gazpacho/recipe.json | 0 .../Chili sin Carne mit Jackfruit/recipe.json | 0 .../Easy Heart-Shaped Cake/recipe.json | 0 .../recipe.json" | 0 .../Recipes/Gelber Smoothie/recipe.json | 0 .../recipe.json | 0 .../recipe.json" | 0 .../docker/assets/Recipes/Readme.md | 0 .../Recipe Without an image/recipe.json | 0 .../recipe.json | 0 .../recipe.json | 0 .../recipe.json" | 0 .../Sommerlicher Himbeerkuchen/recipe.json | 0 .../recipe.json | 0 .../Recipes/The Best Baked Ziti/recipe.json | 0 .../assets/Recipes/Vegi-Tortillas/recipe.json | 0 .../docker/assets/Recipes/problem/recipe.json | 0 .../packages}/nextcloud_test/docker/local.sh | 0 .../packages}/nextcloud_test/docker/post.sh | 0 .../packages}/nextcloud_test/docker/pre.sh | 0 .../docker/presets/cookbook/0.11 | 0 .../docker/presets/drop_account/2.4 | 0 .../docker/presets/drop_account/2.5 | 0 .../docker/presets/drop_account/2.6 | 0 .../nextcloud_test/docker/presets/latest | 0 .../nextcloud_test/docker/presets/news/25.0 | 0 .../nextcloud_test/docker/presets/notes/4.10 | 0 .../nextcloud_test/docker/presets/notes/4.8 | 0 .../nextcloud_test/docker/presets/notes/4.9 | 0 .../nextcloud_test/docker/presets/server/28.0 | 0 .../nextcloud_test/docker/presets/server/29.0 | 0 .../nextcloud_test/docker/presets/spreed/18.0 | 0 .../nextcloud_test/docker/presets/spreed/19.0 | 0 .../nextcloud_test/docker/presets/tables/0.6 | 0 .../nextcloud_test/docker/presets/tables/0.7 | 0 .../nextcloud_test/docker/presets/tables/0.8 | 0 .../nextcloud_test/docker/presets/uppush/1.4 | 0 .../nextcloud_test/docker/static/nasa.xml | 0 .../nextcloud_test/docker/static/recipe.html | 0 .../docker/static/wikipedia.xml | 0 .../nextcloud_test/lib/nextcloud_test.dart | 0 .../packages}/nextcloud_test/lib/src/app.dart | 0 .../nextcloud_test/lib/src/fixtures.dart | 0 .../nextcloud_test/lib/src/models/models.dart | 0 .../lib/src/models/nextcloud_tester.dart | 0 .../nextcloud_test/lib/src/models/preset.dart | 0 .../nextcloud_test/lib/src/presets.dart | 0 .../lib/src/proxy_http_client.dart | 0 .../lib/src/test_target/docker_container.dart | 2 +- .../lib/src/test_target/local.dart | 0 .../lib/src/test_target/test_target.dart | 0 .../packages}/nextcloud_test/pubspec.yaml | 0 .../nextcloud_test/pubspec_overrides.yaml | 10 +- packages/nextcloud/pubspec.yaml | 2 +- packages/nextcloud/pubspec_overrides.yaml | 8 +- packages/nextcloud_test/LICENSE | 1 - packages/nextcloud_test/analysis_options.yaml | 1 - packages/sort_box/LICENSE | 1 - packages/sort_box/analysis_options.yaml | 1 - tool/build-app.sh | 4 +- tool/build-dev-container.sh | 4 +- tool/build/linux.sh | 2 +- tool/common.sh | 2 +- tool/dev.sh | 2 +- tool/find-untested-neon-apis.sh | 4 +- tool/generate-assets.sh | 14 +-- tool/generate-dynamite-e2e-test.sh | 2 +- tool/generate-dynamite-petstore-example.sh | 4 +- tool/generate-file-icons.sh | 2 +- tool/generate-nextcloud-test-presets.sh | 2 +- 781 files changed, 693 insertions(+), 677 deletions(-) delete mode 100644 packages/app/pubspec_overrides.yaml create mode 120000 packages/cookie_store/packages/cookie_store_conformance_tests/LICENSE rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/analysis_options.yaml (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/cookie_store_conformance_tests.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/src/deletion_tests.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/src/domain_matching_tests.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/src/expiration_tests.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/src/http_only_cookie_tests.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/src/path_matching_tests.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/src/persist_cookies_tests.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/src/secure_cookie_tests.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/src/sorting_tests.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/lib/src/utils.dart (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/pubspec.yaml (100%) rename packages/{ => cookie_store/packages}/cookie_store_conformance_tests/pubspec_overrides.yaml (69%) delete mode 120000 packages/cookie_store_conformance_tests/LICENSE create mode 100644 packages/dynamite/.pubignore rename packages/dynamite/{dynamite => }/CHANGELOG.md (100%) rename packages/{app => dynamite}/LICENSE (100%) rename packages/dynamite/{dynamite => }/README.md (96%) rename packages/dynamite/{dynamite => }/analysis_options.yaml (100%) rename packages/dynamite/{dynamite => }/build.yaml (100%) delete mode 100644 packages/dynamite/dynamite/example/README.md delete mode 120000 packages/dynamite/dynamite_runtime/LICENSE rename packages/dynamite/{dynamite => example}/LICENSE (100%) create mode 100644 packages/dynamite/example/README.md rename packages/dynamite/{dynamite => }/example/analysis_options.yaml (100%) rename packages/dynamite/{dynamite => }/example/build.yaml (100%) rename packages/dynamite/{dynamite => }/example/lib/petstore.openapi.dart (100%) rename packages/dynamite/{dynamite => }/example/lib/petstore.openapi.g.dart (100%) rename packages/dynamite/{dynamite => }/example/lib/petstore.openapi.json (100%) rename packages/dynamite/{dynamite => }/example/pubspec.yaml (100%) rename packages/dynamite/{dynamite_end_to_end_test => example}/pubspec_overrides.yaml (76%) rename packages/dynamite/{dynamite => }/lib/builder.dart (100%) rename packages/dynamite/{dynamite => }/lib/dynamite.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/client.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/generate_ofs.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/generate_schemas.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/resolve_enum.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/resolve_interface.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/resolve_mime_type.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/resolve_object.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/resolve_ofs.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/resolve_type.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/serializer.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/builder/state.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/helpers/built_value.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/helpers/dart_helpers.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/helpers/default_value.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/helpers/docs.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/helpers/dynamite.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/helpers/logger.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/helpers/pattern_check.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/helpers/version_checker.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/config.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/dynamite_config/config.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/dynamite_config/config.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/exceptions.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/json_schema.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/json_schema.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/json_schema/annotations.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/json_schema/schema.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/json_schema/schema.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/json_schema/type_result.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/json_schema/validators.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/components.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/components.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/contact.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/contact.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/discriminator.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/discriminator.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/header.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/header.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/info.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/info.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/license.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/license.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/media_type.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/media_type.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/open_api.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/open_api.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/operation.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/operation.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/parameter.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/parameter.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/path_item.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/path_item.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/request_body.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/request_body.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/response.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/response.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/security_scheme.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/security_scheme.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/server.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/server.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/server_variable.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/server_variable.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/tag.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/openapi/tag.g.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/type_result.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/type_result/base.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/type_result/enum.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/type_result/list.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/type_result/map.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/type_result/object.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/type_result/some_of.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/models/type_result/type_result.dart (100%) rename packages/dynamite/{dynamite => }/lib/src/openapi_builder.dart (100%) rename packages/dynamite/{dynamite/example => packages/dynamite_end_to_end_test}/LICENSE (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/README.md (63%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/analysis_options.yaml (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/build.yaml (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/all_of.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/all_of.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/all_of.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/any_of.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/any_of.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/any_of.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/authentication.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/authentication.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/deprecation.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/deprecation.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/deprecation.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/documentation.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/documentation.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/documentation.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/enum.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/enum.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/enum.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/headers.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/headers.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/headers.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/interfaces.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/interfaces.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/interfaces.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/nested_ofs.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/nested_ofs.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/one_of.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/one_of.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/one_of.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/parameters.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/parameters.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/parameters.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/pattern_check.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/pattern_check.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/pattern_check.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/request_body.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/request_body.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/request_body.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/responses.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/responses.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/some_of.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/some_of.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/some_of.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/tags.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/tags.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/type_defs.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/type_defs.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/type_defs.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/types.openapi.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/types.openapi.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/lib/types.openapi.json (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/pubspec.yaml (100%) rename packages/dynamite/{dynamite/example => packages/dynamite_end_to_end_test}/pubspec_overrides.yaml (78%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/all_of_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/any_of_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/authentication_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/enum_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/interfaces_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/nested_ofs_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/one_of_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/parameters_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/pattern_check_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/request_body_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/some_of_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/tags_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/type_defs_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_end_to_end_test/test/types_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/CHANGELOG.md (100%) create mode 120000 packages/dynamite/packages/dynamite_runtime/LICENSE rename packages/dynamite/{ => packages}/dynamite_runtime/README.md (95%) rename packages/dynamite/{ => packages}/dynamite_runtime/analysis_options.yaml (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/example/README.md (54%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/built_value.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/http_client.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/models.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/built_value/content_string_serializer.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/built_value/double_serializer.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/built_value/header_serializer.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/client/authentication.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/client/client.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/client/exception.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/client/response.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/models/content_string.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/models/content_string.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/models/header.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/models/header.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/utils/codecs.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/utils/json_schema_validation.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/utils/some_of_validators.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/src/utils/uri.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/lib/utils.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/pubspec.yaml (95%) rename packages/dynamite/{ => packages}/dynamite_runtime/pubspec_overrides.yaml (73%) rename packages/dynamite/{ => packages}/dynamite_runtime/test/content_string_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/test/content_string_test.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/test/double_serializer_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/test/header_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/test/header_test.g.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/test/json_schema_validation_test.dart (100%) rename packages/dynamite/{ => packages}/dynamite_runtime/test/uri_test.dart (100%) rename packages/dynamite/{dynamite => }/pubspec.yaml (97%) rename packages/{file_icons => dynamite}/pubspec_overrides.yaml (100%) rename packages/dynamite/{dynamite => }/test/dart_helpers_test.dart (100%) rename packages/dynamite/{dynamite => }/test/json_schema_test.dart (100%) rename packages/dynamite/{dynamite => }/test/openapi_spec_test.dart (100%) rename packages/dynamite/{dynamite => }/test/type_result_test.dart (100%) delete mode 120000 packages/file_icons/LICENSE delete mode 120000 packages/neon/neon_dashboard/LICENSE delete mode 120000 packages/neon/neon_files/LICENSE delete mode 100644 packages/neon/neon_files/pubspec_overrides.yaml delete mode 120000 packages/neon/neon_news/LICENSE delete mode 120000 packages/neon/neon_notes/LICENSE delete mode 120000 packages/neon/neon_notifications/LICENSE delete mode 120000 packages/neon/neon_talk/LICENSE delete mode 100644 packages/neon/neon_talk/pubspec_overrides.yaml create mode 100644 packages/neon_framework/.pubignore rename packages/{app => neon_framework/example}/.gitattributes (100%) rename packages/{app => neon_framework/example}/.metadata (100%) create mode 100644 packages/neon_framework/example/.pubignore rename packages/{dynamite/dynamite_end_to_end_test => neon_framework/example}/LICENSE (100%) rename packages/{app => neon_framework/example}/README.md (52%) rename packages/{app => neon_framework/example}/analysis_options.yaml (100%) rename packages/{app => neon_framework/example}/android/.gitignore (100%) rename packages/{app => neon_framework/example}/android/app/build.gradle (100%) rename packages/{app => neon_framework/example}/android/app/src/debug/AndroidManifest.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/debug/res/values/string.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/main/AndroidManifest.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/main/kotlin/de/provokateurin/neon/EmbeddedDistributor.kt (100%) rename packages/{app => neon_framework/example}/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-hdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-hdpi/splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-mdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-mdpi/splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-night-hdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-night-mdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-night-v21/background.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-night-v21/launch_background.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-night-xhdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-night/background.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-night/launch_background.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-v21/background.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-v21/launch_background.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-xhdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-xhdpi/splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-xxhdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-xxhdpi/splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-xxxhdpi/android12splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable-xxxhdpi/splash.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable/background.png (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/drawable/launch_background.xml (100%) rename packages/{app/android/app/src/main/res/mipmap-hdpi/app_dashboard.png => neon_framework/example/android/app/src/main/res/mipmap-hdpi/dashboard_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-hdpi/app_files.png => neon_framework/example/android/app/src/main/res/mipmap-hdpi/files_app.png} (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename packages/{app/android/app/src/main/res/mipmap-hdpi/app_news.png => neon_framework/example/android/app/src/main/res/mipmap-hdpi/news_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-hdpi/app_notes.png => neon_framework/example/android/app/src/main/res/mipmap-hdpi/notes_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-hdpi/app_notifications.png => neon_framework/example/android/app/src/main/res/mipmap-hdpi/notifications_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-hdpi/app_talk.png => neon_framework/example/android/app/src/main/res/mipmap-hdpi/talk_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-mdpi/app_dashboard.png => neon_framework/example/android/app/src/main/res/mipmap-mdpi/dashboard_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-mdpi/app_files.png => neon_framework/example/android/app/src/main/res/mipmap-mdpi/files_app.png} (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename packages/{app/android/app/src/main/res/mipmap-mdpi/app_news.png => neon_framework/example/android/app/src/main/res/mipmap-mdpi/news_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-mdpi/app_notes.png => neon_framework/example/android/app/src/main/res/mipmap-mdpi/notes_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-mdpi/app_notifications.png => neon_framework/example/android/app/src/main/res/mipmap-mdpi/notifications_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-mdpi/app_talk.png => neon_framework/example/android/app/src/main/res/mipmap-mdpi/talk_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xhdpi/app_dashboard.png => neon_framework/example/android/app/src/main/res/mipmap-xhdpi/dashboard_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xhdpi/app_files.png => neon_framework/example/android/app/src/main/res/mipmap-xhdpi/files_app.png} (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename packages/{app/android/app/src/main/res/mipmap-xhdpi/app_news.png => neon_framework/example/android/app/src/main/res/mipmap-xhdpi/news_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xhdpi/app_notes.png => neon_framework/example/android/app/src/main/res/mipmap-xhdpi/notes_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xhdpi/app_notifications.png => neon_framework/example/android/app/src/main/res/mipmap-xhdpi/notifications_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xhdpi/app_talk.png => neon_framework/example/android/app/src/main/res/mipmap-xhdpi/talk_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxhdpi/app_dashboard.png => neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/dashboard_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxhdpi/app_files.png => neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/files_app.png} (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename packages/{app/android/app/src/main/res/mipmap-xxhdpi/app_news.png => neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/news_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxhdpi/app_notes.png => neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/notes_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxhdpi/app_notifications.png => neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/notifications_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxhdpi/app_talk.png => neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/talk_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxxhdpi/app_dashboard.png => neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/dashboard_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxxhdpi/app_files.png => neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/files_app.png} (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename packages/{app/android/app/src/main/res/mipmap-xxxhdpi/app_news.png => neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/news_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png => neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/notes_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxxhdpi/app_notifications.png => neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/notifications_app.png} (100%) rename packages/{app/android/app/src/main/res/mipmap-xxxhdpi/app_talk.png => neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/talk_app.png} (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/raw/keep.xml (70%) rename packages/{app => neon_framework/example}/android/app/src/main/res/values-night-v31/styles.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/values-night/styles.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/values-v31/styles.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/values/string.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/main/res/values/styles.xml (100%) rename packages/{app => neon_framework/example}/android/app/src/profile/AndroidManifest.xml (100%) rename packages/{app => neon_framework/example}/android/build.gradle (100%) rename packages/{app => neon_framework/example}/android/gradle.properties (100%) rename packages/{app => neon_framework/example}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename packages/{app => neon_framework/example}/android/settings.gradle (100%) rename packages/{app => neon_framework/example}/assets/logo.svg (100%) rename packages/{app => neon_framework/example}/assets/logo.svg.vec (100%) rename packages/{app => neon_framework/example}/de.provokateurin.neon.desktop (100%) rename packages/{app => neon_framework/example}/de.provokateurin.neon.yaml (100%) rename packages/{app => neon_framework/example}/flutter_native_splash.yaml (100%) rename packages/{app => neon_framework/example}/img/splash_icon.png (100%) rename packages/{app => neon_framework/example}/img/splash_icon_android_12.png (100%) rename packages/{app => neon_framework/example}/lib/apps.dart (56%) rename packages/{app => neon_framework/example}/lib/branding.dart (100%) rename packages/{app => neon_framework/example}/lib/main.dart (68%) rename packages/{app => neon_framework/example}/linux/.gitignore (100%) rename packages/{app => neon_framework/example}/linux/CMakeLists.txt (100%) rename packages/{app => neon_framework/example}/linux/flutter/CMakeLists.txt (100%) rename packages/{app => neon_framework/example}/linux/flutter/generated_plugin_registrant.cc (100%) rename packages/{app => neon_framework/example}/linux/flutter/generated_plugin_registrant.h (100%) rename packages/{app => neon_framework/example}/linux/flutter/generated_plugins.cmake (100%) rename packages/{app => neon_framework/example}/linux/main.cc (100%) rename packages/{app => neon_framework/example}/linux/my_application.cc (100%) rename packages/{app => neon_framework/example}/linux/my_application.h (100%) rename packages/{app => neon_framework/example}/pubspec.lock (98%) rename packages/{app => neon_framework/example}/pubspec.yaml (65%) create mode 100644 packages/neon_framework/example/pubspec_overrides.yaml rename packages/{app => neon_framework/example}/screenshots/files_actions.png (100%) rename packages/{app => neon_framework/example}/screenshots/files_create.png (100%) rename packages/{app => neon_framework/example}/screenshots/files_details.png (100%) rename packages/{app => neon_framework/example}/screenshots/files_photos.png (100%) rename packages/{app => neon_framework/example}/screenshots/files_root.png (100%) rename packages/{app => neon_framework/example}/screenshots/home_drawer.png (100%) rename packages/{app => neon_framework/example}/screenshots/login_server_selection.png (100%) rename packages/{app => neon_framework/example}/screenshots/news_articles_starred_list.png (100%) rename packages/{app => neon_framework/example}/screenshots/news_articles_unread_list.png (100%) rename packages/{app => neon_framework/example}/screenshots/news_feed_add.png (100%) rename packages/{app => neon_framework/example}/screenshots/news_feed_articles_list.png (100%) rename packages/{app => neon_framework/example}/screenshots/news_feeds_list.png (100%) rename packages/{app => neon_framework/example}/screenshots/news_folders_list.png (100%) rename packages/{app => neon_framework/example}/screenshots/notes_categories_list.png (100%) rename packages/{app => neon_framework/example}/screenshots/notes_note_create.png (100%) rename packages/{app => neon_framework/example}/screenshots/notes_note_edit.png (100%) rename packages/{app => neon_framework/example}/screenshots/notes_note_preview.png (100%) rename packages/{app => neon_framework/example}/screenshots/notes_notes_list.png (100%) rename packages/{app => neon_framework/example}/screenshots/notifications_list.png (100%) rename packages/{app => neon_framework/example}/screenshots/settings_account.png (100%) rename packages/{app => neon_framework/example}/screenshots/settings_accounts.png (100%) rename packages/{app => neon_framework/example}/screenshots/settings_app_files.png (100%) rename packages/{app => neon_framework/example}/screenshots/settings_app_news.png (100%) rename packages/{app => neon_framework/example}/screenshots/settings_app_notes.png (100%) rename packages/{app => neon_framework/example}/screenshots/settings_dark.png (100%) rename packages/{app => neon_framework/example}/screenshots/settings_light.png (100%) rename packages/{app => neon_framework/example}/screenshots/settings_oled.png (100%) rename packages/{app => neon_framework/example}/web/favicon.png (100%) rename packages/{app => neon_framework/example}/web/flutter_bootstrap.js (100%) rename packages/{app => neon_framework/example}/web/icons/Icon-192.png (100%) rename packages/{app => neon_framework/example}/web/icons/Icon-512.png (100%) rename packages/{app => neon_framework/example}/web/index.html (100%) rename packages/{app => neon_framework/example}/web/manifest.json (100%) rename packages/{app => neon_framework/example}/web/splash/img/dark-1x.png (100%) rename packages/{app => neon_framework/example}/web/splash/img/dark-2x.png (100%) rename packages/{app => neon_framework/example}/web/splash/img/dark-3x.png (100%) rename packages/{app => neon_framework/example}/web/splash/img/dark-4x.png (100%) rename packages/{app => neon_framework/example}/web/splash/img/light-1x.png (100%) rename packages/{app => neon_framework/example}/web/splash/img/light-2x.png (100%) rename packages/{app => neon_framework/example}/web/splash/img/light-3x.png (100%) rename packages/{app => neon_framework/example}/web/splash/img/light-4x.png (100%) rename packages/{app => neon_framework/example}/web/sqflite_sw.js (100%) rename packages/{app => neon_framework/example}/web/sqlite3.wasm (100%) rename packages/{file_icons => neon_framework/packages/dashboard_app}/.metadata (100%) create mode 120000 packages/neon_framework/packages/dashboard_app/LICENSE rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/analysis_options.yaml (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/assets/app.svg.vec (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/build.yaml (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/l10n.yaml (100%) rename packages/{neon/neon_dashboard/lib/neon_dashboard.dart => neon_framework/packages/dashboard_app/lib/dashboard_app.dart} (80%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/l10n/en.arb (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/l10n/localizations.dart (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/l10n/localizations_en.dart (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/blocs/dashboard.dart (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/options.dart (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/pages/main.dart (96%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/routes.dart (91%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/routes.g.dart (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/widgets/dry_intrinsic_height.dart (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/widgets/set_weather_location_dialog.dart (96%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/widgets/widget.dart (95%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/widgets/widget_button.dart (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/lib/src/widgets/widget_item.dart (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/pubspec.yaml (97%) rename packages/{neon/neon_notes => neon_framework/packages/dashboard_app}/pubspec_overrides.yaml (55%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/bloc_test.dart (99%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_button_invalid.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_button_more.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_button_new.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_button_setup.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_item.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_item_not_round.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_not_round.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_with_empty.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_with_empty_and_half_empty.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_with_half_empty.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_with_multiple_buttons.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_without_buttons.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/goldens/widget_without_items.png (100%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/set_weather_location_dialog_test.dart (90%) rename packages/{neon/neon_dashboard => neon_framework/packages/dashboard_app}/test/widget_test.dart (98%) rename packages/{neon/neon_dashboard => neon_framework/packages/files_app}/.metadata (100%) create mode 120000 packages/neon_framework/packages/files_app/LICENSE rename packages/{neon/neon_files => neon_framework/packages/files_app}/analysis_options.yaml (100%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/assets/app.svg.vec (100%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/build.yaml (100%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/l10n.yaml (100%) rename packages/{neon/neon_files/lib/neon_files.dart => neon_framework/packages/files_app/lib/files_app.dart} (79%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/l10n/en.arb (100%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/l10n/localizations.dart (100%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/l10n/localizations_en.dart (100%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/blocs/browser.dart (98%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/blocs/files.dart (97%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/models/file_details.dart (97%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/options.dart (98%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/pages/details.dart (92%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/pages/main.dart (85%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/routes.dart (90%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/routes.g.dart (100%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/sort/files.dart (94%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/utils/dialog.dart (93%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/utils/task.dart (100%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/widgets/actions.dart (93%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/widgets/browser_view.dart (91%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/widgets/dialog.dart (96%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/widgets/file_list_tile.dart (90%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/widgets/file_preview.dart (93%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/lib/src/widgets/navigator.dart (94%) rename packages/{neon/neon_files => neon_framework/packages/files_app}/pubspec.yaml (92%) create mode 100644 packages/neon_framework/packages/files_app/pubspec_overrides.yaml rename packages/{neon/neon_files => neon_framework/packages/files_icons}/.metadata (100%) create mode 120000 packages/neon_framework/packages/files_icons/LICENSE rename packages/{file_icons => neon_framework/packages/files_icons}/README.md (94%) rename packages/{file_icons => neon_framework/packages/files_icons}/analysis_options.yaml (61%) rename packages/{file_icons => neon_framework/packages/files_icons}/assets/seti.ttf (100%) rename packages/{file_icons/bin/file_icons.dart => neon_framework/packages/files_icons/bin/files_icons.dart} (97%) rename packages/{file_icons/lib/file_icons.dart => neon_framework/packages/files_icons/lib/files_icons.dart} (95%) rename packages/{file_icons => neon_framework/packages/files_icons}/lib/src/data.dart (99%) rename packages/{file_icons => neon_framework/packages/files_icons}/lib/src/meta.dart (100%) rename packages/{file_icons => neon_framework/packages/files_icons}/pubspec.yaml (94%) rename packages/{sort_box => neon_framework/packages/files_icons}/pubspec_overrides.yaml (73%) create mode 120000 packages/neon_framework/packages/neon_http_client/LICENSE create mode 100644 packages/neon_framework/packages/neon_http_client/analysis_options.yaml rename packages/{ => neon_framework/packages}/neon_http_client/dart_test.yaml (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/neon_http_client.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/src/interceptors/base_header_interceptor.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/src/interceptors/cookie_interceptor.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/src/interceptors/csrf_interceptor.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/src/interceptors/http_interceptor.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/src/interceptors/interceptors.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/src/neon_http_client.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/src/utils/defaults.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/src/utils/future_timeout.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/lib/src/utils/utils.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/pubspec.yaml (100%) rename packages/{ => neon_framework/packages}/neon_http_client/pubspec_overrides.yaml (54%) rename packages/{ => neon_framework/packages}/neon_http_client/test/client_conformance_test.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/test/interceptors/base_header_interceptor_test.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/test/interceptors/cookie_interceptor_test.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/test/interceptors/csrf_interceptor_test.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/test/interceptors/http_interceptor_test.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/test/neon_http_client_test.dart (100%) rename packages/{ => neon_framework/packages}/neon_http_client/test/utils/future_timeout_test.dart (100%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/.metadata (100%) create mode 120000 packages/neon_framework/packages/news_app/LICENSE rename packages/{neon/neon_news => neon_framework/packages/news_app}/analysis_options.yaml (100%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/assets/app.svg.vec (100%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/build.yaml (100%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/l10n.yaml (100%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/l10n/en.arb (100%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/l10n/localizations.dart (100%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/l10n/localizations_en.dart (100%) rename packages/{neon/neon_news/lib/neon_news.dart => neon_framework/packages/news_app/lib/news_app.dart} (85%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/blocs/article.dart (97%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/blocs/articles.dart (98%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/blocs/news.dart (98%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/options.dart (98%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/pages/article.dart (97%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/pages/feed.dart (81%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/pages/folder.dart (79%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/pages/main.dart (82%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/routes.dart (90%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/routes.g.dart (100%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/sort/articles.dart (93%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/sort/feeds.dart (92%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/sort/folders.dart (94%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/utils/dialog.dart (95%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/widgets/articles_view.dart (96%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/widgets/dialog.dart (98%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/widgets/feed_floating_action_button.dart (85%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/widgets/feed_icon.dart (100%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/widgets/feeds_view.dart (94%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/widgets/folder_floating_action_button.dart (80%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/widgets/folder_select.dart (95%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/widgets/folder_view.dart (89%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/lib/src/widgets/folders_view.dart (94%) rename packages/{neon/neon_news => neon_framework/packages/news_app}/pubspec.yaml (98%) rename packages/{neon/neon_dashboard => neon_framework/packages/news_app}/pubspec_overrides.yaml (55%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/.metadata (100%) create mode 120000 packages/neon_framework/packages/notes_app/LICENSE rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/analysis_options.yaml (100%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/assets/app.svg.vec (100%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/build.yaml (100%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/l10n.yaml (100%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/l10n/en.arb (100%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/l10n/localizations.dart (100%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/l10n/localizations_en.dart (100%) rename packages/{neon/neon_notes/lib/neon_notes.dart => neon_framework/packages/notes_app/lib/notes_app.dart} (83%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/blocs/note.dart (98%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/blocs/notes.dart (100%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/options.dart (98%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/pages/category.dart (72%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/pages/main.dart (81%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/pages/note.dart (94%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/routes.dart (90%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/routes.g.dart (100%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/sort/categories.dart (92%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/sort/notes.dart (93%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/utils/category_color.dart (100%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/utils/exception_handler.dart (88%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/widgets/categories_view.dart (88%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/widgets/category_select.dart (96%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/widgets/dialog.dart (96%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/widgets/notes_floating_action_button.dart (85%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/lib/src/widgets/notes_view.dart (91%) rename packages/{neon/neon_notes => neon_framework/packages/notes_app}/pubspec.yaml (98%) rename packages/{neon/neon_notifications => neon_framework/packages/notes_app}/pubspec_overrides.yaml (55%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/.metadata (100%) create mode 120000 packages/neon_framework/packages/notifications_app/LICENSE rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/analysis_options.yaml (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/assets/app.svg.vec (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/build.yaml (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/l10n.yaml (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/l10n/en.arb (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/l10n/localizations.dart (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/l10n/localizations_en.dart (100%) rename packages/{neon/neon_notifications/lib/neon_notifications.dart => neon_framework/packages/notifications_app/lib/notifications_app.dart} (82%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/src/blocs/notifications.dart (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/src/options.dart (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/src/pages/main.dart (92%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/src/routes.dart (90%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/src/routes.g.dart (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/src/widgets/action.dart (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/lib/src/widgets/notification.dart (97%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/pubspec.yaml (97%) rename packages/{neon/neon_news => neon_framework/packages/notifications_app}/pubspec_overrides.yaml (55%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/action_test.dart (96%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/bloc_test.dart (98%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/goldens/action_primary.png (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/goldens/action_secondary.png (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/goldens/main_page_error.png (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/goldens/main_page_with_notifications.png (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/goldens/main_page_without_notifications.png (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/goldens/notification.png (100%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/main_page_test.dart (95%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/notification_test.dart (94%) rename packages/{neon/neon_notifications => neon_framework/packages/notifications_app}/test/testing.dart (83%) create mode 120000 packages/neon_framework/packages/sort_box/LICENSE rename packages/{ => neon_framework/packages}/sort_box/README.md (100%) create mode 100644 packages/neon_framework/packages/sort_box/analysis_options.yaml rename packages/{ => neon_framework/packages}/sort_box/lib/sort_box.dart (100%) rename packages/{ => neon_framework/packages}/sort_box/lib/src/sort_box.dart (100%) rename packages/{ => neon_framework/packages}/sort_box/pubspec.yaml (100%) rename packages/{dynamite/dynamite => neon_framework/packages/sort_box}/pubspec_overrides.yaml (73%) rename packages/{ => neon_framework/packages}/sort_box/test/sort_box_test.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/.metadata (100%) create mode 120000 packages/neon_framework/packages/talk_app/LICENSE rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/analysis_options.yaml (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/assets/app.svg.vec (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/build.yaml (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/l10n.yaml (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/l10n/en.arb (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/l10n/localizations.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/l10n/localizations_en.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/blocs/message_bloc.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/blocs/room.dart (99%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/blocs/talk.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/dialogs/create_room.dart (99%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/options.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/pages/main.dart (88%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/pages/room.dart (95%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/routes.dart (90%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/routes.g.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/theme.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/utils/helpers.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/actor_avatar.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/message.dart (97%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/message_input.dart (98%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/reactions.dart (97%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/read_indicator.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/reference_preview.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/rich_object/deck_card.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/rich_object/fallback.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/rich_object/file.dart (91%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/rich_object/file_preview.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/rich_object/mention.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/room_avatar.dart (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/lib/src/widgets/unread_indicator.dart (100%) rename packages/{neon/neon_talk/lib/neon_talk.dart => neon_framework/packages/talk_app/lib/talk_app.dart} (85%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/pubspec.yaml (92%) create mode 100644 packages/neon_framework/packages/talk_app/pubspec_overrides.yaml rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/actor_avatar_test.dart (95%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/bloc_test.dart (98%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/create_room_dialog_test.dart (97%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/main_page_error.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/main_page_with_message_preview_with_unread_messages.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/main_page_with_message_preview_without_unread_messages_other.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/main_page_with_message_preview_without_unread_messages_self.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/main_page_without_message_preview.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_as_parent.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_deleted.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_other.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_self.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_separate_actor.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_separate_edited.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_separate_system_message.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_separate_time.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_with_parent.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_comment_message_with_references.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_input_edit.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_input_emoji.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_input_mention_suggestions.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_input_multiline.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_input_no_emoji_button.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_input_reply.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_parent_message.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_system_message_grouping.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/message_system_message_show.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/reactions.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/reference_preview.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/reference_preview_with_description.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/reference_preview_with_thumb.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_deck_card.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_fallback_with_icon.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_fallback_without_icon.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_file_without_preview.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_mention_call.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_mention_group_highlight.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_mention_group_other.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_mention_guest.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_mention_user-group_highlight.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_mention_user-group_other.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_mention_user_highlight.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/rich_object_mention_user_other.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/room_page_error.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/room_page_messages.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/room_page_read_only.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/unread_indicator_unread_mention.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/unread_indicator_unread_mention_direct.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/unread_indicator_unread_messages.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/goldens/unread_indicator_unread_single_user_messages.png (100%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/main_page_test.dart (96%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/message_bloc_test.dart (97%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/message_input_test.dart (98%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/message_test.dart (99%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/reactions_test.dart (96%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/read_indicator_test.dart (94%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/reference_preview_test.dart (98%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/rich_object_test.dart (97%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/room_avatar_test.dart (97%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/room_bloc_test.dart (99%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/room_page_test.dart (97%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/testing.dart (96%) rename packages/{neon/neon_talk => neon_framework/packages/talk_app}/test/unread_indicator_test.dart (97%) delete mode 120000 packages/neon_http_client/LICENSE create mode 120000 packages/nextcloud/packages/nextcloud_test/LICENSE rename packages/{ => nextcloud/packages}/nextcloud_test/README.md (100%) rename packages/{neon_http_client => nextcloud/packages/nextcloud_test}/analysis_options.yaml (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/bin/generate_presets.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/Dockerfile (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Bauernbrot mit Sauerteig/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Blaubeer Cluster/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Chantal's New York Cheesecake/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Chef John's Gazpacho/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Chili sin Carne mit Jackfruit/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Easy Heart-Shaped Cake/recipe.json (100%) rename "packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" => "packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Gelber Smoothie/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Grandma's Sour Cream Pound Cake/recipe.json (100%) rename "packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" => "packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Readme.md (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Recipe Without an image/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Reines Roggenbrot aus Sauerteig/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Restaurant-Style Zuppa Toscana/recipe.json (100%) rename "packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" => "packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Sommerlicher Himbeerkuchen/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Sweet and Spicy Baked Keto Chicken WingsNEW/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/The Best Baked Ziti/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/Vegi-Tortillas/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/assets/Recipes/problem/recipe.json (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/local.sh (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/post.sh (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/pre.sh (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/cookbook/0.11 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/drop_account/2.4 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/drop_account/2.5 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/drop_account/2.6 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/latest (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/news/25.0 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/notes/4.10 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/notes/4.8 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/notes/4.9 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/server/28.0 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/server/29.0 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/spreed/18.0 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/spreed/19.0 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/tables/0.6 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/tables/0.7 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/tables/0.8 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/presets/uppush/1.4 (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/static/nasa.xml (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/static/recipe.html (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/docker/static/wikipedia.xml (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/nextcloud_test.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/app.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/fixtures.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/models/models.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/models/nextcloud_tester.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/models/preset.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/presets.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/proxy_http_client.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/test_target/docker_container.dart (97%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/test_target/local.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/lib/src/test_target/test_target.dart (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/pubspec.yaml (100%) rename packages/{ => nextcloud/packages}/nextcloud_test/pubspec_overrides.yaml (52%) delete mode 120000 packages/nextcloud_test/LICENSE delete mode 100644 packages/nextcloud_test/analysis_options.yaml delete mode 120000 packages/sort_box/LICENSE delete mode 100644 packages/sort_box/analysis_options.yaml diff --git a/.github/renovate.json b/.github/renovate.json index 2ab8c3c6eb9..cf891f9e5d3 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -30,7 +30,7 @@ ], "matchCurrentVersion": "!/^0/", "matchDepNames": [ - "!app", + "!example", "!dynamite_end_to_end_test", "!dynamite_petstore_example", "!neon_lints", diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 4af62f00d7d..3564f062a96 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -30,11 +30,11 @@ jobs: run: ./tool/setup.sh - name: Build - run: cd packages/app && fvm flutter build apk --split-per-abi --build-number="$(date +"%s")" + run: cd packages/neon_framework/example && fvm flutter build apk --split-per-abi --build-number="$(date +"%s")" - uses: ilharp/sign-android-release@2034987c31e3959f7c97e88d5e656e52e6e88bd8 # v1 name: Sign with: - releaseDir: packages/app/build/app/outputs/flutter-apk + releaseDir: packages/neon_framework/example/build/app/outputs/flutter-apk signingKey: ${{ secrets.SIGNING_KEY }} keyAlias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} @@ -43,24 +43,24 @@ jobs: - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 with: name: Android arm64-v8a - path: packages/app/build/app/outputs/flutter-apk/app-arm64-v8a-release-signed.apk + path: packages/neon_framework/example/build/app/outputs/flutter-apk/app-arm64-v8a-release-signed.apk if-no-files-found: error - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 with: name: Android armeabi-v7a - path: packages/app/build/app/outputs/flutter-apk/app-armeabi-v7a-release-signed.apk + path: packages/neon_framework/example/build/app/outputs/flutter-apk/app-armeabi-v7a-release-signed.apk if-no-files-found: error - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 with: name: Android x86_64 - path: packages/app/build/app/outputs/flutter-apk/app-x86_64-release-signed.apk + path: packages/neon_framework/example/build/app/outputs/flutter-apk/app-x86_64-release-signed.apk if-no-files-found: error - name: F-Droid nightly run: | - cp packages/app/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk app-arm64-v8a-debug.apk - cp packages/app/build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk app-armeabi-v7a-debug.apk - cp packages/app/build/app/outputs/flutter-apk/app-x86_64-release.apk app-x86_64-debug.apk + cp packages/neon_framework/example/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk app-arm64-v8a-debug.apk + cp packages/neon_framework/example/build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk app-armeabi-v7a-debug.apk + cp packages/neon_framework/example/build/app/outputs/flutter-apk/app-x86_64-release.apk app-x86_64-debug.apk sudo add-apt-repository ppa:fdroid/fdroidserver sudo apt-get update @@ -113,5 +113,5 @@ jobs: - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 with: name: Linux ${{ matrix.architecture.flutter }} - path: packages/app/build/linux/${{ matrix.architecture.flutter }}/release/bundle/* + path: packages/neon_framework/example/build/linux/${{ matrix.architecture.flutter }}/release/bundle/* if-no-files-found: error diff --git a/.gitignore b/.gitignore index edde97e3761..c0129bc824a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ packages/**/build-dir packages/**/.flatpak-builder packages/**/doc/api -!packages/app/pubspec.lock +!packages/neon_framework/example/pubspec.lock # Melos recommends adding them, but renovate does not generate them which would end up with broken lockfiles # **/pubspec_overrides.yaml diff --git a/.idea/runConfigurations/Debug.xml b/.idea/runConfigurations/Debug.xml index 7f76bc2f24b..68cae638fa1 100644 --- a/.idea/runConfigurations/Debug.xml +++ b/.idea/runConfigurations/Debug.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/.idea/runConfigurations/Release.xml b/.idea/runConfigurations/Release.xml index 0f87074ecb8..adb6d94228b 100644 --- a/.idea/runConfigurations/Release.xml +++ b/.idea/runConfigurations/Release.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 47ce799d792..b40ed1da661 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -3,7 +3,7 @@ "configurations": [ { "name": "app", - "cwd": "packages/app", + "cwd": "packages/neon_framework/example", "request": "launch", "type": "dart", "args": [ @@ -13,7 +13,7 @@ }, { "name": "app (profile mode)", - "cwd": "packages/app", + "cwd": "packages/neon_framework/example", "request": "launch", "type": "dart", "flutterMode": "profile", @@ -24,7 +24,7 @@ }, { "name": "app (release mode)", - "cwd": "packages/app", + "cwd": "packages/neon_framework/example", "request": "launch", "type": "dart", "flutterMode": "release", diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ed046e08a1e..c40ab8a76ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,9 +35,9 @@ All commits need to be signed and signed off to pass our tests. To sign off your commits use `git commit --signoff`. To setup commit signing please consult the [Github documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits). We use conventional commits to have meaningful commit messages and be able to generate changelogs. -A non-breaking feature contribution to `neon_notes` could look like this: +A non-breaking feature contribution to `notes_app` could look like this: ```bash -git commit -m "feat(neon_notes): Add a super cool feature." +git commit -m "feat(notes_app): Add a super cool feature." ``` You can read the full documentation at https://www.conventionalcommits.org. diff --git a/README.md b/README.md index ad120dcc24e..3000f12a7d2 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Please make sure to read them before starting to contribute. The Neon project has three main goals: 1. The [Neon framework](packages/neon_framework) does the heavy lifting for Nextcloud client developers. Neon already handles the authentication flow and manages data requests and caching. This means that developers can reuse a lot of the code and do not need to reinvent the wheel. -2. The [Neon app](packages/app) is a cross-platform Nextcloud client that runs on iOS, Android, macOS, Windows, Linux and Web. We already support Android and Linux with the other platforms being work in progress. -3. The [Neon app](packages/app) is a multi client app. This means that you can have multiple clients in the same mobile app. It enables seamless switching between multiple apps as Nextcloud users have enjoyed on the web forever. +2. The [Neon app](packages/neon_framework/example) is a cross-platform Nextcloud client that runs on iOS, Android, macOS, Windows, Linux and Web. We already support Android and Linux with the other platforms being work in progress. +3. The [Neon app](packages/neon_framework/example) is a multi client app. This means that you can have multiple clients in the same mobile app. It enables seamless switching between multiple apps as Nextcloud users have enjoyed on the web forever. ### Current problems with other clients @@ -47,28 +47,28 @@ We have a Matrix space where you can ask questions: https://matrix.to/#/#nextclo ## Features -See [here](packages/app/README.md) for screenshots. +See [here](packages/neon_framework/example/README.md) for screenshots. - :white_check_mark: Supported - :construction: Work in progress - :rocket: Planned -| App | Status | -|---------------------------------------------------|--------------------| -| [Dashboard](packages/neon/neon_dashboard) | :white_check_mark: | -| [Files](packages/neon/neon_files) | :white_check_mark: | -| [News](packages/neon/neon_news) | :white_check_mark: | -| [Notes](packages/neon/neon_notes) | :white_check_mark: | -| [Notifications](packages/neon/neon_notifications) | :white_check_mark: | -| Activity | :rocket: | -| Calendar | :rocket: | -| Contacts | :rocket: | -| Cookbook | :rocket: | -| Cospend | :rocket: | -| Deck | :rocket: | -| Photos | :rocket: | -| Talk | :construction: | -| Tasks | :rocket: | +| App | Status | +|---------------------------------------------------------------------|--------------------| +| [Dashboard](packages/neon_framework/packages/dashboard_app) | :white_check_mark: | +| [Files](packages/neon_framework/packages/files_app) | :white_check_mark: | +| [News](packages/neon_framework/packages/news_app) | :white_check_mark: | +| [Notes](packages/neon_framework/packages/notes_app) | :white_check_mark: | +| [Notifications](packages/neon_framework/packages/notifications_app) | :white_check_mark: | +| Activity | :rocket: | +| Calendar | :rocket: | +| Contacts | :rocket: | +| Cookbook | :rocket: | +| Cospend | :rocket: | +| Deck | :rocket: | +| Photos | :rocket: | +| Talk | :construction: | +| Tasks | :rocket: | ## Platform support diff --git a/commitlint.yaml b/commitlint.yaml index 1ca8ea9846d..514855d342b 100644 --- a/commitlint.yaml +++ b/commitlint.yaml @@ -7,26 +7,25 @@ rules: scope-enum: - 2 - always - - - app - - ci + - - ci - cookie_store + - dashboard_app - deps - docs - dynamite - dynamite_end_to_end_test - dynamite_runtime - - file_icons - - neon_dashboard - - neon_files + - files_icons + - files_app - neon_framework - neon_http_client - neon_lints - - neon_news - - neon_notes - - neon_notifications - - neon_talk + - news_app - nextcloud - nextcloud_test + - notes_app + - notifications_app - release - sort_box + - talk_app - tool diff --git a/cspell.json b/cspell.json index 477be61b06d..b9a683c2ccb 100644 --- a/cspell.json +++ b/cspell.json @@ -15,14 +15,14 @@ "**.openapi.json", "**/CHANGELOG.md", "external", - "packages/app/web/sqlite3.wasm", - "packages/app/web/sqflite_sw.js", - "packages/dynamite/dynamite/example/lib", - "packages/file_icons/lib/src/data.dart", + "packages/dynamite/example/lib", + "packages/neon_framework/example/web/sqflite_sw.js", + "packages/neon_framework/example/web/sqlite3.wasm", + "packages/neon_framework/packages/files_icons/lib/src/data.dart", "packages/neon_lints/lib", - "packages/nextcloud/test/fixtures", - "packages/nextcloud_test/docker/static", - "/packages/nextcloud/test/files" + "packages/nextcloud/packages/nextcloud_test/docker/static", + "packages/nextcloud/test/files", + "packages/nextcloud/test/fixtures" ], "dictionaries": [ "bash", diff --git a/docs/architecture.puml b/docs/architecture.puml index 99b32e140df..bd6493c002a 100644 --- a/docs/architecture.puml +++ b/docs/architecture.puml @@ -4,15 +4,15 @@ package "Neon framework" { component neon_framework component nextcloud component sort_box - component file_icons + component files_icons } package "Clients" { - component neon_dashboard - component neon_files - component neon_news - component neon_notes - component neon_notifications + component dashboard_app + component files_app + component news_app + component notes_app + component notifications_app } package "OpenAPI" { @@ -22,22 +22,22 @@ package "OpenAPI" { component app -app ..> neon_dashboard -app ..> neon_files -app ..> neon_news -app ..> neon_notes -app ..> neon_notifications +app ..> dashboard_app +app ..> files_app +app ..> news_app +app ..> notes_app +app ..> notifications_app -neon_dashboard --> neon_framework -neon_files --> neon_framework -neon_news --> neon_framework -neon_notes --> neon_framework -neon_notifications --> neon_framework +dashboard_app --> neon_framework +files_app --> neon_framework +news_app --> neon_framework +notes_app --> neon_framework +notifications_app --> neon_framework neon_framework --> nextcloud neon_framework --> sort_box -neon_framework --> file_icons +neon_framework --> files_icons dynamite --> nextcloud specifications --> nextcloud diff --git a/docs/architecture.svg b/docs/architecture.svg index e7e3ce00459..137d8f2648f 100644 --- a/docs/architecture.svg +++ b/docs/architecture.svg @@ -1 +1 @@ -Neon frameworkClientsOpenAPIneon_frameworknextcloudsort_boxfile_iconsneon_dashboardneon_filesneon_newsneon_notesneon_notificationsdynamitespecificationsapp \ No newline at end of file +Neon frameworkClientsOpenAPIneon_frameworknextcloudsort_boxfiles_iconsdashboard_appfiles_appnews_appnotes_appnotifications_appdynamitespecificationsapp \ No newline at end of file diff --git a/docs/login.svg b/docs/login.svg index cdc86f6cf4d..fb3a011f46c 100644 --- a/docs/login.svg +++ b/docs/login.svg @@ -1 +1 @@ -Validate server detailsLogin pageOpen login flow pageInitiate login flowOpen web browserWait for login flow resultValidate login detailsOpen QR scan pageScan QR codeStarted from QR code scanner?YesNoHas account?YesNoSelected login method?Login flowQR codeLogin successColorLogin method QR Code Login flow \ No newline at end of file +Validate server detailsLogin pageOpen login flow pageInitiate login flowOpen web browserWait for login flow resultValidate login detailsOpen QR scan pageScan QR codeStarted from QR code scanner?YesNoHas account?YesNoSelected login method?Login flowQR codeLogin successColorLogin method QR Code Login flow \ No newline at end of file diff --git a/melos.yaml b/melos.yaml index dc6ba10eb92..254767e1324 100644 --- a/melos.yaml +++ b/melos.yaml @@ -11,8 +11,7 @@ bootstrap: packages: - packages/* - - packages/dynamite/* - - packages/neon/* + - packages/*/packages/* - packages/**/example ide: @@ -27,7 +26,7 @@ command: hooks: preCommit: | melos bootstrap - git add packages/app/pubspec.lock + git add packages/neon_framework/example/pubspec.lock # Needed until https://github.com/invertase/melos/issues/591 is supported post: | git commit --amend --signoff --no-edit diff --git a/packages/app/pubspec_overrides.yaml b/packages/app/pubspec_overrides.yaml deleted file mode 100644 index 9347f3aa30b..00000000000 --- a/packages/app/pubspec_overrides.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,file_icons,neon_dashboard,neon_files,neon_framework,neon_http_client,neon_lints,neon_news,neon_notes,neon_notifications,neon_talk,nextcloud,sort_box -dependency_overrides: - cookie_store: - path: ../cookie_store - dynamite_runtime: - path: ../dynamite/dynamite_runtime - file_icons: - path: ../file_icons - neon_dashboard: - path: ../neon/neon_dashboard - neon_files: - path: ../neon/neon_files - neon_framework: - path: ../neon_framework - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../neon_lints - neon_news: - path: ../neon/neon_news - neon_notes: - path: ../neon/neon_notes - neon_notifications: - path: ../neon/neon_notifications - neon_talk: - path: ../neon/neon_talk - nextcloud: - path: ../nextcloud - sort_box: - path: ../sort_box diff --git a/packages/cookie_store/packages/cookie_store_conformance_tests/LICENSE b/packages/cookie_store/packages/cookie_store_conformance_tests/LICENSE new file mode 120000 index 00000000000..0fef81c998a --- /dev/null +++ b/packages/cookie_store/packages/cookie_store_conformance_tests/LICENSE @@ -0,0 +1 @@ +../../../../assets/BSD-3-Clause.txt \ No newline at end of file diff --git a/packages/cookie_store_conformance_tests/analysis_options.yaml b/packages/cookie_store/packages/cookie_store_conformance_tests/analysis_options.yaml similarity index 100% rename from packages/cookie_store_conformance_tests/analysis_options.yaml rename to packages/cookie_store/packages/cookie_store_conformance_tests/analysis_options.yaml diff --git a/packages/cookie_store_conformance_tests/lib/cookie_store_conformance_tests.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/cookie_store_conformance_tests.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/cookie_store_conformance_tests.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/cookie_store_conformance_tests.dart diff --git a/packages/cookie_store_conformance_tests/lib/src/deletion_tests.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/deletion_tests.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/src/deletion_tests.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/deletion_tests.dart diff --git a/packages/cookie_store_conformance_tests/lib/src/domain_matching_tests.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/domain_matching_tests.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/src/domain_matching_tests.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/domain_matching_tests.dart diff --git a/packages/cookie_store_conformance_tests/lib/src/expiration_tests.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/expiration_tests.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/src/expiration_tests.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/expiration_tests.dart diff --git a/packages/cookie_store_conformance_tests/lib/src/http_only_cookie_tests.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/http_only_cookie_tests.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/src/http_only_cookie_tests.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/http_only_cookie_tests.dart diff --git a/packages/cookie_store_conformance_tests/lib/src/path_matching_tests.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/path_matching_tests.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/src/path_matching_tests.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/path_matching_tests.dart diff --git a/packages/cookie_store_conformance_tests/lib/src/persist_cookies_tests.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/persist_cookies_tests.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/src/persist_cookies_tests.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/persist_cookies_tests.dart diff --git a/packages/cookie_store_conformance_tests/lib/src/secure_cookie_tests.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/secure_cookie_tests.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/src/secure_cookie_tests.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/secure_cookie_tests.dart diff --git a/packages/cookie_store_conformance_tests/lib/src/sorting_tests.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/sorting_tests.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/src/sorting_tests.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/sorting_tests.dart diff --git a/packages/cookie_store_conformance_tests/lib/src/utils.dart b/packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/utils.dart similarity index 100% rename from packages/cookie_store_conformance_tests/lib/src/utils.dart rename to packages/cookie_store/packages/cookie_store_conformance_tests/lib/src/utils.dart diff --git a/packages/cookie_store_conformance_tests/pubspec.yaml b/packages/cookie_store/packages/cookie_store_conformance_tests/pubspec.yaml similarity index 100% rename from packages/cookie_store_conformance_tests/pubspec.yaml rename to packages/cookie_store/packages/cookie_store_conformance_tests/pubspec.yaml diff --git a/packages/cookie_store_conformance_tests/pubspec_overrides.yaml b/packages/cookie_store/packages/cookie_store_conformance_tests/pubspec_overrides.yaml similarity index 69% rename from packages/cookie_store_conformance_tests/pubspec_overrides.yaml rename to packages/cookie_store/packages/cookie_store_conformance_tests/pubspec_overrides.yaml index 8c5a77e9f0c..d6f09bca76c 100644 --- a/packages/cookie_store_conformance_tests/pubspec_overrides.yaml +++ b/packages/cookie_store/packages/cookie_store_conformance_tests/pubspec_overrides.yaml @@ -1,6 +1,6 @@ # melos_managed_dependency_overrides: cookie_store,neon_lints dependency_overrides: cookie_store: - path: ../cookie_store + path: ../.. neon_lints: - path: ../neon_lints + path: ../../../neon_lints diff --git a/packages/cookie_store/pubspec.yaml b/packages/cookie_store/pubspec.yaml index b0b9ad5e2cc..ca0107fc7a1 100644 --- a/packages/cookie_store/pubspec.yaml +++ b/packages/cookie_store/pubspec.yaml @@ -15,7 +15,7 @@ dev_dependencies: cookie_store_conformance_tests: git: url: https://github.com/nextcloud/neon - path: packages/cookie_store_conformance_tests + path: packages/cookie_store/packages/cookie_store_conformance_tests neon_lints: git: url: https://github.com/nextcloud/neon diff --git a/packages/cookie_store/pubspec_overrides.yaml b/packages/cookie_store/pubspec_overrides.yaml index c9cf9b468c9..3d66c7094c7 100644 --- a/packages/cookie_store/pubspec_overrides.yaml +++ b/packages/cookie_store/pubspec_overrides.yaml @@ -1,6 +1,6 @@ # melos_managed_dependency_overrides: cookie_store_conformance_tests,neon_lints dependency_overrides: cookie_store_conformance_tests: - path: ../cookie_store_conformance_tests + path: packages/cookie_store_conformance_tests neon_lints: path: ../neon_lints diff --git a/packages/cookie_store_conformance_tests/LICENSE b/packages/cookie_store_conformance_tests/LICENSE deleted file mode 120000 index dc0786b028f..00000000000 --- a/packages/cookie_store_conformance_tests/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../assets/BSD-3-Clause.txt \ No newline at end of file diff --git a/packages/dynamite/.pubignore b/packages/dynamite/.pubignore new file mode 100644 index 00000000000..23053de093d --- /dev/null +++ b/packages/dynamite/.pubignore @@ -0,0 +1 @@ +packages/ diff --git a/packages/dynamite/dynamite/CHANGELOG.md b/packages/dynamite/CHANGELOG.md similarity index 100% rename from packages/dynamite/dynamite/CHANGELOG.md rename to packages/dynamite/CHANGELOG.md diff --git a/packages/app/LICENSE b/packages/dynamite/LICENSE similarity index 100% rename from packages/app/LICENSE rename to packages/dynamite/LICENSE diff --git a/packages/dynamite/dynamite/README.md b/packages/dynamite/README.md similarity index 96% rename from packages/dynamite/dynamite/README.md rename to packages/dynamite/README.md index c4427ee109e..1c2cbad1232 100644 --- a/packages/dynamite/dynamite/README.md +++ b/packages/dynamite/README.md @@ -26,7 +26,7 @@ To generate code you need to invoke the `build_runner` with the following comman dart run build_runner build ``` The builder will look for any files ending with either `.openapi.json` or `.openapi.yaml` and place the generated code next to the specifications in a file ending with `.openapi.dart`. -For a full example checkout the [example package](https://github.com/nextcloud/neon/tree/main/packages/dynamite/dynamite/example) using the OpenAPI petstore specification. +For a full example checkout the [example package](https://github.com/nextcloud/neon/tree/main/packages/dynamite/example) using the OpenAPI petstore specification. # Build configuration diff --git a/packages/dynamite/dynamite/analysis_options.yaml b/packages/dynamite/analysis_options.yaml similarity index 100% rename from packages/dynamite/dynamite/analysis_options.yaml rename to packages/dynamite/analysis_options.yaml diff --git a/packages/dynamite/dynamite/build.yaml b/packages/dynamite/build.yaml similarity index 100% rename from packages/dynamite/dynamite/build.yaml rename to packages/dynamite/build.yaml diff --git a/packages/dynamite/dynamite/example/README.md b/packages/dynamite/dynamite/example/README.md deleted file mode 100644 index 214aced6115..00000000000 --- a/packages/dynamite/dynamite/example/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# dynamite petstore example - -An example showcasing the [dynamite generator](https://github.com/nextcloud/neon/tree/main/packages/dynamite/dynamite) for OpenAPI using the [Swagger Petstore](https://github.com/swagger-api/swagger-petstore). diff --git a/packages/dynamite/dynamite_runtime/LICENSE b/packages/dynamite/dynamite_runtime/LICENSE deleted file mode 120000 index 54f190e25f9..00000000000 --- a/packages/dynamite/dynamite_runtime/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/BSD-3-Clause.txt \ No newline at end of file diff --git a/packages/dynamite/dynamite/LICENSE b/packages/dynamite/example/LICENSE similarity index 100% rename from packages/dynamite/dynamite/LICENSE rename to packages/dynamite/example/LICENSE diff --git a/packages/dynamite/example/README.md b/packages/dynamite/example/README.md new file mode 100644 index 00000000000..49630f57032 --- /dev/null +++ b/packages/dynamite/example/README.md @@ -0,0 +1,3 @@ +# dynamite petstore example + +An example showcasing the [dynamite generator](https://github.com/nextcloud/neon/tree/main/packages/dynamite) for OpenAPI using the [Swagger Petstore](https://github.com/swagger-api/swagger-petstore). diff --git a/packages/dynamite/dynamite/example/analysis_options.yaml b/packages/dynamite/example/analysis_options.yaml similarity index 100% rename from packages/dynamite/dynamite/example/analysis_options.yaml rename to packages/dynamite/example/analysis_options.yaml diff --git a/packages/dynamite/dynamite/example/build.yaml b/packages/dynamite/example/build.yaml similarity index 100% rename from packages/dynamite/dynamite/example/build.yaml rename to packages/dynamite/example/build.yaml diff --git a/packages/dynamite/dynamite/example/lib/petstore.openapi.dart b/packages/dynamite/example/lib/petstore.openapi.dart similarity index 100% rename from packages/dynamite/dynamite/example/lib/petstore.openapi.dart rename to packages/dynamite/example/lib/petstore.openapi.dart diff --git a/packages/dynamite/dynamite/example/lib/petstore.openapi.g.dart b/packages/dynamite/example/lib/petstore.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite/example/lib/petstore.openapi.g.dart rename to packages/dynamite/example/lib/petstore.openapi.g.dart diff --git a/packages/dynamite/dynamite/example/lib/petstore.openapi.json b/packages/dynamite/example/lib/petstore.openapi.json similarity index 100% rename from packages/dynamite/dynamite/example/lib/petstore.openapi.json rename to packages/dynamite/example/lib/petstore.openapi.json diff --git a/packages/dynamite/dynamite/example/pubspec.yaml b/packages/dynamite/example/pubspec.yaml similarity index 100% rename from packages/dynamite/dynamite/example/pubspec.yaml rename to packages/dynamite/example/pubspec.yaml diff --git a/packages/dynamite/dynamite_end_to_end_test/pubspec_overrides.yaml b/packages/dynamite/example/pubspec_overrides.yaml similarity index 76% rename from packages/dynamite/dynamite_end_to_end_test/pubspec_overrides.yaml rename to packages/dynamite/example/pubspec_overrides.yaml index 6271ab73042..0f0bf64f6b1 100644 --- a/packages/dynamite/dynamite_end_to_end_test/pubspec_overrides.yaml +++ b/packages/dynamite/example/pubspec_overrides.yaml @@ -1,8 +1,8 @@ # melos_managed_dependency_overrides: dynamite,dynamite_runtime,neon_lints dependency_overrides: dynamite: - path: ../dynamite + path: .. dynamite_runtime: - path: ../dynamite_runtime + path: ../packages/dynamite_runtime neon_lints: path: ../../neon_lints diff --git a/packages/dynamite/dynamite/lib/builder.dart b/packages/dynamite/lib/builder.dart similarity index 100% rename from packages/dynamite/dynamite/lib/builder.dart rename to packages/dynamite/lib/builder.dart diff --git a/packages/dynamite/dynamite/lib/dynamite.dart b/packages/dynamite/lib/dynamite.dart similarity index 100% rename from packages/dynamite/dynamite/lib/dynamite.dart rename to packages/dynamite/lib/dynamite.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/client.dart b/packages/dynamite/lib/src/builder/client.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/client.dart rename to packages/dynamite/lib/src/builder/client.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/generate_ofs.dart b/packages/dynamite/lib/src/builder/generate_ofs.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/generate_ofs.dart rename to packages/dynamite/lib/src/builder/generate_ofs.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/generate_schemas.dart b/packages/dynamite/lib/src/builder/generate_schemas.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/generate_schemas.dart rename to packages/dynamite/lib/src/builder/generate_schemas.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_enum.dart b/packages/dynamite/lib/src/builder/resolve_enum.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/resolve_enum.dart rename to packages/dynamite/lib/src/builder/resolve_enum.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_interface.dart b/packages/dynamite/lib/src/builder/resolve_interface.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/resolve_interface.dart rename to packages/dynamite/lib/src/builder/resolve_interface.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_mime_type.dart b/packages/dynamite/lib/src/builder/resolve_mime_type.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/resolve_mime_type.dart rename to packages/dynamite/lib/src/builder/resolve_mime_type.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_object.dart b/packages/dynamite/lib/src/builder/resolve_object.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/resolve_object.dart rename to packages/dynamite/lib/src/builder/resolve_object.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_ofs.dart b/packages/dynamite/lib/src/builder/resolve_ofs.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/resolve_ofs.dart rename to packages/dynamite/lib/src/builder/resolve_ofs.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_type.dart b/packages/dynamite/lib/src/builder/resolve_type.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/resolve_type.dart rename to packages/dynamite/lib/src/builder/resolve_type.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/serializer.dart b/packages/dynamite/lib/src/builder/serializer.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/serializer.dart rename to packages/dynamite/lib/src/builder/serializer.dart diff --git a/packages/dynamite/dynamite/lib/src/builder/state.dart b/packages/dynamite/lib/src/builder/state.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/builder/state.dart rename to packages/dynamite/lib/src/builder/state.dart diff --git a/packages/dynamite/dynamite/lib/src/helpers/built_value.dart b/packages/dynamite/lib/src/helpers/built_value.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/helpers/built_value.dart rename to packages/dynamite/lib/src/helpers/built_value.dart diff --git a/packages/dynamite/dynamite/lib/src/helpers/dart_helpers.dart b/packages/dynamite/lib/src/helpers/dart_helpers.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/helpers/dart_helpers.dart rename to packages/dynamite/lib/src/helpers/dart_helpers.dart diff --git a/packages/dynamite/dynamite/lib/src/helpers/default_value.dart b/packages/dynamite/lib/src/helpers/default_value.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/helpers/default_value.dart rename to packages/dynamite/lib/src/helpers/default_value.dart diff --git a/packages/dynamite/dynamite/lib/src/helpers/docs.dart b/packages/dynamite/lib/src/helpers/docs.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/helpers/docs.dart rename to packages/dynamite/lib/src/helpers/docs.dart diff --git a/packages/dynamite/dynamite/lib/src/helpers/dynamite.dart b/packages/dynamite/lib/src/helpers/dynamite.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/helpers/dynamite.dart rename to packages/dynamite/lib/src/helpers/dynamite.dart diff --git a/packages/dynamite/dynamite/lib/src/helpers/logger.dart b/packages/dynamite/lib/src/helpers/logger.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/helpers/logger.dart rename to packages/dynamite/lib/src/helpers/logger.dart diff --git a/packages/dynamite/dynamite/lib/src/helpers/pattern_check.dart b/packages/dynamite/lib/src/helpers/pattern_check.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/helpers/pattern_check.dart rename to packages/dynamite/lib/src/helpers/pattern_check.dart diff --git a/packages/dynamite/dynamite/lib/src/helpers/version_checker.dart b/packages/dynamite/lib/src/helpers/version_checker.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/helpers/version_checker.dart rename to packages/dynamite/lib/src/helpers/version_checker.dart diff --git a/packages/dynamite/dynamite/lib/src/models/config.dart b/packages/dynamite/lib/src/models/config.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/config.dart rename to packages/dynamite/lib/src/models/config.dart diff --git a/packages/dynamite/dynamite/lib/src/models/dynamite_config/config.dart b/packages/dynamite/lib/src/models/dynamite_config/config.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/dynamite_config/config.dart rename to packages/dynamite/lib/src/models/dynamite_config/config.dart diff --git a/packages/dynamite/dynamite/lib/src/models/dynamite_config/config.g.dart b/packages/dynamite/lib/src/models/dynamite_config/config.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/dynamite_config/config.g.dart rename to packages/dynamite/lib/src/models/dynamite_config/config.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/exceptions.dart b/packages/dynamite/lib/src/models/exceptions.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/exceptions.dart rename to packages/dynamite/lib/src/models/exceptions.dart diff --git a/packages/dynamite/dynamite/lib/src/models/json_schema.dart b/packages/dynamite/lib/src/models/json_schema.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/json_schema.dart rename to packages/dynamite/lib/src/models/json_schema.dart diff --git a/packages/dynamite/dynamite/lib/src/models/json_schema.g.dart b/packages/dynamite/lib/src/models/json_schema.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/json_schema.g.dart rename to packages/dynamite/lib/src/models/json_schema.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/json_schema/annotations.dart b/packages/dynamite/lib/src/models/json_schema/annotations.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/json_schema/annotations.dart rename to packages/dynamite/lib/src/models/json_schema/annotations.dart diff --git a/packages/dynamite/dynamite/lib/src/models/json_schema/schema.dart b/packages/dynamite/lib/src/models/json_schema/schema.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/json_schema/schema.dart rename to packages/dynamite/lib/src/models/json_schema/schema.dart diff --git a/packages/dynamite/dynamite/lib/src/models/json_schema/schema.g.dart b/packages/dynamite/lib/src/models/json_schema/schema.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/json_schema/schema.g.dart rename to packages/dynamite/lib/src/models/json_schema/schema.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/json_schema/type_result.dart b/packages/dynamite/lib/src/models/json_schema/type_result.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/json_schema/type_result.dart rename to packages/dynamite/lib/src/models/json_schema/type_result.dart diff --git a/packages/dynamite/dynamite/lib/src/models/json_schema/validators.dart b/packages/dynamite/lib/src/models/json_schema/validators.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/json_schema/validators.dart rename to packages/dynamite/lib/src/models/json_schema/validators.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi.dart b/packages/dynamite/lib/src/models/openapi.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi.dart rename to packages/dynamite/lib/src/models/openapi.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi.g.dart b/packages/dynamite/lib/src/models/openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi.g.dart rename to packages/dynamite/lib/src/models/openapi.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/components.dart b/packages/dynamite/lib/src/models/openapi/components.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/components.dart rename to packages/dynamite/lib/src/models/openapi/components.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/components.g.dart b/packages/dynamite/lib/src/models/openapi/components.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/components.g.dart rename to packages/dynamite/lib/src/models/openapi/components.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/contact.dart b/packages/dynamite/lib/src/models/openapi/contact.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/contact.dart rename to packages/dynamite/lib/src/models/openapi/contact.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/contact.g.dart b/packages/dynamite/lib/src/models/openapi/contact.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/contact.g.dart rename to packages/dynamite/lib/src/models/openapi/contact.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/discriminator.dart b/packages/dynamite/lib/src/models/openapi/discriminator.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/discriminator.dart rename to packages/dynamite/lib/src/models/openapi/discriminator.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/discriminator.g.dart b/packages/dynamite/lib/src/models/openapi/discriminator.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/discriminator.g.dart rename to packages/dynamite/lib/src/models/openapi/discriminator.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/header.dart b/packages/dynamite/lib/src/models/openapi/header.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/header.dart rename to packages/dynamite/lib/src/models/openapi/header.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/header.g.dart b/packages/dynamite/lib/src/models/openapi/header.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/header.g.dart rename to packages/dynamite/lib/src/models/openapi/header.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/info.dart b/packages/dynamite/lib/src/models/openapi/info.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/info.dart rename to packages/dynamite/lib/src/models/openapi/info.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/info.g.dart b/packages/dynamite/lib/src/models/openapi/info.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/info.g.dart rename to packages/dynamite/lib/src/models/openapi/info.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/license.dart b/packages/dynamite/lib/src/models/openapi/license.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/license.dart rename to packages/dynamite/lib/src/models/openapi/license.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/license.g.dart b/packages/dynamite/lib/src/models/openapi/license.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/license.g.dart rename to packages/dynamite/lib/src/models/openapi/license.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/media_type.dart b/packages/dynamite/lib/src/models/openapi/media_type.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/media_type.dart rename to packages/dynamite/lib/src/models/openapi/media_type.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/media_type.g.dart b/packages/dynamite/lib/src/models/openapi/media_type.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/media_type.g.dart rename to packages/dynamite/lib/src/models/openapi/media_type.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/open_api.dart b/packages/dynamite/lib/src/models/openapi/open_api.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/open_api.dart rename to packages/dynamite/lib/src/models/openapi/open_api.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/open_api.g.dart b/packages/dynamite/lib/src/models/openapi/open_api.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/open_api.g.dart rename to packages/dynamite/lib/src/models/openapi/open_api.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/operation.dart b/packages/dynamite/lib/src/models/openapi/operation.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/operation.dart rename to packages/dynamite/lib/src/models/openapi/operation.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/operation.g.dart b/packages/dynamite/lib/src/models/openapi/operation.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/operation.g.dart rename to packages/dynamite/lib/src/models/openapi/operation.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/parameter.dart b/packages/dynamite/lib/src/models/openapi/parameter.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/parameter.dart rename to packages/dynamite/lib/src/models/openapi/parameter.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/parameter.g.dart b/packages/dynamite/lib/src/models/openapi/parameter.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/parameter.g.dart rename to packages/dynamite/lib/src/models/openapi/parameter.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/path_item.dart b/packages/dynamite/lib/src/models/openapi/path_item.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/path_item.dart rename to packages/dynamite/lib/src/models/openapi/path_item.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/path_item.g.dart b/packages/dynamite/lib/src/models/openapi/path_item.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/path_item.g.dart rename to packages/dynamite/lib/src/models/openapi/path_item.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/request_body.dart b/packages/dynamite/lib/src/models/openapi/request_body.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/request_body.dart rename to packages/dynamite/lib/src/models/openapi/request_body.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/request_body.g.dart b/packages/dynamite/lib/src/models/openapi/request_body.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/request_body.g.dart rename to packages/dynamite/lib/src/models/openapi/request_body.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/response.dart b/packages/dynamite/lib/src/models/openapi/response.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/response.dart rename to packages/dynamite/lib/src/models/openapi/response.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/response.g.dart b/packages/dynamite/lib/src/models/openapi/response.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/response.g.dart rename to packages/dynamite/lib/src/models/openapi/response.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.dart b/packages/dynamite/lib/src/models/openapi/security_scheme.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.dart rename to packages/dynamite/lib/src/models/openapi/security_scheme.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.g.dart b/packages/dynamite/lib/src/models/openapi/security_scheme.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.g.dart rename to packages/dynamite/lib/src/models/openapi/security_scheme.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/server.dart b/packages/dynamite/lib/src/models/openapi/server.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/server.dart rename to packages/dynamite/lib/src/models/openapi/server.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/server.g.dart b/packages/dynamite/lib/src/models/openapi/server.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/server.g.dart rename to packages/dynamite/lib/src/models/openapi/server.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/server_variable.dart b/packages/dynamite/lib/src/models/openapi/server_variable.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/server_variable.dart rename to packages/dynamite/lib/src/models/openapi/server_variable.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/server_variable.g.dart b/packages/dynamite/lib/src/models/openapi/server_variable.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/server_variable.g.dart rename to packages/dynamite/lib/src/models/openapi/server_variable.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/tag.dart b/packages/dynamite/lib/src/models/openapi/tag.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/tag.dart rename to packages/dynamite/lib/src/models/openapi/tag.dart diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/tag.g.dart b/packages/dynamite/lib/src/models/openapi/tag.g.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/openapi/tag.g.dart rename to packages/dynamite/lib/src/models/openapi/tag.g.dart diff --git a/packages/dynamite/dynamite/lib/src/models/type_result.dart b/packages/dynamite/lib/src/models/type_result.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/type_result.dart rename to packages/dynamite/lib/src/models/type_result.dart diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/base.dart b/packages/dynamite/lib/src/models/type_result/base.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/type_result/base.dart rename to packages/dynamite/lib/src/models/type_result/base.dart diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/enum.dart b/packages/dynamite/lib/src/models/type_result/enum.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/type_result/enum.dart rename to packages/dynamite/lib/src/models/type_result/enum.dart diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/list.dart b/packages/dynamite/lib/src/models/type_result/list.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/type_result/list.dart rename to packages/dynamite/lib/src/models/type_result/list.dart diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/map.dart b/packages/dynamite/lib/src/models/type_result/map.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/type_result/map.dart rename to packages/dynamite/lib/src/models/type_result/map.dart diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/object.dart b/packages/dynamite/lib/src/models/type_result/object.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/type_result/object.dart rename to packages/dynamite/lib/src/models/type_result/object.dart diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/some_of.dart b/packages/dynamite/lib/src/models/type_result/some_of.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/type_result/some_of.dart rename to packages/dynamite/lib/src/models/type_result/some_of.dart diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/type_result.dart b/packages/dynamite/lib/src/models/type_result/type_result.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/models/type_result/type_result.dart rename to packages/dynamite/lib/src/models/type_result/type_result.dart diff --git a/packages/dynamite/dynamite/lib/src/openapi_builder.dart b/packages/dynamite/lib/src/openapi_builder.dart similarity index 100% rename from packages/dynamite/dynamite/lib/src/openapi_builder.dart rename to packages/dynamite/lib/src/openapi_builder.dart diff --git a/packages/dynamite/dynamite/example/LICENSE b/packages/dynamite/packages/dynamite_end_to_end_test/LICENSE similarity index 100% rename from packages/dynamite/dynamite/example/LICENSE rename to packages/dynamite/packages/dynamite_end_to_end_test/LICENSE diff --git a/packages/dynamite/dynamite_end_to_end_test/README.md b/packages/dynamite/packages/dynamite_end_to_end_test/README.md similarity index 63% rename from packages/dynamite/dynamite_end_to_end_test/README.md rename to packages/dynamite/packages/dynamite_end_to_end_test/README.md index eba219eaf36..c6e70cbc6d2 100644 --- a/packages/dynamite/dynamite_end_to_end_test/README.md +++ b/packages/dynamite/packages/dynamite_end_to_end_test/README.md @@ -1,4 +1,4 @@ # Dynamite end to end test -This package contains OpenAPI specs to test the [dynamite](https://github.com/nextcloud/neon/tree/main/packages/dynamite/dynamite) generator. +This package contains OpenAPI specs to test the [dynamite](https://github.com/nextcloud/neon/tree/main/packages/dynamite) generator. This package is not meant for publishing. diff --git a/packages/dynamite/dynamite_end_to_end_test/analysis_options.yaml b/packages/dynamite/packages/dynamite_end_to_end_test/analysis_options.yaml similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/analysis_options.yaml rename to packages/dynamite/packages/dynamite_end_to_end_test/analysis_options.yaml diff --git a/packages/dynamite/dynamite_end_to_end_test/build.yaml b/packages/dynamite/packages/dynamite_end_to_end_test/build.yaml similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/build.yaml rename to packages/dynamite/packages/dynamite_end_to_end_test/build.yaml diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/all_of.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/all_of.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/all_of.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/all_of.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/all_of.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/all_of.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/all_of.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/all_of.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/all_of.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/all_of.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/all_of.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/all_of.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/any_of.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/any_of.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/any_of.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/any_of.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/any_of.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/any_of.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/any_of.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/any_of.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/any_of.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/any_of.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/any_of.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/any_of.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/authentication.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/authentication.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/authentication.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/authentication.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/authentication.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/authentication.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/authentication.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/authentication.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/deprecation.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/deprecation.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/deprecation.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/deprecation.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/deprecation.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/deprecation.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/deprecation.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/deprecation.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/deprecation.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/deprecation.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/deprecation.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/deprecation.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/documentation.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/documentation.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/documentation.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/documentation.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/documentation.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/documentation.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/documentation.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/documentation.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/documentation.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/documentation.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/documentation.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/documentation.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/enum.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/enum.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/enum.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/enum.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/enum.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/enum.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/headers.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/headers.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/headers.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/headers.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/headers.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/headers.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/headers.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/headers.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/headers.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/headers.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/headers.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/headers.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/interfaces.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/interfaces.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/interfaces.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/interfaces.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/interfaces.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/interfaces.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/nested_ofs.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/nested_ofs.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/nested_ofs.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/nested_ofs.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/one_of.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/one_of.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/one_of.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/one_of.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/one_of.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/one_of.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/one_of.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/one_of.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/one_of.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/one_of.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/one_of.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/one_of.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/parameters.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/parameters.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/parameters.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/parameters.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/parameters.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/parameters.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/parameters.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/parameters.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/parameters.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/parameters.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/parameters.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/parameters.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/pattern_check.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/pattern_check.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/pattern_check.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/pattern_check.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/pattern_check.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/pattern_check.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/pattern_check.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/pattern_check.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/pattern_check.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/pattern_check.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/pattern_check.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/pattern_check.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/request_body.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/request_body.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/request_body.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/request_body.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/request_body.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/request_body.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/request_body.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/request_body.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/request_body.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/request_body.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/request_body.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/request_body.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/responses.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/responses.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/responses.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/responses.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/responses.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/responses.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/responses.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/responses.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/some_of.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/some_of.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/some_of.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/some_of.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/some_of.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/some_of.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/some_of.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/some_of.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/some_of.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/some_of.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/some_of.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/some_of.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/tags.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/tags.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/tags.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/tags.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/tags.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/tags.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/tags.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/tags.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/type_defs.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/type_defs.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/type_defs.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/type_defs.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/type_defs.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/type_defs.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/type_defs.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/type_defs.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/type_defs.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/type_defs.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/type_defs.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/type_defs.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/types.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/types.openapi.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/types.openapi.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/types.openapi.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/types.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/types.openapi.g.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/types.openapi.g.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/types.openapi.g.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/types.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/types.openapi.json similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/lib/types.openapi.json rename to packages/dynamite/packages/dynamite_end_to_end_test/lib/types.openapi.json diff --git a/packages/dynamite/dynamite_end_to_end_test/pubspec.yaml b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/pubspec.yaml rename to packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml diff --git a/packages/dynamite/dynamite/example/pubspec_overrides.yaml b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml similarity index 78% rename from packages/dynamite/dynamite/example/pubspec_overrides.yaml rename to packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml index fd3b172cb02..9b80778757a 100644 --- a/packages/dynamite/dynamite/example/pubspec_overrides.yaml +++ b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml @@ -1,8 +1,8 @@ # melos_managed_dependency_overrides: dynamite,dynamite_runtime,neon_lints dependency_overrides: dynamite: - path: .. + path: ../.. dynamite_runtime: - path: ../../dynamite_runtime + path: ../dynamite_runtime neon_lints: path: ../../../neon_lints diff --git a/packages/dynamite/dynamite_end_to_end_test/test/all_of_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/all_of_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/all_of_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/all_of_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/any_of_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/any_of_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/any_of_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/any_of_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/authentication_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/authentication_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/authentication_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/authentication_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/enum_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/enum_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/enum_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/enum_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/interfaces_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/interfaces_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/interfaces_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/interfaces_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/nested_ofs_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/nested_ofs_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/nested_ofs_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/nested_ofs_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/one_of_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/one_of_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/one_of_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/one_of_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/parameters_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/parameters_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/parameters_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/parameters_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/pattern_check_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/pattern_check_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/pattern_check_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/pattern_check_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/request_body_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/request_body_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/request_body_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/request_body_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/some_of_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/some_of_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/some_of_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/some_of_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/tags_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/tags_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/tags_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/tags_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/type_defs_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/type_defs_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/type_defs_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/type_defs_test.dart diff --git a/packages/dynamite/dynamite_end_to_end_test/test/types_test.dart b/packages/dynamite/packages/dynamite_end_to_end_test/test/types_test.dart similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/test/types_test.dart rename to packages/dynamite/packages/dynamite_end_to_end_test/test/types_test.dart diff --git a/packages/dynamite/dynamite_runtime/CHANGELOG.md b/packages/dynamite/packages/dynamite_runtime/CHANGELOG.md similarity index 100% rename from packages/dynamite/dynamite_runtime/CHANGELOG.md rename to packages/dynamite/packages/dynamite_runtime/CHANGELOG.md diff --git a/packages/dynamite/packages/dynamite_runtime/LICENSE b/packages/dynamite/packages/dynamite_runtime/LICENSE new file mode 120000 index 00000000000..0fef81c998a --- /dev/null +++ b/packages/dynamite/packages/dynamite_runtime/LICENSE @@ -0,0 +1 @@ +../../../../assets/BSD-3-Clause.txt \ No newline at end of file diff --git a/packages/dynamite/dynamite_runtime/README.md b/packages/dynamite/packages/dynamite_runtime/README.md similarity index 95% rename from packages/dynamite/dynamite_runtime/README.md rename to packages/dynamite/packages/dynamite_runtime/README.md index ab4e607f626..8b2a2139911 100644 --- a/packages/dynamite/dynamite_runtime/README.md +++ b/packages/dynamite/packages/dynamite_runtime/README.md @@ -1,4 +1,4 @@ -Provides runtime helpers used by code generated with the [dynamite](https://github.com/nextcloud/neon/tree/main/packages/dynamite/dynamite) generator. +Provides runtime helpers used by code generated with the [dynamite](https://github.com/nextcloud/neon/tree/main/packages/dynamite) generator. # Licensing diff --git a/packages/dynamite/dynamite_runtime/analysis_options.yaml b/packages/dynamite/packages/dynamite_runtime/analysis_options.yaml similarity index 100% rename from packages/dynamite/dynamite_runtime/analysis_options.yaml rename to packages/dynamite/packages/dynamite_runtime/analysis_options.yaml diff --git a/packages/dynamite/dynamite_runtime/example/README.md b/packages/dynamite/packages/dynamite_runtime/example/README.md similarity index 54% rename from packages/dynamite/dynamite_runtime/example/README.md rename to packages/dynamite/packages/dynamite_runtime/example/README.md index 299da3f402b..5081515a922 100644 --- a/packages/dynamite/dynamite_runtime/example/README.md +++ b/packages/dynamite/packages/dynamite_runtime/example/README.md @@ -1,3 +1,3 @@ -This package only provides the runtime functions needed in code generated by the [dynamite](https://github.com/nextcloud/neon/tree/main/packages/dynamite/dynamite) generator. +This package only provides the runtime functions needed in code generated by the [dynamite](https://github.com/nextcloud/neon/tree/main/packages/dynamite) generator. -For a full example checkout the dynamite [example package](https://github.com/nextcloud/neon/tree/main/packages/dynamite/dynamite/example) using the OpenAPI petstore specification. +For a full example checkout the dynamite [example package](https://github.com/nextcloud/neon/tree/main/packages/dynamite/example) using the OpenAPI petstore specification. diff --git a/packages/dynamite/dynamite_runtime/lib/built_value.dart b/packages/dynamite/packages/dynamite_runtime/lib/built_value.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/built_value.dart rename to packages/dynamite/packages/dynamite_runtime/lib/built_value.dart diff --git a/packages/dynamite/dynamite_runtime/lib/http_client.dart b/packages/dynamite/packages/dynamite_runtime/lib/http_client.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/http_client.dart rename to packages/dynamite/packages/dynamite_runtime/lib/http_client.dart diff --git a/packages/dynamite/dynamite_runtime/lib/models.dart b/packages/dynamite/packages/dynamite_runtime/lib/models.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/models.dart rename to packages/dynamite/packages/dynamite_runtime/lib/models.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/built_value/content_string_serializer.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/built_value/content_string_serializer.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/built_value/content_string_serializer.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/built_value/content_string_serializer.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/built_value/double_serializer.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/built_value/double_serializer.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/built_value/double_serializer.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/built_value/double_serializer.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/built_value/header_serializer.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/built_value/header_serializer.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/built_value/header_serializer.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/built_value/header_serializer.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/client/authentication.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/client/authentication.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/client/authentication.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/client/authentication.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/client/client.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/client/client.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/client/client.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/client/client.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/client/exception.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/client/exception.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/client/exception.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/client/exception.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/client/response.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/client/response.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/client/response.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/client/response.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/models/content_string.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/models/content_string.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/models/content_string.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/models/content_string.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/models/content_string.g.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/models/content_string.g.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/models/content_string.g.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/models/content_string.g.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/models/header.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/models/header.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/models/header.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/models/header.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/models/header.g.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/models/header.g.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/models/header.g.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/models/header.g.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/utils/codecs.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/utils/codecs.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/utils/codecs.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/utils/codecs.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/utils/json_schema_validation.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/utils/json_schema_validation.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/utils/json_schema_validation.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/utils/json_schema_validation.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/utils/some_of_validators.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/utils/some_of_validators.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/utils/some_of_validators.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/utils/some_of_validators.dart diff --git a/packages/dynamite/dynamite_runtime/lib/src/utils/uri.dart b/packages/dynamite/packages/dynamite_runtime/lib/src/utils/uri.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/src/utils/uri.dart rename to packages/dynamite/packages/dynamite_runtime/lib/src/utils/uri.dart diff --git a/packages/dynamite/dynamite_runtime/lib/utils.dart b/packages/dynamite/packages/dynamite_runtime/lib/utils.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/lib/utils.dart rename to packages/dynamite/packages/dynamite_runtime/lib/utils.dart diff --git a/packages/dynamite/dynamite_runtime/pubspec.yaml b/packages/dynamite/packages/dynamite_runtime/pubspec.yaml similarity index 95% rename from packages/dynamite/dynamite_runtime/pubspec.yaml rename to packages/dynamite/packages/dynamite_runtime/pubspec.yaml index 483b5c9a46b..f73695a4cae 100644 --- a/packages/dynamite/dynamite_runtime/pubspec.yaml +++ b/packages/dynamite/packages/dynamite_runtime/pubspec.yaml @@ -2,7 +2,7 @@ name: dynamite_runtime description: The helper package used at runtime by code generated with the OpenAPI generator dynamite. version: 0.5.0 homepage: https://github.com/nextcloud/neon -repository: https://github.com/nextcloud/neon/tree/main/packages/dynamite/dynamite_runtime +repository: https://github.com/nextcloud/neon/tree/main/packages/dynamite/packages/dynamite_runtime topics: - openapi - codegen diff --git a/packages/dynamite/dynamite_runtime/pubspec_overrides.yaml b/packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml similarity index 73% rename from packages/dynamite/dynamite_runtime/pubspec_overrides.yaml rename to packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml index acded63f9b7..0e5d8123538 100644 --- a/packages/dynamite/dynamite_runtime/pubspec_overrides.yaml +++ b/packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml @@ -1,4 +1,4 @@ # melos_managed_dependency_overrides: neon_lints dependency_overrides: neon_lints: - path: ../../neon_lints + path: ../../../neon_lints diff --git a/packages/dynamite/dynamite_runtime/test/content_string_test.dart b/packages/dynamite/packages/dynamite_runtime/test/content_string_test.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/test/content_string_test.dart rename to packages/dynamite/packages/dynamite_runtime/test/content_string_test.dart diff --git a/packages/dynamite/dynamite_runtime/test/content_string_test.g.dart b/packages/dynamite/packages/dynamite_runtime/test/content_string_test.g.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/test/content_string_test.g.dart rename to packages/dynamite/packages/dynamite_runtime/test/content_string_test.g.dart diff --git a/packages/dynamite/dynamite_runtime/test/double_serializer_test.dart b/packages/dynamite/packages/dynamite_runtime/test/double_serializer_test.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/test/double_serializer_test.dart rename to packages/dynamite/packages/dynamite_runtime/test/double_serializer_test.dart diff --git a/packages/dynamite/dynamite_runtime/test/header_test.dart b/packages/dynamite/packages/dynamite_runtime/test/header_test.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/test/header_test.dart rename to packages/dynamite/packages/dynamite_runtime/test/header_test.dart diff --git a/packages/dynamite/dynamite_runtime/test/header_test.g.dart b/packages/dynamite/packages/dynamite_runtime/test/header_test.g.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/test/header_test.g.dart rename to packages/dynamite/packages/dynamite_runtime/test/header_test.g.dart diff --git a/packages/dynamite/dynamite_runtime/test/json_schema_validation_test.dart b/packages/dynamite/packages/dynamite_runtime/test/json_schema_validation_test.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/test/json_schema_validation_test.dart rename to packages/dynamite/packages/dynamite_runtime/test/json_schema_validation_test.dart diff --git a/packages/dynamite/dynamite_runtime/test/uri_test.dart b/packages/dynamite/packages/dynamite_runtime/test/uri_test.dart similarity index 100% rename from packages/dynamite/dynamite_runtime/test/uri_test.dart rename to packages/dynamite/packages/dynamite_runtime/test/uri_test.dart diff --git a/packages/dynamite/dynamite/pubspec.yaml b/packages/dynamite/pubspec.yaml similarity index 97% rename from packages/dynamite/dynamite/pubspec.yaml rename to packages/dynamite/pubspec.yaml index 7bed4f251d9..6c37e98d482 100644 --- a/packages/dynamite/dynamite/pubspec.yaml +++ b/packages/dynamite/pubspec.yaml @@ -2,7 +2,7 @@ name: dynamite version: 0.5.0 description: Provides a Dart Build System builder for generating clients from OpenAPI specifications. homepage: https://github.com/nextcloud/neon -repository: https://github.com/nextcloud/neon/tree/main/packages/dynamite/dynamite +repository: https://github.com/nextcloud/neon/tree/main/packages/dynamite topics: - openapi - codegen diff --git a/packages/file_icons/pubspec_overrides.yaml b/packages/dynamite/pubspec_overrides.yaml similarity index 100% rename from packages/file_icons/pubspec_overrides.yaml rename to packages/dynamite/pubspec_overrides.yaml diff --git a/packages/dynamite/dynamite/test/dart_helpers_test.dart b/packages/dynamite/test/dart_helpers_test.dart similarity index 100% rename from packages/dynamite/dynamite/test/dart_helpers_test.dart rename to packages/dynamite/test/dart_helpers_test.dart diff --git a/packages/dynamite/dynamite/test/json_schema_test.dart b/packages/dynamite/test/json_schema_test.dart similarity index 100% rename from packages/dynamite/dynamite/test/json_schema_test.dart rename to packages/dynamite/test/json_schema_test.dart diff --git a/packages/dynamite/dynamite/test/openapi_spec_test.dart b/packages/dynamite/test/openapi_spec_test.dart similarity index 100% rename from packages/dynamite/dynamite/test/openapi_spec_test.dart rename to packages/dynamite/test/openapi_spec_test.dart diff --git a/packages/dynamite/dynamite/test/type_result_test.dart b/packages/dynamite/test/type_result_test.dart similarity index 100% rename from packages/dynamite/dynamite/test/type_result_test.dart rename to packages/dynamite/test/type_result_test.dart diff --git a/packages/file_icons/LICENSE b/packages/file_icons/LICENSE deleted file mode 120000 index af8c58b151a..00000000000 --- a/packages/file_icons/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_dashboard/LICENSE b/packages/neon/neon_dashboard/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_dashboard/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_files/LICENSE b/packages/neon/neon_files/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_files/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_files/pubspec_overrides.yaml b/packages/neon/neon_files/pubspec_overrides.yaml deleted file mode 100644 index 445ed2d3271..00000000000 --- a/packages/neon/neon_files/pubspec_overrides.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,file_icons,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box -dependency_overrides: - cookie_store: - path: ../../cookie_store - dynamite_runtime: - path: ../../dynamite/dynamite_runtime - file_icons: - path: ../../file_icons - neon_framework: - path: ../../neon_framework - neon_http_client: - path: ../../neon_http_client - neon_lints: - path: ../../neon_lints - nextcloud: - path: ../../nextcloud - sort_box: - path: ../../sort_box diff --git a/packages/neon/neon_news/LICENSE b/packages/neon/neon_news/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_news/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_notes/LICENSE b/packages/neon/neon_notes/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_notes/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_notifications/LICENSE b/packages/neon/neon_notifications/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_notifications/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_talk/LICENSE b/packages/neon/neon_talk/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_talk/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_talk/pubspec_overrides.yaml b/packages/neon/neon_talk/pubspec_overrides.yaml deleted file mode 100644 index 31ba5fa6de8..00000000000 --- a/packages/neon/neon_talk/pubspec_overrides.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# melos_managed_dependency_overrides: neon_http_client -dependency_overrides: - cookie_store: - path: ../../cookie_store - dynamite_runtime: - path: ../../dynamite/dynamite_runtime - file_icons: - path: ../../file_icons - neon_framework: - path: ../../neon_framework - neon_http_client: - path: ../../neon_http_client - neon_lints: - path: ../../neon_lints - nextcloud: - path: ../../nextcloud - sort_box: - path: ../../sort_box diff --git a/packages/neon_framework/.pubignore b/packages/neon_framework/.pubignore new file mode 100644 index 00000000000..23053de093d --- /dev/null +++ b/packages/neon_framework/.pubignore @@ -0,0 +1 @@ +packages/ diff --git a/packages/app/.gitattributes b/packages/neon_framework/example/.gitattributes similarity index 100% rename from packages/app/.gitattributes rename to packages/neon_framework/example/.gitattributes diff --git a/packages/app/.metadata b/packages/neon_framework/example/.metadata similarity index 100% rename from packages/app/.metadata rename to packages/neon_framework/example/.metadata diff --git a/packages/neon_framework/example/.pubignore b/packages/neon_framework/example/.pubignore new file mode 100644 index 00000000000..23053de093d --- /dev/null +++ b/packages/neon_framework/example/.pubignore @@ -0,0 +1 @@ +packages/ diff --git a/packages/dynamite/dynamite_end_to_end_test/LICENSE b/packages/neon_framework/example/LICENSE similarity index 100% rename from packages/dynamite/dynamite_end_to_end_test/LICENSE rename to packages/neon_framework/example/LICENSE diff --git a/packages/app/README.md b/packages/neon_framework/example/README.md similarity index 52% rename from packages/app/README.md rename to packages/neon_framework/example/README.md index a671c4130ba..b164efccbbd 100644 --- a/packages/app/README.md +++ b/packages/neon_framework/example/README.md @@ -26,7 +26,7 @@ flatpak run de.provokateurin.neon For more screenshots see `./screenshots/`. -| ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/app/screenshots/login_server_selection.png) | ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/app/screenshots/home_drawer.png) | ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/app/screenshots/settings_oled.png) | -|----------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------| -| ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/app/screenshots/files_photos.png) | ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/app/screenshots/news_articles_unread_list.png) | ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/app/screenshots/notes_note_edit.png) | -| ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/app/screenshots/notifications_list.png) | | | +| ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/neon_framework/example/screenshots/login_server_selection.png) | ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/neon_framework/example/screenshots/home_drawer.png) | ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/neon_framework/example/screenshots/settings_oled.png) | +|-----------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------| +| ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/neon_framework/example/screenshots/files_photos.png) | ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/neon_framework/example/screenshots/news_articles_unread_list.png) | ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/neon_framework/example/screenshots/notes_note_edit.png) | +| ![](https://raw.githubusercontent.com/nextcloud/neon/main/packages/neon_framework/example/screenshots/notifications_list.png) | | | diff --git a/packages/app/analysis_options.yaml b/packages/neon_framework/example/analysis_options.yaml similarity index 100% rename from packages/app/analysis_options.yaml rename to packages/neon_framework/example/analysis_options.yaml diff --git a/packages/app/android/.gitignore b/packages/neon_framework/example/android/.gitignore similarity index 100% rename from packages/app/android/.gitignore rename to packages/neon_framework/example/android/.gitignore diff --git a/packages/app/android/app/build.gradle b/packages/neon_framework/example/android/app/build.gradle similarity index 100% rename from packages/app/android/app/build.gradle rename to packages/neon_framework/example/android/app/build.gradle diff --git a/packages/app/android/app/src/debug/AndroidManifest.xml b/packages/neon_framework/example/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from packages/app/android/app/src/debug/AndroidManifest.xml rename to packages/neon_framework/example/android/app/src/debug/AndroidManifest.xml diff --git a/packages/app/android/app/src/debug/res/values/string.xml b/packages/neon_framework/example/android/app/src/debug/res/values/string.xml similarity index 100% rename from packages/app/android/app/src/debug/res/values/string.xml rename to packages/neon_framework/example/android/app/src/debug/res/values/string.xml diff --git a/packages/app/android/app/src/main/AndroidManifest.xml b/packages/neon_framework/example/android/app/src/main/AndroidManifest.xml similarity index 100% rename from packages/app/android/app/src/main/AndroidManifest.xml rename to packages/neon_framework/example/android/app/src/main/AndroidManifest.xml diff --git a/packages/app/android/app/src/main/kotlin/de/provokateurin/neon/EmbeddedDistributor.kt b/packages/neon_framework/example/android/app/src/main/kotlin/de/provokateurin/neon/EmbeddedDistributor.kt similarity index 100% rename from packages/app/android/app/src/main/kotlin/de/provokateurin/neon/EmbeddedDistributor.kt rename to packages/neon_framework/example/android/app/src/main/kotlin/de/provokateurin/neon/EmbeddedDistributor.kt diff --git a/packages/app/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt b/packages/neon_framework/example/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt similarity index 100% rename from packages/app/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt rename to packages/neon_framework/example/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt diff --git a/packages/app/android/app/src/main/res/drawable-hdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-hdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-hdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-hdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-hdpi/splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-hdpi/splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-hdpi/splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-hdpi/splash.png diff --git a/packages/app/android/app/src/main/res/drawable-mdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-mdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-mdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-mdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-mdpi/splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-mdpi/splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-mdpi/splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-mdpi/splash.png diff --git a/packages/app/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-night-hdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-night-hdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-night-hdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-night-mdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-night-mdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-night-mdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-night-v21/background.png b/packages/neon_framework/example/android/app/src/main/res/drawable-night-v21/background.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-night-v21/background.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-night-v21/background.png diff --git a/packages/app/android/app/src/main/res/drawable-night-v21/launch_background.xml b/packages/neon_framework/example/android/app/src/main/res/drawable-night-v21/launch_background.xml similarity index 100% rename from packages/app/android/app/src/main/res/drawable-night-v21/launch_background.xml rename to packages/neon_framework/example/android/app/src/main/res/drawable-night-v21/launch_background.xml diff --git a/packages/app/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-night-xhdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-night-xhdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-night-xhdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-night/background.png b/packages/neon_framework/example/android/app/src/main/res/drawable-night/background.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-night/background.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-night/background.png diff --git a/packages/app/android/app/src/main/res/drawable-night/launch_background.xml b/packages/neon_framework/example/android/app/src/main/res/drawable-night/launch_background.xml similarity index 100% rename from packages/app/android/app/src/main/res/drawable-night/launch_background.xml rename to packages/neon_framework/example/android/app/src/main/res/drawable-night/launch_background.xml diff --git a/packages/app/android/app/src/main/res/drawable-v21/background.png b/packages/neon_framework/example/android/app/src/main/res/drawable-v21/background.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-v21/background.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-v21/background.png diff --git a/packages/app/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/neon_framework/example/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from packages/app/android/app/src/main/res/drawable-v21/launch_background.xml rename to packages/neon_framework/example/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/packages/app/android/app/src/main/res/drawable-xhdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-xhdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-xhdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-xhdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-xhdpi/splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-xhdpi/splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-xhdpi/splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-xhdpi/splash.png diff --git a/packages/app/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-xxhdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-xxhdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-xxhdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-xxhdpi/splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-xxhdpi/splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-xxhdpi/splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-xxhdpi/splash.png diff --git a/packages/app/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-xxxhdpi/android12splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-xxxhdpi/android12splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-xxxhdpi/android12splash.png diff --git a/packages/app/android/app/src/main/res/drawable-xxxhdpi/splash.png b/packages/neon_framework/example/android/app/src/main/res/drawable-xxxhdpi/splash.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable-xxxhdpi/splash.png rename to packages/neon_framework/example/android/app/src/main/res/drawable-xxxhdpi/splash.png diff --git a/packages/app/android/app/src/main/res/drawable/background.png b/packages/neon_framework/example/android/app/src/main/res/drawable/background.png similarity index 100% rename from packages/app/android/app/src/main/res/drawable/background.png rename to packages/neon_framework/example/android/app/src/main/res/drawable/background.png diff --git a/packages/app/android/app/src/main/res/drawable/launch_background.xml b/packages/neon_framework/example/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from packages/app/android/app/src/main/res/drawable/launch_background.xml rename to packages/neon_framework/example/android/app/src/main/res/drawable/launch_background.xml diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/app_dashboard.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/dashboard_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-hdpi/app_dashboard.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/dashboard_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/app_files.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/files_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-hdpi/app_files.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/files_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/app_news.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/news_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-hdpi/app_news.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/news_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/app_notes.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/notes_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-hdpi/app_notes.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/notes_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/app_notifications.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/notifications_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-hdpi/app_notifications.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/notifications_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/app_talk.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/talk_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-hdpi/app_talk.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-hdpi/talk_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/app_dashboard.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/dashboard_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-mdpi/app_dashboard.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/dashboard_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/app_files.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/files_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-mdpi/app_files.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/files_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/app_news.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/news_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-mdpi/app_news.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/news_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/app_notes.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/notes_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-mdpi/app_notes.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/notes_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/app_notifications.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/notifications_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-mdpi/app_notifications.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/notifications_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/app_talk.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/talk_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-mdpi/app_talk.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-mdpi/talk_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/app_dashboard.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/dashboard_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xhdpi/app_dashboard.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/dashboard_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/app_files.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/files_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xhdpi/app_files.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/files_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/app_news.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/news_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xhdpi/app_news.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/news_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/app_notes.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/notes_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xhdpi/app_notes.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/notes_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/app_notifications.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/notifications_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xhdpi/app_notifications.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/notifications_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/app_talk.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/talk_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xhdpi/app_talk.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xhdpi/talk_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_dashboard.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/dashboard_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxhdpi/app_dashboard.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/dashboard_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_files.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/files_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxhdpi/app_files.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/files_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_news.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/news_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxhdpi/app_news.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/news_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_notes.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/notes_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxhdpi/app_notes.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/notes_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_notifications.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/notifications_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxhdpi/app_notifications.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/notifications_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_talk.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/talk_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxhdpi/app_talk.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxhdpi/talk_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_dashboard.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/dashboard_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_dashboard.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/dashboard_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_files.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/files_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_files.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/files_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_news.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/news_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_news.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/news_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/notes_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/notes_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_notifications.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/notifications_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_notifications.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/notifications_app.png diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_talk.png b/packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/talk_app.png similarity index 100% rename from packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_talk.png rename to packages/neon_framework/example/android/app/src/main/res/mipmap-xxxhdpi/talk_app.png diff --git a/packages/app/android/app/src/main/res/raw/keep.xml b/packages/neon_framework/example/android/app/src/main/res/raw/keep.xml similarity index 70% rename from packages/app/android/app/src/main/res/raw/keep.xml rename to packages/neon_framework/example/android/app/src/main/res/raw/keep.xml index c4cb8ab2910..348e90b5bf2 100644 --- a/packages/app/android/app/src/main/res/raw/keep.xml +++ b/packages/neon_framework/example/android/app/src/main/res/raw/keep.xml @@ -1,3 +1,3 @@ + tools:keep="@mipmap/*_app"/> diff --git a/packages/app/android/app/src/main/res/values-night-v31/styles.xml b/packages/neon_framework/example/android/app/src/main/res/values-night-v31/styles.xml similarity index 100% rename from packages/app/android/app/src/main/res/values-night-v31/styles.xml rename to packages/neon_framework/example/android/app/src/main/res/values-night-v31/styles.xml diff --git a/packages/app/android/app/src/main/res/values-night/styles.xml b/packages/neon_framework/example/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from packages/app/android/app/src/main/res/values-night/styles.xml rename to packages/neon_framework/example/android/app/src/main/res/values-night/styles.xml diff --git a/packages/app/android/app/src/main/res/values-v31/styles.xml b/packages/neon_framework/example/android/app/src/main/res/values-v31/styles.xml similarity index 100% rename from packages/app/android/app/src/main/res/values-v31/styles.xml rename to packages/neon_framework/example/android/app/src/main/res/values-v31/styles.xml diff --git a/packages/app/android/app/src/main/res/values/string.xml b/packages/neon_framework/example/android/app/src/main/res/values/string.xml similarity index 100% rename from packages/app/android/app/src/main/res/values/string.xml rename to packages/neon_framework/example/android/app/src/main/res/values/string.xml diff --git a/packages/app/android/app/src/main/res/values/styles.xml b/packages/neon_framework/example/android/app/src/main/res/values/styles.xml similarity index 100% rename from packages/app/android/app/src/main/res/values/styles.xml rename to packages/neon_framework/example/android/app/src/main/res/values/styles.xml diff --git a/packages/app/android/app/src/profile/AndroidManifest.xml b/packages/neon_framework/example/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from packages/app/android/app/src/profile/AndroidManifest.xml rename to packages/neon_framework/example/android/app/src/profile/AndroidManifest.xml diff --git a/packages/app/android/build.gradle b/packages/neon_framework/example/android/build.gradle similarity index 100% rename from packages/app/android/build.gradle rename to packages/neon_framework/example/android/build.gradle diff --git a/packages/app/android/gradle.properties b/packages/neon_framework/example/android/gradle.properties similarity index 100% rename from packages/app/android/gradle.properties rename to packages/neon_framework/example/android/gradle.properties diff --git a/packages/app/android/gradle/wrapper/gradle-wrapper.properties b/packages/neon_framework/example/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from packages/app/android/gradle/wrapper/gradle-wrapper.properties rename to packages/neon_framework/example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/app/android/settings.gradle b/packages/neon_framework/example/android/settings.gradle similarity index 100% rename from packages/app/android/settings.gradle rename to packages/neon_framework/example/android/settings.gradle diff --git a/packages/app/assets/logo.svg b/packages/neon_framework/example/assets/logo.svg similarity index 100% rename from packages/app/assets/logo.svg rename to packages/neon_framework/example/assets/logo.svg diff --git a/packages/app/assets/logo.svg.vec b/packages/neon_framework/example/assets/logo.svg.vec similarity index 100% rename from packages/app/assets/logo.svg.vec rename to packages/neon_framework/example/assets/logo.svg.vec diff --git a/packages/app/de.provokateurin.neon.desktop b/packages/neon_framework/example/de.provokateurin.neon.desktop similarity index 100% rename from packages/app/de.provokateurin.neon.desktop rename to packages/neon_framework/example/de.provokateurin.neon.desktop diff --git a/packages/app/de.provokateurin.neon.yaml b/packages/neon_framework/example/de.provokateurin.neon.yaml similarity index 100% rename from packages/app/de.provokateurin.neon.yaml rename to packages/neon_framework/example/de.provokateurin.neon.yaml diff --git a/packages/app/flutter_native_splash.yaml b/packages/neon_framework/example/flutter_native_splash.yaml similarity index 100% rename from packages/app/flutter_native_splash.yaml rename to packages/neon_framework/example/flutter_native_splash.yaml diff --git a/packages/app/img/splash_icon.png b/packages/neon_framework/example/img/splash_icon.png similarity index 100% rename from packages/app/img/splash_icon.png rename to packages/neon_framework/example/img/splash_icon.png diff --git a/packages/app/img/splash_icon_android_12.png b/packages/neon_framework/example/img/splash_icon_android_12.png similarity index 100% rename from packages/app/img/splash_icon_android_12.png rename to packages/neon_framework/example/img/splash_icon_android_12.png diff --git a/packages/app/lib/apps.dart b/packages/neon_framework/example/lib/apps.dart similarity index 56% rename from packages/app/lib/apps.dart rename to packages/neon_framework/example/lib/apps.dart index ecdf2f1704d..62351c02660 100644 --- a/packages/app/lib/apps.dart +++ b/packages/neon_framework/example/lib/apps.dart @@ -1,12 +1,12 @@ import 'package:built_collection/built_collection.dart'; +import 'package:dashboard_app/dashboard_app.dart'; +import 'package:files_app/files_app.dart'; import 'package:flutter/foundation.dart'; -import 'package:neon_dashboard/neon_dashboard.dart'; -import 'package:neon_files/neon_files.dart'; import 'package:neon_framework/models.dart'; -import 'package:neon_news/neon_news.dart'; -import 'package:neon_notes/neon_notes.dart'; -import 'package:neon_notifications/neon_notifications.dart'; -import 'package:neon_talk/neon_talk.dart'; +import 'package:news_app/news_app.dart'; +import 'package:notes_app/notes_app.dart'; +import 'package:notifications_app/notifications_app.dart'; +import 'package:talk_app/talk_app.dart'; /// The collection of clients enabled for the Neon app. final BuiltSet appImplementations = BuiltSet({ diff --git a/packages/app/lib/branding.dart b/packages/neon_framework/example/lib/branding.dart similarity index 100% rename from packages/app/lib/branding.dart rename to packages/neon_framework/example/lib/branding.dart diff --git a/packages/app/lib/main.dart b/packages/neon_framework/example/lib/main.dart similarity index 68% rename from packages/app/lib/main.dart rename to packages/neon_framework/example/lib/main.dart index e26e69bb404..02c35cfc0bd 100644 --- a/packages/app/lib/main.dart +++ b/packages/neon_framework/example/lib/main.dart @@ -1,5 +1,5 @@ -import 'package:app/apps.dart'; -import 'package:app/branding.dart'; +import 'package:example/apps.dart'; +import 'package:example/branding.dart'; import 'package:neon_framework/neon.dart'; Future main() async { diff --git a/packages/app/linux/.gitignore b/packages/neon_framework/example/linux/.gitignore similarity index 100% rename from packages/app/linux/.gitignore rename to packages/neon_framework/example/linux/.gitignore diff --git a/packages/app/linux/CMakeLists.txt b/packages/neon_framework/example/linux/CMakeLists.txt similarity index 100% rename from packages/app/linux/CMakeLists.txt rename to packages/neon_framework/example/linux/CMakeLists.txt diff --git a/packages/app/linux/flutter/CMakeLists.txt b/packages/neon_framework/example/linux/flutter/CMakeLists.txt similarity index 100% rename from packages/app/linux/flutter/CMakeLists.txt rename to packages/neon_framework/example/linux/flutter/CMakeLists.txt diff --git a/packages/app/linux/flutter/generated_plugin_registrant.cc b/packages/neon_framework/example/linux/flutter/generated_plugin_registrant.cc similarity index 100% rename from packages/app/linux/flutter/generated_plugin_registrant.cc rename to packages/neon_framework/example/linux/flutter/generated_plugin_registrant.cc diff --git a/packages/app/linux/flutter/generated_plugin_registrant.h b/packages/neon_framework/example/linux/flutter/generated_plugin_registrant.h similarity index 100% rename from packages/app/linux/flutter/generated_plugin_registrant.h rename to packages/neon_framework/example/linux/flutter/generated_plugin_registrant.h diff --git a/packages/app/linux/flutter/generated_plugins.cmake b/packages/neon_framework/example/linux/flutter/generated_plugins.cmake similarity index 100% rename from packages/app/linux/flutter/generated_plugins.cmake rename to packages/neon_framework/example/linux/flutter/generated_plugins.cmake diff --git a/packages/app/linux/main.cc b/packages/neon_framework/example/linux/main.cc similarity index 100% rename from packages/app/linux/main.cc rename to packages/neon_framework/example/linux/main.cc diff --git a/packages/app/linux/my_application.cc b/packages/neon_framework/example/linux/my_application.cc similarity index 100% rename from packages/app/linux/my_application.cc rename to packages/neon_framework/example/linux/my_application.cc diff --git a/packages/app/linux/my_application.h b/packages/neon_framework/example/linux/my_application.h similarity index 100% rename from packages/app/linux/my_application.h rename to packages/neon_framework/example/linux/my_application.h diff --git a/packages/app/pubspec.lock b/packages/neon_framework/example/pubspec.lock similarity index 98% rename from packages/app/pubspec.lock rename to packages/neon_framework/example/pubspec.lock index 783f6225418..7805d7cf546 100644 --- a/packages/app/pubspec.lock +++ b/packages/neon_framework/example/pubspec.lock @@ -193,7 +193,7 @@ packages: cookie_store: dependency: "direct overridden" description: - path: "../cookie_store" + path: "../../cookie_store" relative: true source: path version: "0.1.0" @@ -245,6 +245,13 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.6" + dashboard_app: + dependency: "direct main" + description: + path: "../packages/dashboard_app" + relative: true + source: path + version: "1.0.0" dbus: dependency: transitive description: @@ -280,7 +287,7 @@ packages: dynamite_runtime: dependency: "direct overridden" description: - path: "../dynamite/dynamite_runtime" + path: "../../dynamite/packages/dynamite_runtime" relative: true source: path version: "0.5.0" @@ -316,13 +323,6 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.0" - file_icons: - dependency: "direct overridden" - description: - path: "../file_icons" - relative: true - source: path - version: "1.0.0" file_picker: dependency: transitive description: @@ -363,6 +363,20 @@ packages: url: "https://pub.dev" source: hosted version: "0.9.3+2" + files_app: + dependency: "direct main" + description: + path: "../packages/files_app" + relative: true + source: path + version: "1.0.0" + files_icons: + dependency: "direct overridden" + description: + path: "../packages/files_icons" + relative: true + source: path + version: "1.0.0" filesize: dependency: transitive description: @@ -783,84 +797,63 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - neon_dashboard: - dependency: "direct main" - description: - path: "../neon/neon_dashboard" - relative: true - source: path - version: "1.0.0" - neon_files: - dependency: "direct main" - description: - path: "../neon/neon_files" - relative: true - source: path - version: "1.0.0" neon_framework: dependency: "direct main" description: - path: "../neon_framework" + path: ".." relative: true source: path version: "1.0.0" neon_http_client: dependency: "direct overridden" description: - path: "../neon_http_client" + path: "../packages/neon_http_client" relative: true source: path version: "0.1.0" neon_lints: dependency: "direct dev" description: - path: "../neon_lints" + path: "../../neon_lints" relative: true source: path version: "1.0.0" - neon_news: - dependency: "direct main" + nested: + dependency: transitive description: - path: "../neon/neon_news" - relative: true - source: path + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted version: "1.0.0" - neon_notes: + news_app: dependency: "direct main" description: - path: "../neon/neon_notes" + path: "../packages/news_app" relative: true source: path version: "1.0.0" - neon_notifications: - dependency: "direct main" + nextcloud: + dependency: "direct overridden" description: - path: "../neon/neon_notifications" + path: "../../nextcloud" relative: true source: path - version: "1.0.0" - neon_talk: + version: "7.0.0" + notes_app: dependency: "direct main" description: - path: "../neon/neon_talk" + path: "../packages/notes_app" relative: true source: path version: "1.0.0" - nested: - dependency: transitive - description: - name: nested - sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - nextcloud: - dependency: "direct overridden" + notifications_app: + dependency: "direct main" description: - path: "../nextcloud" + path: "../packages/notifications_app" relative: true source: path - version: "7.0.0" + version: "1.0.0" open_filex: dependency: transitive description: @@ -1261,7 +1254,7 @@ packages: sort_box: dependency: "direct overridden" description: - path: "../sort_box" + path: "../packages/sort_box" relative: true source: path version: "1.0.0" @@ -1361,6 +1354,13 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.0+1" + talk_app: + dependency: "direct main" + description: + path: "../packages/talk_app" + relative: true + source: path + version: "1.0.0" term_glyph: dependency: transitive description: diff --git a/packages/app/pubspec.yaml b/packages/neon_framework/example/pubspec.yaml similarity index 65% rename from packages/app/pubspec.yaml rename to packages/neon_framework/example/pubspec.yaml index b0cdfa34a14..e99dd8816a3 100644 --- a/packages/app/pubspec.yaml +++ b/packages/neon_framework/example/pubspec.yaml @@ -1,4 +1,4 @@ -name: app +name: example version: 1.0.0 publish_to: 'none' @@ -8,36 +8,36 @@ environment: dependencies: built_collection: ^5.0.0 - flutter: - sdk: flutter - neon_dashboard: + dashboard_app: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_dashboard - neon_files: + path: packages/neon_framework/packages/dashboard_app + files_app: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_files + path: packages/neon_framework/packages/files_app + flutter: + sdk: flutter neon_framework: git: url: https://github.com/nextcloud/neon path: packages/neon_framework - neon_news: + news_app: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_news - neon_notes: + path: packages/neon_framework/packages/news_app + notes_app: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_notes - neon_notifications: + path: packages/neon_framework/packages/notes_app + notifications_app: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_notifications - neon_talk: + path: packages/neon_framework/packages/notifications_app + talk_app: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_talk + path: packages/neon_framework/packages/talk_app vector_graphics: any dev_dependencies: diff --git a/packages/neon_framework/example/pubspec_overrides.yaml b/packages/neon_framework/example/pubspec_overrides.yaml new file mode 100644 index 00000000000..9c7851cbef6 --- /dev/null +++ b/packages/neon_framework/example/pubspec_overrides.yaml @@ -0,0 +1,30 @@ +# melos_managed_dependency_overrides: cookie_store,dashboard_app,dynamite_runtime,files_app,files_icons,neon_framework,neon_http_client,neon_lints,news_app,nextcloud,notes_app,notifications_app,sort_box,talk_app +dependency_overrides: + cookie_store: + path: ../../cookie_store + dashboard_app: + path: ../packages/dashboard_app + dynamite_runtime: + path: ../../dynamite/packages/dynamite_runtime + files_app: + path: ../packages/files_app + files_icons: + path: ../packages/files_icons + neon_framework: + path: .. + neon_http_client: + path: ../packages/neon_http_client + neon_lints: + path: ../../neon_lints + news_app: + path: ../packages/news_app + nextcloud: + path: ../../nextcloud + notes_app: + path: ../packages/notes_app + notifications_app: + path: ../packages/notifications_app + sort_box: + path: ../packages/sort_box + talk_app: + path: ../packages/talk_app diff --git a/packages/app/screenshots/files_actions.png b/packages/neon_framework/example/screenshots/files_actions.png similarity index 100% rename from packages/app/screenshots/files_actions.png rename to packages/neon_framework/example/screenshots/files_actions.png diff --git a/packages/app/screenshots/files_create.png b/packages/neon_framework/example/screenshots/files_create.png similarity index 100% rename from packages/app/screenshots/files_create.png rename to packages/neon_framework/example/screenshots/files_create.png diff --git a/packages/app/screenshots/files_details.png b/packages/neon_framework/example/screenshots/files_details.png similarity index 100% rename from packages/app/screenshots/files_details.png rename to packages/neon_framework/example/screenshots/files_details.png diff --git a/packages/app/screenshots/files_photos.png b/packages/neon_framework/example/screenshots/files_photos.png similarity index 100% rename from packages/app/screenshots/files_photos.png rename to packages/neon_framework/example/screenshots/files_photos.png diff --git a/packages/app/screenshots/files_root.png b/packages/neon_framework/example/screenshots/files_root.png similarity index 100% rename from packages/app/screenshots/files_root.png rename to packages/neon_framework/example/screenshots/files_root.png diff --git a/packages/app/screenshots/home_drawer.png b/packages/neon_framework/example/screenshots/home_drawer.png similarity index 100% rename from packages/app/screenshots/home_drawer.png rename to packages/neon_framework/example/screenshots/home_drawer.png diff --git a/packages/app/screenshots/login_server_selection.png b/packages/neon_framework/example/screenshots/login_server_selection.png similarity index 100% rename from packages/app/screenshots/login_server_selection.png rename to packages/neon_framework/example/screenshots/login_server_selection.png diff --git a/packages/app/screenshots/news_articles_starred_list.png b/packages/neon_framework/example/screenshots/news_articles_starred_list.png similarity index 100% rename from packages/app/screenshots/news_articles_starred_list.png rename to packages/neon_framework/example/screenshots/news_articles_starred_list.png diff --git a/packages/app/screenshots/news_articles_unread_list.png b/packages/neon_framework/example/screenshots/news_articles_unread_list.png similarity index 100% rename from packages/app/screenshots/news_articles_unread_list.png rename to packages/neon_framework/example/screenshots/news_articles_unread_list.png diff --git a/packages/app/screenshots/news_feed_add.png b/packages/neon_framework/example/screenshots/news_feed_add.png similarity index 100% rename from packages/app/screenshots/news_feed_add.png rename to packages/neon_framework/example/screenshots/news_feed_add.png diff --git a/packages/app/screenshots/news_feed_articles_list.png b/packages/neon_framework/example/screenshots/news_feed_articles_list.png similarity index 100% rename from packages/app/screenshots/news_feed_articles_list.png rename to packages/neon_framework/example/screenshots/news_feed_articles_list.png diff --git a/packages/app/screenshots/news_feeds_list.png b/packages/neon_framework/example/screenshots/news_feeds_list.png similarity index 100% rename from packages/app/screenshots/news_feeds_list.png rename to packages/neon_framework/example/screenshots/news_feeds_list.png diff --git a/packages/app/screenshots/news_folders_list.png b/packages/neon_framework/example/screenshots/news_folders_list.png similarity index 100% rename from packages/app/screenshots/news_folders_list.png rename to packages/neon_framework/example/screenshots/news_folders_list.png diff --git a/packages/app/screenshots/notes_categories_list.png b/packages/neon_framework/example/screenshots/notes_categories_list.png similarity index 100% rename from packages/app/screenshots/notes_categories_list.png rename to packages/neon_framework/example/screenshots/notes_categories_list.png diff --git a/packages/app/screenshots/notes_note_create.png b/packages/neon_framework/example/screenshots/notes_note_create.png similarity index 100% rename from packages/app/screenshots/notes_note_create.png rename to packages/neon_framework/example/screenshots/notes_note_create.png diff --git a/packages/app/screenshots/notes_note_edit.png b/packages/neon_framework/example/screenshots/notes_note_edit.png similarity index 100% rename from packages/app/screenshots/notes_note_edit.png rename to packages/neon_framework/example/screenshots/notes_note_edit.png diff --git a/packages/app/screenshots/notes_note_preview.png b/packages/neon_framework/example/screenshots/notes_note_preview.png similarity index 100% rename from packages/app/screenshots/notes_note_preview.png rename to packages/neon_framework/example/screenshots/notes_note_preview.png diff --git a/packages/app/screenshots/notes_notes_list.png b/packages/neon_framework/example/screenshots/notes_notes_list.png similarity index 100% rename from packages/app/screenshots/notes_notes_list.png rename to packages/neon_framework/example/screenshots/notes_notes_list.png diff --git a/packages/app/screenshots/notifications_list.png b/packages/neon_framework/example/screenshots/notifications_list.png similarity index 100% rename from packages/app/screenshots/notifications_list.png rename to packages/neon_framework/example/screenshots/notifications_list.png diff --git a/packages/app/screenshots/settings_account.png b/packages/neon_framework/example/screenshots/settings_account.png similarity index 100% rename from packages/app/screenshots/settings_account.png rename to packages/neon_framework/example/screenshots/settings_account.png diff --git a/packages/app/screenshots/settings_accounts.png b/packages/neon_framework/example/screenshots/settings_accounts.png similarity index 100% rename from packages/app/screenshots/settings_accounts.png rename to packages/neon_framework/example/screenshots/settings_accounts.png diff --git a/packages/app/screenshots/settings_app_files.png b/packages/neon_framework/example/screenshots/settings_app_files.png similarity index 100% rename from packages/app/screenshots/settings_app_files.png rename to packages/neon_framework/example/screenshots/settings_app_files.png diff --git a/packages/app/screenshots/settings_app_news.png b/packages/neon_framework/example/screenshots/settings_app_news.png similarity index 100% rename from packages/app/screenshots/settings_app_news.png rename to packages/neon_framework/example/screenshots/settings_app_news.png diff --git a/packages/app/screenshots/settings_app_notes.png b/packages/neon_framework/example/screenshots/settings_app_notes.png similarity index 100% rename from packages/app/screenshots/settings_app_notes.png rename to packages/neon_framework/example/screenshots/settings_app_notes.png diff --git a/packages/app/screenshots/settings_dark.png b/packages/neon_framework/example/screenshots/settings_dark.png similarity index 100% rename from packages/app/screenshots/settings_dark.png rename to packages/neon_framework/example/screenshots/settings_dark.png diff --git a/packages/app/screenshots/settings_light.png b/packages/neon_framework/example/screenshots/settings_light.png similarity index 100% rename from packages/app/screenshots/settings_light.png rename to packages/neon_framework/example/screenshots/settings_light.png diff --git a/packages/app/screenshots/settings_oled.png b/packages/neon_framework/example/screenshots/settings_oled.png similarity index 100% rename from packages/app/screenshots/settings_oled.png rename to packages/neon_framework/example/screenshots/settings_oled.png diff --git a/packages/app/web/favicon.png b/packages/neon_framework/example/web/favicon.png similarity index 100% rename from packages/app/web/favicon.png rename to packages/neon_framework/example/web/favicon.png diff --git a/packages/app/web/flutter_bootstrap.js b/packages/neon_framework/example/web/flutter_bootstrap.js similarity index 100% rename from packages/app/web/flutter_bootstrap.js rename to packages/neon_framework/example/web/flutter_bootstrap.js diff --git a/packages/app/web/icons/Icon-192.png b/packages/neon_framework/example/web/icons/Icon-192.png similarity index 100% rename from packages/app/web/icons/Icon-192.png rename to packages/neon_framework/example/web/icons/Icon-192.png diff --git a/packages/app/web/icons/Icon-512.png b/packages/neon_framework/example/web/icons/Icon-512.png similarity index 100% rename from packages/app/web/icons/Icon-512.png rename to packages/neon_framework/example/web/icons/Icon-512.png diff --git a/packages/app/web/index.html b/packages/neon_framework/example/web/index.html similarity index 100% rename from packages/app/web/index.html rename to packages/neon_framework/example/web/index.html diff --git a/packages/app/web/manifest.json b/packages/neon_framework/example/web/manifest.json similarity index 100% rename from packages/app/web/manifest.json rename to packages/neon_framework/example/web/manifest.json diff --git a/packages/app/web/splash/img/dark-1x.png b/packages/neon_framework/example/web/splash/img/dark-1x.png similarity index 100% rename from packages/app/web/splash/img/dark-1x.png rename to packages/neon_framework/example/web/splash/img/dark-1x.png diff --git a/packages/app/web/splash/img/dark-2x.png b/packages/neon_framework/example/web/splash/img/dark-2x.png similarity index 100% rename from packages/app/web/splash/img/dark-2x.png rename to packages/neon_framework/example/web/splash/img/dark-2x.png diff --git a/packages/app/web/splash/img/dark-3x.png b/packages/neon_framework/example/web/splash/img/dark-3x.png similarity index 100% rename from packages/app/web/splash/img/dark-3x.png rename to packages/neon_framework/example/web/splash/img/dark-3x.png diff --git a/packages/app/web/splash/img/dark-4x.png b/packages/neon_framework/example/web/splash/img/dark-4x.png similarity index 100% rename from packages/app/web/splash/img/dark-4x.png rename to packages/neon_framework/example/web/splash/img/dark-4x.png diff --git a/packages/app/web/splash/img/light-1x.png b/packages/neon_framework/example/web/splash/img/light-1x.png similarity index 100% rename from packages/app/web/splash/img/light-1x.png rename to packages/neon_framework/example/web/splash/img/light-1x.png diff --git a/packages/app/web/splash/img/light-2x.png b/packages/neon_framework/example/web/splash/img/light-2x.png similarity index 100% rename from packages/app/web/splash/img/light-2x.png rename to packages/neon_framework/example/web/splash/img/light-2x.png diff --git a/packages/app/web/splash/img/light-3x.png b/packages/neon_framework/example/web/splash/img/light-3x.png similarity index 100% rename from packages/app/web/splash/img/light-3x.png rename to packages/neon_framework/example/web/splash/img/light-3x.png diff --git a/packages/app/web/splash/img/light-4x.png b/packages/neon_framework/example/web/splash/img/light-4x.png similarity index 100% rename from packages/app/web/splash/img/light-4x.png rename to packages/neon_framework/example/web/splash/img/light-4x.png diff --git a/packages/app/web/sqflite_sw.js b/packages/neon_framework/example/web/sqflite_sw.js similarity index 100% rename from packages/app/web/sqflite_sw.js rename to packages/neon_framework/example/web/sqflite_sw.js diff --git a/packages/app/web/sqlite3.wasm b/packages/neon_framework/example/web/sqlite3.wasm similarity index 100% rename from packages/app/web/sqlite3.wasm rename to packages/neon_framework/example/web/sqlite3.wasm diff --git a/packages/neon_framework/lib/src/app.dart b/packages/neon_framework/lib/src/app.dart index 67c9a95001a..e04ad263898 100644 --- a/packages/neon_framework/lib/src/app.dart +++ b/packages/neon_framework/lib/src/app.dart @@ -56,7 +56,7 @@ class NeonApp extends StatefulWidget { } class _NeonAppState extends State with WidgetsBindingObserver, WindowListener { - final _appRegex = RegExp(r'^app_([a-z]+)$', multiLine: true); + final _appRegex = RegExp(r'^([a-z]+)_app$', multiLine: true); final _navigatorKey = GlobalKey(); late final BuiltSet _appImplementations; late final GlobalOptions _globalOptions; @@ -90,9 +90,9 @@ class _NeonAppState extends State with WidgetsBindingObserver, WindowLi _appImplementations .map( (app) => ShortcutItem( - type: 'app_${app.id}', + type: '${app.id}_app', localizedTitle: app.nameFromLocalization(localizations), - icon: 'app_${app.id}', + icon: '${app.id}_app', ), ) .toList(), diff --git a/packages/neon_framework/lib/src/models/app_implementation.dart b/packages/neon_framework/lib/src/models/app_implementation.dart index 5d673844fc7..ef8382c3d03 100644 --- a/packages/neon_framework/lib/src/models/app_implementation.dart +++ b/packages/neon_framework/lib/src/models/app_implementation.dart @@ -169,7 +169,7 @@ abstract class AppImplementation 1 && account != null ? account.humanReadableID : null, - groupKey: 'app_$appID', + groupKey: '${appID}_app', icon: '@mipmap/ic_launcher', largeIcon: largeIconBitmap, when: when?.millisecondsSinceEpoch, diff --git a/packages/file_icons/.metadata b/packages/neon_framework/packages/dashboard_app/.metadata similarity index 100% rename from packages/file_icons/.metadata rename to packages/neon_framework/packages/dashboard_app/.metadata diff --git a/packages/neon_framework/packages/dashboard_app/LICENSE b/packages/neon_framework/packages/dashboard_app/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/dashboard_app/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_dashboard/analysis_options.yaml b/packages/neon_framework/packages/dashboard_app/analysis_options.yaml similarity index 100% rename from packages/neon/neon_dashboard/analysis_options.yaml rename to packages/neon_framework/packages/dashboard_app/analysis_options.yaml diff --git a/packages/neon/neon_dashboard/assets/app.svg.vec b/packages/neon_framework/packages/dashboard_app/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_dashboard/assets/app.svg.vec rename to packages/neon_framework/packages/dashboard_app/assets/app.svg.vec diff --git a/packages/neon/neon_dashboard/build.yaml b/packages/neon_framework/packages/dashboard_app/build.yaml similarity index 100% rename from packages/neon/neon_dashboard/build.yaml rename to packages/neon_framework/packages/dashboard_app/build.yaml diff --git a/packages/neon/neon_dashboard/l10n.yaml b/packages/neon_framework/packages/dashboard_app/l10n.yaml similarity index 100% rename from packages/neon/neon_dashboard/l10n.yaml rename to packages/neon_framework/packages/dashboard_app/l10n.yaml diff --git a/packages/neon/neon_dashboard/lib/neon_dashboard.dart b/packages/neon_framework/packages/dashboard_app/lib/dashboard_app.dart similarity index 80% rename from packages/neon/neon_dashboard/lib/neon_dashboard.dart rename to packages/neon_framework/packages/dashboard_app/lib/dashboard_app.dart index 83f68756440..94cdc6d7aeb 100644 --- a/packages/neon/neon_dashboard/lib/neon_dashboard.dart +++ b/packages/neon_framework/packages/dashboard_app/lib/dashboard_app.dart @@ -3,13 +3,13 @@ /// Add `DashboardApp()` to your runNeon command to execute this app. library; +import 'package:dashboard_app/l10n/localizations.dart'; +import 'package:dashboard_app/src/blocs/dashboard.dart'; +import 'package:dashboard_app/src/options.dart'; +import 'package:dashboard_app/src/pages/main.dart'; +import 'package:dashboard_app/src/routes.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:neon_dashboard/l10n/localizations.dart'; -import 'package:neon_dashboard/src/blocs/dashboard.dart'; -import 'package:neon_dashboard/src/options.dart'; -import 'package:neon_dashboard/src/pages/main.dart'; -import 'package:neon_dashboard/src/routes.dart'; import 'package:neon_framework/models.dart'; import 'package:nextcloud/dashboard.dart' as dashboard; diff --git a/packages/neon/neon_dashboard/lib/l10n/en.arb b/packages/neon_framework/packages/dashboard_app/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_dashboard/lib/l10n/en.arb rename to packages/neon_framework/packages/dashboard_app/lib/l10n/en.arb diff --git a/packages/neon/neon_dashboard/lib/l10n/localizations.dart b/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/l10n/localizations.dart rename to packages/neon_framework/packages/dashboard_app/lib/l10n/localizations.dart diff --git a/packages/neon/neon_dashboard/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/l10n/localizations_en.dart rename to packages/neon_framework/packages/dashboard_app/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_dashboard/lib/src/blocs/dashboard.dart b/packages/neon_framework/packages/dashboard_app/lib/src/blocs/dashboard.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/blocs/dashboard.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/blocs/dashboard.dart diff --git a/packages/neon/neon_dashboard/lib/src/options.dart b/packages/neon_framework/packages/dashboard_app/lib/src/options.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/options.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/options.dart diff --git a/packages/neon/neon_dashboard/lib/src/pages/main.dart b/packages/neon_framework/packages/dashboard_app/lib/src/pages/main.dart similarity index 96% rename from packages/neon/neon_dashboard/lib/src/pages/main.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/pages/main.dart index e04756448df..9938a4f7b34 100644 --- a/packages/neon/neon_dashboard/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/dashboard_app/lib/src/pages/main.dart @@ -1,14 +1,14 @@ import 'dart:math'; +import 'package:dashboard_app/l10n/localizations.dart'; +import 'package:dashboard_app/src/blocs/dashboard.dart'; +import 'package:dashboard_app/src/widgets/dry_intrinsic_height.dart'; +import 'package:dashboard_app/src/widgets/set_weather_location_dialog.dart'; +import 'package:dashboard_app/src/widgets/widget.dart'; +import 'package:dashboard_app/src/widgets/widget_button.dart'; +import 'package:dashboard_app/src/widgets/widget_item.dart'; import 'package:flutter/material.dart'; import 'package:intersperse/intersperse.dart'; -import 'package:neon_dashboard/l10n/localizations.dart'; -import 'package:neon_dashboard/src/blocs/dashboard.dart'; -import 'package:neon_dashboard/src/widgets/dry_intrinsic_height.dart'; -import 'package:neon_dashboard/src/widgets/set_weather_location_dialog.dart'; -import 'package:neon_dashboard/src/widgets/widget.dart'; -import 'package:neon_dashboard/src/widgets/widget_button.dart'; -import 'package:neon_dashboard/src/widgets/widget_item.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/theme.dart'; diff --git a/packages/neon/neon_dashboard/lib/src/routes.dart b/packages/neon_framework/packages/dashboard_app/lib/src/routes.dart similarity index 91% rename from packages/neon/neon_dashboard/lib/src/routes.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/routes.dart index 7872d58ef54..8c5e3617b68 100644 --- a/packages/neon/neon_dashboard/lib/src/routes.dart +++ b/packages/neon_framework/packages/dashboard_app/lib/src/routes.dart @@ -1,6 +1,6 @@ +import 'package:dashboard_app/src/pages/main.dart'; import 'package:flutter/widgets.dart'; import 'package:go_router/go_router.dart'; -import 'package:neon_dashboard/src/pages/main.dart'; import 'package:neon_framework/utils.dart'; import 'package:nextcloud/dashboard.dart' as dashboard; diff --git a/packages/neon/neon_dashboard/lib/src/routes.g.dart b/packages/neon_framework/packages/dashboard_app/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/routes.g.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/routes.g.dart diff --git a/packages/neon/neon_dashboard/lib/src/widgets/dry_intrinsic_height.dart b/packages/neon_framework/packages/dashboard_app/lib/src/widgets/dry_intrinsic_height.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/widgets/dry_intrinsic_height.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/widgets/dry_intrinsic_height.dart diff --git a/packages/neon/neon_dashboard/lib/src/widgets/set_weather_location_dialog.dart b/packages/neon_framework/packages/dashboard_app/lib/src/widgets/set_weather_location_dialog.dart similarity index 96% rename from packages/neon/neon_dashboard/lib/src/widgets/set_weather_location_dialog.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/widgets/set_weather_location_dialog.dart index df0a894f265..1113b0afa40 100644 --- a/packages/neon/neon_dashboard/lib/src/widgets/set_weather_location_dialog.dart +++ b/packages/neon_framework/packages/dashboard_app/lib/src/widgets/set_weather_location_dialog.dart @@ -1,5 +1,5 @@ +import 'package:dashboard_app/l10n/localizations.dart'; import 'package:flutter/material.dart'; -import 'package:neon_dashboard/l10n/localizations.dart'; import 'package:neon_framework/l10n/localizations.dart'; import 'package:neon_framework/widgets.dart'; diff --git a/packages/neon/neon_dashboard/lib/src/widgets/widget.dart b/packages/neon_framework/packages/dashboard_app/lib/src/widgets/widget.dart similarity index 95% rename from packages/neon/neon_dashboard/lib/src/widgets/widget.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/widgets/widget.dart index 1e1a79b1a8e..b975abb9960 100644 --- a/packages/neon/neon_dashboard/lib/src/widgets/widget.dart +++ b/packages/neon_framework/packages/dashboard_app/lib/src/widgets/widget.dart @@ -1,6 +1,6 @@ +import 'package:dashboard_app/l10n/localizations.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:neon_dashboard/l10n/localizations.dart'; import 'package:nextcloud/dashboard.dart' as dashboard; /// Displays a single dashboard widget and its items. diff --git a/packages/neon/neon_dashboard/lib/src/widgets/widget_button.dart b/packages/neon_framework/packages/dashboard_app/lib/src/widgets/widget_button.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/widgets/widget_button.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/widgets/widget_button.dart diff --git a/packages/neon/neon_dashboard/lib/src/widgets/widget_item.dart b/packages/neon_framework/packages/dashboard_app/lib/src/widgets/widget_item.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/widgets/widget_item.dart rename to packages/neon_framework/packages/dashboard_app/lib/src/widgets/widget_item.dart diff --git a/packages/neon/neon_dashboard/pubspec.yaml b/packages/neon_framework/packages/dashboard_app/pubspec.yaml similarity index 97% rename from packages/neon/neon_dashboard/pubspec.yaml rename to packages/neon_framework/packages/dashboard_app/pubspec.yaml index 630d5eb56bb..8b2ed544bee 100644 --- a/packages/neon/neon_dashboard/pubspec.yaml +++ b/packages/neon_framework/packages/dashboard_app/pubspec.yaml @@ -1,4 +1,4 @@ -name: neon_dashboard +name: dashboard_app version: 1.0.0 publish_to: 'none' diff --git a/packages/neon/neon_notes/pubspec_overrides.yaml b/packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml similarity index 55% rename from packages/neon/neon_notes/pubspec_overrides.yaml rename to packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml index b02d61254c9..198db33e28c 100644 --- a/packages/neon/neon_notes/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml @@ -1,16 +1,16 @@ # melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box dependency_overrides: cookie_store: - path: ../../cookie_store + path: ../../../cookie_store dynamite_runtime: - path: ../../dynamite/dynamite_runtime + path: ../../../dynamite/packages/dynamite_runtime neon_framework: - path: ../../neon_framework + path: ../.. neon_http_client: - path: ../../neon_http_client + path: ../neon_http_client neon_lints: - path: ../../neon_lints + path: ../../../neon_lints nextcloud: - path: ../../nextcloud + path: ../../../nextcloud sort_box: - path: ../../sort_box + path: ../sort_box diff --git a/packages/neon/neon_dashboard/test/bloc_test.dart b/packages/neon_framework/packages/dashboard_app/test/bloc_test.dart similarity index 99% rename from packages/neon/neon_dashboard/test/bloc_test.dart rename to packages/neon_framework/packages/dashboard_app/test/bloc_test.dart index b1e589d9204..22ed983b73d 100644 --- a/packages/neon/neon_dashboard/test/bloc_test.dart +++ b/packages/neon_framework/packages/dashboard_app/test/bloc_test.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'package:built_collection/built_collection.dart'; +import 'package:dashboard_app/src/blocs/dashboard.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart'; -import 'package:neon_dashboard/src/blocs/dashboard.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; diff --git a/packages/neon/neon_dashboard/test/goldens/widget.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_invalid.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_invalid.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_button_invalid.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_invalid.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_more.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_more.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_button_more.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_more.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_new.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_new.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_button_new.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_new.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_setup.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_setup.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_button_setup.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_setup.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_item.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_item.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_item.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_item_not_round.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item_not_round.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_item_not_round.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_item_not_round.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_not_round.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_not_round.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_not_round.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_not_round.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_empty.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_with_empty.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_empty_and_half_empty.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty_and_half_empty.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_with_empty_and_half_empty.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty_and_half_empty.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_half_empty.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_half_empty.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_with_half_empty.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_half_empty.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_multiple_buttons.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_multiple_buttons.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_with_multiple_buttons.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_multiple_buttons.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_without_buttons.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_buttons.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_without_buttons.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_buttons.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_without_items.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_items.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_without_items.png rename to packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_items.png diff --git a/packages/neon/neon_dashboard/test/set_weather_location_dialog_test.dart b/packages/neon_framework/packages/dashboard_app/test/set_weather_location_dialog_test.dart similarity index 90% rename from packages/neon/neon_dashboard/test/set_weather_location_dialog_test.dart rename to packages/neon_framework/packages/dashboard_app/test/set_weather_location_dialog_test.dart index 7ae6ccbe13d..d12f15aac52 100644 --- a/packages/neon/neon_dashboard/test/set_weather_location_dialog_test.dart +++ b/packages/neon_framework/packages/dashboard_app/test/set_weather_location_dialog_test.dart @@ -1,7 +1,7 @@ +import 'package:dashboard_app/l10n/localizations.dart'; +import 'package:dashboard_app/src/widgets/set_weather_location_dialog.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:neon_dashboard/l10n/localizations.dart'; -import 'package:neon_dashboard/src/widgets/set_weather_location_dialog.dart'; import 'package:neon_framework/testing.dart'; void main() { diff --git a/packages/neon/neon_dashboard/test/widget_test.dart b/packages/neon_framework/packages/dashboard_app/test/widget_test.dart similarity index 98% rename from packages/neon/neon_dashboard/test/widget_test.dart rename to packages/neon_framework/packages/dashboard_app/test/widget_test.dart index ea1fce1d768..01967245c5c 100644 --- a/packages/neon/neon_dashboard/test/widget_test.dart +++ b/packages/neon_framework/packages/dashboard_app/test/widget_test.dart @@ -1,11 +1,11 @@ +import 'package:dashboard_app/l10n/localizations.dart'; +import 'package:dashboard_app/src/pages/main.dart'; +import 'package:dashboard_app/src/widgets/widget.dart'; +import 'package:dashboard_app/src/widgets/widget_button.dart'; +import 'package:dashboard_app/src/widgets/widget_item.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; -import 'package:neon_dashboard/l10n/localizations.dart'; -import 'package:neon_dashboard/src/pages/main.dart'; -import 'package:neon_dashboard/src/widgets/widget.dart'; -import 'package:neon_dashboard/src/widgets/widget_button.dart'; -import 'package:neon_dashboard/src/widgets/widget_item.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; import 'package:neon_framework/theme.dart'; diff --git a/packages/neon/neon_dashboard/.metadata b/packages/neon_framework/packages/files_app/.metadata similarity index 100% rename from packages/neon/neon_dashboard/.metadata rename to packages/neon_framework/packages/files_app/.metadata diff --git a/packages/neon_framework/packages/files_app/LICENSE b/packages/neon_framework/packages/files_app/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/files_app/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_files/analysis_options.yaml b/packages/neon_framework/packages/files_app/analysis_options.yaml similarity index 100% rename from packages/neon/neon_files/analysis_options.yaml rename to packages/neon_framework/packages/files_app/analysis_options.yaml diff --git a/packages/neon/neon_files/assets/app.svg.vec b/packages/neon_framework/packages/files_app/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_files/assets/app.svg.vec rename to packages/neon_framework/packages/files_app/assets/app.svg.vec diff --git a/packages/neon/neon_files/build.yaml b/packages/neon_framework/packages/files_app/build.yaml similarity index 100% rename from packages/neon/neon_files/build.yaml rename to packages/neon_framework/packages/files_app/build.yaml diff --git a/packages/neon/neon_files/l10n.yaml b/packages/neon_framework/packages/files_app/l10n.yaml similarity index 100% rename from packages/neon/neon_files/l10n.yaml rename to packages/neon_framework/packages/files_app/l10n.yaml diff --git a/packages/neon/neon_files/lib/neon_files.dart b/packages/neon_framework/packages/files_app/lib/files_app.dart similarity index 79% rename from packages/neon/neon_files/lib/neon_files.dart rename to packages/neon_framework/packages/files_app/lib/files_app.dart index 096814b68be..91f79eee655 100644 --- a/packages/neon/neon_files/lib/neon_files.dart +++ b/packages/neon_framework/packages/files_app/lib/files_app.dart @@ -3,13 +3,13 @@ /// Add `FilesApp()` to your runNeon command to execute this app. library; +import 'package:files_app/l10n/localizations.dart'; +import 'package:files_app/src/blocs/files.dart'; +import 'package:files_app/src/options.dart'; +import 'package:files_app/src/pages/main.dart'; +import 'package:files_app/src/routes.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:neon_files/l10n/localizations.dart'; -import 'package:neon_files/src/blocs/files.dart'; -import 'package:neon_files/src/options.dart'; -import 'package:neon_files/src/pages/main.dart'; -import 'package:neon_files/src/routes.dart'; import 'package:neon_framework/models.dart'; import 'package:nextcloud/files.dart' as files; diff --git a/packages/neon/neon_files/lib/l10n/en.arb b/packages/neon_framework/packages/files_app/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_files/lib/l10n/en.arb rename to packages/neon_framework/packages/files_app/lib/l10n/en.arb diff --git a/packages/neon/neon_files/lib/l10n/localizations.dart b/packages/neon_framework/packages/files_app/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_files/lib/l10n/localizations.dart rename to packages/neon_framework/packages/files_app/lib/l10n/localizations.dart diff --git a/packages/neon/neon_files/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/files_app/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_files/lib/l10n/localizations_en.dart rename to packages/neon_framework/packages/files_app/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_files/lib/src/blocs/browser.dart b/packages/neon_framework/packages/files_app/lib/src/blocs/browser.dart similarity index 98% rename from packages/neon/neon_files/lib/src/blocs/browser.dart rename to packages/neon_framework/packages/files_app/lib/src/blocs/browser.dart index ce2ca5fdd94..fbecf4f2cb1 100644 --- a/packages/neon/neon_files/lib/src/blocs/browser.dart +++ b/packages/neon_framework/packages/files_app/lib/src/blocs/browser.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:built_collection/built_collection.dart'; +import 'package:files_app/src/options.dart'; import 'package:logging/logging.dart'; -import 'package:neon_files/src/options.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/utils.dart'; diff --git a/packages/neon/neon_files/lib/src/blocs/files.dart b/packages/neon_framework/packages/files_app/lib/src/blocs/files.dart similarity index 97% rename from packages/neon/neon_files/lib/src/blocs/files.dart rename to packages/neon_framework/packages/files_app/lib/src/blocs/files.dart index bc64c9071fb..38cee57a361 100644 --- a/packages/neon/neon_files/lib/src/blocs/files.dart +++ b/packages/neon_framework/packages/files_app/lib/src/blocs/files.dart @@ -1,12 +1,12 @@ import 'dart:async'; import 'package:built_collection/built_collection.dart'; +import 'package:files_app/l10n/localizations.dart'; +import 'package:files_app/src/blocs/browser.dart'; +import 'package:files_app/src/options.dart'; +import 'package:files_app/src/utils/task.dart'; import 'package:flutter/foundation.dart'; import 'package:logging/logging.dart'; -import 'package:neon_files/l10n/localizations.dart'; -import 'package:neon_files/src/blocs/browser.dart'; -import 'package:neon_files/src/options.dart'; -import 'package:neon_files/src/utils/task.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/platform.dart'; diff --git a/packages/neon/neon_files/lib/src/models/file_details.dart b/packages/neon_framework/packages/files_app/lib/src/models/file_details.dart similarity index 97% rename from packages/neon/neon_files/lib/src/models/file_details.dart rename to packages/neon_framework/packages/files_app/lib/src/models/file_details.dart index 1cf61d9d8af..ad078ee136e 100644 --- a/packages/neon/neon_files/lib/src/models/file_details.dart +++ b/packages/neon_framework/packages/files_app/lib/src/models/file_details.dart @@ -1,5 +1,5 @@ +import 'package:files_app/src/utils/task.dart'; import 'package:meta/meta.dart'; -import 'package:neon_files/src/utils/task.dart'; import 'package:nextcloud/webdav.dart'; import 'package:timezone/timezone.dart' as tz; diff --git a/packages/neon/neon_files/lib/src/options.dart b/packages/neon_framework/packages/files_app/lib/src/options.dart similarity index 98% rename from packages/neon/neon_files/lib/src/options.dart rename to packages/neon_framework/packages/files_app/lib/src/options.dart index 7ff34fafcc9..bcd4e6d8ef2 100644 --- a/packages/neon/neon_files/lib/src/options.dart +++ b/packages/neon_framework/packages/files_app/lib/src/options.dart @@ -1,5 +1,5 @@ +import 'package:files_app/l10n/localizations.dart'; import 'package:filesize/filesize.dart'; -import 'package:neon_files/l10n/localizations.dart'; import 'package:neon_framework/settings.dart'; import 'package:neon_framework/sort_box.dart'; import 'package:neon_framework/storage.dart'; diff --git a/packages/neon/neon_files/lib/src/pages/details.dart b/packages/neon_framework/packages/files_app/lib/src/pages/details.dart similarity index 92% rename from packages/neon/neon_files/lib/src/pages/details.dart rename to packages/neon_framework/packages/files_app/lib/src/pages/details.dart index 6f2bdff3df4..955b68c3fa3 100644 --- a/packages/neon/neon_files/lib/src/pages/details.dart +++ b/packages/neon_framework/packages/files_app/lib/src/pages/details.dart @@ -1,9 +1,9 @@ +import 'package:files_app/l10n/localizations.dart'; +import 'package:files_app/src/blocs/files.dart'; +import 'package:files_app/src/models/file_details.dart'; +import 'package:files_app/src/widgets/file_preview.dart'; import 'package:filesize/filesize.dart'; import 'package:flutter/material.dart'; -import 'package:neon_files/l10n/localizations.dart'; -import 'package:neon_files/src/blocs/files.dart'; -import 'package:neon_files/src/models/file_details.dart'; -import 'package:neon_files/src/widgets/file_preview.dart'; import 'package:neon_framework/l10n/localizations.dart'; class FilesDetailsPage extends StatelessWidget { diff --git a/packages/neon/neon_files/lib/src/pages/main.dart b/packages/neon_framework/packages/files_app/lib/src/pages/main.dart similarity index 85% rename from packages/neon/neon_files/lib/src/pages/main.dart rename to packages/neon_framework/packages/files_app/lib/src/pages/main.dart index 205aea7b26f..06463fc8743 100644 --- a/packages/neon/neon_files/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/files_app/lib/src/pages/main.dart @@ -1,10 +1,10 @@ import 'dart:async'; +import 'package:files_app/l10n/localizations.dart'; +import 'package:files_app/src/blocs/files.dart'; +import 'package:files_app/src/utils/dialog.dart'; +import 'package:files_app/src/widgets/browser_view.dart'; import 'package:flutter/material.dart'; -import 'package:neon_files/l10n/localizations.dart'; -import 'package:neon_files/src/blocs/files.dart'; -import 'package:neon_files/src/utils/dialog.dart'; -import 'package:neon_files/src/widgets/browser_view.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; diff --git a/packages/neon/neon_files/lib/src/routes.dart b/packages/neon_framework/packages/files_app/lib/src/routes.dart similarity index 90% rename from packages/neon/neon_files/lib/src/routes.dart rename to packages/neon_framework/packages/files_app/lib/src/routes.dart index 4e219dbb0c6..bd027ced726 100644 --- a/packages/neon/neon_files/lib/src/routes.dart +++ b/packages/neon_framework/packages/files_app/lib/src/routes.dart @@ -1,6 +1,6 @@ +import 'package:files_app/src/pages/main.dart'; import 'package:flutter/widgets.dart'; import 'package:go_router/go_router.dart'; -import 'package:neon_files/src/pages/main.dart'; import 'package:neon_framework/utils.dart'; import 'package:nextcloud/files.dart' as files; diff --git a/packages/neon/neon_files/lib/src/routes.g.dart b/packages/neon_framework/packages/files_app/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_files/lib/src/routes.g.dart rename to packages/neon_framework/packages/files_app/lib/src/routes.g.dart diff --git a/packages/neon/neon_files/lib/src/sort/files.dart b/packages/neon_framework/packages/files_app/lib/src/sort/files.dart similarity index 94% rename from packages/neon/neon_files/lib/src/sort/files.dart rename to packages/neon_framework/packages/files_app/lib/src/sort/files.dart index 16cb66845b5..d6ad8a2f7c9 100644 --- a/packages/neon/neon_files/lib/src/sort/files.dart +++ b/packages/neon_framework/packages/files_app/lib/src/sort/files.dart @@ -1,4 +1,4 @@ -import 'package:neon_files/src/options.dart'; +import 'package:files_app/src/options.dart'; import 'package:neon_framework/sort_box.dart'; import 'package:nextcloud/utils.dart'; import 'package:nextcloud/webdav.dart'; diff --git a/packages/neon/neon_files/lib/src/utils/dialog.dart b/packages/neon_framework/packages/files_app/lib/src/utils/dialog.dart similarity index 93% rename from packages/neon/neon_files/lib/src/utils/dialog.dart rename to packages/neon_framework/packages/files_app/lib/src/utils/dialog.dart index d23aea3aade..0dd874ecea1 100644 --- a/packages/neon/neon_files/lib/src/utils/dialog.dart +++ b/packages/neon_framework/packages/files_app/lib/src/utils/dialog.dart @@ -1,11 +1,11 @@ +import 'package:files_app/l10n/localizations.dart'; +import 'package:files_app/src/blocs/browser.dart'; +import 'package:files_app/src/blocs/files.dart'; +import 'package:files_app/src/models/file_details.dart'; +import 'package:files_app/src/widgets/dialog.dart'; import 'package:filesize/filesize.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:neon_files/l10n/localizations.dart'; -import 'package:neon_files/src/blocs/browser.dart'; -import 'package:neon_files/src/blocs/files.dart'; -import 'package:neon_files/src/models/file_details.dart'; -import 'package:neon_files/src/widgets/dialog.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; import 'package:nextcloud/webdav.dart'; diff --git a/packages/neon/neon_files/lib/src/utils/task.dart b/packages/neon_framework/packages/files_app/lib/src/utils/task.dart similarity index 100% rename from packages/neon/neon_files/lib/src/utils/task.dart rename to packages/neon_framework/packages/files_app/lib/src/utils/task.dart diff --git a/packages/neon/neon_files/lib/src/widgets/actions.dart b/packages/neon_framework/packages/files_app/lib/src/widgets/actions.dart similarity index 93% rename from packages/neon/neon_files/lib/src/widgets/actions.dart rename to packages/neon_framework/packages/files_app/lib/src/widgets/actions.dart index c15452ad4c5..401221be3dc 100644 --- a/packages/neon/neon_files/lib/src/widgets/actions.dart +++ b/packages/neon_framework/packages/files_app/lib/src/widgets/actions.dart @@ -1,9 +1,9 @@ +import 'package:files_app/l10n/localizations.dart'; +import 'package:files_app/src/blocs/files.dart'; +import 'package:files_app/src/models/file_details.dart'; +import 'package:files_app/src/pages/details.dart'; +import 'package:files_app/src/utils/dialog.dart'; import 'package:flutter/material.dart'; -import 'package:neon_files/l10n/localizations.dart'; -import 'package:neon_files/src/blocs/files.dart'; -import 'package:neon_files/src/models/file_details.dart'; -import 'package:neon_files/src/pages/details.dart'; -import 'package:neon_files/src/utils/dialog.dart'; import 'package:neon_framework/platform.dart'; import 'package:neon_framework/utils.dart'; import 'package:nextcloud/webdav.dart'; diff --git a/packages/neon/neon_files/lib/src/widgets/browser_view.dart b/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart similarity index 91% rename from packages/neon/neon_files/lib/src/widgets/browser_view.dart rename to packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart index 6946e77fdb8..2db746fa4b7 100644 --- a/packages/neon/neon_files/lib/src/widgets/browser_view.dart +++ b/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart @@ -2,15 +2,15 @@ import 'dart:async'; import 'package:built_collection/built_collection.dart'; import 'package:collection/collection.dart'; +import 'package:files_app/src/blocs/browser.dart'; +import 'package:files_app/src/blocs/files.dart'; +import 'package:files_app/src/models/file_details.dart'; +import 'package:files_app/src/options.dart'; +import 'package:files_app/src/sort/files.dart'; +import 'package:files_app/src/utils/task.dart'; +import 'package:files_app/src/widgets/file_list_tile.dart'; +import 'package:files_app/src/widgets/navigator.dart'; import 'package:flutter/material.dart'; -import 'package:neon_files/src/blocs/browser.dart'; -import 'package:neon_files/src/blocs/files.dart'; -import 'package:neon_files/src/models/file_details.dart'; -import 'package:neon_files/src/options.dart'; -import 'package:neon_files/src/sort/files.dart'; -import 'package:neon_files/src/utils/task.dart'; -import 'package:neon_files/src/widgets/file_list_tile.dart'; -import 'package:neon_files/src/widgets/navigator.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/sort_box.dart'; import 'package:neon_framework/utils.dart'; diff --git a/packages/neon/neon_files/lib/src/widgets/dialog.dart b/packages/neon_framework/packages/files_app/lib/src/widgets/dialog.dart similarity index 96% rename from packages/neon/neon_files/lib/src/widgets/dialog.dart rename to packages/neon_framework/packages/files_app/lib/src/widgets/dialog.dart index 73e7834c550..b73bdd19fd3 100644 --- a/packages/neon/neon_files/lib/src/widgets/dialog.dart +++ b/packages/neon_framework/packages/files_app/lib/src/widgets/dialog.dart @@ -1,17 +1,17 @@ import 'dart:async'; import 'package:file_picker/file_picker.dart'; +import 'package:files_app/l10n/localizations.dart'; +import 'package:files_app/src/blocs/browser.dart'; +import 'package:files_app/src/blocs/files.dart'; +import 'package:files_app/src/options.dart'; +import 'package:files_app/src/utils/dialog.dart'; +import 'package:files_app/src/widgets/browser_view.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:neon_files/l10n/localizations.dart'; -import 'package:neon_files/src/blocs/browser.dart'; -import 'package:neon_files/src/blocs/files.dart'; -import 'package:neon_files/src/options.dart'; -import 'package:neon_files/src/utils/dialog.dart'; -import 'package:neon_files/src/widgets/browser_view.dart'; import 'package:neon_framework/platform.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; diff --git a/packages/neon/neon_files/lib/src/widgets/file_list_tile.dart b/packages/neon_framework/packages/files_app/lib/src/widgets/file_list_tile.dart similarity index 90% rename from packages/neon/neon_files/lib/src/widgets/file_list_tile.dart rename to packages/neon_framework/packages/files_app/lib/src/widgets/file_list_tile.dart index 3a1fa53a225..8dce0d03ac4 100644 --- a/packages/neon/neon_files/lib/src/widgets/file_list_tile.dart +++ b/packages/neon_framework/packages/files_app/lib/src/widgets/file_list_tile.dart @@ -1,14 +1,14 @@ +import 'package:files_app/src/blocs/browser.dart'; +import 'package:files_app/src/blocs/files.dart'; +import 'package:files_app/src/models/file_details.dart'; +import 'package:files_app/src/options.dart'; +import 'package:files_app/src/utils/dialog.dart'; +import 'package:files_app/src/utils/task.dart'; +import 'package:files_app/src/widgets/actions.dart'; +import 'package:files_app/src/widgets/file_preview.dart'; import 'package:filesize/filesize.dart'; import 'package:flutter/material.dart'; import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; -import 'package:neon_files/src/blocs/browser.dart'; -import 'package:neon_files/src/blocs/files.dart'; -import 'package:neon_files/src/models/file_details.dart'; -import 'package:neon_files/src/options.dart'; -import 'package:neon_files/src/utils/dialog.dart'; -import 'package:neon_files/src/utils/task.dart'; -import 'package:neon_files/src/widgets/actions.dart'; -import 'package:neon_files/src/widgets/file_preview.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; diff --git a/packages/neon/neon_files/lib/src/widgets/file_preview.dart b/packages/neon_framework/packages/files_app/lib/src/widgets/file_preview.dart similarity index 93% rename from packages/neon/neon_files/lib/src/widgets/file_preview.dart rename to packages/neon_framework/packages/files_app/lib/src/widgets/file_preview.dart index 26cd4038ceb..afb51a073cd 100644 --- a/packages/neon/neon_files/lib/src/widgets/file_preview.dart +++ b/packages/neon_framework/packages/files_app/lib/src/widgets/file_preview.dart @@ -1,8 +1,8 @@ -import 'package:file_icons/file_icons.dart'; +import 'package:files_app/src/blocs/files.dart'; +import 'package:files_app/src/models/file_details.dart'; +import 'package:files_app/src/options.dart'; +import 'package:files_icons/files_icons.dart'; import 'package:flutter/material.dart'; -import 'package:neon_files/src/blocs/files.dart'; -import 'package:neon_files/src/models/file_details.dart'; -import 'package:neon_files/src/options.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; diff --git a/packages/neon/neon_files/lib/src/widgets/navigator.dart b/packages/neon_framework/packages/files_app/lib/src/widgets/navigator.dart similarity index 94% rename from packages/neon/neon_files/lib/src/widgets/navigator.dart rename to packages/neon_framework/packages/files_app/lib/src/widgets/navigator.dart index 50b4e5dbe61..26d9722f4d9 100644 --- a/packages/neon/neon_files/lib/src/widgets/navigator.dart +++ b/packages/neon_framework/packages/files_app/lib/src/widgets/navigator.dart @@ -1,6 +1,6 @@ +import 'package:files_app/l10n/localizations.dart'; +import 'package:files_app/src/blocs/browser.dart'; import 'package:flutter/material.dart'; -import 'package:neon_files/l10n/localizations.dart'; -import 'package:neon_files/src/blocs/browser.dart'; import 'package:neon_framework/theme.dart'; import 'package:nextcloud/webdav.dart'; diff --git a/packages/neon/neon_files/pubspec.yaml b/packages/neon_framework/packages/files_app/pubspec.yaml similarity index 92% rename from packages/neon/neon_files/pubspec.yaml rename to packages/neon_framework/packages/files_app/pubspec.yaml index a3d13d47776..3e35ed9c534 100644 --- a/packages/neon/neon_files/pubspec.yaml +++ b/packages/neon_framework/packages/files_app/pubspec.yaml @@ -1,4 +1,4 @@ -name: neon_files +name: files_app version: 1.0.0 publish_to: 'none' @@ -10,11 +10,11 @@ dependencies: built_collection: ^5.0.0 collection: ^1.0.0 dynamite_runtime: ^0.5.0 - file_icons: + file_picker: ^8.0.0+1 + files_icons: git: url: https://github.com/nextcloud/neon - path: packages/file_icons - file_picker: ^8.0.0+1 + path: packages/neon_framework/packages/files_icons filesize: ^2.0.0 flutter: sdk: flutter diff --git a/packages/neon_framework/packages/files_app/pubspec_overrides.yaml b/packages/neon_framework/packages/files_app/pubspec_overrides.yaml new file mode 100644 index 00000000000..85cab030cf0 --- /dev/null +++ b/packages/neon_framework/packages/files_app/pubspec_overrides.yaml @@ -0,0 +1,18 @@ +# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,files_icons,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box +dependency_overrides: + cookie_store: + path: ../../../cookie_store + dynamite_runtime: + path: ../../../dynamite/packages/dynamite_runtime + files_icons: + path: ../files_icons + neon_framework: + path: ../.. + neon_http_client: + path: ../neon_http_client + neon_lints: + path: ../../../neon_lints + nextcloud: + path: ../../../nextcloud + sort_box: + path: ../sort_box diff --git a/packages/neon/neon_files/.metadata b/packages/neon_framework/packages/files_icons/.metadata similarity index 100% rename from packages/neon/neon_files/.metadata rename to packages/neon_framework/packages/files_icons/.metadata diff --git a/packages/neon_framework/packages/files_icons/LICENSE b/packages/neon_framework/packages/files_icons/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/files_icons/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/file_icons/README.md b/packages/neon_framework/packages/files_icons/README.md similarity index 94% rename from packages/file_icons/README.md rename to packages/neon_framework/packages/files_icons/README.md index 870f164019e..2b2b575cffd 100644 --- a/packages/file_icons/README.md +++ b/packages/neon_framework/packages/files_icons/README.md @@ -1,4 +1,4 @@ -# file_icons +# files_icons This is loosely ported from https://github.com/git-touch/file-icon. I rewrote the script for generating the code in dart, improved the script and fixed some issues with the resulting output. diff --git a/packages/file_icons/analysis_options.yaml b/packages/neon_framework/packages/files_icons/analysis_options.yaml similarity index 61% rename from packages/file_icons/analysis_options.yaml rename to packages/neon_framework/packages/files_icons/analysis_options.yaml index f2cddfc2d75..64c023b8daf 100644 --- a/packages/file_icons/analysis_options.yaml +++ b/packages/neon_framework/packages/files_icons/analysis_options.yaml @@ -3,3 +3,7 @@ include: package:neon_lints/dart.yaml linter: rules: avoid_print: false + +custom_lint: + rules: + - avoid_dart_io: false diff --git a/packages/file_icons/assets/seti.ttf b/packages/neon_framework/packages/files_icons/assets/seti.ttf similarity index 100% rename from packages/file_icons/assets/seti.ttf rename to packages/neon_framework/packages/files_icons/assets/seti.ttf diff --git a/packages/file_icons/bin/file_icons.dart b/packages/neon_framework/packages/files_icons/bin/files_icons.dart similarity index 97% rename from packages/file_icons/bin/file_icons.dart rename to packages/neon_framework/packages/files_icons/bin/files_icons.dart index 6f1668a40ee..1bb8744a4f6 100644 --- a/packages/file_icons/bin/file_icons.dart +++ b/packages/neon_framework/packages/files_icons/bin/files_icons.dart @@ -5,6 +5,8 @@ import 'dart:io'; import 'package:path/path.dart' as p; final setiUIPath = p.join( + '..', + '..', '..', '..', 'external', @@ -94,7 +96,7 @@ void generateData() { final code = [ '// THIS CODE IS GENERATED - DO NOT EDIT MANUALLY', '', - "import 'package:file_icons/src/meta.dart';", + "import 'package:files_icons/src/meta.dart';", "import 'package:flutter/widgets.dart';", '', '// Code points', @@ -107,7 +109,7 @@ void generateData() { for (final colorName in colors.keys) 'const ${_toVariableName(colorName)} = ${colors[colorName]};', '', "const _fontFamily = 'Seti';", - "const _fontPackage = 'file_icons';", + "const _fontPackage = 'files_icons';", '', '/// Mapping between file extensions and [IconData] and color', 'const iconSetMap = {', diff --git a/packages/file_icons/lib/file_icons.dart b/packages/neon_framework/packages/files_icons/lib/files_icons.dart similarity index 95% rename from packages/file_icons/lib/file_icons.dart rename to packages/neon_framework/packages/files_icons/lib/files_icons.dart index 17566405d8d..e039e1808d8 100644 --- a/packages/file_icons/lib/file_icons.dart +++ b/packages/neon_framework/packages/files_icons/lib/files_icons.dart @@ -1,4 +1,4 @@ -import 'package:file_icons/src/data.dart'; +import 'package:files_icons/src/data.dart'; import 'package:flutter/widgets.dart'; // ignore: public_member_api_docs diff --git a/packages/file_icons/lib/src/data.dart b/packages/neon_framework/packages/files_icons/lib/src/data.dart similarity index 99% rename from packages/file_icons/lib/src/data.dart rename to packages/neon_framework/packages/files_icons/lib/src/data.dart index 6a4ecd1a0a1..25505cc8962 100644 --- a/packages/file_icons/lib/src/data.dart +++ b/packages/neon_framework/packages/files_icons/lib/src/data.dart @@ -1,6 +1,6 @@ // THIS CODE IS GENERATED - DO NOT EDIT MANUALLY -import 'package:file_icons/src/meta.dart'; +import 'package:files_icons/src/meta.dart'; import 'package:flutter/widgets.dart'; // Code points @@ -170,7 +170,7 @@ const _orange = 0xffe37933; const _grey = 0xff4d5a5e; const _fontFamily = 'Seti'; -const _fontPackage = 'file_icons'; +const _fontPackage = 'files_icons'; /// Mapping between file extensions and [IconData] and color const iconSetMap = { diff --git a/packages/file_icons/lib/src/meta.dart b/packages/neon_framework/packages/files_icons/lib/src/meta.dart similarity index 100% rename from packages/file_icons/lib/src/meta.dart rename to packages/neon_framework/packages/files_icons/lib/src/meta.dart diff --git a/packages/file_icons/pubspec.yaml b/packages/neon_framework/packages/files_icons/pubspec.yaml similarity index 94% rename from packages/file_icons/pubspec.yaml rename to packages/neon_framework/packages/files_icons/pubspec.yaml index a7baf1d3431..974b439ae08 100644 --- a/packages/file_icons/pubspec.yaml +++ b/packages/neon_framework/packages/files_icons/pubspec.yaml @@ -1,4 +1,4 @@ -name: file_icons +name: files_icons version: 1.0.0 publish_to: none diff --git a/packages/sort_box/pubspec_overrides.yaml b/packages/neon_framework/packages/files_icons/pubspec_overrides.yaml similarity index 73% rename from packages/sort_box/pubspec_overrides.yaml rename to packages/neon_framework/packages/files_icons/pubspec_overrides.yaml index 4abc9fdcbad..0e5d8123538 100644 --- a/packages/sort_box/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/files_icons/pubspec_overrides.yaml @@ -1,4 +1,4 @@ # melos_managed_dependency_overrides: neon_lints dependency_overrides: neon_lints: - path: ../neon_lints + path: ../../../neon_lints diff --git a/packages/neon_framework/packages/neon_http_client/LICENSE b/packages/neon_framework/packages/neon_http_client/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/neon_http_client/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon_framework/packages/neon_http_client/analysis_options.yaml b/packages/neon_framework/packages/neon_http_client/analysis_options.yaml new file mode 100644 index 00000000000..f0a42286945 --- /dev/null +++ b/packages/neon_framework/packages/neon_http_client/analysis_options.yaml @@ -0,0 +1,6 @@ +include: package:neon_lints/dart.yaml + +custom_lint: + rules: + - avoid_exports: false + - avoid_dart_io: false diff --git a/packages/neon_http_client/dart_test.yaml b/packages/neon_framework/packages/neon_http_client/dart_test.yaml similarity index 100% rename from packages/neon_http_client/dart_test.yaml rename to packages/neon_framework/packages/neon_http_client/dart_test.yaml diff --git a/packages/neon_http_client/lib/neon_http_client.dart b/packages/neon_framework/packages/neon_http_client/lib/neon_http_client.dart similarity index 100% rename from packages/neon_http_client/lib/neon_http_client.dart rename to packages/neon_framework/packages/neon_http_client/lib/neon_http_client.dart diff --git a/packages/neon_http_client/lib/src/interceptors/base_header_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/base_header_interceptor.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/base_header_interceptor.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/base_header_interceptor.dart diff --git a/packages/neon_http_client/lib/src/interceptors/cookie_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/cookie_interceptor.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/cookie_interceptor.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/cookie_interceptor.dart diff --git a/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart diff --git a/packages/neon_http_client/lib/src/interceptors/http_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/http_interceptor.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/http_interceptor.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/http_interceptor.dart diff --git a/packages/neon_http_client/lib/src/interceptors/interceptors.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/interceptors.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/interceptors.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/interceptors.dart diff --git a/packages/neon_http_client/lib/src/neon_http_client.dart b/packages/neon_framework/packages/neon_http_client/lib/src/neon_http_client.dart similarity index 100% rename from packages/neon_http_client/lib/src/neon_http_client.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/neon_http_client.dart diff --git a/packages/neon_http_client/lib/src/utils/defaults.dart b/packages/neon_framework/packages/neon_http_client/lib/src/utils/defaults.dart similarity index 100% rename from packages/neon_http_client/lib/src/utils/defaults.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/utils/defaults.dart diff --git a/packages/neon_http_client/lib/src/utils/future_timeout.dart b/packages/neon_framework/packages/neon_http_client/lib/src/utils/future_timeout.dart similarity index 100% rename from packages/neon_http_client/lib/src/utils/future_timeout.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/utils/future_timeout.dart diff --git a/packages/neon_http_client/lib/src/utils/utils.dart b/packages/neon_framework/packages/neon_http_client/lib/src/utils/utils.dart similarity index 100% rename from packages/neon_http_client/lib/src/utils/utils.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/utils/utils.dart diff --git a/packages/neon_http_client/pubspec.yaml b/packages/neon_framework/packages/neon_http_client/pubspec.yaml similarity index 100% rename from packages/neon_http_client/pubspec.yaml rename to packages/neon_framework/packages/neon_http_client/pubspec.yaml diff --git a/packages/neon_http_client/pubspec_overrides.yaml b/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml similarity index 54% rename from packages/neon_http_client/pubspec_overrides.yaml rename to packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml index e81861f7072..9b0f16df821 100644 --- a/packages/neon_http_client/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml @@ -1,10 +1,10 @@ # melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_lints,nextcloud dependency_overrides: cookie_store: - path: ../cookie_store + path: ../../../cookie_store dynamite_runtime: - path: ../dynamite/dynamite_runtime + path: ../../../dynamite/packages/dynamite_runtime neon_lints: - path: ../neon_lints + path: ../../../neon_lints nextcloud: - path: ../nextcloud + path: ../../../nextcloud diff --git a/packages/neon_http_client/test/client_conformance_test.dart b/packages/neon_framework/packages/neon_http_client/test/client_conformance_test.dart similarity index 100% rename from packages/neon_http_client/test/client_conformance_test.dart rename to packages/neon_framework/packages/neon_http_client/test/client_conformance_test.dart diff --git a/packages/neon_http_client/test/interceptors/base_header_interceptor_test.dart b/packages/neon_framework/packages/neon_http_client/test/interceptors/base_header_interceptor_test.dart similarity index 100% rename from packages/neon_http_client/test/interceptors/base_header_interceptor_test.dart rename to packages/neon_framework/packages/neon_http_client/test/interceptors/base_header_interceptor_test.dart diff --git a/packages/neon_http_client/test/interceptors/cookie_interceptor_test.dart b/packages/neon_framework/packages/neon_http_client/test/interceptors/cookie_interceptor_test.dart similarity index 100% rename from packages/neon_http_client/test/interceptors/cookie_interceptor_test.dart rename to packages/neon_framework/packages/neon_http_client/test/interceptors/cookie_interceptor_test.dart diff --git a/packages/neon_http_client/test/interceptors/csrf_interceptor_test.dart b/packages/neon_framework/packages/neon_http_client/test/interceptors/csrf_interceptor_test.dart similarity index 100% rename from packages/neon_http_client/test/interceptors/csrf_interceptor_test.dart rename to packages/neon_framework/packages/neon_http_client/test/interceptors/csrf_interceptor_test.dart diff --git a/packages/neon_http_client/test/interceptors/http_interceptor_test.dart b/packages/neon_framework/packages/neon_http_client/test/interceptors/http_interceptor_test.dart similarity index 100% rename from packages/neon_http_client/test/interceptors/http_interceptor_test.dart rename to packages/neon_framework/packages/neon_http_client/test/interceptors/http_interceptor_test.dart diff --git a/packages/neon_http_client/test/neon_http_client_test.dart b/packages/neon_framework/packages/neon_http_client/test/neon_http_client_test.dart similarity index 100% rename from packages/neon_http_client/test/neon_http_client_test.dart rename to packages/neon_framework/packages/neon_http_client/test/neon_http_client_test.dart diff --git a/packages/neon_http_client/test/utils/future_timeout_test.dart b/packages/neon_framework/packages/neon_http_client/test/utils/future_timeout_test.dart similarity index 100% rename from packages/neon_http_client/test/utils/future_timeout_test.dart rename to packages/neon_framework/packages/neon_http_client/test/utils/future_timeout_test.dart diff --git a/packages/neon/neon_news/.metadata b/packages/neon_framework/packages/news_app/.metadata similarity index 100% rename from packages/neon/neon_news/.metadata rename to packages/neon_framework/packages/news_app/.metadata diff --git a/packages/neon_framework/packages/news_app/LICENSE b/packages/neon_framework/packages/news_app/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/news_app/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_news/analysis_options.yaml b/packages/neon_framework/packages/news_app/analysis_options.yaml similarity index 100% rename from packages/neon/neon_news/analysis_options.yaml rename to packages/neon_framework/packages/news_app/analysis_options.yaml diff --git a/packages/neon/neon_news/assets/app.svg.vec b/packages/neon_framework/packages/news_app/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_news/assets/app.svg.vec rename to packages/neon_framework/packages/news_app/assets/app.svg.vec diff --git a/packages/neon/neon_news/build.yaml b/packages/neon_framework/packages/news_app/build.yaml similarity index 100% rename from packages/neon/neon_news/build.yaml rename to packages/neon_framework/packages/news_app/build.yaml diff --git a/packages/neon/neon_news/l10n.yaml b/packages/neon_framework/packages/news_app/l10n.yaml similarity index 100% rename from packages/neon/neon_news/l10n.yaml rename to packages/neon_framework/packages/news_app/l10n.yaml diff --git a/packages/neon/neon_news/lib/l10n/en.arb b/packages/neon_framework/packages/news_app/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_news/lib/l10n/en.arb rename to packages/neon_framework/packages/news_app/lib/l10n/en.arb diff --git a/packages/neon/neon_news/lib/l10n/localizations.dart b/packages/neon_framework/packages/news_app/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_news/lib/l10n/localizations.dart rename to packages/neon_framework/packages/news_app/lib/l10n/localizations.dart diff --git a/packages/neon/neon_news/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/news_app/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_news/lib/l10n/localizations_en.dart rename to packages/neon_framework/packages/news_app/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_news/lib/neon_news.dart b/packages/neon_framework/packages/news_app/lib/news_app.dart similarity index 85% rename from packages/neon/neon_news/lib/neon_news.dart rename to packages/neon_framework/packages/news_app/lib/news_app.dart index eb17a4704a7..8e6a4da38e2 100644 --- a/packages/neon/neon_news/lib/neon_news.dart +++ b/packages/neon_framework/packages/news_app/lib/news_app.dart @@ -8,11 +8,11 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:neon_framework/models.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/options.dart'; -import 'package:neon_news/src/pages/main.dart'; -import 'package:neon_news/src/routes.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/options.dart'; +import 'package:news_app/src/pages/main.dart'; +import 'package:news_app/src/routes.dart'; import 'package:nextcloud/core.dart' as core; import 'package:nextcloud/news.dart' as news; import 'package:nextcloud/nextcloud.dart'; diff --git a/packages/neon/neon_news/lib/src/blocs/article.dart b/packages/neon_framework/packages/news_app/lib/src/blocs/article.dart similarity index 97% rename from packages/neon/neon_news/lib/src/blocs/article.dart rename to packages/neon_framework/packages/news_app/lib/src/blocs/article.dart index 675fe2a27d3..afb2d3bed1f 100644 --- a/packages/neon/neon_news/lib/src/blocs/article.dart +++ b/packages/neon_framework/packages/news_app/lib/src/blocs/article.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:logging/logging.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; -import 'package:neon_news/src/blocs/articles.dart'; +import 'package:news_app/src/blocs/articles.dart'; import 'package:nextcloud/news.dart' as news; import 'package:rxdart/rxdart.dart'; diff --git a/packages/neon/neon_news/lib/src/blocs/articles.dart b/packages/neon_framework/packages/news_app/lib/src/blocs/articles.dart similarity index 98% rename from packages/neon/neon_news/lib/src/blocs/articles.dart rename to packages/neon_framework/packages/news_app/lib/src/blocs/articles.dart index a0e3e2e78b7..ae6d9576ca7 100644 --- a/packages/neon/neon_news/lib/src/blocs/articles.dart +++ b/packages/neon_framework/packages/news_app/lib/src/blocs/articles.dart @@ -6,8 +6,8 @@ import 'package:logging/logging.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/options.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/options.dart'; import 'package:nextcloud/news.dart' as news; import 'package:rxdart/rxdart.dart'; diff --git a/packages/neon/neon_news/lib/src/blocs/news.dart b/packages/neon_framework/packages/news_app/lib/src/blocs/news.dart similarity index 98% rename from packages/neon/neon_news/lib/src/blocs/news.dart rename to packages/neon_framework/packages/news_app/lib/src/blocs/news.dart index 7b683717b5b..a28312b8e5b 100644 --- a/packages/neon/neon_news/lib/src/blocs/news.dart +++ b/packages/neon_framework/packages/news_app/lib/src/blocs/news.dart @@ -6,8 +6,8 @@ import 'package:logging/logging.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_news/src/blocs/articles.dart'; -import 'package:neon_news/src/options.dart'; +import 'package:news_app/src/blocs/articles.dart'; +import 'package:news_app/src/options.dart'; import 'package:nextcloud/news.dart' as news; import 'package:rxdart/rxdart.dart'; diff --git a/packages/neon/neon_news/lib/src/options.dart b/packages/neon_framework/packages/news_app/lib/src/options.dart similarity index 98% rename from packages/neon/neon_news/lib/src/options.dart rename to packages/neon_framework/packages/news_app/lib/src/options.dart index 7702f147635..1707a10242c 100644 --- a/packages/neon/neon_news/lib/src/options.dart +++ b/packages/neon_framework/packages/news_app/lib/src/options.dart @@ -2,8 +2,8 @@ import 'package:neon_framework/platform.dart'; import 'package:neon_framework/settings.dart'; import 'package:neon_framework/sort_box.dart'; import 'package:neon_framework/storage.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/articles.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/articles.dart'; class NewsOptions extends AppImplementationOptions { NewsOptions(super.storage) { diff --git a/packages/neon/neon_news/lib/src/pages/article.dart b/packages/neon_framework/packages/news_app/lib/src/pages/article.dart similarity index 97% rename from packages/neon/neon_news/lib/src/pages/article.dart rename to packages/neon_framework/packages/news_app/lib/src/pages/article.dart index a96fa26f7fe..8dde8f5fcda 100644 --- a/packages/neon/neon_news/lib/src/pages/article.dart +++ b/packages/neon_framework/packages/news_app/lib/src/pages/article.dart @@ -6,10 +6,10 @@ import 'package:neon_framework/platform.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/article.dart'; -import 'package:neon_news/src/blocs/articles.dart'; -import 'package:neon_news/src/options.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/article.dart'; +import 'package:news_app/src/blocs/articles.dart'; +import 'package:news_app/src/options.dart'; import 'package:share_plus/share_plus.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; diff --git a/packages/neon/neon_news/lib/src/pages/feed.dart b/packages/neon_framework/packages/news_app/lib/src/pages/feed.dart similarity index 81% rename from packages/neon/neon_news/lib/src/pages/feed.dart rename to packages/neon_framework/packages/news_app/lib/src/pages/feed.dart index 6716139b41d..15ec0a58b79 100644 --- a/packages/neon/neon_news/lib/src/pages/feed.dart +++ b/packages/neon_framework/packages/news_app/lib/src/pages/feed.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_news/src/blocs/articles.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/options.dart'; -import 'package:neon_news/src/widgets/articles_view.dart'; +import 'package:news_app/src/blocs/articles.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/options.dart'; +import 'package:news_app/src/widgets/articles_view.dart'; import 'package:nextcloud/news.dart' as news; class NewsFeedPage extends StatelessWidget { diff --git a/packages/neon/neon_news/lib/src/pages/folder.dart b/packages/neon_framework/packages/news_app/lib/src/pages/folder.dart similarity index 79% rename from packages/neon/neon_news/lib/src/pages/folder.dart rename to packages/neon_framework/packages/news_app/lib/src/pages/folder.dart index 238be4689bd..3514bbf304b 100644 --- a/packages/neon/neon_news/lib/src/pages/folder.dart +++ b/packages/neon_framework/packages/news_app/lib/src/pages/folder.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/widgets/feed_floating_action_button.dart'; -import 'package:neon_news/src/widgets/folder_view.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/widgets/feed_floating_action_button.dart'; +import 'package:news_app/src/widgets/folder_view.dart'; import 'package:nextcloud/news.dart' as news; class NewsFolderPage extends StatelessWidget { diff --git a/packages/neon/neon_news/lib/src/pages/main.dart b/packages/neon_framework/packages/news_app/lib/src/pages/main.dart similarity index 82% rename from packages/neon/neon_news/lib/src/pages/main.dart rename to packages/neon_framework/packages/news_app/lib/src/pages/main.dart index edbdbba1392..53ebab8849d 100644 --- a/packages/neon/neon_news/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/news_app/lib/src/pages/main.dart @@ -4,14 +4,14 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/options.dart'; -import 'package:neon_news/src/widgets/articles_view.dart'; -import 'package:neon_news/src/widgets/feed_floating_action_button.dart'; -import 'package:neon_news/src/widgets/feeds_view.dart'; -import 'package:neon_news/src/widgets/folder_floating_action_button.dart'; -import 'package:neon_news/src/widgets/folders_view.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/options.dart'; +import 'package:news_app/src/widgets/articles_view.dart'; +import 'package:news_app/src/widgets/feed_floating_action_button.dart'; +import 'package:news_app/src/widgets/feeds_view.dart'; +import 'package:news_app/src/widgets/folder_floating_action_button.dart'; +import 'package:news_app/src/widgets/folders_view.dart'; class NewsMainPage extends StatefulWidget { const NewsMainPage({ diff --git a/packages/neon/neon_news/lib/src/routes.dart b/packages/neon_framework/packages/news_app/lib/src/routes.dart similarity index 90% rename from packages/neon/neon_news/lib/src/routes.dart rename to packages/neon_framework/packages/news_app/lib/src/routes.dart index b3199f4e150..4270761b43f 100644 --- a/packages/neon/neon_news/lib/src/routes.dart +++ b/packages/neon_framework/packages/news_app/lib/src/routes.dart @@ -1,7 +1,7 @@ import 'package:flutter/widgets.dart'; import 'package:go_router/go_router.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_news/src/pages/main.dart'; +import 'package:news_app/src/pages/main.dart'; import 'package:nextcloud/news.dart' as news; part 'routes.g.dart'; diff --git a/packages/neon/neon_news/lib/src/routes.g.dart b/packages/neon_framework/packages/news_app/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_news/lib/src/routes.g.dart rename to packages/neon_framework/packages/news_app/lib/src/routes.g.dart diff --git a/packages/neon/neon_news/lib/src/sort/articles.dart b/packages/neon_framework/packages/news_app/lib/src/sort/articles.dart similarity index 93% rename from packages/neon/neon_news/lib/src/sort/articles.dart rename to packages/neon_framework/packages/news_app/lib/src/sort/articles.dart index 0fd6c4bb186..1ef2ae22c0b 100644 --- a/packages/neon/neon_news/lib/src/sort/articles.dart +++ b/packages/neon_framework/packages/news_app/lib/src/sort/articles.dart @@ -1,5 +1,5 @@ import 'package:neon_framework/sort_box.dart'; -import 'package:neon_news/src/options.dart'; +import 'package:news_app/src/options.dart'; import 'package:nextcloud/news.dart' as news; final articlesSortBox = SortBox( diff --git a/packages/neon/neon_news/lib/src/sort/feeds.dart b/packages/neon_framework/packages/news_app/lib/src/sort/feeds.dart similarity index 92% rename from packages/neon/neon_news/lib/src/sort/feeds.dart rename to packages/neon_framework/packages/news_app/lib/src/sort/feeds.dart index ef4660998af..01b3e5b4624 100644 --- a/packages/neon/neon_news/lib/src/sort/feeds.dart +++ b/packages/neon_framework/packages/news_app/lib/src/sort/feeds.dart @@ -1,5 +1,5 @@ import 'package:neon_framework/sort_box.dart'; -import 'package:neon_news/src/options.dart'; +import 'package:news_app/src/options.dart'; import 'package:nextcloud/news.dart' as news; final feedsSortBox = SortBox( diff --git a/packages/neon/neon_news/lib/src/sort/folders.dart b/packages/neon_framework/packages/news_app/lib/src/sort/folders.dart similarity index 94% rename from packages/neon/neon_news/lib/src/sort/folders.dart rename to packages/neon_framework/packages/news_app/lib/src/sort/folders.dart index 1d56922efcc..fee59e7cb05 100644 --- a/packages/neon/neon_news/lib/src/sort/folders.dart +++ b/packages/neon_framework/packages/news_app/lib/src/sort/folders.dart @@ -1,5 +1,5 @@ import 'package:neon_framework/sort_box.dart'; -import 'package:neon_news/src/options.dart'; +import 'package:news_app/src/options.dart'; import 'package:nextcloud/news.dart' as news; final foldersSortBox = SortBox( diff --git a/packages/neon/neon_news/lib/src/utils/dialog.dart b/packages/neon_framework/packages/news_app/lib/src/utils/dialog.dart similarity index 95% rename from packages/neon/neon_news/lib/src/utils/dialog.dart rename to packages/neon_framework/packages/news_app/lib/src/utils/dialog.dart index 36fff1eabda..bda3ddda565 100644 --- a/packages/neon/neon_news/lib/src/utils/dialog.dart +++ b/packages/neon_framework/packages/news_app/lib/src/utils/dialog.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/widgets/dialog.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/widgets/dialog.dart'; import 'package:nextcloud/news.dart'; /// Displays a [NeonConfirmationDialog] to confirm the deletion of the given [feed]. diff --git a/packages/neon/neon_news/lib/src/widgets/articles_view.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart similarity index 96% rename from packages/neon/neon_news/lib/src/widgets/articles_view.dart rename to packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart index adc7cd7a178..72207c4b01a 100644 --- a/packages/neon/neon_news/lib/src/widgets/articles_view.dart +++ b/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart @@ -11,14 +11,14 @@ import 'package:neon_framework/sort_box.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/article.dart'; -import 'package:neon_news/src/blocs/articles.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/options.dart'; -import 'package:neon_news/src/pages/article.dart'; -import 'package:neon_news/src/sort/articles.dart'; -import 'package:neon_news/src/widgets/feed_icon.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/article.dart'; +import 'package:news_app/src/blocs/articles.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/options.dart'; +import 'package:news_app/src/pages/article.dart'; +import 'package:news_app/src/sort/articles.dart'; +import 'package:news_app/src/widgets/feed_icon.dart'; import 'package:nextcloud/news.dart' as news; import 'package:nextcloud/utils.dart'; import 'package:timezone/timezone.dart' as tz; diff --git a/packages/neon/neon_news/lib/src/widgets/dialog.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/dialog.dart similarity index 98% rename from packages/neon/neon_news/lib/src/widgets/dialog.dart rename to packages/neon_framework/packages/news_app/lib/src/widgets/dialog.dart index 13f063e2ca4..e4c312fe93f 100644 --- a/packages/neon/neon_news/lib/src/widgets/dialog.dart +++ b/packages/neon_framework/packages/news_app/lib/src/widgets/dialog.dart @@ -7,9 +7,9 @@ import 'package:flutter/services.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/widgets/folder_select.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/widgets/folder_select.dart'; import 'package:nextcloud/news.dart' as news; /// A dialog for adding a news feed by url. diff --git a/packages/neon/neon_news/lib/src/widgets/feed_floating_action_button.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/feed_floating_action_button.dart similarity index 85% rename from packages/neon/neon_news/lib/src/widgets/feed_floating_action_button.dart rename to packages/neon_framework/packages/news_app/lib/src/widgets/feed_floating_action_button.dart index e1e8101421d..c08ca94ad97 100644 --- a/packages/neon/neon_news/lib/src/widgets/feed_floating_action_button.dart +++ b/packages/neon_framework/packages/news_app/lib/src/widgets/feed_floating_action_button.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/theme.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/widgets/dialog.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/widgets/dialog.dart'; class NewsFeedFloatingActionButton extends StatelessWidget { const NewsFeedFloatingActionButton({ diff --git a/packages/neon/neon_news/lib/src/widgets/feed_icon.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/feed_icon.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/feed_icon.dart rename to packages/neon_framework/packages/news_app/lib/src/widgets/feed_icon.dart diff --git a/packages/neon/neon_news/lib/src/widgets/feeds_view.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/feeds_view.dart similarity index 94% rename from packages/neon/neon_news/lib/src/widgets/feeds_view.dart rename to packages/neon_framework/packages/news_app/lib/src/widgets/feeds_view.dart index 85ff37eb121..cdd88906c13 100644 --- a/packages/neon/neon_news/lib/src/widgets/feeds_view.dart +++ b/packages/neon_framework/packages/news_app/lib/src/widgets/feeds_view.dart @@ -4,14 +4,14 @@ import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/sort_box.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/options.dart'; -import 'package:neon_news/src/pages/feed.dart'; -import 'package:neon_news/src/sort/feeds.dart'; -import 'package:neon_news/src/utils/dialog.dart'; -import 'package:neon_news/src/widgets/dialog.dart'; -import 'package:neon_news/src/widgets/feed_icon.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/options.dart'; +import 'package:news_app/src/pages/feed.dart'; +import 'package:news_app/src/sort/feeds.dart'; +import 'package:news_app/src/utils/dialog.dart'; +import 'package:news_app/src/widgets/dialog.dart'; +import 'package:news_app/src/widgets/feed_icon.dart'; import 'package:nextcloud/news.dart' as news; class NewsFeedsView extends StatelessWidget { diff --git a/packages/neon/neon_news/lib/src/widgets/folder_floating_action_button.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/folder_floating_action_button.dart similarity index 80% rename from packages/neon/neon_news/lib/src/widgets/folder_floating_action_button.dart rename to packages/neon_framework/packages/news_app/lib/src/widgets/folder_floating_action_button.dart index 6df50ba2d4a..8765b8196f6 100644 --- a/packages/neon/neon_news/lib/src/widgets/folder_floating_action_button.dart +++ b/packages/neon_framework/packages/news_app/lib/src/widgets/folder_floating_action_button.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/theme.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/utils/dialog.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/utils/dialog.dart'; class NewsFolderFloatingActionButton extends StatelessWidget { const NewsFolderFloatingActionButton({ diff --git a/packages/neon/neon_news/lib/src/widgets/folder_select.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/folder_select.dart similarity index 95% rename from packages/neon/neon_news/lib/src/widgets/folder_select.dart rename to packages/neon_framework/packages/news_app/lib/src/widgets/folder_select.dart index 57898ae15ba..bb320321637 100644 --- a/packages/neon/neon_news/lib/src/widgets/folder_select.dart +++ b/packages/neon_framework/packages/news_app/lib/src/widgets/folder_select.dart @@ -1,6 +1,6 @@ import 'package:built_collection/built_collection.dart'; import 'package:flutter/material.dart'; -import 'package:neon_news/l10n/localizations.dart'; +import 'package:news_app/l10n/localizations.dart'; import 'package:nextcloud/news.dart' as news; class NewsFolderSelect extends StatelessWidget { diff --git a/packages/neon/neon_news/lib/src/widgets/folder_view.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/folder_view.dart similarity index 89% rename from packages/neon/neon_news/lib/src/widgets/folder_view.dart rename to packages/neon_framework/packages/news_app/lib/src/widgets/folder_view.dart index 59e19c9b6d3..4f073523925 100644 --- a/packages/neon/neon_news/lib/src/widgets/folder_view.dart +++ b/packages/neon_framework/packages/news_app/lib/src/widgets/folder_view.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_news/src/blocs/articles.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/options.dart'; -import 'package:neon_news/src/widgets/articles_view.dart'; -import 'package:neon_news/src/widgets/feeds_view.dart'; +import 'package:news_app/src/blocs/articles.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/options.dart'; +import 'package:news_app/src/widgets/articles_view.dart'; +import 'package:news_app/src/widgets/feeds_view.dart'; import 'package:nextcloud/news.dart' as news; class NewsFolderView extends StatefulWidget { diff --git a/packages/neon/neon_news/lib/src/widgets/folders_view.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/folders_view.dart similarity index 94% rename from packages/neon/neon_news/lib/src/widgets/folders_view.dart rename to packages/neon_framework/packages/news_app/lib/src/widgets/folders_view.dart index 4b01de2e993..572b5279d05 100644 --- a/packages/neon/neon_news/lib/src/widgets/folders_view.dart +++ b/packages/neon_framework/packages/news_app/lib/src/widgets/folders_view.dart @@ -4,12 +4,12 @@ import 'package:neon_framework/sort_box.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_news/l10n/localizations.dart'; -import 'package:neon_news/src/blocs/news.dart'; -import 'package:neon_news/src/options.dart'; -import 'package:neon_news/src/pages/folder.dart'; -import 'package:neon_news/src/sort/folders.dart'; -import 'package:neon_news/src/utils/dialog.dart'; +import 'package:news_app/l10n/localizations.dart'; +import 'package:news_app/src/blocs/news.dart'; +import 'package:news_app/src/options.dart'; +import 'package:news_app/src/pages/folder.dart'; +import 'package:news_app/src/sort/folders.dart'; +import 'package:news_app/src/utils/dialog.dart'; class NewsFoldersView extends StatelessWidget { const NewsFoldersView({ diff --git a/packages/neon/neon_news/pubspec.yaml b/packages/neon_framework/packages/news_app/pubspec.yaml similarity index 98% rename from packages/neon/neon_news/pubspec.yaml rename to packages/neon_framework/packages/news_app/pubspec.yaml index 68014f5aebb..0d0f8851ac3 100644 --- a/packages/neon/neon_news/pubspec.yaml +++ b/packages/neon_framework/packages/news_app/pubspec.yaml @@ -1,4 +1,4 @@ -name: neon_news +name: news_app version: 1.0.0 publish_to: 'none' diff --git a/packages/neon/neon_dashboard/pubspec_overrides.yaml b/packages/neon_framework/packages/news_app/pubspec_overrides.yaml similarity index 55% rename from packages/neon/neon_dashboard/pubspec_overrides.yaml rename to packages/neon_framework/packages/news_app/pubspec_overrides.yaml index b02d61254c9..198db33e28c 100644 --- a/packages/neon/neon_dashboard/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/news_app/pubspec_overrides.yaml @@ -1,16 +1,16 @@ # melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box dependency_overrides: cookie_store: - path: ../../cookie_store + path: ../../../cookie_store dynamite_runtime: - path: ../../dynamite/dynamite_runtime + path: ../../../dynamite/packages/dynamite_runtime neon_framework: - path: ../../neon_framework + path: ../.. neon_http_client: - path: ../../neon_http_client + path: ../neon_http_client neon_lints: - path: ../../neon_lints + path: ../../../neon_lints nextcloud: - path: ../../nextcloud + path: ../../../nextcloud sort_box: - path: ../../sort_box + path: ../sort_box diff --git a/packages/neon/neon_notes/.metadata b/packages/neon_framework/packages/notes_app/.metadata similarity index 100% rename from packages/neon/neon_notes/.metadata rename to packages/neon_framework/packages/notes_app/.metadata diff --git a/packages/neon_framework/packages/notes_app/LICENSE b/packages/neon_framework/packages/notes_app/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/notes_app/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_notes/analysis_options.yaml b/packages/neon_framework/packages/notes_app/analysis_options.yaml similarity index 100% rename from packages/neon/neon_notes/analysis_options.yaml rename to packages/neon_framework/packages/notes_app/analysis_options.yaml diff --git a/packages/neon/neon_notes/assets/app.svg.vec b/packages/neon_framework/packages/notes_app/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_notes/assets/app.svg.vec rename to packages/neon_framework/packages/notes_app/assets/app.svg.vec diff --git a/packages/neon/neon_notes/build.yaml b/packages/neon_framework/packages/notes_app/build.yaml similarity index 100% rename from packages/neon/neon_notes/build.yaml rename to packages/neon_framework/packages/notes_app/build.yaml diff --git a/packages/neon/neon_notes/l10n.yaml b/packages/neon_framework/packages/notes_app/l10n.yaml similarity index 100% rename from packages/neon/neon_notes/l10n.yaml rename to packages/neon_framework/packages/notes_app/l10n.yaml diff --git a/packages/neon/neon_notes/lib/l10n/en.arb b/packages/neon_framework/packages/notes_app/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_notes/lib/l10n/en.arb rename to packages/neon_framework/packages/notes_app/lib/l10n/en.arb diff --git a/packages/neon/neon_notes/lib/l10n/localizations.dart b/packages/neon_framework/packages/notes_app/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_notes/lib/l10n/localizations.dart rename to packages/neon_framework/packages/notes_app/lib/l10n/localizations.dart diff --git a/packages/neon/neon_notes/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/notes_app/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_notes/lib/l10n/localizations_en.dart rename to packages/neon_framework/packages/notes_app/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_notes/lib/neon_notes.dart b/packages/neon_framework/packages/notes_app/lib/notes_app.dart similarity index 83% rename from packages/neon/neon_notes/lib/neon_notes.dart rename to packages/neon_framework/packages/notes_app/lib/notes_app.dart index bb022d20bc4..df0589fbd87 100644 --- a/packages/neon/neon_notes/lib/neon_notes.dart +++ b/packages/neon_framework/packages/notes_app/lib/notes_app.dart @@ -6,14 +6,14 @@ library; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:neon_framework/models.dart'; -import 'package:neon_notes/l10n/localizations.dart'; -import 'package:neon_notes/src/blocs/notes.dart'; -import 'package:neon_notes/src/options.dart'; -import 'package:neon_notes/src/pages/main.dart'; -import 'package:neon_notes/src/routes.dart'; import 'package:nextcloud/core.dart' as core; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/notes.dart' as notes; +import 'package:notes_app/l10n/localizations.dart'; +import 'package:notes_app/src/blocs/notes.dart'; +import 'package:notes_app/src/options.dart'; +import 'package:notes_app/src/pages/main.dart'; +import 'package:notes_app/src/routes.dart'; class NotesApp extends AppImplementation { NotesApp(); diff --git a/packages/neon/neon_notes/lib/src/blocs/note.dart b/packages/neon_framework/packages/notes_app/lib/src/blocs/note.dart similarity index 98% rename from packages/neon/neon_notes/lib/src/blocs/note.dart rename to packages/neon_framework/packages/notes_app/lib/src/blocs/note.dart index 36a3f31402f..96373a8e8d5 100644 --- a/packages/neon/neon_notes/lib/src/blocs/note.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/blocs/note.dart @@ -4,9 +4,9 @@ import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; -import 'package:neon_notes/src/blocs/notes.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/notes.dart' as notes; +import 'package:notes_app/src/blocs/notes.dart'; import 'package:queue/queue.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/neon/neon_notes/lib/src/blocs/notes.dart b/packages/neon_framework/packages/notes_app/lib/src/blocs/notes.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/blocs/notes.dart rename to packages/neon_framework/packages/notes_app/lib/src/blocs/notes.dart diff --git a/packages/neon/neon_notes/lib/src/options.dart b/packages/neon_framework/packages/notes_app/lib/src/options.dart similarity index 98% rename from packages/neon/neon_notes/lib/src/options.dart rename to packages/neon_framework/packages/notes_app/lib/src/options.dart index 652fa3b2885..ec05b44a440 100644 --- a/packages/neon/neon_notes/lib/src/options.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/options.dart @@ -1,7 +1,7 @@ import 'package:neon_framework/settings.dart'; import 'package:neon_framework/sort_box.dart'; import 'package:neon_framework/storage.dart'; -import 'package:neon_notes/l10n/localizations.dart'; +import 'package:notes_app/l10n/localizations.dart'; class NotesOptions extends AppImplementationOptions { NotesOptions(super.storage) { diff --git a/packages/neon/neon_notes/lib/src/pages/category.dart b/packages/neon_framework/packages/notes_app/lib/src/pages/category.dart similarity index 72% rename from packages/neon/neon_notes/lib/src/pages/category.dart rename to packages/neon_framework/packages/notes_app/lib/src/pages/category.dart index a88051642d3..8a8ff037122 100644 --- a/packages/neon/neon_notes/lib/src/pages/category.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/pages/category.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:neon_notes/l10n/localizations.dart'; -import 'package:neon_notes/src/blocs/notes.dart'; -import 'package:neon_notes/src/sort/categories.dart'; -import 'package:neon_notes/src/widgets/notes_floating_action_button.dart'; -import 'package:neon_notes/src/widgets/notes_view.dart'; +import 'package:notes_app/l10n/localizations.dart'; +import 'package:notes_app/src/blocs/notes.dart'; +import 'package:notes_app/src/sort/categories.dart'; +import 'package:notes_app/src/widgets/notes_floating_action_button.dart'; +import 'package:notes_app/src/widgets/notes_view.dart'; class NotesCategoryPage extends StatelessWidget { const NotesCategoryPage({ diff --git a/packages/neon/neon_notes/lib/src/pages/main.dart b/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart similarity index 81% rename from packages/neon/neon_notes/lib/src/pages/main.dart rename to packages/neon_framework/packages/notes_app/lib/src/pages/main.dart index 82784882797..29e5af394f1 100644 --- a/packages/neon/neon_notes/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart @@ -3,13 +3,13 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_notes/l10n/localizations.dart'; -import 'package:neon_notes/src/blocs/notes.dart'; -import 'package:neon_notes/src/options.dart'; -import 'package:neon_notes/src/utils/exception_handler.dart'; -import 'package:neon_notes/src/widgets/categories_view.dart'; -import 'package:neon_notes/src/widgets/notes_floating_action_button.dart'; -import 'package:neon_notes/src/widgets/notes_view.dart'; +import 'package:notes_app/l10n/localizations.dart'; +import 'package:notes_app/src/blocs/notes.dart'; +import 'package:notes_app/src/options.dart'; +import 'package:notes_app/src/utils/exception_handler.dart'; +import 'package:notes_app/src/widgets/categories_view.dart'; +import 'package:notes_app/src/widgets/notes_floating_action_button.dart'; +import 'package:notes_app/src/widgets/notes_view.dart'; class NotesMainPage extends StatefulWidget { const NotesMainPage({ diff --git a/packages/neon/neon_notes/lib/src/pages/note.dart b/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart similarity index 94% rename from packages/neon/neon_notes/lib/src/pages/note.dart rename to packages/neon_framework/packages/notes_app/lib/src/pages/note.dart index 7158458cca8..eeba26cee21 100644 --- a/packages/neon/neon_notes/lib/src/pages/note.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart @@ -4,13 +4,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_notes/l10n/localizations.dart'; -import 'package:neon_notes/src/blocs/note.dart'; -import 'package:neon_notes/src/blocs/notes.dart'; -import 'package:neon_notes/src/options.dart'; -import 'package:neon_notes/src/utils/category_color.dart'; -import 'package:neon_notes/src/utils/exception_handler.dart'; -import 'package:neon_notes/src/widgets/dialog.dart'; +import 'package:notes_app/l10n/localizations.dart'; +import 'package:notes_app/src/blocs/note.dart'; +import 'package:notes_app/src/blocs/notes.dart'; +import 'package:notes_app/src/options.dart'; +import 'package:notes_app/src/utils/category_color.dart'; +import 'package:notes_app/src/utils/exception_handler.dart'; +import 'package:notes_app/src/widgets/dialog.dart'; import 'package:rxdart/rxdart.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; diff --git a/packages/neon/neon_notes/lib/src/routes.dart b/packages/neon_framework/packages/notes_app/lib/src/routes.dart similarity index 90% rename from packages/neon/neon_notes/lib/src/routes.dart rename to packages/neon_framework/packages/notes_app/lib/src/routes.dart index 446f105e2e6..631891ed6b2 100644 --- a/packages/neon/neon_notes/lib/src/routes.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/routes.dart @@ -1,8 +1,8 @@ import 'package:flutter/widgets.dart'; import 'package:go_router/go_router.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_notes/src/pages/main.dart'; import 'package:nextcloud/notes.dart' as notes; +import 'package:notes_app/src/pages/main.dart'; part 'routes.g.dart'; diff --git a/packages/neon/neon_notes/lib/src/routes.g.dart b/packages/neon_framework/packages/notes_app/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/routes.g.dart rename to packages/neon_framework/packages/notes_app/lib/src/routes.g.dart diff --git a/packages/neon/neon_notes/lib/src/sort/categories.dart b/packages/neon_framework/packages/notes_app/lib/src/sort/categories.dart similarity index 92% rename from packages/neon/neon_notes/lib/src/sort/categories.dart rename to packages/neon_framework/packages/notes_app/lib/src/sort/categories.dart index aacea026fe9..f09ceffd2eb 100644 --- a/packages/neon/neon_notes/lib/src/sort/categories.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/sort/categories.dart @@ -1,5 +1,5 @@ import 'package:neon_framework/sort_box.dart'; -import 'package:neon_notes/src/options.dart'; +import 'package:notes_app/src/options.dart'; final categoriesSortBox = SortBox( properties: { diff --git a/packages/neon/neon_notes/lib/src/sort/notes.dart b/packages/neon_framework/packages/notes_app/lib/src/sort/notes.dart similarity index 93% rename from packages/neon/neon_notes/lib/src/sort/notes.dart rename to packages/neon_framework/packages/notes_app/lib/src/sort/notes.dart index 6366c8a28c4..94507be09f6 100644 --- a/packages/neon/neon_notes/lib/src/sort/notes.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/sort/notes.dart @@ -1,6 +1,6 @@ import 'package:neon_framework/sort_box.dart'; -import 'package:neon_notes/src/options.dart'; import 'package:nextcloud/notes.dart' as notes; +import 'package:notes_app/src/options.dart'; final notesSortBox = SortBox( properties: { diff --git a/packages/neon/neon_notes/lib/src/utils/category_color.dart b/packages/neon_framework/packages/notes_app/lib/src/utils/category_color.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/utils/category_color.dart rename to packages/neon_framework/packages/notes_app/lib/src/utils/category_color.dart diff --git a/packages/neon/neon_notes/lib/src/utils/exception_handler.dart b/packages/neon_framework/packages/notes_app/lib/src/utils/exception_handler.dart similarity index 88% rename from packages/neon/neon_notes/lib/src/utils/exception_handler.dart rename to packages/neon_framework/packages/notes_app/lib/src/utils/exception_handler.dart index a11cb8ccb3d..69f4cd73575 100644 --- a/packages/neon/neon_notes/lib/src/utils/exception_handler.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/utils/exception_handler.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_notes/l10n/localizations.dart'; import 'package:nextcloud/nextcloud.dart'; +import 'package:notes_app/l10n/localizations.dart'; void handleNotesException(BuildContext context, Object error) { if (error is DynamiteStatusCodeException && error.statusCode == 412) { diff --git a/packages/neon/neon_notes/lib/src/widgets/categories_view.dart b/packages/neon_framework/packages/notes_app/lib/src/widgets/categories_view.dart similarity index 88% rename from packages/neon/neon_notes/lib/src/widgets/categories_view.dart rename to packages/neon_framework/packages/notes_app/lib/src/widgets/categories_view.dart index 5ccf623dad1..6c8cafcf335 100644 --- a/packages/neon/neon_notes/lib/src/widgets/categories_view.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/widgets/categories_view.dart @@ -4,12 +4,12 @@ import 'package:neon_framework/sort_box.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_notes/l10n/localizations.dart'; -import 'package:neon_notes/src/blocs/notes.dart'; -import 'package:neon_notes/src/options.dart'; -import 'package:neon_notes/src/pages/category.dart'; -import 'package:neon_notes/src/sort/categories.dart'; -import 'package:neon_notes/src/utils/category_color.dart'; +import 'package:notes_app/l10n/localizations.dart'; +import 'package:notes_app/src/blocs/notes.dart'; +import 'package:notes_app/src/options.dart'; +import 'package:notes_app/src/pages/category.dart'; +import 'package:notes_app/src/sort/categories.dart'; +import 'package:notes_app/src/utils/category_color.dart'; class NotesCategoriesView extends StatelessWidget { const NotesCategoriesView({ diff --git a/packages/neon/neon_notes/lib/src/widgets/category_select.dart b/packages/neon_framework/packages/notes_app/lib/src/widgets/category_select.dart similarity index 96% rename from packages/neon/neon_notes/lib/src/widgets/category_select.dart rename to packages/neon_framework/packages/notes_app/lib/src/widgets/category_select.dart index 1ca8c417b7f..540406f4736 100644 --- a/packages/neon/neon_notes/lib/src/widgets/category_select.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/widgets/category_select.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/theme.dart'; -import 'package:neon_notes/l10n/localizations.dart'; -import 'package:neon_notes/src/utils/category_color.dart'; +import 'package:notes_app/l10n/localizations.dart'; +import 'package:notes_app/src/utils/category_color.dart'; class NotesCategorySelect extends StatelessWidget { NotesCategorySelect({ diff --git a/packages/neon/neon_notes/lib/src/widgets/dialog.dart b/packages/neon_framework/packages/notes_app/lib/src/widgets/dialog.dart similarity index 96% rename from packages/neon/neon_notes/lib/src/widgets/dialog.dart rename to packages/neon_framework/packages/notes_app/lib/src/widgets/dialog.dart index ea6e4d1e5dc..a4c3da45367 100644 --- a/packages/neon/neon_notes/lib/src/widgets/dialog.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/widgets/dialog.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_notes/l10n/localizations.dart'; -import 'package:neon_notes/src/blocs/notes.dart'; -import 'package:neon_notes/src/widgets/category_select.dart'; +import 'package:notes_app/l10n/localizations.dart'; +import 'package:notes_app/src/blocs/notes.dart'; +import 'package:notes_app/src/widgets/category_select.dart'; /// A dialog for creating a note. class NotesCreateNoteDialog extends StatefulWidget { diff --git a/packages/neon/neon_notes/lib/src/widgets/notes_floating_action_button.dart b/packages/neon_framework/packages/notes_app/lib/src/widgets/notes_floating_action_button.dart similarity index 85% rename from packages/neon/neon_notes/lib/src/widgets/notes_floating_action_button.dart rename to packages/neon_framework/packages/notes_app/lib/src/widgets/notes_floating_action_button.dart index ae0a3fd60fe..5edbdf9ffda 100644 --- a/packages/neon/neon_notes/lib/src/widgets/notes_floating_action_button.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/widgets/notes_floating_action_button.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:neon_framework/theme.dart'; -import 'package:neon_notes/l10n/localizations.dart'; -import 'package:neon_notes/src/blocs/notes.dart'; -import 'package:neon_notes/src/widgets/dialog.dart'; +import 'package:notes_app/l10n/localizations.dart'; +import 'package:notes_app/src/blocs/notes.dart'; +import 'package:notes_app/src/widgets/dialog.dart'; class NotesFloatingActionButton extends StatelessWidget { const NotesFloatingActionButton({ diff --git a/packages/neon/neon_notes/lib/src/widgets/notes_view.dart b/packages/neon_framework/packages/notes_app/lib/src/widgets/notes_view.dart similarity index 91% rename from packages/neon/neon_notes/lib/src/widgets/notes_view.dart rename to packages/neon_framework/packages/notes_app/lib/src/widgets/notes_view.dart index c251ae69c73..6bae6f6bf2e 100644 --- a/packages/neon/neon_notes/lib/src/widgets/notes_view.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/widgets/notes_view.dart @@ -5,15 +5,15 @@ import 'package:neon_framework/sort_box.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_notes/l10n/localizations.dart'; -import 'package:neon_notes/src/blocs/note.dart'; -import 'package:neon_notes/src/blocs/notes.dart'; -import 'package:neon_notes/src/options.dart'; -import 'package:neon_notes/src/pages/note.dart'; -import 'package:neon_notes/src/sort/notes.dart'; -import 'package:neon_notes/src/utils/category_color.dart'; import 'package:nextcloud/notes.dart' as notes; import 'package:nextcloud/utils.dart'; +import 'package:notes_app/l10n/localizations.dart'; +import 'package:notes_app/src/blocs/note.dart'; +import 'package:notes_app/src/blocs/notes.dart'; +import 'package:notes_app/src/options.dart'; +import 'package:notes_app/src/pages/note.dart'; +import 'package:notes_app/src/sort/notes.dart'; +import 'package:notes_app/src/utils/category_color.dart'; import 'package:timezone/timezone.dart' as tz; class NotesView extends StatelessWidget { diff --git a/packages/neon/neon_notes/pubspec.yaml b/packages/neon_framework/packages/notes_app/pubspec.yaml similarity index 98% rename from packages/neon/neon_notes/pubspec.yaml rename to packages/neon_framework/packages/notes_app/pubspec.yaml index b91bda49feb..52b7e153d6f 100644 --- a/packages/neon/neon_notes/pubspec.yaml +++ b/packages/neon_framework/packages/notes_app/pubspec.yaml @@ -1,4 +1,4 @@ -name: neon_notes +name: notes_app version: 1.0.0 publish_to: 'none' diff --git a/packages/neon/neon_notifications/pubspec_overrides.yaml b/packages/neon_framework/packages/notes_app/pubspec_overrides.yaml similarity index 55% rename from packages/neon/neon_notifications/pubspec_overrides.yaml rename to packages/neon_framework/packages/notes_app/pubspec_overrides.yaml index b02d61254c9..198db33e28c 100644 --- a/packages/neon/neon_notifications/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/notes_app/pubspec_overrides.yaml @@ -1,16 +1,16 @@ # melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box dependency_overrides: cookie_store: - path: ../../cookie_store + path: ../../../cookie_store dynamite_runtime: - path: ../../dynamite/dynamite_runtime + path: ../../../dynamite/packages/dynamite_runtime neon_framework: - path: ../../neon_framework + path: ../.. neon_http_client: - path: ../../neon_http_client + path: ../neon_http_client neon_lints: - path: ../../neon_lints + path: ../../../neon_lints nextcloud: - path: ../../nextcloud + path: ../../../nextcloud sort_box: - path: ../../sort_box + path: ../sort_box diff --git a/packages/neon/neon_notifications/.metadata b/packages/neon_framework/packages/notifications_app/.metadata similarity index 100% rename from packages/neon/neon_notifications/.metadata rename to packages/neon_framework/packages/notifications_app/.metadata diff --git a/packages/neon_framework/packages/notifications_app/LICENSE b/packages/neon_framework/packages/notifications_app/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/notifications_app/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_notifications/analysis_options.yaml b/packages/neon_framework/packages/notifications_app/analysis_options.yaml similarity index 100% rename from packages/neon/neon_notifications/analysis_options.yaml rename to packages/neon_framework/packages/notifications_app/analysis_options.yaml diff --git a/packages/neon/neon_notifications/assets/app.svg.vec b/packages/neon_framework/packages/notifications_app/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_notifications/assets/app.svg.vec rename to packages/neon_framework/packages/notifications_app/assets/app.svg.vec diff --git a/packages/neon/neon_notifications/build.yaml b/packages/neon_framework/packages/notifications_app/build.yaml similarity index 100% rename from packages/neon/neon_notifications/build.yaml rename to packages/neon_framework/packages/notifications_app/build.yaml diff --git a/packages/neon/neon_notifications/l10n.yaml b/packages/neon_framework/packages/notifications_app/l10n.yaml similarity index 100% rename from packages/neon/neon_notifications/l10n.yaml rename to packages/neon_framework/packages/notifications_app/l10n.yaml diff --git a/packages/neon/neon_notifications/lib/l10n/en.arb b/packages/neon_framework/packages/notifications_app/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_notifications/lib/l10n/en.arb rename to packages/neon_framework/packages/notifications_app/lib/l10n/en.arb diff --git a/packages/neon/neon_notifications/lib/l10n/localizations.dart b/packages/neon_framework/packages/notifications_app/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_notifications/lib/l10n/localizations.dart rename to packages/neon_framework/packages/notifications_app/lib/l10n/localizations.dart diff --git a/packages/neon/neon_notifications/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/notifications_app/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_notifications/lib/l10n/localizations_en.dart rename to packages/neon_framework/packages/notifications_app/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_notifications/lib/neon_notifications.dart b/packages/neon_framework/packages/notifications_app/lib/notifications_app.dart similarity index 82% rename from packages/neon/neon_notifications/lib/neon_notifications.dart rename to packages/neon_framework/packages/notifications_app/lib/notifications_app.dart index 37cc132d803..3b15651d275 100644 --- a/packages/neon/neon_notifications/lib/neon_notifications.dart +++ b/packages/neon_framework/packages/notifications_app/lib/notifications_app.dart @@ -6,12 +6,12 @@ library; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:neon_framework/models.dart'; -import 'package:neon_notifications/l10n/localizations.dart'; -import 'package:neon_notifications/src/blocs/notifications.dart'; -import 'package:neon_notifications/src/options.dart'; -import 'package:neon_notifications/src/pages/main.dart'; -import 'package:neon_notifications/src/routes.dart'; import 'package:nextcloud/notifications.dart' as notifications; +import 'package:notifications_app/l10n/localizations.dart'; +import 'package:notifications_app/src/blocs/notifications.dart'; +import 'package:notifications_app/src/options.dart'; +import 'package:notifications_app/src/pages/main.dart'; +import 'package:notifications_app/src/routes.dart'; import 'package:rxdart/rxdart.dart'; class NotificationsApp extends AppImplementation diff --git a/packages/neon/neon_notifications/lib/src/blocs/notifications.dart b/packages/neon_framework/packages/notifications_app/lib/src/blocs/notifications.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/blocs/notifications.dart rename to packages/neon_framework/packages/notifications_app/lib/src/blocs/notifications.dart diff --git a/packages/neon/neon_notifications/lib/src/options.dart b/packages/neon_framework/packages/notifications_app/lib/src/options.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/options.dart rename to packages/neon_framework/packages/notifications_app/lib/src/options.dart diff --git a/packages/neon/neon_notifications/lib/src/pages/main.dart b/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart similarity index 92% rename from packages/neon/neon_notifications/lib/src/pages/main.dart rename to packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart index d1b7935e496..09b8f70b37a 100644 --- a/packages/neon/neon_notifications/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart @@ -6,9 +6,9 @@ import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_notifications/l10n/localizations.dart'; -import 'package:neon_notifications/src/blocs/notifications.dart'; -import 'package:neon_notifications/src/widgets/notification.dart'; +import 'package:notifications_app/l10n/localizations.dart'; +import 'package:notifications_app/src/blocs/notifications.dart'; +import 'package:notifications_app/src/widgets/notification.dart'; class NotificationsMainPage extends StatefulWidget { const NotificationsMainPage({ diff --git a/packages/neon/neon_notifications/lib/src/routes.dart b/packages/neon_framework/packages/notifications_app/lib/src/routes.dart similarity index 90% rename from packages/neon/neon_notifications/lib/src/routes.dart rename to packages/neon_framework/packages/notifications_app/lib/src/routes.dart index b054b3685ee..7f36773376e 100644 --- a/packages/neon/neon_notifications/lib/src/routes.dart +++ b/packages/neon_framework/packages/notifications_app/lib/src/routes.dart @@ -1,8 +1,8 @@ import 'package:flutter/widgets.dart'; import 'package:go_router/go_router.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_notifications/src/pages/main.dart'; import 'package:nextcloud/notifications.dart' as notifications; +import 'package:notifications_app/src/pages/main.dart'; part 'routes.g.dart'; diff --git a/packages/neon/neon_notifications/lib/src/routes.g.dart b/packages/neon_framework/packages/notifications_app/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/routes.g.dart rename to packages/neon_framework/packages/notifications_app/lib/src/routes.g.dart diff --git a/packages/neon/neon_notifications/lib/src/widgets/action.dart b/packages/neon_framework/packages/notifications_app/lib/src/widgets/action.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/widgets/action.dart rename to packages/neon_framework/packages/notifications_app/lib/src/widgets/action.dart diff --git a/packages/neon/neon_notifications/lib/src/widgets/notification.dart b/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart similarity index 97% rename from packages/neon/neon_notifications/lib/src/widgets/notification.dart rename to packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart index 84aaf354b49..9929d089dd8 100644 --- a/packages/neon/neon_notifications/lib/src/widgets/notification.dart +++ b/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart @@ -5,8 +5,8 @@ import 'package:neon_framework/models.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_notifications/src/widgets/action.dart'; import 'package:nextcloud/notifications.dart' as notifications; +import 'package:notifications_app/src/widgets/action.dart'; import 'package:timezone/timezone.dart' as tz; class NotificationsNotification extends StatelessWidget { diff --git a/packages/neon/neon_notifications/pubspec.yaml b/packages/neon_framework/packages/notifications_app/pubspec.yaml similarity index 97% rename from packages/neon/neon_notifications/pubspec.yaml rename to packages/neon_framework/packages/notifications_app/pubspec.yaml index 364c9f74107..80cbafd3870 100644 --- a/packages/neon/neon_notifications/pubspec.yaml +++ b/packages/neon_framework/packages/notifications_app/pubspec.yaml @@ -1,4 +1,4 @@ -name: neon_notifications +name: notifications_app version: 1.0.0 publish_to: 'none' diff --git a/packages/neon/neon_news/pubspec_overrides.yaml b/packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml similarity index 55% rename from packages/neon/neon_news/pubspec_overrides.yaml rename to packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml index b02d61254c9..198db33e28c 100644 --- a/packages/neon/neon_news/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml @@ -1,16 +1,16 @@ # melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box dependency_overrides: cookie_store: - path: ../../cookie_store + path: ../../../cookie_store dynamite_runtime: - path: ../../dynamite/dynamite_runtime + path: ../../../dynamite/packages/dynamite_runtime neon_framework: - path: ../../neon_framework + path: ../.. neon_http_client: - path: ../../neon_http_client + path: ../neon_http_client neon_lints: - path: ../../neon_lints + path: ../../../neon_lints nextcloud: - path: ../../nextcloud + path: ../../../nextcloud sort_box: - path: ../../sort_box + path: ../sort_box diff --git a/packages/neon/neon_notifications/test/action_test.dart b/packages/neon_framework/packages/notifications_app/test/action_test.dart similarity index 96% rename from packages/neon/neon_notifications/test/action_test.dart rename to packages/neon_framework/packages/notifications_app/test/action_test.dart index 7f33ec0e61f..2dad8f18157 100644 --- a/packages/neon/neon_notifications/test/action_test.dart +++ b/packages/neon_framework/packages/notifications_app/test/action_test.dart @@ -1,7 +1,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/testing.dart'; -import 'package:neon_notifications/src/widgets/action.dart'; +import 'package:notifications_app/src/widgets/action.dart'; import 'testing.dart'; diff --git a/packages/neon/neon_notifications/test/bloc_test.dart b/packages/neon_framework/packages/notifications_app/test/bloc_test.dart similarity index 98% rename from packages/neon/neon_notifications/test/bloc_test.dart rename to packages/neon_framework/packages/notifications_app/test/bloc_test.dart index 40fff7a08d9..10f9e85320f 100644 --- a/packages/neon/neon_notifications/test/bloc_test.dart +++ b/packages/neon_framework/packages/notifications_app/test/bloc_test.dart @@ -6,7 +6,7 @@ import 'package:http/http.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; -import 'package:neon_notifications/src/blocs/notifications.dart'; +import 'package:notifications_app/src/blocs/notifications.dart'; Account mockNotificationsAccount() { final notifications = List.generate( diff --git a/packages/neon/neon_notifications/test/goldens/action_primary.png b/packages/neon_framework/packages/notifications_app/test/goldens/action_primary.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/action_primary.png rename to packages/neon_framework/packages/notifications_app/test/goldens/action_primary.png diff --git a/packages/neon/neon_notifications/test/goldens/action_secondary.png b/packages/neon_framework/packages/notifications_app/test/goldens/action_secondary.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/action_secondary.png rename to packages/neon_framework/packages/notifications_app/test/goldens/action_secondary.png diff --git a/packages/neon/neon_notifications/test/goldens/main_page_error.png b/packages/neon_framework/packages/notifications_app/test/goldens/main_page_error.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/main_page_error.png rename to packages/neon_framework/packages/notifications_app/test/goldens/main_page_error.png diff --git a/packages/neon/neon_notifications/test/goldens/main_page_with_notifications.png b/packages/neon_framework/packages/notifications_app/test/goldens/main_page_with_notifications.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/main_page_with_notifications.png rename to packages/neon_framework/packages/notifications_app/test/goldens/main_page_with_notifications.png diff --git a/packages/neon/neon_notifications/test/goldens/main_page_without_notifications.png b/packages/neon_framework/packages/notifications_app/test/goldens/main_page_without_notifications.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/main_page_without_notifications.png rename to packages/neon_framework/packages/notifications_app/test/goldens/main_page_without_notifications.png diff --git a/packages/neon/neon_notifications/test/goldens/notification.png b/packages/neon_framework/packages/notifications_app/test/goldens/notification.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/notification.png rename to packages/neon_framework/packages/notifications_app/test/goldens/notification.png diff --git a/packages/neon/neon_notifications/test/main_page_test.dart b/packages/neon_framework/packages/notifications_app/test/main_page_test.dart similarity index 95% rename from packages/neon/neon_notifications/test/main_page_test.dart rename to packages/neon_framework/packages/notifications_app/test/main_page_test.dart index 37f2bcd50cf..3c5a659ee33 100644 --- a/packages/neon/neon_notifications/test/main_page_test.dart +++ b/packages/neon_framework/packages/notifications_app/test/main_page_test.dart @@ -8,11 +8,11 @@ import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_notifications/l10n/localizations.dart'; -import 'package:neon_notifications/src/blocs/notifications.dart'; -import 'package:neon_notifications/src/pages/main.dart'; -import 'package:neon_notifications/src/widgets/notification.dart'; import 'package:nextcloud/nextcloud.dart'; +import 'package:notifications_app/l10n/localizations.dart'; +import 'package:notifications_app/src/blocs/notifications.dart'; +import 'package:notifications_app/src/pages/main.dart'; +import 'package:notifications_app/src/widgets/notification.dart'; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; import 'package:timezone/timezone.dart' as tz; diff --git a/packages/neon/neon_notifications/test/notification_test.dart b/packages/neon_framework/packages/notifications_app/test/notification_test.dart similarity index 94% rename from packages/neon/neon_notifications/test/notification_test.dart rename to packages/neon_framework/packages/notifications_app/test/notification_test.dart index e1bd706b6cf..a805de2f920 100644 --- a/packages/neon/neon_notifications/test/notification_test.dart +++ b/packages/neon_framework/packages/notifications_app/test/notification_test.dart @@ -4,11 +4,11 @@ import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_notifications/l10n/localizations.dart'; -import 'package:neon_notifications/src/widgets/action.dart'; -import 'package:neon_notifications/src/widgets/notification.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/notifications.dart' as notifications; +import 'package:notifications_app/l10n/localizations.dart'; +import 'package:notifications_app/src/widgets/action.dart'; +import 'package:notifications_app/src/widgets/notification.dart'; import 'package:provider/provider.dart'; import 'package:timezone/timezone.dart' as tz; diff --git a/packages/neon/neon_notifications/test/testing.dart b/packages/neon_framework/packages/notifications_app/test/testing.dart similarity index 83% rename from packages/neon/neon_notifications/test/testing.dart rename to packages/neon_framework/packages/notifications_app/test/testing.dart index f6534cfd483..8412572de5a 100644 --- a/packages/neon/neon_notifications/test/testing.dart +++ b/packages/neon_framework/packages/notifications_app/test/testing.dart @@ -1,6 +1,6 @@ import 'package:mocktail/mocktail.dart'; -import 'package:neon_notifications/src/blocs/notifications.dart'; import 'package:nextcloud/notifications.dart' as notifications; +import 'package:notifications_app/src/blocs/notifications.dart'; class MockNotificationsBloc extends Mock implements NotificationsBloc {} diff --git a/packages/neon_framework/packages/sort_box/LICENSE b/packages/neon_framework/packages/sort_box/LICENSE new file mode 120000 index 00000000000..0fef81c998a --- /dev/null +++ b/packages/neon_framework/packages/sort_box/LICENSE @@ -0,0 +1 @@ +../../../../assets/BSD-3-Clause.txt \ No newline at end of file diff --git a/packages/sort_box/README.md b/packages/neon_framework/packages/sort_box/README.md similarity index 100% rename from packages/sort_box/README.md rename to packages/neon_framework/packages/sort_box/README.md diff --git a/packages/neon_framework/packages/sort_box/analysis_options.yaml b/packages/neon_framework/packages/sort_box/analysis_options.yaml new file mode 100644 index 00000000000..bff1b129f3c --- /dev/null +++ b/packages/neon_framework/packages/sort_box/analysis_options.yaml @@ -0,0 +1,5 @@ +include: package:neon_lints/dart.yaml + +custom_lint: + rules: + - avoid_exports: false diff --git a/packages/sort_box/lib/sort_box.dart b/packages/neon_framework/packages/sort_box/lib/sort_box.dart similarity index 100% rename from packages/sort_box/lib/sort_box.dart rename to packages/neon_framework/packages/sort_box/lib/sort_box.dart diff --git a/packages/sort_box/lib/src/sort_box.dart b/packages/neon_framework/packages/sort_box/lib/src/sort_box.dart similarity index 100% rename from packages/sort_box/lib/src/sort_box.dart rename to packages/neon_framework/packages/sort_box/lib/src/sort_box.dart diff --git a/packages/sort_box/pubspec.yaml b/packages/neon_framework/packages/sort_box/pubspec.yaml similarity index 100% rename from packages/sort_box/pubspec.yaml rename to packages/neon_framework/packages/sort_box/pubspec.yaml diff --git a/packages/dynamite/dynamite/pubspec_overrides.yaml b/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml similarity index 73% rename from packages/dynamite/dynamite/pubspec_overrides.yaml rename to packages/neon_framework/packages/sort_box/pubspec_overrides.yaml index acded63f9b7..0e5d8123538 100644 --- a/packages/dynamite/dynamite/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml @@ -1,4 +1,4 @@ # melos_managed_dependency_overrides: neon_lints dependency_overrides: neon_lints: - path: ../../neon_lints + path: ../../../neon_lints diff --git a/packages/sort_box/test/sort_box_test.dart b/packages/neon_framework/packages/sort_box/test/sort_box_test.dart similarity index 100% rename from packages/sort_box/test/sort_box_test.dart rename to packages/neon_framework/packages/sort_box/test/sort_box_test.dart diff --git a/packages/neon/neon_talk/.metadata b/packages/neon_framework/packages/talk_app/.metadata similarity index 100% rename from packages/neon/neon_talk/.metadata rename to packages/neon_framework/packages/talk_app/.metadata diff --git a/packages/neon_framework/packages/talk_app/LICENSE b/packages/neon_framework/packages/talk_app/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/talk_app/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_talk/analysis_options.yaml b/packages/neon_framework/packages/talk_app/analysis_options.yaml similarity index 100% rename from packages/neon/neon_talk/analysis_options.yaml rename to packages/neon_framework/packages/talk_app/analysis_options.yaml diff --git a/packages/neon/neon_talk/assets/app.svg.vec b/packages/neon_framework/packages/talk_app/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_talk/assets/app.svg.vec rename to packages/neon_framework/packages/talk_app/assets/app.svg.vec diff --git a/packages/neon/neon_talk/build.yaml b/packages/neon_framework/packages/talk_app/build.yaml similarity index 100% rename from packages/neon/neon_talk/build.yaml rename to packages/neon_framework/packages/talk_app/build.yaml diff --git a/packages/neon/neon_talk/l10n.yaml b/packages/neon_framework/packages/talk_app/l10n.yaml similarity index 100% rename from packages/neon/neon_talk/l10n.yaml rename to packages/neon_framework/packages/talk_app/l10n.yaml diff --git a/packages/neon/neon_talk/lib/l10n/en.arb b/packages/neon_framework/packages/talk_app/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_talk/lib/l10n/en.arb rename to packages/neon_framework/packages/talk_app/lib/l10n/en.arb diff --git a/packages/neon/neon_talk/lib/l10n/localizations.dart b/packages/neon_framework/packages/talk_app/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_talk/lib/l10n/localizations.dart rename to packages/neon_framework/packages/talk_app/lib/l10n/localizations.dart diff --git a/packages/neon/neon_talk/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/talk_app/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_talk/lib/l10n/localizations_en.dart rename to packages/neon_framework/packages/talk_app/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_talk/lib/src/blocs/message_bloc.dart b/packages/neon_framework/packages/talk_app/lib/src/blocs/message_bloc.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/blocs/message_bloc.dart rename to packages/neon_framework/packages/talk_app/lib/src/blocs/message_bloc.dart diff --git a/packages/neon/neon_talk/lib/src/blocs/room.dart b/packages/neon_framework/packages/talk_app/lib/src/blocs/room.dart similarity index 99% rename from packages/neon/neon_talk/lib/src/blocs/room.dart rename to packages/neon_framework/packages/talk_app/lib/src/blocs/room.dart index 5eac66fee2d..32201529def 100644 --- a/packages/neon/neon_talk/lib/src/blocs/room.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/blocs/room.dart @@ -8,11 +8,11 @@ import 'package:meta/meta.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_talk/src/blocs/talk.dart'; -import 'package:neon_talk/src/utils/helpers.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:rxdart/rxdart.dart'; import 'package:rxdart/subjects.dart'; +import 'package:talk_app/src/blocs/talk.dart'; +import 'package:talk_app/src/utils/helpers.dart'; /// Manages the state of a Talk room. @sealed diff --git a/packages/neon/neon_talk/lib/src/blocs/talk.dart b/packages/neon_framework/packages/talk_app/lib/src/blocs/talk.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/blocs/talk.dart rename to packages/neon_framework/packages/talk_app/lib/src/blocs/talk.dart diff --git a/packages/neon/neon_talk/lib/src/dialogs/create_room.dart b/packages/neon_framework/packages/talk_app/lib/src/dialogs/create_room.dart similarity index 99% rename from packages/neon/neon_talk/lib/src/dialogs/create_room.dart rename to packages/neon_framework/packages/talk_app/lib/src/dialogs/create_room.dart index 8af483952b4..0f4d90fecfd 100644 --- a/packages/neon/neon_talk/lib/src/dialogs/create_room.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/dialogs/create_room.dart @@ -4,9 +4,9 @@ import 'package:neon_framework/models.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/l10n/localizations.dart'; import 'package:nextcloud/core.dart' as core; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/l10n/localizations.dart'; /// The data that will be returned when the [TalkCreateRoomDialog] is closed. typedef TalkCreateRoomDetails = ({ diff --git a/packages/neon/neon_talk/lib/src/options.dart b/packages/neon_framework/packages/talk_app/lib/src/options.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/options.dart rename to packages/neon_framework/packages/talk_app/lib/src/options.dart diff --git a/packages/neon/neon_talk/lib/src/pages/main.dart b/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart similarity index 88% rename from packages/neon/neon_talk/lib/src/pages/main.dart rename to packages/neon_framework/packages/talk_app/lib/src/pages/main.dart index 577545c3efc..eba2449e683 100644 --- a/packages/neon/neon_talk/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart @@ -6,17 +6,17 @@ import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/blocs/talk.dart'; -import 'package:neon_talk/src/dialogs/create_room.dart'; -import 'package:neon_talk/src/pages/room.dart'; -import 'package:neon_talk/src/utils/helpers.dart'; -import 'package:neon_talk/src/widgets/message.dart'; -import 'package:neon_talk/src/widgets/read_indicator.dart'; -import 'package:neon_talk/src/widgets/room_avatar.dart'; -import 'package:neon_talk/src/widgets/unread_indicator.dart'; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/blocs/talk.dart'; +import 'package:talk_app/src/dialogs/create_room.dart'; +import 'package:talk_app/src/pages/room.dart'; +import 'package:talk_app/src/utils/helpers.dart'; +import 'package:talk_app/src/widgets/message.dart'; +import 'package:talk_app/src/widgets/read_indicator.dart'; +import 'package:talk_app/src/widgets/room_avatar.dart'; +import 'package:talk_app/src/widgets/unread_indicator.dart'; /// The main page displaying the chat list. class TalkMainPage extends StatefulWidget { diff --git a/packages/neon/neon_talk/lib/src/pages/room.dart b/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart similarity index 95% rename from packages/neon/neon_talk/lib/src/pages/room.dart rename to packages/neon_framework/packages/talk_app/lib/src/pages/room.dart index 4c516d333f0..567efd3b5a7 100644 --- a/packages/neon/neon_talk/lib/src/pages/room.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart @@ -6,12 +6,12 @@ import 'package:intl/intl.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/theme.dart'; -import 'package:neon_talk/src/utils/helpers.dart'; -import 'package:neon_talk/src/widgets/message.dart'; -import 'package:neon_talk/src/widgets/message_input.dart'; -import 'package:neon_talk/src/widgets/room_avatar.dart'; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/theme.dart'; +import 'package:talk_app/src/utils/helpers.dart'; +import 'package:talk_app/src/widgets/message.dart'; +import 'package:talk_app/src/widgets/message_input.dart'; +import 'package:talk_app/src/widgets/room_avatar.dart'; import 'package:timezone/timezone.dart' as tz; const _millisecondsPerDay = 24 * 60 * 60 * 1000; diff --git a/packages/neon/neon_talk/lib/src/routes.dart b/packages/neon_framework/packages/talk_app/lib/src/routes.dart similarity index 90% rename from packages/neon/neon_talk/lib/src/routes.dart rename to packages/neon_framework/packages/talk_app/lib/src/routes.dart index 03b10929cc8..4b48d5d9abd 100644 --- a/packages/neon/neon_talk/lib/src/routes.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/routes.dart @@ -1,7 +1,7 @@ import 'package:flutter/widgets.dart'; import 'package:go_router/go_router.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_talk/src/pages/main.dart'; +import 'package:talk_app/src/pages/main.dart'; part 'routes.g.dart'; diff --git a/packages/neon/neon_talk/lib/src/routes.g.dart b/packages/neon_framework/packages/talk_app/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/routes.g.dart rename to packages/neon_framework/packages/talk_app/lib/src/routes.g.dart diff --git a/packages/neon/neon_talk/lib/src/theme.dart b/packages/neon_framework/packages/talk_app/lib/src/theme.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/theme.dart rename to packages/neon_framework/packages/talk_app/lib/src/theme.dart diff --git a/packages/neon/neon_talk/lib/src/utils/helpers.dart b/packages/neon_framework/packages/talk_app/lib/src/utils/helpers.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/utils/helpers.dart rename to packages/neon_framework/packages/talk_app/lib/src/utils/helpers.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/actor_avatar.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/actor_avatar.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/actor_avatar.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/actor_avatar.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/message.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart similarity index 97% rename from packages/neon/neon_talk/lib/src/widgets/message.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart index def4365a718..87d2208e3f0 100644 --- a/packages/neon/neon_talk/lib/src/widgets/message.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart @@ -9,19 +9,19 @@ import 'package:neon_framework/models.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/src/blocs/message_bloc.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/utils/helpers.dart'; -import 'package:neon_talk/src/widgets/actor_avatar.dart'; -import 'package:neon_talk/src/widgets/reactions.dart'; -import 'package:neon_talk/src/widgets/read_indicator.dart'; -import 'package:neon_talk/src/widgets/reference_preview.dart'; -import 'package:neon_talk/src/widgets/rich_object/deck_card.dart'; -import 'package:neon_talk/src/widgets/rich_object/fallback.dart'; -import 'package:neon_talk/src/widgets/rich_object/file.dart'; -import 'package:neon_talk/src/widgets/rich_object/mention.dart'; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/src/blocs/message_bloc.dart'; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/utils/helpers.dart'; +import 'package:talk_app/src/widgets/actor_avatar.dart'; +import 'package:talk_app/src/widgets/reactions.dart'; +import 'package:talk_app/src/widgets/read_indicator.dart'; +import 'package:talk_app/src/widgets/reference_preview.dart'; +import 'package:talk_app/src/widgets/rich_object/deck_card.dart'; +import 'package:talk_app/src/widgets/rich_object/fallback.dart'; +import 'package:talk_app/src/widgets/rich_object/file.dart'; +import 'package:talk_app/src/widgets/rich_object/mention.dart'; import 'package:timezone/timezone.dart' as tz; final _timeFormat = DateFormat.jm(); diff --git a/packages/neon/neon_talk/lib/src/widgets/message_input.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/message_input.dart similarity index 98% rename from packages/neon/neon_talk/lib/src/widgets/message_input.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/message_input.dart index 7a14fe94abb..52a203b810e 100644 --- a/packages/neon/neon_talk/lib/src/widgets/message_input.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/widgets/message_input.dart @@ -8,10 +8,10 @@ import 'package:neon_framework/models.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/widgets/message.dart'; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/widgets/message.dart'; /// Widget for displaying the emoji button, text input and send button. class TalkMessageInput extends StatefulWidget { diff --git a/packages/neon/neon_talk/lib/src/widgets/reactions.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/reactions.dart similarity index 97% rename from packages/neon/neon_talk/lib/src/widgets/reactions.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/reactions.dart index 9d462236ad8..b37ed387619 100644 --- a/packages/neon/neon_talk/lib/src/widgets/reactions.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/widgets/reactions.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:intersperse/intersperse.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/src/blocs/room.dart'; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/src/blocs/room.dart'; /// Widget for displaying the current reactions on a chat message including the ability to add and remove reactions. class TalkReactions extends StatelessWidget { diff --git a/packages/neon/neon_talk/lib/src/widgets/read_indicator.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/read_indicator.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/read_indicator.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/read_indicator.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/reference_preview.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/reference_preview.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/reference_preview.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/reference_preview.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/deck_card.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/deck_card.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/deck_card.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/deck_card.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/fallback.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/fallback.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/fallback.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/fallback.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/file.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/file.dart similarity index 91% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/file.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/file.dart index ce05ad68f4d..ee0cf17a977 100644 --- a/packages/neon/neon_talk/lib/src/widgets/rich_object/file.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/file.dart @@ -1,9 +1,9 @@ -import 'package:file_icons/file_icons.dart'; +import 'package:files_icons/files_icons.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:neon_framework/theme.dart'; -import 'package:neon_talk/src/widgets/rich_object/file_preview.dart'; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/src/widgets/rich_object/file_preview.dart'; /// Displays a file from a rich object. class TalkRichObjectFile extends StatelessWidget { diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/file_preview.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/file_preview.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/file_preview.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/file_preview.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/mention.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/mention.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/mention.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/mention.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/room_avatar.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/room_avatar.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/room_avatar.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/room_avatar.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/unread_indicator.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/unread_indicator.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/unread_indicator.dart rename to packages/neon_framework/packages/talk_app/lib/src/widgets/unread_indicator.dart diff --git a/packages/neon/neon_talk/lib/neon_talk.dart b/packages/neon_framework/packages/talk_app/lib/talk_app.dart similarity index 85% rename from packages/neon/neon_talk/lib/neon_talk.dart rename to packages/neon_framework/packages/talk_app/lib/talk_app.dart index 0870d5c124e..f116bb329b9 100644 --- a/packages/neon/neon_talk/lib/neon_talk.dart +++ b/packages/neon_framework/packages/talk_app/lib/talk_app.dart @@ -8,16 +8,16 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:meta/meta.dart'; import 'package:neon_framework/models.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/src/blocs/talk.dart'; -import 'package:neon_talk/src/options.dart'; -import 'package:neon_talk/src/pages/main.dart'; -import 'package:neon_talk/src/routes.dart'; -import 'package:neon_talk/src/theme.dart'; import 'package:nextcloud/core.dart' as core; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:rxdart/rxdart.dart'; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/src/blocs/talk.dart'; +import 'package:talk_app/src/options.dart'; +import 'package:talk_app/src/pages/main.dart'; +import 'package:talk_app/src/routes.dart'; +import 'package:talk_app/src/theme.dart'; /// Implementation of the server `talk` app. @experimental diff --git a/packages/neon/neon_talk/pubspec.yaml b/packages/neon_framework/packages/talk_app/pubspec.yaml similarity index 92% rename from packages/neon/neon_talk/pubspec.yaml rename to packages/neon_framework/packages/talk_app/pubspec.yaml index 78a8e06b995..357203d5e3b 100644 --- a/packages/neon/neon_talk/pubspec.yaml +++ b/packages/neon_framework/packages/talk_app/pubspec.yaml @@ -1,4 +1,4 @@ -name: neon_talk +name: talk_app version: 1.0.0 publish_to: 'none' @@ -10,10 +10,10 @@ dependencies: built_collection: ^5.0.0 collection: ^1.0.0 dynamite_runtime: ^0.5.0 - file_icons: + files_icons: git: url: https://github.com/nextcloud/neon - path: packages/file_icons + path: packages/neon_framework/packages/files_icons flutter: sdk: flutter flutter_localizations: diff --git a/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml b/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml new file mode 100644 index 00000000000..85cab030cf0 --- /dev/null +++ b/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml @@ -0,0 +1,18 @@ +# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,files_icons,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box +dependency_overrides: + cookie_store: + path: ../../../cookie_store + dynamite_runtime: + path: ../../../dynamite/packages/dynamite_runtime + files_icons: + path: ../files_icons + neon_framework: + path: ../.. + neon_http_client: + path: ../neon_http_client + neon_lints: + path: ../../../neon_lints + nextcloud: + path: ../../../nextcloud + sort_box: + path: ../sort_box diff --git a/packages/neon/neon_talk/test/actor_avatar_test.dart b/packages/neon_framework/packages/talk_app/test/actor_avatar_test.dart similarity index 95% rename from packages/neon/neon_talk/test/actor_avatar_test.dart rename to packages/neon_framework/packages/talk_app/test/actor_avatar_test.dart index 4f1ef3d9852..b173d943267 100644 --- a/packages/neon/neon_talk/test/actor_avatar_test.dart +++ b/packages/neon_framework/packages/talk_app/test/actor_avatar_test.dart @@ -4,10 +4,10 @@ import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/src/widgets/actor_avatar.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:provider/provider.dart'; +import 'package:talk_app/src/widgets/actor_avatar.dart'; void main() { setUp(() { diff --git a/packages/neon/neon_talk/test/bloc_test.dart b/packages/neon_framework/packages/talk_app/test/bloc_test.dart similarity index 98% rename from packages/neon/neon_talk/test/bloc_test.dart rename to packages/neon_framework/packages/talk_app/test/bloc_test.dart index d1fdf5ccb28..f7deaa6eed0 100644 --- a/packages/neon/neon_talk/test/bloc_test.dart +++ b/packages/neon_framework/packages/talk_app/test/bloc_test.dart @@ -7,9 +7,9 @@ import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; -import 'package:neon_talk/src/blocs/talk.dart'; import 'package:nextcloud/core.dart' as core; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/src/blocs/talk.dart'; import 'testing.dart'; diff --git a/packages/neon/neon_talk/test/create_room_dialog_test.dart b/packages/neon_framework/packages/talk_app/test/create_room_dialog_test.dart similarity index 97% rename from packages/neon/neon_talk/test/create_room_dialog_test.dart rename to packages/neon_framework/packages/talk_app/test/create_room_dialog_test.dart index fe66a1568a6..d156e353d4a 100644 --- a/packages/neon/neon_talk/test/create_room_dialog_test.dart +++ b/packages/neon_framework/packages/talk_app/test/create_room_dialog_test.dart @@ -11,14 +11,14 @@ import 'package:neon_framework/testing.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/l10n/localizations_en.dart'; -import 'package:neon_talk/src/dialogs/create_room.dart'; import 'package:nextcloud/core.dart' as core; import 'package:nextcloud/spreed.dart' as spreed; import 'package:nextcloud/user_status.dart' as user_status; import 'package:provider/provider.dart'; import 'package:rxdart/subjects.dart'; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/l10n/localizations_en.dart'; +import 'package:talk_app/src/dialogs/create_room.dart'; Account mockAutocompleteAccount() { return mockServer({ diff --git a/packages/neon/neon_talk/test/goldens/main_page_error.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_error.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_error.png rename to packages/neon_framework/packages/talk_app/test/goldens/main_page_error.png diff --git a/packages/neon/neon_talk/test/goldens/main_page_with_message_preview_with_unread_messages.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_with_unread_messages.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_with_message_preview_with_unread_messages.png rename to packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_with_unread_messages.png diff --git a/packages/neon/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_other.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_other.png rename to packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_other.png diff --git a/packages/neon/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_self.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_self.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_self.png rename to packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_self.png diff --git a/packages/neon/neon_talk/test/goldens/main_page_without_message_preview.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_without_message_preview.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_without_message_preview.png rename to packages/neon_framework/packages/talk_app/test/goldens/main_page_without_message_preview.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_as_parent.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_as_parent.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_as_parent.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_as_parent.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_deleted.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_deleted.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_deleted.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_deleted.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_other.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_other.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_other.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_self.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_self.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_self.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_self.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_separate_actor.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_actor.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_separate_actor.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_actor.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_separate_edited.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_edited.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_separate_edited.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_edited.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_separate_system_message.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_system_message.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_separate_system_message.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_system_message.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_separate_time.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_time.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_separate_time.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_time.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_with_parent.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_parent.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_with_parent.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_parent.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_with_references.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_references.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_with_references.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_references.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_edit.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_edit.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_edit.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_input_edit.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_emoji.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_emoji.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_emoji.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_input_emoji.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_mention_suggestions.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_mention_suggestions.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_mention_suggestions.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_input_mention_suggestions.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_multiline.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_multiline.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_multiline.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_input_multiline.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_no_emoji_button.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_no_emoji_button.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_no_emoji_button.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_input_no_emoji_button.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_reply.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_reply.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_reply.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_input_reply.png diff --git a/packages/neon/neon_talk/test/goldens/message_parent_message.png b/packages/neon_framework/packages/talk_app/test/goldens/message_parent_message.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_parent_message.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_parent_message.png diff --git a/packages/neon/neon_talk/test/goldens/message_system_message_grouping.png b/packages/neon_framework/packages/talk_app/test/goldens/message_system_message_grouping.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_system_message_grouping.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_system_message_grouping.png diff --git a/packages/neon/neon_talk/test/goldens/message_system_message_show.png b/packages/neon_framework/packages/talk_app/test/goldens/message_system_message_show.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_system_message_show.png rename to packages/neon_framework/packages/talk_app/test/goldens/message_system_message_show.png diff --git a/packages/neon/neon_talk/test/goldens/reactions.png b/packages/neon_framework/packages/talk_app/test/goldens/reactions.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/reactions.png rename to packages/neon_framework/packages/talk_app/test/goldens/reactions.png diff --git a/packages/neon/neon_talk/test/goldens/reference_preview.png b/packages/neon_framework/packages/talk_app/test/goldens/reference_preview.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/reference_preview.png rename to packages/neon_framework/packages/talk_app/test/goldens/reference_preview.png diff --git a/packages/neon/neon_talk/test/goldens/reference_preview_with_description.png b/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_description.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/reference_preview_with_description.png rename to packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_description.png diff --git a/packages/neon/neon_talk/test/goldens/reference_preview_with_thumb.png b/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_thumb.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/reference_preview_with_thumb.png rename to packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_thumb.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_deck_card.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_deck_card.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_deck_card.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_deck_card.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_fallback_with_icon.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_with_icon.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_fallback_with_icon.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_with_icon.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_fallback_without_icon.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_without_icon.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_fallback_without_icon.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_without_icon.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_file_without_preview.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_file_without_preview.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_file_without_preview.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_file_without_preview.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_call.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_call.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_call.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_call.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_group_highlight.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_highlight.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_group_highlight.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_highlight.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_group_other.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_group_other.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_other.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_guest.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_guest.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_guest.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_guest.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_user-group_highlight.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_highlight.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_user-group_highlight.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_highlight.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_user-group_other.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_user-group_other.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_other.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_user_highlight.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_highlight.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_user_highlight.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_highlight.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_user_other.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_user_other.png rename to packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_other.png diff --git a/packages/neon/neon_talk/test/goldens/room_page_error.png b/packages/neon_framework/packages/talk_app/test/goldens/room_page_error.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/room_page_error.png rename to packages/neon_framework/packages/talk_app/test/goldens/room_page_error.png diff --git a/packages/neon/neon_talk/test/goldens/room_page_messages.png b/packages/neon_framework/packages/talk_app/test/goldens/room_page_messages.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/room_page_messages.png rename to packages/neon_framework/packages/talk_app/test/goldens/room_page_messages.png diff --git a/packages/neon/neon_talk/test/goldens/room_page_read_only.png b/packages/neon_framework/packages/talk_app/test/goldens/room_page_read_only.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/room_page_read_only.png rename to packages/neon_framework/packages/talk_app/test/goldens/room_page_read_only.png diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention.png b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention.png rename to packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention.png diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention_direct.png b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention_direct.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention_direct.png rename to packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention_direct.png diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_messages.png b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_messages.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/unread_indicator_unread_messages.png rename to packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_messages.png diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_single_user_messages.png b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_single_user_messages.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/unread_indicator_unread_single_user_messages.png rename to packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_single_user_messages.png diff --git a/packages/neon/neon_talk/test/main_page_test.dart b/packages/neon_framework/packages/talk_app/test/main_page_test.dart similarity index 96% rename from packages/neon/neon_talk/test/main_page_test.dart rename to packages/neon_framework/packages/talk_app/test/main_page_test.dart index 6f87ebf81e6..39ac9e8ce51 100644 --- a/packages/neon/neon_talk/test/main_page_test.dart +++ b/packages/neon_framework/packages/talk_app/test/main_page_test.dart @@ -8,19 +8,19 @@ import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/l10n/localizations_en.dart'; -import 'package:neon_talk/src/blocs/talk.dart'; -import 'package:neon_talk/src/dialogs/create_room.dart'; -import 'package:neon_talk/src/pages/main.dart'; -import 'package:neon_talk/src/widgets/message.dart'; -import 'package:neon_talk/src/widgets/read_indicator.dart'; -import 'package:neon_talk/src/widgets/unread_indicator.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:nextcloud/utils.dart'; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/l10n/localizations_en.dart'; +import 'package:talk_app/src/blocs/talk.dart'; +import 'package:talk_app/src/dialogs/create_room.dart'; +import 'package:talk_app/src/pages/main.dart'; +import 'package:talk_app/src/widgets/message.dart'; +import 'package:talk_app/src/widgets/read_indicator.dart'; +import 'package:talk_app/src/widgets/unread_indicator.dart'; import 'package:timezone/data/latest.dart' as tzdata; import 'package:timezone/timezone.dart' as tz; diff --git a/packages/neon/neon_talk/test/message_bloc_test.dart b/packages/neon_framework/packages/talk_app/test/message_bloc_test.dart similarity index 97% rename from packages/neon/neon_talk/test/message_bloc_test.dart rename to packages/neon_framework/packages/talk_app/test/message_bloc_test.dart index 15d26d913e6..359ae0ddc31 100644 --- a/packages/neon/neon_talk/test/message_bloc_test.dart +++ b/packages/neon_framework/packages/talk_app/test/message_bloc_test.dart @@ -3,9 +3,9 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/testing.dart'; -import 'package:neon_talk/src/blocs/message_bloc.dart'; import 'package:nextcloud/core.dart' as core; import 'package:rxdart/rxdart.dart'; +import 'package:talk_app/src/blocs/message_bloc.dart'; import 'testing.dart'; diff --git a/packages/neon/neon_talk/test/message_input_test.dart b/packages/neon_framework/packages/talk_app/test/message_input_test.dart similarity index 98% rename from packages/neon/neon_talk/test/message_input_test.dart rename to packages/neon_framework/packages/talk_app/test/message_input_test.dart index 47b1596aedf..88916f5e41c 100644 --- a/packages/neon/neon_talk/test/message_input_test.dart +++ b/packages/neon_framework/packages/talk_app/test/message_input_test.dart @@ -14,15 +14,15 @@ import 'package:neon_framework/testing.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/widgets/message.dart'; -import 'package:neon_talk/src/widgets/message_input.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:nextcloud/user_status.dart' as user_status; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/widgets/message.dart'; +import 'package:talk_app/src/widgets/message_input.dart'; import 'package:timezone/data/latest.dart' as tzdata; import 'package:timezone/timezone.dart' as tz; diff --git a/packages/neon/neon_talk/test/message_test.dart b/packages/neon_framework/packages/talk_app/test/message_test.dart similarity index 99% rename from packages/neon/neon_talk/test/message_test.dart rename to packages/neon_framework/packages/talk_app/test/message_test.dart index 5f01aec069a..f82e5be321b 100644 --- a/packages/neon/neon_talk/test/message_test.dart +++ b/packages/neon_framework/packages/talk_app/test/message_test.dart @@ -8,18 +8,6 @@ import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/l10n/localizations_en.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/widgets/actor_avatar.dart'; -import 'package:neon_talk/src/widgets/message.dart'; -import 'package:neon_talk/src/widgets/reactions.dart'; -import 'package:neon_talk/src/widgets/read_indicator.dart'; -import 'package:neon_talk/src/widgets/reference_preview.dart'; -import 'package:neon_talk/src/widgets/rich_object/deck_card.dart'; -import 'package:neon_talk/src/widgets/rich_object/fallback.dart'; -import 'package:neon_talk/src/widgets/rich_object/file.dart'; -import 'package:neon_talk/src/widgets/rich_object/mention.dart'; import 'package:nextcloud/core.dart' as core; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/spreed.dart' as spreed; @@ -27,6 +15,18 @@ import 'package:provider/provider.dart'; import 'package:provider/single_child_widget.dart'; import 'package:rxdart/rxdart.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/l10n/localizations_en.dart'; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/widgets/actor_avatar.dart'; +import 'package:talk_app/src/widgets/message.dart'; +import 'package:talk_app/src/widgets/reactions.dart'; +import 'package:talk_app/src/widgets/read_indicator.dart'; +import 'package:talk_app/src/widgets/reference_preview.dart'; +import 'package:talk_app/src/widgets/rich_object/deck_card.dart'; +import 'package:talk_app/src/widgets/rich_object/fallback.dart'; +import 'package:talk_app/src/widgets/rich_object/file.dart'; +import 'package:talk_app/src/widgets/rich_object/mention.dart'; import 'package:timezone/data/latest.dart' as tzdata; import 'package:timezone/timezone.dart' as tz; diff --git a/packages/neon/neon_talk/test/reactions_test.dart b/packages/neon_framework/packages/talk_app/test/reactions_test.dart similarity index 96% rename from packages/neon/neon_talk/test/reactions_test.dart rename to packages/neon_framework/packages/talk_app/test/reactions_test.dart index be545d7e35c..e281f194c84 100644 --- a/packages/neon/neon_talk/test/reactions_test.dart +++ b/packages/neon_framework/packages/talk_app/test/reactions_test.dart @@ -5,12 +5,12 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/testing.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/widgets/reactions.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:rxdart/rxdart.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/widgets/reactions.dart'; import 'testing.dart'; diff --git a/packages/neon/neon_talk/test/read_indicator_test.dart b/packages/neon_framework/packages/talk_app/test/read_indicator_test.dart similarity index 94% rename from packages/neon/neon_talk/test/read_indicator_test.dart rename to packages/neon_framework/packages/talk_app/test/read_indicator_test.dart index 2354cd22979..187b5f80735 100644 --- a/packages/neon/neon_talk/test/read_indicator_test.dart +++ b/packages/neon_framework/packages/talk_app/test/read_indicator_test.dart @@ -2,7 +2,7 @@ import 'package:flutter_material_design_icons/flutter_material_design_icons.dart import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/testing.dart'; -import 'package:neon_talk/src/widgets/read_indicator.dart'; +import 'package:talk_app/src/widgets/read_indicator.dart'; import 'testing.dart'; diff --git a/packages/neon/neon_talk/test/reference_preview_test.dart b/packages/neon_framework/packages/talk_app/test/reference_preview_test.dart similarity index 98% rename from packages/neon/neon_talk/test/reference_preview_test.dart rename to packages/neon_framework/packages/talk_app/test/reference_preview_test.dart index 333afb2dfd6..61c32462f98 100644 --- a/packages/neon/neon_talk/test/reference_preview_test.dart +++ b/packages/neon_framework/packages/talk_app/test/reference_preview_test.dart @@ -4,9 +4,9 @@ import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/src/widgets/reference_preview.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:provider/provider.dart'; +import 'package:talk_app/src/widgets/reference_preview.dart'; import 'testing.dart'; diff --git a/packages/neon/neon_talk/test/rich_object_test.dart b/packages/neon_framework/packages/talk_app/test/rich_object_test.dart similarity index 97% rename from packages/neon/neon_talk/test/rich_object_test.dart rename to packages/neon_framework/packages/talk_app/test/rich_object_test.dart index 1204e20f3d2..b371890cc77 100644 --- a/packages/neon/neon_talk/test/rich_object_test.dart +++ b/packages/neon_framework/packages/talk_app/test/rich_object_test.dart @@ -1,5 +1,5 @@ import 'package:built_collection/built_collection.dart'; -import 'package:file_icons/file_icons.dart'; +import 'package:files_icons/files_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; @@ -9,15 +9,15 @@ import 'package:neon_framework/testing.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/src/widgets/rich_object/deck_card.dart'; -import 'package:neon_talk/src/widgets/rich_object/fallback.dart'; -import 'package:neon_talk/src/widgets/rich_object/file.dart'; -import 'package:neon_talk/src/widgets/rich_object/file_preview.dart'; -import 'package:neon_talk/src/widgets/rich_object/mention.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; +import 'package:talk_app/src/widgets/rich_object/deck_card.dart'; +import 'package:talk_app/src/widgets/rich_object/fallback.dart'; +import 'package:talk_app/src/widgets/rich_object/file.dart'; +import 'package:talk_app/src/widgets/rich_object/file_preview.dart'; +import 'package:talk_app/src/widgets/rich_object/mention.dart'; void main() { late Account account; diff --git a/packages/neon/neon_talk/test/room_avatar_test.dart b/packages/neon_framework/packages/talk_app/test/room_avatar_test.dart similarity index 97% rename from packages/neon/neon_talk/test/room_avatar_test.dart rename to packages/neon_framework/packages/talk_app/test/room_avatar_test.dart index 3afdfddd29b..ac946df19cd 100644 --- a/packages/neon/neon_talk/test/room_avatar_test.dart +++ b/packages/neon_framework/packages/talk_app/test/room_avatar_test.dart @@ -7,11 +7,11 @@ import 'package:neon_framework/testing.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; import 'package:neon_framework/widgets.dart'; -import 'package:neon_talk/src/widgets/room_avatar.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:provider/provider.dart'; import 'package:rxdart/subjects.dart'; +import 'package:talk_app/src/widgets/room_avatar.dart'; import 'testing.dart'; diff --git a/packages/neon/neon_talk/test/room_bloc_test.dart b/packages/neon_framework/packages/talk_app/test/room_bloc_test.dart similarity index 99% rename from packages/neon/neon_talk/test/room_bloc_test.dart rename to packages/neon_framework/packages/talk_app/test/room_bloc_test.dart index 98ffde94bc8..fbfaa699819 100644 --- a/packages/neon/neon_talk/test/room_bloc_test.dart +++ b/packages/neon_framework/packages/talk_app/test/room_bloc_test.dart @@ -7,9 +7,9 @@ import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/blocs/talk.dart'; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/blocs/talk.dart'; import 'testing.dart'; diff --git a/packages/neon/neon_talk/test/room_page_test.dart b/packages/neon_framework/packages/talk_app/test/room_page_test.dart similarity index 97% rename from packages/neon/neon_talk/test/room_page_test.dart rename to packages/neon_framework/packages/talk_app/test/room_page_test.dart index 3a0e1f258b5..bd9122dd7c7 100644 --- a/packages/neon/neon_talk/test/room_page_test.dart +++ b/packages/neon_framework/packages/talk_app/test/room_page_test.dart @@ -10,15 +10,15 @@ import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; import 'package:neon_framework/utils.dart'; -import 'package:neon_talk/l10n/localizations.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/pages/room.dart'; -import 'package:neon_talk/src/theme.dart'; -import 'package:neon_talk/src/widgets/message.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; +import 'package:talk_app/l10n/localizations.dart'; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/pages/room.dart'; +import 'package:talk_app/src/theme.dart'; +import 'package:talk_app/src/widgets/message.dart'; import 'package:timezone/data/latest.dart' as tzdata; import 'package:timezone/timezone.dart' as tz; diff --git a/packages/neon/neon_talk/test/testing.dart b/packages/neon_framework/packages/talk_app/test/testing.dart similarity index 96% rename from packages/neon/neon_talk/test/testing.dart rename to packages/neon_framework/packages/talk_app/test/testing.dart index 3776ef6389b..8dbfe255588 100644 --- a/packages/neon/neon_talk/test/testing.dart +++ b/packages/neon_framework/packages/talk_app/test/testing.dart @@ -1,8 +1,8 @@ import 'package:mocktail/mocktail.dart'; -import 'package:neon_talk/src/blocs/room.dart'; -import 'package:neon_talk/src/blocs/talk.dart'; import 'package:nextcloud/core.dart' as core; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/src/blocs/room.dart'; +import 'package:talk_app/src/blocs/talk.dart'; class MockRoom extends Mock implements spreed.Room {} diff --git a/packages/neon/neon_talk/test/unread_indicator_test.dart b/packages/neon_framework/packages/talk_app/test/unread_indicator_test.dart similarity index 97% rename from packages/neon/neon_talk/test/unread_indicator_test.dart rename to packages/neon_framework/packages/talk_app/test/unread_indicator_test.dart index 37d97eb2397..478c8b5edd6 100644 --- a/packages/neon/neon_talk/test/unread_indicator_test.dart +++ b/packages/neon_framework/packages/talk_app/test/unread_indicator_test.dart @@ -1,8 +1,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/testing.dart'; -import 'package:neon_talk/src/widgets/unread_indicator.dart'; import 'package:nextcloud/spreed.dart' as spreed; +import 'package:talk_app/src/widgets/unread_indicator.dart'; import 'testing.dart'; diff --git a/packages/neon_framework/pubspec.yaml b/packages/neon_framework/pubspec.yaml index 9bb9eb3bcbd..3c0bcce5d1b 100644 --- a/packages/neon_framework/pubspec.yaml +++ b/packages/neon_framework/pubspec.yaml @@ -56,7 +56,7 @@ dependencies: sort_box: git: url: https://github.com/nextcloud/neon - path: packages/sort_box + path: packages/neon_framework/packages/sort_box sqflite: ^2.3.0 sqflite_common_ffi: ^2.3.2 sqflite_common_ffi_web: ^0.4.2+3 diff --git a/packages/neon_framework/pubspec_overrides.yaml b/packages/neon_framework/pubspec_overrides.yaml index e6bedf91e5d..624e0aaa28c 100644 --- a/packages/neon_framework/pubspec_overrides.yaml +++ b/packages/neon_framework/pubspec_overrides.yaml @@ -3,14 +3,14 @@ dependency_overrides: cookie_store: path: ../cookie_store cookie_store_conformance_tests: - path: ../cookie_store_conformance_tests + path: ../cookie_store/packages/cookie_store_conformance_tests dynamite_runtime: - path: ../dynamite/dynamite_runtime + path: ../dynamite/packages/dynamite_runtime neon_http_client: - path: ../neon_http_client + path: packages/neon_http_client neon_lints: path: ../neon_lints nextcloud: path: ../nextcloud sort_box: - path: ../sort_box + path: packages/sort_box diff --git a/packages/neon_http_client/LICENSE b/packages/neon_http_client/LICENSE deleted file mode 120000 index af8c58b151a..00000000000 --- a/packages/neon_http_client/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/nextcloud/.pubignore b/packages/nextcloud/.pubignore index 16072c6df20..155616583e6 100644 --- a/packages/nextcloud/.pubignore +++ b/packages/nextcloud/.pubignore @@ -1,4 +1,4 @@ -lib/src/webdav/props.csv -lib/src/patches/ -lib/src/api/*.openapi.json +lib/src/api/**/patches/ +*.openapi.json /*.dart +packages/ diff --git a/packages/nextcloud/doc/development.md b/packages/nextcloud/doc/development.md index 965dcae3a32..f019d59a7b5 100644 --- a/packages/nextcloud/doc/development.md +++ b/packages/nextcloud/doc/development.md @@ -31,7 +31,7 @@ To run the tests against development versions follow these steps: ```sh cd /path/to/server -/path/to/neon/packages/nextcloud_test/docker/local.sh +/path/to/neon/packages/nextcloud/packages/nextcloud_test/docker/local.sh # Open a second terminal cd /path/to/neon/packages/nextcloud diff --git a/packages/nextcloud/packages/nextcloud_test/LICENSE b/packages/nextcloud/packages/nextcloud_test/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/nextcloud/packages/nextcloud_test/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/nextcloud_test/README.md b/packages/nextcloud/packages/nextcloud_test/README.md similarity index 100% rename from packages/nextcloud_test/README.md rename to packages/nextcloud/packages/nextcloud_test/README.md diff --git a/packages/neon_http_client/analysis_options.yaml b/packages/nextcloud/packages/nextcloud_test/analysis_options.yaml similarity index 100% rename from packages/neon_http_client/analysis_options.yaml rename to packages/nextcloud/packages/nextcloud_test/analysis_options.yaml diff --git a/packages/nextcloud_test/bin/generate_presets.dart b/packages/nextcloud/packages/nextcloud_test/bin/generate_presets.dart similarity index 100% rename from packages/nextcloud_test/bin/generate_presets.dart rename to packages/nextcloud/packages/nextcloud_test/bin/generate_presets.dart diff --git a/packages/nextcloud_test/docker/Dockerfile b/packages/nextcloud/packages/nextcloud_test/docker/Dockerfile similarity index 100% rename from packages/nextcloud_test/docker/Dockerfile rename to packages/nextcloud/packages/nextcloud_test/docker/Dockerfile diff --git a/packages/nextcloud_test/docker/assets/Recipes/Bauernbrot mit Sauerteig/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Bauernbrot mit Sauerteig/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Bauernbrot mit Sauerteig/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Bauernbrot mit Sauerteig/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Blaubeer Cluster/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Blaubeer Cluster/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Blaubeer Cluster/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Blaubeer Cluster/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Chantal's New York Cheesecake/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chantal's New York Cheesecake/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Chantal's New York Cheesecake/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chantal's New York Cheesecake/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Chef John's Gazpacho/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chef John's Gazpacho/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Chef John's Gazpacho/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chef John's Gazpacho/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Chili sin Carne mit Jackfruit/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chili sin Carne mit Jackfruit/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Chili sin Carne mit Jackfruit/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chili sin Carne mit Jackfruit/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Easy Heart-Shaped Cake/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Easy Heart-Shaped Cake/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Easy Heart-Shaped Cake/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Easy Heart-Shaped Cake/recipe.json diff --git "a/packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" "b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" similarity index 100% rename from "packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" rename to "packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" diff --git a/packages/nextcloud_test/docker/assets/Recipes/Gelber Smoothie/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Gelber Smoothie/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Gelber Smoothie/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Gelber Smoothie/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Grandma's Sour Cream Pound Cake/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Grandma's Sour Cream Pound Cake/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Grandma's Sour Cream Pound Cake/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Grandma's Sour Cream Pound Cake/recipe.json diff --git "a/packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" "b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" similarity index 100% rename from "packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" rename to "packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" diff --git a/packages/nextcloud_test/docker/assets/Recipes/Readme.md b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Readme.md similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Readme.md rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Readme.md diff --git a/packages/nextcloud_test/docker/assets/Recipes/Recipe Without an image/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Recipe Without an image/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Recipe Without an image/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Recipe Without an image/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Reines Roggenbrot aus Sauerteig/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Reines Roggenbrot aus Sauerteig/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Reines Roggenbrot aus Sauerteig/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Reines Roggenbrot aus Sauerteig/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Restaurant-Style Zuppa Toscana/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Restaurant-Style Zuppa Toscana/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Restaurant-Style Zuppa Toscana/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Restaurant-Style Zuppa Toscana/recipe.json diff --git "a/packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" "b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" similarity index 100% rename from "packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" rename to "packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" diff --git a/packages/nextcloud_test/docker/assets/Recipes/Sommerlicher Himbeerkuchen/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sommerlicher Himbeerkuchen/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Sommerlicher Himbeerkuchen/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sommerlicher Himbeerkuchen/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Sweet and Spicy Baked Keto Chicken WingsNEW/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sweet and Spicy Baked Keto Chicken WingsNEW/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Sweet and Spicy Baked Keto Chicken WingsNEW/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sweet and Spicy Baked Keto Chicken WingsNEW/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/The Best Baked Ziti/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/The Best Baked Ziti/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/The Best Baked Ziti/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/The Best Baked Ziti/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Vegi-Tortillas/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Vegi-Tortillas/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Vegi-Tortillas/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Vegi-Tortillas/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/problem/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/problem/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/problem/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/problem/recipe.json diff --git a/packages/nextcloud_test/docker/local.sh b/packages/nextcloud/packages/nextcloud_test/docker/local.sh similarity index 100% rename from packages/nextcloud_test/docker/local.sh rename to packages/nextcloud/packages/nextcloud_test/docker/local.sh diff --git a/packages/nextcloud_test/docker/post.sh b/packages/nextcloud/packages/nextcloud_test/docker/post.sh similarity index 100% rename from packages/nextcloud_test/docker/post.sh rename to packages/nextcloud/packages/nextcloud_test/docker/post.sh diff --git a/packages/nextcloud_test/docker/pre.sh b/packages/nextcloud/packages/nextcloud_test/docker/pre.sh similarity index 100% rename from packages/nextcloud_test/docker/pre.sh rename to packages/nextcloud/packages/nextcloud_test/docker/pre.sh diff --git a/packages/nextcloud_test/docker/presets/cookbook/0.11 b/packages/nextcloud/packages/nextcloud_test/docker/presets/cookbook/0.11 similarity index 100% rename from packages/nextcloud_test/docker/presets/cookbook/0.11 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/cookbook/0.11 diff --git a/packages/nextcloud_test/docker/presets/drop_account/2.4 b/packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.4 similarity index 100% rename from packages/nextcloud_test/docker/presets/drop_account/2.4 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.4 diff --git a/packages/nextcloud_test/docker/presets/drop_account/2.5 b/packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.5 similarity index 100% rename from packages/nextcloud_test/docker/presets/drop_account/2.5 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.5 diff --git a/packages/nextcloud_test/docker/presets/drop_account/2.6 b/packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.6 similarity index 100% rename from packages/nextcloud_test/docker/presets/drop_account/2.6 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.6 diff --git a/packages/nextcloud_test/docker/presets/latest b/packages/nextcloud/packages/nextcloud_test/docker/presets/latest similarity index 100% rename from packages/nextcloud_test/docker/presets/latest rename to packages/nextcloud/packages/nextcloud_test/docker/presets/latest diff --git a/packages/nextcloud_test/docker/presets/news/25.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/news/25.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/news/25.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/news/25.0 diff --git a/packages/nextcloud_test/docker/presets/notes/4.10 b/packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.10 similarity index 100% rename from packages/nextcloud_test/docker/presets/notes/4.10 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.10 diff --git a/packages/nextcloud_test/docker/presets/notes/4.8 b/packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.8 similarity index 100% rename from packages/nextcloud_test/docker/presets/notes/4.8 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.8 diff --git a/packages/nextcloud_test/docker/presets/notes/4.9 b/packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.9 similarity index 100% rename from packages/nextcloud_test/docker/presets/notes/4.9 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.9 diff --git a/packages/nextcloud_test/docker/presets/server/28.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/server/28.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/server/28.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/server/28.0 diff --git a/packages/nextcloud_test/docker/presets/server/29.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/server/29.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/server/29.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/server/29.0 diff --git a/packages/nextcloud_test/docker/presets/spreed/18.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/spreed/18.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/spreed/18.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/spreed/18.0 diff --git a/packages/nextcloud_test/docker/presets/spreed/19.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/spreed/19.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/spreed/19.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/spreed/19.0 diff --git a/packages/nextcloud_test/docker/presets/tables/0.6 b/packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.6 similarity index 100% rename from packages/nextcloud_test/docker/presets/tables/0.6 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.6 diff --git a/packages/nextcloud_test/docker/presets/tables/0.7 b/packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.7 similarity index 100% rename from packages/nextcloud_test/docker/presets/tables/0.7 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.7 diff --git a/packages/nextcloud_test/docker/presets/tables/0.8 b/packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.8 similarity index 100% rename from packages/nextcloud_test/docker/presets/tables/0.8 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.8 diff --git a/packages/nextcloud_test/docker/presets/uppush/1.4 b/packages/nextcloud/packages/nextcloud_test/docker/presets/uppush/1.4 similarity index 100% rename from packages/nextcloud_test/docker/presets/uppush/1.4 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/uppush/1.4 diff --git a/packages/nextcloud_test/docker/static/nasa.xml b/packages/nextcloud/packages/nextcloud_test/docker/static/nasa.xml similarity index 100% rename from packages/nextcloud_test/docker/static/nasa.xml rename to packages/nextcloud/packages/nextcloud_test/docker/static/nasa.xml diff --git a/packages/nextcloud_test/docker/static/recipe.html b/packages/nextcloud/packages/nextcloud_test/docker/static/recipe.html similarity index 100% rename from packages/nextcloud_test/docker/static/recipe.html rename to packages/nextcloud/packages/nextcloud_test/docker/static/recipe.html diff --git a/packages/nextcloud_test/docker/static/wikipedia.xml b/packages/nextcloud/packages/nextcloud_test/docker/static/wikipedia.xml similarity index 100% rename from packages/nextcloud_test/docker/static/wikipedia.xml rename to packages/nextcloud/packages/nextcloud_test/docker/static/wikipedia.xml diff --git a/packages/nextcloud_test/lib/nextcloud_test.dart b/packages/nextcloud/packages/nextcloud_test/lib/nextcloud_test.dart similarity index 100% rename from packages/nextcloud_test/lib/nextcloud_test.dart rename to packages/nextcloud/packages/nextcloud_test/lib/nextcloud_test.dart diff --git a/packages/nextcloud_test/lib/src/app.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/app.dart similarity index 100% rename from packages/nextcloud_test/lib/src/app.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/app.dart diff --git a/packages/nextcloud_test/lib/src/fixtures.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/fixtures.dart similarity index 100% rename from packages/nextcloud_test/lib/src/fixtures.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/fixtures.dart diff --git a/packages/nextcloud_test/lib/src/models/models.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/models/models.dart similarity index 100% rename from packages/nextcloud_test/lib/src/models/models.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/models/models.dart diff --git a/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart similarity index 100% rename from packages/nextcloud_test/lib/src/models/nextcloud_tester.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart diff --git a/packages/nextcloud_test/lib/src/models/preset.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/models/preset.dart similarity index 100% rename from packages/nextcloud_test/lib/src/models/preset.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/models/preset.dart diff --git a/packages/nextcloud_test/lib/src/presets.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/presets.dart similarity index 100% rename from packages/nextcloud_test/lib/src/presets.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/presets.dart diff --git a/packages/nextcloud_test/lib/src/proxy_http_client.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/proxy_http_client.dart similarity index 100% rename from packages/nextcloud_test/lib/src/proxy_http_client.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/proxy_http_client.dart diff --git a/packages/nextcloud_test/lib/src/test_target/docker_container.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/test_target/docker_container.dart similarity index 97% rename from packages/nextcloud_test/lib/src/test_target/docker_container.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/test_target/docker_container.dart index 54812ad1797..0e4ba6f036b 100644 --- a/packages/nextcloud_test/lib/src/test_target/docker_container.dart +++ b/packages/nextcloud/packages/nextcloud_test/lib/src/test_target/docker_container.dart @@ -71,7 +71,7 @@ final class DockerContainerFactory extends TestTargetFactory getPresets() { - final files = Glob('../nextcloud_test/docker/presets/**/*').listSync(); + final files = Glob('packages/nextcloud_test/docker/presets/**/*').listSync(); return BuiltListMultimap.build((b) { for (final file in files) { diff --git a/packages/nextcloud_test/lib/src/test_target/local.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/test_target/local.dart similarity index 100% rename from packages/nextcloud_test/lib/src/test_target/local.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/test_target/local.dart diff --git a/packages/nextcloud_test/lib/src/test_target/test_target.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/test_target/test_target.dart similarity index 100% rename from packages/nextcloud_test/lib/src/test_target/test_target.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/test_target/test_target.dart diff --git a/packages/nextcloud_test/pubspec.yaml b/packages/nextcloud/packages/nextcloud_test/pubspec.yaml similarity index 100% rename from packages/nextcloud_test/pubspec.yaml rename to packages/nextcloud/packages/nextcloud_test/pubspec.yaml diff --git a/packages/nextcloud_test/pubspec_overrides.yaml b/packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml similarity index 52% rename from packages/nextcloud_test/pubspec_overrides.yaml rename to packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml index 68b6706a349..0c3e5c59f56 100644 --- a/packages/nextcloud_test/pubspec_overrides.yaml +++ b/packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml @@ -1,12 +1,12 @@ # melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_http_client,neon_lints,nextcloud dependency_overrides: cookie_store: - path: ../cookie_store + path: ../../../cookie_store dynamite_runtime: - path: ../dynamite/dynamite_runtime + path: ../../../dynamite/packages/dynamite_runtime neon_http_client: - path: ../neon_http_client + path: ../../../neon_framework/packages/neon_http_client neon_lints: - path: ../neon_lints + path: ../../../neon_lints nextcloud: - path: ../nextcloud + path: ../.. diff --git a/packages/nextcloud/pubspec.yaml b/packages/nextcloud/pubspec.yaml index 64ad649d3ec..f6affc1caee 100644 --- a/packages/nextcloud/pubspec.yaml +++ b/packages/nextcloud/pubspec.yaml @@ -51,7 +51,7 @@ dev_dependencies: nextcloud_test: git: url: https://github.com/nextcloud/neon - path: packages/nextcloud_test + path: packages/nextcloud/packages/nextcloud_test path: ^1.9.0 process_run: ^1.1.0 test: ^1.25.8 diff --git a/packages/nextcloud/pubspec_overrides.yaml b/packages/nextcloud/pubspec_overrides.yaml index 51ae5ce9766..a6b97546cd8 100644 --- a/packages/nextcloud/pubspec_overrides.yaml +++ b/packages/nextcloud/pubspec_overrides.yaml @@ -3,12 +3,12 @@ dependency_overrides: cookie_store: path: ../cookie_store dynamite: - path: ../dynamite/dynamite + path: ../dynamite dynamite_runtime: - path: ../dynamite/dynamite_runtime + path: ../dynamite/packages/dynamite_runtime neon_http_client: - path: ../neon_http_client + path: ../neon_framework/packages/neon_http_client neon_lints: path: ../neon_lints nextcloud_test: - path: ../nextcloud_test + path: packages/nextcloud_test diff --git a/packages/nextcloud_test/LICENSE b/packages/nextcloud_test/LICENSE deleted file mode 120000 index af8c58b151a..00000000000 --- a/packages/nextcloud_test/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/nextcloud_test/analysis_options.yaml b/packages/nextcloud_test/analysis_options.yaml deleted file mode 100644 index 4db3c296b81..00000000000 --- a/packages/nextcloud_test/analysis_options.yaml +++ /dev/null @@ -1 +0,0 @@ -include: package:neon_lints/dart.yaml diff --git a/packages/sort_box/LICENSE b/packages/sort_box/LICENSE deleted file mode 120000 index dc0786b028f..00000000000 --- a/packages/sort_box/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../assets/BSD-3-Clause.txt \ No newline at end of file diff --git a/packages/sort_box/analysis_options.yaml b/packages/sort_box/analysis_options.yaml deleted file mode 100644 index 4db3c296b81..00000000000 --- a/packages/sort_box/analysis_options.yaml +++ /dev/null @@ -1 +0,0 @@ -include: package:neon_lints/dart.yaml diff --git a/tool/build-app.sh b/tool/build-app.sh index 6ce6b36b222..7b96dbadd45 100755 --- a/tool/build-app.sh +++ b/tool/build-app.sh @@ -41,7 +41,7 @@ if [[ "$target" == "linux/arm64" ]] || [[ "$target" == "linux/amd64" ]]; then -f "tool/build/Dockerfile.$os" \ ./tool/build - paths=(packages/app/{pubspec.lock,linux,build}) + paths=(packages/neon_framework/example/{pubspec.lock,linux,build}) mapfile -O "${#paths[@]}" -t paths < <(get_mount_paths_dir "lib") mapfile -O "${#paths[@]}" -t paths < <(get_mount_paths_dir "assets") mapfile -O "${#paths[@]}" -t paths < <(get_mount_paths_file "pubspec.yaml") @@ -51,7 +51,7 @@ if [[ "$target" == "linux/arm64" ]] || [[ "$target" == "linux/amd64" ]]; then for path in ${paths[*]}; do run_args+=(-v "$(pwd)/$path:/src/$path") done - mkdir -p "packages/app/build" + mkdir -p "packages/neon_framework/example/build" container_id="$( # shellcheck disable=SC2086 diff --git a/tool/build-dev-container.sh b/tool/build-dev-container.sh index 9d9e6de6788..d27e8abaaa0 100755 --- a/tool/build-dev-container.sh +++ b/tool/build-dev-container.sh @@ -4,7 +4,7 @@ cd "$(dirname "$0")/.." source tool/common.sh if [ "$#" -eq 0 ]; then - presets=(./packages/nextcloud_test/docker/presets/*/*) + presets=(./packages/nextcloud/packages/nextcloud_test/docker/presets/*/*) else presets=("$@") fi @@ -18,5 +18,5 @@ for preset in "${presets[@]}"; do done < "$preset" # shellcheck disable=SC2046,SC2086 - docker buildx build --tag "$tag" $(cache_build_args "$tag") ${args[*]} -f - ./packages/nextcloud_test/docker < packages/nextcloud_test/docker/Dockerfile + docker buildx build --tag "$tag" $(cache_build_args "$tag") ${args[*]} -f - ./packages/nextcloud/packages/nextcloud_test/docker < packages/nextcloud/packages/nextcloud_test/docker/Dockerfile done diff --git a/tool/build/linux.sh b/tool/build/linux.sh index 998b3379199..6cd1c362a37 100755 --- a/tool/build/linux.sh +++ b/tool/build/linux.sh @@ -11,6 +11,6 @@ function cleanup() { } trap cleanup EXIT -cd /src/packages/app +cd /src/packages/neon_framework/example # shellcheck disable=SC2086 flutter build linux ${BUILD_ARGS[*]} diff --git a/tool/common.sh b/tool/common.sh index 17f9a8e87b8..9aef7214194 100644 --- a/tool/common.sh +++ b/tool/common.sh @@ -23,7 +23,7 @@ function cache_build_args() { } function preset_image_tag() { - path="$(realpath --relative-to ./packages/nextcloud_test/docker/presets "$1")" + path="$(realpath --relative-to ./packages/nextcloud/packages/nextcloud_test/docker/presets "$1")" name="$(dirname "$path")" version="$(basename "$path")" image_tag "dev:$name-$version" diff --git a/tool/dev.sh b/tool/dev.sh index b9a240fb618..575eef95bfe 100755 --- a/tool/dev.sh +++ b/tool/dev.sh @@ -6,7 +6,7 @@ source tool/common.sh if [ "$#" -eq 1 ]; then preset="$1" else - preset="packages/nextcloud_test/docker/presets/latest" + preset="packages/nextcloud/packages/nextcloud_test/docker/presets/latest" fi ./tool/build-dev-container.sh "$preset" diff --git a/tool/find-untested-neon-apis.sh b/tool/find-untested-neon-apis.sh index 9e1002fcc3c..d1a0d63d748 100755 --- a/tool/find-untested-neon-apis.sh +++ b/tool/find-untested-neon-apis.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")/.." function find_apis() { # shellcheck disable=SC2068 - grep -r $@ --include "*\.dart" -e "client\([0-9]\)\?\.[^.]*.[^(]*(" -oh | sed "s/^client\([0-9]\)\?\.//" | sed "s/($//" | grep -v "_Serializer" | grep -v "send" | grep -v "head" | grep -v "close" | grep -v "_Request" | sort | uniq + grep -r $@ --include "*\.dart" -e "client\([0-9]\)\?\.[^.]*.[^(]*(" -oh | sed "s/^client\([0-9]\)\?\.//" | sed "s/($//" | grep -v "_Serializer" | grep -v "send" | grep -v "get" | grep -v "head" | grep -v "close" | grep -v "_Request" | sort | uniq } -used_apis=("$(find_apis "packages/neon_framework" "packages/neon/"*)") +used_apis=("$(find_apis "packages/neon_framework")") tested_apis=("$(find_apis "packages/nextcloud")") untested_apis=() diff --git a/tool/generate-assets.sh b/tool/generate-assets.sh index b172fbff085..ae8a0432d3b 100755 --- a/tool/generate-assets.sh +++ b/tool/generate-assets.sh @@ -10,7 +10,7 @@ mkdir -p /tmp/nextcloud-neon function copy_app_svg() { id="$1" path="$2" - target="packages/neon/neon_$id/assets/app.svg" + target="packages/neon_framework/packages/${id}_app/assets/app.svg" if [ -f "$path/img/app.svg" ]; then cp "$path/img/app.svg" "$target" elif [ -f "$path/img/$id.svg" ]; then @@ -83,9 +83,9 @@ copy_app_svg notifications external/nextcloud-notifications copy_app_svg talk external/nextcloud-spreed ( - cd packages/app + cd packages/neon_framework/example - cp ../../assets/logo.svg assets/logo.svg + cp ../../../assets/logo.svg assets/logo.svg # Splash screens inkscape assets/logo.svg -o img/splash_icon.png -w 768 -h 768 # 768px at xxxhdpi is 192dp @@ -94,8 +94,8 @@ copy_app_svg talk external/nextcloud-spreed # Android launcher icons export_mipmap_icon_all "assets/logo.svg" "ic_launcher" & - for path in ../neon/neon_*; do - export_mipmap_icon_all "$path/assets/app.svg" "app_$(basename "$path" | sed "s/^neon_//")" & + for path in ../packages/*_app; do + export_mipmap_icon_all "$path/assets/app.svg" "$(basename "$path")" & done wait @@ -107,10 +107,10 @@ copy_app_svg talk external/nextcloud-spreed fvm dart run sqflite_common_ffi_web:setup --force precompile_assets - cp ../../assets/logo.svg assets/logo.svg + cp ../../../assets/logo.svg assets/logo.svg ) -for path in packages/neon/neon_*; do +for path in packages/neon_framework/packages/*_app; do ( cd "$path" precompile_assets diff --git a/tool/generate-dynamite-e2e-test.sh b/tool/generate-dynamite-e2e-test.sh index 8daee2c9daf..8135ad4338e 100755 --- a/tool/generate-dynamite-e2e-test.sh +++ b/tool/generate-dynamite-e2e-test.sh @@ -3,7 +3,7 @@ set -euxo pipefail cd "$(dirname "$0")/.." ( - cd packages/dynamite/dynamite_end_to_end_test + cd packages/dynamite/packages/dynamite_end_to_end_test rm -rf .dart_tool/build/generated/dynamite fvm dart run build_runner build --delete-conflicting-outputs fvm dart fix --apply lib/ diff --git a/tool/generate-dynamite-petstore-example.sh b/tool/generate-dynamite-petstore-example.sh index 1d7ce11fb51..4ad10456036 100755 --- a/tool/generate-dynamite-petstore-example.sh +++ b/tool/generate-dynamite-petstore-example.sh @@ -2,10 +2,10 @@ set -euxo pipefail cd "$(dirname "$0")/.." -cp external/openapi-specification/examples/v3.0/petstore-expanded.json packages/dynamite/dynamite/example/lib/petstore.openapi.json +cp external/openapi-specification/examples/v3.0/petstore-expanded.json packages/dynamite/example/lib/petstore.openapi.json ( - cd packages/dynamite/dynamite/example + cd packages/dynamite/example rm -rf .dart_tool/build/generated/dynamite fvm dart run build_runner build --delete-conflicting-outputs fvm dart fix --apply lib/ diff --git a/tool/generate-file-icons.sh b/tool/generate-file-icons.sh index 19da5c65c7d..567c4c1d625 100755 --- a/tool/generate-file-icons.sh +++ b/tool/generate-file-icons.sh @@ -3,6 +3,6 @@ set -euxo pipefail cd "$(dirname "$0")/.." ( - cd packages/file_icons + cd packages/neon_framework/packages/files_icons fvm dart run ) diff --git a/tool/generate-nextcloud-test-presets.sh b/tool/generate-nextcloud-test-presets.sh index 1ce81f969d6..460991ea4ba 100755 --- a/tool/generate-nextcloud-test-presets.sh +++ b/tool/generate-nextcloud-test-presets.sh @@ -3,6 +3,6 @@ set -euxo pipefail cd "$(dirname "$0")/.." ( - cd packages/nextcloud_test + cd packages/nextcloud/packages/nextcloud_test fvm dart run nextcloud_test:generate_presets ) From 72b50acf35762f077f1c123be558a746c5ffacb9 Mon Sep 17 00:00:00 2001 From: Nikolas Rimikis Date: Wed, 14 Aug 2024 22:07:09 +0200 Subject: [PATCH 2/2] fix: ignore false positive lints Signed-off-by: Nikolas Rimikis Signed-off-by: provokateurin --- .../neon_framework/packages/files_app/lib/src/pages/main.dart | 1 + .../packages/files_app/lib/src/widgets/browser_view.dart | 1 + .../packages/news_app/lib/src/pages/article.dart | 1 + .../neon_framework/packages/news_app/lib/src/pages/main.dart | 1 + .../packages/news_app/lib/src/widgets/articles_view.dart | 1 + .../neon_framework/packages/notes_app/lib/src/pages/main.dart | 1 + .../neon_framework/packages/notes_app/lib/src/pages/note.dart | 1 + .../packages/notifications_app/lib/src/pages/main.dart | 1 + .../neon_framework/packages/talk_app/lib/src/pages/main.dart | 1 + .../neon_framework/packages/talk_app/lib/src/pages/room.dart | 1 + .../packages/talk_app/lib/src/widgets/message.dart | 3 +-- 11 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/neon_framework/packages/files_app/lib/src/pages/main.dart b/packages/neon_framework/packages/files_app/lib/src/pages/main.dart index 06463fc8743..091e0b5c552 100644 --- a/packages/neon_framework/packages/files_app/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/files_app/lib/src/pages/main.dart @@ -28,6 +28,7 @@ class _FilesMainPageState extends State { bloc = NeonProvider.of(context); errorsSubscription = bloc.errors.listen((error) { + // ignore: use_build_context_synchronously NeonError.showSnackbar(context, error); }); } diff --git a/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart b/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart index 2db746fa4b7..b20e6fe6f2e 100644 --- a/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart +++ b/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart @@ -38,6 +38,7 @@ class _FilesBrowserViewState extends State { @override void initState() { errorsSubscription = widget.bloc.errors.listen((error) { + // ignore: use_build_context_synchronously NeonError.showSnackbar(context, error); }); diff --git a/packages/neon_framework/packages/news_app/lib/src/pages/article.dart b/packages/neon_framework/packages/news_app/lib/src/pages/article.dart index 8dde8f5fcda..6d00fe39f20 100644 --- a/packages/neon_framework/packages/news_app/lib/src/pages/article.dart +++ b/packages/neon_framework/packages/news_app/lib/src/pages/article.dart @@ -47,6 +47,7 @@ class _NewsArticlePageState extends State { super.initState(); errorsSubscription = widget.bloc.errors.listen((error) { + // ignore: use_build_context_synchronously NeonError.showSnackbar(context, error); }); diff --git a/packages/neon_framework/packages/news_app/lib/src/pages/main.dart b/packages/neon_framework/packages/news_app/lib/src/pages/main.dart index 53ebab8849d..cd7a3fead24 100644 --- a/packages/neon_framework/packages/news_app/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/news_app/lib/src/pages/main.dart @@ -34,6 +34,7 @@ class _NewsMainPageState extends State { index = NeonProvider.of(context).defaultCategoryOption.value.index; errorsSubscription = bloc.errors.listen((error) { + // ignore: use_build_context_synchronously NeonError.showSnackbar(context, error); }); } diff --git a/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart index 72207c4b01a..6b7ac5ff864 100644 --- a/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart +++ b/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart @@ -49,6 +49,7 @@ class _NewsArticlesViewState extends State { super.initState(); errorsSubscription = widget.bloc.errors.listen((error) { + // ignore: use_build_context_synchronously NeonError.showSnackbar(context, error); }); diff --git a/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart b/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart index 29e5af394f1..ec83749d1f1 100644 --- a/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart @@ -34,6 +34,7 @@ class _NotesMainPageState extends State { index = NeonProvider.of(context).defaultCategoryOption.value.index; errorsSubscription = bloc.errors.listen((error) { + // ignore: use_build_context_synchronously handleNotesException(context, error); }); } diff --git a/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart b/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart index eeba26cee21..e8d4b57741b 100644 --- a/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart +++ b/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart @@ -49,6 +49,7 @@ class _NotesNotePageState extends State { super.initState(); errorsSubscription = widget.bloc.errors.listen((error) { + // ignore: use_build_context_synchronously handleNotesException(context, error); }); diff --git a/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart b/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart index 09b8f70b37a..242869bee8d 100644 --- a/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart @@ -30,6 +30,7 @@ class _NotificationsMainPageState extends State { bloc = NeonProvider.of(context) as NotificationsBloc; errorsSubscription = bloc.errors.listen((error) { + // ignore: use_build_context_synchronously NeonError.showSnackbar(context, error); }); } diff --git a/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart b/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart index eba2449e683..3fcd562196c 100644 --- a/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart @@ -40,6 +40,7 @@ class _TalkMainPageState extends State { bloc = NeonProvider.of(context); errorsSubscription = bloc.errors.listen((error) { + // ignore: use_build_context_synchronously NeonError.showSnackbar(context, error); }); } diff --git a/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart b/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart index 567efd3b5a7..c2fa08ea1e6 100644 --- a/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart @@ -38,6 +38,7 @@ class _TalkRoomPageState extends State { bloc = NeonProvider.of(context); errorsSubscription = bloc.errors.listen((error) { + // ignore: use_build_context_synchronously NeonError.showSnackbar(context, error); }); } diff --git a/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart index 87d2208e3f0..70d9a16ac81 100644 --- a/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart @@ -123,8 +123,7 @@ TextSpan buildChatMessage({ } for (final reference in references) { if (reference == part) { - final gestureRecognizer = TapGestureRecognizer(); - gestureRecognizer.onTap = () => onReferenceClicked(reference); + final gestureRecognizer = TapGestureRecognizer()..onTap = () => onReferenceClicked(reference); children.add( TextSpan(