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

Fix loader issue.

See merge request Cloud_Solution/diplomatic-quarter!90
fix_login
Mohammad Aljammal 5 years ago
commit 1775766a08

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

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

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

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

Loading…
Cancel
Save