BCPL/bharat_erp
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

theme changes

Browse Source
This commit is contained in:
Surendiran 2026-07-17 14:35:10 +05:30
parent 4360931be4
commit 03486ea3f4
21 changed files with 230 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/core/theme/app_theme.dart
View File

@ -162,6 +162,20 @@ class AppTheme {
),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ElevatedButton.styleFrom(
backgroundColor: colorScheme.primary,
foregroundColor: colorScheme.onPrimary,
disabledBackgroundColor: colorScheme.onSurface.withValues(alpha: 0.12),
disabledForegroundColor: colorScheme.onSurface.withValues(alpha: 0.38),
minimumSize: const Size(0, 48),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
textStyle: textTheme.labelLarge,
),
),
filledButtonTheme: FilledButtonThemeData(
style: FilledButton.styleFrom(
backgroundColor: colorScheme.primary,
foregroundColor: colorScheme.onPrimary,
minimumSize: const Size(0, 48),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
@ -170,18 +184,30 @@ class AppTheme {
),
outlinedButtonTheme: OutlinedButtonThemeData(
style: OutlinedButton.styleFrom(
foregroundColor: colorScheme.secondary,
minimumSize: const Size(0, 48),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
side: BorderSide(color: colorScheme.secondary.withValues(alpha: 0.55)),
textStyle: textTheme.labelLarge,
),
),
textButtonTheme: TextButtonThemeData(
style: TextButton.styleFrom(
foregroundColor: colorScheme.secondary,
minimumSize: const Size(0, 48),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
textStyle: textTheme.labelLarge,
),
),
iconButtonTheme: IconButtonThemeData(
style: IconButton.styleFrom(
foregroundColor: colorScheme.secondary,
),
),
floatingActionButtonTheme: FloatingActionButtonThemeData(
backgroundColor: colorScheme.primary,
foregroundColor: colorScheme.onPrimary,
),
navigationRailTheme: NavigationRailThemeData(
backgroundColor: isDark ? AppColors.darkSurface : AppColors.lightSurface,
selectedIconTheme: IconThemeData(color: colorScheme.primary),
@ -215,7 +241,17 @@ class AppTheme {
dataTextStyle: textTheme.bodyMedium,
),
chipTheme: ChipThemeData(
labelStyle: textTheme.labelSmall,
backgroundColor: colorScheme.secondaryContainer.withValues(alpha: 0.55),
selectedColor: colorScheme.secondary.withValues(alpha: 0.18),
disabledColor: colorScheme.onSurface.withValues(alpha: 0.08),
labelStyle: textTheme.labelSmall?.copyWith(
color: colorScheme.onSecondaryContainer,
),
secondaryLabelStyle: textTheme.labelSmall?.copyWith(
color: colorScheme.secondary,
),
side: BorderSide(color: colorScheme.secondary.withValues(alpha: 0.28)),
iconTheme: IconThemeData(color: colorScheme.secondary, size: 18),
),
dialogTheme: DialogThemeData(
titleTextStyle: textTheme.titleLarge,

3
lib/modules/assets/presentation/widgets/asset_form_panel.dart
View File

@ -1088,6 +1088,9 @@ class _AssetFormPanelState extends ConsumerState<AssetFormPanel> {
},
icon: const Icon(Icons.add, size: 18),
label: const Text('Add Item'),
style: TextButton.styleFrom(
foregroundColor: theme.colorScheme.primary,
),
),
],
),

2
lib/modules/audit/presentation/screens/audit_logs_screen.dart
View File

@ -339,7 +339,7 @@ class _FiltersBar extends StatelessWidget {
);
final theme = Theme.of(context);
final iconColor = theme.colorScheme.primary;
final iconColor = theme.colorScheme.secondary;
final resetButton = IconButton(
tooltip: 'Reset',
color: iconColor,

4
lib/modules/dashboard/presentation/screens/dashboard_screen.dart
View File

@ -45,13 +45,13 @@ class DashboardScreen extends StatelessWidget {
title: 'Allocated',
value: '—',
icon: Icons.assignment_ind_outlined,
color: Colors.blue,
color: Theme.of(context).colorScheme.primary,
),
KpiCard(
title: 'Available',
value: '—',
icon: Icons.check_circle_outline,
color: Colors.green,
color: Theme.of(context).colorScheme.secondary,
),
KpiCard(
title: 'Under Maintenance',

9
lib/modules/grn/presentation/widgets/grn_status_chip.dart
View File

@ -17,7 +17,8 @@ class GrnStatusChip extends StatelessWidget {
@override
Widget build(BuildContext context) {
final (color, label) = _resolveStatus(status);
final secondary = Theme.of(context).colorScheme.secondary;
final (color, label) = _resolveStatus(status, secondary);
if (forTable) {
return TableStatusBadge(
label: label,
@ -43,14 +44,14 @@ class GrnStatusChip extends StatelessWidget {
);
}
(Color, String) _resolveStatus(String raw) {
(Color, String) _resolveStatus(String raw, Color secondary) {
switch (raw.toUpperCase()) {
case 'POSTED':
return (Colors.green.shade700, grnStatusLabel(raw));
return (secondary, grnStatusLabel(raw));
case 'CANCELLED':
return (Colors.grey.shade700, grnStatusLabel(raw));
default:
return (Colors.blueGrey, grnStatusLabel(raw));
return (secondary, grnStatusLabel(raw));
}
}
}

15
lib/modules/purchase_orders/presentation/widgets/po_status_chip.dart
View File

@ -17,7 +17,8 @@ class PoStatusChip extends StatelessWidget {
@override
Widget build(BuildContext context) {
final (color, label) = _resolveStatus(status);
final secondary = Theme.of(context).colorScheme.secondary;
final (color, label) = _resolveStatus(status, secondary);
if (forTable) {
return TableStatusBadge(
label: label,
@ -29,7 +30,7 @@ class PoStatusChip extends StatelessWidget {
return _PoBadge(label: label, color: color, compact: compact);
}
(Color, String) _resolveStatus(String raw) {
(Color, String) _resolveStatus(String raw, Color secondary) {
switch (raw.toUpperCase()) {
case 'DRAFT':
return (const Color(0xFF546E7A), poStatusLabel(raw));
@ -38,17 +39,17 @@ class PoStatusChip extends StatelessWidget {
case 'PENDING':
return (const Color(0xFFE65100), poStatusLabel(raw));
case 'APPROVED':
return (const Color(0xFF2E7D32), poStatusLabel(raw));
return (secondary, poStatusLabel(raw));
case 'REJECTED':
return (const Color(0xFFC62828), poStatusLabel(raw));
case 'CANCELLED':
return (const Color(0xFF616161), poStatusLabel(raw));
case 'PARTIALLY_RECEIVED':
return (const Color(0xFF00695C), poStatusLabel(raw));
return (secondary, poStatusLabel(raw));
case 'FULLY_RECEIVED':
return (const Color(0xFF283593), poStatusLabel(raw));
return (secondary, poStatusLabel(raw));
default:
return (const Color(0xFF546E7A), poStatusLabel(raw));
return (secondary, poStatusLabel(raw));
}
}
}
@ -67,7 +68,7 @@ class PoRevisionChip extends StatelessWidget {
Widget build(BuildContext context) {
return _PoBadge(
label: 'Revision $revisionNo',
color: const Color(0xFF607D8B),
color: Theme.of(context).colorScheme.secondary,
compact: compact,
);
}

32
lib/modules/rbac/presentation/screens/users_role_management_screen.dart
View File

@ -1511,18 +1511,34 @@ class _PermissionMatrixTable extends ConsumerWidget {
alignment: Alignment.center,
enableSearch: false,
cellBuilder: (context, module) {
final moduleCatalog = catalog
?.where(
(entry) =>
entry.id == module.moduleId ||
normalizePermissionModuleCode(entry.code) ==
normalizePermissionModuleCode(module.code),
)
.firstOrNull;
final applicable = isPermissionActionApplicable(
module.code,
action,
catalogActions: moduleCatalog?.actions,
columnActions: actionColumns,
);
final checked = module.granted[action] ?? false;
return Checkbox(
value: checked,
value: applicable ? checked : false,
visualDensity: VisualDensity.compact,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (value) => ref
.read(permissionMatrixProvider(roleId).notifier)
.toggleAction(
module.moduleId,
action,
value ?? false,
),
onChanged: applicable
? (value) => ref
.read(permissionMatrixProvider(roleId).notifier)
.toggleAction(
module.moduleId,
action,
value ?? false,
)
: null,
);
},
),

8
lib/modules/rbac/presentation/widgets/rbac_widgets.dart
View File

@ -126,11 +126,11 @@ class RoleBadge extends StatelessWidget {
@override
Widget build(BuildContext context) {
final primary = Theme.of(context).colorScheme.primary;
final secondary = Theme.of(context).colorScheme.secondary;
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration(
color: primary.withValues(alpha: 0.08),
color: secondary.withValues(alpha: 0.08),
borderRadius: BorderRadius.circular(20),
),
child: Row(
@ -139,7 +139,7 @@ class RoleBadge extends StatelessWidget {
Container(
width: 6,
height: 6,
decoration: BoxDecoration(color: primary, shape: BoxShape.circle),
decoration: BoxDecoration(color: secondary, shape: BoxShape.circle),
),
const SizedBox(width: 6),
Flexible(
@ -148,7 +148,7 @@ class RoleBadge extends StatelessWidget {
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: primary,
color: secondary,
fontWeight: FontWeight.w600,
),
),

2
lib/modules/reports/presentation/screens/depreciation_report_screen.dart
View File

@ -515,7 +515,7 @@ class _FiltersBarState extends State<_FiltersBar> {
? (_moreOpen ? 'Less filters ($moreCount)' : 'More filters ($moreCount)')
: (_moreOpen ? 'Less filters' : 'More filters');
final iconColor = theme.colorScheme.primary;
final iconColor = theme.colorScheme.secondary;
final moreButton = IconButton(
tooltip: moreTooltip,

7
lib/modules/roles/presentation/providers/roles_provider.dart
View File

@ -164,6 +164,13 @@ class PermissionMatrixNotifier
final updated = current.modules.map((row) {
if (row.moduleId != moduleId) return row;
if (!isPermissionActionApplicable(
row.code,
action,
columnActions: current.actionColumns,
)) {
return row;
}
final granted = Map<String, bool>.from(row.granted);
granted[action] = value;
return row.copyWith(granted: granted);

50
lib/modules/roles/presentation/screens/permission_matrix_screen.dart
View File

@ -100,14 +100,23 @@ class _MatrixGrid extends ConsumerWidget {
flex: 1,
alignment: Alignment.center,
enableSearch: false,
cellBuilder: (_, row) => Checkbox(
value: row.granted[action] ?? false,
visualDensity: VisualDensity.compact,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (checked) => ref
.read(permissionMatrixProvider(roleId).notifier)
.toggleAction(row.moduleId, action, checked ?? false),
),
cellBuilder: (_, row) {
final applicable = isPermissionActionApplicable(
row.code,
action,
columnActions: matrix.actionColumns,
);
return Checkbox(
value: applicable ? (row.granted[action] ?? false) : false,
visualDensity: VisualDensity.compact,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: applicable
? (checked) => ref
.read(permissionMatrixProvider(roleId).notifier)
.toggleAction(row.moduleId, action, checked ?? false)
: null,
);
},
),
),
],
@ -134,13 +143,22 @@ class _MatrixCardList extends ConsumerWidget {
title: Text(row.name),
children: matrix.actionColumns
.map(
(action) => _PermissionSwitch(
label: permissionActionLabel(action),
value: row.granted[action] ?? false,
onChanged: (v) => ref
.read(permissionMatrixProvider(roleId).notifier)
.toggleAction(row.moduleId, action, v),
),
(action) {
final applicable = isPermissionActionApplicable(
row.code,
action,
columnActions: matrix.actionColumns,
);
return _PermissionSwitch(
label: permissionActionLabel(action),
value: applicable ? (row.granted[action] ?? false) : false,
onChanged: applicable
? (v) => ref
.read(permissionMatrixProvider(roleId).notifier)
.toggleAction(row.moduleId, action, v)
: null,
);
},
)
.toList(),
),
@ -159,7 +177,7 @@ class _PermissionSwitch extends StatelessWidget {
final String label;
final bool value;
final ValueChanged<bool> onChanged;
final ValueChanged<bool>? onChanged;
@override
Widget build(BuildContext context) {

67
lib/shared/models/permission_matrix_models.dart
View File

@ -32,6 +32,54 @@ List<String> sortPermissionActions(Iterable<String> actions) {
return permissionMatrixActionOrder.where(set.contains).toList();
}
String normalizePermissionModuleCode(String code) =>
code.trim().toLowerCase().replaceAll('-', '_').replaceAll(' ', '_');
/// Actions that apply to a module in the permission matrix UI.
///
/// Restricted modules omit actions that are not meaningful for them.
/// For other modules, [catalogActions] (when provided) limits the set.
List<String> applicablePermissionActionsForModule(
String code, {
List<String>? catalogActions,
List<String> columnActions = permissionMatrixActionOrder,
}) {
final normalized = normalizePermissionModuleCode(code);
final columns = sortPermissionActions(columnActions);
final restricted = switch (normalized) {
'settings' || 'setting' || 'settings_module' => const ['view', 'edit'],
'reports' || 'report' => const ['view', 'export'],
'audit_logs' || 'audit_log' || 'audit' => const ['view', 'export'],
_ => null,
};
if (restricted != null) {
return columns.where(restricted.contains).toList();
}
if (catalogActions != null && catalogActions.isNotEmpty) {
final catalogSet =
catalogActions.map((action) => action.toLowerCase()).toSet();
return columns.where(catalogSet.contains).toList();
}
return columns;
}
bool isPermissionActionApplicable(
String moduleCode,
String action, {
List<String>? catalogActions,
List<String> columnActions = permissionMatrixActionOrder,
}) {
return applicablePermissionActionsForModule(
moduleCode,
catalogActions: catalogActions,
columnActions: columnActions,
).contains(action.toLowerCase());
}
/// Module row from `GET /roles/permissions`.
class PermissionModuleCatalog {
const PermissionModuleCatalog({
@ -181,12 +229,19 @@ class RolePermissionMatrix {
return {
'matrix': modules
.map(
(module) => {
'module_id': int.tryParse(module.moduleId) ?? module.moduleId,
'actions': {
for (final action in actionColumns)
action: module.granted[action] ?? false,
},
(module) {
final applicable = applicablePermissionActionsForModule(
module.code,
columnActions: actionColumns,
).toSet();
return {
'module_id': int.tryParse(module.moduleId) ?? module.moduleId,
'actions': {
for (final action in actionColumns)
action: applicable.contains(action) &&
(module.granted[action] ?? false),
},
};
},
)
.toList(),

30
lib/shared/widgets/app_button.dart
View File

@ -20,11 +20,19 @@ class AppButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final primary = theme.colorScheme.primary;
final onPrimary = theme.colorScheme.onPrimary;
final secondary = theme.colorScheme.secondary;
final child = isLoading
? const SizedBox(
? SizedBox(
height: 20,
width: 20,
child: CircularProgressIndicator(strokeWidth: 2),
child: CircularProgressIndicator(
strokeWidth: 2,
color: isOutlined ? secondary : onPrimary,
),
)
: Row(
mainAxisSize: MainAxisSize.min,
@ -36,8 +44,22 @@ class AppButton extends StatelessWidget {
);
final button = isOutlined
? OutlinedButton(onPressed: isLoading ? null : onPressed, child: child)
: ElevatedButton(onPressed: isLoading ? null : onPressed, child: child);
? OutlinedButton(
onPressed: isLoading ? null : onPressed,
style: OutlinedButton.styleFrom(
foregroundColor: secondary,
side: BorderSide(color: secondary.withValues(alpha: 0.55)),
),
child: child,
)
: ElevatedButton(
onPressed: isLoading ? null : onPressed,
style: ElevatedButton.styleFrom(
backgroundColor: primary,
foregroundColor: onPrimary,
),
child: child,
);
return expand ? SizedBox(width: double.infinity, child: button) : button;
}

2
lib/shared/widgets/app_data_table.dart
View File

@ -453,7 +453,7 @@ class _ColumnSearchField extends StatelessWidget {
Icons.search_rounded,
size: 16,
color: hasQuery
? theme.colorScheme.primary
? theme.colorScheme.secondary
: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.7),
),
prefixIconConstraints: const BoxConstraints(

2
lib/shared/widgets/app_filter_date_field.dart
View File

@ -63,7 +63,7 @@ class AppFilterDateField extends StatelessWidget {
height: 24,
child: Row(
children: [
Icon(icon, size: 16, color: theme.colorScheme.primary),
Icon(icon, size: 16, color: theme.colorScheme.secondary),
const SizedBox(width: 8),
Expanded(
child: Text(

2
lib/shared/widgets/app_search_filter_toggle.dart
View File

@ -14,7 +14,7 @@ class AppSearchFilterButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final activeColor = theme.colorScheme.primary;
final activeColor = theme.colorScheme.secondary;
return OutlinedButton(
onPressed: onPressed,

5
lib/shared/widgets/app_searchable_dropdown.dart
View File

@ -391,7 +391,7 @@ class _SearchableDropdownPanelState<T>
? Icon(
Icons.check,
size: 20,
color: theme.colorScheme.primary,
color: theme.colorScheme.secondary,
)
: null,
selected: isSelected,
@ -409,6 +409,9 @@ class _SearchableDropdownPanelState<T>
onPressed: () => widget.onAddNew?.call(),
icon: const Icon(Icons.add, size: 18),
label: Text(addLabel),
style: TextButton.styleFrom(
foregroundColor: theme.colorScheme.primary,
),
),
],
],

13
lib/shared/widgets/app_status_chip.dart
View File

@ -72,7 +72,8 @@ class AppStatusChip extends StatelessWidget {
@override
Widget build(BuildContext context) {
final (color, label) = _resolveStatus(status);
final secondary = Theme.of(context).colorScheme.secondary;
final (color, label) = _resolveStatus(status, secondary);
if (forTable) {
return TableStatusBadge(
label: label,
@ -98,26 +99,26 @@ class AppStatusChip extends StatelessWidget {
);
}
(Color, String) _resolveStatus(String raw) {
(Color, String) _resolveStatus(String raw, Color secondary) {
final normalized = raw.trim().toLowerCase().replaceAll(' ', '_');
switch (normalized) {
case 'active':
return (Colors.green.shade700, EntityStatus.active.label);
return (secondary, EntityStatus.active.label);
case 'inactive':
return (Colors.grey.shade700, EntityStatus.inactive.label);
case 'locked':
return (Colors.orange.shade800, 'Locked');
case 'in_use':
return (const Color(0xFF16A34A), 'In Use');
return (secondary, 'In Use');
case 'under_maintenance':
return (const Color(0xFFCA8A04), 'Under Maintenance');
case 'available':
return (const Color(0xFF2563EB), 'Available');
return (secondary, 'Available');
case 'disposed':
case 'scrapped':
return (Colors.grey.shade700, _humanizeStatus(raw));
default:
return (Colors.blueGrey, _humanizeStatus(raw));
return (secondary, _humanizeStatus(raw));
}
}

2
lib/shared/widgets/entity_attachments_card.dart
View File

@ -314,7 +314,7 @@ class _AttachmentRow extends StatelessWidget {
Icon(
_fileIcon(attachment),
size: 22,
color: theme.colorScheme.primary,
color: theme.colorScheme.secondary,
),
const SizedBox(width: 12),
Expanded(

2
lib/shared/widgets/kpi_card.dart
View File

@ -20,7 +20,7 @@ class KpiCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
final cardColor = color ?? Theme.of(context).colorScheme.primary;
final cardColor = color ?? Theme.of(context).colorScheme.secondary;
return AppCard(
onTap: onTap,

2
lib/shared/widgets/master_inline_quick_add_form.dart
View File

@ -325,7 +325,7 @@ class _MasterInlineQuickAddFormState
Row(
children: [
Icon(Icons.add_circle_outline,
size: 16, color: theme.colorScheme.primary),
size: 16, color: theme.colorScheme.secondary),
const SizedBox(width: 6),
Expanded(
child: Text(