From 01ea3c4dbeac0cdbc126867e06fed011ced8e4f4 Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 13 Oct 2023 15:22:17 +0700 Subject: [PATCH] Move CupertinoLoadingWidget to core module Signed-off-by: dab246 (cherry picked from commit 2091224f5e55587af2b4c901299673cd0387d15a) --- core/lib/core.dart | 1 + .../loading/cupertino_loading_widget.dart | 45 +++++++++++++++++++ .../cupertino_loading_widget_styles.dart | 0 .../base/widget/cupertino_loading_widget.dart | 38 ---------------- .../view/mobile/mobile_editor_view.dart | 2 +- .../view/web/web_editor_view.dart | 2 +- .../email_view_loading_bar_widget.dart | 2 +- .../widgets/mailbox_loading_bar_widget.dart | 2 +- .../mailbox_dashboard_view_web.dart | 1 - ...thread_view_bottom_loading_bar_widget.dart | 2 +- .../thread_view_loading_bar_widget.dart | 2 +- 11 files changed, 52 insertions(+), 45 deletions(-) create mode 100644 core/lib/presentation/views/loading/cupertino_loading_widget.dart rename {lib/features/base/styles => core/lib/presentation/views/loading}/cupertino_loading_widget_styles.dart (100%) delete mode 100644 lib/features/base/widget/cupertino_loading_widget.dart diff --git a/core/lib/core.dart b/core/lib/core.dart index a98fe21bc..b397e6e81 100644 --- a/core/lib/core.dart +++ b/core/lib/core.dart @@ -84,6 +84,7 @@ export 'presentation/views/checkbox/labeled_checkbox.dart'; export 'presentation/views/container/tmail_container_widget.dart'; export 'presentation/views/clipper/side_arrow_clipper.dart'; export 'presentation/views/avatar/gradient_circle_avatar_icon.dart'; +export 'presentation/views/loading/cupertino_loading_widget.dart'; // Resources export 'presentation/resources/assets_paths.dart'; diff --git a/core/lib/presentation/views/loading/cupertino_loading_widget.dart b/core/lib/presentation/views/loading/cupertino_loading_widget.dart new file mode 100644 index 000000000..36544a955 --- /dev/null +++ b/core/lib/presentation/views/loading/cupertino_loading_widget.dart @@ -0,0 +1,45 @@ +import 'package:core/presentation/views/loading/cupertino_loading_widget_styles.dart'; +import 'package:flutter/cupertino.dart'; + +class CupertinoLoadingWidget extends StatelessWidget { + + final double? size; + final EdgeInsetsGeometry? padding; + final bool isCenter; + + const CupertinoLoadingWidget({ + super.key, + this.size, + this.padding, + this.isCenter = true, + }); + + @override + Widget build(BuildContext context) { + final item = isCenter + ? Center( + child: SizedBox( + width: size ?? CupertinoLoadingWidgetStyles.size, + height: size ?? CupertinoLoadingWidgetStyles.size, + child: const CupertinoActivityIndicator( + color: CupertinoLoadingWidgetStyles.progressColor + ) + ) + ) + : Align( + alignment: AlignmentDirectional.topCenter, + child: SizedBox( + width: size ?? CupertinoLoadingWidgetStyles.size, + height: size ?? CupertinoLoadingWidgetStyles.size, + child: const CupertinoActivityIndicator( + color: CupertinoLoadingWidgetStyles.progressColor + ) + ), + ); + if (padding != null) { + return Padding(padding: padding!, child: item); + } else { + return item; + } + } +} \ No newline at end of file diff --git a/lib/features/base/styles/cupertino_loading_widget_styles.dart b/core/lib/presentation/views/loading/cupertino_loading_widget_styles.dart similarity index 100% rename from lib/features/base/styles/cupertino_loading_widget_styles.dart rename to core/lib/presentation/views/loading/cupertino_loading_widget_styles.dart diff --git a/lib/features/base/widget/cupertino_loading_widget.dart b/lib/features/base/widget/cupertino_loading_widget.dart deleted file mode 100644 index 52a4c4a2b..000000000 --- a/lib/features/base/widget/cupertino_loading_widget.dart +++ /dev/null @@ -1,38 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:tmail_ui_user/features/base/styles/cupertino_loading_widget_styles.dart'; - -class CupertinoLoadingWidget extends StatelessWidget { - - final double? size; - final EdgeInsetsGeometry? padding; - - const CupertinoLoadingWidget({super.key, this.size, this.padding}); - - @override - Widget build(BuildContext context) { - if (padding != null) { - return Padding( - padding: padding!, - child: Center( - child: SizedBox( - width: size ?? CupertinoLoadingWidgetStyles.size, - height: size ?? CupertinoLoadingWidgetStyles.size, - child: const CupertinoActivityIndicator( - color: CupertinoLoadingWidgetStyles.progressColor - ) - ) - ), - ); - } else { - return Center( - child: SizedBox( - width: size ?? CupertinoLoadingWidgetStyles.size, - height: size ?? CupertinoLoadingWidgetStyles.size, - child: const CupertinoActivityIndicator( - color: CupertinoLoadingWidgetStyles.progressColor - ) - ) - ); - } - } -} \ No newline at end of file diff --git a/lib/features/composer/presentation/view/mobile/mobile_editor_view.dart b/lib/features/composer/presentation/view/mobile/mobile_editor_view.dart index da680722c..c3b106a31 100644 --- a/lib/features/composer/presentation/view/mobile/mobile_editor_view.dart +++ b/lib/features/composer/presentation/view/mobile/mobile_editor_view.dart @@ -1,10 +1,10 @@ import 'package:core/presentation/extensions/html_extension.dart'; import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; +import 'package:core/presentation/views/loading/cupertino_loading_widget.dart'; import 'package:dartz/dartz.dart'; import 'package:flutter/material.dart'; import 'package:model/email/email_action_type.dart'; -import 'package:tmail_ui_user/features/base/widget/cupertino_loading_widget.dart'; import 'package:tmail_ui_user/features/composer/presentation/view/editor_view_mixin.dart'; import 'package:tmail_ui_user/features/composer/presentation/widgets/mobile/mobile_editor_widget.dart'; import 'package:tmail_ui_user/features/email/domain/state/get_email_content_state.dart'; diff --git a/lib/features/composer/presentation/view/web/web_editor_view.dart b/lib/features/composer/presentation/view/web/web_editor_view.dart index c8fa71d01..a46d992bf 100644 --- a/lib/features/composer/presentation/view/web/web_editor_view.dart +++ b/lib/features/composer/presentation/view/web/web_editor_view.dart @@ -2,11 +2,11 @@ import 'package:core/presentation/extensions/html_extension.dart'; import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; +import 'package:core/presentation/views/loading/cupertino_loading_widget.dart'; import 'package:dartz/dartz.dart'; import 'package:flutter/material.dart'; import 'package:html_editor_enhanced/html_editor.dart'; import 'package:model/email/email_action_type.dart'; -import 'package:tmail_ui_user/features/base/widget/cupertino_loading_widget.dart'; import 'package:tmail_ui_user/features/composer/presentation/view/editor_view_mixin.dart'; import 'package:tmail_ui_user/features/composer/presentation/widgets/web/web_editor_widget.dart'; import 'package:tmail_ui_user/features/email/domain/state/get_email_content_state.dart'; diff --git a/lib/features/email/presentation/widgets/email_view_loading_bar_widget.dart b/lib/features/email/presentation/widgets/email_view_loading_bar_widget.dart index f0054755a..fdaade6b8 100644 --- a/lib/features/email/presentation/widgets/email_view_loading_bar_widget.dart +++ b/lib/features/email/presentation/widgets/email_view_loading_bar_widget.dart @@ -1,8 +1,8 @@ import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; +import 'package:core/presentation/views/loading/cupertino_loading_widget.dart'; import 'package:dartz/dartz.dart'; import 'package:flutter/material.dart'; -import 'package:tmail_ui_user/features/base/widget/cupertino_loading_widget.dart'; import 'package:tmail_ui_user/features/email/domain/state/get_email_content_state.dart'; import 'package:tmail_ui_user/features/email/domain/state/parse_calendar_event_state.dart'; diff --git a/lib/features/mailbox/presentation/widgets/mailbox_loading_bar_widget.dart b/lib/features/mailbox/presentation/widgets/mailbox_loading_bar_widget.dart index 32f19a4dd..87c899b48 100644 --- a/lib/features/mailbox/presentation/widgets/mailbox_loading_bar_widget.dart +++ b/lib/features/mailbox/presentation/widgets/mailbox_loading_bar_widget.dart @@ -1,8 +1,8 @@ import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; +import 'package:core/presentation/views/loading/cupertino_loading_widget.dart'; import 'package:dartz/dartz.dart'; import 'package:flutter/material.dart'; -import 'package:tmail_ui_user/features/base/widget/cupertino_loading_widget.dart'; import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/styles/mailbox_loading_bar_widget_styles.dart'; diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart index 8b298621a..e6c64dc44 100644 --- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart +++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; -import 'package:tmail_ui_user/features/base/widget/cupertino_loading_widget.dart'; import 'package:tmail_ui_user/features/base/widget/popup_item_no_icon_widget.dart'; import 'package:tmail_ui_user/features/composer/presentation/composer_view_web.dart'; import 'package:tmail_ui_user/features/email/presentation/email_view.dart'; diff --git a/lib/features/thread/presentation/widgets/thread_view_bottom_loading_bar_widget.dart b/lib/features/thread/presentation/widgets/thread_view_bottom_loading_bar_widget.dart index 6440543e1..85e717911 100644 --- a/lib/features/thread/presentation/widgets/thread_view_bottom_loading_bar_widget.dart +++ b/lib/features/thread/presentation/widgets/thread_view_bottom_loading_bar_widget.dart @@ -1,8 +1,8 @@ import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; +import 'package:core/presentation/views/loading/cupertino_loading_widget.dart'; import 'package:dartz/dartz.dart'; import 'package:flutter/material.dart'; -import 'package:tmail_ui_user/features/base/widget/cupertino_loading_widget.dart'; import 'package:tmail_ui_user/features/thread/domain/state/load_more_emails_state.dart'; import 'package:tmail_ui_user/features/thread/domain/state/search_more_email_state.dart'; diff --git a/lib/features/thread/presentation/widgets/thread_view_loading_bar_widget.dart b/lib/features/thread/presentation/widgets/thread_view_loading_bar_widget.dart index 236559210..b5d7972d6 100644 --- a/lib/features/thread/presentation/widgets/thread_view_loading_bar_widget.dart +++ b/lib/features/thread/presentation/widgets/thread_view_loading_bar_widget.dart @@ -1,8 +1,8 @@ import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; +import 'package:core/presentation/views/loading/cupertino_loading_widget.dart'; import 'package:dartz/dartz.dart'; import 'package:flutter/material.dart'; -import 'package:tmail_ui_user/features/base/widget/cupertino_loading_widget.dart'; import 'package:tmail_ui_user/features/thread/domain/state/get_all_email_state.dart'; import 'package:tmail_ui_user/features/thread/domain/state/search_email_state.dart';