refactor: Remove category handling from note editor and simplify note card options
This commit is contained in:
@@ -5,10 +5,8 @@ import 'package:flutter_quill/flutter_quill.dart';
|
||||
|
||||
import 'package:notas/data/note_body.dart';
|
||||
import 'package:notas/data/note_repository.dart';
|
||||
import 'package:notas/models/category.dart';
|
||||
import 'package:notas/models/note.dart';
|
||||
import 'package:notas/theme/app_palette.dart';
|
||||
import 'package:notas/widgets/category_style.dart';
|
||||
|
||||
class NoteEditorScreen extends StatefulWidget {
|
||||
const NoteEditorScreen({
|
||||
@@ -16,7 +14,6 @@ class NoteEditorScreen extends StatefulWidget {
|
||||
this.repository,
|
||||
this.saveNote,
|
||||
required this.note,
|
||||
this.categories = const <Category>[],
|
||||
this.embedded = false,
|
||||
this.onSaved,
|
||||
});
|
||||
@@ -24,7 +21,6 @@ class NoteEditorScreen extends StatefulWidget {
|
||||
final NoteRepository? repository;
|
||||
final Future<Note> Function(Note note)? saveNote;
|
||||
final Note note;
|
||||
final List<Category> categories;
|
||||
final bool embedded;
|
||||
final ValueChanged<Note>? onSaved;
|
||||
|
||||
@@ -34,7 +30,6 @@ class NoteEditorScreen extends StatefulWidget {
|
||||
|
||||
class _NoteEditorScreenState extends State<NoteEditorScreen> {
|
||||
static const Duration _debounceDuration = Duration(seconds: 1);
|
||||
final GlobalKey _categorySelectorKey = GlobalKey();
|
||||
|
||||
late final TextEditingController _titleController;
|
||||
late final QuillController _bodyController;
|
||||
@@ -45,7 +40,6 @@ class _NoteEditorScreenState extends State<NoteEditorScreen> {
|
||||
bool _isSaving = false;
|
||||
bool _saveQueued = false;
|
||||
late Note _baselineNote;
|
||||
String? _selectedCategoryId;
|
||||
|
||||
AppPalette _paletteOf(BuildContext context) {
|
||||
return Theme.of(context).extension<AppPalette>() ??
|
||||
@@ -56,7 +50,6 @@ class _NoteEditorScreenState extends State<NoteEditorScreen> {
|
||||
void initState() {
|
||||
super.initState();
|
||||
_baselineNote = widget.note;
|
||||
_selectedCategoryId = widget.note.categoryId;
|
||||
_titleController = TextEditingController(text: widget.note.title)
|
||||
..addListener(_scheduleSave);
|
||||
_bodyController = QuillController(
|
||||
@@ -81,55 +74,6 @@ class _NoteEditorScreenState extends State<NoteEditorScreen> {
|
||||
return noteDocumentToStorageJson(_bodyController.document);
|
||||
}
|
||||
|
||||
Category? _categoryById(String? id) {
|
||||
for (final Category category in widget.categories) {
|
||||
if (category.id == id) {
|
||||
return category;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
Color _categoryBackgroundColor(Category? category) {
|
||||
final AppPalette palette = _paletteOf(context);
|
||||
|
||||
if (category?.colorValue == null) {
|
||||
return palette.borderMuted;
|
||||
}
|
||||
|
||||
return Color(category!.colorValue!);
|
||||
}
|
||||
|
||||
Color _categoryForegroundColor(Category? category) {
|
||||
final AppPalette palette = _paletteOf(context);
|
||||
|
||||
if (category == null || category.colorValue == null) {
|
||||
return palette.textPrimary;
|
||||
}
|
||||
|
||||
final Color background = Color(category.colorValue!);
|
||||
return background.computeLuminance() > 0.55
|
||||
? palette.textOnSurfaceDark
|
||||
: palette.textPrimary;
|
||||
}
|
||||
|
||||
RelativeRect _menuRectFromContext(BuildContext anchorContext) {
|
||||
final RenderBox button = anchorContext.findRenderObject()! as RenderBox;
|
||||
final RenderBox overlay =
|
||||
Overlay.of(anchorContext).context.findRenderObject()! as RenderBox;
|
||||
final Offset topLeft = button.localToGlobal(Offset.zero, ancestor: overlay);
|
||||
final Offset bottomRight = button.localToGlobal(
|
||||
button.size.bottomRight(Offset.zero),
|
||||
ancestor: overlay,
|
||||
);
|
||||
|
||||
return RelativeRect.fromRect(
|
||||
Rect.fromLTRB(topLeft.dx, topLeft.dy, bottomRight.dx, bottomRight.dy),
|
||||
Offset.zero & overlay.size,
|
||||
);
|
||||
}
|
||||
|
||||
void _scheduleSave() {
|
||||
_debounceTimer?.cancel();
|
||||
_debounceTimer = Timer(_debounceDuration, () {
|
||||
@@ -147,7 +91,7 @@ class _NoteEditorScreenState extends State<NoteEditorScreen> {
|
||||
final Note draft = _baselineNote.copyWith(
|
||||
title: title.isEmpty ? 'Sin título' : title,
|
||||
body: body,
|
||||
categoryId: _selectedCategoryId,
|
||||
categoryId: _baselineNote.categoryId,
|
||||
updatedAt: DateTime.now(),
|
||||
isDirty: true,
|
||||
);
|
||||
@@ -188,89 +132,8 @@ class _NoteEditorScreenState extends State<NoteEditorScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _selectCategory(BuildContext anchorContext) async {
|
||||
final Category? selected = await showMenu<Category?>(
|
||||
context: anchorContext,
|
||||
position: _menuRectFromContext(anchorContext),
|
||||
elevation: 10,
|
||||
color: _paletteOf(anchorContext).surfaceElevated,
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14)),
|
||||
items: <PopupMenuEntry<Category?>>[
|
||||
const PopupMenuItem<Category?>(
|
||||
value: null,
|
||||
child: Text('Sin categoría'),
|
||||
),
|
||||
const PopupMenuDivider(),
|
||||
for (final Category category in widget.categories)
|
||||
PopupMenuItem<Category?>(value: category, child: Text(category.name)),
|
||||
],
|
||||
);
|
||||
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() {
|
||||
_selectedCategoryId = selected?.id;
|
||||
});
|
||||
_scheduleSave();
|
||||
}
|
||||
|
||||
Widget _buildCategorySelector() {
|
||||
final Category? category = _categoryById(_selectedCategoryId);
|
||||
Widget _buildEditorBody() {
|
||||
final AppPalette palette = _paletteOf(context);
|
||||
final Color backgroundColor = _categoryBackgroundColor(category);
|
||||
final Color foregroundColor = _categoryForegroundColor(category);
|
||||
|
||||
return InkWell(
|
||||
key: const ValueKey<String>('category_selector'),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
onTap: () => _selectCategory(context),
|
||||
child: Container(
|
||||
key: _categorySelectorKey,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
|
||||
decoration: BoxDecoration(
|
||||
color: backgroundColor,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: category?.colorValue != null
|
||||
? backgroundColor.withValues(alpha: 0.9)
|
||||
: palette.textDisabled,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
CategoryStyle.iconForCodePoint(category?.iconCodePoint),
|
||||
color: foregroundColor,
|
||||
size: 16,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Flexible(
|
||||
child: Text(
|
||||
category?.name ?? 'Sin categoría',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
color: foregroundColor,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
Icon(Icons.arrow_drop_down, color: foregroundColor, size: 18),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildEditorBody({required bool embedded}) {
|
||||
final AppPalette palette = _paletteOf(context);
|
||||
final BoxBorder? bodyBorder = embedded
|
||||
? null
|
||||
: Border.all(color: palette.border);
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
@@ -278,36 +141,29 @@ class _NoteEditorScreenState extends State<NoteEditorScreen> {
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: TextField(
|
||||
controller: _titleController,
|
||||
style: TextStyle(
|
||||
color: palette.textPrimary,
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Título',
|
||||
hintStyle: TextStyle(color: palette.textHint),
|
||||
border: InputBorder.none,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(left: 8),
|
||||
child: TextField(
|
||||
controller: _titleController,
|
||||
style: TextStyle(
|
||||
color: palette.textPrimary,
|
||||
fontSize: 26,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Título',
|
||||
hintStyle: TextStyle(color: palette.textHint),
|
||||
border: InputBorder.none,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 240),
|
||||
child: _buildCategorySelector(),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
const SizedBox(height: 10),
|
||||
Expanded(
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: palette.transparent,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
border: bodyBorder,
|
||||
),
|
||||
padding: const EdgeInsets.all(14),
|
||||
padding: const EdgeInsets.all(8),
|
||||
child: QuillEditor.basic(
|
||||
controller: _bodyController,
|
||||
focusNode: _bodyFocusNode,
|
||||
@@ -323,7 +179,7 @@ class _NoteEditorScreenState extends State<NoteEditorScreen> {
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
const SizedBox(height: 8),
|
||||
QuillSimpleToolbar(
|
||||
controller: _bodyController,
|
||||
config: const QuillSimpleToolbarConfig(
|
||||
@@ -367,8 +223,8 @@ class _NoteEditorScreenState extends State<NoteEditorScreen> {
|
||||
final AppPalette palette = _paletteOf(context);
|
||||
|
||||
final Widget editor = Padding(
|
||||
padding: const EdgeInsets.all(20),
|
||||
child: _buildEditorBody(embedded: widget.embedded),
|
||||
padding: const EdgeInsets.all(8),
|
||||
child: _buildEditorBody(),
|
||||
);
|
||||
|
||||
if (widget.embedded) {
|
||||
|
||||
Reference in New Issue
Block a user