vikunja
/
app-mirror-github
mirror of https://github.com/go-vikunja/app
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Theme update (#23)

This commit is contained in:
konrad 2019-03-11 20:38:05 +00:00 committed by Gitea
parent b904379af7
commit cb360f656f
12 changed files with 203 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/graphics/background.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 126 KiB

4
lib/main.dart
View File

@ -1,10 +1,8 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:vikunja_app/global.dart';
import 'package:vikunja_app/pages/home_page.dart';
import 'package:vikunja_app/pages/login_page.dart';
import 'package:vikunja_app/style.dart';
import 'package:vikunja_app/theme/theme.dart';
void main() => runApp(VikunjaGlobal(
child: new VikunjaApp(home: HomePage()),

2
lib/pages/list_page.dart
View File

@ -102,7 +102,7 @@ class _ListPageState extends State<ListPage> {
builder: (_) => AddDialog(
onAdd: _addItem,
decoration: new InputDecoration(
labelText: 'List Item', hintText: 'eg. Milk')));
labelText: 'Task Name', hintText: 'eg. Milk')));
}
_addItem(String name) {

38
lib/pages/login_page.dart
View File

@ -1,6 +1,9 @@
import 'package:flutter/material.dart';
import 'package:vikunja_app/global.dart';
import 'package:vikunja_app/pages/register_page.dart';
import 'package:vikunja_app/theme/button.dart';
import 'package:vikunja_app/theme/buttonText.dart';
import 'package:vikunja_app/theme/constants.dart';
import 'package:vikunja_app/utils/validator.dart';
class LoginPage extends StatefulWidget {
@ -30,7 +33,7 @@ class _LoginPageState extends State<LoginPage> {
padding: const EdgeInsets.symmetric(horizontal: 16.0),
children: <Widget>[
Padding(
padding: const EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: Image(
image: AssetImage('assets/vikunja_logo.png'),
height: 128.0,
@ -38,37 +41,40 @@ class _LoginPageState extends State<LoginPage> {
),
),
Padding(
padding: EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: TextFormField(
onSaved: (serverAddress) => _server = serverAddress,
validator: (address) {
return isUrl(address) ? null : 'Invalid URL';
},
decoration: new InputDecoration(
border: OutlineInputBorder(),
labelText: 'Server Address'),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: TextFormField(
onSaved: (username) => _username = username,
decoration:
new InputDecoration(labelText: 'Username'),
new InputDecoration(
border: OutlineInputBorder(),
labelText: 'Username'),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: TextFormField(
onSaved: (password) => _password = password,
decoration:
new InputDecoration(labelText: 'Password'),
new InputDecoration(
border: OutlineInputBorder(),
labelText: 'Password'),
obscureText: true,
),
),
Builder(
builder: (context) => ButtonTheme(
height: _loading ? 55.0 : 36.0,
child: RaisedButton(
builder: (context) => FancyButton(
onPressed: !_loading
? () {
if (_formKey.currentState
@ -80,21 +86,17 @@ class _LoginPageState extends State<LoginPage> {
: null,
child: _loading
? CircularProgressIndicator()
: Text('Login'),
))),
: VikunjaButtonText('Login'),
)),
Builder(
builder: (context) => ButtonTheme(
height: _loading ? 55.0 : 36.0,
child: RaisedButton(
builder: (context) => FancyButton(
onPressed: () => Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
RegisterPage())),
child: _loading
? CircularProgressIndicator()
: Text('Register'),
))),
child: VikunjaButtonText('Register'),
)),
],
)),
),

40
lib/pages/register_page.dart
View File

@ -1,5 +1,8 @@
import 'package:flutter/material.dart';
import 'package:vikunja_app/global.dart';
import 'package:vikunja_app/theme/button.dart';
import 'package:vikunja_app/theme/buttonText.dart';
import 'package:vikunja_app/theme/constants.dart';
import 'package:vikunja_app/utils/validator.dart';
class RegisterPage extends StatefulWidget {
@ -29,7 +32,7 @@ class _RegisterPageState extends State<RegisterPage> {
padding: const EdgeInsets.symmetric(horizontal: 16.0),
children: <Widget>[
Padding(
padding: const EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: Image(
image: AssetImage('assets/vikunja_logo.png'),
height: 128.0,
@ -37,18 +40,19 @@ class _RegisterPageState extends State<RegisterPage> {
),
),
Padding(
padding: EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: TextFormField(
onSaved: (serverAddress) => _server = serverAddress,
validator: (address) {
return isUrl(address) ? null : 'Invalid URL';
},
decoration: new InputDecoration(
border: OutlineInputBorder(),
labelText: 'Server Address'),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: TextFormField(
onSaved: (username) => _username = username.trim(),
validator: (username) {
@ -56,12 +60,13 @@ class _RegisterPageState extends State<RegisterPage> {
? null
: 'Please specify a username';
},
decoration:
new InputDecoration(labelText: 'Username'),
decoration: new InputDecoration(
border: OutlineInputBorder(),
labelText: 'Username'),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: TextFormField(
onSaved: (email) => _email = email,
validator: (email) {
@ -69,12 +74,13 @@ class _RegisterPageState extends State<RegisterPage> {
? null
: 'Email adress is invalid';
},
decoration:
new InputDecoration(labelText: 'Email Address'),
decoration: new InputDecoration(
border: OutlineInputBorder(),
labelText: 'Email Address'),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: TextFormField(
controller: passwordController,
onSaved: (password) => _password = password,
@ -83,13 +89,14 @@ class _RegisterPageState extends State<RegisterPage> {
? null
: 'Please use at least 8 characters';
},
decoration:
new InputDecoration(labelText: 'Password'),
decoration: new InputDecoration(
border: OutlineInputBorder(),
labelText: 'Password'),
obscureText: true,
),
),
Padding(
padding: const EdgeInsets.all(8.0),
padding: vStandardVerticalPadding,
child: TextFormField(
validator: (password) {
return passwordController.text == password
@ -97,14 +104,13 @@ class _RegisterPageState extends State<RegisterPage> {
: 'Passwords don\'t match.';
},
decoration: new InputDecoration(
border: OutlineInputBorder(),
labelText: 'Repeat Password'),
obscureText: true,
),
),
Builder(
builder: (context) => ButtonTheme(
height: _loading ? 55.0 : 36.0,
child: RaisedButton(
builder: (context) => FancyButton(
onPressed: !_loading
? () {
if (_formKey.currentState
@ -118,8 +124,8 @@ class _RegisterPageState extends State<RegisterPage> {
: null,
child: _loading
? CircularProgressIndicator()
: Text('Register'),
))),
: VikunjaButtonText('Register'),
)),
],
)),
),

23
lib/style.dart
View File

@ -1,23 +0,0 @@
import 'package:flutter/material.dart';
const vBlue = Color(0xFF455486);
const vBlueLight = Color(0xFF7480b7);
const vBlueDark = Color(0xFF152c5a);
const vBlack = Color(0xFFFFFFFF);
ThemeData buildVikunjaTheme() {
var base = ThemeData.light();
return base.copyWith(
primaryColor: vBlue,
primaryColorLight: vBlueLight,
primaryColorDark: vBlueDark,
textTheme: base.textTheme.copyWith(
headline: base.textTheme.headline.copyWith(
fontFamily: 'Quicksand',
fontSize: 72.0,
),
title: base.textTheme.title.copyWith(
fontFamily: 'Quicksand',
),
));
}

43
lib/theme/button.dart Normal file
View File

@ -0,0 +1,43 @@
import 'package:flutter/material.dart';
import 'package:vikunja_app/theme/constants.dart';
class FancyButton extends StatelessWidget {
final double width;
final double height;
final Function onPressed;
final Widget child;
const FancyButton({
Key key,
@required this.child,
this.width = double.infinity,
this.height = 35,
this.onPressed,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return Padding(
padding: vStandardVerticalPadding,
child: Container(
width: width,
height: height,
decoration: BoxDecoration(boxShadow: [
BoxShadow(
color: vButtonShadow,
offset: Offset(-5, 5),
blurRadius: 10,
),
]),
child: Material(
borderRadius: BorderRadius.circular(3),
color: vButtonColor,
child: InkWell(
onTap: onPressed,
child: Center(
child: child,
)),
),
));
}
}

19
lib/theme/buttonText.dart Normal file
View File

@ -0,0 +1,19 @@
import 'package:flutter/material.dart';
import 'package:vikunja_app/theme/constants.dart';
class VikunjaButtonText extends StatelessWidget {
final String text;
const VikunjaButtonText(
this.text, {
Key key,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return Text(
text,
style: TextStyle(color: vButtonTextColor, fontWeight: FontWeight.w600),
);
}
}

25
lib/theme/constants.dart Normal file
View File

@ -0,0 +1,25 @@
import 'package:flutter/material.dart';
/////////
// Colors
//////
const vBlue = Color(0xFF7F23FF);
const vBlueLight = Color(0xFF7480b7);
const vBlueDark = Color(0xFF152c5a);
const vPrimary = Color(0xFF0c86ff);
const vPrimaryDark = Color(0xFF1A73E8);
const vRed = Color(0xFFff4136);
const vOrange = Color(0xFFff851b);
const vWhite = Color(0xFFffffff);
const vGreen = Color(0xFF00CE6E);
const vButtonColor = vPrimary;
const vButtonTextColor = vWhite;
const vButtonShadow = Color(0xFFb2d9ff);
///////////
// Paddings
////////
const vStandardVerticalPadding = EdgeInsets.symmetric(vertical: 5.0);
const vStandardHorizontalPadding = EdgeInsets.symmetric(horizontal: 5.0);
const vStandardPadding = EdgeInsets.symmetric(horizontal: 5.0, vertical: 5.0);

37
lib/theme/fancyAppBar.dart Normal file
View File

@ -0,0 +1,37 @@
import 'package:flutter/material.dart';
class FancyAppBar extends StatelessWidget {
final String title;
final double barHeight = 80.0;
FancyAppBar(this.title);
@override
Widget build(BuildContext context) {
return new Container(
height: barHeight,
width: double.infinity,
decoration: new BoxDecoration(color: Colors.blue),
child: new Padding(
padding: EdgeInsets.symmetric(vertical: 38, horizontal: 10),
child: new Text(title,
style: const TextStyle(
color: Colors.white,
fontWeight: FontWeight.w600,
fontFamily: 'Quicksand',
fontSize: 21)),
),
);
}
}
/*
Usage:
return new Scaffold(
body: new Column(
children: <Widget>[
new FancyAppBar('Login to Vikunja'),
],
),
);
*/

34
lib/theme/theme.dart Normal file
View File

@ -0,0 +1,34 @@
import 'package:flutter/material.dart';
import 'package:vikunja_app/theme/constants.dart';
ThemeData buildVikunjaTheme() {
var base = ThemeData.light();
return base.copyWith(
errorColor: vRed,
primaryColor: vPrimaryDark,
primaryColorLight: vPrimary,
primaryColorDark: vBlueDark,
buttonTheme: base.buttonTheme.copyWith(
buttonColor: vPrimary,
textTheme: ButtonTextTheme.normal,
colorScheme: base.buttonTheme.colorScheme.copyWith(
// Why does this not work?
onSurface: vWhite,
onSecondary: vWhite,
background: vBlue,
),
),
textTheme: base.textTheme.copyWith(
headline: base.textTheme.headline.copyWith(
fontFamily: 'Quicksand',
),
title: base.textTheme.title.copyWith(
fontFamily: 'Quicksand',
),
button: base.textTheme.button.copyWith(
color:
vWhite, // This does not work, looks like a bug in Flutter: https://github.com/flutter/flutter/issues/19623
),
),
);
}

1
pubspec.yaml
View File

@ -32,7 +32,6 @@ flutter_icons:
flutter:
uses-material-design: true
assets:
- assets/graphics/background.jpg
- assets/graphics/hypnotize.png
- assets/vikunja_logo.png
fonts: