diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c089ec81718..972b3783e32 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -380,7 +380,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CURRENT_PROJECT_VERSION = 102; + CURRENT_PROJECT_VERSION = 103; DEVELOPMENT_TEAM = NPC44Y2C98; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -388,7 +388,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 5.0.102; + MARKETING_VERSION = 5.0.103; PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -512,7 +512,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CURRENT_PROJECT_VERSION = 102; + CURRENT_PROJECT_VERSION = 103; DEVELOPMENT_TEAM = NPC44Y2C98; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -520,7 +520,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 5.0.102; + MARKETING_VERSION = 5.0.103; PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -538,7 +538,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CURRENT_PROJECT_VERSION = 102; + CURRENT_PROJECT_VERSION = 103; DEVELOPMENT_TEAM = NPC44Y2C98; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -546,7 +546,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 5.0.102; + MARKETING_VERSION = 5.0.103; PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/constants.dart b/lib/constants.dart index 6c9127c0df1..96c2ab378b1 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -4,7 +4,7 @@ class Constants { } // TODO remove version once #46609 is fixed -const String kClientVersion = '5.0.102'; +const String kClientVersion = '5.0.103'; const String kMinServerVersion = '5.0.4'; const String kAppName = 'Invoice Ninja'; @@ -304,6 +304,7 @@ const String kGatewayTypeACSS = '19'; const String kGatewayTypeBECS = '20'; const String kGatewayTypeInstantBankPay = '21'; const String kGatewayTypeFPX = '22'; +const String kGatewayTypeKlarna = '23'; const kGatewayTypes = { kGatewayTypeCreditCard: 'credit_card', @@ -328,6 +329,7 @@ const kGatewayTypes = { kGatewayTypeBECS: 'becs', kGatewayTypeInstantBankPay: 'instant_bank_pay', kGatewayTypeFPX: 'fpx', + kGatewayTypeKlarna: 'klarna', }; const String kNotificationChannelEmail = 'email'; diff --git a/lib/ui/app/copy_to_clipboard.dart b/lib/ui/app/copy_to_clipboard.dart index 8cc4ac52753..8d370123564 100644 --- a/lib/ui/app/copy_to_clipboard.dart +++ b/lib/ui/app/copy_to_clipboard.dart @@ -35,10 +35,16 @@ class CopyToClipboard extends StatelessWidget { final localization = AppLocalization.of(context); final onTap = () { Clipboard.setData(ClipboardData(text: value)); + + var valueStr = value.replaceAll('\n', ' '); + if (value.length > 20) { + valueStr = value.substring(0, 20) + '...'; + } + showToast( localization.copiedToClipboard.replaceFirst( ':value', - value.replaceAll('\n', ' '), + '"$valueStr"', ), ); }; diff --git a/lib/ui/app/icon_message.dart b/lib/ui/app/icon_message.dart index dd76bce338c..88b9aac3d17 100644 --- a/lib/ui/app/icon_message.dart +++ b/lib/ui/app/icon_message.dart @@ -1,5 +1,6 @@ // Flutter imports: import 'package:flutter/material.dart'; +import 'package:invoiceninja_flutter/ui/app/copy_to_clipboard.dart'; class IconMessage extends StatelessWidget { const IconMessage( @@ -29,11 +30,14 @@ class IconMessage extends StatelessWidget { ), SizedBox(width: 16), Expanded( - child: Text( - text, - maxLines: null, - style: TextStyle( - color: Colors.white, + child: CopyToClipboard( + value: text, + child: Text( + text, + maxLines: null, + style: TextStyle( + color: Colors.white, + ), ), ), ), diff --git a/lib/ui/transaction/view/transaction_view.dart b/lib/ui/transaction/view/transaction_view.dart index 90eff39e209..4d3fd6c5e4f 100644 --- a/lib/ui/transaction/view/transaction_view.dart +++ b/lib/ui/transaction/view/transaction_view.dart @@ -1123,110 +1123,102 @@ class _MatchWithdrawalsState extends State<_MatchWithdrawals> { ), ), ListDivider(), - Expanded( - child: Column( - children: [ - Row( - children: [ - Expanded( - child: Padding( - padding: const EdgeInsets.only( - left: 22, top: 12, right: 10, bottom: 12), - child: SearchText( - filterController: _categoryFilterController, - focusNode: _categoryFocusNode, - onChanged: (value) { - setState(() { - updateCategoryList(); - }); - }, - onCleared: () { - setState(() { - _categoryFilterController.text = ''; - updateCategoryList(); - }); - }, - placeholder: localization.searchCategories - .replaceFirst(':count ', '')), - ), - ), - IconButton( - onPressed: () { - final completer = - snackBarCompleter( - context, - localization.createdExpenseCategory); - createEntity( - context: context, - entity: ExpenseCategoryEntity( - state: viewModel.state), - force: true, - completer: completer, - cancelCompleter: Completer() - ..future.then((_) { - store.dispatch(UpdateCurrentRoute( - TransactionScreen.route)); - })); - completer.future - .then((SelectableEntity category) { - store.dispatch(SaveTransactionSuccess( - transaction.rebuild((b) => - b..pendingCategoryId = category.id))); - store.dispatch(UpdateCurrentRoute( - TransactionScreen.route)); + Row( + children: [ + Expanded( + child: Padding( + padding: const EdgeInsets.only( + left: 22, top: 12, right: 10, bottom: 12), + child: SearchText( + filterController: _categoryFilterController, + focusNode: _categoryFocusNode, + onChanged: (value) { + setState(() { + updateCategoryList(); }); }, - icon: Icon(Icons.add), - ), - SizedBox(width: 8), - ], - ), - ListDivider(), - Expanded( - child: Scrollbar( - thumbVisibility: true, - controller: _categoryScrollController, - child: ListView.separated( - controller: _categoryScrollController, - separatorBuilder: (context, index) => ListDivider(), - itemCount: _categories.length, - itemBuilder: (BuildContext context, int index) { - final category = _categories[index]; - return ExpenseCategoryListItem( - expenseCategory: category, - showCheck: true, - isChecked: _selectedCategory?.id == category.id, - onTap: () => setState(() { - if (_selectedCategory?.id == category.id) { - _selectedCategory = null; - } else { - _selectedCategory = category; - } - updateCategoryList(); - store.dispatch(SaveTransactionSuccess( - transaction.rebuild((b) => b - ..pendingCategoryId = - _selectedCategory?.id))); - }), - ); + onCleared: () { + setState(() { + _categoryFilterController.text = ''; + updateCategoryList(); + }); }, - ), - ), + placeholder: localization.searchCategories + .replaceFirst(':count ', '')), ), - if (transaction.category.isNotEmpty && - _selectedCategory == null) - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16, vertical: 12), - child: Text( - '${localization.defaultCategory}: ${transaction.category}', - textAlign: TextAlign.center, - style: TextStyle(color: Colors.grey), - ), - ), - ], + ), + IconButton( + onPressed: () { + final completer = + snackBarCompleter( + context, localization.createdExpenseCategory); + createEntity( + context: context, + entity: + ExpenseCategoryEntity(state: viewModel.state), + force: true, + completer: completer, + cancelCompleter: Completer() + ..future.then((_) { + store.dispatch(UpdateCurrentRoute( + TransactionScreen.route)); + })); + completer.future.then((SelectableEntity category) { + store.dispatch(SaveTransactionSuccess( + transaction.rebuild( + (b) => b..pendingCategoryId = category.id))); + store.dispatch( + UpdateCurrentRoute(TransactionScreen.route)); + }); + }, + icon: Icon(Icons.add), + ), + SizedBox(width: 8), + ], + ), + ListDivider(), + Expanded( + child: Scrollbar( + thumbVisibility: true, + controller: _categoryScrollController, + child: ListView.separated( + controller: _categoryScrollController, + separatorBuilder: (context, index) => ListDivider(), + itemCount: _categories.length, + itemBuilder: (BuildContext context, int index) { + final category = _categories[index]; + return ExpenseCategoryListItem( + expenseCategory: category, + showCheck: true, + isChecked: _selectedCategory?.id == category.id, + onTap: () => setState(() { + if (_selectedCategory?.id == category.id) { + _selectedCategory = null; + } else { + _selectedCategory = category; + } + updateCategoryList(); + store.dispatch(SaveTransactionSuccess( + transaction.rebuild((b) => b + ..pendingCategoryId = + _selectedCategory?.id))); + }), + ); + }, + ), ), ), + if (transaction.category.isNotEmpty && + _selectedCategory == null) + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, vertical: 12), + child: Text( + '${localization.defaultCategory}: ${transaction.category}', + textAlign: TextAlign.center, + style: TextStyle(color: Colors.grey), + ), + ), ], ), ), diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index bd85941b9f4..caba6ce1944 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -16,6 +16,7 @@ mixin LocalizationsProvider on LocaleCodeAware { static final Map> _localizedValues = { 'en': { // STARTER: lang key - do not remove comment + 'klarna': 'Klarna', 'convert_payment_currency_help': 'Set an exchange rate when entering a manual payment', 'convert_expense_currency_help': @@ -28,7 +29,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -2339,7 +2340,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -4666,7 +4667,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -6983,7 +6984,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Изтриване на проект', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -9317,7 +9318,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': '刪除專案', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -11616,7 +11617,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Izbriši projekt', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -13938,7 +13939,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -16258,7 +16259,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Slet projekt', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -18577,7 +18578,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Verwijder project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -20928,7 +20929,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -23246,7 +23247,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Kustuta Projekt', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -25566,7 +25567,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Poista projekti', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -27887,7 +27888,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Effacer le Projet', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -30233,7 +30234,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Supprimer le projet', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -32631,7 +32632,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Projekt löschen', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -35036,7 +35037,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Διαγραφή Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -37404,7 +37405,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'מחק פרויקט', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -39715,7 +39716,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Elimina Progetto', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -42059,7 +42060,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'プロジェクトを削除', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -44374,7 +44375,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -46693,7 +46694,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -49012,7 +49013,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Избриши проект', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -51336,7 +51337,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Slett Prosjekt', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -53655,7 +53656,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -55973,7 +55974,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Usuń projekt', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -58296,7 +58297,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Excluir Projeto', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -60633,7 +60634,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Apagar Projeto', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -62989,7 +62990,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Eliminați proiectul', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -65397,7 +65398,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -67717,7 +67718,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Obriši projekat', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -70044,7 +70045,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Zmazať projekt', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -72378,7 +72379,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Izbriši projekt', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -74699,7 +74700,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Eliminar Proyecto', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -77029,7 +77030,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Borrar Proyecto', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -79417,7 +79418,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Ta bort projekt', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -81751,7 +81752,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', @@ -84067,7 +84068,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'manual_payment_email_help': 'Send an email when manually entering a payment', 'mark_paid_payment_email_help': - 'Send an email when marking an invoice as pad', + 'Send an email when marking an invoice as paid', 'delete_project': 'Delete Project', 'linked_transaction': 'Successfully linked transaction', 'link_payment': 'Link Payment', diff --git a/macos/Podfile b/macos/Podfile index dade8dfad0d..fe733905db6 100644 --- a/macos/Podfile +++ b/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.11' +platform :osx, '10.13' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/macos/Podfile.lock b/macos/Podfile.lock index d2fce4c81f9..8d2e23af75e 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -105,6 +105,6 @@ SPEC CHECKSUMS: url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8 -PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c +PODFILE CHECKSUM: a884f6dd3f7494f3892ee6c81feea3a3abbf9153 COCOAPODS: 1.11.3 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index acaa1207ef4..9019108db1f 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -403,7 +403,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -421,14 +421,14 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 102; + CURRENT_PROJECT_VERSION = 103; DEVELOPMENT_TEAM = NPC44Y2C98; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 5.0.102; + MARKETING_VERSION = 5.0.103; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -486,7 +486,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -533,7 +533,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -551,14 +551,14 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 102; + CURRENT_PROJECT_VERSION = 103; DEVELOPMENT_TEAM = NPC44Y2C98; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 5.0.102; + MARKETING_VERSION = 5.0.103; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -575,14 +575,14 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 102; + CURRENT_PROJECT_VERSION = 103; DEVELOPMENT_TEAM = NPC44Y2C98; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 5.0.102; + MARKETING_VERSION = 5.0.103; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; diff --git a/pubspec.foss.yaml b/pubspec.foss.yaml index 9b97e9dd5c1..6b976b721a9 100644 --- a/pubspec.foss.yaml +++ b/pubspec.foss.yaml @@ -1,6 +1,6 @@ name: invoiceninja_flutter description: Client for Invoice Ninja -version: 5.0.102+102 +version: 5.0.103+103 homepage: https://invoiceninja.com documentation: https://invoiceninja.github.io publish_to: none diff --git a/pubspec.next.yaml b/pubspec.next.yaml index c4a9e4cd98d..d0cc4cee450 100644 --- a/pubspec.next.yaml +++ b/pubspec.next.yaml @@ -1,6 +1,6 @@ name: invoiceninja_flutter description: Client for Invoice Ninja -version: 5.0.102+102 +version: 5.0.103+103 homepage: https://invoiceninja.com documentation: https://invoiceninja.github.io publish_to: none diff --git a/pubspec.yaml b/pubspec.yaml index e8dbbeae610..b2e8eee2b0b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: invoiceninja_flutter description: Client for Invoice Ninja -version: 5.0.102+102 +version: 5.0.103+103 homepage: https://invoiceninja.com documentation: https://invoiceninja.github.io publish_to: none diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index bacfd42fb4e..d4b16c35e38 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: invoiceninja -version: '5.0.102' +version: '5.0.103' summary: Create invoices, accept payments, track expenses & time-tasks description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead