refactor: rename neon app packages to reflect their folders

Signed-off-by: Nikolas Rimikis <leptopoda@users.noreply.github.com>
nextcloud · Aug 14, 2024 · e5447fb · e5447fb
1 parent 42823d4
commit e5447fb
Show file tree

Hide file tree

Showing 109 changed files with 414 additions and 415 deletions.
diff --git a/commitlint.yaml b/commitlint.yaml
@@ -16,17 +16,17 @@ rules:
       - dynamite_end_to_end_test
       - dynamite_runtime
       - file_icons
+      - files_app
       - neon_dashboard
-      - neon_files
       - 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/packages/neon_framework/example/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<AppImplementation> appImplementations = BuiltSet({

diff --git a/packages/neon_framework/example/pubspec.lock b/packages/neon_framework/example/pubspec.lock
@@ -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:
@@ -363,6 +370,13 @@ 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"
   filesize:
     dependency: transitive
     description:
@@ -783,20 +797,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
-  neon_dashboard:
-    dependency: "direct main"
-    description:
-      path: "../packages/dashboard_app"
-      relative: true
-    source: path
-    version: "1.0.0"
-  neon_files:
-    dependency: "direct main"
-    description:
-      path: "../packages/files_app"
-      relative: true
-    source: path
-    version: "1.0.0"
   neon_framework:
     dependency: "direct main"
     description:
@@ -818,49 +818,42 @@ packages:
       relative: true
     source: path
     version: "1.0.0"
-  neon_news:
+  nested:
+    dependency: transitive
+    description:
+      name: nested
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  news_app:
     dependency: "direct main"
     description:
       path: "../packages/news_app"
       relative: true
     source: path
     version: "1.0.0"
-  neon_notes:
-    dependency: "direct main"
+  nextcloud:
+    dependency: "direct overridden"
     description:
-      path: "../packages/notes_app"
+      path: "../../nextcloud"
       relative: true
     source: path
-    version: "1.0.0"
-  neon_notifications:
+    version: "7.0.0"
+  notes_app:
     dependency: "direct main"
     description:
-      path: "../packages/notifications_app"
+      path: "../packages/notes_app"
       relative: true
     source: path
     version: "1.0.0"
-  neon_talk:
+  notifications_app:
     dependency: "direct main"
     description:
-      path: "../packages/talk_app"
+      path: "../packages/notifications_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"
-    description:
-      path: "../../nextcloud"
-      relative: true
-    source: path
-    version: "7.0.0"
   open_filex:
     dependency: transitive
     description:
@@ -1361,6 +1354,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.0"
+  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/neon_framework/example/pubspec.yaml b/packages/neon_framework/example/pubspec.yaml
@@ -8,33 +8,33 @@ environment:
 
 dependencies:
   built_collection: ^5.0.0
-  flutter:
-    sdk: flutter
-  neon_dashboard:
+  dashboard_app:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework/packages/dashboard_app
-  neon_files:
+  files_app:
     git:
       url: https://github.com/nextcloud/neon
       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_framework/packages/news_app
-  neon_notes:
+  notes_app:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework/packages/notes_app
-  neon_notifications:
+  notifications_app:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework/packages/notifications_app
-  neon_talk:
+  talk_app:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework/packages/talk_app

diff --git a/packages/neon_framework/example/pubspec_overrides.yaml b/packages/neon_framework/example/pubspec_overrides.yaml
@@ -1,30 +1,30 @@
-# 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
+# melos_managed_dependency_overrides: cookie_store,dashboard_app,dynamite_runtime,file_icons,files_app,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
   file_icons:
     path: ../packages/file_icons
-  neon_dashboard:
-    path: ../packages/dashboard_app
-  neon_files:
+  files_app:
     path: ../packages/files_app
   neon_framework:
     path: ..
   neon_http_client:
     path: ../packages/neon_http_client
   neon_lints:
     path: ../../neon_lints
-  neon_news:
+  news_app:
     path: ../packages/news_app
-  neon_notes:
-    path: ../packages/notes_app
-  neon_notifications:
-    path: ../packages/notifications_app
-  neon_talk:
-    path: ../packages/talk_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/neon_framework/lib/l10n/localizations.dart b/packages/neon_framework/lib/l10n/localizations.dart
@@ -89,7 +89,9 @@ abstract class NeonLocalizations {
   ];
 
   /// A list of this localizations delegate's supported locales.
-  static const List<Locale> supportedLocales = <Locale>[Locale('en')];
+  static const List<Locale> supportedLocales = <Locale>[
+    Locale('en')
+  ];
 
   /// No description provided for @nextcloud.
   ///
@@ -888,14 +890,17 @@ class _NeonLocalizationsDelegate extends LocalizationsDelegate<NeonLocalizations
 }
 
 NeonLocalizations lookupNeonLocalizations(Locale locale) {
+
+
   // Lookup logic when only language code is specified.
   switch (locale.languageCode) {
-    case 'en':
-      return NeonLocalizationsEn();
+    case 'en': return NeonLocalizationsEn();
   }
 
-  throw FlutterError('NeonLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
-      'an issue with the localizations generation tool. Please file an issue '
-      'on GitHub with a reproducible sample app and the gen-l10n configuration '
-      'that was used.');
+  throw FlutterError(
+    'NeonLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
+    'an issue with the localizations generation tool. Please file an issue '
+    'on GitHub with a reproducible sample app and the gen-l10n configuration '
+    'that was used.'
+  );
 }
diff --git a/packages/neon_framework/lib/l10n/localizations_en.dart b/packages/neon_framework/lib/l10n/localizations_en.dart
@@ -83,8 +83,7 @@ class NeonLocalizationsEn extends NeonLocalizations {
   String get errorBruteforceThrottled => 'Your requests are throttled at the moment due to brute force protection';
 
   @override
-  String get errorServerHadAProblemProcessingYourRequest =>
-      'The server had a problem while processing your request. You might want to try again';
+  String get errorServerHadAProblemProcessingYourRequest => 'The server had a problem while processing your request. You might want to try again';
 
   @override
   String get errorSomethingWentWrongTryAgainLater => 'Something went wrong. Please try again later';
@@ -101,12 +100,10 @@ class NeonLocalizationsEn extends NeonLocalizations {
   String get errorConnectionTimedOut => 'Connection has timed out';
 
   @override
-  String get errorNoCompatibleNextcloudAppsFound =>
-      'No compatible Nextcloud apps could be found.\nWe are working hard to implement more and more apps!';
+  String get errorNoCompatibleNextcloudAppsFound => 'No compatible Nextcloud apps could be found.\nWe are working hard to implement more and more apps!';
 
   @override
-  String get errorServerInMaintenanceMode =>
-      'The server is in maintenance mode. Please try again later or contact the server admin.';
+  String get errorServerInMaintenanceMode => 'The server is in maintenance mode. Please try again later or contact the server admin.';
 
   @override
   String errorMissingPermission(String name) {
@@ -169,8 +166,7 @@ class NeonLocalizationsEn extends NeonLocalizations {
   String get nextPushSupported => 'NextPush is supported!';
 
   @override
-  String get nextPushSupportedText =>
-      'NextPush is a FOSS way of receiving push notifications using the UnifiedPush protocol via a Nextcloud instance.\nYou can install NextPush from the F-Droid app store.';
+  String get nextPushSupportedText => 'NextPush is a FOSS way of receiving push notifications using the UnifiedPush protocol via a Nextcloud instance.\nYou can install NextPush from the F-Droid app store.';
 
   @override
   String get nextPushSupportedInstall => 'Install NextPush';
@@ -225,8 +221,7 @@ class NeonLocalizationsEn extends NeonLocalizations {
   String get settingsResetForExplanation => 'This will reset your account preferences back to their default settings.';
 
   @override
-  String get settingsResetForClientExplanation =>
-      'This will reset all preferences for the app back to their default settings.';
+  String get settingsResetForClientExplanation => 'This will reset all preferences for the app back to their default settings.';
 
   @override
   String settingsResetForConfirmation(String name) {
@@ -285,8 +280,7 @@ class NeonLocalizationsEn extends NeonLocalizations {
   String get globalOptionsPushNotificationsEnabled => 'Enabled';
 
   @override
-  String get globalOptionsPushNotificationsEnabledDisabledNotice =>
-      'No UnifiedPush distributor could be found or you denied the permission for showing notifications. Please go to the app settings and allow notifications and go to https://unifiedpush.org/users/distributors and setup any of the listed distributors. Then re-open this app and you should be able to enable notifications';
+  String get globalOptionsPushNotificationsEnabledDisabledNotice => 'No UnifiedPush distributor could be found or you denied the permission for showing notifications. Please go to the app settings and allow notifications and go to https://unifiedpush.org/users/distributors and setup any of the listed distributors. Then re-open this app and you should be able to enable notifications';
 
   @override
   String get globalOptionsPushNotificationsDistributor => 'UnifiedPush Distributor';

diff --git a/...ges/dashboard_app/lib/neon_dashboard.dart → ...ages/dashboard_app/lib/dashboard_app.dart b/...ges/dashboard_app/lib/neon_dashboard.dart → ...ages/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_framework/packages/dashboard_app/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_framework/packages/dashboard_app/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;