Compare commits

..

No commits in common. "a613292095b785d106cfcdfbdada2ff163028b9b" and "d914b8bcaedf964b184a7e3da80cf1c5469729cb" have entirely different histories.

2 changed files with 71 additions and 80 deletions

View File

@ -76,14 +76,15 @@ class _AddFormState extends State<AddForm> {
}
return null;
},
textInputAction: TextInputAction.next,
onFieldSubmitted: (value) =>
_formKey.currentState!.validate(),
onFieldSubmitted: (value) {
if (_formKey.currentState!.validate()) {
FocusScope.of(context).requestFocus(_TemplateFocusNode);
}
},
decoration: const InputDecoration(labelText: 'Label')),
TextFormField(
decoration:
const InputDecoration(labelText: 'Description(optional)'),
textInputAction: TextInputAction.next,
onChanged: (value) {
_listDesc = value;
},

View File

@ -43,9 +43,6 @@ class _MainListPageState extends State<MainListPage> {
int _selectedPage = data.Page.lists.index;
List<data.List> lists = [];
final double _marginHorizontal = 10;
final double _cardSpacing = 4;
Future<void> _loadData(data.Page listType) async {
lists.clear();
var res = await DBHelper.dbHelper.getAllLists(listType);
@ -69,9 +66,6 @@ class _MainListPageState extends State<MainListPage> {
@override
Widget build(BuildContext context) {
final EdgeInsets cardMargin =
EdgeInsets.symmetric(vertical: _cardSpacing, horizontal: 0);
return Scaffold(
appBar: AppBar(
title: Text(widget.title),
@ -89,80 +83,76 @@ class _MainListPageState extends State<MainListPage> {
tooltip: 'Add List',
child: const Icon(Icons.add),
),
body: Container(
padding: EdgeInsets.symmetric(horizontal: _marginHorizontal),
child: RefreshIndicator(
onRefresh: () => _loadData(data.Page.values[_selectedPage]),
child: ListView.builder(
itemCount: lists.length,
itemBuilder: (context, index) {
return Dismissible(
direction: DismissDirection.startToEnd,
key: Key(lists[index].id.toString()),
background: Card(
margin: cardMargin,
color: Colors.red,
child: Row(
children: const [
Padding(
padding: EdgeInsets.all(10),
child: Icon(Icons.delete),
),
],
body: RefreshIndicator(
onRefresh: () => _loadData(data.Page.values[_selectedPage]),
child: ListView.builder(
itemCount: lists.length,
itemBuilder: (context, index) {
return Dismissible(
direction: DismissDirection.startToEnd,
key: Key(lists[index].id.toString()),
background: Card(
color: Colors.red,
child: Row(
children: const [
Padding(
padding: EdgeInsets.all(10),
child: Icon(Icons.delete),
),
),
confirmDismiss: (direction) async {
if (direction != DismissDirection.startToEnd) {
return false;
}
],
),
),
confirmDismiss: (direction) async {
if (direction != DismissDirection.startToEnd) {
return false;
}
showDialog(
context: context,
builder: (context) {
return AlertDialog(
title: const Text('Are you sure?'),
content: const Text(
'You are about to delete this permently'),
actions: [
TextButton(
onPressed: () =>
Navigator.pop(context, false),
child: const Text('Cancel')),
TextButton(
onPressed: () =>
Navigator.pop(context, true),
child: const Text('OK')),
],
);
}).then((value) {
if (value) {
setState(() {
_removeList(lists[index]);
lists.removeAt(index);
});
}
return value;
showDialog(
context: context,
builder: (context) {
return AlertDialog(
title: const Text('Are you sure?'),
content: const Text(
'You are about to delete this permently'),
actions: [
TextButton(
onPressed: () =>
Navigator.pop(context, false),
child: const Text('Cancel')),
TextButton(
onPressed: () =>
Navigator.pop(context, true),
child: const Text('OK')),
],
);
}).then((value) {
if (value) {
setState(() {
_removeList(lists[index]);
lists.removeAt(index);
});
}
return value;
});
},
child: Card(
child: ListTile(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
CheckList(id: lists[index].id!)));
},
child: Card(
margin: cardMargin,
child: ListTile(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
CheckList(id: lists[index].id!)));
},
title: Text(lists[index].name),
subtitle: Text((lists[index].description != null)
? lists[index].description!
: ""),
),
),
);
}))),
title: Text(lists[index].name),
subtitle: Text((lists[index].description != null)
? lists[index].description!
: ""),
),
),
);
})),
bottomNavigationBar: BottomNavigationBar(
elevation: 4,
currentIndex: _selectedPage,