Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Datatable fixes

This commit is contained in:
Hillel Coren 2023-10-12 23:18:40 +03:00
parent edcf9af11d
commit f9b37114b3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ui/app/tables/entity_datatable.dart
View File

@ -4,6 +4,9 @@
import 'package:built_collection/built_collection.dart'; import 'package:built_collection/built_collection.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
import 'package:invoiceninja_flutter/utils/colors.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
// Project imports: // Project imports:
@ -53,8 +56,6 @@ class EntityDataTableSource extends DataTableSource {
entityPresenter!.initialize(entity, context); entityPresenter!.initialize(entity, context);
final listState = state.getListState(entityType); final listState = state.getListState(entityType);
/*
final uIState = state.getUIState(entityType); final uIState = state.getUIState(entityType);
bool isSelected = false; bool isSelected = false;
@ -67,7 +68,6 @@ class EntityDataTableSource extends DataTableSource {
} }
} }
Color? backgroundColor; Color? backgroundColor;
final rowColor = state.prefState.activeCustomColors[ final rowColor = state.prefState.activeCustomColors[
PrefState.THEME_TABLE_ALTERNATE_ROW_BACKGROUND_COLOR] ?? PrefState.THEME_TABLE_ALTERNATE_ROW_BACKGROUND_COLOR] ??
@ -80,7 +80,6 @@ class EntityDataTableSource extends DataTableSource {
} else if (rowColor.isNotEmpty && index % 2 == 0) { } else if (rowColor.isNotEmpty && index % 2 == 0) {
backgroundColor = convertHexStringToColor(rowColor); backgroundColor = convertHexStringToColor(rowColor);
} }
*/
final wideFields = [ final wideFields = [
'public_notes', 'public_notes',
@ -93,6 +92,9 @@ class EntityDataTableSource extends DataTableSource {
]; ];
return DataRow( return DataRow(
color: backgroundColor == null
? null
: MaterialStateProperty.all<Color>(backgroundColor),
selected: (listState.selectedIds ?? <String>[]).contains(entity.id), selected: (listState.selectedIds ?? <String>[]).contains(entity.id),
onSelectChanged: onSelectChanged:
listState.isInMultiselect() ? (value) => onTap(entity) : null, listState.isInMultiselect() ? (value) => onTap(entity) : null,
@ -128,7 +130,6 @@ class EntityDataTableSource extends DataTableSource {
], ],
), ),
onTap: () => onTap(entity), onTap: () => onTap(entity),
//backgroundColor: backgroundColor,
), ),
...tableColumns!.map( ...tableColumns!.map(
(field) => DataCell( (field) => DataCell(
@ -144,8 +145,7 @@ class EntityDataTableSource extends DataTableSource {
), ),
), ),
onTap: () => onTap(entity), onTap: () => onTap(entity),
//onLongPress: () => selectEntity(entity: entity, context: context, longPress: true), onLongPress: () => selectEntity(entity: entity, longPress: true),
//backgroundColor: backgroundColor,
), ),
) )
], ],