Skip to content

Commit 9e9d3a2

Browse files
Leptopodaprovokateurin
authored andcommitted
refactor: change package file structure
Signed-off-by: Nikolas Rimikis <leptopoda@users.noreply.github.com> Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent 636c2c1 commit 9e9d3a2

File tree

779 files changed

+671
-655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

779 files changed

+671
-655
lines changed

.github/workflows/publish.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030
run: ./tool/setup.sh
3131

3232
- name: Build
33-
run: cd packages/app && fvm flutter build apk --split-per-abi --build-number="$(date +"%s")"
33+
run: cd packages/neon_framework/example && fvm flutter build apk --split-per-abi --build-number="$(date +"%s")"
3434
- uses: ilharp/sign-android-release@2034987c31e3959f7c97e88d5e656e52e6e88bd8 # v1
3535
name: Sign
3636
with:
37-
releaseDir: packages/app/build/app/outputs/flutter-apk
37+
releaseDir: packages/neon_framework/example/build/app/outputs/flutter-apk
3838
signingKey: ${{ secrets.SIGNING_KEY }}
3939
keyAlias: ${{ secrets.ALIAS }}
4040
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -43,24 +43,24 @@ jobs:
4343
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
4444
with:
4545
name: Android arm64-v8a
46-
path: packages/app/build/app/outputs/flutter-apk/app-arm64-v8a-release-signed.apk
46+
path: packages/neon_framework/example/build/app/outputs/flutter-apk/app-arm64-v8a-release-signed.apk
4747
if-no-files-found: error
4848
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
4949
with:
5050
name: Android armeabi-v7a
51-
path: packages/app/build/app/outputs/flutter-apk/app-armeabi-v7a-release-signed.apk
51+
path: packages/neon_framework/example/build/app/outputs/flutter-apk/app-armeabi-v7a-release-signed.apk
5252
if-no-files-found: error
5353
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
5454
with:
5555
name: Android x86_64
56-
path: packages/app/build/app/outputs/flutter-apk/app-x86_64-release-signed.apk
56+
path: packages/neon_framework/example/build/app/outputs/flutter-apk/app-x86_64-release-signed.apk
5757
if-no-files-found: error
5858

5959
- name: F-Droid nightly
6060
run: |
61-
cp packages/app/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk app-arm64-v8a-debug.apk
62-
cp packages/app/build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk app-armeabi-v7a-debug.apk
63-
cp packages/app/build/app/outputs/flutter-apk/app-x86_64-release.apk app-x86_64-debug.apk
61+
cp packages/neon_framework/example/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk app-arm64-v8a-debug.apk
62+
cp packages/neon_framework/example/build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk app-armeabi-v7a-debug.apk
63+
cp packages/neon_framework/example/build/app/outputs/flutter-apk/app-x86_64-release.apk app-x86_64-debug.apk
6464
6565
sudo add-apt-repository ppa:fdroid/fdroidserver
6666
sudo apt-get update
@@ -113,5 +113,5 @@ jobs:
113113
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
114114
with:
115115
name: Linux ${{ matrix.architecture.flutter }}
116-
path: packages/app/build/linux/${{ matrix.architecture.flutter }}/release/bundle/*
116+
path: packages/neon_framework/example/build/linux/${{ matrix.architecture.flutter }}/release/bundle/*
117117
if-no-files-found: error

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ packages/**/build-dir
1313
packages/**/.flatpak-builder
1414
packages/**/doc/api
1515

16-
!packages/app/pubspec.lock
16+
!packages/neon_framework/example/pubspec.lock
1717

1818
# Melos recommends adding them, but renovate does not generate them which would end up with broken lockfiles
1919
# **/pubspec_overrides.yaml

.idea/runConfigurations/Debug.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Release.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.vscode/launch.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"configurations": [
44
{
55
"name": "app",
6-
"cwd": "packages/app",
6+
"cwd": "packages/neon_framework/example",
77
"request": "launch",
88
"type": "dart",
99
"args": [
@@ -13,7 +13,7 @@
1313
},
1414
{
1515
"name": "app (profile mode)",
16-
"cwd": "packages/app",
16+
"cwd": "packages/neon_framework/example",
1717
"request": "launch",
1818
"type": "dart",
1919
"flutterMode": "profile",
@@ -24,7 +24,7 @@
2424
},
2525
{
2626
"name": "app (release mode)",
27-
"cwd": "packages/app",
27+
"cwd": "packages/neon_framework/example",
2828
"request": "launch",
2929
"type": "dart",
3030
"flutterMode": "release",

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ All commits need to be signed and signed off to pass our tests.
3535
To sign off your commits use `git commit --signoff`.
3636
To setup commit signing please consult the [Github documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).
3737
We use conventional commits to have meaningful commit messages and be able to generate changelogs.
38-
A non-breaking feature contribution to `neon_notes` could look like this:
38+
A non-breaking feature contribution to `notes_app` could look like this:
3939
```bash
40-
git commit -m "feat(neon_notes): Add a super cool feature."
40+
git commit -m "feat(notes_app): Add a super cool feature."
4141
```
4242
You can read the full documentation at https://www.conventionalcommits.org.
4343

README.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Please make sure to read them before starting to contribute.
1818
The Neon project has three main goals:
1919

2020
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.
21-
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.
22-
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.
21+
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.
22+
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.
2323

2424
### Current problems with other clients
2525

@@ -47,28 +47,28 @@ We have a Matrix space where you can ask questions: https://matrix.to/#/#nextclo
4747

4848
## Features
4949

50-
See [here](packages/app/README.md) for screenshots.
50+
See [here](packages/neon_framework/example/README.md) for screenshots.
5151

5252
- :white_check_mark: Supported
5353
- :construction: Work in progress
5454
- :rocket: Planned
5555

56-
| App | Status |
57-
|---------------------------------------------------|--------------------|
58-
| [Dashboard](packages/neon/neon_dashboard) | :white_check_mark: |
59-
| [Files](packages/neon/neon_files) | :white_check_mark: |
60-
| [News](packages/neon/neon_news) | :white_check_mark: |
61-
| [Notes](packages/neon/neon_notes) | :white_check_mark: |
62-
| [Notifications](packages/neon/neon_notifications) | :white_check_mark: |
63-
| Activity | :rocket: |
64-
| Calendar | :rocket: |
65-
| Contacts | :rocket: |
66-
| Cookbook | :rocket: |
67-
| Cospend | :rocket: |
68-
| Deck | :rocket: |
69-
| Photos | :rocket: |
70-
| Talk | :construction: |
71-
| Tasks | :rocket: |
56+
| App | Status |
57+
|---------------------------------------------------------------------|--------------------|
58+
| [Dashboard](packages/neon_framework/packages/dashboard_app) | :white_check_mark: |
59+
| [Files](packages/neon_framework/packages/files_app) | :white_check_mark: |
60+
| [News](packages/neon_framework/packages/news_app) | :white_check_mark: |
61+
| [Notes](packages/neon_framework/packages/notes_app) | :white_check_mark: |
62+
| [Notifications](packages/neon_framework/packages/notifications_app) | :white_check_mark: |
63+
| Activity | :rocket: |
64+
| Calendar | :rocket: |
65+
| Contacts | :rocket: |
66+
| Cookbook | :rocket: |
67+
| Cospend | :rocket: |
68+
| Deck | :rocket: |
69+
| Photos | :rocket: |
70+
| Talk | :construction: |
71+
| Tasks | :rocket: |
7272

7373
## Platform support
7474

commitlint.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,25 @@ rules:
77
scope-enum:
88
- 2
99
- always
10-
- - app
11-
- ci
10+
- - ci
1211
- cookie_store
12+
- dashboard_app
1313
- deps
1414
- docs
1515
- dynamite
1616
- dynamite_end_to_end_test
1717
- dynamite_runtime
1818
- file_icons
19-
- neon_dashboard
20-
- neon_files
19+
- files_app
2120
- neon_framework
2221
- neon_http_client
2322
- neon_lints
24-
- neon_news
25-
- neon_notes
26-
- neon_notifications
27-
- neon_talk
23+
- news_app
2824
- nextcloud
2925
- nextcloud_test
26+
- notes_app
27+
- notifications_app
3028
- release
3129
- sort_box
30+
- talk_app
3231
- tool

cspell.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
"**.openapi.json",
1616
"**/CHANGELOG.md",
1717
"external",
18-
"packages/app/web/sqlite3.wasm",
19-
"packages/app/web/sqflite_sw.js",
20-
"packages/dynamite/dynamite/example/lib",
21-
"packages/file_icons/lib/src/data.dart",
18+
"packages/dynamite/example/lib",
19+
"packages/neon_framework/example/web/sqflite_sw.js",
20+
"packages/neon_framework/example/web/sqlite3.wasm",
21+
"packages/neon_framework/packages/file_icons/lib/src/data.dart",
2222
"packages/neon_lints/lib",
23-
"packages/nextcloud/test/fixtures",
24-
"packages/nextcloud_test/docker/static",
25-
"/packages/nextcloud/test/files"
23+
"packages/nextcloud/packages/nextcloud_test/docker/static",
24+
"packages/nextcloud/test/files",
25+
"packages/nextcloud/test/fixtures"
2626
],
2727
"dictionaries": [
2828
"bash",

docs/architecture.puml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ package "Neon framework" {
88
}
99

1010
package "Clients" {
11-
component neon_dashboard
12-
component neon_files
13-
component neon_news
14-
component neon_notes
15-
component neon_notifications
11+
component dashboard_app
12+
component files_app
13+
component news_app
14+
component notes_app
15+
component notifications_app
1616
}
1717

1818
package "OpenAPI" {
@@ -22,17 +22,17 @@ package "OpenAPI" {
2222

2323
component app
2424

25-
app ..> neon_dashboard
26-
app ..> neon_files
27-
app ..> neon_news
28-
app ..> neon_notes
29-
app ..> neon_notifications
30-
31-
neon_dashboard --> neon_framework
32-
neon_files --> neon_framework
33-
neon_news --> neon_framework
34-
neon_notes --> neon_framework
35-
neon_notifications --> neon_framework
25+
app ..> dashboard_app
26+
app ..> files_app
27+
app ..> news_app
28+
app ..> notes_app
29+
app ..> notifications_app
30+
31+
dashboard_app --> neon_framework
32+
files_app --> neon_framework
33+
news_app --> neon_framework
34+
notes_app --> neon_framework
35+
notifications_app --> neon_framework
3636

3737

3838
neon_framework --> nextcloud

docs/architecture.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)