Merge branch 'loader_fix' into 'diplomatic-quarter-live'

Fix loader issue.

See merge request Cloud_Solution/diplomatic-quarter!90

lib/pages/pharmacies/medicine_search_screen.dart

@@ -25,6 +25,7 @@ class MedicineSearch extends StatelessWidget {
           AppScaffold(
               baseViewModel: model,
               appBarTitle: TranslationBase.of(context).searchMedicine,
+              isShowAppBar: true,
               body: Container(
                 height: SizeConfig.screenHeight,
                 child: Column(

lib/uitl/gif_loader_dialog_utils.dart

@@ -3,13 +3,8 @@ import 'package:flutter/material.dart';
 import '../widgets/Loader/gif_loader_container.dart';
 
 class GifLoaderDialogUtils {
-  static AlertDialog dialog = AlertDialog(
-    backgroundColor: Colors.transparent,
-    content: GifLoaderContainer(),
-  );
-
   static showMyDialog(BuildContext context) {
-    showDialog(context: context, child: dialog);
+    showDialog(context: context, child: GifLoaderContainer());
   }
 
   static hideDialog(BuildContext context) {

lib/widgets/Loader/gif_loader_container.dart

@@ -32,7 +32,7 @@ class _GifLoaderContainerState extends State<GifLoaderContainer>
     return Center(
       //progress-loading.gif
         child: Container(
-          margin: EdgeInsets.only(bottom: 40),
+          // margin: EdgeInsets.only(bottom: 40),
           child: GifImage(
             controller: controller1,
             image: AssetImage(

lib/widgets/others/network_base_view.dart

@@ -42,14 +42,18 @@ class _NetworkBaseViewState extends State<NetworkBaseView>{
         return widget.child;
         break;
       case ViewState.Busy:
-        return Stack(
-          children: [
-            Container(
-              height: MediaQuery.of(context).size.height,
-              color: Colors.grey.withOpacity(0.6),
-            ),
-            GifLoaderContainer()
-          ],
+        return Container(
+          height: MediaQuery.of(context).size.height,
+
+          child: Stack(
+            children: [
+              Container(
+                color: Colors.grey.withOpacity(0.6),
+              ),
+              Container(child: GifLoaderContainer(), margin: EdgeInsets.only(
+                  bottom: MediaQuery.of(context).size.height * 0.09))
+            ],
+          ),
         );
         break;
       case ViewState.Error: