Skip to content

feat(category): subcategory grid supports drag-to-reorder #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Syz87 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(category): subcategory grid supports drag-to-reorder #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8d479d
fix(category): upsertCategory now matches by name AND kind
May 28, 2026
13529ec
feat(category): subcategory grid supports drag-to-reorder
May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/data/repositories/local/local_category_repository.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,10 @@ class LocalCategoryRepository implements CategoryRepository {
String? icon,
int? sortOrder,
}) async {
// name 全局唯一:按 name 找;有则复用,无则用给定 kind/icon/sortOrder 建。
// Match by name + kind to prevent same-name categories across
// expense/income from being incorrectly reused (e.g. 'transfer').
final existing = await (db.select(db.categories)
..where((c) => c.name.equals(name)))
..where((c) => c.name.equals(name) & c.kind.equals(kind)))
.get();
if (existing.isNotEmpty) return existing.first.id;
return db.into(db.categories).insert(CategoriesCompanion.insert(
Expand Down
29 changes: 24 additions & 5 deletions lib/pages/category/category_manage_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ class _SubcategoryDialogState extends ConsumerState<_SubcategoryDialog> {
child: Center(child: CircularProgressIndicator()),
)
else
GridView.builder(
ReorderableGridView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
Expand All @@ -1028,28 +1028,46 @@ class _SubcategoryDialogState extends ConsumerState<_SubcategoryDialog> {
mainAxisSpacing: 10,
childAspectRatio: 1,
),
itemCount: (_subCategories?.length ?? 0) + 2, // 子分类 + 添加 + 编辑
itemCount: (_subCategories?.length ?? 0) + 2,
onReorder: (oldIndex, newIndex) {
final subCategories = _subCategories;
if (subCategories == null) return;
final subCount = subCategories.length;
// Ignore drags involving the add/edit buttons
if (oldIndex >= subCount || newIndex >= subCount) return;
if (oldIndex < newIndex) newIndex -= 1;
// Optimistic local update
final reordered = List<({db.Category category, int transactionCount})>.from(subCategories);
final moved = reordered.removeAt(oldIndex);
reordered.insert(newIndex, moved);
setState(() => _subCategories = reordered);
// Persist to DB
final repo = ref.read(repositoryProvider);
final updates = reordered.asMap().entries.map((e) => (
id: e.value.category.id,
sortOrder: e.key,
)).toList();
repo.updateCategorySortOrders(updates);
},
itemBuilder: (context, index) {
final subCategories = _subCategories ?? [];
// 添加按钮
if (index == subCategories.length) {
return _DialogActionButton(
onTap: widget.onAddSubCategory,
icon: Icons.add,
label: l10n.commonAdd,
);
}
// 编辑按钮
if (index == subCategories.length + 1) {
return _DialogActionButton(
onTap: widget.onEditParentCategory,
icon: Icons.edit_outlined,
label: l10n.commonEdit,
);
}
// 子分类
final item = subCategories[index];
return _DialogSubCategoryCard(
key: ValueKey(item.category.id),
category: item.category,
transactionCount: item.transactionCount,
onTap: () => widget.onSubCategoryTap(item.category),
Expand Down Expand Up @@ -1119,6 +1137,7 @@ class _DialogSubCategoryCard extends StatelessWidget {
final VoidCallback onTap;

const _DialogSubCategoryCard({
super.key,
required this.category,
required this.transactionCount,
required this.onTap,
Expand Down