Login page design improvements (#26)
the build failed Details

This commit is contained in:
konrad 2019-03-14 21:12:02 +00:00 committed by Gitea
parent cb360f656f
commit ae197684ac
4 changed files with 94 additions and 92 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -19,33 +19,36 @@ class _LoginPageState extends State<LoginPage> {
@override @override
Widget build(BuildContext ctx) { Widget build(BuildContext ctx) {
return Scaffold( return Scaffold(
appBar: AppBar( body: Center(
title: Text('Login to Vikunja'), child: SingleChildScrollView(
), padding: const EdgeInsets.all(16.0),
body: Builder( child: Builder(
builder: (BuildContext context) => SafeArea( builder: (BuildContext context) => Form(
top: false,
bottom: false,
child: Form(
autovalidate: true, autovalidate: true,
key: _formKey, key: _formKey,
child: ListView( child: Center(
padding: const EdgeInsets.symmetric(horizontal: 16.0), child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: vStandardVerticalPadding, padding: EdgeInsets.symmetric(vertical: 30),
child: Image( child: Image(
image: AssetImage('assets/vikunja_logo.png'), image: AssetImage('assets/vikunja_logo_full.png'),
height: 128.0, height: 85.0,
semanticLabel: 'Vikunja Logo', semanticLabel: 'Vikunja Logo',
), ),
), ),
Padding( Padding(
padding: vStandardVerticalPadding, padding: vStandardVerticalPadding,
child: TextFormField( child: TextFormField(
onSaved: (serverAddress) => _server = serverAddress, enabled: !_loading,
onSaved: (serverAddress) =>
_server = serverAddress,
validator: (address) { validator: (address) {
return isUrl(address) ? null : 'Invalid URL'; return isUrl(address)
? null
: 'Invalid URL';
}, },
decoration: new InputDecoration( decoration: new InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
@ -55,9 +58,9 @@ class _LoginPageState extends State<LoginPage> {
Padding( Padding(
padding: vStandardVerticalPadding, padding: vStandardVerticalPadding,
child: TextFormField( child: TextFormField(
enabled: !_loading,
onSaved: (username) => _username = username, onSaved: (username) => _username = username,
decoration: decoration: new InputDecoration(
new InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: 'Username'), labelText: 'Username'),
), ),
@ -65,9 +68,9 @@ class _LoginPageState extends State<LoginPage> {
Padding( Padding(
padding: vStandardVerticalPadding, padding: vStandardVerticalPadding,
child: TextFormField( child: TextFormField(
enabled: !_loading,
onSaved: (password) => _password = password, onSaved: (password) => _password = password,
decoration: decoration: new InputDecoration(
new InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: 'Password'), labelText: 'Password'),
obscureText: true, obscureText: true,
@ -98,9 +101,13 @@ class _LoginPageState extends State<LoginPage> {
child: VikunjaButtonText('Register'), child: VikunjaButtonText('Register'),
)), )),
], ],
)),
), ),
)); ),
),
),
),
),
);
} }
_loginUser(BuildContext context) async { _loginUser(BuildContext context) async {
@ -114,7 +121,9 @@ class _LoginPageState extends State<LoginPage> {
showDialog( showDialog(
context: context, context: context,
builder: (context) => new AlertDialog( builder: (context) => new AlertDialog(
title: Text('Login failed! Please check your server url and credentials. ' + ex.toString()), title: Text(
'Login failed! Please check your server url and credentials. ' +
ex.toString()),
actions: <Widget>[ actions: <Widget>[
FlatButton( FlatButton(
onPressed: () => Navigator.pop(context), onPressed: () => Navigator.pop(context),

View File

@ -20,7 +20,7 @@ class _RegisterPageState extends State<RegisterPage> {
Widget build(BuildContext ctx) { Widget build(BuildContext ctx) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Register to Vikunja'), title: Text('Register'),
), ),
body: Builder( body: Builder(
builder: (BuildContext context) => SafeArea( builder: (BuildContext context) => SafeArea(
@ -29,16 +29,8 @@ class _RegisterPageState extends State<RegisterPage> {
child: Form( child: Form(
key: _formKey, key: _formKey,
child: ListView( child: ListView(
padding: const EdgeInsets.symmetric(horizontal: 16.0), padding: const EdgeInsets.all(16),
children: <Widget>[ children: <Widget>[
Padding(
padding: vStandardVerticalPadding,
child: Image(
image: AssetImage('assets/vikunja_logo.png'),
height: 128.0,
semanticLabel: 'Vikunja Logo',
),
),
Padding( Padding(
padding: vStandardVerticalPadding, padding: vStandardVerticalPadding,
child: TextFormField( child: TextFormField(

View File

@ -34,6 +34,7 @@ flutter:
assets: assets:
- assets/graphics/hypnotize.png - assets/graphics/hypnotize.png
- assets/vikunja_logo.png - assets/vikunja_logo.png
- assets/vikunja_logo_full.png
fonts: fonts:
- family: Quicksand - family: Quicksand
fonts: fonts: