mirror of
https://github.com/krille-chan/fluffychat
synced 2024-09-10 13:05:11 +00:00
chore: Follow up todo list feature
This commit is contained in:
krille-chan
parent
d0dbaa5e72
commit
5d387145c8
2 changed files with 233 additions and 191 deletions
|
|
@ -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) {
|
||||
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(
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@ class TasksView extends StatelessWidget {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final tag = Localizations.maybeLocaleOf(context)?.toLanguageTag();
|
||||
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),
|
||||
|
|
@ -35,6 +39,7 @@ class TasksView extends StatelessWidget {
|
|||
? CrossFadeState.showSecond
|
||||
: CrossFadeState.showFirst,
|
||||
),
|
||||
if (list.any((todo) => todo.done))
|
||||
IconButton(
|
||||
icon: const Icon(Icons.cleaning_services_outlined),
|
||||
onPressed: controller.cleanUp,
|
||||
|
|
@ -46,12 +51,8 @@ class TasksView extends StatelessWidget {
|
|||
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(
|
||||
child: list.isEmpty
|
||||
? Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
|
|
@ -69,9 +70,8 @@ class TasksView extends StatelessWidget {
|
|||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
return ReorderableListView.builder(
|
||||
)
|
||||
: ReorderableListView.builder(
|
||||
onReorder: controller.onReorder,
|
||||
itemCount: list.length,
|
||||
itemBuilder: (context, i) {
|
||||
|
|
@ -90,15 +90,17 @@ class TasksView extends StatelessWidget {
|
|||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
decoration:
|
||||
todo.done ? TextDecoration.lineThrough : null,
|
||||
decoration: todo.done
|
||||
? TextDecoration.lineThrough
|
||||
: null,
|
||||
),
|
||||
),
|
||||
subtitle: description == null && dueDate == null
|
||||
? null
|
||||
: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.start,
|
||||
children: [
|
||||
if (description != null)
|
||||
Text(
|
||||
|
|
@ -110,7 +112,8 @@ class TasksView extends StatelessWidget {
|
|||
height: 24,
|
||||
child: OutlinedButton.icon(
|
||||
style: OutlinedButton.styleFrom(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
padding:
|
||||
const EdgeInsets.symmetric(
|
||||
horizontal: 6,
|
||||
),
|
||||
),
|
||||
|
|
@ -119,8 +122,11 @@ class TasksView extends StatelessWidget {
|
|||
size: 16,
|
||||
),
|
||||
label: Text(
|
||||
DateFormat.yMMMd(tag).format(dueDate),
|
||||
style: const TextStyle(fontSize: 12),
|
||||
DateFormat.yMMMd(tag)
|
||||
.format(dueDate),
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
onPressed: () =>
|
||||
controller.editTodoDueDate(
|
||||
|
|
@ -134,15 +140,27 @@ class TasksView extends StatelessWidget {
|
|||
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),
|
||||
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),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
|
|
@ -187,7 +205,8 @@ class TasksView extends StatelessWidget {
|
|||
),
|
||||
suffixIcon: IconButton(
|
||||
icon: const Icon(Icons.add_outlined),
|
||||
onPressed: controller.isLoading ? null : controller.addTodo,
|
||||
onPressed:
|
||||
controller.isLoading ? null : controller.addTodo,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -195,5 +214,7 @@ class TasksView extends StatelessWidget {
|
|||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue