mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed safe area

Browse Source
This commit is contained in:
amirrezaghabeli
2025-09-27 08:55:57 +03:30
parent e432853478
commit ac57392919
3 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/detail/pages/detail_mobile_page.dart
+21 -19
View File
@@ -81,25 +81,27 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
context: context, context: context,
title: TenderDetailsStrings.tenderDetailTitle, title: TenderDetailsStrings.tenderDetailTitle,
), ),
body: Consumer<TenderDetailViewModel>( body: SafeArea(
builder: (context, tenderViewModel, child) { child: Consumer<TenderDetailViewModel>(
if (tenderViewModel.isLoading) { builder: (context, tenderViewModel, child) {
return const Center( if (tenderViewModel.isLoading) {
child: CircularProgressIndicator(color: AppColors.secondary50), return const Center(
); child: CircularProgressIndicator(color: AppColors.secondary50),
} );
}
if (tenderViewModel.errorMessage != null) { if (tenderViewModel.errorMessage != null) {
return Center(child: Text(tenderViewModel.errorMessage!)); return Center(child: Text(tenderViewModel.errorMessage!));
} }
final detail = tenderViewModel.tenderDetail; final detail = tenderViewModel.tenderDetail;
if (detail == null) { if (detail == null) {
return const Center(child: Text(TenderDetailsStrings.tenderNoData)); return const Center(
} child: Text(TenderDetailsStrings.tenderNoData),
);
}
return SafeArea( return SingleChildScrollView(
child: SingleChildScrollView(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 16.0.w(), horizontal: 16.0.w(),
@@ -116,9 +118,9 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
], ],
), ),
), ),
), );
); },
}, ),
), ),
); );
} }
lib/views/home/pages/m_home_page.dart
+21 -21
View File
@@ -18,23 +18,23 @@ class MobileHomePage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: tenderMobileAppBar(title: HomeStrings.home), appBar: tenderMobileAppBar(title: HomeStrings.home),
body: Consumer<HomeViewModel>( body: SafeArea(
builder: (context, homeViewModel, child) { child: Consumer<HomeViewModel>(
if (homeViewModel.isLoading) { builder: (context, homeViewModel, child) {
return const Center( if (homeViewModel.isLoading) {
child: CircularProgressIndicator(color: AppColors.secondary50), return const Center(
); child: CircularProgressIndicator(color: AppColors.secondary50),
} );
}
if (homeViewModel.errorMessage != null) { if (homeViewModel.errorMessage != null) {
return Center(child: Text(homeViewModel.errorMessage!)); return Center(child: Text(homeViewModel.errorMessage!));
} }
if (homeViewModel.tenderApprovalsStateResponse != null && if (homeViewModel.tenderApprovalsStateResponse != null &&
homeViewModel.data != null && homeViewModel.data != null &&
homeViewModel.feedbackStats != null) { homeViewModel.feedbackStats != null) {
return SafeArea( return SingleChildScrollView(
child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@@ -54,13 +54,13 @@ class MobileHomePage extends StatelessWidget {
_bottomListView(homeViewModel), _bottomListView(homeViewModel),
], ],
), ),
), );
}
return const Center(
child: CircularProgressIndicator(color: AppColors.secondary50),
); );
} },
return const Center( ),
child: CircularProgressIndicator(color: AppColors.secondary50),
);
},
), ),
); );
} }
lib/views/tenders/pages/m_tenders_page.dart
+4 -6
View File
@@ -43,14 +43,12 @@ class _MobileTendersPageState extends State<MobileTendersPage> {
return Scaffold( return Scaffold(
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
appBar: tenderMobileAppBar(title: TendersStrings.tendersTitle), appBar: tenderMobileAppBar(title: TendersStrings.tendersTitle),
body: SingleChildScrollView( body: SafeArea(
child: Consumer<TendersViewModel>( child: Consumer<TendersViewModel>(
builder: (context, viewModel, child) { builder: (context, viewModel, child) {
if (viewModel.isLoading) { if (viewModel.isLoading) {
return const Expanded( return const Center(
child: Center( child: CircularProgressIndicator(color: AppColors.jellyBean),
child: CircularProgressIndicator(color: AppColors.jellyBean),
),
); );
} }
if (viewModel.errorMessage != null) { if (viewModel.errorMessage != null) {
@@ -63,7 +61,7 @@ class _MobileTendersPageState extends State<MobileTendersPage> {
return const Center(child: Text(CommonStrings.noData)); return const Center(child: Text(CommonStrings.noData));
} }
return SafeArea( return SingleChildScrollView(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(vertical: 18.0.h()), padding: EdgeInsets.symmetric(vertical: 18.0.h()),
child: MainTendersSlider( child: MainTendersSlider(