From bca086fed7dea0116552b8c9ab675265aa2ea9ca Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 25 Oct 2020 17:22:28 +0200 Subject: [PATCH] Categories --- lib/constants.dart | 2 +- lib/data/models/entities.dart | 6 ++++ lib/ui/app/main_screen.dart | 12 +++++++ .../expense_category_screen.dart | 2 +- lib/ui/settings/expense_settings.dart | 9 ++++++ lib/ui/settings/expense_settings_vm.dart | 31 ++++++++++++------- lib/utils/i18n.dart | 16 +++++++++- 7 files changed, 64 insertions(+), 14 deletions(-) diff --git a/lib/constants.dart b/lib/constants.dart index bca137454..587c6cb51 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -341,7 +341,7 @@ const String kSettingsTokenEdit = 'token_edit'; const String kSettingsWebhooks = 'webhook'; const String kSettingsWebhookView = 'webhook_view'; const String kSettingsWebhookEdit = 'webhook_edit'; -const String kSettingsExpenseCategory = 'expense_category'; +const String kSettingsExpenseCategories = 'expense_category'; const String kSettingsExpenseCategoryView = 'expense_category_view'; const String kSettingsExpenseCategoryEdit = 'expense_category_edit'; diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart index 0c06818b1..c6c1da1a4 100644 --- a/lib/data/models/entities.dart +++ b/lib/data/models/entities.dart @@ -37,6 +37,7 @@ class EntityType extends EnumClass { static const EntityType gatewayToken = _$gatewayToken; static const EntityType invoiceItem = _$invoiceItem; static const EntityType design = _$design; + // STARTER: entity type - do not remove comment static const EntityType webhook = _$webhook; static const EntityType token = _$token; @@ -57,6 +58,10 @@ class EntityType extends EnumClass { static const EntityType font = _$font; String get plural { + if (this == EntityType.expenseCategory) { + return 'expenseCategories'; + } + return toString() + 's'; } @@ -69,6 +74,7 @@ class EntityType extends EnumClass { EntityType.design, EntityType.token, EntityType.webhook, + EntityType.expenseCategory, ].contains(this); List get relatedTypes { diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart index 09e9160c0..cae0cf5e1 100644 --- a/lib/ui/app/main_screen.dart +++ b/lib/ui/app/main_screen.dart @@ -23,6 +23,9 @@ import 'package:invoiceninja_flutter/ui/credit/view/credit_view_vm.dart'; import 'package:invoiceninja_flutter/ui/design/design_screen_vm.dart'; import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/design/view/design_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/edit/expense_category_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/expense_category_screen_vm.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view_vm.dart'; import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/payment_term/payment_term_screen_vm.dart'; import 'package:invoiceninja_flutter/ui/payment_term/view/payment_term_view_vm.dart'; @@ -497,6 +500,15 @@ class SettingsScreens extends StatelessWidget { case kSettingsWebhookEdit: screen = WebhookEditScreen(); break; + case kSettingsExpenseCategories: + screen = ExpenseCategoryScreenBuilder(); + break; + case kSettingsExpenseCategoryView: + screen = ExpenseCategoryViewScreen(); + break; + case kSettingsExpenseCategoryEdit: + screen = ExpenseCategoryEditScreen(); + break; } return Row(children: [ diff --git a/lib/ui/expense_category/expense_category_screen.dart b/lib/ui/expense_category/expense_category_screen.dart index 69ed35098..c2341c2de 100644 --- a/lib/ui/expense_category/expense_category_screen.dart +++ b/lib/ui/expense_category/expense_category_screen.dart @@ -20,7 +20,7 @@ class ExpenseCategoryScreen extends StatelessWidget { @required this.viewModel, }) : super(key: key); - static const String route = '/$kSettings/$kSettingsExpenseCategory'; + static const String route = '/$kSettings/$kSettingsExpenseCategories'; final ExpenseCategoryScreenVM viewModel; diff --git a/lib/ui/settings/expense_settings.dart b/lib/ui/settings/expense_settings.dart index 706be46f3..e44fe22fc 100644 --- a/lib/ui/settings/expense_settings.dart +++ b/lib/ui/settings/expense_settings.dart @@ -1,5 +1,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/settings/expense_settings_vm.dart'; @@ -76,6 +77,14 @@ class _ExpenseSettingsState extends State { ), ], ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: AppButton( + iconData: Icons.settings, + label: localization.configureCategories.toUpperCase(), + onPressed: () => viewModel.onConfigureCategoriesPressed(context), + ), + ), ], ), ); diff --git a/lib/ui/settings/expense_settings_vm.dart b/lib/ui/settings/expense_settings_vm.dart index b154a001e..640b40021 100644 --- a/lib/ui/settings/expense_settings_vm.dart +++ b/lib/ui/settings/expense_settings_vm.dart @@ -4,6 +4,7 @@ import 'package:flutter_redux/flutter_redux.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/expense_settings.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; @@ -34,27 +35,35 @@ class ExpenseSettingsVM { @required this.company, @required this.onCompanyChanged, @required this.onSavePressed, + @required this.onConfigureCategoriesPressed, }); static ExpenseSettingsVM fromStore(Store store) { final state = store.state; return ExpenseSettingsVM( - state: state, - company: state.uiState.settingsUIState.company, - onCompanyChanged: (company) => - store.dispatch(UpdateCompany(company: company)), - onSavePressed: (context) { - final settingsUIState = state.uiState.settingsUIState; - final completer = snackBarCompleter( - context, AppLocalization.of(context).savedSettings); - store.dispatch(SaveCompanyRequest( - completer: completer, company: settingsUIState.company)); - }); + state: state, + company: state.uiState.settingsUIState.company, + onCompanyChanged: (company) => + store.dispatch(UpdateCompany(company: company)), + onSavePressed: (context) { + final settingsUIState = state.uiState.settingsUIState; + final completer = snackBarCompleter( + context, AppLocalization.of(context).savedSettings); + store.dispatch(SaveCompanyRequest( + completer: completer, company: settingsUIState.company)); + }, + onConfigureCategoriesPressed: (context) { + store.dispatch(ViewSettings( + navigator: Navigator.of(context), + section: kSettingsExpenseCategories)); + }, + ); } final AppState state; final Function(BuildContext) onSavePressed; final CompanyEntity company; final Function(CompanyEntity) onCompanyChanged; + final Function(BuildContext) onConfigureCategoriesPressed; } diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index 971fc8f21..e7cbab0eb 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -15,6 +15,7 @@ mixin LocalizationsProvider on LocaleCodeAware { static final Map> _localizedValues = { 'en': { // STARTER: lang key - do not remove comment + 'configure_categories': 'Configure Categories', 'expense_categories': 'Expense Categories', 'new_expense_category': 'New Expense Category', 'edit_expense_category': 'Edit Expense Category', @@ -24,7 +25,8 @@ mixin LocalizationsProvider on LocaleCodeAware { 'deleted_expense_category': 'Successfully deleted expense category', 'removed_expense_category': 'Successfully removed expense category', 'restored_expense_category': 'Successfully restored expense category', - 'search_expense_category': 'Search ExpenseCategory', + 'search_expense_category': 'Search Expense Category', + 'search_expense_categories': 'Search :count Expense Categories', 'use_available_credits': 'Use Available Credits', 'show_option': 'Show Option', 'negative_payment_error': @@ -3705,22 +3707,31 @@ mixin LocalizationsProvider on LocaleCodeAware { // STARTER: lang field - do not remove comment String get expenseCategory => _localizedValues[localeCode]['expense_category']; + String get expenseCategories => _localizedValues[localeCode]['expense_categories']; + String get newExpenseCategory => _localizedValues[localeCode]['new_expense_category']; + String get createdExpenseCategory => _localizedValues[localeCode]['created_expense_category']; + String get updatedExpenseCategory => _localizedValues[localeCode]['updated_expense_category']; + String get archivedExpenseCategory => _localizedValues[localeCode]['archived_expense_category']; + String get deletedExpenseCategory => _localizedValues[localeCode]['deleted_expense_category']; + String get restoredExpenseCategory => _localizedValues[localeCode]['restored_expense_category']; + String get editExpenseCategory => _localizedValues[localeCode]['edit_expense_category']; + String get searchExpenseCategory => _localizedValues[localeCode]['search_expense_category']; @@ -4751,6 +4762,9 @@ mixin LocalizationsProvider on LocaleCodeAware { String get transactionId => _localizedValues[localeCode]['transaction_id'] ?? ''; + String get configureCategories => + _localizedValues[localeCode]['configure_categories'] ?? ''; + String lookup(String key) { final lookupKey = toSnakeCase(key);