From ac57392919509e5b2d8831d4bf9e9f4b18dff12c Mon Sep 17 00:00:00 2001 From: amirrezaghabeli Date: Sat, 27 Sep 2025 08:55:57 +0330 Subject: [PATCH] fixed safe area --- .../detail/pages/detail_mobile_page.dart | 40 +++++++++--------- lib/views/home/pages/m_home_page.dart | 42 +++++++++---------- lib/views/tenders/pages/m_tenders_page.dart | 10 ++--- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/lib/views/detail/pages/detail_mobile_page.dart b/lib/views/detail/pages/detail_mobile_page.dart index 1d9c4d0..23e6ccc 100644 --- a/lib/views/detail/pages/detail_mobile_page.dart +++ b/lib/views/detail/pages/detail_mobile_page.dart @@ -81,25 +81,27 @@ class _TenderDetailMobilePageState extends State { context: context, title: TenderDetailsStrings.tenderDetailTitle, ), - body: Consumer( - builder: (context, tenderViewModel, child) { - if (tenderViewModel.isLoading) { - return const Center( - child: CircularProgressIndicator(color: AppColors.secondary50), - ); - } + body: SafeArea( + child: Consumer( + builder: (context, tenderViewModel, child) { + if (tenderViewModel.isLoading) { + return const Center( + child: CircularProgressIndicator(color: AppColors.secondary50), + ); + } - if (tenderViewModel.errorMessage != null) { - return Center(child: Text(tenderViewModel.errorMessage!)); - } + if (tenderViewModel.errorMessage != null) { + return Center(child: Text(tenderViewModel.errorMessage!)); + } - final detail = tenderViewModel.tenderDetail; - if (detail == null) { - return const Center(child: Text(TenderDetailsStrings.tenderNoData)); - } + final detail = tenderViewModel.tenderDetail; + if (detail == null) { + return const Center( + child: Text(TenderDetailsStrings.tenderNoData), + ); + } - return SafeArea( - child: SingleChildScrollView( + return SingleChildScrollView( child: Padding( padding: EdgeInsets.symmetric( horizontal: 16.0.w(), @@ -116,9 +118,9 @@ class _TenderDetailMobilePageState extends State { ], ), ), - ), - ); - }, + ); + }, + ), ), ); } diff --git a/lib/views/home/pages/m_home_page.dart b/lib/views/home/pages/m_home_page.dart index 6a8f445..74f2525 100644 --- a/lib/views/home/pages/m_home_page.dart +++ b/lib/views/home/pages/m_home_page.dart @@ -18,23 +18,23 @@ class MobileHomePage extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( appBar: tenderMobileAppBar(title: HomeStrings.home), - body: Consumer( - builder: (context, homeViewModel, child) { - if (homeViewModel.isLoading) { - return const Center( - child: CircularProgressIndicator(color: AppColors.secondary50), - ); - } + body: SafeArea( + child: Consumer( + builder: (context, homeViewModel, child) { + if (homeViewModel.isLoading) { + return const Center( + child: CircularProgressIndicator(color: AppColors.secondary50), + ); + } - if (homeViewModel.errorMessage != null) { - return Center(child: Text(homeViewModel.errorMessage!)); - } + if (homeViewModel.errorMessage != null) { + return Center(child: Text(homeViewModel.errorMessage!)); + } - if (homeViewModel.tenderApprovalsStateResponse != null && - homeViewModel.data != null && - homeViewModel.feedbackStats != null) { - return SafeArea( - child: SingleChildScrollView( + if (homeViewModel.tenderApprovalsStateResponse != null && + homeViewModel.data != null && + homeViewModel.feedbackStats != null) { + return SingleChildScrollView( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -54,13 +54,13 @@ class MobileHomePage extends StatelessWidget { _bottomListView(homeViewModel), ], ), - ), + ); + } + return const Center( + child: CircularProgressIndicator(color: AppColors.secondary50), ); - } - return const Center( - child: CircularProgressIndicator(color: AppColors.secondary50), - ); - }, + }, + ), ), ); } diff --git a/lib/views/tenders/pages/m_tenders_page.dart b/lib/views/tenders/pages/m_tenders_page.dart index f82e241..5325e16 100644 --- a/lib/views/tenders/pages/m_tenders_page.dart +++ b/lib/views/tenders/pages/m_tenders_page.dart @@ -43,14 +43,12 @@ class _MobileTendersPageState extends State { return Scaffold( backgroundColor: AppColors.backgroundColor, appBar: tenderMobileAppBar(title: TendersStrings.tendersTitle), - body: SingleChildScrollView( + body: SafeArea( child: Consumer( builder: (context, viewModel, child) { if (viewModel.isLoading) { - return const Expanded( - child: Center( - child: CircularProgressIndicator(color: AppColors.jellyBean), - ), + return const Center( + child: CircularProgressIndicator(color: AppColors.jellyBean), ); } if (viewModel.errorMessage != null) { @@ -63,7 +61,7 @@ class _MobileTendersPageState extends State { return const Center(child: Text(CommonStrings.noData)); } - return SafeArea( + return SingleChildScrollView( child: Padding( padding: EdgeInsets.symmetric(vertical: 18.0.h()), child: MainTendersSlider(