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

Mobile fixes

This commit is contained in:
Hillel Coren 2020-07-19 18:12:00 +03:00
parent 417a2f81c7
commit a9fc37717b
8 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ui/client/client_list_item.dart
View File

@ -9,6 +9,7 @@ import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class ClientListItem extends StatelessWidget { class ClientListItem extends StatelessWidget {
const ClientListItem({ const ClientListItem({
@ -48,7 +49,7 @@ class ClientListItem extends StatelessWidget {
final textStyle = TextStyle(fontSize: 16); final textStyle = TextStyle(fontSize: 16);
return DismissibleEntity( return DismissibleEntity(
isSelected: client.id == isSelected: isDesktop(context) && client.id ==
(uiState.isEditing (uiState.isEditing
? clientUIState.editing.id ? clientUIState.editing.id
: clientUIState.selectedId), : clientUIState.selectedId),

3
lib/ui/expense/expense_list_item.dart
View File

@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class ExpenseListItem extends StatelessWidget { class ExpenseListItem extends StatelessWidget {
const ExpenseListItem({ const ExpenseListItem({
@ -82,7 +83,7 @@ class ExpenseListItem extends StatelessWidget {
final showCheckbox = onCheckboxChanged != null || isInMultiselect; final showCheckbox = onCheckboxChanged != null || isInMultiselect;
return DismissibleEntity( return DismissibleEntity(
isSelected: expense.id == isSelected: isDesktop(context) && expense.id ==
(uiState.isEditing (uiState.isEditing
? expenseUIState.editing.id ? expenseUIState.editing.id
: expenseUIState.selectedId), : expenseUIState.selectedId),

10
lib/ui/invoice/invoice_list_item.dart
View File

@ -11,6 +11,7 @@ import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class InvoiceListItem extends StatelessWidget { class InvoiceListItem extends StatelessWidget {
const InvoiceListItem({ const InvoiceListItem({
@ -68,10 +69,11 @@ class InvoiceListItem extends StatelessWidget {
} }
return DismissibleEntity( return DismissibleEntity(
isSelected: invoice.id == isSelected: isDesktop(context) &&
(uiState.isEditing invoice.id ==
? invoiceUIState.editing.id (uiState.isEditing
: invoiceUIState.selectedId), ? invoiceUIState.editing.id
: invoiceUIState.selectedId),
userCompany: state.userCompany, userCompany: state.userCompany,
entity: invoice, entity: invoice,
onEntityAction: onEntityAction, onEntityAction: onEntityAction,

3
lib/ui/payment/payment_list_item.dart
View File

@ -11,6 +11,7 @@ import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class PaymentListItem extends StatelessWidget { class PaymentListItem extends StatelessWidget {
const PaymentListItem({ const PaymentListItem({
@ -65,7 +66,7 @@ class PaymentListItem extends StatelessWidget {
} }
return DismissibleEntity( return DismissibleEntity(
isSelected: payment.id == isSelected: isDesktop(context) && payment.id ==
(uiState.isEditing (uiState.isEditing
? paymentUIState.editing.id ? paymentUIState.editing.id
: paymentUIState.selectedId), : paymentUIState.selectedId),

3
lib/ui/product/product_list_item.dart
View File

@ -9,6 +9,7 @@ import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class ProductListItem extends StatelessWidget { class ProductListItem extends StatelessWidget {
const ProductListItem({ const ProductListItem({
@ -51,7 +52,7 @@ class ProductListItem extends StatelessWidget {
final textStyle = TextStyle(fontSize: 16); final textStyle = TextStyle(fontSize: 16);
return DismissibleEntity( return DismissibleEntity(
isSelected: product.id == isSelected: isDesktop(context) && product.id ==
(uiState.isEditing (uiState.isEditing
? productUIState.editing.id ? productUIState.editing.id
: productUIState.selectedId), : productUIState.selectedId),

3
lib/ui/project/project_list_item.dart
View File

@ -7,6 +7,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class ProjectListItem extends StatelessWidget { class ProjectListItem extends StatelessWidget {
const ProjectListItem({ const ProjectListItem({
@ -49,7 +50,7 @@ class ProjectListItem extends StatelessWidget {
final subtitle = filterMatch ?? client.displayName; final subtitle = filterMatch ?? client.displayName;
return DismissibleEntity( return DismissibleEntity(
isSelected: project.id == isSelected: isDesktop(context) && project.id ==
(uiState.isEditing (uiState.isEditing
? projectUIState.editing.id ? projectUIState.editing.id
: projectUIState.selectedId), : projectUIState.selectedId),

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

@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class TaskListItem extends StatelessWidget { class TaskListItem extends StatelessWidget {
const TaskListItem({ const TaskListItem({
@ -66,7 +67,7 @@ class TaskListItem extends StatelessWidget {
} }
return DismissibleEntity( return DismissibleEntity(
isSelected: task.id == isSelected: isDesktop(context) && task.id ==
(uiState.isEditing ? taskUIState.editing.id : taskUIState.selectedId), (uiState.isEditing ? taskUIState.editing.id : taskUIState.selectedId),
userCompany: userCompany, userCompany: userCompany,
entity: task, entity: task,

3
lib/ui/vendor/vendor_list_item.dart vendored
View File

@ -7,6 +7,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class VendorListItem extends StatelessWidget { class VendorListItem extends StatelessWidget {
const VendorListItem({ const VendorListItem({
@ -46,7 +47,7 @@ class VendorListItem extends StatelessWidget {
: null; : null;
return DismissibleEntity( return DismissibleEntity(
isSelected: vendor.id == isSelected: isDesktop(context) && vendor.id ==
(uiState.isEditing (uiState.isEditing
? vendorUIState.editing.id ? vendorUIState.editing.id
: vendorUIState.selectedId), : vendorUIState.selectedId),