Merge pull request 'fixed safe area' (#168) from fix_safe_area into main

Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/168

lib/views/detail/pages/detail_mobile_page.dart

@@ -81,7 +81,8 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
         context: context,
         title: TenderDetailsStrings.tenderDetailTitle,
       ),
-      body: Consumer<TenderDetailViewModel>(
+      body: SafeArea(
+        child: Consumer<TenderDetailViewModel>(
           builder: (context, tenderViewModel, child) {
             if (tenderViewModel.isLoading) {
               return const Center(
@@ -95,11 +96,12 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
 
             final detail = tenderViewModel.tenderDetail;
             if (detail == null) {
-            return const Center(child: Text(TenderDetailsStrings.tenderNoData));
+              return const Center(
+                child: Text(TenderDetailsStrings.tenderNoData),
+              );
             }
 
-          return SafeArea(
-            child: SingleChildScrollView(
+            return SingleChildScrollView(
               child: Padding(
                 padding: EdgeInsets.symmetric(
                   horizontal: 16.0.w(),
@@ -116,10 +118,10 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
                   ],
                 ),
               ),
-            ),
             );
           },
         ),
+      ),
     );
   }
 }

lib/views/home/pages/m_home_page.dart

@@ -18,7 +18,8 @@ class MobileHomePage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: tenderMobileAppBar(title: HomeStrings.home),
-      body: Consumer<HomeViewModel>(
+      body: SafeArea(
+        child: Consumer<HomeViewModel>(
           builder: (context, homeViewModel, child) {
             if (homeViewModel.isLoading) {
               return const Center(
@@ -33,8 +34,7 @@ class MobileHomePage extends StatelessWidget {
             if (homeViewModel.tenderApprovalsStateResponse != null &&
                 homeViewModel.data != null &&
                 homeViewModel.feedbackStats != null) {
-            return SafeArea(
-              child: SingleChildScrollView(
+              return SingleChildScrollView(
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
@@ -54,7 +54,6 @@ class MobileHomePage extends StatelessWidget {
                     _bottomListView(homeViewModel),
                   ],
                 ),
-              ),
               );
             }
             return const Center(
@@ -62,6 +61,7 @@ class MobileHomePage extends StatelessWidget {
             );
           },
         ),
+      ),
     );
   }
 

lib/views/tenders/pages/m_tenders_page.dart

@@ -43,14 +43,12 @@ class _MobileTendersPageState extends State<MobileTendersPage> {
     return Scaffold(
       backgroundColor: AppColors.backgroundColor,
       appBar: tenderMobileAppBar(title: TendersStrings.tendersTitle),
-      body: SingleChildScrollView(
+      body: SafeArea(
         child: Consumer<TendersViewModel>(
           builder: (context, viewModel, child) {
             if (viewModel.isLoading) {
-              return const Expanded(
-                child: Center(
+              return const Center(
                 child: CircularProgressIndicator(color: AppColors.jellyBean),
-                ),
               );
             }
             if (viewModel.errorMessage != null) {
@@ -63,7 +61,7 @@ class _MobileTendersPageState extends State<MobileTendersPage> {
               return const Center(child: Text(CommonStrings.noData));
             }
 
-            return SafeArea(
+            return SingleChildScrollView(
               child: Padding(
                 padding: EdgeInsets.symmetric(vertical: 18.0.h()),
                 child: MainTendersSlider(