Fix 2 loader inside the dashboard_screen

fix_issues
Elham Rababah 6 years ago
parent d47e1c2a43
commit ae8af0ab43

@ -457,25 +457,23 @@ class _DashboardScreenState extends State<DashboardScreen> {
], ],
), ),
), ),
NetworkBaseView( Padding(
baseViewModel: model, padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 1.0),
child: Padding( child: Row(
padding: mainAxisAlignment: MainAxisAlignment.spaceBetween,
EdgeInsets.symmetric(horizontal: 20.0, vertical: 1.0), children: <Widget>[
child: Row( Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
children: <Widget>[ Text(
Column( TranslationBase.of(context).nearestDropOffs,
children: <Widget>[ style: TextStyle(
Text( fontSize: 21.0,
TranslationBase.of(context).nearestDropOffs, fontWeight: FontWeight.w400,
style: TextStyle(
fontSize: 21.0,
fontWeight: FontWeight.w400,
),
), ),
], ),
), ],
),
if (model.state == ViewState.Idle)
Column( Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
@ -494,16 +492,16 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
], ],
), ),
onTap: () => Navigator.push( onTap: () =>
context, Navigator.push(
MaterialPageRoute( context,
builder: (context) => OrdersListScreen()), MaterialPageRoute(
), builder: (context) => OrdersListScreen()),
),
), ),
], ],
), ),
], ],
),
), ),
), ),
NetworkBaseView( NetworkBaseView(

@ -14,7 +14,7 @@ class SplashScreenPage extends StatefulWidget {
class _SplashScreenPageState extends State<SplashScreenPage> { class _SplashScreenPageState extends State<SplashScreenPage> {
startTime() async { startTime() async {
var _duration = new Duration(seconds: 2); var _duration = new Duration(seconds: 1);
return new Timer(_duration, navigationPage); return new Timer(_duration, navigationPage);
} }

Loading…
Cancel
Save