Settings

lib/constants.dart

@@ -148,7 +148,7 @@ const String kSettingsDeviceSettings = 'device_settings';
 const String kSettingsGroupSettings = 'group_settings';
 const String kSettingsGroupSettingsView = 'group_settings_view';
 const String kSettingsGroupSettingsEdit = 'group_settings_edit';
-const String kSettingSystemSettings = 'system_settings';
+const String kSettingCustomFields = 'custom_fields';
 const String kSettingsInvoiceDesign = 'invoice_design';
 const String kSettingsClientPortal = 'client_portal';
 const String kSettingsBuyNowButtons = 'buy_now_buttons';
@@ -172,7 +172,7 @@ const List<String> kSettingsSections = [
   kSettingsGroupSettings,
   kSettingsGroupSettingsView,
   kSettingsGroupSettingsEdit,
-  kSettingSystemSettings,
+  kSettingCustomFields,
   kSettingsInvoiceDesign,
   kSettingsClientPortal,
   kSettingsBuyNowButtons,

lib/main.dart

@@ -52,7 +52,7 @@ import 'package:invoiceninja_flutter/ui/settings/device_settings_list_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/email_settings_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/import_export_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/invoice_design_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/system_settings_vm.dart';
+import 'package:invoiceninja_flutter/ui/settings/custom_fields_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/localization_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/notifications_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/online_payments_vm.dart';
@@ -366,7 +366,7 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
             GroupSettingsScreen.route: (context) => GroupScreenBuilder(),
             GroupEditScreen.route: (context) => GroupEditScreen(),
             GroupViewScreen.route: (context) => GroupViewScreen(),
-            SystemSettingsScreen.route: (context) => SystemSettingsScreen(),
+            CustomFieldsScreen.route: (context) => CustomFieldsScreen(),
             InvoiceDesignScreen.route: (context) => InvoiceDesignScreen(),
             ClientPortalScreen.route: (context) => ClientPortalScreen(),
             BuyNowButtonsScreen.route: (context) => BuyNowButtonsScreen(),

lib/ui/app/main_screen.dart

@@ -30,7 +30,7 @@ import 'package:invoiceninja_flutter/ui/settings/device_settings_list_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/email_settings_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/import_export_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/invoice_design_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/system_settings_vm.dart';
+import 'package:invoiceninja_flutter/ui/settings/custom_fields_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/localization_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/notifications_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/products_vm.dart';
@@ -211,8 +211,8 @@ class SettingsScreens extends StatelessWidget {
       case kSettingsGroupSettingsEdit:
         screen = GroupEditScreen();
         break;
-      case kSettingSystemSettings:
-        screen = SystemSettingsScreen();
+      case kSettingCustomFields:
+        screen = CustomFieldsScreen();
         break;
       case kSettingsInvoiceDesign:
         screen = InvoiceDesignScreen();

lib/ui/settings/custom_fields.dart

@@ -6,23 +6,23 @@ import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
-import 'package:invoiceninja_flutter/ui/settings/system_settings_vm.dart';
+import 'package:invoiceninja_flutter/ui/settings/custom_fields_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/settings_scaffold.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 
-class SystemSettings extends StatefulWidget {
-  const SystemSettings({
+class CustomFields extends StatefulWidget {
+  const CustomFields({
     Key key,
     @required this.viewModel,
   }) : super(key: key);
 
-  final SystemSettingsVM viewModel;
+  final CustomFieldsVM viewModel;
 
   @override
-  _SystemSettingsState createState() => _SystemSettingsState();
+  _CustomFieldsState createState() => _CustomFieldsState();
 }
 
-class _SystemSettingsState extends State<SystemSettings>
+class _CustomFieldsState extends State<CustomFields>
     with SingleTickerProviderStateMixin {
   static final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
 
@@ -88,7 +88,7 @@ class _SystemSettingsState extends State<SystemSettings>
     final state = viewModel.state;
 
     return SettingsScaffold(
-      title: localization.systemSettings,
+      title: localization.customFields,
       onSavePressed: viewModel.onSavePressed,
       appBarBottom: TabBar(
         key: ValueKey(state.settingsUIState.updatedAt),
@@ -306,7 +306,7 @@ class CustomFieldsSettings extends StatefulWidget {
       this.showValues = false,
       this.valueLabel});
 
-  final SystemSettingsVM viewModel;
+  final CustomFieldsVM viewModel;
   final String fieldLabel;
   final String valueLabel;
   final bool showChargeTaxes;

lib/ui/settings/custom_fields_vm.dart

@@ -7,22 +7,22 @@ import 'package:invoiceninja_flutter/data/models/entities.dart';
 import 'package:invoiceninja_flutter/redux/client/client_actions.dart';
 import 'package:invoiceninja_flutter/redux/group/group_actions.dart';
 import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
-import 'package:invoiceninja_flutter/ui/settings/system_settings.dart';
+import 'package:invoiceninja_flutter/ui/settings/custom_fields.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:redux/redux.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 
-class SystemSettingsScreen extends StatelessWidget {
-  const SystemSettingsScreen({Key key}) : super(key: key);
-  static const String route = '/$kSettings/$kSettingSystemSettings';
+class CustomFieldsScreen extends StatelessWidget {
+  const CustomFieldsScreen({Key key}) : super(key: key);
+  static const String route = '/$kSettings/$kSettingCustomFields';
 
   @override
   Widget build(BuildContext context) {
-    return StoreConnector<AppState, SystemSettingsVM>(
-      converter: SystemSettingsVM.fromStore,
+    return StoreConnector<AppState, CustomFieldsVM>(
+      converter: CustomFieldsVM.fromStore,
       builder: (context, viewModel) {
-        return SystemSettings(
+        return CustomFields(
           viewModel: viewModel,
           key: ValueKey(viewModel.state.settingsUIState.updatedAt),
         );
@@ -31,8 +31,8 @@ class SystemSettingsScreen extends StatelessWidget {
   }
 }
 
-class SystemSettingsVM {
-  SystemSettingsVM({
+class CustomFieldsVM {
+  CustomFieldsVM({
     @required this.state,
     @required this.onSavePressed,
     @required this.onCancelPressed,
@@ -42,10 +42,10 @@ class SystemSettingsVM {
     @required this.onCompanyChanged,
   });
 
-  static SystemSettingsVM fromStore(Store<AppState> store) {
+  static CustomFieldsVM fromStore(Store<AppState> store) {
     final state = store.state;
 
-    return SystemSettingsVM(
+    return CustomFieldsVM(
         state: state,
         company: state.uiState.settingsUIState.userCompany.company,
         settings: state.uiState.settingsUIState.settings,

lib/ui/settings/settings_list.dart

@@ -121,7 +121,7 @@ class SettingsList extends StatelessWidget {
           icon: FontAwesomeIcons.layerGroup,
         ),
         SettingsListTile(
-          section: kSettingSystemSettings,
+          section: kSettingCustomFields,
           viewModel: viewModel,
           icon: FontAwesomeIcons.fileInvoice,
         ),

lib/utils/i18n.dart

@@ -195,7 +195,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'tax_rates': 'Tax Rates',
       'notifications': 'Notifications',
       'import_export': 'Import | Export',
-      'system_settings': 'System Settings',
+      'custom_fields': 'Custom Fields',
       'invoice_design': 'Invoice Design',
       'buy_now_buttons': 'Buy Now Buttons',
       'email_settings': 'Email Settings',
@@ -14819,7 +14819,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
 
   String get importExport => _localizedValues[localeCode]['import_export'];
 
-  String get systemSettings => _localizedValues[localeCode]['system_settings'];
+  String get customFields => _localizedValues[localeCode]['custom_fields'];
 
   String get invoiceDesign => _localizedValues[localeCode]['invoice_design'];