Marcos/notas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor theme management: Replace AppColors with AppPalette

Browse Source 
- Removed AppColors class and migrated all references to AppPalette.
- Updated VaultAccessScreen, MenuDrawer, NoteCard, SearchAppBar, and other widgets to use AppPalette for color management.
- Introduced AppPalette to handle light and dark themes with appropriate color schemes.
- Adjusted theme application in AppTheme to utilize AppPalette extensions.
- Updated tests to reflect changes in theme structure and color references.
This commit is contained in:
Marcos
2026-05-23 13:55:40 +02:00
parent 29881183ed
commit 1dede9eb78
16 changed files with 1031 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/widgets/category_style.dart
+11 -2
View File
@@ -1,10 +1,19 @@
import 'package:flutter/material.dart';
import 'package:notas/theme/app_colors.dart';
import 'package:notas/theme/app_palette.dart';
class CategoryStyle {
CategoryStyle._();
static const List<Color> colors = AppColors.categoryColors;
static const List<Color> colors = AppPalette.defaultCategoryColors;
static List<Color> colorsOf(BuildContext context) {
final AppPalette? palette = Theme.of(context).extension<AppPalette>();
if (palette != null) {
return palette.categoryColors;
}
return AppPalette.defaultCategoryColors;
}
static const List<IconData> icons = <IconData>[
Icons.label_outline_rounded,
lib/widgets/menu_drawer.dart
+17 -18
View File
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:notas/models/category.dart';
import 'package:notas/theme/app_colors.dart';
import 'package:notas/theme/app_palette.dart';
import 'package:notas/widgets/category_style.dart';
class MenuDrawer extends StatelessWidget {
@@ -21,10 +21,12 @@ class MenuDrawer extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AppPalette palette = Theme.of(context).extension<AppPalette>()!;
return Container(
decoration: const BoxDecoration(
color: AppColors.drawerBackground,
border: Border(right: BorderSide(color: AppColors.border, width: 0.5)),
decoration: BoxDecoration(
color: palette.drawerBackground,
border: Border(right: BorderSide(color: palette.border, width: 0.5)),
),
child: Column(
children: [
@@ -59,12 +61,10 @@ class MenuDrawer extends StatelessWidget {
? null
: () => onEditCategory?.call(category),
iconColor: Color(
category.colorValue ??
AppColors.categoryFallback.value,
category.colorValue ?? palette.accent.value,
),
textColor: Color(
category.colorValue ??
AppColors.categoryFallback.value,
category.colorValue ?? palette.accent.value,
),
trailing: IconButton(
padding: const EdgeInsets.all(8),
@@ -72,9 +72,9 @@ class MenuDrawer extends StatelessWidget {
minWidth: 0,
minHeight: 0,
),
icon: const Icon(
icon: Icon(
Icons.more_vert,
color: AppColors.textSecondary,
color: palette.textSecondary,
size: 20,
),
onPressed: () => onEditCategory?.call(category),
@@ -97,10 +97,10 @@ class MenuDrawer extends StatelessWidget {
label: 'Mis notas borradas',
selected: selectedItem == 'deleted_notes',
onTap: () => onMenuItemTapped?.call('deleted_notes'),
iconColor: AppColors.destructiveAccent,
textColor: AppColors.destructiveAccent,
iconColor: palette.destructiveAccent,
textColor: palette.destructiveAccent,
),
const Divider(color: AppColors.border, height: 16),
Divider(color: palette.border, height: 16),
_MenuItemTile(
icon: Icons.settings,
label: 'Configuración',
@@ -143,13 +143,12 @@ class _MenuItemTileState extends State<_MenuItemTile> {
@override
Widget build(BuildContext context) {
final AppPalette palette = Theme.of(context).extension<AppPalette>()!;
final bool active = widget.selected || _hovering;
final Color backgroundColor = active
? AppColors.hover
: AppColors.transparent;
final Color backgroundColor = active ? palette.hover : palette.transparent;
final Color foregroundColor = active
? AppColors.textPrimary
: AppColors.textSecondary;
? palette.textPrimary
: palette.textSecondary;
final Widget? trailing = _hovering ? widget.trailing : null;
return MouseRegion(
lib/widgets/note_card.dart
+12 -11
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:notas/models/note.dart';
import 'package:notas/theme/app_colors.dart';
import 'package:notas/theme/app_palette.dart';
// Small presentational widget for a note inside the grid.
// Keep this widget lightweight and layout-agnostic: it should not force
@@ -31,6 +31,7 @@ class _NoteCardState extends State<NoteCard> {
@override
Widget build(BuildContext context) {
final AppPalette palette = Theme.of(context).extension<AppPalette>()!;
final bool showGrabbing = widget.isDragging || _isPressed;
return MouseRegion(
@@ -63,10 +64,10 @@ class _NoteCardState extends State<NoteCard> {
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: AppColors.cardBackground,
color: palette.cardBackground,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: widget.borderColor ?? AppColors.textDisabled,
color: widget.borderColor ?? palette.textDisabled,
width: 1,
),
),
@@ -90,8 +91,8 @@ class _NoteCardState extends State<NoteCard> {
final TextPainter textPainter = TextPainter(
text: TextSpan(
text: widget.note.body,
style: const TextStyle(
color: AppColors.textSecondary,
style: TextStyle(
color: palette.textSecondary,
fontSize: 14,
),
),
@@ -110,8 +111,8 @@ class _NoteCardState extends State<NoteCard> {
children: [
Text(
widget.note.title,
style: const TextStyle(
color: AppColors.textPrimary,
style: TextStyle(
color: palette.textPrimary,
fontSize: 16,
fontWeight: FontWeight.bold,
),
@@ -121,8 +122,8 @@ class _NoteCardState extends State<NoteCard> {
const SizedBox(height: 8),
Text(
widget.note.body,
style: const TextStyle(
color: AppColors.textSecondary,
style: TextStyle(
color: palette.textSecondary,
fontSize: 14,
),
maxLines: 20,
@@ -130,10 +131,10 @@ class _NoteCardState extends State<NoteCard> {
),
if (isBodyTruncated) ...[
const SizedBox(height: 4),
const Text(
Text(
'...',
style: TextStyle(
color: AppColors.textMuted,
color: palette.textMuted,
fontSize: 18,
height: 1,
),
lib/widgets/search_app_bar.dart
+22 -22
View File
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:notas/theme/app_colors.dart';
import 'package:notas/theme/app_palette.dart';
class SearchAppBar extends StatefulWidget {
const SearchAppBar({
@@ -52,10 +52,12 @@ class _SearchAppBarState extends State<SearchAppBar> {
@override
Widget build(BuildContext context) {
final AppPalette palette = Theme.of(context).extension<AppPalette>()!;
return Container(
decoration: BoxDecoration(
color: AppColors.transparent,
border: Border(bottom: BorderSide(color: AppColors.border, width: 0.5)),
color: palette.transparent,
border: Border(bottom: BorderSide(color: palette.border, width: 0.5)),
),
padding: const EdgeInsets.only(left: 8, right: 20, top: 7, bottom: 7),
child: Row(
@@ -64,7 +66,7 @@ class _SearchAppBarState extends State<SearchAppBar> {
onPressed: widget.onLeadingPressed ?? widget.onMenuPressed,
icon: Icon(
widget.leadingIcon,
color: AppColors.textSecondary,
color: palette.textSecondary,
size: 20,
),
tooltip: widget.leadingTooltip,
@@ -84,23 +86,21 @@ class _SearchAppBarState extends State<SearchAppBar> {
child: TextField(
controller: _searchController,
onChanged: widget.onSearchChanged,
style: const TextStyle(
color: AppColors.textPrimary,
style: TextStyle(
color: palette.textPrimary,
fontSize: 13,
),
cursorColor: AppColors.textSecondary,
cursorColor: palette.textSecondary,
decoration: InputDecoration(
hintText: widget.searchHint,
hintStyle: TextStyle(
color: AppColors.textSecondary.withValues(
alpha: 0.5,
),
color: palette.textSecondary.withOpacity(0.6),
),
suffixIcon: _searchController.text.isNotEmpty
? IconButton(
icon: const Icon(
icon: Icon(
Icons.clear,
color: AppColors.textSecondary,
color: palette.textSecondary,
size: 18,
),
onPressed: () {
@@ -112,37 +112,37 @@ class _SearchAppBarState extends State<SearchAppBar> {
minHeight: 36,
),
)
: const Padding(
padding: EdgeInsets.only(right: 8),
: Padding(
padding: const EdgeInsets.only(right: 8),
child: Icon(
Icons.search,
color: AppColors.textSecondary,
color: palette.textSecondary,
size: 18,
),
),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(
color: AppColors.borderStrong,
color: palette.border,
width: 0.5,
),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(
color: AppColors.borderStrong,
color: palette.border,
width: 0.5,
),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(
color: AppColors.searchFocusBorder,
width: 0.5,
color: palette.accent,
width: 0.6,
),
),
filled: true,
fillColor: AppColors.fill,
fillColor: palette.fill,
contentPadding: const EdgeInsets.symmetric(
horizontal: 12,
vertical: 8,
@@ -156,8 +156,8 @@ class _SearchAppBarState extends State<SearchAppBar> {
alignment: Alignment.centerLeft,
child: Text(
widget.titleText ?? '',
style: const TextStyle(
color: AppColors.textPrimary,
style: TextStyle(
color: palette.textPrimary,
fontSize: 18,
fontWeight: FontWeight.w600,
),
lib/widgets/sync_status_indicator.dart
+12 -14
View File
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:notas/theme/app_colors.dart';
import 'package:notas/theme/app_palette.dart';
import 'package:notas/widgets/sync_status.dart';
class SyncStatusIndicator extends StatelessWidget {
@@ -87,16 +87,14 @@ class SyncStatusIndicator extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AppPalette palette = Theme.of(context).extension<AppPalette>()!;
switch (status) {
case SyncStatus.idle:
return Tooltip(
message: _messageForStatus(),
child: _buildIndicator(
const Icon(
Icons.cloud_outlined,
size: 16,
color: AppColors.textSubtle,
),
Icon(Icons.cloud_outlined, size: 16, color: palette.textSecondary),
),
);
@@ -106,7 +104,7 @@ class SyncStatusIndicator extends StatelessWidget {
child: _buildIndicator(
_buildStatusBadge(
icon: Icons.sync,
color: AppColors.syncPreparing,
color: palette.syncPreparing,
determinate: false,
),
),
@@ -118,7 +116,7 @@ class SyncStatusIndicator extends StatelessWidget {
child: _buildIndicator(
_buildStatusBadge(
icon: Icons.cloud_upload_outlined,
color: AppColors.syncEncrypting,
color: palette.syncEncrypting,
determinate: true,
),
),
@@ -130,7 +128,7 @@ class SyncStatusIndicator extends StatelessWidget {
child: _buildIndicator(
_buildStatusBadge(
icon: Icons.cloud_upload,
color: AppColors.syncUploading,
color: palette.syncUploading,
determinate: false,
),
),
@@ -142,7 +140,7 @@ class SyncStatusIndicator extends StatelessWidget {
child: _buildIndicator(
_buildStatusBadge(
icon: Icons.cloud_sync_outlined,
color: AppColors.syncWaiting,
color: palette.syncWaiting,
determinate: false,
),
),
@@ -154,7 +152,7 @@ class SyncStatusIndicator extends StatelessWidget {
child: _buildIndicator(
_buildStatusBadge(
icon: Icons.cloud_download_outlined,
color: AppColors.syncDecrypting,
color: palette.syncDecrypting,
determinate: true,
),
),
@@ -166,7 +164,7 @@ class SyncStatusIndicator extends StatelessWidget {
child: _buildIndicator(
_buildStatusBadge(
icon: Icons.sync,
color: AppColors.syncWaiting,
color: palette.syncWaiting,
determinate: false,
),
),
@@ -176,7 +174,7 @@ class SyncStatusIndicator extends StatelessWidget {
return Tooltip(
message: _messageForStatus(),
child: _buildIndicator(
const Icon(Icons.check_circle, size: 16, color: AppColors.success),
Icon(Icons.check_circle, size: 16, color: palette.success),
),
);
@@ -184,7 +182,7 @@ class SyncStatusIndicator extends StatelessWidget {
return Tooltip(
message: _messageForStatus(),
child: _buildIndicator(
const Icon(Icons.error, size: 16, color: AppColors.destructive),
Icon(Icons.error, size: 16, color: palette.destructiveAccent),
),
);
}