diff --git a/packages/neon_framework/lib/src/blocs/accounts.dart b/packages/neon_framework/lib/src/blocs/accounts.dart index 2429359339a..650331ee00c 100644 --- a/packages/neon_framework/lib/src/blocs/accounts.dart +++ b/packages/neon_framework/lib/src/blocs/accounts.dart @@ -7,11 +7,10 @@ import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; import 'package:neon_framework/blocs.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/blocs/maintenance_mode.dart'; import 'package:neon_framework/src/blocs/unified_search.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/models/account_cache.dart'; -import 'package:neon_framework/src/models/app_implementation.dart'; import 'package:neon_framework/src/models/disposable.dart'; import 'package:neon_framework/src/storage/keys.dart'; import 'package:neon_framework/src/utils/account_options.dart'; diff --git a/packages/neon_framework/lib/src/blocs/apps.dart b/packages/neon_framework/lib/src/blocs/apps.dart index b78a081161c..48383574c31 100644 --- a/packages/neon_framework/lib/src/blocs/apps.dart +++ b/packages/neon_framework/lib/src/blocs/apps.dart @@ -5,10 +5,9 @@ import 'package:collection/collection.dart'; import 'package:dynamite_runtime/http_client.dart'; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/bloc.dart'; import 'package:neon_framework/src/bloc/result.dart'; -import 'package:neon_framework/src/models/account.dart'; -import 'package:neon_framework/src/models/app_implementation.dart'; import 'package:neon_framework/src/utils/account_options.dart'; import 'package:neon_framework/src/utils/findable.dart'; import 'package:neon_framework/src/utils/request_manager.dart'; diff --git a/packages/neon_framework/lib/src/blocs/capabilities.dart b/packages/neon_framework/lib/src/blocs/capabilities.dart index 09a629a9c8f..8302b27b04c 100644 --- a/packages/neon_framework/lib/src/blocs/capabilities.dart +++ b/packages/neon_framework/lib/src/blocs/capabilities.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'package:dynamite_runtime/http_client.dart'; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/bloc.dart'; import 'package:neon_framework/src/bloc/result.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/utils/request_manager.dart'; import 'package:nextcloud/core.dart' as core; import 'package:rxdart/rxdart.dart'; diff --git a/packages/neon_framework/lib/src/blocs/login_check_account.dart b/packages/neon_framework/lib/src/blocs/login_check_account.dart index 32008870858..3b795497bff 100644 --- a/packages/neon_framework/lib/src/blocs/login_check_account.dart +++ b/packages/neon_framework/lib/src/blocs/login_check_account.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/bloc.dart'; import 'package:neon_framework/src/bloc/result.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/utils/user_agent.dart'; import 'package:neon_http_client/neon_http_client.dart'; import 'package:nextcloud/nextcloud.dart'; diff --git a/packages/neon_framework/lib/src/blocs/next_push.dart b/packages/neon_framework/lib/src/blocs/next_push.dart index 297c362ab44..b800ec497b2 100644 --- a/packages/neon_framework/lib/src/blocs/next_push.dart +++ b/packages/neon_framework/lib/src/blocs/next_push.dart @@ -4,8 +4,8 @@ import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/bloc.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/models/disposable.dart'; import 'package:neon_framework/src/utils/global_options.dart'; import 'package:nextcloud/uppush.dart' as uppush; diff --git a/packages/neon_framework/lib/src/blocs/push_notifications.dart b/packages/neon_framework/lib/src/blocs/push_notifications.dart index af900dbdd40..664720e57f2 100644 --- a/packages/neon_framework/lib/src/blocs/push_notifications.dart +++ b/packages/neon_framework/lib/src/blocs/push_notifications.dart @@ -4,8 +4,8 @@ import 'dart:convert'; import 'package:built_collection/built_collection.dart'; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/bloc.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/platform/platform.dart'; import 'package:neon_framework/src/storage/keys.dart'; import 'package:neon_framework/src/utils/findable.dart'; diff --git a/packages/neon_framework/lib/src/blocs/user_details.dart b/packages/neon_framework/lib/src/blocs/user_details.dart index 2b0ee8c61ec..2d61daf2b3d 100644 --- a/packages/neon_framework/lib/src/blocs/user_details.dart +++ b/packages/neon_framework/lib/src/blocs/user_details.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'package:dynamite_runtime/http_client.dart'; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/bloc.dart'; import 'package:neon_framework/src/bloc/result.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/utils/request_manager.dart'; import 'package:nextcloud/provisioning_api.dart' as provisioning_api; import 'package:rxdart/rxdart.dart'; diff --git a/packages/neon_framework/lib/src/blocs/user_status.dart b/packages/neon_framework/lib/src/blocs/user_status.dart index b1b667c1894..b127272195d 100644 --- a/packages/neon_framework/lib/src/blocs/user_status.dart +++ b/packages/neon_framework/lib/src/blocs/user_status.dart @@ -6,11 +6,11 @@ import 'package:dynamite_runtime/http_client.dart'; import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/platform.dart'; import 'package:neon_framework/src/bloc/bloc.dart'; import 'package:neon_framework/src/bloc/result.dart'; import 'package:neon_framework/src/blocs/timer.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/utils/request_manager.dart'; import 'package:nextcloud/user_status.dart' as user_status; import 'package:nextcloud/utils.dart'; diff --git a/packages/neon_framework/lib/src/models/app_implementation.dart b/packages/neon_framework/lib/src/models/app_implementation.dart index ef8382c3d03..d6a4c14e95a 100644 --- a/packages/neon_framework/lib/src/models/app_implementation.dart +++ b/packages/neon_framework/lib/src/models/app_implementation.dart @@ -5,8 +5,8 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:meta/meta.dart'; import 'package:neon_framework/l10n/localizations.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/bloc.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/models/account_cache.dart'; import 'package:neon_framework/src/models/disposable.dart'; import 'package:neon_framework/src/settings/models/options_collection.dart'; diff --git a/packages/neon_framework/lib/src/pages/account_settings.dart b/packages/neon_framework/lib/src/pages/account_settings.dart index 67ab9fccaa6..842ae39bf0e 100644 --- a/packages/neon_framework/lib/src/pages/account_settings.dart +++ b/packages/neon_framework/lib/src/pages/account_settings.dart @@ -2,9 +2,9 @@ import 'package:filesize/filesize.dart'; import 'package:flutter/material.dart'; import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/result.dart'; import 'package:neon_framework/src/blocs/accounts.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/router.dart'; import 'package:neon_framework/src/settings/widgets/custom_settings_tile.dart'; import 'package:neon_framework/src/settings/widgets/option_settings_tile.dart'; diff --git a/packages/neon_framework/lib/src/pages/login_check_account.dart b/packages/neon_framework/lib/src/pages/login_check_account.dart index 2e27e04ff2d..5efce8651e4 100644 --- a/packages/neon_framework/lib/src/pages/login_check_account.dart +++ b/packages/neon_framework/lib/src/pages/login_check_account.dart @@ -2,10 +2,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/result.dart'; import 'package:neon_framework/src/blocs/accounts.dart'; import 'package:neon_framework/src/blocs/login_check_account.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/router.dart'; import 'package:neon_framework/src/theme/dialog.dart'; import 'package:neon_framework/src/widgets/account_tile.dart'; diff --git a/packages/neon_framework/lib/src/router.dart b/packages/neon_framework/lib/src/router.dart index 1309b3f5b97..11dd963ab82 100644 --- a/packages/neon_framework/lib/src/router.dart +++ b/packages/neon_framework/lib/src/router.dart @@ -7,10 +7,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/blocs/accounts.dart'; import 'package:neon_framework/src/blocs/capabilities.dart'; import 'package:neon_framework/src/models/account.dart'; -import 'package:neon_framework/src/models/app_implementation.dart'; import 'package:neon_framework/src/pages/account_settings.dart'; import 'package:neon_framework/src/pages/app_implementation_settings.dart'; import 'package:neon_framework/src/pages/home.dart'; diff --git a/packages/neon_framework/lib/src/settings/utils/settings_export_helper.dart b/packages/neon_framework/lib/src/settings/utils/settings_export_helper.dart index 65ff474af48..9d2fb80b2c3 100644 --- a/packages/neon_framework/lib/src/settings/utils/settings_export_helper.dart +++ b/packages/neon_framework/lib/src/settings/utils/settings_export_helper.dart @@ -4,9 +4,8 @@ import 'dart:typed_data'; import 'package:built_collection/built_collection.dart'; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/blocs/accounts.dart'; -import 'package:neon_framework/src/models/account.dart' show Account; -import 'package:neon_framework/src/models/app_implementation.dart'; import 'package:neon_framework/src/settings/models/exportable.dart'; import 'package:neon_framework/src/settings/models/option.dart'; import 'package:neon_framework/src/storage/keys.dart'; diff --git a/packages/neon_framework/lib/src/settings/widgets/account_settings_tile.dart b/packages/neon_framework/lib/src/settings/widgets/account_settings_tile.dart index fbb4ccf869a..457b210a460 100644 --- a/packages/neon_framework/lib/src/settings/widgets/account_settings_tile.dart +++ b/packages/neon_framework/lib/src/settings/widgets/account_settings_tile.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:meta/meta.dart'; import 'package:neon_framework/blocs.dart'; -import 'package:neon_framework/src/models/account.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/settings/widgets/settings_tile.dart'; import 'package:neon_framework/src/widgets/account_tile.dart'; diff --git a/packages/neon_framework/lib/src/testing/mock_server.dart b/packages/neon_framework/lib/src/testing/mock_server.dart index a76d36ad948..7c43c7fa562 100644 --- a/packages/neon_framework/lib/src/testing/mock_server.dart +++ b/packages/neon_framework/lib/src/testing/mock_server.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:http/http.dart'; import 'package:http/testing.dart'; -import 'package:neon_framework/src/models/account.dart'; +import 'package:neon_framework/models.dart'; /// Creates an [Account] connected to a fake server defined by [requests]. /// diff --git a/packages/neon_framework/lib/src/utils/global_options.dart b/packages/neon_framework/lib/src/utils/global_options.dart index 9172cb7a63d..7c067260952 100644 --- a/packages/neon_framework/lib/src/utils/global_options.dart +++ b/packages/neon_framework/lib/src/utils/global_options.dart @@ -2,8 +2,7 @@ import 'package:built_collection/built_collection.dart'; import 'package:flutter/material.dart'; import 'package:meta/meta.dart'; import 'package:neon_framework/l10n/localizations.dart'; -import 'package:neon_framework/src/models/account.dart'; -import 'package:neon_framework/src/models/label_builder.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/settings/models/option.dart'; import 'package:neon_framework/src/settings/models/options_collection.dart'; import 'package:neon_framework/src/storage/keys.dart'; diff --git a/packages/neon_framework/lib/src/utils/request_manager.dart b/packages/neon_framework/lib/src/utils/request_manager.dart index a0a2d94168a..e39e7101fe5 100644 --- a/packages/neon_framework/lib/src/utils/request_manager.dart +++ b/packages/neon_framework/lib/src/utils/request_manager.dart @@ -8,7 +8,6 @@ import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/result.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/storage.dart'; import 'package:neon_http_client/neon_http_client.dart'; import 'package:nextcloud/utils.dart'; diff --git a/packages/neon_framework/lib/src/widgets/dialog.dart b/packages/neon_framework/lib/src/widgets/dialog.dart index 896e339cfa7..fafb5641209 100644 --- a/packages/neon_framework/lib/src/widgets/dialog.dart +++ b/packages/neon_framework/lib/src/widgets/dialog.dart @@ -6,8 +6,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:meta/meta.dart'; import 'package:neon_framework/blocs.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/blocs/accounts.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/utils/global_options.dart'; import 'package:neon_framework/src/utils/relative_time.dart'; import 'package:neon_framework/src/utils/user_status_clear_at.dart'; diff --git a/packages/neon_framework/lib/src/widgets/image.dart b/packages/neon_framework/lib/src/widgets/image.dart index b5e21eca48d..75692f8df06 100644 --- a/packages/neon_framework/lib/src/widgets/image.dart +++ b/packages/neon_framework/lib/src/widgets/image.dart @@ -7,8 +7,8 @@ import 'package:flutter_blurhash/flutter_blurhash.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:http/http.dart' as http; import 'package:meta/meta.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/bloc/result.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/utils/image_utils.dart'; import 'package:neon_framework/src/utils/request_manager.dart'; import 'package:neon_framework/src/widgets/error.dart'; diff --git a/packages/neon_framework/lib/src/widgets/user_avatar.dart b/packages/neon_framework/lib/src/widgets/user_avatar.dart index bd8b508e721..db1f9ddff1f 100644 --- a/packages/neon_framework/lib/src/widgets/user_avatar.dart +++ b/packages/neon_framework/lib/src/widgets/user_avatar.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:meta/meta.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/src/theme/icons.dart'; import 'package:neon_framework/src/theme/sizes.dart'; import 'package:neon_framework/src/widgets/image.dart'; diff --git a/packages/neon_framework/test/maintenance_mode_bloc_test.dart b/packages/neon_framework/test/maintenance_mode_bloc_test.dart index 21694e65a8c..9243e74453f 100644 --- a/packages/neon_framework/test/maintenance_mode_bloc_test.dart +++ b/packages/neon_framework/test/maintenance_mode_bloc_test.dart @@ -2,8 +2,8 @@ import 'dart:convert'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/src/blocs/maintenance_mode.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/testing.dart'; Account mockMaintenanceModeAccount() { diff --git a/packages/neon_framework/test/user_status_bloc_test.dart b/packages/neon_framework/test/user_status_bloc_test.dart index 117cca6efd3..1b6b72d492f 100644 --- a/packages/neon_framework/test/user_status_bloc_test.dart +++ b/packages/neon_framework/test/user_status_bloc_test.dart @@ -5,8 +5,8 @@ import 'package:http/http.dart' as http; import 'package:http/http.dart'; import 'package:mocktail/mocktail.dart'; import 'package:neon_framework/blocs.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/platform.dart'; -import 'package:neon_framework/src/models/account.dart'; import 'package:neon_framework/testing.dart'; import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/user_status.dart' as user_status; diff --git a/packages/neon_framework/test/weather_status_bloc_test.dart b/packages/neon_framework/test/weather_status_bloc_test.dart index f556ec466a7..637ecf43097 100644 --- a/packages/neon_framework/test/weather_status_bloc_test.dart +++ b/packages/neon_framework/test/weather_status_bloc_test.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart'; import 'package:neon_framework/blocs.dart'; -import 'package:neon_framework/src/models/account.dart'; +import 'package:neon_framework/models.dart'; import 'package:neon_framework/testing.dart'; import 'package:nextcloud/core.dart' as core; import 'package:rxdart/rxdart.dart';