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

Add fallback for company logo URL change

This commit is contained in:
Hillel Coren 2023-09-18 08:57:07 +03:00
parent 0f9f66226f
commit d69b9f62a9
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,11 +81,12 @@ class _MenuDrawerState extends State<MenuDrawer> {
return Container(); return Container();
} }
Widget _companyLogo(CompanyEntity company) => company Widget _companyLogo(CompanyEntity company) {
.settings.companyLogo != if (company.settings.companyLogo != null &&
null && company.settings.companyLogo.isNotEmpty) {
company.settings.companyLogo.isNotEmpty if (state.isHosted && kIsWeb) {
? CachedImage( // Fix for CORS error using 'object' subdomain
return CachedImage(
width: MenuDrawer.LOGO_WIDTH, width: MenuDrawer.LOGO_WIDTH,
url: state.credentials.url + '/companies/' + company.id + '/logo', url: state.credentials.url + '/companies/' + company.id + '/logo',
apiToken: state.userCompanyStates apiToken: state.userCompanyStates
@ -93,8 +94,18 @@ class _MenuDrawerState extends State<MenuDrawer> {
userCompanyState.company.id == company.id) userCompanyState.company.id == company.id)
.token .token
.token, .token,
) );
: Image.asset('assets/images/icon.png', width: MenuDrawer.LOGO_WIDTH); } else {
return CachedImage(
width: MenuDrawer.LOGO_WIDTH,
url: company.settings.companyLogo,
);
}
} else {
return Image.asset('assets/images/icon.png',
width: MenuDrawer.LOGO_WIDTH);
}
}
Widget _companyListItem( Widget _companyListItem(
CompanyEntity company, { CompanyEntity company, {

23
lib/ui/settings/company_details.dart
View File

@ -1,4 +1,5 @@
// Flutter imports: // Flutter imports:
import 'package:flutter/foundation.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/constants.dart'; import 'package:invoiceninja_flutter/constants.dart';
@ -572,14 +573,20 @@ class _CompanyDetailsState extends State<CompanyDetails>
if ('${settings.companyLogo ?? ''}'.isNotEmpty) if ('${settings.companyLogo ?? ''}'.isNotEmpty)
Padding( Padding(
padding: const EdgeInsets.symmetric(vertical: 20), padding: const EdgeInsets.symmetric(vertical: 20),
child: CachedImage( // Fix for CORS error using 'object' subdomain
width: double.infinity, child: (state.isHosted && kIsWeb)
url: state.credentials.url + ? CachedImage(
'/companies/' + width: double.infinity,
company.id + url: state.credentials.url +
'/logo', '/companies/' +
apiToken: state.userCompany.token.token, company.id +
)), '/logo',
apiToken: state.userCompany.token.token,
)
: CachedImage(
width: double.infinity,
url: company.settings.companyLogo,
)),
], ],
), ),
), ),