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

History fixes

This commit is contained in:
Hillel Coren 2020-02-21 09:18:44 +02:00
parent 32b32d5a68
commit a4fbf883ff
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/ui/app/history_drawer.dart
View File

@ -111,7 +111,8 @@ class _HistoryListTileState extends State<HistoryListTile> {
final history = widget.history;
Widget text;
Widget title;
Widget subtitle;
String clientId;
BaseEntity entity;
@ -120,7 +121,16 @@ class _HistoryListTileState extends State<HistoryListTile> {
EntityType.reports,
EntityType.settings,
].contains(history.entityType)) {
text = Text(localization.lookup(history.entityType.toString()));
title = Text(localization.lookup(history.entityType.toString()));
if (history.entityType == EntityType.reports) {
subtitle =
Text(localization.lookup(state.uiState.reportsUIState.report));
} else if (history.entityType == EntityType.settings) {
var section = state.uiState.settingsUIState.section;
section = section.replaceAll('_edit', '').replaceAll('_view', '');
subtitle =
Text(localization.lookup(section));
}
} else {
entity = state.getEntityMap(history.entityType)[history.id] as BaseEntity;
@ -146,10 +156,12 @@ class _HistoryListTileState extends State<HistoryListTile> {
break;
}
text = Text(entity.listDisplayName.isEmpty
title = Text(entity.listDisplayName.isEmpty
? formatNumber(entity.listDisplayAmount, context,
formatNumberType: entity.listDisplayAmountType)
: entity.listDisplayName);
subtitle = Text(localization.lookup('${history.entityType}'));
}
return Container(
@ -158,10 +170,8 @@ class _HistoryListTileState extends State<HistoryListTile> {
child: ListTile(
key: ValueKey('__${history.id}_${history.entityType}__'),
leading: Icon(getEntityIcon(history.entityType)),
title: text,
subtitle: history.id == null
? null
: Text(localization.lookup('${history.entityType}')),
title: title,
subtitle: subtitle,
// TODO this needs to be localized
trailing: LiveText(
() => timeago.format(history.dateTime, locale: 'en_short'),

15
lib/ui/app/main_screen.dart
View File

@ -163,21 +163,14 @@ class MainScreen extends StatelessWidget {
onWillPop: () async {
final state = store.state;
final historyList = state.historyList;
final notViewingEntity = state.uiState.isEditing ||
state.uiState.isInSettings ||
(historyList[0].entityType.toString() !=
state.uiState.mainRoute);
if (historyList.isEmpty ||
historyList.length == 1 && !notViewingEntity) {
return false;
if (historyList.length <= 1) {
return true;
}
final history = historyList[notViewingEntity ? 0 : 1];
final history = historyList[1];
if (!notViewingEntity) {
store.dispatch(PopLastHistory());
}
store.dispatch(PopLastHistory());
switch (history.entityType) {
case EntityType.dashboard: