refactor: change package file structure

.github/renovate.json

@@ -30,7 +30,7 @@
       ],
       "matchCurrentVersion": "!/^0/",
       "matchDepNames": [
-        "!app",
+        "!example",
         "!dynamite_end_to_end_test",
         "!dynamite_petstore_example",
         "!neon_lints",

.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

.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

.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",

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.
 

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
 

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

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",

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