diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/app_dashboard.png b/packages/app/android/app/src/main/res/mipmap-hdpi/app_dashboard.png new file mode 100644 index 00000000..51ff0c82 Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-hdpi/app_dashboard.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/app_dashboard.png b/packages/app/android/app/src/main/res/mipmap-mdpi/app_dashboard.png new file mode 100644 index 00000000..4e66caa4 Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-mdpi/app_dashboard.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/app_dashboard.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/app_dashboard.png new file mode 100644 index 00000000..3ff01a37 Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-xhdpi/app_dashboard.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_dashboard.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_dashboard.png new file mode 100644 index 00000000..46cefe49 Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_dashboard.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_dashboard.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_dashboard.png new file mode 100644 index 00000000..607be58e Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_dashboard.png differ diff --git a/packages/app/lib/apps.dart b/packages/app/lib/apps.dart index ad1a2723..20731e47 100644 --- a/packages/app/lib/apps.dart +++ b/packages/app/lib/apps.dart @@ -1,4 +1,5 @@ import 'package:neon/models.dart'; +import 'package:neon_dashboard/neon_dashboard.dart'; import 'package:neon_files/neon_files.dart'; import 'package:neon_news/neon_news.dart'; import 'package:neon_notes/neon_notes.dart'; @@ -6,6 +7,7 @@ import 'package:neon_notifications/neon_notifications.dart'; /// The collection of clients enabled for the Neon app. final Set appImplementations = { + DashboardApp(), FilesApp(), NewsApp(), NotesApp(), diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock index 75980fe1..32e0e216 100644 --- a/packages/app/pubspec.lock +++ b/packages/app/pubspec.lock @@ -649,6 +649,13 @@ packages: relative: true source: path version: "1.0.0" + neon_dashboard: + dependency: "direct main" + description: + path: "../neon/neon_dashboard" + relative: true + source: path + version: "1.0.0" neon_files: dependency: "direct main" description: diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml index 9c63b44a..0f014f51 100644 --- a/packages/app/pubspec.yaml +++ b/packages/app/pubspec.yaml @@ -13,6 +13,10 @@ dependencies: git: url: https://github.com/nextcloud/neon path: packages/neon/neon + neon_dashboard: + git: + url: https://github.com/nextcloud/neon + path: packages/neon/neon_dashboard neon_files: git: url: https://github.com/nextcloud/neon diff --git a/packages/app/pubspec_overrides.yaml b/packages/app/pubspec_overrides.yaml index 7bd861e4..e896bfc2 100644 --- a/packages/app/pubspec_overrides.yaml +++ b/packages/app/pubspec_overrides.yaml @@ -1,4 +1,4 @@ -# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,neon_files,neon_news,neon_notes,neon_notifications,nextcloud,sort_box,neon_lints +# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,neon_files,neon_news,neon_notes,neon_notifications,nextcloud,sort_box,neon_lints,neon_dashboard dependency_overrides: dynamite_runtime: path: ../dynamite/dynamite_runtime @@ -6,6 +6,8 @@ dependency_overrides: path: ../file_icons neon: path: ../neon/neon + neon_dashboard: + path: ../neon/neon_dashboard neon_files: path: ../neon/neon_files neon_lints: diff --git a/packages/neon/neon/lib/l10n/en.arb b/packages/neon/neon/lib/l10n/en.arb index d7aa46cd..53515aa9 100644 --- a/packages/neon/neon/lib/l10n/en.arb +++ b/packages/neon/neon/lib/l10n/en.arb @@ -2,7 +2,7 @@ "@@locale": "en", "nextcloud": "Nextcloud", "nextcloudLogo": "Nextcloud logo", - "appImplementationName": "{app, select, nextcloud{Nextcloud} core{Server} files{Files} news{News} notes{Notes} notifications{Notifications} other{}}", + "appImplementationName": "{app, select, nextcloud{Nextcloud} core{Server} dashboard{Dashboard} files{Files} news{News} notes{Notes} notifications{Notifications} other{}}", "@appImplementationName": { "placeholders": { "app": {} diff --git a/packages/neon/neon/lib/l10n/localizations.dart b/packages/neon/neon/lib/l10n/localizations.dart index d7f12d81..ce9f982a 100644 --- a/packages/neon/neon/lib/l10n/localizations.dart +++ b/packages/neon/neon/lib/l10n/localizations.dart @@ -104,7 +104,7 @@ abstract class NeonLocalizations { /// No description provided for @appImplementationName. /// /// In en, this message translates to: - /// **'{app, select, nextcloud{Nextcloud} core{Server} files{Files} news{News} notes{Notes} notifications{Notifications} other{}}'** + /// **'{app, select, nextcloud{Nextcloud} core{Server} dashboard{Dashboard} files{Files} news{News} notes{Notes} notifications{Notifications} other{}}'** String appImplementationName(String app); /// No description provided for @loginAgain. diff --git a/packages/neon/neon/lib/l10n/localizations_en.dart b/packages/neon/neon/lib/l10n/localizations_en.dart index c26c2ddf..e1aba5d6 100644 --- a/packages/neon/neon/lib/l10n/localizations_en.dart +++ b/packages/neon/neon/lib/l10n/localizations_en.dart @@ -19,6 +19,7 @@ class NeonLocalizationsEn extends NeonLocalizations { { 'nextcloud': 'Nextcloud', 'core': 'Server', + 'dashboard': 'Dashboard', 'files': 'Files', 'news': 'News', 'notes': 'Notes', diff --git a/tool/generate-assets.sh b/tool/generate-assets.sh index 07d72075..0d910fe4 100755 --- a/tool/generate-assets.sh +++ b/tool/generate-assets.sh @@ -68,6 +68,7 @@ done precompile_assets ) +copy_app_svg dashboard external/nextcloud-server/apps/dashboard copy_app_svg files external/nextcloud-server/apps/files copy_app_svg news external/nextcloud-news copy_app_svg notes external/nextcloud-notes