diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 6474ebdf..da2fab15 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -65,16 +65,16 @@ jobs: needs: - job_001 job_003: - name: "analyze; PKG: packages/harbour; `dart format --output=none --set-exit-if-changed --line-length 120 .`" + name: "analyze; PKG: packages/neon; `dart format --output=none --set-exit-if-changed --line-length 120 .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/harbour;commands:format" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon;commands:format" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/harbour + os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon os:ubuntu-latest;pub-cache-hosted;sdk:stable os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -83,14 +83,14 @@ jobs: channel: stable - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: packages_harbour_pub_upgrade - name: packages/harbour; flutter pub pub upgrade + - id: packages_neon_pub_upgrade + name: packages/neon; flutter pub pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/harbour + working-directory: packages/neon run: flutter pub pub upgrade - - name: "packages/harbour; dart format --output=none --set-exit-if-changed --line-length 120 ." - if: "always() && steps.packages_harbour_pub_upgrade.conclusion == 'success'" - working-directory: packages/harbour + - name: "packages/neon; dart format --output=none --set-exit-if-changed --line-length 120 ." + if: "always() && steps.packages_neon_pub_upgrade.conclusion == 'success'" + working-directory: packages/neon run: "dart format --output=none --set-exit-if-changed --line-length 120 ." needs: - job_001 @@ -275,16 +275,16 @@ jobs: needs: - job_001 job_010: - name: "analyze; PKG: packages/harbour; `flutter analyze`" + name: "analyze; PKG: packages/neon; `flutter analyze`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/harbour;commands:analyze_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon;commands:analyze_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/harbour + os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon os:ubuntu-latest;pub-cache-hosted;sdk:stable os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -293,14 +293,14 @@ jobs: channel: stable - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: packages_harbour_pub_upgrade - name: packages/harbour; flutter pub pub upgrade + - id: packages_neon_pub_upgrade + name: packages/neon; flutter pub pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/harbour + working-directory: packages/neon run: flutter pub pub upgrade - - name: packages/harbour; flutter analyze - if: "always() && steps.packages_harbour_pub_upgrade.conclusion == 'success'" - working-directory: packages/harbour + - name: packages/neon; flutter analyze + if: "always() && steps.packages_neon_pub_upgrade.conclusion == 'success'" + working-directory: packages/neon run: flutter analyze needs: - job_001 diff --git a/.idea/modules.xml b/.idea/modules.xml index 5c1b9a43..590d82f1 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/nextcloud-harbour.iml b/.idea/nextcloud-neon.iml similarity index 93% rename from .idea/nextcloud-harbour.iml rename to .idea/nextcloud-neon.iml index e19a3b2b..f52752ef 100644 --- a/.idea/nextcloud-harbour.iml +++ b/.idea/nextcloud-neon.iml @@ -22,9 +22,6 @@ - - - @@ -44,8 +41,6 @@ - - @@ -56,6 +51,11 @@ + + + + + diff --git a/.idea/runConfigurations/Debug.xml b/.idea/runConfigurations/Debug.xml index f9dc914b..539e14ae 100644 --- a/.idea/runConfigurations/Debug.xml +++ b/.idea/runConfigurations/Debug.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/runConfigurations/Release.xml b/.idea/runConfigurations/Release.xml index 9f4cacbc..9fc9408b 100644 --- a/.idea/runConfigurations/Release.xml +++ b/.idea/runConfigurations/Release.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/README.md b/README.md index 36858a48..3ed121b0 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# nextcloud-harbour +# nextcloud-neon A beautiful convergent cross-platform client for Nextcloud written in Flutter. -See [here](./packages/harbour/README.md) for screenshots and other material regarding the app. +See [here](packages/neon/README.md) for screenshots and other material regarding the app. -This repository not only contains the Harbour app, but also a Nextcloud client written in Dart. +This repository not only contains the Neon app, but also a Nextcloud client written in Dart. The client will replace https://github.com/jld3103/dart-nextcloud which is an older unmaintained client I wrote some time ago. The development of this app and client just started, there will be a lot of changes and new features coming soon. @@ -13,7 +13,7 @@ Additional documentation is very much appreciated. If you find something that yo ## Features -There are a lot of planned features that still need help. Go [here](https://github.com/jld3103/nextcloud-harbour/issues?q=is%3Aopen+is%3Aissue+label%3Afeature) and grab an issue to work on. +There are a lot of planned features that still need help. Go [here](https://github.com/jld3103/nextcloud-neon/issues?q=is%3Aopen+is%3Aissue+label%3Afeature) and grab an issue to work on. Even if a new feature is not listed yet, please open an issue. - :heavy_check_mark: Fully supported @@ -23,9 +23,9 @@ Even if a new feature is not listed yet, please open an issue. | App | Status | |----------|----------------------------------------------------------------------------------------------------------------------------------------------------------| -| Files | :white_check_mark: [See here](https://github.com/jld3103/nextcloud-harbour/issues?q=is%3Aopen+is%3Aissue+label%3A%22harbour%3A+files%22+label%3Afeature) | +| Files | :white_check_mark: [See here](https://github.com/jld3103/nextcloud-neon/issues?q=is%3Aopen+is%3Aissue+label%3A%22neon%3A+files%22+label%3Afeature) | | Notes | :heavy_check_mark: | -| News | :white_check_mark: [See here](https://github.com/jld3103/nextcloud-harbour/issues?q=is%3Aopen+is%3Aissue+label%3Afeature+label%3A%22harbour%3A+news%22) | +| News | :white_check_mark: [See here](https://github.com/jld3103/nextcloud-neon/issues?q=is%3Aopen+is%3Aissue+label%3Afeature+label%3A%22neon%3A+news%22) | | Contacts | :rocket: | | Calendar | :rocket: | | Tasks | :rocket: | @@ -34,7 +34,7 @@ Even if a new feature is not listed yet, please open an issue. ## Platform support -Except for web, Harbour should run on all supported Flutter platforms in the future. +Except for web, Neon should run on all supported Flutter platforms in the future. Right now this is not the case, only Android and Linux are supported and tested, but this can easily be extended to other platforms. The features and problems of all platforms should be considered when implementing new features. diff --git a/packages/harbour/android/app/src/main/res/drawable-hdpi/android12splash.png b/packages/harbour/android/app/src/main/res/drawable-hdpi/android12splash.png deleted file mode 100644 index 00ee9286..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-hdpi/android12splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/drawable-hdpi/splash.png b/packages/harbour/android/app/src/main/res/drawable-hdpi/splash.png deleted file mode 100644 index 83f15b16..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-hdpi/splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/drawable-mdpi/android12splash.png b/packages/harbour/android/app/src/main/res/drawable-mdpi/android12splash.png deleted file mode 100644 index 3ce81a20..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-mdpi/android12splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/drawable-mdpi/splash.png b/packages/harbour/android/app/src/main/res/drawable-mdpi/splash.png deleted file mode 100644 index f7dfd4c2..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-mdpi/splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/drawable-xhdpi/android12splash.png b/packages/harbour/android/app/src/main/res/drawable-xhdpi/android12splash.png deleted file mode 100644 index 1d598d21..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-xhdpi/android12splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/drawable-xhdpi/splash.png b/packages/harbour/android/app/src/main/res/drawable-xhdpi/splash.png deleted file mode 100644 index 27aadf8c..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-xhdpi/splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/packages/harbour/android/app/src/main/res/drawable-xxhdpi/android12splash.png deleted file mode 100644 index 4942715f..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-xxhdpi/android12splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/drawable-xxhdpi/splash.png b/packages/harbour/android/app/src/main/res/drawable-xxhdpi/splash.png deleted file mode 100644 index 1d017a22..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-xxhdpi/splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/packages/harbour/android/app/src/main/res/drawable-xxxhdpi/android12splash.png deleted file mode 100644 index 5255665f..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-xxxhdpi/android12splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/drawable-xxxhdpi/splash.png b/packages/harbour/android/app/src/main/res/drawable-xxxhdpi/splash.png deleted file mode 100644 index d6a09632..00000000 Binary files a/packages/harbour/android/app/src/main/res/drawable-xxxhdpi/splash.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/harbour/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 3eec68c5..00000000 Binary files a/packages/harbour/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/harbour/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 22f63190..00000000 Binary files a/packages/harbour/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/harbour/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index ab062122..00000000 Binary files a/packages/harbour/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/harbour/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 7de7faa9..00000000 Binary files a/packages/harbour/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/packages/harbour/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/harbour/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 09d33e5b..00000000 Binary files a/packages/harbour/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/packages/harbour/assets/LEGALESE.txt b/packages/harbour/assets/LEGALESE.txt deleted file mode 100644 index c1e93575..00000000 --- a/packages/harbour/assets/LEGALESE.txt +++ /dev/null @@ -1,2 +0,0 @@ -Copyright © 2022, Kate Döen -Under BSD-3 license diff --git a/packages/harbour/assets/logo_harbour.svg b/packages/harbour/assets/logo_harbour.svg deleted file mode 100644 index ee032795..00000000 --- a/packages/harbour/assets/logo_harbour.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/harbour/.gitignore b/packages/neon/.gitignore similarity index 100% rename from packages/harbour/.gitignore rename to packages/neon/.gitignore diff --git a/packages/harbour/.metadata b/packages/neon/.metadata similarity index 100% rename from packages/harbour/.metadata rename to packages/neon/.metadata diff --git a/packages/harbour/LICENSE b/packages/neon/LICENSE similarity index 100% rename from packages/harbour/LICENSE rename to packages/neon/LICENSE diff --git a/packages/harbour/README.md b/packages/neon/README.md similarity index 98% rename from packages/harbour/README.md rename to packages/neon/README.md index 0a7a398d..a1ef5e37 100644 --- a/packages/harbour/README.md +++ b/packages/neon/README.md @@ -1,4 +1,4 @@ -# harbour +# neon A beautiful convergent cross-platform client for Nextcloud written in Flutter. diff --git a/packages/harbour/analysis_options.yaml b/packages/neon/analysis_options.yaml similarity index 100% rename from packages/harbour/analysis_options.yaml rename to packages/neon/analysis_options.yaml diff --git a/packages/harbour/android/.gitignore b/packages/neon/android/.gitignore similarity index 100% rename from packages/harbour/android/.gitignore rename to packages/neon/android/.gitignore diff --git a/packages/harbour/android/app/build.gradle b/packages/neon/android/app/build.gradle similarity index 97% rename from packages/harbour/android/app/build.gradle rename to packages/neon/android/app/build.gradle index da88cf07..a052ceeb 100644 --- a/packages/harbour/android/app/build.gradle +++ b/packages/neon/android/app/build.gradle @@ -42,7 +42,7 @@ android { } defaultConfig { - applicationId "de.provokateurin.harbour" + applicationId "de.provokateurin.neon" minSdkVersion 19 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() diff --git a/packages/harbour/android/app/proguard-rules.pro b/packages/neon/android/app/proguard-rules.pro similarity index 100% rename from packages/harbour/android/app/proguard-rules.pro rename to packages/neon/android/app/proguard-rules.pro diff --git a/packages/harbour/android/app/src/debug/AndroidManifest.xml b/packages/neon/android/app/src/debug/AndroidManifest.xml similarity index 87% rename from packages/harbour/android/app/src/debug/AndroidManifest.xml rename to packages/neon/android/app/src/debug/AndroidManifest.xml index 6ea50f8d..6f094988 100644 --- a/packages/harbour/android/app/src/debug/AndroidManifest.xml +++ b/packages/neon/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="de.provokateurin.neon"> diff --git a/packages/harbour/android/app/src/main/AndroidManifest.xml b/packages/neon/android/app/src/main/AndroidManifest.xml similarity index 95% rename from packages/harbour/android/app/src/main/AndroidManifest.xml rename to packages/neon/android/app/src/main/AndroidManifest.xml index 4c7c8c0e..73dcee0a 100644 --- a/packages/harbour/android/app/src/main/AndroidManifest.xml +++ b/packages/neon/android/app/src/main/AndroidManifest.xml @@ -1,10 +1,10 @@ + package="de.provokateurin.neon"> diff --git a/packages/harbour/android/app/src/main/kotlin/de/provokateurin/harbour/MainActivity.kt b/packages/neon/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt similarity index 74% rename from packages/harbour/android/app/src/main/kotlin/de/provokateurin/harbour/MainActivity.kt rename to packages/neon/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt index f4f3ff11..7a5dc89f 100644 --- a/packages/harbour/android/app/src/main/kotlin/de/provokateurin/harbour/MainActivity.kt +++ b/packages/neon/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt @@ -1,4 +1,4 @@ -package de.provokateurin.harbour +package de.provokateurin.neon import io.flutter.embedding.android.FlutterActivity diff --git a/packages/neon/android/app/src/main/res/drawable-hdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-hdpi/android12splash.png new file mode 100644 index 00000000..9a252baf Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-hdpi/android12splash.png differ diff --git a/packages/neon/android/app/src/main/res/drawable-hdpi/splash.png b/packages/neon/android/app/src/main/res/drawable-hdpi/splash.png new file mode 100644 index 00000000..8dc45e70 Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-hdpi/splash.png differ diff --git a/packages/neon/android/app/src/main/res/drawable-mdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-mdpi/android12splash.png new file mode 100644 index 00000000..d28d8f2b Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-mdpi/android12splash.png differ diff --git a/packages/neon/android/app/src/main/res/drawable-mdpi/splash.png b/packages/neon/android/app/src/main/res/drawable-mdpi/splash.png new file mode 100644 index 00000000..432b435d Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-mdpi/splash.png differ diff --git a/packages/harbour/android/app/src/main/res/drawable-night-v21/background.png b/packages/neon/android/app/src/main/res/drawable-night-v21/background.png similarity index 100% rename from packages/harbour/android/app/src/main/res/drawable-night-v21/background.png rename to packages/neon/android/app/src/main/res/drawable-night-v21/background.png diff --git a/packages/harbour/android/app/src/main/res/drawable-night-v21/launch_background.xml b/packages/neon/android/app/src/main/res/drawable-night-v21/launch_background.xml similarity index 100% rename from packages/harbour/android/app/src/main/res/drawable-night-v21/launch_background.xml rename to packages/neon/android/app/src/main/res/drawable-night-v21/launch_background.xml diff --git a/packages/harbour/android/app/src/main/res/drawable-night/background.png b/packages/neon/android/app/src/main/res/drawable-night/background.png similarity index 100% rename from packages/harbour/android/app/src/main/res/drawable-night/background.png rename to packages/neon/android/app/src/main/res/drawable-night/background.png diff --git a/packages/harbour/android/app/src/main/res/drawable-night/launch_background.xml b/packages/neon/android/app/src/main/res/drawable-night/launch_background.xml similarity index 100% rename from packages/harbour/android/app/src/main/res/drawable-night/launch_background.xml rename to packages/neon/android/app/src/main/res/drawable-night/launch_background.xml diff --git a/packages/harbour/android/app/src/main/res/drawable-v21/background.png b/packages/neon/android/app/src/main/res/drawable-v21/background.png similarity index 100% rename from packages/harbour/android/app/src/main/res/drawable-v21/background.png rename to packages/neon/android/app/src/main/res/drawable-v21/background.png diff --git a/packages/harbour/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/neon/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from packages/harbour/android/app/src/main/res/drawable-v21/launch_background.xml rename to packages/neon/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/packages/neon/android/app/src/main/res/drawable-xhdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-xhdpi/android12splash.png new file mode 100644 index 00000000..e29b777d Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-xhdpi/android12splash.png differ diff --git a/packages/neon/android/app/src/main/res/drawable-xhdpi/splash.png b/packages/neon/android/app/src/main/res/drawable-xhdpi/splash.png new file mode 100644 index 00000000..1648cf75 Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-xhdpi/splash.png differ diff --git a/packages/neon/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-xxhdpi/android12splash.png new file mode 100644 index 00000000..df8c594b Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ diff --git a/packages/neon/android/app/src/main/res/drawable-xxhdpi/splash.png b/packages/neon/android/app/src/main/res/drawable-xxhdpi/splash.png new file mode 100644 index 00000000..6ee8f74f Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-xxhdpi/splash.png differ diff --git a/packages/neon/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-xxxhdpi/android12splash.png new file mode 100644 index 00000000..bc19fa53 Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ diff --git a/packages/neon/android/app/src/main/res/drawable-xxxhdpi/splash.png b/packages/neon/android/app/src/main/res/drawable-xxxhdpi/splash.png new file mode 100644 index 00000000..69a35d6d Binary files /dev/null and b/packages/neon/android/app/src/main/res/drawable-xxxhdpi/splash.png differ diff --git a/packages/harbour/android/app/src/main/res/drawable/background.png b/packages/neon/android/app/src/main/res/drawable/background.png similarity index 100% rename from packages/harbour/android/app/src/main/res/drawable/background.png rename to packages/neon/android/app/src/main/res/drawable/background.png diff --git a/packages/harbour/android/app/src/main/res/drawable/launch_background.xml b/packages/neon/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from packages/harbour/android/app/src/main/res/drawable/launch_background.xml rename to packages/neon/android/app/src/main/res/drawable/launch_background.xml diff --git a/packages/harbour/android/app/src/main/res/mipmap-hdpi/app_files.png b/packages/neon/android/app/src/main/res/mipmap-hdpi/app_files.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-hdpi/app_files.png rename to packages/neon/android/app/src/main/res/mipmap-hdpi/app_files.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-hdpi/app_news.png b/packages/neon/android/app/src/main/res/mipmap-hdpi/app_news.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-hdpi/app_news.png rename to packages/neon/android/app/src/main/res/mipmap-hdpi/app_news.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-hdpi/app_notes.png b/packages/neon/android/app/src/main/res/mipmap-hdpi/app_notes.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-hdpi/app_notes.png rename to packages/neon/android/app/src/main/res/mipmap-hdpi/app_notes.png diff --git a/packages/neon/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/neon/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..6bd4d069 Binary files /dev/null and b/packages/neon/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/packages/harbour/android/app/src/main/res/mipmap-mdpi/app_files.png b/packages/neon/android/app/src/main/res/mipmap-mdpi/app_files.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-mdpi/app_files.png rename to packages/neon/android/app/src/main/res/mipmap-mdpi/app_files.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-mdpi/app_news.png b/packages/neon/android/app/src/main/res/mipmap-mdpi/app_news.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-mdpi/app_news.png rename to packages/neon/android/app/src/main/res/mipmap-mdpi/app_news.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-mdpi/app_notes.png b/packages/neon/android/app/src/main/res/mipmap-mdpi/app_notes.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-mdpi/app_notes.png rename to packages/neon/android/app/src/main/res/mipmap-mdpi/app_notes.png diff --git a/packages/neon/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/neon/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..9a36c98a Binary files /dev/null and b/packages/neon/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/packages/harbour/android/app/src/main/res/mipmap-xhdpi/app_files.png b/packages/neon/android/app/src/main/res/mipmap-xhdpi/app_files.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-xhdpi/app_files.png rename to packages/neon/android/app/src/main/res/mipmap-xhdpi/app_files.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-xhdpi/app_news.png b/packages/neon/android/app/src/main/res/mipmap-xhdpi/app_news.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-xhdpi/app_news.png rename to packages/neon/android/app/src/main/res/mipmap-xhdpi/app_news.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-xhdpi/app_notes.png b/packages/neon/android/app/src/main/res/mipmap-xhdpi/app_notes.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-xhdpi/app_notes.png rename to packages/neon/android/app/src/main/res/mipmap-xhdpi/app_notes.png diff --git a/packages/neon/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/neon/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..0c4d513b Binary files /dev/null and b/packages/neon/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/packages/harbour/android/app/src/main/res/mipmap-xxhdpi/app_files.png b/packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_files.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-xxhdpi/app_files.png rename to packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_files.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-xxhdpi/app_news.png b/packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_news.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-xxhdpi/app_news.png rename to packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_news.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-xxhdpi/app_notes.png b/packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_notes.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-xxhdpi/app_notes.png rename to packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_notes.png diff --git a/packages/neon/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/neon/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..46e70f5a Binary files /dev/null and b/packages/neon/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/packages/harbour/android/app/src/main/res/mipmap-xxxhdpi/app_files.png b/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_files.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-xxxhdpi/app_files.png rename to packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_files.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-xxxhdpi/app_news.png b/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_news.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-xxxhdpi/app_news.png rename to packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_news.png diff --git a/packages/harbour/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png b/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png similarity index 100% rename from packages/harbour/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png rename to packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png diff --git a/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..76628027 Binary files /dev/null and b/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/packages/harbour/android/app/src/main/res/raw/keep.xml b/packages/neon/android/app/src/main/res/raw/keep.xml similarity index 100% rename from packages/harbour/android/app/src/main/res/raw/keep.xml rename to packages/neon/android/app/src/main/res/raw/keep.xml diff --git a/packages/harbour/android/app/src/main/res/values-night-v31/styles.xml b/packages/neon/android/app/src/main/res/values-night-v31/styles.xml similarity index 100% rename from packages/harbour/android/app/src/main/res/values-night-v31/styles.xml rename to packages/neon/android/app/src/main/res/values-night-v31/styles.xml diff --git a/packages/harbour/android/app/src/main/res/values-night/styles.xml b/packages/neon/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from packages/harbour/android/app/src/main/res/values-night/styles.xml rename to packages/neon/android/app/src/main/res/values-night/styles.xml diff --git a/packages/harbour/android/app/src/main/res/values-v31/styles.xml b/packages/neon/android/app/src/main/res/values-v31/styles.xml similarity index 100% rename from packages/harbour/android/app/src/main/res/values-v31/styles.xml rename to packages/neon/android/app/src/main/res/values-v31/styles.xml diff --git a/packages/harbour/android/app/src/main/res/values/styles.xml b/packages/neon/android/app/src/main/res/values/styles.xml similarity index 100% rename from packages/harbour/android/app/src/main/res/values/styles.xml rename to packages/neon/android/app/src/main/res/values/styles.xml diff --git a/packages/harbour/android/app/src/profile/AndroidManifest.xml b/packages/neon/android/app/src/profile/AndroidManifest.xml similarity index 87% rename from packages/harbour/android/app/src/profile/AndroidManifest.xml rename to packages/neon/android/app/src/profile/AndroidManifest.xml index 6ea50f8d..6f094988 100644 --- a/packages/harbour/android/app/src/profile/AndroidManifest.xml +++ b/packages/neon/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="de.provokateurin.neon"> diff --git a/packages/harbour/android/build.gradle b/packages/neon/android/build.gradle similarity index 100% rename from packages/harbour/android/build.gradle rename to packages/neon/android/build.gradle diff --git a/packages/harbour/android/gradle.properties b/packages/neon/android/gradle.properties similarity index 100% rename from packages/harbour/android/gradle.properties rename to packages/neon/android/gradle.properties diff --git a/packages/harbour/android/gradle/wrapper/gradle-wrapper.properties b/packages/neon/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from packages/harbour/android/gradle/wrapper/gradle-wrapper.properties rename to packages/neon/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/harbour/android/settings.gradle b/packages/neon/android/settings.gradle similarity index 100% rename from packages/harbour/android/settings.gradle rename to packages/neon/android/settings.gradle diff --git a/packages/harbour/assets/.gitignore b/packages/neon/assets/.gitignore similarity index 100% rename from packages/harbour/assets/.gitignore rename to packages/neon/assets/.gitignore diff --git a/packages/neon/assets/LEGALESE.txt b/packages/neon/assets/LEGALESE.txt new file mode 100644 index 00000000..a578eca2 --- /dev/null +++ b/packages/neon/assets/LEGALESE.txt @@ -0,0 +1,2 @@ +Copyright © 2022, jld3103 +Under BSD-3 license diff --git a/packages/harbour/assets/apps/files.svg b/packages/neon/assets/apps/files.svg similarity index 100% rename from packages/harbour/assets/apps/files.svg rename to packages/neon/assets/apps/files.svg diff --git a/packages/harbour/assets/apps/news.svg b/packages/neon/assets/apps/news.svg similarity index 100% rename from packages/harbour/assets/apps/news.svg rename to packages/neon/assets/apps/news.svg diff --git a/packages/harbour/assets/apps/notes.svg b/packages/neon/assets/apps/notes.svg similarity index 100% rename from packages/harbour/assets/apps/notes.svg rename to packages/neon/assets/apps/notes.svg diff --git a/packages/neon/assets/logo_neon.svg b/packages/neon/assets/logo_neon.svg new file mode 100644 index 00000000..7b9f2aae --- /dev/null +++ b/packages/neon/assets/logo_neon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/harbour/assets/logo_nextcloud.svg b/packages/neon/assets/logo_nextcloud.svg similarity index 100% rename from packages/harbour/assets/logo_nextcloud.svg rename to packages/neon/assets/logo_nextcloud.svg diff --git a/packages/harbour/flutter_native_splash.yaml b/packages/neon/flutter_native_splash.yaml similarity index 100% rename from packages/harbour/flutter_native_splash.yaml rename to packages/neon/flutter_native_splash.yaml diff --git a/packages/harbour/l10n.yaml b/packages/neon/l10n.yaml similarity index 100% rename from packages/harbour/l10n.yaml rename to packages/neon/l10n.yaml diff --git a/packages/harbour/lib/app.dart b/packages/neon/lib/app.dart similarity index 93% rename from packages/harbour/lib/app.dart rename to packages/neon/lib/app.dart index 0d89b023..a03387fc 100644 --- a/packages/harbour/lib/app.dart +++ b/packages/neon/lib/app.dart @@ -1,21 +1,21 @@ import 'package:flutter/material.dart'; import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:flutter_rx_bloc/flutter_rx_bloc.dart'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; -class HarbourApp extends StatefulWidget { - const HarbourApp({ +class NeonApp extends StatefulWidget { + const NeonApp({ super.key, }); @override - State createState() => _HarbourAppState(); + State createState() => _NeonAppState(); } // ignore: prefer_mixin -class _HarbourAppState extends State with WidgetsBindingObserver { +class _NeonAppState extends State with WidgetsBindingObserver { final _navigatorKey = GlobalKey(); NextcloudTheme? _userTheme; diff --git a/packages/harbour/lib/l10n/en.arb b/packages/neon/lib/l10n/en.arb similarity index 99% rename from packages/harbour/lib/l10n/en.arb rename to packages/neon/lib/l10n/en.arb index 1fd12b38..3288de9e 100644 --- a/packages/harbour/lib/l10n/en.arb +++ b/packages/neon/lib/l10n/en.arb @@ -1,6 +1,6 @@ { "@@locale": "en", - "appName": "Nextcloud Harbour", + "appName": "Nextcloud Neon", "loginAccountAlreadyExists": "The account you are trying to add already exists", "loginAgain": "Login again", "loginOpenAgain": "Open again", diff --git a/packages/harbour/lib/l10n/localizations.dart b/packages/neon/lib/l10n/localizations.dart similarity index 99% rename from packages/harbour/lib/l10n/localizations.dart rename to packages/neon/lib/l10n/localizations.dart index c96332a9..1380e7e9 100644 --- a/packages/harbour/lib/l10n/localizations.dart +++ b/packages/neon/lib/l10n/localizations.dart @@ -92,7 +92,7 @@ abstract class AppLocalizations { /// No description provided for @appName. /// /// In en, this message translates to: - /// **'Nextcloud Harbour'** + /// **'Nextcloud Neon'** String get appName; /// No description provided for @loginAccountAlreadyExists. diff --git a/packages/harbour/lib/l10n/localizations_en.dart b/packages/neon/lib/l10n/localizations_en.dart similarity index 99% rename from packages/harbour/lib/l10n/localizations_en.dart rename to packages/neon/lib/l10n/localizations_en.dart index ab02b417..07411e48 100644 --- a/packages/harbour/lib/l10n/localizations_en.dart +++ b/packages/neon/lib/l10n/localizations_en.dart @@ -5,7 +5,7 @@ class AppLocalizationsEn extends AppLocalizations { AppLocalizationsEn([String locale = 'en']) : super(locale); @override - String get appName => 'Nextcloud Harbour'; + String get appName => 'Nextcloud Neon'; @override String get loginAccountAlreadyExists => 'The account you are trying to add already exists'; diff --git a/packages/harbour/lib/main.dart b/packages/neon/lib/main.dart similarity index 87% rename from packages/harbour/lib/main.dart rename to packages/neon/lib/main.dart index a1851264..7073cdb6 100644 --- a/packages/harbour/lib/main.dart +++ b/packages/neon/lib/main.dart @@ -4,8 +4,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_native_splash/flutter_native_splash.dart'; -import 'package:harbour/app.dart'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/app.dart'; +import 'package:neon/src/neon.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -27,7 +27,7 @@ Future main() async { await Global.init(); - final platform = getHarbourPlatform(); + final platform = getNeonPlatform(); await platform.init?.call(); @@ -60,7 +60,7 @@ Future main() async { Provider( create: (final _) => env, ), - Provider( + Provider( create: (final _) => platform, ), Provider( @@ -76,17 +76,17 @@ Future main() async { create: (final _) => allAppImplementations, ), ], - child: const HarbourApp(), + child: const NeonApp(), ), ); } -HarbourPlatform getHarbourPlatform() { +NeonPlatform getNeonPlatform() { if (Platform.isAndroid) { - return AndroidHarbourPlatform(); + return AndroidNeonPlatform(); } if (Platform.isLinux) { - return LinuxHarbourPlatform(); + return LinuxNeonPlatform(); } throw UnimplementedError('No implementation for platform ${Platform.operatingSystem} found'); diff --git a/packages/harbour/lib/src/apps/files/app.dart b/packages/neon/lib/src/apps/files/app.dart similarity index 92% rename from packages/harbour/lib/src/apps/files/app.dart rename to packages/neon/lib/src/apps/files/app.dart index 8a4440dc..f00124d3 100644 --- a/packages/harbour/lib/src/apps/files/app.dart +++ b/packages/neon/lib/src/apps/files/app.dart @@ -11,11 +11,11 @@ import 'package:file_picker/file_picker.dart'; import 'package:filesize/filesize.dart'; import 'package:flutter/material.dart'; import 'package:flutter_rx_bloc/flutter_rx_bloc.dart'; -import 'package:harbour/src/apps/files/blocs/browser.dart'; -import 'package:harbour/src/harbour.dart'; import 'package:image_picker/image_picker.dart'; import 'package:intersperse/intersperse.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:neon/src/apps/files/blocs/browser.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:path/path.dart' as p; import 'package:provider/provider.dart'; @@ -39,7 +39,7 @@ class FilesApp extends AppImplementation { FilesApp( final SharedPreferences sharedPreferences, final RequestManager requestManager, - final HarbourPlatform platform, + final NeonPlatform platform, ) : super( 'files', (final context) => AppLocalizations.of(context).filesName, diff --git a/packages/harbour/lib/src/apps/files/blocs/browser.dart b/packages/neon/lib/src/apps/files/blocs/browser.dart similarity index 98% rename from packages/harbour/lib/src/apps/files/blocs/browser.dart rename to packages/neon/lib/src/apps/files/blocs/browser.dart index 85c377df..77577704 100644 --- a/packages/harbour/lib/src/apps/files/blocs/browser.dart +++ b/packages/neon/lib/src/apps/files/blocs/browser.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/harbour/lib/src/apps/files/blocs/browser.rxb.g.dart b/packages/neon/lib/src/apps/files/blocs/browser.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/blocs/browser.rxb.g.dart rename to packages/neon/lib/src/apps/files/blocs/browser.rxb.g.dart diff --git a/packages/harbour/lib/src/apps/files/blocs/files.dart b/packages/neon/lib/src/apps/files/blocs/files.dart similarity index 97% rename from packages/harbour/lib/src/apps/files/blocs/files.dart rename to packages/neon/lib/src/apps/files/blocs/files.dart index c42a79af..39d97aad 100644 --- a/packages/harbour/lib/src/apps/files/blocs/files.dart +++ b/packages/neon/lib/src/apps/files/blocs/files.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:harbour/src/apps/files/app.dart'; -import 'package:harbour/src/apps/files/blocs/browser.dart'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/apps/files/app.dart'; +import 'package:neon/src/apps/files/blocs/browser.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:open_file/open_file.dart'; import 'package:path/path.dart' as p; @@ -212,7 +212,7 @@ class FilesBloc extends $FilesBloc { final FilesAppSpecificOptions options; final RequestManager _requestManager; final NextcloudClient client; - final HarbourPlatform _platform; + final NeonPlatform _platform; late final browser = getNewFilesBrowserBloc(); final _uploadQueue = Queue(); diff --git a/packages/harbour/lib/src/apps/files/blocs/files.rxb.g.dart b/packages/neon/lib/src/apps/files/blocs/files.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/blocs/files.rxb.g.dart rename to packages/neon/lib/src/apps/files/blocs/files.rxb.g.dart diff --git a/packages/harbour/lib/src/apps/files/dialogs/choose_create.dart b/packages/neon/lib/src/apps/files/dialogs/choose_create.dart similarity index 97% rename from packages/harbour/lib/src/apps/files/dialogs/choose_create.dart rename to packages/neon/lib/src/apps/files/dialogs/choose_create.dart index ba0a8c2e..38d26278 100644 --- a/packages/harbour/lib/src/apps/files/dialogs/choose_create.dart +++ b/packages/neon/lib/src/apps/files/dialogs/choose_create.dart @@ -77,7 +77,7 @@ class _FilesChooseCreateDialogState extends State { } }, ), - if (Provider.of(context, listen: false).canUseCamera) ...[ + if (Provider.of(context, listen: false).canUseCamera) ...[ ListTile( leading: Icon( MdiIcons.cameraPlus, diff --git a/packages/harbour/lib/src/apps/files/dialogs/choose_folder.dart b/packages/neon/lib/src/apps/files/dialogs/choose_folder.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/dialogs/choose_folder.dart rename to packages/neon/lib/src/apps/files/dialogs/choose_folder.dart diff --git a/packages/harbour/lib/src/apps/files/dialogs/create_folder.dart b/packages/neon/lib/src/apps/files/dialogs/create_folder.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/dialogs/create_folder.dart rename to packages/neon/lib/src/apps/files/dialogs/create_folder.dart diff --git a/packages/harbour/lib/src/apps/files/models/file_details.dart b/packages/neon/lib/src/apps/files/models/file_details.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/models/file_details.dart rename to packages/neon/lib/src/apps/files/models/file_details.dart diff --git a/packages/harbour/lib/src/apps/files/options.dart b/packages/neon/lib/src/apps/files/options.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/options.dart rename to packages/neon/lib/src/apps/files/options.dart diff --git a/packages/harbour/lib/src/apps/files/pages/details.dart b/packages/neon/lib/src/apps/files/pages/details.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/pages/details.dart rename to packages/neon/lib/src/apps/files/pages/details.dart diff --git a/packages/harbour/lib/src/apps/files/pages/main.dart b/packages/neon/lib/src/apps/files/pages/main.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/pages/main.dart rename to packages/neon/lib/src/apps/files/pages/main.dart diff --git a/packages/harbour/lib/src/apps/files/utils/download_task.dart b/packages/neon/lib/src/apps/files/utils/download_task.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/utils/download_task.dart rename to packages/neon/lib/src/apps/files/utils/download_task.dart diff --git a/packages/harbour/lib/src/apps/files/utils/upload_task.dart b/packages/neon/lib/src/apps/files/utils/upload_task.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/utils/upload_task.dart rename to packages/neon/lib/src/apps/files/utils/upload_task.dart diff --git a/packages/harbour/lib/src/apps/files/widgets/browser_view.dart b/packages/neon/lib/src/apps/files/widgets/browser_view.dart similarity index 99% rename from packages/harbour/lib/src/apps/files/widgets/browser_view.dart rename to packages/neon/lib/src/apps/files/widgets/browser_view.dart index 801a3e48..5aafad08 100644 --- a/packages/harbour/lib/src/apps/files/widgets/browser_view.dart +++ b/packages/neon/lib/src/apps/files/widgets/browser_view.dart @@ -347,7 +347,7 @@ class _FilesBrowserViewState extends State { value: _FileAction.copy, child: Text(AppLocalizations.of(context).copy), ), - // TODO: https://github.com/jld3103/nextcloud-harbour/issues/4 + // TODO: https://github.com/jld3103/nextcloud-neon/issues/4 if (!details.isDirectory) ...[ PopupMenuItem( value: _FileAction.sync, diff --git a/packages/harbour/lib/src/apps/files/widgets/file_preview.dart b/packages/neon/lib/src/apps/files/widgets/file_preview.dart similarity index 100% rename from packages/harbour/lib/src/apps/files/widgets/file_preview.dart rename to packages/neon/lib/src/apps/files/widgets/file_preview.dart diff --git a/packages/harbour/lib/src/apps/news/app.dart b/packages/neon/lib/src/apps/news/app.dart similarity index 96% rename from packages/harbour/lib/src/apps/news/app.dart rename to packages/neon/lib/src/apps/news/app.dart index 6564168d..81597030 100644 --- a/packages/harbour/lib/src/apps/news/app.dart +++ b/packages/neon/lib/src/apps/news/app.dart @@ -6,11 +6,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_rx_bloc/flutter_rx_bloc.dart'; -import 'package:harbour/src/harbour.dart'; import 'package:html/dom.dart' as html_dom; import 'package:html/parser.dart' as html_parser; import 'package:intersperse/intersperse.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; @@ -46,7 +46,7 @@ class NewsApp extends AppImplementation { NewsApp( final SharedPreferences sharedPreferences, final RequestManager requestManager, - final HarbourPlatform platform, + final NeonPlatform platform, ) : super( 'news', (final context) => AppLocalizations.of(context).newsName, diff --git a/packages/harbour/lib/src/apps/news/blocs/articles.dart b/packages/neon/lib/src/apps/news/blocs/articles.dart similarity index 99% rename from packages/harbour/lib/src/apps/news/blocs/articles.dart rename to packages/neon/lib/src/apps/news/blocs/articles.dart index ab939a3e..4e0cc90f 100644 --- a/packages/harbour/lib/src/apps/news/blocs/articles.dart +++ b/packages/neon/lib/src/apps/news/blocs/articles.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/harbour/lib/src/apps/news/blocs/articles.rxb.g.dart b/packages/neon/lib/src/apps/news/blocs/articles.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/blocs/articles.rxb.g.dart rename to packages/neon/lib/src/apps/news/blocs/articles.rxb.g.dart diff --git a/packages/harbour/lib/src/apps/news/blocs/news.dart b/packages/neon/lib/src/apps/news/blocs/news.dart similarity index 99% rename from packages/harbour/lib/src/apps/news/blocs/news.dart rename to packages/neon/lib/src/apps/news/blocs/news.dart index a6e264d7..16426660 100644 --- a/packages/harbour/lib/src/apps/news/blocs/news.dart +++ b/packages/neon/lib/src/apps/news/blocs/news.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/harbour/lib/src/apps/news/blocs/news.rxb.g.dart b/packages/neon/lib/src/apps/news/blocs/news.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/blocs/news.rxb.g.dart rename to packages/neon/lib/src/apps/news/blocs/news.rxb.g.dart diff --git a/packages/harbour/lib/src/apps/news/dialogs/add_feed.dart b/packages/neon/lib/src/apps/news/dialogs/add_feed.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/dialogs/add_feed.dart rename to packages/neon/lib/src/apps/news/dialogs/add_feed.dart diff --git a/packages/harbour/lib/src/apps/news/dialogs/create_folder.dart b/packages/neon/lib/src/apps/news/dialogs/create_folder.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/dialogs/create_folder.dart rename to packages/neon/lib/src/apps/news/dialogs/create_folder.dart diff --git a/packages/harbour/lib/src/apps/news/dialogs/feed_show_url.dart b/packages/neon/lib/src/apps/news/dialogs/feed_show_url.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/dialogs/feed_show_url.dart rename to packages/neon/lib/src/apps/news/dialogs/feed_show_url.dart diff --git a/packages/harbour/lib/src/apps/news/dialogs/feed_update_error.dart b/packages/neon/lib/src/apps/news/dialogs/feed_update_error.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/dialogs/feed_update_error.dart rename to packages/neon/lib/src/apps/news/dialogs/feed_update_error.dart diff --git a/packages/harbour/lib/src/apps/news/dialogs/move_feed.dart b/packages/neon/lib/src/apps/news/dialogs/move_feed.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/dialogs/move_feed.dart rename to packages/neon/lib/src/apps/news/dialogs/move_feed.dart diff --git a/packages/harbour/lib/src/apps/news/options.dart b/packages/neon/lib/src/apps/news/options.dart similarity index 99% rename from packages/harbour/lib/src/apps/news/options.dart rename to packages/neon/lib/src/apps/news/options.dart index 152f8414..46ba29ea 100644 --- a/packages/harbour/lib/src/apps/news/options.dart +++ b/packages/neon/lib/src/apps/news/options.dart @@ -1,7 +1,7 @@ part of 'app.dart'; class NewsAppSpecificOptions extends NextcloudAppSpecificOptions { - NewsAppSpecificOptions(super.storage, final HarbourPlatform platform) { + NewsAppSpecificOptions(super.storage, final NeonPlatform platform) { super.categories = [ generalCategory, articlesCategory, diff --git a/packages/harbour/lib/src/apps/news/pages/article.dart b/packages/neon/lib/src/apps/news/pages/article.dart similarity index 97% rename from packages/harbour/lib/src/apps/news/pages/article.dart rename to packages/neon/lib/src/apps/news/pages/article.dart index d78a7d82..12f4893a 100644 --- a/packages/harbour/lib/src/apps/news/pages/article.dart +++ b/packages/neon/lib/src/apps/news/pages/article.dart @@ -38,7 +38,7 @@ class _NewsArticlePageState extends State { }); WidgetsBinding.instance.addPostFrameCallback((final _) { - if (Provider.of(context, listen: false).canUseWakelock) { + if (Provider.of(context, listen: false).canUseWakelock) { // ignore: discarded_futures Wakelock.enable(); } @@ -89,7 +89,7 @@ class _NewsArticlePageState extends State { return false; } - if (Provider.of(context, listen: false).canUseWakelock) { + if (Provider.of(context, listen: false).canUseWakelock) { await Wakelock.disable(); } return true; diff --git a/packages/harbour/lib/src/apps/news/pages/feed.dart b/packages/neon/lib/src/apps/news/pages/feed.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/pages/feed.dart rename to packages/neon/lib/src/apps/news/pages/feed.dart diff --git a/packages/harbour/lib/src/apps/news/pages/folder.dart b/packages/neon/lib/src/apps/news/pages/folder.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/pages/folder.dart rename to packages/neon/lib/src/apps/news/pages/folder.dart diff --git a/packages/harbour/lib/src/apps/news/pages/main.dart b/packages/neon/lib/src/apps/news/pages/main.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/pages/main.dart rename to packages/neon/lib/src/apps/news/pages/main.dart diff --git a/packages/harbour/lib/src/apps/news/sort/articles.dart b/packages/neon/lib/src/apps/news/sort/articles.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/sort/articles.dart rename to packages/neon/lib/src/apps/news/sort/articles.dart diff --git a/packages/harbour/lib/src/apps/news/sort/feeds.dart b/packages/neon/lib/src/apps/news/sort/feeds.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/sort/feeds.dart rename to packages/neon/lib/src/apps/news/sort/feeds.dart diff --git a/packages/harbour/lib/src/apps/news/sort/folders.dart b/packages/neon/lib/src/apps/news/sort/folders.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/sort/folders.dart rename to packages/neon/lib/src/apps/news/sort/folders.dart diff --git a/packages/harbour/lib/src/apps/news/widgets/articles_view.dart b/packages/neon/lib/src/apps/news/widgets/articles_view.dart similarity index 99% rename from packages/harbour/lib/src/apps/news/widgets/articles_view.dart rename to packages/neon/lib/src/apps/news/widgets/articles_view.dart index ed2b7c32..2f3adecb 100644 --- a/packages/harbour/lib/src/apps/news/widgets/articles_view.dart +++ b/packages/neon/lib/src/apps/news/widgets/articles_view.dart @@ -254,7 +254,7 @@ class _NewsArticlesViewState extends State { ), ), ); - } else if (Provider.of(context, listen: false).canUseWebView && + } else if (Provider.of(context, listen: false).canUseWebView && viewType == ArticleViewType.internalBrowser) { await Navigator.of(context).push( MaterialPageRoute( diff --git a/packages/harbour/lib/src/apps/news/widgets/feed_icon.dart b/packages/neon/lib/src/apps/news/widgets/feed_icon.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/widgets/feed_icon.dart rename to packages/neon/lib/src/apps/news/widgets/feed_icon.dart diff --git a/packages/harbour/lib/src/apps/news/widgets/feeds_view.dart b/packages/neon/lib/src/apps/news/widgets/feeds_view.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/widgets/feeds_view.dart rename to packages/neon/lib/src/apps/news/widgets/feeds_view.dart diff --git a/packages/harbour/lib/src/apps/news/widgets/folder_select.dart b/packages/neon/lib/src/apps/news/widgets/folder_select.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/widgets/folder_select.dart rename to packages/neon/lib/src/apps/news/widgets/folder_select.dart diff --git a/packages/harbour/lib/src/apps/news/widgets/folder_view.dart b/packages/neon/lib/src/apps/news/widgets/folder_view.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/widgets/folder_view.dart rename to packages/neon/lib/src/apps/news/widgets/folder_view.dart diff --git a/packages/harbour/lib/src/apps/news/widgets/folders_view.dart b/packages/neon/lib/src/apps/news/widgets/folders_view.dart similarity index 100% rename from packages/harbour/lib/src/apps/news/widgets/folders_view.dart rename to packages/neon/lib/src/apps/news/widgets/folders_view.dart diff --git a/packages/harbour/lib/src/apps/notes/app.dart b/packages/neon/lib/src/apps/notes/app.dart similarity index 97% rename from packages/harbour/lib/src/apps/notes/app.dart rename to packages/neon/lib/src/apps/notes/app.dart index 00388980..95413951 100644 --- a/packages/harbour/lib/src/apps/notes/app.dart +++ b/packages/neon/lib/src/apps/notes/app.dart @@ -5,9 +5,9 @@ import 'dart:convert'; import 'package:crypto/crypto.dart'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; -import 'package:harbour/src/harbour.dart'; import 'package:intersperse/intersperse.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/harbour/lib/src/apps/notes/blocs/notes.dart b/packages/neon/lib/src/apps/notes/blocs/notes.dart similarity index 98% rename from packages/harbour/lib/src/apps/notes/blocs/notes.dart rename to packages/neon/lib/src/apps/notes/blocs/notes.dart index f2eb40ca..939e39dc 100644 --- a/packages/harbour/lib/src/apps/notes/blocs/notes.dart +++ b/packages/neon/lib/src/apps/notes/blocs/notes.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/harbour/lib/src/apps/notes/blocs/notes.rxb.g.dart b/packages/neon/lib/src/apps/notes/blocs/notes.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/blocs/notes.rxb.g.dart rename to packages/neon/lib/src/apps/notes/blocs/notes.rxb.g.dart diff --git a/packages/harbour/lib/src/apps/notes/dialogs/create_note.dart b/packages/neon/lib/src/apps/notes/dialogs/create_note.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/dialogs/create_note.dart rename to packages/neon/lib/src/apps/notes/dialogs/create_note.dart diff --git a/packages/harbour/lib/src/apps/notes/dialogs/select_category.dart b/packages/neon/lib/src/apps/notes/dialogs/select_category.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/dialogs/select_category.dart rename to packages/neon/lib/src/apps/notes/dialogs/select_category.dart diff --git a/packages/harbour/lib/src/apps/notes/options.dart b/packages/neon/lib/src/apps/notes/options.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/options.dart rename to packages/neon/lib/src/apps/notes/options.dart diff --git a/packages/harbour/lib/src/apps/notes/pages/category.dart b/packages/neon/lib/src/apps/notes/pages/category.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/pages/category.dart rename to packages/neon/lib/src/apps/notes/pages/category.dart diff --git a/packages/harbour/lib/src/apps/notes/pages/main.dart b/packages/neon/lib/src/apps/notes/pages/main.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/pages/main.dart rename to packages/neon/lib/src/apps/notes/pages/main.dart diff --git a/packages/harbour/lib/src/apps/notes/pages/note.dart b/packages/neon/lib/src/apps/notes/pages/note.dart similarity index 97% rename from packages/harbour/lib/src/apps/notes/pages/note.dart rename to packages/neon/lib/src/apps/notes/pages/note.dart index 5c0f0835..918053e5 100644 --- a/packages/harbour/lib/src/apps/notes/pages/note.dart +++ b/packages/neon/lib/src/apps/notes/pages/note.dart @@ -68,7 +68,7 @@ class _NotesNotePageState extends State { }); WidgetsBinding.instance.addPostFrameCallback((final _) { - if (Provider.of(context, listen: false).canUseWakelock) { + if (Provider.of(context, listen: false).canUseWakelock) { Wakelock.enable(); } if (widget.bloc.options.defaultNoteViewTypeOption.value == DefaultNoteViewType.edit || @@ -93,7 +93,7 @@ class _NotesNotePageState extends State { onWillPop: () async { _update(); - if (Provider.of(context, listen: false).canUseWakelock) { + if (Provider.of(context, listen: false).canUseWakelock) { await Wakelock.disable(); } return true; diff --git a/packages/harbour/lib/src/apps/notes/sort/categories.dart b/packages/neon/lib/src/apps/notes/sort/categories.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/sort/categories.dart rename to packages/neon/lib/src/apps/notes/sort/categories.dart diff --git a/packages/harbour/lib/src/apps/notes/sort/notes.dart b/packages/neon/lib/src/apps/notes/sort/notes.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/sort/notes.dart rename to packages/neon/lib/src/apps/notes/sort/notes.dart diff --git a/packages/harbour/lib/src/apps/notes/utils/category_color.dart b/packages/neon/lib/src/apps/notes/utils/category_color.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/utils/category_color.dart rename to packages/neon/lib/src/apps/notes/utils/category_color.dart diff --git a/packages/harbour/lib/src/apps/notes/utils/exception_handler.dart b/packages/neon/lib/src/apps/notes/utils/exception_handler.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/utils/exception_handler.dart rename to packages/neon/lib/src/apps/notes/utils/exception_handler.dart diff --git a/packages/harbour/lib/src/apps/notes/widgets/categories_view.dart b/packages/neon/lib/src/apps/notes/widgets/categories_view.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/widgets/categories_view.dart rename to packages/neon/lib/src/apps/notes/widgets/categories_view.dart diff --git a/packages/harbour/lib/src/apps/notes/widgets/category_select.dart b/packages/neon/lib/src/apps/notes/widgets/category_select.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/widgets/category_select.dart rename to packages/neon/lib/src/apps/notes/widgets/category_select.dart diff --git a/packages/harbour/lib/src/apps/notes/widgets/notes_view.dart b/packages/neon/lib/src/apps/notes/widgets/notes_view.dart similarity index 100% rename from packages/harbour/lib/src/apps/notes/widgets/notes_view.dart rename to packages/neon/lib/src/apps/notes/widgets/notes_view.dart diff --git a/packages/harbour/lib/src/blocs/accounts.dart b/packages/neon/lib/src/blocs/accounts.dart similarity index 99% rename from packages/harbour/lib/src/blocs/accounts.dart rename to packages/neon/lib/src/blocs/accounts.dart index ec0c1800..a299ee2a 100644 --- a/packages/harbour/lib/src/blocs/accounts.dart +++ b/packages/neon/lib/src/blocs/accounts.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/packages/harbour/lib/src/blocs/accounts.rxb.g.dart b/packages/neon/lib/src/blocs/accounts.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/blocs/accounts.rxb.g.dart rename to packages/neon/lib/src/blocs/accounts.rxb.g.dart diff --git a/packages/harbour/lib/src/blocs/apps.dart b/packages/neon/lib/src/blocs/apps.dart similarity index 99% rename from packages/harbour/lib/src/blocs/apps.dart rename to packages/neon/lib/src/blocs/apps.dart index 3bb6d60f..21f4c276 100644 --- a/packages/harbour/lib/src/blocs/apps.dart +++ b/packages/neon/lib/src/blocs/apps.dart @@ -1,4 +1,4 @@ -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/harbour/lib/src/blocs/apps.rxb.g.dart b/packages/neon/lib/src/blocs/apps.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/blocs/apps.rxb.g.dart rename to packages/neon/lib/src/blocs/apps.rxb.g.dart diff --git a/packages/harbour/lib/src/blocs/capabilities.dart b/packages/neon/lib/src/blocs/capabilities.dart similarity index 97% rename from packages/harbour/lib/src/blocs/capabilities.dart rename to packages/neon/lib/src/blocs/capabilities.dart index ea6a0a5d..28cd87d1 100644 --- a/packages/harbour/lib/src/blocs/capabilities.dart +++ b/packages/neon/lib/src/blocs/capabilities.dart @@ -1,4 +1,4 @@ -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/harbour/lib/src/blocs/capabilities.rxb.g.dart b/packages/neon/lib/src/blocs/capabilities.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/blocs/capabilities.rxb.g.dart rename to packages/neon/lib/src/blocs/capabilities.rxb.g.dart diff --git a/packages/harbour/lib/src/blocs/login.dart b/packages/neon/lib/src/blocs/login.dart similarity index 98% rename from packages/harbour/lib/src/blocs/login.dart rename to packages/neon/lib/src/blocs/login.dart index 12158935..6b8f5806 100644 --- a/packages/harbour/lib/src/blocs/login.dart +++ b/packages/neon/lib/src/blocs/login.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/harbour/lib/src/blocs/login.rxb.g.dart b/packages/neon/lib/src/blocs/login.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/blocs/login.rxb.g.dart rename to packages/neon/lib/src/blocs/login.rxb.g.dart diff --git a/packages/harbour/lib/src/blocs/user_details.dart b/packages/neon/lib/src/blocs/user_details.dart similarity index 96% rename from packages/harbour/lib/src/blocs/user_details.dart rename to packages/neon/lib/src/blocs/user_details.dart index 27fb9dc2..c068ae78 100644 --- a/packages/harbour/lib/src/blocs/user_details.dart +++ b/packages/neon/lib/src/blocs/user_details.dart @@ -1,4 +1,4 @@ -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; diff --git a/packages/harbour/lib/src/blocs/user_details.rxb.g.dart b/packages/neon/lib/src/blocs/user_details.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/blocs/user_details.rxb.g.dart rename to packages/neon/lib/src/blocs/user_details.rxb.g.dart diff --git a/packages/harbour/lib/src/blocs/user_status.dart b/packages/neon/lib/src/blocs/user_status.dart similarity index 95% rename from packages/harbour/lib/src/blocs/user_status.dart rename to packages/neon/lib/src/blocs/user_status.dart index 22e209cb..d81e9d2a 100644 --- a/packages/harbour/lib/src/blocs/user_status.dart +++ b/packages/neon/lib/src/blocs/user_status.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:harbour/src/harbour.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rx_bloc/rx_bloc.dart'; import 'package:rxdart/rxdart.dart'; @@ -52,7 +52,7 @@ class UserStatusBloc extends $UserStatusBloc { Future _heartbeat() async { return; - // TODO: https://github.com/jld3103/nextcloud-harbour/issues/10 + // TODO: https://github.com/jld3103/nextcloud-neon/issues/10 // ignore: dead_code try { await _account.client.userStatus.heartbeat(UserStatusHeartbeat(status: UserStatusTypeEnum.online)); diff --git a/packages/harbour/lib/src/blocs/user_status.rxb.g.dart b/packages/neon/lib/src/blocs/user_status.rxb.g.dart similarity index 100% rename from packages/harbour/lib/src/blocs/user_status.rxb.g.dart rename to packages/neon/lib/src/blocs/user_status.rxb.g.dart diff --git a/packages/harbour/lib/src/models/account.dart b/packages/neon/lib/src/models/account.dart similarity index 94% rename from packages/harbour/lib/src/models/account.dart rename to packages/neon/lib/src/models/account.dart index 55995326..527db1cc 100644 --- a/packages/harbour/lib/src/models/account.dart +++ b/packages/neon/lib/src/models/account.dart @@ -1,15 +1,15 @@ import 'dart:convert'; import 'package:crypto/crypto.dart'; -import 'package:harbour/src/harbour.dart'; import 'package:json_annotation/json_annotation.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:rxdart/rxdart.dart'; import 'package:settings/settings.dart'; part 'account.g.dart'; -String userAgentOverride() => 'Harbour ${Global.packageInfo.version}+${Global.packageInfo.buildNumber}'; +String userAgentOverride() => 'Neon ${Global.packageInfo.version}+${Global.packageInfo.buildNumber}'; @JsonSerializable() class Account { diff --git a/packages/harbour/lib/src/models/account.g.dart b/packages/neon/lib/src/models/account.g.dart similarity index 100% rename from packages/harbour/lib/src/models/account.g.dart rename to packages/neon/lib/src/models/account.g.dart diff --git a/packages/harbour/lib/src/harbour.dart b/packages/neon/lib/src/neon.dart similarity index 72% rename from packages/harbour/lib/src/harbour.dart rename to packages/neon/lib/src/neon.dart index d67139e8..9a15bde2 100644 --- a/packages/harbour/lib/src/harbour.dart +++ b/packages/neon/lib/src/neon.dart @@ -1,4 +1,4 @@ -library harbour; +library neon; import 'dart:async'; import 'dart:convert'; @@ -13,10 +13,10 @@ import 'package:flutter/services.dart'; import 'package:flutter_file_dialog/flutter_file_dialog.dart'; import 'package:flutter_rx_bloc/flutter_rx_bloc.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:harbour/src/harbour.dart'; import 'package:http/http.dart'; import 'package:http/http.dart' as http; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:neon/src/neon.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:path/path.dart' as p; @@ -37,23 +37,23 @@ import 'package:webview_flutter/webview_flutter.dart'; import 'package:window_manager/window_manager.dart'; import 'package:xdg_directories/xdg_directories.dart' as xdg; -export 'package:harbour/l10n/localizations.dart'; -export 'package:harbour/src/apps/files/app.dart' show FilesApp, FilesAppSpecificOptions; -export 'package:harbour/src/apps/files/blocs/files.dart'; -export 'package:harbour/src/apps/news/app.dart' show NewsApp, NewsAppSpecificOptions; -export 'package:harbour/src/apps/news/blocs/articles.dart'; -export 'package:harbour/src/apps/news/blocs/news.dart'; -export 'package:harbour/src/apps/notes/app.dart' show NotesApp, NotesAppSpecificOptions; -export 'package:harbour/src/apps/notes/blocs/notes.dart'; -export 'package:harbour/src/blocs/accounts.dart'; -export 'package:harbour/src/blocs/apps.dart'; -export 'package:harbour/src/blocs/capabilities.dart'; -export 'package:harbour/src/blocs/login.dart'; -export 'package:harbour/src/blocs/user_details.dart'; -export 'package:harbour/src/blocs/user_status.dart'; -export 'package:harbour/src/harbour.dart'; -export 'package:harbour/src/models/account.dart'; -export 'package:harbour/src/widgets/custom_auto_complete.dart'; +export 'package:neon/l10n/localizations.dart'; +export 'package:neon/src/apps/files/app.dart' show FilesApp, FilesAppSpecificOptions; +export 'package:neon/src/apps/files/blocs/files.dart'; +export 'package:neon/src/apps/news/app.dart' show NewsApp, NewsAppSpecificOptions; +export 'package:neon/src/apps/news/blocs/articles.dart'; +export 'package:neon/src/apps/news/blocs/news.dart'; +export 'package:neon/src/apps/notes/app.dart' show NotesApp, NotesAppSpecificOptions; +export 'package:neon/src/apps/notes/blocs/notes.dart'; +export 'package:neon/src/blocs/accounts.dart'; +export 'package:neon/src/blocs/apps.dart'; +export 'package:neon/src/blocs/capabilities.dart'; +export 'package:neon/src/blocs/login.dart'; +export 'package:neon/src/blocs/user_details.dart'; +export 'package:neon/src/blocs/user_status.dart'; +export 'package:neon/src/models/account.dart'; +export 'package:neon/src/neon.dart'; +export 'package:neon/src/widgets/custom_auto_complete.dart'; part 'pages/home/home.dart'; part 'pages/home/widgets/server_status.dart'; @@ -90,7 +90,7 @@ part 'widgets/custom_dialog.dart'; part 'widgets/custom_linear_progress_indicator.dart'; part 'widgets/custom_listview.dart'; part 'widgets/exception.dart'; -part 'widgets/harbour_logo.dart'; +part 'widgets/neon_logo.dart'; part 'widgets/nextcloud_logo.dart'; part 'widgets/result_stream_builder.dart'; part 'widgets/standard_rx_result_builder.dart'; diff --git a/packages/harbour/lib/src/pages/home/home.dart b/packages/neon/lib/src/pages/home/home.dart similarity index 98% rename from packages/harbour/lib/src/pages/home/home.dart rename to packages/neon/lib/src/pages/home/home.dart index f62a8736..e3df6145 100644 --- a/packages/harbour/lib/src/pages/home/home.dart +++ b/packages/neon/lib/src/pages/home/home.dart @@ -1,4 +1,4 @@ -part of '../../harbour.dart'; +part of '../../neon.dart'; class HomePage extends StatefulWidget { const HomePage({ @@ -20,7 +20,7 @@ class _HomePageState extends State with tray.TrayListener, WindowListe final _scaffoldKey = GlobalKey(); - late HarbourPlatform _platform; + late NeonPlatform _platform; late GlobalOptions _globalOptions; late RequestManager _requestManager; late CapabilitiesBloc _capabilitiesBloc; @@ -32,7 +32,7 @@ class _HomePageState extends State with tray.TrayListener, WindowListe void initState() { super.initState(); - _platform = Provider.of(context, listen: false); + _platform = Provider.of(context, listen: false); _globalOptions = Provider.of(context, listen: false); if (_platform.canUseSystemTray) { @@ -89,7 +89,7 @@ class _HomePageState extends State with tray.TrayListener, WindowListe _globalOptions.systemTrayEnabled.stream.listen((final enabled) async { if (enabled) { // TODO: This works on Linux, but maybe not on macOS or Windows - await tray.trayManager.setIcon('assets/logo_harbour.svg'); + await tray.trayManager.setIcon('assets/logo_neon.svg'); if (mounted) { await tray.trayManager.setContextMenu( tray.Menu( diff --git a/packages/harbour/lib/src/pages/home/widgets/server_status.dart b/packages/neon/lib/src/pages/home/widgets/server_status.dart similarity index 96% rename from packages/harbour/lib/src/pages/home/widgets/server_status.dart rename to packages/neon/lib/src/pages/home/widgets/server_status.dart index e8fbe3ec..8d5aa9b6 100644 --- a/packages/harbour/lib/src/pages/home/widgets/server_status.dart +++ b/packages/neon/lib/src/pages/home/widgets/server_status.dart @@ -1,4 +1,4 @@ -part of '../../../harbour.dart'; +part of '../../../neon.dart'; class ServerStatus extends StatefulWidget { const ServerStatus({ diff --git a/packages/harbour/lib/src/pages/login/login.dart b/packages/neon/lib/src/pages/login/login.dart similarity index 97% rename from packages/harbour/lib/src/pages/login/login.dart rename to packages/neon/lib/src/pages/login/login.dart index a3effbb1..ab50c8d1 100644 --- a/packages/harbour/lib/src/pages/login/login.dart +++ b/packages/neon/lib/src/pages/login/login.dart @@ -1,4 +1,4 @@ -part of '../../harbour.dart'; +part of '../../neon.dart'; class LoginPage extends StatefulWidget { const LoginPage({ @@ -27,7 +27,7 @@ class _LoginPageState extends State { } _loginBloc.loginFlowInit.listen((final init) { - if (init != null && !Provider.of(context, listen: false).canUseWebView) { + if (init != null && !Provider.of(context, listen: false).canUseWebView) { WidgetsBinding.instance.addPostFrameCallback((final _) async { await launchUrlString( init.login!, @@ -121,7 +121,7 @@ class _LoginPageState extends State { icon: const Icon(Icons.arrow_back), ), actions: [ - if (serverURLSnapshot.hasData && Provider.of(context).canUseWebView) ...[ + if (serverURLSnapshot.hasData && Provider.of(context).canUseWebView) ...[ IconButton( onPressed: () { _loginBloc.setServerURL(serverURLSnapshot.data); @@ -133,7 +133,7 @@ class _LoginPageState extends State { ) : null, body: serverConnectionStateSnapshot.data == ServerConnectionState.success - ? Provider.of(context).canUseWebView + ? Provider.of(context).canUseWebView ? WebView( javascriptMode: JavascriptMode.unrestricted, zoomEnabled: false, @@ -190,7 +190,7 @@ class _LoginPageState extends State { height: MediaQuery.of(context).size.height / 2, child: Column( children: [ - const HarbourLogo(), + const NeonLogo(), const SizedBox( height: 30, ), diff --git a/packages/harbour/lib/src/pages/settings/account_specific_settings.dart b/packages/neon/lib/src/pages/settings/account_specific_settings.dart similarity index 97% rename from packages/harbour/lib/src/pages/settings/account_specific_settings.dart rename to packages/neon/lib/src/pages/settings/account_specific_settings.dart index 808271b7..d87036a3 100644 --- a/packages/harbour/lib/src/pages/settings/account_specific_settings.dart +++ b/packages/neon/lib/src/pages/settings/account_specific_settings.dart @@ -1,4 +1,4 @@ -part of '../../harbour.dart'; +part of '../../neon.dart'; class AccountSpecificSettingsPage extends StatelessWidget { AccountSpecificSettingsPage({ diff --git a/packages/harbour/lib/src/pages/settings/nextcloud_app_specific_settings.dart b/packages/neon/lib/src/pages/settings/nextcloud_app_specific_settings.dart similarity index 98% rename from packages/harbour/lib/src/pages/settings/nextcloud_app_specific_settings.dart rename to packages/neon/lib/src/pages/settings/nextcloud_app_specific_settings.dart index 8dea7275..04c085e3 100644 --- a/packages/harbour/lib/src/pages/settings/nextcloud_app_specific_settings.dart +++ b/packages/neon/lib/src/pages/settings/nextcloud_app_specific_settings.dart @@ -1,4 +1,4 @@ -part of '../../harbour.dart'; +part of '../../neon.dart'; class NextcloudAppSpecificSettingsPage extends StatelessWidget { const NextcloudAppSpecificSettingsPage({ diff --git a/packages/harbour/lib/src/pages/settings/settings.dart b/packages/neon/lib/src/pages/settings/settings.dart similarity index 97% rename from packages/harbour/lib/src/pages/settings/settings.dart rename to packages/neon/lib/src/pages/settings/settings.dart index d281724e..06827e13 100644 --- a/packages/harbour/lib/src/pages/settings/settings.dart +++ b/packages/neon/lib/src/pages/settings/settings.dart @@ -1,4 +1,4 @@ -part of '../../harbour.dart'; +part of '../../neon.dart'; class SettingsPage extends StatefulWidget { const SettingsPage({ @@ -39,7 +39,7 @@ class _SettingsPageState extends State { }, }, ); - final platform = Provider.of(context, listen: false); + final platform = Provider.of(context, listen: false); return RxBlocBuilder( bloc: accountsBloc, state: (final bloc) => bloc.activeAccount, @@ -210,7 +210,7 @@ class _SettingsPageState extends State { showLicensePage( context: context, applicationName: AppLocalizations.of(context).appName, - applicationIcon: const HarbourLogo( + applicationIcon: const NeonLogo( withoutText: true, ), applicationLegalese: await rootBundle.loadString('assets/LEGALESE.txt'), @@ -227,7 +227,7 @@ class _SettingsPageState extends State { onTap: () async { try { final fileName = - 'nextcloud-harbour-settings-${DateTime.now().millisecondsSinceEpoch ~/ 1000}.json.base64'; + 'nextcloud-neon-settings-${DateTime.now().millisecondsSinceEpoch ~/ 1000}.json.base64'; final data = base64.encode( utf8.encode( json.encode( diff --git a/packages/harbour/lib/src/pages/settings/widgets/account_settings_tile.dart b/packages/neon/lib/src/pages/settings/widgets/account_settings_tile.dart similarity index 92% rename from packages/harbour/lib/src/pages/settings/widgets/account_settings_tile.dart rename to packages/neon/lib/src/pages/settings/widgets/account_settings_tile.dart index 07c5acc5..336e049a 100644 --- a/packages/harbour/lib/src/pages/settings/widgets/account_settings_tile.dart +++ b/packages/neon/lib/src/pages/settings/widgets/account_settings_tile.dart @@ -1,4 +1,4 @@ -part of '../../../harbour.dart'; +part of '../../../neon.dart'; class AccountSettingsTile extends SettingsTile { const AccountSettingsTile({ diff --git a/packages/harbour/lib/src/platforms/abstract.dart b/packages/neon/lib/src/platforms/abstract.dart similarity index 89% rename from packages/harbour/lib/src/platforms/abstract.dart rename to packages/neon/lib/src/platforms/abstract.dart index a64f974d..6c5bdae5 100644 --- a/packages/harbour/lib/src/platforms/abstract.dart +++ b/packages/neon/lib/src/platforms/abstract.dart @@ -1,7 +1,7 @@ -part of '../harbour.dart'; +part of '../neon.dart'; -abstract class HarbourPlatform { - HarbourPlatform({ +abstract class NeonPlatform { + NeonPlatform({ required this.canUseWebView, required this.canUseWakelock, required this.canUseQuickActions, diff --git a/packages/harbour/lib/src/platforms/android.dart b/packages/neon/lib/src/platforms/android.dart similarity index 84% rename from packages/harbour/lib/src/platforms/android.dart rename to packages/neon/lib/src/platforms/android.dart index e9dac549..fd44b065 100644 --- a/packages/harbour/lib/src/platforms/android.dart +++ b/packages/neon/lib/src/platforms/android.dart @@ -1,7 +1,7 @@ -part of '../harbour.dart'; +part of '../neon.dart'; -class AndroidHarbourPlatform extends HarbourPlatform { - AndroidHarbourPlatform() +class AndroidNeonPlatform extends NeonPlatform { + AndroidNeonPlatform() : super( canUseWebView: true, canUseWakelock: true, diff --git a/packages/harbour/lib/src/platforms/linux.dart b/packages/neon/lib/src/platforms/linux.dart similarity index 74% rename from packages/harbour/lib/src/platforms/linux.dart rename to packages/neon/lib/src/platforms/linux.dart index 4016b831..a38760fc 100644 --- a/packages/harbour/lib/src/platforms/linux.dart +++ b/packages/neon/lib/src/platforms/linux.dart @@ -1,7 +1,7 @@ -part of '../harbour.dart'; +part of '../neon.dart'; -class LinuxHarbourPlatform extends HarbourPlatform { - LinuxHarbourPlatform() +class LinuxNeonPlatform extends NeonPlatform { + LinuxNeonPlatform() : super( canUseWebView: false, canUseWakelock: false, @@ -11,9 +11,9 @@ class LinuxHarbourPlatform extends HarbourPlatform { canUseCamera: false, getApplicationCachePath: () async => p.join( xdg.cacheHome.absolute.path, - 'de.provokateurin.harbour', + 'de.provokateurin.neon', ), - getUserAccessibleAppDataPath: () async => p.join(Platform.environment['HOME']!, 'Harbour'), + getUserAccessibleAppDataPath: () async => p.join(Platform.environment['HOME']!, 'Neon'), init: () async { sqfliteFfiInit(); databaseFactory = databaseFactoryFfi; diff --git a/packages/harbour/lib/src/utils/app_implementation.dart b/packages/neon/lib/src/utils/app_implementation.dart similarity index 97% rename from packages/harbour/lib/src/utils/app_implementation.dart rename to packages/neon/lib/src/utils/app_implementation.dart index 7ab649b0..c0b16097 100644 --- a/packages/harbour/lib/src/utils/app_implementation.dart +++ b/packages/neon/lib/src/utils/app_implementation.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; abstract class AppImplementation { AppImplementation( diff --git a/packages/harbour/lib/src/utils/confirmation_dialog.dart b/packages/neon/lib/src/utils/confirmation_dialog.dart similarity index 97% rename from packages/harbour/lib/src/utils/confirmation_dialog.dart rename to packages/neon/lib/src/utils/confirmation_dialog.dart index 37d27466..775460a8 100644 --- a/packages/harbour/lib/src/utils/confirmation_dialog.dart +++ b/packages/neon/lib/src/utils/confirmation_dialog.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; Future showConfirmationDialog(final BuildContext context, final String title) async => await showDialog( diff --git a/packages/harbour/lib/src/utils/custom_timeago.dart b/packages/neon/lib/src/utils/custom_timeago.dart similarity index 96% rename from packages/harbour/lib/src/utils/custom_timeago.dart rename to packages/neon/lib/src/utils/custom_timeago.dart index 751c6077..983ffd69 100644 --- a/packages/harbour/lib/src/utils/custom_timeago.dart +++ b/packages/neon/lib/src/utils/custom_timeago.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class CustomTimeAgo { static String format(final DateTime date) { diff --git a/packages/harbour/lib/src/utils/env.dart b/packages/neon/lib/src/utils/env.dart similarity index 93% rename from packages/harbour/lib/src/utils/env.dart rename to packages/neon/lib/src/utils/env.dart index 370ccbd5..66c01878 100644 --- a/packages/harbour/lib/src/utils/env.dart +++ b/packages/neon/lib/src/utils/env.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class Env { Env({ diff --git a/packages/harbour/lib/src/utils/global.dart b/packages/neon/lib/src/utils/global.dart similarity index 84% rename from packages/harbour/lib/src/utils/global.dart rename to packages/neon/lib/src/utils/global.dart index 77756937..bc3bea51 100644 --- a/packages/harbour/lib/src/utils/global.dart +++ b/packages/neon/lib/src/utils/global.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class Global { static Future init() async { diff --git a/packages/harbour/lib/src/utils/global_options.dart b/packages/neon/lib/src/utils/global_options.dart similarity index 99% rename from packages/harbour/lib/src/utils/global_options.dart rename to packages/neon/lib/src/utils/global_options.dart index fb5fd8e0..0dfc4cbf 100644 --- a/packages/harbour/lib/src/utils/global_options.dart +++ b/packages/neon/lib/src/utils/global_options.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class GlobalOptions { GlobalOptions(this._storage) { diff --git a/packages/harbour/lib/src/utils/hex_color.dart b/packages/neon/lib/src/utils/hex_color.dart similarity index 89% rename from packages/harbour/lib/src/utils/hex_color.dart rename to packages/neon/lib/src/utils/hex_color.dart index 5ade3dd6..9a6ae42c 100644 --- a/packages/harbour/lib/src/utils/hex_color.dart +++ b/packages/neon/lib/src/utils/hex_color.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class HexColor extends Color { HexColor(final String hexColor) diff --git a/packages/harbour/lib/src/utils/missing_permission_exception.dart b/packages/neon/lib/src/utils/missing_permission_exception.dart similarity index 83% rename from packages/harbour/lib/src/utils/missing_permission_exception.dart rename to packages/neon/lib/src/utils/missing_permission_exception.dart index 1f18ad10..9b86c9ae 100644 --- a/packages/harbour/lib/src/utils/missing_permission_exception.dart +++ b/packages/neon/lib/src/utils/missing_permission_exception.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class MissingPermissionException implements Exception { MissingPermissionException(this.permission); diff --git a/packages/harbour/lib/src/utils/nextcloud_app_specific_options.dart b/packages/neon/lib/src/utils/nextcloud_app_specific_options.dart similarity index 91% rename from packages/harbour/lib/src/utils/nextcloud_app_specific_options.dart rename to packages/neon/lib/src/utils/nextcloud_app_specific_options.dart index b8292628..5953f3d6 100644 --- a/packages/harbour/lib/src/utils/nextcloud_app_specific_options.dart +++ b/packages/neon/lib/src/utils/nextcloud_app_specific_options.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; abstract class NextcloudAppSpecificOptions { NextcloudAppSpecificOptions(this.storage); diff --git a/packages/harbour/lib/src/utils/rename_dialog.dart b/packages/neon/lib/src/utils/rename_dialog.dart similarity index 98% rename from packages/harbour/lib/src/utils/rename_dialog.dart rename to packages/neon/lib/src/utils/rename_dialog.dart index 9579c385..56399086 100644 --- a/packages/harbour/lib/src/utils/rename_dialog.dart +++ b/packages/neon/lib/src/utils/rename_dialog.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; Future showRenameDialog({ required final BuildContext context, diff --git a/packages/harbour/lib/src/utils/request_manager.dart b/packages/neon/lib/src/utils/request_manager.dart similarity index 99% rename from packages/harbour/lib/src/utils/request_manager.dart rename to packages/neon/lib/src/utils/request_manager.dart index 945598bc..ac564908 100644 --- a/packages/harbour/lib/src/utils/request_manager.dart +++ b/packages/neon/lib/src/utils/request_manager.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class RequestManager { RequestManager(this._cache); @@ -178,7 +178,7 @@ class RequestManager { class Cache { Cache(this._platform); - final HarbourPlatform _platform; + final NeonPlatform _platform; Database? _database; Future init() async { diff --git a/packages/harbour/lib/src/utils/save_file.dart b/packages/neon/lib/src/utils/save_file.dart similarity index 83% rename from packages/harbour/lib/src/utils/save_file.dart rename to packages/neon/lib/src/utils/save_file.dart index 88779980..373001b0 100644 --- a/packages/harbour/lib/src/utils/save_file.dart +++ b/packages/neon/lib/src/utils/save_file.dart @@ -1,8 +1,8 @@ -part of '../harbour.dart'; +part of '../neon.dart'; Future saveFileWithPickDialog(final String fileName, final Uint8List data) async { if (Platform.isAndroid || Platform.isIOS) { - // TODO: https://github.com/jld3103/nextcloud-harbour/issues/8 + // TODO: https://github.com/jld3103/nextcloud-neon/issues/8 return FlutterFileDialog.saveFile( params: SaveFileDialogParams( data: data, diff --git a/packages/harbour/lib/src/utils/settings_export_helper.dart b/packages/neon/lib/src/utils/settings_export_helper.dart similarity index 99% rename from packages/harbour/lib/src/utils/settings_export_helper.dart rename to packages/neon/lib/src/utils/settings_export_helper.dart index 85fbacf0..62c73550 100644 --- a/packages/harbour/lib/src/utils/settings_export_helper.dart +++ b/packages/neon/lib/src/utils/settings_export_helper.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class SettingsExportHelper { SettingsExportHelper({ diff --git a/packages/harbour/lib/src/utils/sort_box_builder.dart b/packages/neon/lib/src/utils/sort_box_builder.dart similarity index 97% rename from packages/harbour/lib/src/utils/sort_box_builder.dart rename to packages/neon/lib/src/utils/sort_box_builder.dart index 6b52af23..b5f9eb16 100644 --- a/packages/harbour/lib/src/utils/sort_box_builder.dart +++ b/packages/neon/lib/src/utils/sort_box_builder.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class SortBoxBuilder extends StatelessWidget { const SortBoxBuilder({ diff --git a/packages/harbour/lib/src/utils/sort_box_order_option_values.dart b/packages/neon/lib/src/utils/sort_box_order_option_values.dart similarity index 90% rename from packages/harbour/lib/src/utils/sort_box_order_option_values.dart rename to packages/neon/lib/src/utils/sort_box_order_option_values.dart index 8245c80f..4a4553f1 100644 --- a/packages/harbour/lib/src/utils/sort_box_order_option_values.dart +++ b/packages/neon/lib/src/utils/sort_box_order_option_values.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; final sortBoxOrderOptionValues = { SortBoxOrder.ascending: (final context) => AppLocalizations.of(context).optionsSortOrderAscending, diff --git a/packages/harbour/lib/src/utils/storage.dart b/packages/neon/lib/src/utils/storage.dart similarity index 97% rename from packages/harbour/lib/src/utils/storage.dart rename to packages/neon/lib/src/utils/storage.dart index a001b3fe..0e175a8f 100644 --- a/packages/harbour/lib/src/utils/storage.dart +++ b/packages/neon/lib/src/utils/storage.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class Storage extends SettingsStorage { Storage( diff --git a/packages/harbour/lib/src/utils/theme.dart b/packages/neon/lib/src/utils/theme.dart similarity index 99% rename from packages/harbour/lib/src/utils/theme.dart rename to packages/neon/lib/src/utils/theme.dart index afb3f693..4a71a1e1 100644 --- a/packages/harbour/lib/src/utils/theme.dart +++ b/packages/neon/lib/src/utils/theme.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; ThemeData getThemeFromNextcloudTheme( final NextcloudTheme? nextcloudTheme, diff --git a/packages/harbour/lib/src/utils/validators.dart b/packages/neon/lib/src/utils/validators.dart similarity index 96% rename from packages/harbour/lib/src/utils/validators.dart rename to packages/neon/lib/src/utils/validators.dart index bad8b964..c33d71db 100644 --- a/packages/harbour/lib/src/utils/validators.dart +++ b/packages/neon/lib/src/utils/validators.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; String? validateHttpUrl( final BuildContext context, diff --git a/packages/harbour/lib/src/widgets/account_avatar.dart b/packages/neon/lib/src/widgets/account_avatar.dart similarity index 99% rename from packages/harbour/lib/src/widgets/account_avatar.dart rename to packages/neon/lib/src/widgets/account_avatar.dart index 67db208f..cce38b10 100644 --- a/packages/harbour/lib/src/widgets/account_avatar.dart +++ b/packages/neon/lib/src/widgets/account_avatar.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; const kAvatarSize = 40.0; diff --git a/packages/harbour/lib/src/widgets/account_tile.dart b/packages/neon/lib/src/widgets/account_tile.dart similarity index 99% rename from packages/harbour/lib/src/widgets/account_tile.dart rename to packages/neon/lib/src/widgets/account_tile.dart index b494c634..2d386ed8 100644 --- a/packages/harbour/lib/src/widgets/account_tile.dart +++ b/packages/neon/lib/src/widgets/account_tile.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class AccountTile extends StatefulWidget { const AccountTile({ diff --git a/packages/harbour/lib/src/widgets/cached_url_image.dart b/packages/neon/lib/src/widgets/cached_url_image.dart similarity index 99% rename from packages/harbour/lib/src/widgets/cached_url_image.dart rename to packages/neon/lib/src/widgets/cached_url_image.dart index ce066d4d..f91352c2 100644 --- a/packages/harbour/lib/src/widgets/cached_url_image.dart +++ b/packages/neon/lib/src/widgets/cached_url_image.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class CachedURLImage extends StatelessWidget { const CachedURLImage({ diff --git a/packages/harbour/lib/src/widgets/custom_auto_complete.dart b/packages/neon/lib/src/widgets/custom_auto_complete.dart similarity index 100% rename from packages/harbour/lib/src/widgets/custom_auto_complete.dart rename to packages/neon/lib/src/widgets/custom_auto_complete.dart diff --git a/packages/harbour/lib/src/widgets/custom_dialog.dart b/packages/neon/lib/src/widgets/custom_dialog.dart similarity index 93% rename from packages/harbour/lib/src/widgets/custom_dialog.dart rename to packages/neon/lib/src/widgets/custom_dialog.dart index f22cf24a..7cbc6b84 100644 --- a/packages/harbour/lib/src/widgets/custom_dialog.dart +++ b/packages/neon/lib/src/widgets/custom_dialog.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class CustomDialog extends StatelessWidget { const CustomDialog({ diff --git a/packages/harbour/lib/src/widgets/custom_linear_progress_indicator.dart b/packages/neon/lib/src/widgets/custom_linear_progress_indicator.dart similarity index 94% rename from packages/harbour/lib/src/widgets/custom_linear_progress_indicator.dart rename to packages/neon/lib/src/widgets/custom_linear_progress_indicator.dart index 62ac8e35..0637103e 100644 --- a/packages/harbour/lib/src/widgets/custom_linear_progress_indicator.dart +++ b/packages/neon/lib/src/widgets/custom_linear_progress_indicator.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class CustomLinearProgressIndicator extends StatelessWidget { const CustomLinearProgressIndicator({ diff --git a/packages/harbour/lib/src/widgets/custom_listview.dart b/packages/neon/lib/src/widgets/custom_listview.dart similarity index 97% rename from packages/harbour/lib/src/widgets/custom_listview.dart rename to packages/neon/lib/src/widgets/custom_listview.dart index 8133ff98..59d0e054 100644 --- a/packages/harbour/lib/src/widgets/custom_listview.dart +++ b/packages/neon/lib/src/widgets/custom_listview.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class CustomListView extends StatelessWidget { const CustomListView({ diff --git a/packages/harbour/lib/src/widgets/exception.dart b/packages/neon/lib/src/widgets/exception.dart similarity index 99% rename from packages/harbour/lib/src/widgets/exception.dart rename to packages/neon/lib/src/widgets/exception.dart index c88b23a4..5114ee25 100644 --- a/packages/harbour/lib/src/widgets/exception.dart +++ b/packages/neon/lib/src/widgets/exception.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class ExceptionWidget extends StatelessWidget { const ExceptionWidget( diff --git a/packages/harbour/lib/src/widgets/harbour_logo.dart b/packages/neon/lib/src/widgets/neon_logo.dart similarity index 78% rename from packages/harbour/lib/src/widgets/harbour_logo.dart rename to packages/neon/lib/src/widgets/neon_logo.dart index d29b8891..2c5722eb 100644 --- a/packages/harbour/lib/src/widgets/harbour_logo.dart +++ b/packages/neon/lib/src/widgets/neon_logo.dart @@ -1,7 +1,7 @@ -part of '../harbour.dart'; +part of '../neon.dart'; -class HarbourLogo extends StatelessWidget { - const HarbourLogo({ +class NeonLogo extends StatelessWidget { + const NeonLogo({ this.withoutText = false, super.key, }); @@ -12,7 +12,7 @@ class HarbourLogo extends StatelessWidget { Widget build(final BuildContext context) => Column( children: [ SvgPicture.asset( - 'assets/logo_harbour.svg', + 'assets/logo_neon.svg', width: 100, height: 100, ), diff --git a/packages/harbour/lib/src/widgets/nextcloud_logo.dart b/packages/neon/lib/src/widgets/nextcloud_logo.dart similarity index 90% rename from packages/harbour/lib/src/widgets/nextcloud_logo.dart rename to packages/neon/lib/src/widgets/nextcloud_logo.dart index 3cd0ef48..bf456a3f 100644 --- a/packages/harbour/lib/src/widgets/nextcloud_logo.dart +++ b/packages/neon/lib/src/widgets/nextcloud_logo.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class NextcloudLogo extends StatelessWidget { const NextcloudLogo({ diff --git a/packages/harbour/lib/src/widgets/result_stream_builder.dart b/packages/neon/lib/src/widgets/result_stream_builder.dart similarity index 98% rename from packages/harbour/lib/src/widgets/result_stream_builder.dart rename to packages/neon/lib/src/widgets/result_stream_builder.dart index c88fb3da..0ae0a531 100644 --- a/packages/harbour/lib/src/widgets/result_stream_builder.dart +++ b/packages/neon/lib/src/widgets/result_stream_builder.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; class ResultStreamBuilder extends StatelessWidget { const ResultStreamBuilder({ diff --git a/packages/harbour/lib/src/widgets/standard_rx_result_builder.dart b/packages/neon/lib/src/widgets/standard_rx_result_builder.dart similarity index 97% rename from packages/harbour/lib/src/widgets/standard_rx_result_builder.dart rename to packages/neon/lib/src/widgets/standard_rx_result_builder.dart index 4b4512b5..0450dd78 100644 --- a/packages/harbour/lib/src/widgets/standard_rx_result_builder.dart +++ b/packages/neon/lib/src/widgets/standard_rx_result_builder.dart @@ -1,4 +1,4 @@ -part of '../harbour.dart'; +part of '../neon.dart'; // This is some weird false positive // ignore_for_file: use_late_for_private_fields_and_variables diff --git a/packages/harbour/linux/.gitignore b/packages/neon/linux/.gitignore similarity index 100% rename from packages/harbour/linux/.gitignore rename to packages/neon/linux/.gitignore diff --git a/packages/harbour/linux/CMakeLists.txt b/packages/neon/linux/CMakeLists.txt similarity index 98% rename from packages/harbour/linux/CMakeLists.txt rename to packages/neon/linux/CMakeLists.txt index e9307fe1..ae1721f3 100644 --- a/packages/harbour/linux/CMakeLists.txt +++ b/packages/neon/linux/CMakeLists.txt @@ -4,10 +4,10 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "harbour") +set(BINARY_NAME "nextcloud-neon") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "de.provokateurin.harbour") +set(APPLICATION_ID "de.provokateurin.neon") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/packages/harbour/linux/flutter/CMakeLists.txt b/packages/neon/linux/flutter/CMakeLists.txt similarity index 100% rename from packages/harbour/linux/flutter/CMakeLists.txt rename to packages/neon/linux/flutter/CMakeLists.txt diff --git a/packages/harbour/linux/flutter/generated_plugin_registrant.cc b/packages/neon/linux/flutter/generated_plugin_registrant.cc similarity index 100% rename from packages/harbour/linux/flutter/generated_plugin_registrant.cc rename to packages/neon/linux/flutter/generated_plugin_registrant.cc diff --git a/packages/harbour/linux/flutter/generated_plugin_registrant.h b/packages/neon/linux/flutter/generated_plugin_registrant.h similarity index 100% rename from packages/harbour/linux/flutter/generated_plugin_registrant.h rename to packages/neon/linux/flutter/generated_plugin_registrant.h diff --git a/packages/harbour/linux/flutter/generated_plugins.cmake b/packages/neon/linux/flutter/generated_plugins.cmake similarity index 100% rename from packages/harbour/linux/flutter/generated_plugins.cmake rename to packages/neon/linux/flutter/generated_plugins.cmake diff --git a/packages/harbour/linux/main.cc b/packages/neon/linux/main.cc similarity index 100% rename from packages/harbour/linux/main.cc rename to packages/neon/linux/main.cc diff --git a/packages/harbour/linux/my_application.cc b/packages/neon/linux/my_application.cc similarity index 95% rename from packages/harbour/linux/my_application.cc rename to packages/neon/linux/my_application.cc index e490356c..ec56935d 100644 --- a/packages/harbour/linux/my_application.cc +++ b/packages/neon/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "Harbour"); + gtk_header_bar_set_title(header_bar, "Neon"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "Harbour"); + gtk_window_set_title(window, "Neon"); } gtk_window_set_default_size(window, 1280, 720); @@ -53,7 +53,7 @@ static void my_application_activate(GApplication* application) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(GError) error = nullptr; - gtk_window_set_icon_from_file(window, g_strconcat(fl_dart_project_get_assets_path(project), "/assets/logo_harbour.svg", NULL), &error); + gtk_window_set_icon_from_file(window, g_strconcat(fl_dart_project_get_assets_path(project), "/assets/logo_neon.svg", NULL), &error); if (error != nullptr) { g_warning("Failed to set icon: %s", error->message); } diff --git a/packages/harbour/linux/my_application.h b/packages/neon/linux/my_application.h similarity index 100% rename from packages/harbour/linux/my_application.h rename to packages/neon/linux/my_application.h diff --git a/packages/harbour/mono_pkg.yaml b/packages/neon/mono_pkg.yaml similarity index 100% rename from packages/harbour/mono_pkg.yaml rename to packages/neon/mono_pkg.yaml diff --git a/packages/harbour/pubspec.lock b/packages/neon/pubspec.lock similarity index 100% rename from packages/harbour/pubspec.lock rename to packages/neon/pubspec.lock diff --git a/packages/harbour/pubspec.yaml b/packages/neon/pubspec.yaml similarity index 99% rename from packages/harbour/pubspec.yaml rename to packages/neon/pubspec.yaml index 15a7f826..1654daec 100644 --- a/packages/harbour/pubspec.yaml +++ b/packages/neon/pubspec.yaml @@ -1,4 +1,4 @@ -name: harbour +name: neon version: 1.0.0 publish_to: 'none' diff --git a/packages/harbour/screenshots/files_create.png b/packages/neon/screenshots/files_create.png similarity index 100% rename from packages/harbour/screenshots/files_create.png rename to packages/neon/screenshots/files_create.png diff --git a/packages/harbour/screenshots/files_details.png b/packages/neon/screenshots/files_details.png similarity index 100% rename from packages/harbour/screenshots/files_details.png rename to packages/neon/screenshots/files_details.png diff --git a/packages/harbour/screenshots/files_photos.png b/packages/neon/screenshots/files_photos.png similarity index 100% rename from packages/harbour/screenshots/files_photos.png rename to packages/neon/screenshots/files_photos.png diff --git a/packages/harbour/screenshots/files_root.png b/packages/neon/screenshots/files_root.png similarity index 100% rename from packages/harbour/screenshots/files_root.png rename to packages/neon/screenshots/files_root.png diff --git a/packages/harbour/screenshots/login.png b/packages/neon/screenshots/login.png similarity index 100% rename from packages/harbour/screenshots/login.png rename to packages/neon/screenshots/login.png diff --git a/packages/harbour/screenshots/login_server_selection.png b/packages/neon/screenshots/login_server_selection.png similarity index 100% rename from packages/harbour/screenshots/login_server_selection.png rename to packages/neon/screenshots/login_server_selection.png diff --git a/packages/harbour/screenshots/news_add_feed.png b/packages/neon/screenshots/news_add_feed.png similarity index 100% rename from packages/harbour/screenshots/news_add_feed.png rename to packages/neon/screenshots/news_add_feed.png diff --git a/packages/harbour/screenshots/news_articles_feed_list.png b/packages/neon/screenshots/news_articles_feed_list.png similarity index 100% rename from packages/harbour/screenshots/news_articles_feed_list.png rename to packages/neon/screenshots/news_articles_feed_list.png diff --git a/packages/harbour/screenshots/news_articles_starred_list.png b/packages/neon/screenshots/news_articles_starred_list.png similarity index 100% rename from packages/harbour/screenshots/news_articles_starred_list.png rename to packages/neon/screenshots/news_articles_starred_list.png diff --git a/packages/harbour/screenshots/news_articles_unread_list.png b/packages/neon/screenshots/news_articles_unread_list.png similarity index 100% rename from packages/harbour/screenshots/news_articles_unread_list.png rename to packages/neon/screenshots/news_articles_unread_list.png diff --git a/packages/harbour/screenshots/news_feeds_list.png b/packages/neon/screenshots/news_feeds_list.png similarity index 100% rename from packages/harbour/screenshots/news_feeds_list.png rename to packages/neon/screenshots/news_feeds_list.png diff --git a/packages/harbour/screenshots/news_folders_list.png b/packages/neon/screenshots/news_folders_list.png similarity index 100% rename from packages/harbour/screenshots/news_folders_list.png rename to packages/neon/screenshots/news_folders_list.png diff --git a/packages/harbour/screenshots/notes_categories_list.png b/packages/neon/screenshots/notes_categories_list.png similarity index 100% rename from packages/harbour/screenshots/notes_categories_list.png rename to packages/neon/screenshots/notes_categories_list.png diff --git a/packages/harbour/screenshots/notes_create.png b/packages/neon/screenshots/notes_create.png similarity index 100% rename from packages/harbour/screenshots/notes_create.png rename to packages/neon/screenshots/notes_create.png diff --git a/packages/harbour/screenshots/notes_edit.png b/packages/neon/screenshots/notes_edit.png similarity index 100% rename from packages/harbour/screenshots/notes_edit.png rename to packages/neon/screenshots/notes_edit.png diff --git a/packages/harbour/screenshots/notes_list.png b/packages/neon/screenshots/notes_list.png similarity index 100% rename from packages/harbour/screenshots/notes_list.png rename to packages/neon/screenshots/notes_list.png diff --git a/packages/harbour/screenshots/notes_preview.png b/packages/neon/screenshots/notes_preview.png similarity index 100% rename from packages/harbour/screenshots/notes_preview.png rename to packages/neon/screenshots/notes_preview.png diff --git a/packages/harbour/screenshots/settings_account.png b/packages/neon/screenshots/settings_account.png similarity index 100% rename from packages/harbour/screenshots/settings_account.png rename to packages/neon/screenshots/settings_account.png diff --git a/packages/harbour/screenshots/settings_files.png b/packages/neon/screenshots/settings_files.png similarity index 100% rename from packages/harbour/screenshots/settings_files.png rename to packages/neon/screenshots/settings_files.png diff --git a/packages/harbour/screenshots/settings_light.png b/packages/neon/screenshots/settings_light.png similarity index 100% rename from packages/harbour/screenshots/settings_light.png rename to packages/neon/screenshots/settings_light.png diff --git a/packages/harbour/screenshots/settings_news.png b/packages/neon/screenshots/settings_news.png similarity index 100% rename from packages/harbour/screenshots/settings_news.png rename to packages/neon/screenshots/settings_news.png diff --git a/packages/harbour/screenshots/settings_notes.png b/packages/neon/screenshots/settings_notes.png similarity index 100% rename from packages/harbour/screenshots/settings_notes.png rename to packages/neon/screenshots/settings_notes.png diff --git a/packages/harbour/screenshots/settings_oled.png b/packages/neon/screenshots/settings_oled.png similarity index 100% rename from packages/harbour/screenshots/settings_oled.png rename to packages/neon/screenshots/settings_oled.png diff --git a/packages/nextcloud/README.md b/packages/nextcloud/README.md index cbb5965d..a533f558 100644 --- a/packages/nextcloud/README.md +++ b/packages/nextcloud/README.md @@ -2,7 +2,7 @@ A Nextcloud client written in Dart. -This client will become the replacement for https://github.com/jld3103/dart-nextcloud at some point ([See](https://github.com/jld3103/nextcloud-harbour/issues/1)). +This client will become the replacement for https://github.com/jld3103/dart-nextcloud at some point ([See](https://github.com/jld3103/nextcloud-neon/issues/1)). ## Development diff --git a/packages/nextcloud/test/helper.dart b/packages/nextcloud/test/helper.dart index 9228183a..1b890603 100644 --- a/packages/nextcloud/test/helper.dart +++ b/packages/nextcloud/test/helper.dart @@ -96,7 +96,7 @@ class TestHelper { ) .toString(); - final dockerImageName = 'nextcloud-harbour-$hash'; + final dockerImageName = 'nextcloud-neon-$hash'; final inputStream = StreamController>(); final process = runExecutableArguments( diff --git a/packages/spec_templates/bin/generate.dart b/packages/spec_templates/bin/generate.dart index 3a0cad16..029cdc1d 100644 --- a/packages/spec_templates/bin/generate.dart +++ b/packages/spec_templates/bin/generate.dart @@ -7,7 +7,7 @@ import 'package:spec_templates/openapi_spec.dart'; import 'package:xml/xml.dart'; Future main(final List args) async { - final tmpDirectory = Directory(p.join(Directory.systemTemp.path, 'nextcloud-harbour')); + final tmpDirectory = Directory(p.join(Directory.systemTemp.path, 'nextcloud-neon')); if (!tmpDirectory.existsSync()) { tmpDirectory.createSync(); } diff --git a/tool/cloc.sh b/tool/cloc.sh index a5908628..f54f5b3b 100755 --- a/tool/cloc.sh +++ b/tool/cloc.sh @@ -4,6 +4,6 @@ cd "$(dirname "$0")/.." cloc \ --fullpath \ - --not-match-d="(./external|./specs/templates|./packages/.*/.idea|./packages/.*/build|./packages/.*/coverage|./packages/.*/.dart_tool|./packages/harbour/linux/flutter/ephemeral|./packages/nextcloud/lib/src/clients/common|./packages/nextcloud/lib/src/clients/generated|./packages/nextcloud/doc)" \ + --not-match-d="(./external|./specs/templates|./packages/.*/.idea|./packages/.*/build|./packages/.*/coverage|./packages/.*/.dart_tool|./packages/neon/linux/flutter/ephemeral|./packages/nextcloud/lib/src/clients/common|./packages/nextcloud/lib/src/clients/generated|./packages/nextcloud/doc)" \ --exclude-ext="g.dart" \ . diff --git a/tool/generate-harbour.sh b/tool/generate-neon.sh similarity index 82% rename from tool/generate-harbour.sh rename to tool/generate-neon.sh index 7a55cc2d..37829ff3 100755 --- a/tool/generate-harbour.sh +++ b/tool/generate-neon.sh @@ -26,7 +26,7 @@ function export_mipmap_icon_all() { function copy_nextcloud_app_svg() { id="$1" path="$2" - target="packages/harbour/assets/apps/$id.svg" + target="packages/neon/assets/apps/$id.svg" if [ -f "$path/img/app.svg" ]; then cp "$path/img/app.svg" "$target" elif [ -f "$path/img/$id.svg" ]; then @@ -38,30 +38,30 @@ function copy_nextcloud_app_svg() { sed -i "s/fill=\"[^\"]*\"/fill=\"$color\"/g" "$target" } -rm -rf /tmp/nextcloud-harbour -mkdir -p /tmp/nextcloud-harbour +rm -rf /tmp/nextcloud-neon +mkdir -p /tmp/nextcloud-neon copy_nextcloud_app_svg files external/nextcloud-server/apps/files copy_nextcloud_app_svg news external/nextcloud-news copy_nextcloud_app_svg notes external/nextcloud-notes ( - cd packages/harbour + cd packages/neon # Nextcloud logo wget https://raw.githubusercontent.com/nextcloud/promo/master/nextcloud-logo-inverted.svg -O assets/logo_nextcloud.svg - # Harbour logo - wget https://raw.githubusercontent.com/Templarian/MaterialDesign/master/svg/ferry.svg -O assets/logo_harbour.svg - sed -i "s/ packages/harbour/assets/.env +TEST_PASSWORD=$password" > packages/neon/assets/.env function cleanup() { - rm packages/harbour/assets/.env + rm packages/neon/assets/.env } trap cleanup EXIT # The multiple ports are used to let the app think we are talking to two different servers when in fact it's only one -docker run --rm -v nextcloud-harbour-dev:/usr/src/nextcloud -p "80:80" -p "81:80" nextcloud-harbour-dev +docker run --rm -v nextcloud-neon-dev:/usr/src/nextcloud -p "80:80" -p "81:80" nextcloud-neon-dev diff --git a/tool/test.sh b/tool/test.sh index a5b9dc72..4980e4de 100755 --- a/tool/test.sh +++ b/tool/test.sh @@ -2,8 +2,8 @@ set -euxo pipefail cd "$(dirname "$0")/.." -rm -rf /tmp/nextcloud-harbour -mkdir -p /tmp/nextcloud-harbour +rm -rf /tmp/nextcloud-neon +mkdir -p /tmp/nextcloud-neon ( cd packages/nextcloud