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

Menu bar fixes

This commit is contained in:
Hillel Coren 2020-07-23 16:52:08 +03:00
parent 62379aa4eb
commit 621a069ef0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ui/app/menu_drawer.dart
View File

@ -114,10 +114,10 @@ class MenuDrawer extends StatelessWidget {
if (companyId == null) {
viewModel.onAddCompany(context);
} else {
/*
viewModel.onCompanyChanged(
context, value, viewModel.companies[int.parse(value)]);
*/
final company =
state.companies.firstWhere((company) => company.id == companyId);
final index = state.companies.indexOf(company);
viewModel.onCompanyChanged(context, index, company);
}
},
);
@ -150,8 +150,9 @@ class MenuDrawer extends StatelessWidget {
if (value == null) {
viewModel.onAddCompany(context);
} else {
final index = int.parse(value);
viewModel.onCompanyChanged(
context, value, state.companies[int.parse(value)]);
context, index, state.companies[index]);
}
},
);

5
lib/ui/app/menu_drawer_vm.dart
View File

@ -43,7 +43,7 @@ class MenuDrawerVM {
final CompanyEntity selectedCompany;
final UserEntity user;
final String selectedCompanyIndex;
final Function(BuildContext context, String, CompanyEntity) onCompanyChanged;
final Function(BuildContext context, int, CompanyEntity) onCompanyChanged;
final Function(BuildContext context) onAddCompany;
final bool isLoading;
@ -58,8 +58,7 @@ class MenuDrawerVM {
selectedCompany: state.company,
selectedCompanyIndex: state.uiState.selectedCompanyIndex.toString(),
onCompanyChanged:
(BuildContext context, String companyIndex, CompanyEntity company) {
final index = int.parse(companyIndex);
(BuildContext context, int index, CompanyEntity company) {
if (index == state.uiState.selectedCompanyIndex) {
return;