This commit is contained in:
parent
fa05e0e6a3
commit
75f6608863
|
@ -49,7 +49,7 @@ class TaskTileState extends State<TaskTile> {
|
||||||
trailing: IconButton(
|
trailing: IconButton(
|
||||||
icon: Icon(Icons.settings),
|
icon: Icon(Icons.settings),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
null;
|
null; // TODO: implement edit task
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,6 @@ import 'package:vikunja_app/api/task_implementation.dart';
|
||||||
import 'package:vikunja_app/api/user_implementation.dart';
|
import 'package:vikunja_app/api/user_implementation.dart';
|
||||||
import 'package:vikunja_app/managers/user.dart';
|
import 'package:vikunja_app/managers/user.dart';
|
||||||
import 'package:vikunja_app/models/user.dart';
|
import 'package:vikunja_app/models/user.dart';
|
||||||
import 'package:vikunja_app/service/mocked_services.dart';
|
|
||||||
import 'package:vikunja_app/service/services.dart';
|
import 'package:vikunja_app/service/services.dart';
|
||||||
|
|
||||||
class VikunjaGlobal extends StatefulWidget {
|
class VikunjaGlobal extends StatefulWidget {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:vikunja_app/global.dart';
|
import 'package:vikunja_app/global.dart';
|
||||||
import 'package:vikunja_app/pages/home_page.dart';
|
import 'package:vikunja_app/pages/home.dart';
|
||||||
import 'package:vikunja_app/pages/login_page.dart';
|
import 'package:vikunja_app/pages/user/login.dart';
|
||||||
import 'package:vikunja_app/theme/theme.dart';
|
import 'package:vikunja_app/theme/theme.dart';
|
||||||
|
|
||||||
void main() => runApp(VikunjaGlobal(
|
void main() => runApp(VikunjaGlobal(
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
import 'package:meta/meta.dart';
|
|
||||||
|
|
||||||
class User {
|
class User {
|
||||||
final int id;
|
final int id;
|
||||||
final String email, username;
|
final String email, username;
|
||||||
|
|
|
@ -3,12 +3,10 @@ import 'dart:async';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:vikunja_app/components/AddDialog.dart';
|
import 'package:vikunja_app/components/AddDialog.dart';
|
||||||
import 'package:vikunja_app/components/GravatarImage.dart';
|
import 'package:vikunja_app/components/GravatarImage.dart';
|
||||||
import 'package:vikunja_app/fragments/namespace.dart';
|
import 'package:vikunja_app/pages/namespace/namespace.dart';
|
||||||
import 'package:vikunja_app/fragments/placeholder.dart';
|
import 'package:vikunja_app/pages/placeholder.dart';
|
||||||
import 'package:vikunja_app/global.dart';
|
import 'package:vikunja_app/global.dart';
|
||||||
import 'package:vikunja_app/models/namespace.dart';
|
import 'package:vikunja_app/models/namespace.dart';
|
||||||
import 'package:vikunja_app/models/task.dart';
|
|
||||||
import 'package:vikunja_app/models/user.dart';
|
|
||||||
|
|
||||||
class HomePage extends StatefulWidget {
|
class HomePage extends StatefulWidget {
|
||||||
@override
|
@override
|
||||||
|
@ -26,9 +24,9 @@ class HomePageState extends State<HomePage> {
|
||||||
|
|
||||||
_getDrawerItemWidget(int pos) {
|
_getDrawerItemWidget(int pos) {
|
||||||
if (pos == -1) {
|
if (pos == -1) {
|
||||||
return new PlaceholderFragment();
|
return new PlaceholderPage();
|
||||||
}
|
}
|
||||||
return new NamespaceFragment(namespace: _namespaces[pos]);
|
return new NamespacePage(namespace: _namespaces[pos]);
|
||||||
}
|
}
|
||||||
|
|
||||||
_onSelectItem(int index) {
|
_onSelectItem(int index) {
|
||||||
|
@ -51,14 +49,14 @@ class HomePageState extends State<HomePage> {
|
||||||
.namespaceService
|
.namespaceService
|
||||||
.create(Namespace(id: null, name: name))
|
.create(Namespace(id: null, name: name))
|
||||||
.then((_) {
|
.then((_) {
|
||||||
_updateNamespaces();
|
_loadNamespaces();
|
||||||
Scaffold.of(context).showSnackBar(SnackBar(
|
Scaffold.of(context).showSnackBar(SnackBar(
|
||||||
content: Text('The namespace was created successfully!'),
|
content: Text('The namespace was created successfully!'),
|
||||||
));
|
));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _updateNamespaces() {
|
Future<void> _loadNamespaces() {
|
||||||
return VikunjaGlobal.of(context).namespaceService.getAll().then((result) {
|
return VikunjaGlobal.of(context).namespaceService.getAll().then((result) {
|
||||||
setState(() {
|
setState(() {
|
||||||
_loading = false;
|
_loading = false;
|
||||||
|
@ -70,7 +68,7 @@ class HomePageState extends State<HomePage> {
|
||||||
@override
|
@override
|
||||||
void didChangeDependencies() {
|
void didChangeDependencies() {
|
||||||
super.didChangeDependencies();
|
super.didChangeDependencies();
|
||||||
_updateNamespaces();
|
_loadNamespaces();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
@ -114,7 +112,7 @@ class HomePageState extends State<HomePage> {
|
||||||
children: ListTile.divideTiles(
|
children: ListTile.divideTiles(
|
||||||
context: context, tiles: drawerOptions)
|
context: context, tiles: drawerOptions)
|
||||||
.toList()),
|
.toList()),
|
||||||
onRefresh: _updateNamespaces,
|
onRefresh: _loadNamespaces,
|
||||||
)),
|
)),
|
||||||
new Align(
|
new Align(
|
||||||
alignment: FractionalOffset.bottomCenter,
|
alignment: FractionalOffset.bottomCenter,
|
|
@ -6,7 +6,7 @@ import 'package:vikunja_app/components/TaskTile.dart';
|
||||||
import 'package:vikunja_app/global.dart';
|
import 'package:vikunja_app/global.dart';
|
||||||
import 'package:vikunja_app/models/list.dart';
|
import 'package:vikunja_app/models/list.dart';
|
||||||
import 'package:vikunja_app/models/task.dart';
|
import 'package:vikunja_app/models/task.dart';
|
||||||
import 'package:vikunja_app/pages/list_edit_page.dart';
|
import 'package:vikunja_app/pages/list/list_edit.dart';
|
||||||
|
|
||||||
class ListPage extends StatefulWidget {
|
class ListPage extends StatefulWidget {
|
||||||
final TaskList taskList;
|
final TaskList taskList;
|
|
@ -6,22 +6,23 @@ import 'package:vikunja_app/components/AddDialog.dart';
|
||||||
import 'package:vikunja_app/global.dart';
|
import 'package:vikunja_app/global.dart';
|
||||||
import 'package:vikunja_app/models/list.dart';
|
import 'package:vikunja_app/models/list.dart';
|
||||||
import 'package:vikunja_app/models/namespace.dart';
|
import 'package:vikunja_app/models/namespace.dart';
|
||||||
import 'package:vikunja_app/pages/list_page.dart';
|
import 'package:vikunja_app/pages/list/list.dart';
|
||||||
|
|
||||||
class NamespaceFragment extends StatefulWidget {
|
class NamespacePage extends StatefulWidget {
|
||||||
final Namespace namespace;
|
final Namespace namespace;
|
||||||
|
|
||||||
NamespaceFragment({this.namespace})
|
NamespacePage({this.namespace}) : super(key: Key(namespace.id.toString()));
|
||||||
: super(key: Key(namespace.id.toString()));
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
_NamespaceFragmentState createState() => new _NamespaceFragmentState();
|
_NamespacePageState createState() => new _NamespacePageState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _NamespaceFragmentState extends State<NamespaceFragment> {
|
class _NamespacePageState extends State<NamespacePage> {
|
||||||
List<TaskList> _lists = [];
|
List<TaskList> _lists = [];
|
||||||
bool _loading = true;
|
bool _loading = true;
|
||||||
|
|
||||||
|
/////
|
||||||
|
// This essentially shows the lists.
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
|
@ -1,6 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
class PlaceholderFragment extends StatelessWidget {
|
class PlaceholderPage extends StatelessWidget {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return new Container(
|
return new Container(
|
||||||
|
@ -15,7 +15,7 @@ class PlaceholderFragment extends StatelessWidget {
|
||||||
style: Theme.of(context).textTheme.headline,
|
style: Theme.of(context).textTheme.headline,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
new Text('Please select a namespace by clicking the ☰ icon.',
|
new Text('Please select a namespace by tapping the ☰ icon.',
|
||||||
style: Theme.of(context).textTheme.subhead),
|
style: Theme.of(context).textTheme.subhead),
|
||||||
],
|
],
|
||||||
));
|
));
|
|
@ -1,6 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:vikunja_app/global.dart';
|
import 'package:vikunja_app/global.dart';
|
||||||
import 'package:vikunja_app/pages/register_page.dart';
|
import 'package:vikunja_app/pages/user/register.dart';
|
||||||
import 'package:vikunja_app/theme/button.dart';
|
import 'package:vikunja_app/theme/button.dart';
|
||||||
import 'package:vikunja_app/theme/buttonText.dart';
|
import 'package:vikunja_app/theme/buttonText.dart';
|
||||||
import 'package:vikunja_app/theme/constants.dart';
|
import 'package:vikunja_app/theme/constants.dart';
|
Reference in New Issue