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

Null safety

This commit is contained in:
Hillel Coren 2023-10-01 21:49:48 +03:00
parent 2da1686395
commit 4a99ef1042
4 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ui/dashboard/dashboard_sidebar.dart
View File

@ -314,7 +314,7 @@ class TaskSidebar extends StatelessWidget {
itemCount: runningTasks.length, itemCount: runningTasks.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return TaskListItem( return TaskListItem(
task: runningTasks[index], task: runningTasks[index]!,
showCheckbox: false, showCheckbox: false,
); );
}, },

2
lib/ui/invoice/edit/invoice_item_selector.dart
View File

@ -209,7 +209,7 @@ class _InvoiceItemSelectorState extends State<InvoiceItemSelector>
itemCount: tasks.length, itemCount: tasks.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
final String? entityId = tasks[index]; final String? entityId = tasks[index];
final task = state.taskState.map[entityId]; final task = state.taskState.map[entityId]!;
return TaskListItem( return TaskListItem(
isDismissible: false, isDismissible: false,
onCheckboxChanged: (checked) => _toggleEntity(task), onCheckboxChanged: (checked) => _toggleEntity(task),

63
lib/ui/task/task_list_item.dart
View File

@ -34,7 +34,7 @@ class TaskListItem extends StatelessWidget {
final Function(bool?)? onCheckboxChanged; final Function(bool?)? onCheckboxChanged;
final GestureTapCallback? onTap; final GestureTapCallback? onTap;
final TaskEntity? task; final TaskEntity task;
final String? filter; final String? filter;
final bool showCheckbox; final bool showCheckbox;
final bool isDismissible; final bool isDismissible;
@ -46,63 +46,62 @@ class TaskListItem extends StatelessWidget {
final state = store.state; final state = store.state;
final uiState = state.uiState; final uiState = state.uiState;
final taskUIState = uiState.taskUIState; final taskUIState = uiState.taskUIState;
final client = state.clientState.get(task!.clientId); final client = state.clientState.get(task.clientId);
final filterMatch = filter != null && filter!.isNotEmpty final filterMatch = filter != null && filter!.isNotEmpty
? (task!.matchesFilterValue(filter) ?? ? (task.matchesFilterValue(filter) ?? client.matchesFilterValue(filter))
client.matchesFilterValue(filter))
: null; : null;
final listUIState = taskUIState.listUIState; final listUIState = taskUIState.listUIState;
final isInMultiselect = listUIState.isInMultiselect(); final isInMultiselect = listUIState.isInMultiselect();
final showCheckbox = onCheckboxChanged != null || isInMultiselect; final showCheckbox = onCheckboxChanged != null || isInMultiselect;
final isChecked = isDismissible final isChecked = isDismissible
? (isInMultiselect && listUIState.isSelected(task!.id)) ? (isInMultiselect && listUIState.isSelected(task.id))
: this.isChecked; : this.isChecked;
final textStyle = TextStyle(fontSize: 16); final textStyle = TextStyle(fontSize: 16);
final textColor = Theme.of(context).textTheme.bodyLarge!.color; final textColor = Theme.of(context).textTheme.bodyLarge!.color;
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final status = state.taskStatusState.get(task!.statusId); final status = state.taskStatusState.get(task.statusId);
final statusLabel = task!.isInvoiced final statusLabel = task.isInvoiced
? localization!.invoiced ? localization!.invoiced
: task!.isRunning : task.isRunning
? localization!.running ? localization!.running
: status.name.isNotEmpty : status.name.isNotEmpty
? status.name ? status.name
: localization!.logged; : localization!.logged;
final statusColor = task!.isInvoiced final statusColor = task.isInvoiced
? state.prefState.colorThemeModel!.colorSuccess ? state.prefState.colorThemeModel!.colorSuccess
: task!.isRunning : task.isRunning
? state.prefState.colorThemeModel!.colorInfo ? state.prefState.colorThemeModel!.colorInfo
: status.color.isNotEmpty && status.color != '#fff' : status.color.isNotEmpty && status.color != '#fff'
? convertHexStringToColor(status.color) ? convertHexStringToColor(status.color)
: TaskStatusColors(state.prefState.colorThemeModel) : TaskStatusColors(state.prefState.colorThemeModel)
.colors[task!.calculateStatusId]; .colors[task.calculateStatusId];
String subtitle = client.displayName; String subtitle = client.displayName;
if (task!.projectId.isNotEmpty) { if (task.projectId.isNotEmpty) {
subtitle += subtitle +=
' • ' + state.projectState.get(task!.projectId).listDisplayName; ' • ' + state.projectState.get(task.projectId).listDisplayName;
} }
final duration = LiveText(() { final duration = LiveText(() {
return formatNumber(task!.listDisplayAmount, context, return formatNumber(task.listDisplayAmount, context,
formatNumberType: FormatNumberType.duration); formatNumberType: FormatNumberType.duration);
}, style: textStyle); }, style: textStyle);
final startStopButton = !isDismissible final startStopButton = !isDismissible
? SizedBox() ? SizedBox()
: IconButton( : IconButton(
icon: task!.isInvoiced icon: task.isInvoiced
? SizedBox() ? SizedBox()
: Icon( : Icon(
getEntityActionIcon(task!.isRunning getEntityActionIcon(task.isRunning
? EntityAction.stop ? EntityAction.stop
: EntityAction.start), : EntityAction.start),
), ),
onPressed: task!.isInvoiced onPressed: task.isInvoiced
? null ? null
: () => handleEntityAction(task, : () => handleEntityAction(task,
task!.isRunning ? EntityAction.stop : EntityAction.start), task.isRunning ? EntityAction.stop : EntityAction.start),
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
); );
@ -110,7 +109,7 @@ class TaskListItem extends StatelessWidget {
showMultiselect: this.showCheckbox, showMultiselect: this.showCheckbox,
isDismissible: isDismissible, isDismissible: isDismissible,
isSelected: isDesktop(context) && isSelected: isDesktop(context) &&
task!.id == task.id ==
(uiState.isEditing (uiState.isEditing
? taskUIState.editing!.id ? taskUIState.editing!.id
: taskUIState.selectedId), : taskUIState.selectedId),
@ -121,9 +120,9 @@ class TaskListItem extends StatelessWidget {
return constraints.maxWidth > kTableListWidthCutoff return constraints.maxWidth > kTableListWidthCutoff
? InkWell( ? InkWell(
onTap: () => onTap: () =>
onTap != null ? onTap!() : selectEntity(entity: task!), onTap != null ? onTap!() : selectEntity(entity: task),
onLongPress: () => selectEntity( onLongPress: () => selectEntity(
entity: task!, entity: task,
longPress: true, longPress: true,
), ),
child: Padding( child: Padding(
@ -154,7 +153,7 @@ class TaskListItem extends StatelessWidget {
), ),
) )
: ActionMenuButton( : ActionMenuButton(
entityActions: task!.getActions( entityActions: task.getActions(
userCompany: state.userCompany, userCompany: state.userCompany,
includeEdit: true, includeEdit: true,
), ),
@ -170,11 +169,11 @@ class TaskListItem extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
task!.number, task.number,
style: textStyle, style: textStyle,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
if (!task!.isActive) EntityStateLabel(task) if (!task.isActive) EntityStateLabel(task)
], ],
), ),
), ),
@ -184,8 +183,8 @@ class TaskListItem extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
task!.description + task.description +
(task!.documents.isNotEmpty ? ' 📎' : ''), (task.documents.isNotEmpty ? ' 📎' : ''),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: textStyle), style: textStyle),
@ -216,8 +215,8 @@ class TaskListItem extends StatelessWidget {
) )
: ListTile( : ListTile(
onTap: () => onTap: () =>
onTap != null ? onTap!() : selectEntity(entity: task!), onTap != null ? onTap!() : selectEntity(entity: task),
onLongPress: () => selectEntity(entity: task!, longPress: true), onLongPress: () => selectEntity(entity: task, longPress: true),
leading: showCheckbox leading: showCheckbox
? IgnorePointer( ? IgnorePointer(
ignoring: listUIState.isInMultiselect(), ignoring: listUIState.isInMultiselect(),
@ -237,10 +236,10 @@ class TaskListItem extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Text( child: Text(
(task!.description.isEmpty (task.description.isEmpty
? task!.number ? task.number
: task!.description) + : task.description) +
(task!.documents.isNotEmpty ? ' 📎' : ''), (task.documents.isNotEmpty ? ' 📎' : ''),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.titleMedium, style: Theme.of(context).textTheme.titleMedium,

2
lib/ui/task/task_list_vm.dart
View File

@ -42,7 +42,7 @@ class TaskListBuilder extends StatelessWidget {
onSortColumn: viewModel.onSortColumn, onSortColumn: viewModel.onSortColumn,
itemBuilder: (BuildContext context, index) { itemBuilder: (BuildContext context, index) {
final taskId = viewModel.taskList[index]; final taskId = viewModel.taskList[index];
final task = viewModel.taskMap[taskId]; final task = viewModel.taskMap[taskId]!;
return TaskListItem( return TaskListItem(
filter: viewModel.filter, filter: viewModel.filter,