Merge pull request #28 from jld3103/rebrand

Rebrand to Nextcloud Neon

.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
+      - id: packages_neon_pub_upgrade
-        name: packages/harbour; flutter pub 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 ."
+      - name: "packages/neon; dart format --output=none --set-exit-if-changed --line-length 120 ."
-        if: "always() && steps.packages_harbour_pub_upgrade.conclusion == 'success'"
+        if: "always() && steps.packages_neon_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/harbour
+        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
+      - id: packages_neon_pub_upgrade
-        name: packages/harbour; flutter pub 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
+      - name: packages/neon; flutter analyze
-        if: "always() && steps.packages_harbour_pub_upgrade.conclusion == 'success'"
+        if: "always() && steps.packages_neon_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/harbour
+        working-directory: packages/neon
         run: flutter analyze
     needs:
       - job_001

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/nextcloud-harbour.iml" filepath="$PROJECT_DIR$/.idea/nextcloud-harbour.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/nextcloud-neon.iml" filepath="$PROJECT_DIR$/.idea/nextcloud-neon.iml" />
     </modules>
   </component>
 </project>

.idea/nextcloud-neon.iml

@@ -22,9 +22,6 @@
       <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/build" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/harbour/build" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/harbour/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/harbour/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/spec_templates/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/spec_templates/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages/spec_templates/build" />
@@ -44,8 +41,6 @@
       <excludeFolder url="file://$MODULE_DIR$/external" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud/lib/src/clients/common" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud/lib/src/clients/generated" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/harbour/android/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/harbour/linux/flutter/ephemeral" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud_push_proxy/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud_push_proxy/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud_push_proxy/.pub" />
@@ -56,6 +51,11 @@
       <excludeFolder url="file://$MODULE_DIR$/.fvm/flutter_sdk/bin/cache/dart-sdk/lib/_internal/js_runtime/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/.fvm/flutter_sdk/bin/cache/dart-sdk/lib/_internal/js_runtime/build" />
       <excludeFolder url="file://$MODULE_DIR$/.fvm" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/linux/flutter/ephemeral" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/android/.gradle" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/runConfigurations/Debug.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Debug" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/packages/harbour/lib/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/packages/neon/lib/main.dart" />
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/Release.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Release" type="FlutterRunConfigurationType" factoryName="Flutter">
     <option name="additionalArgs" value="--release" />
-    <option name="filePath" value="$PROJECT_DIR$/packages/harbour/lib/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/packages/neon/lib/main.dart" />
     <method v="2" />
   </configuration>
 </component>

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.

packages/harbour/assets/LEGALESE.txt

@@ -1,2 +0,0 @@
-Copyright © 2022, Kate Döen
-Under BSD-3 license

packages/harbour/assets/logo_harbour.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-ferry" viewBox="0 0 24 24"><path fill="#f37736" d="M6,6H18V9.96L12,8L6,9.96M3.94,19H4C5.6,19 7,18.12 8,17C9,18.12 10.4,19 12,19C13.6,19 15,18.12 16,17C17,18.12 18.4,19 20,19H20.05L21.95,12.31C22.03,12.06 22,11.78 21.89,11.54C21.76,11.3 21.55,11.12 21.29,11.04L20,10.62V6C20,4.89 19.1,4 18,4H15V1H9V4H6A2,2 0 0,0 4,6V10.62L2.71,11.04C2.45,11.12 2.24,11.3 2.11,11.54C2,11.78 1.97,12.06 2.05,12.31M20,21C18.61,21 17.22,20.53 16,19.67C13.56,21.38 10.44,21.38 8,19.67C6.78,20.53 5.39,21 4,21H2V23H4C5.37,23 6.74,22.65 8,22C10.5,23.3 13.5,23.3 16,22C17.26,22.65 18.62,23 20,23H22V21H20Z" /></svg>

packages/neon/README.md

@@ -1,4 +1,4 @@
-# harbour
+# neon
 
 A beautiful convergent cross-platform client for Nextcloud written in Flutter.
 

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()

packages/neon/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.provokateurin.harbour">
+    package="de.provokateurin.neon">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

packages/neon/android/app/src/main/AndroidManifest.xml

@@ -1,10 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.provokateurin.harbour">
+    package="de.provokateurin.neon">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:label="Harbour"
+        android:label="Neon"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">

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
 

packages/neon/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.provokateurin.harbour">
+    package="de.provokateurin.neon">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

packages/neon/assets/LEGALESE.txt

@@ -0,0 +1,2 @@
+Copyright © 2022, jld3103
+Under BSD-3 license

packages/neon/assets/logo_neon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-cable-data" viewBox="0 0 24 24"><path fill="#f37736" d="M7.05 3.5C5.68 4.88 5.68 7.1 7.05 8.47L15.54 16.95C16.12 17.54 16.12 18.5 15.54 19.07C14.95 19.66 14 19.66 13.41 19.07L9.17 14.83L10.23 13.77L6.7 10.23L6.34 10.59L4.93 9.17C4.54 8.78 3.91 8.78 3.5 9.17L2.1 10.59C1.71 11 1.71 11.61 2.1 12L3.5 13.41L3.16 13.77L6.7 17.3L7.76 16.24L12 20.5C13.37 21.85 15.58 21.85 16.95 20.5C18.32 19.12 18.32 16.9 16.95 15.54L8.46 7.05C7.88 6.46 7.88 5.5 8.46 4.93C9.05 4.34 10 4.34 10.59 4.93L14.83 9.17L13.77 10.23L17.3 13.77L17.66 13.41L19.07 14.83C19.46 15.22 20.1 15.22 20.5 14.83L21.9 13.41C22.29 13 22.29 12.39 21.9 12L20.5 10.59L20.84 10.23L17.3 6.7L16.24 7.76L12 3.5C10.63 2.15 8.42 2.15 7.05 3.5M2.81 11.29L4.22 9.88L5.64 11.29L4.22 12.71M18.36 12.71L19.78 11.29L21.19 12.71L19.78 14.12Z" /></svg>

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 {
+class NeonApp extends StatefulWidget {
-  const HarbourApp({
+  const NeonApp({
     super.key,
   });
 
   @override
-  State<HarbourApp> createState() => _HarbourAppState();
+  State<NeonApp> createState() => _NeonAppState();
 }
 
 // ignore: prefer_mixin
-class _HarbourAppState extends State<HarbourApp> with WidgetsBindingObserver {
+class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver {
   final _navigatorKey = GlobalKey<NavigatorState>();
   NextcloudTheme? _userTheme;
 

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

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.

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';

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:neon/app.dart';
-import 'package:harbour/src/harbour.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<Env?>(
           create: (final _) => env,
         ),
-        Provider<HarbourPlatform>(
+        Provider<NeonPlatform>(
           create: (final _) => platform,
         ),
         Provider<GlobalOptions>(
@@ -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');

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<FilesBloc, FilesAppSpecificOptions> {
   FilesApp(
     final SharedPreferences sharedPreferences,
     final RequestManager requestManager,
-    final HarbourPlatform platform,
+    final NeonPlatform platform,
   ) : super(
           'files',
           (final context) => AppLocalizations.of(context).filesName,

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';

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:neon/src/apps/files/app.dart';
-import 'package:harbour/src/apps/files/blocs/browser.dart';
+import 'package:neon/src/apps/files/blocs/browser.dart';
-import 'package:harbour/src/harbour.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();