change SingleChildScrollView into list view and add safeArea

merge-requests/3/head
Elham Rababah 6 years ago
parent 87eb2ca6b8
commit 9621f5d9b5

@ -2,24 +2,26 @@ import 'package:doctor_app_flutter/lookups/auth_lookup.dart';
import 'package:doctor_app_flutter/widgets/auth/auth_header.dart'; import 'package:doctor_app_flutter/widgets/auth/auth_header.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../widgets/auth/change_password.dart'; import '../../widgets/auth/change_password.dart';
class ChangePasswordScreen extends StatelessWidget { class ChangePasswordScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// return Container()]; // return Container()];
return Scaffold( return Scaffold(
backgroundColor: Colors.white, body: SafeArea(
body: SingleChildScrollView( child: ListView(children: <Widget>[
child: Container( Container(
margin: EdgeInsetsDirectional.fromSTEB(30, 0, 0, 0), margin: EdgeInsetsDirectional.fromSTEB(30, 0, 0, 0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AuthHeader(loginType.changePassword), AuthHeader(loginType.changePassword),
ChangePassword(), ChangePassword(),
], ],
),
), ),
)); ),
]),
));
} }
} }

@ -11,12 +11,12 @@ import '../../widgets/auth/login_form.dart';
import '../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; import '../../widgets/shared/dr_app_circular_progress_Indeicator.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
class Loginsreen extends StatefulWidget { class Loginsreen extends StatefulWidget {
@override @override
_LoginsreenState createState() => _LoginsreenState(); _LoginsreenState createState() => _LoginsreenState();
} }
class _LoginsreenState extends State<Loginsreen> { class _LoginsreenState extends State<Loginsreen> {
Future<SharedPreferences> _prefs = SharedPreferences.getInstance(); Future<SharedPreferences> _prefs = SharedPreferences.getInstance();
@ -25,7 +25,7 @@ class _LoginsreenState extends State<Loginsreen> {
Future<String> platformImeiFuture; Future<String> platformImeiFuture;
Future<void> getSharedPref() async { Future<void> getSharedPref() async {
sharedPref.getString('platformImei').then((imei){ sharedPref.getString('platformImei').then((imei) {
platformImei = imei; platformImei = imei;
}); });
} }
@ -42,45 +42,46 @@ class _LoginsreenState extends State<Loginsreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
getSharedPref(); getSharedPref();
return Scaffold( return Scaffold(
backgroundColor: Colors.white, body: SafeArea(
body: SingleChildScrollView( child: ListView(children: <Widget>[
child: FutureBuilder( FutureBuilder(
future: platformImeiFuture, future: platformImeiFuture,
builder: (BuildContext context, AsyncSnapshot<String> snapshot) { builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
switch (snapshot.connectionState) { switch (snapshot.connectionState) {
case ConnectionState.waiting: case ConnectionState.waiting:
return DrAppCircularProgressIndeicator(); return DrAppCircularProgressIndeicator();
default: default:
if (snapshot.hasError) { if (snapshot.hasError) {
return Text('Error: ${snapshot.error}'); return Text('Error: ${snapshot.error}');
} else { } else {
return Container( return Container(
margin: EdgeInsetsDirectional.fromSTEB(30, 0, 0, 0), margin: EdgeInsetsDirectional.fromSTEB(30, 0, 0, 0),
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
(platformImei == null) (platformImei == null)
? Column( ? Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AuthHeader(loginType.knownUser), AuthHeader(loginType.knownUser),
LoginForm(), LoginForm(),
], ],
) )
: Column( : Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AuthHeader(loginType.unknownUser), AuthHeader(loginType.unknownUser),
KnownUserLogin(), KnownUserLogin(),
], ],
), ),
])); ]));
} }
} }
}), }),
]),
), ),
); );
} }

@ -1,9 +1,8 @@
import 'package:doctor_app_flutter/widgets/auth/verification_methods.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../lookups/auth_lookup.dart'; import '../../lookups/auth_lookup.dart';
import '../../widgets/auth/auth_header.dart'; import '../../widgets/auth/auth_header.dart';
import '../../widgets/auth/verfiy_account.dart'; import '../../widgets/auth/verification_methods.dart';
/* /*
*@author: Elham Rababah *@author: Elham Rababah
@ -17,18 +16,17 @@ class VerificationMethodsScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
// return Container()]; // return Container()];
return Scaffold( return Scaffold(
backgroundColor: Colors.white, body: ListView(children: <Widget>[
body: SingleChildScrollView( Container(
child: Container( margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),
margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
children: <Widget>[ AuthHeader(loginType.verificationMethods),
AuthHeader(loginType.verificationMethods), VerificationMethods(),
VerificationMethods(), ],
], ),
), ),
), ]));
));
} }
} }

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import '../../lookups/auth_lookup.dart'; import '../../lookups/auth_lookup.dart';
import '../../widgets/auth/auth_header.dart'; import '../../widgets/auth/auth_header.dart';
import 'package:flutter/material.dart';
import '../../widgets/auth/verfiy_account.dart'; import '../../widgets/auth/verfiy_account.dart';
class VerifyAccountScreen extends StatelessWidget { class VerifyAccountScreen extends StatelessWidget {
@ -8,18 +9,19 @@ class VerifyAccountScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
// return Container()]; // return Container()];
return Scaffold( return Scaffold(
backgroundColor: Colors.white, body: SafeArea(
body: SingleChildScrollView( child: ListView(children: <Widget>[
child: Container( Container(
margin: EdgeInsetsDirectional.fromSTEB(30, 0, 0, 0), margin: EdgeInsetsDirectional.fromSTEB(30, 0, 0, 0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AuthHeader(loginType.verifyPassword), AuthHeader(loginType.verifyPassword),
VerifyAccount(), VerifyAccount(),
], ],
),
), ),
)); ),
]),
));
} }
} }

Loading…
Cancel
Save