refactor: change package file structure

Signed-off-by: Nikolas Rimikis <leptopoda@users.noreply.github.com>
nextcloud · Aug 5, 2024 · ac36f75 · ac36f75
1 parent 1bd0179
commit ac36f75
Show file tree

Hide file tree

Showing 388 changed files with 171 additions and 158 deletions.
diff --git a/melos.yaml b/melos.yaml
@@ -11,8 +11,8 @@ bootstrap:
 
 packages:
   - packages/*
+  - packages/*/packages/*
   - packages/dynamite/*
-  - packages/neon/*
   - packages/**/example
 
 ide:

diff --git a/packages/file_icons/.metadata → ...ges/app/packages/neon_dashboard/.metadata b/packages/file_icons/.metadata → ...ges/app/packages/neon_dashboard/.metadata
diff --git a/packages/app/packages/neon_dashboard/LICENSE b/packages/app/packages/neon_dashboard/LICENSE
@@ -0,0 +1 @@
+../../../../assets/AGPL-3.0.txt
diff --git a/...neon/neon_dashboard/analysis_options.yaml → ...ages/neon_dashboard/analysis_options.yaml b/...neon/neon_dashboard/analysis_options.yaml → ...ages/neon_dashboard/analysis_options.yaml
diff --git a/...es/neon/neon_dashboard/assets/app.svg.vec → ...ackages/neon_dashboard/assets/app.svg.vec b/...es/neon/neon_dashboard/assets/app.svg.vec → ...ackages/neon_dashboard/assets/app.svg.vec
diff --git a/packages/neon/neon_dashboard/build.yaml → ...es/app/packages/neon_dashboard/build.yaml b/packages/neon/neon_dashboard/build.yaml → ...es/app/packages/neon_dashboard/build.yaml
diff --git a/packages/neon/neon_dashboard/l10n.yaml → ...ges/app/packages/neon_dashboard/l10n.yaml b/packages/neon/neon_dashboard/l10n.yaml → ...ges/app/packages/neon_dashboard/l10n.yaml
diff --git a/packages/neon/neon_dashboard/lib/l10n/en.arb → ...p/packages/neon_dashboard/lib/l10n/en.arb b/packages/neon/neon_dashboard/lib/l10n/en.arb → ...p/packages/neon_dashboard/lib/l10n/en.arb
diff --git a/...eon_dashboard/lib/l10n/localizations.dart → ...eon_dashboard/lib/l10n/localizations.dart b/...eon_dashboard/lib/l10n/localizations.dart → ...eon_dashboard/lib/l10n/localizations.dart
diff --git a/..._dashboard/lib/l10n/localizations_en.dart → ..._dashboard/lib/l10n/localizations_en.dart b/..._dashboard/lib/l10n/localizations_en.dart → ..._dashboard/lib/l10n/localizations_en.dart
diff --git a/...on/neon_dashboard/lib/neon_dashboard.dart → ...es/neon_dashboard/lib/neon_dashboard.dart b/...on/neon_dashboard/lib/neon_dashboard.dart → ...es/neon_dashboard/lib/neon_dashboard.dart
diff --git a/...on_dashboard/lib/src/blocs/dashboard.dart → ...on_dashboard/lib/src/blocs/dashboard.dart b/...on_dashboard/lib/src/blocs/dashboard.dart → ...on_dashboard/lib/src/blocs/dashboard.dart
diff --git a/.../neon/neon_dashboard/lib/src/options.dart → ...kages/neon_dashboard/lib/src/options.dart b/.../neon/neon_dashboard/lib/src/options.dart → ...kages/neon_dashboard/lib/src/options.dart
diff --git a/...on/neon_dashboard/lib/src/pages/main.dart → ...es/neon_dashboard/lib/src/pages/main.dart b/...on/neon_dashboard/lib/src/pages/main.dart → ...es/neon_dashboard/lib/src/pages/main.dart
diff --git a/...s/neon/neon_dashboard/lib/src/routes.dart → ...ckages/neon_dashboard/lib/src/routes.dart b/...s/neon/neon_dashboard/lib/src/routes.dart → ...ckages/neon_dashboard/lib/src/routes.dart
diff --git a/...neon/neon_dashboard/lib/src/routes.g.dart → ...ages/neon_dashboard/lib/src/routes.g.dart b/...neon/neon_dashboard/lib/src/routes.g.dart → ...ages/neon_dashboard/lib/src/routes.g.dart
diff --git a/...lib/src/widgets/dry_intrinsic_height.dart → ...lib/src/widgets/dry_intrinsic_height.dart b/...lib/src/widgets/dry_intrinsic_height.dart → ...lib/src/widgets/dry_intrinsic_height.dart
diff --git a/.../widgets/set_weather_location_dialog.dart → .../widgets/set_weather_location_dialog.dart b/.../widgets/set_weather_location_dialog.dart → .../widgets/set_weather_location_dialog.dart
diff --git a/...eon_dashboard/lib/src/widgets/widget.dart → ...eon_dashboard/lib/src/widgets/widget.dart b/...eon_dashboard/lib/src/widgets/widget.dart → ...eon_dashboard/lib/src/widgets/widget.dart
diff --git a/...hboard/lib/src/widgets/widget_button.dart → ...hboard/lib/src/widgets/widget_button.dart b/...hboard/lib/src/widgets/widget_button.dart → ...hboard/lib/src/widgets/widget_button.dart
diff --git a/...ashboard/lib/src/widgets/widget_item.dart → ...ashboard/lib/src/widgets/widget_item.dart b/...ashboard/lib/src/widgets/widget_item.dart → ...ashboard/lib/src/widgets/widget_item.dart
diff --git a/packages/neon/neon_dashboard/pubspec.yaml → .../app/packages/neon_dashboard/pubspec.yaml b/packages/neon/neon_dashboard/pubspec.yaml → .../app/packages/neon_dashboard/pubspec.yaml
diff --git a/packages/app/packages/neon_dashboard/pubspec_overrides.yaml b/packages/app/packages/neon_dashboard/pubspec_overrides.yaml
@@ -0,0 +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
+  dynamite_runtime:
+    path: ../../../dynamite/dynamite_runtime
+  neon_framework:
+    path: ../../../neon_framework
+  neon_http_client:
+    path: ../../../neon_framework/packages/neon_http_client
+  neon_lints:
+    path: ../../../neon_lints
+  nextcloud:
+    path: ../../../nextcloud
+  sort_box:
+    path: ../../../neon_framework/packages/sort_box
diff --git a/...s/neon/neon_dashboard/test/bloc_test.dart → ...ckages/neon_dashboard/test/bloc_test.dart b/...s/neon/neon_dashboard/test/bloc_test.dart → ...ckages/neon_dashboard/test/bloc_test.dart
diff --git a/...on/neon_dashboard/test/goldens/widget.png → ...es/neon_dashboard/test/goldens/widget.png b/...on/neon_dashboard/test/goldens/widget.png → ...es/neon_dashboard/test/goldens/widget.png
diff --git a/...rd/test/goldens/widget_button_invalid.png → ...rd/test/goldens/widget_button_invalid.png b/...rd/test/goldens/widget_button_invalid.png → ...rd/test/goldens/widget_button_invalid.png
diff --git a/...board/test/goldens/widget_button_more.png → ...board/test/goldens/widget_button_more.png b/...board/test/goldens/widget_button_more.png → ...board/test/goldens/widget_button_more.png
diff --git a/...hboard/test/goldens/widget_button_new.png → ...hboard/test/goldens/widget_button_new.png b/...hboard/test/goldens/widget_button_new.png → ...hboard/test/goldens/widget_button_new.png
diff --git a/...oard/test/goldens/widget_button_setup.png → ...oard/test/goldens/widget_button_setup.png b/...oard/test/goldens/widget_button_setup.png → ...oard/test/goldens/widget_button_setup.png
diff --git a/...on_dashboard/test/goldens/widget_item.png → ...on_dashboard/test/goldens/widget_item.png b/...on_dashboard/test/goldens/widget_item.png → ...on_dashboard/test/goldens/widget_item.png
diff --git a/...rd/test/goldens/widget_item_not_round.png → ...rd/test/goldens/widget_item_not_round.png b/...rd/test/goldens/widget_item_not_round.png → ...rd/test/goldens/widget_item_not_round.png
diff --git a/...shboard/test/goldens/widget_not_round.png → ...shboard/test/goldens/widget_not_round.png b/...shboard/test/goldens/widget_not_round.png → ...shboard/test/goldens/widget_not_round.png
diff --git a/...hboard/test/goldens/widget_with_empty.png → ...hboard/test/goldens/widget_with_empty.png b/...hboard/test/goldens/widget_with_empty.png → ...hboard/test/goldens/widget_with_empty.png
diff --git a/...dens/widget_with_empty_and_half_empty.png → ...dens/widget_with_empty_and_half_empty.png b/...dens/widget_with_empty_and_half_empty.png → ...dens/widget_with_empty_and_half_empty.png
diff --git a/...d/test/goldens/widget_with_half_empty.png → ...d/test/goldens/widget_with_half_empty.png b/...d/test/goldens/widget_with_half_empty.png → ...d/test/goldens/widget_with_half_empty.png
diff --git a/.../goldens/widget_with_multiple_buttons.png → .../goldens/widget_with_multiple_buttons.png b/.../goldens/widget_with_multiple_buttons.png → .../goldens/widget_with_multiple_buttons.png
diff --git a/...d/test/goldens/widget_without_buttons.png → ...d/test/goldens/widget_without_buttons.png b/...d/test/goldens/widget_without_buttons.png → ...d/test/goldens/widget_without_buttons.png
diff --git a/...ard/test/goldens/widget_without_items.png → ...ard/test/goldens/widget_without_items.png b/...ard/test/goldens/widget_without_items.png → ...ard/test/goldens/widget_without_items.png
diff --git a/...est/set_weather_location_dialog_test.dart → ...est/set_weather_location_dialog_test.dart b/...est/set_weather_location_dialog_test.dart → ...est/set_weather_location_dialog_test.dart
diff --git a/...neon/neon_dashboard/test/widget_test.dart → ...ages/neon_dashboard/test/widget_test.dart b/...neon/neon_dashboard/test/widget_test.dart → ...ages/neon_dashboard/test/widget_test.dart
diff --git a/packages/neon/neon_dashboard/.metadata → packages/app/packages/neon_files/.metadata b/packages/neon/neon_dashboard/.metadata → packages/app/packages/neon_files/.metadata
diff --git a/packages/app/packages/neon_files/LICENSE b/packages/app/packages/neon_files/LICENSE
@@ -0,0 +1 @@
+../../../../assets/AGPL-3.0.txt
diff --git a/...ges/neon/neon_files/analysis_options.yaml → ...packages/neon_files/analysis_options.yaml b/...ges/neon/neon_files/analysis_options.yaml → ...packages/neon_files/analysis_options.yaml
diff --git a/packages/neon/neon_files/assets/app.svg.vec → ...pp/packages/neon_files/assets/app.svg.vec b/packages/neon/neon_files/assets/app.svg.vec → ...pp/packages/neon_files/assets/app.svg.vec
diff --git a/packages/neon/neon_files/build.yaml → packages/app/packages/neon_files/build.yaml b/packages/neon/neon_files/build.yaml → packages/app/packages/neon_files/build.yaml
diff --git a/packages/neon/neon_files/l10n.yaml → packages/app/packages/neon_files/l10n.yaml b/packages/neon/neon_files/l10n.yaml → packages/app/packages/neon_files/l10n.yaml
diff --git a/packages/neon/neon_files/lib/l10n/en.arb → ...s/app/packages/neon_files/lib/l10n/en.arb b/packages/neon/neon_files/lib/l10n/en.arb → ...s/app/packages/neon_files/lib/l10n/en.arb
diff --git a/...on/neon_files/lib/l10n/localizations.dart → ...es/neon_files/lib/l10n/localizations.dart b/...on/neon_files/lib/l10n/localizations.dart → ...es/neon_files/lib/l10n/localizations.dart
diff --git a/...neon_files/lib/l10n/localizations_en.dart → ...neon_files/lib/l10n/localizations_en.dart b/...neon_files/lib/l10n/localizations_en.dart → ...neon_files/lib/l10n/localizations_en.dart
diff --git a/packages/neon/neon_files/lib/neon_files.dart → ...p/packages/neon_files/lib/neon_files.dart b/packages/neon/neon_files/lib/neon_files.dart → ...p/packages/neon_files/lib/neon_files.dart
diff --git a/...eon/neon_files/lib/src/blocs/browser.dart → ...ges/neon_files/lib/src/blocs/browser.dart b/...eon/neon_files/lib/src/blocs/browser.dart → ...ges/neon_files/lib/src/blocs/browser.dart
diff --git a/.../neon/neon_files/lib/src/blocs/files.dart → ...kages/neon_files/lib/src/blocs/files.dart b/.../neon/neon_files/lib/src/blocs/files.dart → ...kages/neon_files/lib/src/blocs/files.dart
diff --git a/...on_files/lib/src/models/file_details.dart → ...on_files/lib/src/models/file_details.dart b/...on_files/lib/src/models/file_details.dart → ...on_files/lib/src/models/file_details.dart
diff --git a/...ages/neon/neon_files/lib/src/options.dart → .../packages/neon_files/lib/src/options.dart b/...ages/neon/neon_files/lib/src/options.dart → .../packages/neon_files/lib/src/options.dart
diff --git a/...eon/neon_files/lib/src/pages/details.dart → ...ges/neon_files/lib/src/pages/details.dart b/...eon/neon_files/lib/src/pages/details.dart → ...ges/neon_files/lib/src/pages/details.dart
diff --git a/...s/neon/neon_files/lib/src/pages/main.dart → ...ckages/neon_files/lib/src/pages/main.dart b/...s/neon/neon_files/lib/src/pages/main.dart → ...ckages/neon_files/lib/src/pages/main.dart
diff --git a/packages/neon/neon_files/lib/src/routes.dart → ...p/packages/neon_files/lib/src/routes.dart b/packages/neon/neon_files/lib/src/routes.dart → ...p/packages/neon_files/lib/src/routes.dart
diff --git a/...ges/neon/neon_files/lib/src/routes.g.dart → ...packages/neon_files/lib/src/routes.g.dart b/...ges/neon/neon_files/lib/src/routes.g.dart → ...packages/neon_files/lib/src/routes.g.dart
diff --git a/...s/neon/neon_files/lib/src/sort/files.dart → ...ckages/neon_files/lib/src/sort/files.dart b/...s/neon/neon_files/lib/src/sort/files.dart → ...ckages/neon_files/lib/src/sort/files.dart
diff --git a/...neon/neon_files/lib/src/utils/dialog.dart → ...ages/neon_files/lib/src/utils/dialog.dart b/...neon/neon_files/lib/src/utils/dialog.dart → ...ages/neon_files/lib/src/utils/dialog.dart
diff --git a/...s/neon/neon_files/lib/src/utils/task.dart → ...ckages/neon_files/lib/src/utils/task.dart b/...s/neon/neon_files/lib/src/utils/task.dart → ...ckages/neon_files/lib/src/utils/task.dart
diff --git a/...n/neon_files/lib/src/widgets/actions.dart → ...s/neon_files/lib/src/widgets/actions.dart b/...n/neon_files/lib/src/widgets/actions.dart → ...s/neon_files/lib/src/widgets/actions.dart
diff --git a/...n_files/lib/src/widgets/browser_view.dart → ...n_files/lib/src/widgets/browser_view.dart b/...n_files/lib/src/widgets/browser_view.dart → ...n_files/lib/src/widgets/browser_view.dart
diff --git a/...on/neon_files/lib/src/widgets/dialog.dart → ...es/neon_files/lib/src/widgets/dialog.dart b/...on/neon_files/lib/src/widgets/dialog.dart → ...es/neon_files/lib/src/widgets/dialog.dart
diff --git a/...files/lib/src/widgets/file_list_tile.dart → ...files/lib/src/widgets/file_list_tile.dart b/...files/lib/src/widgets/file_list_tile.dart → ...files/lib/src/widgets/file_list_tile.dart
diff --git a/...n_files/lib/src/widgets/file_preview.dart → ...n_files/lib/src/widgets/file_preview.dart b/...n_files/lib/src/widgets/file_preview.dart → ...n_files/lib/src/widgets/file_preview.dart
diff --git a/...neon_files/lib/src/widgets/navigator.dart → ...neon_files/lib/src/widgets/navigator.dart b/...neon_files/lib/src/widgets/navigator.dart → ...neon_files/lib/src/widgets/navigator.dart
diff --git a/packages/neon/neon_files/pubspec.yaml → ...ages/app/packages/neon_files/pubspec.yaml b/packages/neon/neon_files/pubspec.yaml → ...ages/app/packages/neon_files/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   file_icons:
     git:
       url: https://github.com/nextcloud/neon
-      path: packages/file_icons
+      path: packages/neon_framework/packages/file_icons
   file_picker: ^8.0.0+1
   filesize: ^2.0.0
   flutter:

diff --git a/packages/app/packages/neon_files/pubspec_overrides.yaml b/packages/app/packages/neon_files/pubspec_overrides.yaml
@@ -0,0 +1,18 @@
+# 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: ../../../neon_framework/packages/file_icons
+  neon_framework:
+    path: ../../../neon_framework
+  neon_http_client:
+    path: ../../../neon_framework/packages/neon_http_client
+  neon_lints:
+    path: ../../../neon_lints
+  nextcloud:
+    path: ../../../nextcloud
+  sort_box:
+    path: ../../../neon_framework/packages/sort_box
diff --git a/packages/neon/neon_files/.metadata → packages/app/packages/neon_news/.metadata b/packages/neon/neon_files/.metadata → packages/app/packages/neon_news/.metadata
diff --git a/packages/app/packages/neon_news/LICENSE b/packages/app/packages/neon_news/LICENSE
@@ -0,0 +1 @@
+../../../../assets/AGPL-3.0.txt
diff --git a/...ages/neon/neon_news/analysis_options.yaml → .../packages/neon_news/analysis_options.yaml b/...ages/neon/neon_news/analysis_options.yaml → .../packages/neon_news/analysis_options.yaml
diff --git a/packages/neon/neon_news/assets/app.svg.vec → ...app/packages/neon_news/assets/app.svg.vec b/packages/neon/neon_news/assets/app.svg.vec → ...app/packages/neon_news/assets/app.svg.vec
diff --git a/packages/neon/neon_news/build.yaml → packages/app/packages/neon_news/build.yaml b/packages/neon/neon_news/build.yaml → packages/app/packages/neon_news/build.yaml
diff --git a/packages/neon/neon_news/l10n.yaml → packages/app/packages/neon_news/l10n.yaml b/packages/neon/neon_news/l10n.yaml → packages/app/packages/neon_news/l10n.yaml
diff --git a/packages/neon/neon_news/lib/l10n/en.arb → ...es/app/packages/neon_news/lib/l10n/en.arb b/packages/neon/neon_news/lib/l10n/en.arb → ...es/app/packages/neon_news/lib/l10n/en.arb
diff --git a/...eon/neon_news/lib/l10n/localizations.dart → ...ges/neon_news/lib/l10n/localizations.dart b/...eon/neon_news/lib/l10n/localizations.dart → ...ges/neon_news/lib/l10n/localizations.dart
diff --git a/.../neon_news/lib/l10n/localizations_en.dart → .../neon_news/lib/l10n/localizations_en.dart b/.../neon_news/lib/l10n/localizations_en.dart → .../neon_news/lib/l10n/localizations_en.dart
diff --git a/packages/neon/neon_news/lib/neon_news.dart → ...app/packages/neon_news/lib/neon_news.dart b/packages/neon/neon_news/lib/neon_news.dart → ...app/packages/neon_news/lib/neon_news.dart
diff --git a/...neon/neon_news/lib/src/blocs/article.dart → ...ages/neon_news/lib/src/blocs/article.dart b/...neon/neon_news/lib/src/blocs/article.dart → ...ages/neon_news/lib/src/blocs/article.dart
diff --git a/...eon/neon_news/lib/src/blocs/articles.dart → ...ges/neon_news/lib/src/blocs/articles.dart b/...eon/neon_news/lib/src/blocs/articles.dart → ...ges/neon_news/lib/src/blocs/articles.dart
diff --git a/...es/neon/neon_news/lib/src/blocs/news.dart → ...ackages/neon_news/lib/src/blocs/news.dart b/...es/neon/neon_news/lib/src/blocs/news.dart → ...ackages/neon_news/lib/src/blocs/news.dart
diff --git a/packages/neon/neon_news/lib/src/options.dart → ...p/packages/neon_news/lib/src/options.dart b/packages/neon/neon_news/lib/src/options.dart → ...p/packages/neon_news/lib/src/options.dart
diff --git a/...neon/neon_news/lib/src/pages/article.dart → ...ages/neon_news/lib/src/pages/article.dart b/...neon/neon_news/lib/src/pages/article.dart → ...ages/neon_news/lib/src/pages/article.dart
diff --git a/...es/neon/neon_news/lib/src/pages/feed.dart → ...ackages/neon_news/lib/src/pages/feed.dart b/...es/neon/neon_news/lib/src/pages/feed.dart → ...ackages/neon_news/lib/src/pages/feed.dart
diff --git a/.../neon/neon_news/lib/src/pages/folder.dart → ...kages/neon_news/lib/src/pages/folder.dart b/.../neon/neon_news/lib/src/pages/folder.dart → ...kages/neon_news/lib/src/pages/folder.dart
diff --git a/...es/neon/neon_news/lib/src/pages/main.dart → ...ackages/neon_news/lib/src/pages/main.dart b/...es/neon/neon_news/lib/src/pages/main.dart → ...ackages/neon_news/lib/src/pages/main.dart
diff --git a/packages/neon/neon_news/lib/src/routes.dart → ...pp/packages/neon_news/lib/src/routes.dart b/packages/neon/neon_news/lib/src/routes.dart → ...pp/packages/neon_news/lib/src/routes.dart
diff --git a/...ages/neon/neon_news/lib/src/routes.g.dart → .../packages/neon_news/lib/src/routes.g.dart b/...ages/neon/neon_news/lib/src/routes.g.dart → .../packages/neon_news/lib/src/routes.g.dart
diff --git a/...neon/neon_news/lib/src/sort/articles.dart → ...ages/neon_news/lib/src/sort/articles.dart b/...neon/neon_news/lib/src/sort/articles.dart → ...ages/neon_news/lib/src/sort/articles.dart
diff --git a/...es/neon/neon_news/lib/src/sort/feeds.dart → ...ackages/neon_news/lib/src/sort/feeds.dart b/...es/neon/neon_news/lib/src/sort/feeds.dart → ...ackages/neon_news/lib/src/sort/feeds.dart
diff --git a/.../neon/neon_news/lib/src/sort/folders.dart → ...kages/neon_news/lib/src/sort/folders.dart b/.../neon/neon_news/lib/src/sort/folders.dart → ...kages/neon_news/lib/src/sort/folders.dart
diff --git a/.../neon/neon_news/lib/src/utils/dialog.dart → ...kages/neon_news/lib/src/utils/dialog.dart b/.../neon/neon_news/lib/src/utils/dialog.dart → ...kages/neon_news/lib/src/utils/dialog.dart
diff --git a/...n_news/lib/src/widgets/articles_view.dart → ...n_news/lib/src/widgets/articles_view.dart b/...n_news/lib/src/widgets/articles_view.dart → ...n_news/lib/src/widgets/articles_view.dart
diff --git a/...eon/neon_news/lib/src/widgets/dialog.dart → ...ges/neon_news/lib/src/widgets/dialog.dart b/...eon/neon_news/lib/src/widgets/dialog.dart → ...ges/neon_news/lib/src/widgets/dialog.dart
diff --git a/.../widgets/feed_floating_action_button.dart → .../widgets/feed_floating_action_button.dart b/.../widgets/feed_floating_action_button.dart → .../widgets/feed_floating_action_button.dart
diff --git a/.../neon_news/lib/src/widgets/feed_icon.dart → .../neon_news/lib/src/widgets/feed_icon.dart b/.../neon_news/lib/src/widgets/feed_icon.dart → .../neon_news/lib/src/widgets/feed_icon.dart
diff --git a/...neon_news/lib/src/widgets/feeds_view.dart → ...neon_news/lib/src/widgets/feeds_view.dart b/...neon_news/lib/src/widgets/feeds_view.dart → ...neon_news/lib/src/widgets/feeds_view.dart
diff --git a/...idgets/folder_floating_action_button.dart → ...idgets/folder_floating_action_button.dart b/...idgets/folder_floating_action_button.dart → ...idgets/folder_floating_action_button.dart
diff --git a/...n_news/lib/src/widgets/folder_select.dart → ...n_news/lib/src/widgets/folder_select.dart b/...n_news/lib/src/widgets/folder_select.dart → ...n_news/lib/src/widgets/folder_select.dart
diff --git a/...eon_news/lib/src/widgets/folder_view.dart → ...eon_news/lib/src/widgets/folder_view.dart b/...eon_news/lib/src/widgets/folder_view.dart → ...eon_news/lib/src/widgets/folder_view.dart
diff --git a/...on_news/lib/src/widgets/folders_view.dart → ...on_news/lib/src/widgets/folders_view.dart b/...on_news/lib/src/widgets/folders_view.dart → ...on_news/lib/src/widgets/folders_view.dart
diff --git a/packages/neon/neon_news/pubspec.yaml → packages/app/packages/neon_news/pubspec.yaml b/packages/neon/neon_news/pubspec.yaml → packages/app/packages/neon_news/pubspec.yaml
diff --git a/packages/app/packages/neon_news/pubspec_overrides.yaml b/packages/app/packages/neon_news/pubspec_overrides.yaml
@@ -0,0 +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
+  dynamite_runtime:
+    path: ../../../dynamite/dynamite_runtime
+  neon_framework:
+    path: ../../../neon_framework
+  neon_http_client:
+    path: ../../../neon_framework/packages/neon_http_client
+  neon_lints:
+    path: ../../../neon_lints
+  nextcloud:
+    path: ../../../nextcloud
+  sort_box:
+    path: ../../../neon_framework/packages/sort_box
diff --git a/packages/neon/neon_news/.metadata → packages/app/packages/neon_notes/.metadata b/packages/neon/neon_news/.metadata → packages/app/packages/neon_notes/.metadata
diff --git a/packages/app/packages/neon_notes/LICENSE b/packages/app/packages/neon_notes/LICENSE
@@ -0,0 +1 @@
+../../../../assets/AGPL-3.0.txt
diff --git a/...ges/neon/neon_notes/analysis_options.yaml → ...packages/neon_notes/analysis_options.yaml b/...ges/neon/neon_notes/analysis_options.yaml → ...packages/neon_notes/analysis_options.yaml
diff --git a/packages/neon/neon_notes/assets/app.svg.vec → ...pp/packages/neon_notes/assets/app.svg.vec b/packages/neon/neon_notes/assets/app.svg.vec → ...pp/packages/neon_notes/assets/app.svg.vec
diff --git a/packages/neon/neon_notes/build.yaml → packages/app/packages/neon_notes/build.yaml b/packages/neon/neon_notes/build.yaml → packages/app/packages/neon_notes/build.yaml
diff --git a/packages/neon/neon_notes/l10n.yaml → packages/app/packages/neon_notes/l10n.yaml b/packages/neon/neon_notes/l10n.yaml → packages/app/packages/neon_notes/l10n.yaml
diff --git a/packages/neon/neon_notes/lib/l10n/en.arb → ...s/app/packages/neon_notes/lib/l10n/en.arb b/packages/neon/neon_notes/lib/l10n/en.arb → ...s/app/packages/neon_notes/lib/l10n/en.arb
diff --git a/...on/neon_notes/lib/l10n/localizations.dart → ...es/neon_notes/lib/l10n/localizations.dart b/...on/neon_notes/lib/l10n/localizations.dart → ...es/neon_notes/lib/l10n/localizations.dart
diff --git a/...neon_notes/lib/l10n/localizations_en.dart → ...neon_notes/lib/l10n/localizations_en.dart b/...neon_notes/lib/l10n/localizations_en.dart → ...neon_notes/lib/l10n/localizations_en.dart
diff --git a/packages/neon/neon_notes/lib/neon_notes.dart → ...p/packages/neon_notes/lib/neon_notes.dart b/packages/neon/neon_notes/lib/neon_notes.dart → ...p/packages/neon_notes/lib/neon_notes.dart
diff --git a/...s/neon/neon_notes/lib/src/blocs/note.dart → ...ckages/neon_notes/lib/src/blocs/note.dart b/...s/neon/neon_notes/lib/src/blocs/note.dart → ...ckages/neon_notes/lib/src/blocs/note.dart
diff --git a/.../neon/neon_notes/lib/src/blocs/notes.dart → ...kages/neon_notes/lib/src/blocs/notes.dart b/.../neon/neon_notes/lib/src/blocs/notes.dart → ...kages/neon_notes/lib/src/blocs/notes.dart
diff --git a/...ages/neon/neon_notes/lib/src/options.dart → .../packages/neon_notes/lib/src/options.dart b/...ages/neon/neon_notes/lib/src/options.dart → .../packages/neon_notes/lib/src/options.dart
diff --git a/...on/neon_notes/lib/src/pages/category.dart → ...es/neon_notes/lib/src/pages/category.dart b/...on/neon_notes/lib/src/pages/category.dart → ...es/neon_notes/lib/src/pages/category.dart
diff --git a/...s/neon/neon_notes/lib/src/pages/main.dart → ...ckages/neon_notes/lib/src/pages/main.dart b/...s/neon/neon_notes/lib/src/pages/main.dart → ...ckages/neon_notes/lib/src/pages/main.dart
diff --git a/...s/neon/neon_notes/lib/src/pages/note.dart → ...ckages/neon_notes/lib/src/pages/note.dart b/...s/neon/neon_notes/lib/src/pages/note.dart → ...ckages/neon_notes/lib/src/pages/note.dart
diff --git a/packages/neon/neon_notes/lib/src/routes.dart → ...p/packages/neon_notes/lib/src/routes.dart b/packages/neon/neon_notes/lib/src/routes.dart → ...p/packages/neon_notes/lib/src/routes.dart
diff --git a/...ges/neon/neon_notes/lib/src/routes.g.dart → ...packages/neon_notes/lib/src/routes.g.dart b/...ges/neon/neon_notes/lib/src/routes.g.dart → ...packages/neon_notes/lib/src/routes.g.dart
diff --git a/...n/neon_notes/lib/src/sort/categories.dart → ...s/neon_notes/lib/src/sort/categories.dart b/...n/neon_notes/lib/src/sort/categories.dart → ...s/neon_notes/lib/src/sort/categories.dart
diff --git a/...s/neon/neon_notes/lib/src/sort/notes.dart → ...ckages/neon_notes/lib/src/sort/notes.dart b/...s/neon/neon_notes/lib/src/sort/notes.dart → ...ckages/neon_notes/lib/src/sort/notes.dart
diff --git a/...n_notes/lib/src/utils/category_color.dart → ...n_notes/lib/src/utils/category_color.dart b/...n_notes/lib/src/utils/category_color.dart → ...n_notes/lib/src/utils/category_color.dart
diff --git a/...otes/lib/src/utils/exception_handler.dart → ...otes/lib/src/utils/exception_handler.dart b/...otes/lib/src/utils/exception_handler.dart → ...otes/lib/src/utils/exception_handler.dart
diff --git a/...otes/lib/src/widgets/categories_view.dart → ...otes/lib/src/widgets/categories_view.dart b/...otes/lib/src/widgets/categories_view.dart → ...otes/lib/src/widgets/categories_view.dart
diff --git a/...otes/lib/src/widgets/category_select.dart → ...otes/lib/src/widgets/category_select.dart b/...otes/lib/src/widgets/category_select.dart → ...otes/lib/src/widgets/category_select.dart
diff --git a/...on/neon_notes/lib/src/widgets/dialog.dart → ...es/neon_notes/lib/src/widgets/dialog.dart b/...on/neon_notes/lib/src/widgets/dialog.dart → ...es/neon_notes/lib/src/widgets/dialog.dart
diff --git a/...widgets/notes_floating_action_button.dart → ...widgets/notes_floating_action_button.dart b/...widgets/notes_floating_action_button.dart → ...widgets/notes_floating_action_button.dart
diff --git a/...eon_notes/lib/src/widgets/notes_view.dart → ...eon_notes/lib/src/widgets/notes_view.dart b/...eon_notes/lib/src/widgets/notes_view.dart → ...eon_notes/lib/src/widgets/notes_view.dart
diff --git a/packages/neon/neon_notes/pubspec.yaml → ...ages/app/packages/neon_notes/pubspec.yaml b/packages/neon/neon_notes/pubspec.yaml → ...ages/app/packages/neon_notes/pubspec.yaml
diff --git a/packages/app/packages/neon_notes/pubspec_overrides.yaml b/packages/app/packages/neon_notes/pubspec_overrides.yaml
@@ -0,0 +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
+  dynamite_runtime:
+    path: ../../../dynamite/dynamite_runtime
+  neon_framework:
+    path: ../../../neon_framework
+  neon_http_client:
+    path: ../../../neon_framework/packages/neon_http_client
+  neon_lints:
+    path: ../../../neon_lints
+  nextcloud:
+    path: ../../../nextcloud
+  sort_box:
+    path: ../../../neon_framework/packages/sort_box
diff --git a/packages/neon/neon_notes/.metadata → ...app/packages/neon_notifications/.metadata b/packages/neon/neon_notes/.metadata → ...app/packages/neon_notifications/.metadata
diff --git a/packages/app/packages/neon_notifications/LICENSE b/packages/app/packages/neon_notifications/LICENSE
@@ -0,0 +1 @@
+../../../../assets/AGPL-3.0.txt
diff --git a/.../neon_notifications/analysis_options.yaml → .../neon_notifications/analysis_options.yaml b/.../neon_notifications/analysis_options.yaml → .../neon_notifications/analysis_options.yaml
diff --git a/...eon/neon_notifications/assets/app.svg.vec → ...ges/neon_notifications/assets/app.svg.vec b/...eon/neon_notifications/assets/app.svg.vec → ...ges/neon_notifications/assets/app.svg.vec
diff --git a/packages/neon/neon_notifications/build.yaml → ...pp/packages/neon_notifications/build.yaml b/packages/neon/neon_notifications/build.yaml → ...pp/packages/neon_notifications/build.yaml
diff --git a/packages/neon/neon_notifications/l10n.yaml → ...app/packages/neon_notifications/l10n.yaml b/packages/neon/neon_notifications/l10n.yaml → ...app/packages/neon_notifications/l10n.yaml
diff --git a/...s/neon/neon_notifications/lib/l10n/en.arb → ...ckages/neon_notifications/lib/l10n/en.arb b/...s/neon/neon_notifications/lib/l10n/en.arb → ...ckages/neon_notifications/lib/l10n/en.arb
diff --git a/...notifications/lib/l10n/localizations.dart → ...notifications/lib/l10n/localizations.dart b/...notifications/lib/l10n/localizations.dart → ...notifications/lib/l10n/localizations.dart
diff --git a/...ifications/lib/l10n/localizations_en.dart → ...ifications/lib/l10n/localizations_en.dart b/...ifications/lib/l10n/localizations_en.dart → ...ifications/lib/l10n/localizations_en.dart
diff --git a/...notifications/lib/neon_notifications.dart → ...notifications/lib/neon_notifications.dart b/...notifications/lib/neon_notifications.dart → ...notifications/lib/neon_notifications.dart
diff --git a/...ications/lib/src/blocs/notifications.dart → ...ications/lib/src/blocs/notifications.dart b/...ications/lib/src/blocs/notifications.dart → ...ications/lib/src/blocs/notifications.dart
diff --git a/...n/neon_notifications/lib/src/options.dart → ...s/neon_notifications/lib/src/options.dart b/...n/neon_notifications/lib/src/options.dart → ...s/neon_notifications/lib/src/options.dart
diff --git a/...eon_notifications/lib/src/pages/main.dart → ...eon_notifications/lib/src/pages/main.dart b/...eon_notifications/lib/src/pages/main.dart → ...eon_notifications/lib/src/pages/main.dart
diff --git a/...on/neon_notifications/lib/src/routes.dart → ...es/neon_notifications/lib/src/routes.dart b/...on/neon_notifications/lib/src/routes.dart → ...es/neon_notifications/lib/src/routes.dart
diff --git a/.../neon_notifications/lib/src/routes.g.dart → .../neon_notifications/lib/src/routes.g.dart b/.../neon_notifications/lib/src/routes.g.dart → .../neon_notifications/lib/src/routes.g.dart
diff --git a/...notifications/lib/src/widgets/action.dart → ...notifications/lib/src/widgets/action.dart b/...notifications/lib/src/widgets/action.dart → ...notifications/lib/src/widgets/action.dart
diff --git a/...cations/lib/src/widgets/notification.dart → ...cations/lib/src/widgets/notification.dart b/...cations/lib/src/widgets/notification.dart → ...cations/lib/src/widgets/notification.dart
diff --git a/...ages/neon/neon_notifications/pubspec.yaml → .../packages/neon_notifications/pubspec.yaml b/...ages/neon/neon_notifications/pubspec.yaml → .../packages/neon_notifications/pubspec.yaml
diff --git a/packages/app/packages/neon_notifications/pubspec_overrides.yaml b/packages/app/packages/neon_notifications/pubspec_overrides.yaml
@@ -0,0 +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
+  dynamite_runtime:
+    path: ../../../dynamite/dynamite_runtime
+  neon_framework:
+    path: ../../../neon_framework
+  neon_http_client:
+    path: ../../../neon_framework/packages/neon_http_client
+  neon_lints:
+    path: ../../../neon_lints
+  nextcloud:
+    path: ../../../nextcloud
+  sort_box:
+    path: ../../../neon_framework/packages/sort_box
diff --git a/.../neon_notifications/test/action_test.dart → .../neon_notifications/test/action_test.dart b/.../neon_notifications/test/action_test.dart → .../neon_notifications/test/action_test.dart
diff --git a/...on/neon_notifications/test/bloc_test.dart → ...es/neon_notifications/test/bloc_test.dart b/...on/neon_notifications/test/bloc_test.dart → ...es/neon_notifications/test/bloc_test.dart
diff --git a/...fications/test/goldens/action_primary.png → ...fications/test/goldens/action_primary.png b/...fications/test/goldens/action_primary.png → ...fications/test/goldens/action_primary.png
diff --git a/...cations/test/goldens/action_secondary.png → ...cations/test/goldens/action_secondary.png b/...cations/test/goldens/action_secondary.png → ...cations/test/goldens/action_secondary.png
diff --git a/...ications/test/goldens/main_page_error.png → ...ications/test/goldens/main_page_error.png b/...ications/test/goldens/main_page_error.png → ...ications/test/goldens/main_page_error.png
diff --git a/.../goldens/main_page_with_notifications.png → .../goldens/main_page_with_notifications.png b/.../goldens/main_page_with_notifications.png → .../goldens/main_page_with_notifications.png
diff --git a/...ldens/main_page_without_notifications.png → ...ldens/main_page_without_notifications.png b/...ldens/main_page_without_notifications.png → ...ldens/main_page_without_notifications.png
diff --git a/...tifications/test/goldens/notification.png → ...tifications/test/goldens/notification.png b/...tifications/test/goldens/notification.png → ...tifications/test/goldens/notification.png
diff --git a/...on_notifications/test/main_page_test.dart → ...on_notifications/test/main_page_test.dart b/...on_notifications/test/main_page_test.dart → ...on_notifications/test/main_page_test.dart
diff --git a/...notifications/test/notification_test.dart → ...notifications/test/notification_test.dart b/...notifications/test/notification_test.dart → ...notifications/test/notification_test.dart
diff --git a/...neon/neon_notifications/test/testing.dart → ...ages/neon_notifications/test/testing.dart b/...neon/neon_notifications/test/testing.dart → ...ages/neon_notifications/test/testing.dart
diff --git a/packages/neon/neon_notifications/.metadata → packages/app/packages/neon_talk/.metadata b/packages/neon/neon_notifications/.metadata → packages/app/packages/neon_talk/.metadata
diff --git a/packages/app/packages/neon_talk/LICENSE b/packages/app/packages/neon_talk/LICENSE
@@ -0,0 +1 @@
+../../../../assets/AGPL-3.0.txt
diff --git a/...ages/neon/neon_talk/analysis_options.yaml → .../packages/neon_talk/analysis_options.yaml b/...ages/neon/neon_talk/analysis_options.yaml → .../packages/neon_talk/analysis_options.yaml
diff --git a/packages/neon/neon_talk/assets/app.svg.vec → ...app/packages/neon_talk/assets/app.svg.vec b/packages/neon/neon_talk/assets/app.svg.vec → ...app/packages/neon_talk/assets/app.svg.vec
diff --git a/packages/neon/neon_talk/build.yaml → packages/app/packages/neon_talk/build.yaml b/packages/neon/neon_talk/build.yaml → packages/app/packages/neon_talk/build.yaml
diff --git a/packages/neon/neon_talk/l10n.yaml → packages/app/packages/neon_talk/l10n.yaml b/packages/neon/neon_talk/l10n.yaml → packages/app/packages/neon_talk/l10n.yaml
diff --git a/packages/neon/neon_talk/lib/l10n/en.arb → ...es/app/packages/neon_talk/lib/l10n/en.arb b/packages/neon/neon_talk/lib/l10n/en.arb → ...es/app/packages/neon_talk/lib/l10n/en.arb
diff --git a/...eon/neon_talk/lib/l10n/localizations.dart → ...ges/neon_talk/lib/l10n/localizations.dart b/...eon/neon_talk/lib/l10n/localizations.dart → ...ges/neon_talk/lib/l10n/localizations.dart
diff --git a/.../neon_talk/lib/l10n/localizations_en.dart → .../neon_talk/lib/l10n/localizations_en.dart b/.../neon_talk/lib/l10n/localizations_en.dart → .../neon_talk/lib/l10n/localizations_en.dart
diff --git a/packages/neon/neon_talk/lib/neon_talk.dart → ...app/packages/neon_talk/lib/neon_talk.dart b/packages/neon/neon_talk/lib/neon_talk.dart → ...app/packages/neon_talk/lib/neon_talk.dart
diff --git a/...neon_talk/lib/src/blocs/message_bloc.dart → ...neon_talk/lib/src/blocs/message_bloc.dart b/...neon_talk/lib/src/blocs/message_bloc.dart → ...neon_talk/lib/src/blocs/message_bloc.dart
diff --git a/...es/neon/neon_talk/lib/src/blocs/room.dart → ...ackages/neon_talk/lib/src/blocs/room.dart b/...es/neon/neon_talk/lib/src/blocs/room.dart → ...ackages/neon_talk/lib/src/blocs/room.dart
diff --git a/...es/neon/neon_talk/lib/src/blocs/talk.dart → ...ackages/neon_talk/lib/src/blocs/talk.dart b/...es/neon/neon_talk/lib/src/blocs/talk.dart → ...ackages/neon_talk/lib/src/blocs/talk.dart
diff --git a/...eon_talk/lib/src/dialogs/create_room.dart → ...eon_talk/lib/src/dialogs/create_room.dart b/...eon_talk/lib/src/dialogs/create_room.dart → ...eon_talk/lib/src/dialogs/create_room.dart
diff --git a/packages/neon/neon_talk/lib/src/options.dart → ...p/packages/neon_talk/lib/src/options.dart b/packages/neon/neon_talk/lib/src/options.dart → ...p/packages/neon_talk/lib/src/options.dart
diff --git a/...es/neon/neon_talk/lib/src/pages/main.dart → ...ackages/neon_talk/lib/src/pages/main.dart b/...es/neon/neon_talk/lib/src/pages/main.dart → ...ackages/neon_talk/lib/src/pages/main.dart
diff --git a/...es/neon/neon_talk/lib/src/pages/room.dart → ...ackages/neon_talk/lib/src/pages/room.dart b/...es/neon/neon_talk/lib/src/pages/room.dart → ...ackages/neon_talk/lib/src/pages/room.dart
diff --git a/packages/neon/neon_talk/lib/src/routes.dart → ...pp/packages/neon_talk/lib/src/routes.dart b/packages/neon/neon_talk/lib/src/routes.dart → ...pp/packages/neon_talk/lib/src/routes.dart
diff --git a/...ages/neon/neon_talk/lib/src/routes.g.dart → .../packages/neon_talk/lib/src/routes.g.dart b/...ages/neon/neon_talk/lib/src/routes.g.dart → .../packages/neon_talk/lib/src/routes.g.dart
diff --git a/packages/neon/neon_talk/lib/src/theme.dart → ...app/packages/neon_talk/lib/src/theme.dart b/packages/neon/neon_talk/lib/src/theme.dart → ...app/packages/neon_talk/lib/src/theme.dart
diff --git a/...neon/neon_talk/lib/src/utils/helpers.dart → ...ages/neon_talk/lib/src/utils/helpers.dart b/...neon/neon_talk/lib/src/utils/helpers.dart → ...ages/neon_talk/lib/src/utils/helpers.dart
diff --git a/...on_talk/lib/src/widgets/actor_avatar.dart → ...on_talk/lib/src/widgets/actor_avatar.dart b/...on_talk/lib/src/widgets/actor_avatar.dart → ...on_talk/lib/src/widgets/actor_avatar.dart
diff --git a/...on/neon_talk/lib/src/widgets/message.dart → ...es/neon_talk/lib/src/widgets/message.dart b/...on/neon_talk/lib/src/widgets/message.dart → ...es/neon_talk/lib/src/widgets/message.dart
diff --git a/...n_talk/lib/src/widgets/message_input.dart → ...n_talk/lib/src/widgets/message_input.dart b/...n_talk/lib/src/widgets/message_input.dart → ...n_talk/lib/src/widgets/message_input.dart
diff --git a/.../neon_talk/lib/src/widgets/reactions.dart → .../neon_talk/lib/src/widgets/reactions.dart b/.../neon_talk/lib/src/widgets/reactions.dart → .../neon_talk/lib/src/widgets/reactions.dart
diff --git a/..._talk/lib/src/widgets/read_indicator.dart → ..._talk/lib/src/widgets/read_indicator.dart b/..._talk/lib/src/widgets/read_indicator.dart → ..._talk/lib/src/widgets/read_indicator.dart
diff --git a/...lk/lib/src/widgets/reference_preview.dart → ...lk/lib/src/widgets/reference_preview.dart b/...lk/lib/src/widgets/reference_preview.dart → ...lk/lib/src/widgets/reference_preview.dart
diff --git a/...ib/src/widgets/rich_object/deck_card.dart → ...ib/src/widgets/rich_object/deck_card.dart b/...ib/src/widgets/rich_object/deck_card.dart → ...ib/src/widgets/rich_object/deck_card.dart
diff --git a/...lib/src/widgets/rich_object/fallback.dart → ...lib/src/widgets/rich_object/fallback.dart b/...lib/src/widgets/rich_object/fallback.dart → ...lib/src/widgets/rich_object/fallback.dart
diff --git a/...alk/lib/src/widgets/rich_object/file.dart → ...alk/lib/src/widgets/rich_object/file.dart b/...alk/lib/src/widgets/rich_object/file.dart → ...alk/lib/src/widgets/rich_object/file.dart
diff --git a/...src/widgets/rich_object/file_preview.dart → ...src/widgets/rich_object/file_preview.dart b/...src/widgets/rich_object/file_preview.dart → ...src/widgets/rich_object/file_preview.dart
diff --git a/.../lib/src/widgets/rich_object/mention.dart → .../lib/src/widgets/rich_object/mention.dart b/.../lib/src/widgets/rich_object/mention.dart → .../lib/src/widgets/rich_object/mention.dart
diff --git a/...eon_talk/lib/src/widgets/room_avatar.dart → ...eon_talk/lib/src/widgets/room_avatar.dart b/...eon_talk/lib/src/widgets/room_avatar.dart → ...eon_talk/lib/src/widgets/room_avatar.dart
diff --git a/...alk/lib/src/widgets/unread_indicator.dart → ...alk/lib/src/widgets/unread_indicator.dart b/...alk/lib/src/widgets/unread_indicator.dart → ...alk/lib/src/widgets/unread_indicator.dart
diff --git a/packages/neon/neon_talk/pubspec.yaml → packages/app/packages/neon_talk/pubspec.yaml b/packages/neon/neon_talk/pubspec.yaml → packages/app/packages/neon_talk/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   file_icons:
     git:
       url: https://github.com/nextcloud/neon
-      path: packages/file_icons
+      path: packages/neon_framework/packages/file_icons
   flutter:
     sdk: flutter
   flutter_localizations:

diff --git a/packages/app/packages/neon_talk/pubspec_overrides.yaml b/packages/app/packages/neon_talk/pubspec_overrides.yaml
@@ -0,0 +1,18 @@
+# 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: ../../../neon_framework/packages/file_icons
+  neon_framework:
+    path: ../../../neon_framework
+  neon_http_client:
+    path: ../../../neon_framework/packages/neon_http_client
+  neon_lints:
+    path: ../../../neon_lints
+  nextcloud:
+    path: ../../../nextcloud
+  sort_box:
+    path: ../../../neon_framework/packages/sort_box
diff --git a/...eon/neon_talk/test/actor_avatar_test.dart → ...ges/neon_talk/test/actor_avatar_test.dart b/...eon/neon_talk/test/actor_avatar_test.dart → ...ges/neon_talk/test/actor_avatar_test.dart
diff --git a/packages/neon/neon_talk/test/bloc_test.dart → ...pp/packages/neon_talk/test/bloc_test.dart b/packages/neon/neon_talk/test/bloc_test.dart → ...pp/packages/neon_talk/test/bloc_test.dart
diff --git a/...on_talk/test/create_room_dialog_test.dart → ...on_talk/test/create_room_dialog_test.dart b/...on_talk/test/create_room_dialog_test.dart → ...on_talk/test/create_room_dialog_test.dart
diff --git a/...eon_talk/test/goldens/main_page_error.png → ...eon_talk/test/goldens/main_page_error.png b/...eon_talk/test/goldens/main_page_error.png → ...eon_talk/test/goldens/main_page_error.png
diff --git a/..._message_preview_with_unread_messages.png → ..._message_preview_with_unread_messages.png b/..._message_preview_with_unread_messages.png → ..._message_preview_with_unread_messages.png
diff --git a/...preview_without_unread_messages_other.png → ...preview_without_unread_messages_other.png b/...preview_without_unread_messages_other.png → ...preview_without_unread_messages_other.png
diff --git a/..._preview_without_unread_messages_self.png → ..._preview_without_unread_messages_self.png b/..._preview_without_unread_messages_self.png → ..._preview_without_unread_messages_self.png
diff --git a/...ens/main_page_without_message_preview.png → ...ens/main_page_without_message_preview.png b/...ens/main_page_without_message_preview.png → ...ens/main_page_without_message_preview.png
diff --git a/...ens/message_comment_message_as_parent.png → ...ens/message_comment_message_as_parent.png b/...ens/message_comment_message_as_parent.png → ...ens/message_comment_message_as_parent.png
diff --git a/...ldens/message_comment_message_deleted.png → ...ldens/message_comment_message_deleted.png b/...ldens/message_comment_message_deleted.png → ...ldens/message_comment_message_deleted.png
diff --git a/...goldens/message_comment_message_other.png → ...goldens/message_comment_message_other.png b/...goldens/message_comment_message_other.png → ...goldens/message_comment_message_other.png
diff --git a/.../goldens/message_comment_message_self.png → .../goldens/message_comment_message_self.png b/.../goldens/message_comment_message_self.png → .../goldens/message_comment_message_self.png
diff --git a/...essage_comment_message_separate_actor.png → ...essage_comment_message_separate_actor.png b/...essage_comment_message_separate_actor.png → ...essage_comment_message_separate_actor.png
diff --git a/...ssage_comment_message_separate_edited.png → ...ssage_comment_message_separate_edited.png b/...ssage_comment_message_separate_edited.png → ...ssage_comment_message_separate_edited.png
diff --git a/...mment_message_separate_system_message.png → ...mment_message_separate_system_message.png b/...mment_message_separate_system_message.png → ...mment_message_separate_system_message.png
diff --git a/...message_comment_message_separate_time.png → ...message_comment_message_separate_time.png b/...message_comment_message_separate_time.png → ...message_comment_message_separate_time.png
diff --git a/...s/message_comment_message_with_parent.png → ...s/message_comment_message_with_parent.png b/...s/message_comment_message_with_parent.png → ...s/message_comment_message_with_parent.png
diff --git a/...ssage_comment_message_with_references.png → ...ssage_comment_message_with_references.png b/...ssage_comment_message_with_references.png → ...ssage_comment_message_with_references.png
diff --git a/..._talk/test/goldens/message_input_edit.png → ..._talk/test/goldens/message_input_edit.png b/..._talk/test/goldens/message_input_edit.png → ..._talk/test/goldens/message_input_edit.png
diff --git a/...talk/test/goldens/message_input_emoji.png → ...talk/test/goldens/message_input_emoji.png b/...talk/test/goldens/message_input_emoji.png → ...talk/test/goldens/message_input_emoji.png
diff --git a/...ens/message_input_mention_suggestions.png → ...ens/message_input_mention_suggestions.png b/...ens/message_input_mention_suggestions.png → ...ens/message_input_mention_suggestions.png
diff --git a/.../test/goldens/message_input_multiline.png → .../test/goldens/message_input_multiline.png b/.../test/goldens/message_input_multiline.png → .../test/goldens/message_input_multiline.png
diff --git a/...goldens/message_input_no_emoji_button.png → ...goldens/message_input_no_emoji_button.png b/...goldens/message_input_no_emoji_button.png → ...goldens/message_input_no_emoji_button.png
diff --git a/...talk/test/goldens/message_input_reply.png → ...talk/test/goldens/message_input_reply.png b/...talk/test/goldens/message_input_reply.png → ...talk/test/goldens/message_input_reply.png
diff --git a/...k/test/goldens/message_parent_message.png → ...k/test/goldens/message_parent_message.png b/...k/test/goldens/message_parent_message.png → ...k/test/goldens/message_parent_message.png
diff --git a/...ldens/message_system_message_grouping.png → ...ldens/message_system_message_grouping.png b/...ldens/message_system_message_grouping.png → ...ldens/message_system_message_grouping.png
diff --git a/...t/goldens/message_system_message_show.png → ...t/goldens/message_system_message_show.png b/...t/goldens/message_system_message_show.png → ...t/goldens/message_system_message_show.png
diff --git a/...neon/neon_talk/test/goldens/reactions.png → ...ages/neon_talk/test/goldens/reactions.png b/...neon/neon_talk/test/goldens/reactions.png → ...ages/neon_talk/test/goldens/reactions.png
diff --git a/...n_talk/test/goldens/reference_preview.png → ...n_talk/test/goldens/reference_preview.png b/...n_talk/test/goldens/reference_preview.png → ...n_talk/test/goldens/reference_preview.png
diff --git a/...ns/reference_preview_with_description.png → ...ns/reference_preview_with_description.png b/...ns/reference_preview_with_description.png → ...ns/reference_preview_with_description.png
diff --git a/.../goldens/reference_preview_with_thumb.png → .../goldens/reference_preview_with_thumb.png b/.../goldens/reference_preview_with_thumb.png → .../goldens/reference_preview_with_thumb.png
diff --git a/...lk/test/goldens/rich_object_deck_card.png → ...lk/test/goldens/rich_object_deck_card.png b/...lk/test/goldens/rich_object_deck_card.png → ...lk/test/goldens/rich_object_deck_card.png
diff --git a/...oldens/rich_object_fallback_with_icon.png → ...oldens/rich_object_fallback_with_icon.png b/...oldens/rich_object_fallback_with_icon.png → ...oldens/rich_object_fallback_with_icon.png
diff --git a/...ens/rich_object_fallback_without_icon.png → ...ens/rich_object_fallback_without_icon.png b/...ens/rich_object_fallback_without_icon.png → ...ens/rich_object_fallback_without_icon.png
diff --git a/...dens/rich_object_file_without_preview.png → ...dens/rich_object_file_without_preview.png b/...dens/rich_object_file_without_preview.png → ...dens/rich_object_file_without_preview.png
diff --git a/...test/goldens/rich_object_mention_call.png → ...test/goldens/rich_object_mention_call.png b/...test/goldens/rich_object_mention_call.png → ...test/goldens/rich_object_mention_call.png
diff --git a/...s/rich_object_mention_group_highlight.png → ...s/rich_object_mention_group_highlight.png b/...s/rich_object_mention_group_highlight.png → ...s/rich_object_mention_group_highlight.png
diff --git a/...ldens/rich_object_mention_group_other.png → ...ldens/rich_object_mention_group_other.png b/...ldens/rich_object_mention_group_other.png → ...ldens/rich_object_mention_group_other.png
diff --git a/...est/goldens/rich_object_mention_guest.png → ...est/goldens/rich_object_mention_guest.png b/...est/goldens/rich_object_mention_guest.png → ...est/goldens/rich_object_mention_guest.png
diff --git a/...h_object_mention_user-group_highlight.png → ...h_object_mention_user-group_highlight.png b/...h_object_mention_user-group_highlight.png → ...h_object_mention_user-group_highlight.png
diff --git a/.../rich_object_mention_user-group_other.png → .../rich_object_mention_user-group_other.png b/.../rich_object_mention_user-group_other.png → .../rich_object_mention_user-group_other.png
diff --git a/...ns/rich_object_mention_user_highlight.png → ...ns/rich_object_mention_user_highlight.png b/...ns/rich_object_mention_user_highlight.png → ...ns/rich_object_mention_user_highlight.png
diff --git a/...oldens/rich_object_mention_user_other.png → ...oldens/rich_object_mention_user_other.png b/...oldens/rich_object_mention_user_other.png → ...oldens/rich_object_mention_user_other.png
diff --git a/...eon_talk/test/goldens/room_page_error.png → ...eon_talk/test/goldens/room_page_error.png b/...eon_talk/test/goldens/room_page_error.png → ...eon_talk/test/goldens/room_page_error.png
diff --git a/..._talk/test/goldens/room_page_messages.png → ..._talk/test/goldens/room_page_messages.png b/..._talk/test/goldens/room_page_messages.png → ..._talk/test/goldens/room_page_messages.png
diff --git a/...talk/test/goldens/room_page_read_only.png → ...talk/test/goldens/room_page_read_only.png b/...talk/test/goldens/room_page_read_only.png → ...talk/test/goldens/room_page_read_only.png
diff --git a/...ldens/unread_indicator_unread_mention.png → ...ldens/unread_indicator_unread_mention.png b/...ldens/unread_indicator_unread_mention.png → ...ldens/unread_indicator_unread_mention.png
diff --git a/...nread_indicator_unread_mention_direct.png → ...nread_indicator_unread_mention_direct.png b/...nread_indicator_unread_mention_direct.png → ...nread_indicator_unread_mention_direct.png
diff --git a/...dens/unread_indicator_unread_messages.png → ...dens/unread_indicator_unread_messages.png b/...dens/unread_indicator_unread_messages.png → ...dens/unread_indicator_unread_messages.png
diff --git a/...indicator_unread_single_user_messages.png → ...indicator_unread_single_user_messages.png b/...indicator_unread_single_user_messages.png → ...indicator_unread_single_user_messages.png
diff --git a/...s/neon/neon_talk/test/main_page_test.dart → ...ckages/neon_talk/test/main_page_test.dart b/...s/neon/neon_talk/test/main_page_test.dart → ...ckages/neon_talk/test/main_page_test.dart
diff --git a/...eon/neon_talk/test/message_bloc_test.dart → ...ges/neon_talk/test/message_bloc_test.dart b/...eon/neon_talk/test/message_bloc_test.dart → ...ges/neon_talk/test/message_bloc_test.dart
diff --git a/...on/neon_talk/test/message_input_test.dart → ...es/neon_talk/test/message_input_test.dart b/...on/neon_talk/test/message_input_test.dart → ...es/neon_talk/test/message_input_test.dart
diff --git a/...ges/neon/neon_talk/test/message_test.dart → ...packages/neon_talk/test/message_test.dart b/...ges/neon/neon_talk/test/message_test.dart → ...packages/neon_talk/test/message_test.dart
diff --git a/...s/neon/neon_talk/test/reactions_test.dart → ...ckages/neon_talk/test/reactions_test.dart b/...s/neon/neon_talk/test/reactions_test.dart → ...ckages/neon_talk/test/reactions_test.dart
diff --git a/...n/neon_talk/test/read_indicator_test.dart → ...s/neon_talk/test/read_indicator_test.dart b/...n/neon_talk/test/read_indicator_test.dart → ...s/neon_talk/test/read_indicator_test.dart
diff --git a/...eon_talk/test/reference_preview_test.dart → ...eon_talk/test/reference_preview_test.dart b/...eon_talk/test/reference_preview_test.dart → ...eon_talk/test/reference_preview_test.dart
diff --git a/...neon/neon_talk/test/rich_object_test.dart → ...ages/neon_talk/test/rich_object_test.dart b/...neon/neon_talk/test/rich_object_test.dart → ...ages/neon_talk/test/rich_object_test.dart
diff --git a/...neon/neon_talk/test/room_avatar_test.dart → ...ages/neon_talk/test/room_avatar_test.dart b/...neon/neon_talk/test/room_avatar_test.dart → ...ages/neon_talk/test/room_avatar_test.dart
diff --git a/...s/neon/neon_talk/test/room_bloc_test.dart → ...ckages/neon_talk/test/room_bloc_test.dart b/...s/neon/neon_talk/test/room_bloc_test.dart → ...ckages/neon_talk/test/room_bloc_test.dart
diff --git a/...s/neon/neon_talk/test/room_page_test.dart → ...ckages/neon_talk/test/room_page_test.dart b/...s/neon/neon_talk/test/room_page_test.dart → ...ckages/neon_talk/test/room_page_test.dart
diff --git a/packages/neon/neon_talk/test/testing.dart → .../app/packages/neon_talk/test/testing.dart b/packages/neon/neon_talk/test/testing.dart → .../app/packages/neon_talk/test/testing.dart
diff --git a/...neon_talk/test/unread_indicator_test.dart → ...neon_talk/test/unread_indicator_test.dart b/...neon_talk/test/unread_indicator_test.dart → ...neon_talk/test/unread_indicator_test.dart
diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock
@@ -354,7 +354,7 @@ packages:
   file_icons:
     dependency: "direct overridden"
     description:
-      path: "../file_icons"
+      path: "../neon_framework/packages/file_icons"
       relative: true
     source: path
     version: "1.0.0"
@@ -829,14 +829,14 @@ packages:
   neon_dashboard:
     dependency: "direct main"
     description:
-      path: "../neon/neon_dashboard"
+      path: "packages/neon_dashboard"
       relative: true
     source: path
     version: "1.0.0"
   neon_files:
     dependency: "direct main"
     description:
-      path: "../neon/neon_files"
+      path: "packages/neon_files"
       relative: true
     source: path
     version: "1.0.0"
@@ -850,7 +850,7 @@ packages:
   neon_http_client:
     dependency: "direct overridden"
     description:
-      path: "../neon_http_client"
+      path: "../neon_framework/packages/neon_http_client"
       relative: true
     source: path
     version: "0.1.0"
@@ -864,28 +864,28 @@ packages:
   neon_news:
     dependency: "direct main"
     description:
-      path: "../neon/neon_news"
+      path: "packages/neon_news"
       relative: true
     source: path
     version: "1.0.0"
   neon_notes:
     dependency: "direct main"
     description:
-      path: "../neon/neon_notes"
+      path: "packages/neon_notes"
       relative: true
     source: path
     version: "1.0.0"
   neon_notifications:
     dependency: "direct main"
     description:
-      path: "../neon/neon_notifications"
+      path: "packages/neon_notifications"
       relative: true
     source: path
     version: "1.0.0"
   neon_talk:
     dependency: "direct main"
     description:
-      path: "../neon/neon_talk"
+      path: "packages/neon_talk"
       relative: true
     source: path
     version: "1.0.0"
@@ -1304,7 +1304,7 @@ packages:
   sort_box:
     dependency: "direct overridden"
     description:
-      path: "../sort_box"
+      path: "../neon_framework/packages/sort_box"
       relative: true
     source: path
     version: "1.0.0"

diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml
@@ -13,31 +13,31 @@ dependencies:
   neon_dashboard:
     git:
       url: https://github.com/nextcloud/neon
-      path: packages/neon/neon_dashboard
+      path: packages/apps/packages/neon_dashboard
   neon_files:
     git:
       url: https://github.com/nextcloud/neon
-      path: packages/neon/neon_files
+      path: packages/apps/packages/neon_files
   neon_framework:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework
   neon_news:
     git:
       url: https://github.com/nextcloud/neon
-      path: packages/neon/neon_news
+      path: packages/apps/packages/neon_news
   neon_notes:
     git:
       url: https://github.com/nextcloud/neon
-      path: packages/neon/neon_notes
+      path: packages/apps/packages/neon_notes
   neon_notifications:
     git:
       url: https://github.com/nextcloud/neon
-      path: packages/neon/neon_notifications
+      path: packages/apps/packages/neon_notifications
   neon_talk:
     git:
       url: https://github.com/nextcloud/neon
-      path: packages/neon/neon_talk
+      path: packages/apps/packages/neon_talk
   vector_graphics: any
 
 dev_dependencies:

diff --git a/packages/app/pubspec_overrides.yaml b/packages/app/pubspec_overrides.yaml
@@ -5,26 +5,26 @@ dependency_overrides:
   dynamite_runtime:
     path: ../dynamite/dynamite_runtime
   file_icons:
-    path: ../file_icons
+    path: ../neon_framework/packages/file_icons
   neon_dashboard:
-    path: ../neon/neon_dashboard
+    path: packages/neon_dashboard
   neon_files:
-    path: ../neon/neon_files
+    path: packages/neon_files
   neon_framework:
     path: ../neon_framework
   neon_http_client:
-    path: ../neon_http_client
+    path: ../neon_framework/packages/neon_http_client
   neon_lints:
     path: ../neon_lints
   neon_news:
-    path: ../neon/neon_news
+    path: packages/neon_news
   neon_notes:
-    path: ../neon/neon_notes
+    path: packages/neon_notes
   neon_notifications:
-    path: ../neon/neon_notifications
+    path: packages/neon_notifications
   neon_talk:
-    path: ../neon/neon_talk
+    path: packages/neon_talk
   nextcloud:
     path: ../nextcloud
   sort_box:
-    path: ../sort_box
+    path: ../neon_framework/packages/sort_box
diff --git a/packages/file_icons/LICENSE b/packages/file_icons/LICENSE
diff --git a/packages/neon/neon_dashboard/LICENSE b/packages/neon/neon_dashboard/LICENSE
diff --git a/packages/neon/neon_dashboard/pubspec_overrides.yaml b/packages/neon/neon_dashboard/pubspec_overrides.yaml
diff --git a/packages/neon/neon_files/LICENSE b/packages/neon/neon_files/LICENSE
diff --git a/packages/neon/neon_files/pubspec_overrides.yaml b/packages/neon/neon_files/pubspec_overrides.yaml
diff --git a/packages/neon/neon_news/LICENSE b/packages/neon/neon_news/LICENSE
diff --git a/packages/neon/neon_news/pubspec_overrides.yaml b/packages/neon/neon_news/pubspec_overrides.yaml
diff --git a/packages/neon/neon_notes/LICENSE b/packages/neon/neon_notes/LICENSE
diff --git a/packages/neon/neon_notes/pubspec_overrides.yaml b/packages/neon/neon_notes/pubspec_overrides.yaml
diff --git a/packages/neon/neon_notifications/LICENSE b/packages/neon/neon_notifications/LICENSE