From 46dbce52c467f5a069983df28fb8ec203b8deb9b Mon Sep 17 00:00:00 2001
From: jld3103 <jld3103yt@gmail.com>
Date: Mon, 22 May 2023 21:04:17 +0200
Subject: [PATCH] neon: Cleanup parts for generated code

---
 packages/neon/neon/lib/neon.dart              |  9 ++++----
 .../push_notification.g.dart => neon.g.dart}  | 18 ++++++++++++++-
 .../neon/neon/lib/src/models/account.dart     |  9 +-------
 .../neon/neon/lib/src/models/account.g.dart   | 23 -------------------
 .../lib/src/models/push_notification.dart     |  5 +---
 5 files changed, 23 insertions(+), 41 deletions(-)
 rename packages/neon/neon/lib/{src/models/push_notification.g.dart => neon.g.dart} (57%)
 delete mode 100644 packages/neon/neon/lib/src/models/account.g.dart

diff --git a/packages/neon/neon/lib/neon.dart b/packages/neon/neon/lib/neon.dart
index da10472b..e24a60f7 100644
--- a/packages/neon/neon/lib/neon.dart
+++ b/packages/neon/neon/lib/neon.dart
@@ -19,10 +19,9 @@ import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:http/http.dart';
 import 'package:intl/intl_standalone.dart';
+import 'package:json_annotation/json_annotation.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:neon/l10n/localizations.dart';
-import 'package:neon/src/models/account.dart';
-import 'package:neon/src/models/push_notification.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path/path.dart' as p;
@@ -44,9 +43,7 @@ import 'package:window_manager/window_manager.dart';
 import 'package:xdg_directories/xdg_directories.dart' as xdg;
 import 'package:xml/xml.dart' as xml;
 
-export 'src/models/account.dart';
-export 'src/models/push_notification.dart';
-
+part 'neon.g.dart';
 part 'src/app.dart';
 part 'src/blocs/accounts.dart';
 part 'src/blocs/apps.dart';
@@ -58,6 +55,8 @@ part 'src/blocs/push_notifications.dart';
 part 'src/blocs/user_details.dart';
 part 'src/blocs/user_status.dart';
 part 'src/interfaces/notifications.dart';
+part 'src/models/account.dart';
+part 'src/models/push_notification.dart';
 part 'src/pages/account_settings.dart';
 part 'src/pages/home.dart';
 part 'src/pages/login.dart';
diff --git a/packages/neon/neon/lib/src/models/push_notification.g.dart b/packages/neon/neon/lib/neon.g.dart
similarity index 57%
rename from packages/neon/neon/lib/src/models/push_notification.g.dart
rename to packages/neon/neon/lib/neon.g.dart
index dc2208f6..5b471bdf 100644
--- a/packages/neon/neon/lib/src/models/push_notification.g.dart
+++ b/packages/neon/neon/lib/neon.g.dart
@@ -1,11 +1,27 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'push_notification.dart';
+part of 'neon.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
+Account _$AccountFromJson(Map<String, dynamic> json) => Account(
+      serverURL: json['serverURL'] as String,
+      loginName: json['loginName'] as String,
+      username: json['username'] as String,
+      password: json['password'] as String?,
+      userAgent: json['userAgent'] as String?,
+    );
+
+Map<String, dynamic> _$AccountToJson(Account instance) => <String, dynamic>{
+      'serverURL': instance.serverURL,
+      'loginName': instance.loginName,
+      'username': instance.username,
+      'password': instance.password,
+      'userAgent': instance.userAgent,
+    };
+
 PushNotification _$PushNotificationFromJson(Map<String, dynamic> json) => PushNotification(
       accountID: json['accountID'] as String,
       priority: json['priority'] as String,
diff --git a/packages/neon/neon/lib/src/models/account.dart b/packages/neon/neon/lib/src/models/account.dart
index 2d23034f..f0b8d8cf 100644
--- a/packages/neon/neon/lib/src/models/account.dart
+++ b/packages/neon/neon/lib/src/models/account.dart
@@ -1,11 +1,4 @@
-import 'dart:convert';
-
-import 'package:crypto/crypto.dart';
-import 'package:json_annotation/json_annotation.dart';
-import 'package:nextcloud/nextcloud.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-
-part 'account.g.dart';
+part of '../../neon.dart';
 
 Future<Account> getAccount(
   final PackageInfo packageInfo,
diff --git a/packages/neon/neon/lib/src/models/account.g.dart b/packages/neon/neon/lib/src/models/account.g.dart
deleted file mode 100644
index fa9b929e..00000000
--- a/packages/neon/neon/lib/src/models/account.g.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'account.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Account _$AccountFromJson(Map<String, dynamic> json) => Account(
-      serverURL: json['serverURL'] as String,
-      loginName: json['loginName'] as String,
-      username: json['username'] as String,
-      password: json['password'] as String?,
-      userAgent: json['userAgent'] as String?,
-    );
-
-Map<String, dynamic> _$AccountToJson(Account instance) => <String, dynamic>{
-      'serverURL': instance.serverURL,
-      'loginName': instance.loginName,
-      'username': instance.username,
-      'password': instance.password,
-      'userAgent': instance.userAgent,
-    };
diff --git a/packages/neon/neon/lib/src/models/push_notification.dart b/packages/neon/neon/lib/src/models/push_notification.dart
index 5a9e4142..d85fbe00 100644
--- a/packages/neon/neon/lib/src/models/push_notification.dart
+++ b/packages/neon/neon/lib/src/models/push_notification.dart
@@ -1,7 +1,4 @@
-import 'package:json_annotation/json_annotation.dart';
-import 'package:nextcloud/nextcloud.dart';
-
-part 'push_notification.g.dart';
+part of '../../neon.dart';
 
 @JsonSerializable()
 class PushNotification {