aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Follow up todo list feature

Browse Source
pull/633/head
krille-chan 1 year ago
parent d0dbaa5e72
commit 5d387145c8
No known key found for this signature in database
2 changed files with 228 additions and 186 deletions
Show Stats Download Patch File Download Diff File

61
lib/pages/tasks/tasks.dart
Unescape Escape View File

@ -99,18 +99,19 @@ class TasksController extends State<TasksPage> {
update: (todos) => todos..removeWhere((t) => t.done),
);
void onReorder(int oldindex, int newindex) => updateTodos(
update: (todos) {
if (newindex > oldindex) {
newindex -= 1;
}
final todo = todos.removeAt(oldindex);
todos.insert(newindex, todo);
return todos;
},
tmpTodo: true,
);
void onReorder(int oldindex, int newindex) {
if (newindex > oldindex) {
newindex -= 1;
}
updateTodos(
update: (todos) {
final todo = todos.removeAt(oldindex);
todos.insert(newindex, todo);
return todos;
},
tmpTodo: true,
);
}
void updateTodos({
required List<MatrixTodo> Function(List<MatrixTodo>) update,
@ -122,6 +123,7 @@ class TasksController extends State<TasksPage> {
});
try {
final newTodos = update(todos);
assert(todos != newTodos);
if (tmpTodo) {
setState(() {
_tmpTodos = newTodos;
@ -130,17 +132,23 @@ class TasksController extends State<TasksPage> {
_tmpTodos = null;
});
}
await widget.room.updateMatrixTodos(newTodos);
await widget.room
.updateMatrixTodos(newTodos)
.timeout(const Duration(seconds: 30));
onSuccess?.call();
} on MatrixException catch (e) {
if (e.error != MatrixError.M_LIMIT_EXCEEDED) rethrow;
Logs().w('Rate limit! Try again in ${e.raw['retry_after_ms']}ms');
await Future.delayed(
Duration(milliseconds: e.raw['retry_after_ms'] as int),
);
final retryAfterMs = e.retryAfterMs;
if (retryAfterMs == null) rethrow;
Logs().w('Rate limit! Try again in $retryAfterMs ms');
await Future.delayed(Duration(milliseconds: retryAfterMs));
updateTodos(update: update, onSuccess: onSuccess);
} catch (e, s) {
Logs().w('Unable to toggle done', e, s);
Logs().w('Unable to update todo list', e, s);
if (_tmpTodos != null) {
setState(() {
_tmpTodos = null;
});
}
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
duration: const Duration(seconds: 20),
@ -151,7 +159,13 @@ class TasksController extends State<TasksPage> {
color: Theme.of(context).colorScheme.background,
),
const SizedBox(width: 16),
Text(e.toLocalizedString(context)),
Expanded(
child: Text(
e.toLocalizedString(context),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
),
action: e is TodoListChangedException
@ -207,6 +221,13 @@ class TasksController extends State<TasksPage> {
);
}
void deleteTodo(int i) => updateTodos(
update: (list) {
list.removeAt(i);
return list;
},
);
void editTodoDueDate(int i, MatrixTodo todo) async {
final now = DateTime.now();
final date = await showDatePicker(

353
lib/pages/tasks/tasks_view.dart
Unescape Escape View File

@ -13,187 +13,208 @@ class TasksView extends StatelessWidget {
@override
Widget build(BuildContext context) {
final tag = Localizations.maybeLocaleOf(context)?.toLanguageTag();
return Scaffold(
appBar: AppBar(
title: Text(L10n.of(context)!.todoLists),
actions: [
AnimatedCrossFade(
duration: FluffyThemes.animationDuration,
firstChild: const SizedBox(
width: 32,
height: 32,
),
secondChild: const Padding(
padding: EdgeInsets.all(8.0),
child: SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
return StreamBuilder<Object>(
stream: controller.widget.room.onUpdate.stream,
builder: (context, snapshot) {
final list = controller.todos;
return Scaffold(
appBar: AppBar(
title: Text(L10n.of(context)!.todoLists),
actions: [
AnimatedCrossFade(
duration: FluffyThemes.animationDuration,
firstChild: const SizedBox(
width: 32,
height: 32,
),
secondChild: const Padding(
padding: EdgeInsets.all(8.0),
child: SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
),
),
crossFadeState: controller.isLoading
? CrossFadeState.showSecond
: CrossFadeState.showFirst,
),
),
crossFadeState: controller.isLoading
? CrossFadeState.showSecond
: CrossFadeState.showFirst,
),
IconButton(
icon: const Icon(Icons.cleaning_services_outlined),
onPressed: controller.cleanUp,
if (list.any((todo) => todo.done))
IconButton(
icon: const Icon(Icons.cleaning_services_outlined),
onPressed: controller.cleanUp,
),
],
),
],
),
body: Column(
children: [
Expanded(
child: Opacity(
opacity: controller.isLoading ? 0.66 : 1,
child: StreamBuilder(
stream: controller.widget.room.onUpdate.stream,
builder: (context, snapshot) {
final list = controller.todos;
if (list.isEmpty) {
return Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Icon(
Icons.task_alt,
size: 80,
color: Theme.of(context).colorScheme.secondary,
),
const SizedBox(height: 16),
SizedBox(
width: 256,
child: Text(
L10n.of(context)!.noTodosYet,
textAlign: TextAlign.center,
),
),
],
);
}
return ReorderableListView.builder(
onReorder: controller.onReorder,
itemCount: list.length,
itemBuilder: (context, i) {
final todo = list[i];
final description = todo.description;
final dueDate = todo.dueDate;
return ListTile(
key: Key(todo.toJson().toString()),
leading: Icon(
todo.done
? Icons.check_circle
: Icons.circle_outlined,
),
title: Text(
todo.title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
decoration:
todo.done ? TextDecoration.lineThrough : null,
),
),
subtitle: description == null && dueDate == null
? null
: Column(
body: Column(
children: [
Expanded(
child: Opacity(
opacity: controller.isLoading ? 0.66 : 1,
child: list.isEmpty
? Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Icon(
Icons.task_alt,
size: 80,
color: Theme.of(context).colorScheme.secondary,
),
const SizedBox(height: 16),
SizedBox(
width: 256,
child: Text(
L10n.of(context)!.noTodosYet,
textAlign: TextAlign.center,
),
),
],
)
: ReorderableListView.builder(
onReorder: controller.onReorder,
itemCount: list.length,
itemBuilder: (context, i) {
final todo = list[i];
final description = todo.description;
final dueDate = todo.dueDate;
return ListTile(
key: Key(todo.toJson().toString()),
leading: Icon(
todo.done
? Icons.check_circle
: Icons.circle_outlined,
),
title: Text(
todo.title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
decoration: todo.done
? TextDecoration.lineThrough
: null,
),
),
subtitle: description == null && dueDate == null
? null
: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
if (description != null)
Text(
description,
maxLines: 2,
),
if (dueDate != null)
SizedBox(
height: 24,
child: OutlinedButton.icon(
style: OutlinedButton.styleFrom(
padding:
const EdgeInsets.symmetric(
horizontal: 6,
),
),
icon: const Icon(
Icons.calendar_month,
size: 16,
),
label: Text(
DateFormat.yMMMd(tag)
.format(dueDate),
style: const TextStyle(
fontSize: 12,
),
),
onPressed: () =>
controller.editTodoDueDate(
i,
todo,
),
),
),
],
),
onTap: controller.isLoading
? null
: () => controller.toggleDone(i),
trailing: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (description != null)
Text(
description,
maxLines: 2,
IconButton(
icon: const Icon(
Icons.edit_outlined,
size: 16,
),
if (dueDate != null)
SizedBox(
height: 24,
child: OutlinedButton.icon(
style: OutlinedButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 6,
),
),
icon: const Icon(
Icons.calendar_month,
size: 16,
),
label: Text(
DateFormat.yMMMd(tag).format(dueDate),
style: const TextStyle(fontSize: 12),
),
onPressed: () =>
controller.editTodoDueDate(
i,
todo,
),
),
onPressed: () =>
controller.editTodo(i, todo),
),
IconButton(
icon: const Icon(
Icons.delete_outlined,
size: 16,
),
onPressed: () => controller.deleteTodo(i),
),
const SizedBox(width: 8),
],
),
onTap: controller.isLoading
? null
: () => controller.toggleDone(i),
trailing: Padding(
padding: const EdgeInsets.only(right: 8.0),
child: IconButton(
icon: const Icon(Icons.edit_outlined, size: 16),
onPressed: () => controller.editTodo(i, todo),
),
);
},
),
);
},
);
},
),
),
),
),
Padding(
padding: const EdgeInsets.all(12.0),
child: TextField(
focusNode: controller.focusNode,
readOnly: controller.isLoading,
controller: controller.textEditingController,
onSubmitted: controller.addTodo,
maxLength: 64,
decoration: InputDecoration(
counterStyle: const TextStyle(height: double.minPositive),
counterText: '',
hintText: L10n.of(context)!.newTodo,
prefixIcon: Row(
mainAxisSize: MainAxisSize.min,
children: [
IconButton(
icon: Icon(
controller.newTaskDateTime == null
? Icons.calendar_month_outlined
: Icons.calendar_month,
color: controller.newTaskDateTime == null
? null
: Theme.of(context).primaryColor,
),
onPressed: controller.setNewTaskDateTime,
Padding(
padding: const EdgeInsets.all(12.0),
child: TextField(
focusNode: controller.focusNode,
readOnly: controller.isLoading,
controller: controller.textEditingController,
onSubmitted: controller.addTodo,
maxLength: 64,
decoration: InputDecoration(
counterStyle: const TextStyle(height: double.minPositive),
counterText: '',
hintText: L10n.of(context)!.newTodo,
prefixIcon: Row(
mainAxisSize: MainAxisSize.min,
children: [
IconButton(
icon: Icon(
controller.newTaskDateTime == null
? Icons.calendar_month_outlined
: Icons.calendar_month,
color: controller.newTaskDateTime == null
? null
: Theme.of(context).primaryColor,
),
onPressed: controller.setNewTaskDateTime,
),
IconButton(
icon: Icon(
Icons.text_fields,
color: controller.newTaskDescription == null
? null
: Theme.of(context).primaryColor,
),
onPressed: controller.setNewTaskDescription,
),
],
),
IconButton(
icon: Icon(
Icons.text_fields,
color: controller.newTaskDescription == null
? null
: Theme.of(context).primaryColor,
),
onPressed: controller.setNewTaskDescription,
suffixIcon: IconButton(
icon: const Icon(Icons.add_outlined),
onPressed:
controller.isLoading ? null : controller.addTodo,
),
],
),
suffixIcon: IconButton(
icon: const Icon(Icons.add_outlined),
onPressed: controller.isLoading ? null : controller.addTodo,
),
),
),
),
],
),
],
),
);
},
);
}
}

Write Preview
Loading…
Cancel
Save