diff --git a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart index 0cb5dec3d..94f8b27b4 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart @@ -157,6 +157,8 @@ class SearchController extends BaseController { bool isSearchActive() => searchState.value.searchStatus == SearchStatus.ACTIVE; + bool isAdvanceSearchActive() => isAdvancedSearchHasApply.isTrue; + void enableSearch() { searchState.value = searchState.value.enableSearchState(); } diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart index b91fdb2ab..6020c8373 100644 --- a/lib/features/thread/presentation/thread_controller.dart +++ b/lib/features/thread/presentation/thread_controller.dart @@ -803,6 +803,9 @@ class ThreadController extends BaseController { bool isSearchActive() => searchController.isSearchActive(); + bool isAdvanceSearchActive() => searchController.isAdvanceSearchActive(); + + bool get isAllSearchInActive => !searchController.isSearchActive() && searchController.isAdvancedSearchViewOpen.isFalse; diff --git a/lib/features/thread/presentation/thread_view.dart b/lib/features/thread/presentation/thread_view.dart index 6e1886a03..0cf7033fb 100644 --- a/lib/features/thread/presentation/thread_view.dart +++ b/lib/features/thread/presentation/thread_view.dart @@ -473,7 +473,7 @@ class ThreadView extends GetWidget with AppLoaderMixin, return Obx(() => controller.viewState.value.fold( (failure) => const SizedBox.shrink(), (success) { - if (controller.isSearchActive()) { + if (controller.isSearchActive() || controller.isAdvanceSearchActive()) { return success is SearchingState ? Padding(padding: const EdgeInsets.symmetric(vertical: 16), child: loadingWidget) : const SizedBox.shrink();