This commit is contained in:
Hillel Coren 2019-10-30 21:30:46 +02:00
parent 63edb15a1a
commit 0ea24218ba
17 changed files with 36 additions and 22 deletions

View File

@ -181,7 +181,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState clientListState, ClearClientMultiselect action) { ListUIState clientListState, ClearClientMultiselect action) {
return clientListState.rebuild((b) => b..selectedIds = ListBuilder()); return clientListState.rebuild((b) => b..selectedIds = null);
} }
final clientsReducer = combineReducers<ClientState>([ final clientsReducer = combineReducers<ClientState>([

View File

@ -148,7 +148,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState productListState, ClearCompanyGatewayMultiselect action) { ListUIState productListState, ClearCompanyGatewayMultiselect action) {
return productListState.rebuild((b) => b..selectedIds = ListBuilder()); return productListState.rebuild((b) => b..selectedIds = null);
} }
final companyGatewaysReducer = combineReducers<CompanyGatewayState>([ final companyGatewaysReducer = combineReducers<CompanyGatewayState>([

View File

@ -130,7 +130,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState documentListState, ClearDocumentMultiselect action) { ListUIState documentListState, ClearDocumentMultiselect action) {
return documentListState.rebuild((b) => b..selectedIds = ListBuilder()); return documentListState.rebuild((b) => b..selectedIds = null);
} }
final documentsReducer = combineReducers<DocumentState>([ final documentsReducer = combineReducers<DocumentState>([

View File

@ -140,7 +140,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState expenseListState, ClearExpenseMultiselect action) { ListUIState expenseListState, ClearExpenseMultiselect action) {
return expenseListState.rebuild((b) => b..selectedIds = ListBuilder()); return expenseListState.rebuild((b) => b..selectedIds = null);
} }
final expensesReducer = combineReducers<ExpenseState>([ final expensesReducer = combineReducers<ExpenseState>([

View File

@ -127,7 +127,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState groupListState, ClearGroupMultiselect action) { ListUIState groupListState, ClearGroupMultiselect action) {
return groupListState.rebuild((b) => b..selectedIds = ListBuilder()); return groupListState.rebuild((b) => b..selectedIds = null);
} }
final groupsReducer = combineReducers<GroupState>([ final groupsReducer = combineReducers<GroupState>([

View File

@ -199,7 +199,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState invoiceListState, ClearInvoiceMultiselect action) { ListUIState invoiceListState, ClearInvoiceMultiselect action) {
return invoiceListState.rebuild((b) => b..selectedIds = ListBuilder()); return invoiceListState.rebuild((b) => b..selectedIds = null);
} }
final invoicesReducer = combineReducers<InvoiceState>([ final invoicesReducer = combineReducers<InvoiceState>([

View File

@ -129,7 +129,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState paymentListState, ClearPaymentMultiselect action) { ListUIState paymentListState, ClearPaymentMultiselect action) {
return paymentListState.rebuild((b) => b..selectedIds = ListBuilder()); return paymentListState.rebuild((b) => b..selectedIds = null);
} }
final paymentsReducer = combineReducers<PaymentState>([ final paymentsReducer = combineReducers<PaymentState>([

View File

@ -128,7 +128,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState productListState, ClearProductMultiselect action) { ListUIState productListState, ClearProductMultiselect action) {
return productListState.rebuild((b) => b..selectedIds = ListBuilder()); return productListState.rebuild((b) => b..selectedIds = null);
} }
final productsReducer = combineReducers<ProductState>([ final productsReducer = combineReducers<ProductState>([

View File

@ -145,7 +145,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState projectListState, ClearProjectMultiselect action) { ListUIState projectListState, ClearProjectMultiselect action) {
return projectListState.rebuild((b) => b..selectedIds = ListBuilder()); return projectListState.rebuild((b) => b..selectedIds = null);
} }
final projectsReducer = combineReducers<ProjectState>([ final projectsReducer = combineReducers<ProjectState>([

View File

@ -185,7 +185,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState quoteListState, ClearQuoteMultiselect action) { ListUIState quoteListState, ClearQuoteMultiselect action) {
return quoteListState.rebuild((b) => b..selectedIds = ListBuilder()); return quoteListState.rebuild((b) => b..selectedIds = null);
} }
final quotesReducer = combineReducers<QuoteState>([ final quotesReducer = combineReducers<QuoteState>([

View File

@ -158,7 +158,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState taskListState, ClearTaskMultiselect action) { ListUIState taskListState, ClearTaskMultiselect action) {
return taskListState.rebuild((b) => b..selectedIds = ListBuilder()); return taskListState.rebuild((b) => b..selectedIds = null);
} }
final tasksReducer = combineReducers<TaskState>([ final tasksReducer = combineReducers<TaskState>([

View File

@ -130,7 +130,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState taxRateListState, ClearTaxRateMultiselect action) { ListUIState taxRateListState, ClearTaxRateMultiselect action) {
return taxRateListState.rebuild((b) => b..selectedIds = ListBuilder()); return taxRateListState.rebuild((b) => b..selectedIds = null);
} }
final taxRatesReducer = combineReducers<TaxRateState>([ final taxRatesReducer = combineReducers<TaxRateState>([

View File

@ -126,7 +126,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState productListState, ClearUserMultiselect action) { ListUIState productListState, ClearUserMultiselect action) {
return productListState.rebuild((b) => b..selectedIds = ListBuilder()); return productListState.rebuild((b) => b..selectedIds = null);
} }
final usersReducer = combineReducers<UserState>([ final usersReducer = combineReducers<UserState>([

View File

@ -171,7 +171,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState vendorListState, ClearVendorMultiselect action) { ListUIState vendorListState, ClearVendorMultiselect action) {
return vendorListState.rebuild((b) => b..selectedIds = ListBuilder()); return vendorListState.rebuild((b) => b..selectedIds = null);
} }
final vendorsReducer = combineReducers<VendorState>([ final vendorsReducer = combineReducers<VendorState>([

View File

@ -41,7 +41,7 @@ class UserListItem extends StatelessWidget {
final filterMatch = filter != null && filter.isNotEmpty final filterMatch = filter != null && filter.isNotEmpty
? user.matchesFilterValue(filter) ? user.matchesFilterValue(filter)
: null; : user.email;
final subtitle = filterMatch; final subtitle = filterMatch;
return DismissibleEntity( return DismissibleEntity(

View File

@ -5,10 +5,12 @@ import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart';
import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart'; import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
import 'package:invoiceninja_flutter/ui/app/buttons/edit_icon_button.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/edit_icon_button.dart';
import 'package:invoiceninja_flutter/ui/app/entities/entity_state_title.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_state_title.dart';
import 'package:invoiceninja_flutter/ui/app/form_card.dart';
import 'package:invoiceninja_flutter/ui/app/lists/app_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/lists/app_list_tile.dart';
import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart'; import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/icons.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart';
@ -55,12 +57,24 @@ class UserView extends StatelessWidget {
), ),
body: ListView( body: ListView(
children: <Widget>[ children: <Widget>[
AppListTile( FormCard(
icon: Icons.email, children: <Widget>[
title: user.email, AppListTile(
copyValue: user.email, icon: Icons.email,
subtitle: localization.email, title: user.email,
onTap: () => launch('mailto:' + user.email), copyValue: user.email,
subtitle: localization.email,
onTap: () => launch('mailto:' + user.email),
),
if ((user.phone ?? '').isNotEmpty)
AppListTile(
icon: Icons.phone,
title: user.phone,
copyValue: user.phone,
subtitle: localization.phone,
onTap: () => launch('sms:' + cleanPhoneNumber(user.phone)),
),
],
), ),
/* /*
TwoValueHeader( TwoValueHeader(

View File

@ -129,7 +129,7 @@ ListUIState _removeFromListMultiselect(
ListUIState _clearListMultiselect( ListUIState _clearListMultiselect(
ListUIState productListState, ClearStubMultiselect action) { ListUIState productListState, ClearStubMultiselect action) {
return productListState.rebuild((b) => b..selectedIds = ListBuilder()); return productListState.rebuild((b) => b..selectedIds = null;
} }
final stubsReducer = combineReducers<StubState>([ final stubsReducer = combineReducers<StubState>([