diff --git a/mobile/lib/models/backup/backup_item_status.dart b/mobile/lib/models/backup/backup_item_status.dart index b4aedfa562..3133903500 100644 --- a/mobile/lib/models/backup/backup_item_status.dart +++ b/mobile/lib/models/backup/backup_item_status.dart @@ -1,7 +1,7 @@ enum BackupItemStatus { - inBackground, + retry, inQueue, + inBackground, uploading, completed, - retry, } diff --git a/mobile/lib/ui/settings/backup/backup_status_screen.dart b/mobile/lib/ui/settings/backup/backup_status_screen.dart index 0d7199ca47..a32b1e8e09 100644 --- a/mobile/lib/ui/settings/backup/backup_status_screen.dart +++ b/mobile/lib/ui/settings/backup/backup_status_screen.dart @@ -1,6 +1,7 @@ // ignore_for_file: public_member_api_docs, sort_constructors_first import "dart:collection"; +import "package:collection/collection.dart"; import 'package:flutter/material.dart'; import "package:photos/core/event_bus.dart"; import "package:photos/events/backup_updated_event.dart"; @@ -37,7 +38,9 @@ class _BackupStatusScreenState extends State { @override Widget build(BuildContext context) { - final List items = this.items.values.toList(); + final List items = this.items.values.toList().sorted( + (a, b) => a.status.index.compareTo(b.status.index), + ); return Scaffold( body: CustomScrollView(