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

Add separate loading messages

This commit is contained in:
Hillel Coren 2022-01-16 12:22:37 +02:00
parent b706ab545f
commit d2e8df63d2
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,15 @@ class MenuDrawer extends StatelessWidget {
onSelected: (String companyId) { onSelected: (String companyId) {
if (companyId == 'logout') { if (companyId == 'logout') {
viewModel.onLogoutTap(context); viewModel.onLogoutTap(context);
} else if (!state.isLoaded || state.isLoading || state.isSaving) { } else if (state.isLoading) {
showMessageDialog(
context: context, message: localization.waitForLoading);
return;
} else if (state.isSaving) {
showMessageDialog(
context: context, message: localization.waitForSaving);
return;
} else if (!state.isLoaded) {
showMessageDialog( showMessageDialog(
context: context, message: localization.waitForData); context: context, message: localization.waitForData);
return; return;
@ -221,9 +229,15 @@ class MenuDrawer extends StatelessWidget {
onChanged: (dynamic value) { onChanged: (dynamic value) {
if (value == 'logout' && !state.isLoading && !state.isSaving) { if (value == 'logout' && !state.isLoading && !state.isSaving) {
viewModel.onLogoutTap(context); viewModel.onLogoutTap(context);
} else if (!state.isLoaded || } else if (state.isLoading) {
state.isLoading || showMessageDialog(
state.isSaving) { context: context, message: localization.waitForLoading);
return;
} else if (state.isSaving) {
showMessageDialog(
context: context, message: localization.waitForSaving);
return;
} else if (!state.isLoaded) {
showMessageDialog( showMessageDialog(
context: context, message: localization.waitForData); context: context, message: localization.waitForData);
return; return;

10
lib/utils/i18n.dart
View File

@ -16,6 +16,8 @@ mixin LocalizationsProvider on LocaleCodeAware {
static final Map<String, Map<String, String>> _localizedValues = { static final Map<String, Map<String, String>> _localizedValues = {
'en': { 'en': {
// STARTER: lang key - do not remove comment // STARTER: lang key - do not remove comment
'wait_for_loading': 'Data loading - please wait for it to complete',
'wait_for_saving': 'Data saving - please wait for it to complete',
'html_preview_warning': 'html_preview_warning':
'Note: changes made here are only previewed, they must be applied in the tabs above to be saved', 'Note: changes made here are only previewed, they must be applied in the tabs above to be saved',
'remaining': 'Remaining', 'remaining': 'Remaining',
@ -70925,6 +70927,14 @@ mixin LocalizationsProvider on LocaleCodeAware {
_localizedValues[localeCode]['html_preview_warning'] ?? _localizedValues[localeCode]['html_preview_warning'] ??
_localizedValues['en']['html_preview_warning']; _localizedValues['en']['html_preview_warning'];
String get waitForLoading =>
_localizedValues[localeCode]['wait_for_loading'] ??
_localizedValues['en']['wait_for_loading'];
String get waitForSaving =>
_localizedValues[localeCode]['wait_for_saving'] ??
_localizedValues['en']['wait_for_saving'];
// STARTER: lang field - do not remove comment // STARTER: lang field - do not remove comment
String lookup(String key) { String lookup(String key) {