Matrix/fluffychat
Matrix/fluffychat
1
0
Fork 0
mirror of https://github.com/krille-chan/fluffychat synced 2024-09-10 13:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: Follow up todo list feature

Browse source
This commit is contained in:
krille-chan 2023-10-29 07:55:00 +01:00
parent d0dbaa5e72
commit 5d387145c8
No known key found for this signature in database
2 changed files with 233 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
lib/pages/tasks/tasks.dart
View file

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

363
lib/pages/tasks/tasks_view.dart
View file

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