From 2497ef55c9757c726e11263a037e089bc82993de Mon Sep 17 00:00:00 2001 From: nilsreichardt Date: Tue, 12 Dec 2023 23:41:01 +0100 Subject: [PATCH] Move `Dimensions` to `sharezone_widgets` --- app/lib/auth/sign_in_with_qr_code_page.dart | 1 - app/lib/blackboard/details/blackboard_details.dart | 4 +--- app/lib/filesharing/file_sharing_view_group.dart | 1 - .../scaffold/sharezone_custom_scaffold.dart | 2 +- .../navigation/scaffold/sharezone_main_scaffold.dart | 2 +- lib/sharezone_utils/lib/dimensions.dart | 11 ----------- lib/sharezone_widgets/lib/sharezone_widgets.dart | 3 +++ .../lib/src}/dimensions.dart | 0 .../lib/src/widgets/modal_floating_action_button.dart | 2 +- lib/sharezone_widgets/pubspec.lock | 2 +- lib/sharezone_widgets/pubspec.yaml | 2 -- 11 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 lib/sharezone_utils/lib/dimensions.dart rename lib/{sharezone_utils/lib/src/dimensions => sharezone_widgets/lib/src}/dimensions.dart (100%) diff --git a/app/lib/auth/sign_in_with_qr_code_page.dart b/app/lib/auth/sign_in_with_qr_code_page.dart index 0a861d0cf..cb59cea83 100644 --- a/app/lib/auth/sign_in_with_qr_code_page.dart +++ b/app/lib/auth/sign_in_with_qr_code_page.dart @@ -18,7 +18,6 @@ import 'package:crash_analytics/crash_analytics.dart'; import 'package:flutter/material.dart' hide VerticalDivider; import 'package:qr_flutter/qr_flutter.dart'; import 'package:sharezone/groups/src/widgets/contact_support.dart'; -import 'package:sharezone_utils/dimensions.dart'; import 'package:sharezone_widgets/sharezone_widgets.dart'; import 'email_and_password_link_page.dart'; diff --git a/app/lib/blackboard/details/blackboard_details.dart b/app/lib/blackboard/details/blackboard_details.dart index c88ecced8..abe5bddcd 100644 --- a/app/lib/blackboard/details/blackboard_details.dart +++ b/app/lib/blackboard/details/blackboard_details.dart @@ -8,22 +8,20 @@ import 'package:bloc_provider/bloc_provider.dart'; import 'package:common_domain_models/common_domain_models.dart'; - import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:sharezone/blackboard/blackboard_dialog.dart'; import 'package:sharezone/blackboard/blackboard_item.dart'; import 'package:sharezone/blackboard/blackboard_view.dart'; import 'package:sharezone/blackboard/details/blackboard_item_read_by_users_list/blackboard_item_read_by_users_list_page.dart'; -import 'package:sharezone/main/application_bloc.dart'; import 'package:sharezone/comments/comments_gateway.dart'; import 'package:sharezone/comments/widgets/comment_section_builder.dart'; import 'package:sharezone/filesharing/dialog/attachment_list.dart'; +import 'package:sharezone/main/application_bloc.dart'; import 'package:sharezone/report/report_icon.dart'; import 'package:sharezone/report/report_item.dart'; import 'package:sharezone/util/launch_link.dart'; import 'package:sharezone/widgets/material/bottom_action_bar.dart'; -import 'package:sharezone_utils/dimensions.dart'; import 'package:sharezone_widgets/sharezone_widgets.dart'; import '../show_delete_blackboard_item_dialog.dart'; diff --git a/app/lib/filesharing/file_sharing_view_group.dart b/app/lib/filesharing/file_sharing_view_group.dart index b45b36511..ddbe7d425 100644 --- a/app/lib/filesharing/file_sharing_view_group.dart +++ b/app/lib/filesharing/file_sharing_view_group.dart @@ -14,7 +14,6 @@ import 'package:sharezone/filesharing/logic/file_sharing_page_state_bloc.dart'; import 'package:sharezone/filesharing/models/file_sharing_page_state.dart'; import 'package:sharezone/filesharing/rules/filesharing_permissions.dart'; import 'package:sharezone/widgets/animation/color_fade_in.dart'; -import 'package:sharezone_utils/dimensions.dart'; import 'package:sharezone_widgets/sharezone_widgets.dart'; import 'logic/open_cloud_file.dart'; diff --git a/app/lib/navigation/scaffold/sharezone_custom_scaffold.dart b/app/lib/navigation/scaffold/sharezone_custom_scaffold.dart index 4d5a554b3..650c8805b 100644 --- a/app/lib/navigation/scaffold/sharezone_custom_scaffold.dart +++ b/app/lib/navigation/scaffold/sharezone_custom_scaffold.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; import 'package:sharezone/navigation/models/navigation_item.dart'; import 'package:sharezone/navigation/scaffold/app_bar_configuration.dart'; -import 'package:sharezone_utils/dimensions.dart'; +import 'package:sharezone_widgets/sharezone_widgets.dart'; import 'desktop/desktop_custom_scaffold.dart'; import 'portable/portable_custom_scaffold.dart'; diff --git a/app/lib/navigation/scaffold/sharezone_main_scaffold.dart b/app/lib/navigation/scaffold/sharezone_main_scaffold.dart index b38696ba1..a2932b041 100644 --- a/app/lib/navigation/scaffold/sharezone_main_scaffold.dart +++ b/app/lib/navigation/scaffold/sharezone_main_scaffold.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; import 'package:sharezone/navigation/models/navigation_item.dart'; import 'package:sharezone/navigation/scaffold/app_bar_configuration.dart'; -import 'package:sharezone_utils/dimensions.dart'; +import 'package:sharezone_widgets/sharezone_widgets.dart'; import 'bottom_bar_configuration.dart'; import 'desktop/desktop_main_scaffold.dart'; diff --git a/lib/sharezone_utils/lib/dimensions.dart b/lib/sharezone_utils/lib/dimensions.dart deleted file mode 100644 index 93f9f0c4f..000000000 --- a/lib/sharezone_utils/lib/dimensions.dart +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2022 Sharezone UG (haftungsbeschränkt) -// Licensed under the EUPL-1.2-or-later. -// -// You may obtain a copy of the Licence at: -// https://joinup.ec.europa.eu/software/page/eupl -// -// SPDX-License-Identifier: EUPL-1.2 - -library dimensions; - -export 'src/dimensions/dimensions.dart'; diff --git a/lib/sharezone_widgets/lib/sharezone_widgets.dart b/lib/sharezone_widgets/lib/sharezone_widgets.dart index 5ab62adff..e86d46716 100644 --- a/lib/sharezone_widgets/lib/sharezone_widgets.dart +++ b/lib/sharezone_widgets/lib/sharezone_widgets.dart @@ -36,6 +36,9 @@ export 'src/common/widgets/action_item_button.dart'; // dialog_wrapper export 'src/dialog_wrapper.dart'; +// dimensions +export 'src/dimensions.dart'; + // form export 'src/form.dart'; diff --git a/lib/sharezone_utils/lib/src/dimensions/dimensions.dart b/lib/sharezone_widgets/lib/src/dimensions.dart similarity index 100% rename from lib/sharezone_utils/lib/src/dimensions/dimensions.dart rename to lib/sharezone_widgets/lib/src/dimensions.dart diff --git a/lib/sharezone_widgets/lib/src/widgets/modal_floating_action_button.dart b/lib/sharezone_widgets/lib/src/widgets/modal_floating_action_button.dart index b9e57b872..0cd1b1c5a 100644 --- a/lib/sharezone_widgets/lib/src/widgets/modal_floating_action_button.dart +++ b/lib/sharezone_widgets/lib/src/widgets/modal_floating_action_button.dart @@ -7,7 +7,7 @@ // SPDX-License-Identifier: EUPL-1.2 import 'package:flutter/material.dart'; -import 'package:sharezone_utils/dimensions.dart'; +import 'package:sharezone_widgets/sharezone_widgets.dart'; class ModalFloatingActionButton extends StatelessWidget { final VoidCallback onPressed; diff --git a/lib/sharezone_widgets/pubspec.lock b/lib/sharezone_widgets/pubspec.lock index 8c78db2c1..82917634f 100644 --- a/lib/sharezone_widgets/pubspec.lock +++ b/lib/sharezone_widgets/pubspec.lock @@ -411,7 +411,7 @@ packages: source: path version: "1.0.0" sharezone_utils: - dependency: "direct main" + dependency: transitive description: path: "../sharezone_utils" relative: true diff --git a/lib/sharezone_widgets/pubspec.yaml b/lib/sharezone_widgets/pubspec.yaml index d1f3927c5..1566edd62 100644 --- a/lib/sharezone_widgets/pubspec.yaml +++ b/lib/sharezone_widgets/pubspec.yaml @@ -17,8 +17,6 @@ environment: dependencies: sharezone_common: path: ../sharezone_common - sharezone_utils: - path: ../sharezone_utils build_context: path: ../build_context flutter_svg: ^2.0.2