diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 71aae1c..375876f 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -44,7 +44,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.payu.flutter.demo" - minSdkVersion 19 + minSdkVersion flutter.minSdkVersion targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 9625e10..7c56964 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 444b4c9..42c8a1d 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,7 +1,8 @@ PODS: - Flutter (1.0.0) - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter + - FlutterMacOS - payu_mobile_payments_ios (0.0.1): - Flutter - url_launcher_ios (0.0.1): @@ -11,7 +12,7 @@ PODS: DEPENDENCIES: - Flutter (from `Flutter`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - payu_mobile_payments_ios (from `.symlinks/plugins/payu_mobile_payments_ios/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -19,8 +20,8 @@ DEPENDENCIES: EXTERNAL SOURCES: Flutter: :path: Flutter - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" payu_mobile_payments_ios: :path: ".symlinks/plugins/payu_mobile_payments_ios/ios" url_launcher_ios: @@ -29,12 +30,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" SPEC CHECKSUMS: - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c payu_mobile_payments_ios: 346266119d695d016bff3ec413602064de303bb6 - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b -COCOAPODS: 1.11.3 +COCOAPODS: 1.15.2 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 1e75459..02154e0 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -156,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -200,10 +200,12 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -214,6 +216,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -340,7 +343,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -414,7 +417,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -463,7 +466,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3db53b6..e67b280 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ + UIApplicationSupportsIndirectInputEvents + diff --git a/example/lib/apps/example_add_card_widget_app.dart b/example/lib/apps/example_add_card_widget_app.dart index 4195472..7cb13ef 100644 --- a/example/lib/apps/example_add_card_widget_app.dart +++ b/example/lib/apps/example_add_card_widget_app.dart @@ -17,7 +17,7 @@ void main() { } class HomePage extends StatefulWidget { - const HomePage({Key? key}) : super(key: key); + const HomePage({super.key}); @override State createState() => _HomePageState(); diff --git a/example/lib/apps/example_apple_pay_app.dart b/example/lib/apps/example_apple_pay_app.dart index 2942aa3..f8f7c6b 100644 --- a/example/lib/apps/example_apple_pay_app.dart +++ b/example/lib/apps/example_apple_pay_app.dart @@ -19,7 +19,7 @@ void main() { } class HomePage extends StatefulWidget { - const HomePage({Key? key}) : super(key: key); + const HomePage({super.key}); @override State createState() => _HomePageState(); diff --git a/example/lib/apps/example_mastercard_installments_app.dart b/example/lib/apps/example_mastercard_installments_app.dart index 23e962f..d9fa56a 100644 --- a/example/lib/apps/example_mastercard_installments_app.dart +++ b/example/lib/apps/example_mastercard_installments_app.dart @@ -17,7 +17,7 @@ void main() { } class HomePage extends StatelessWidget { - const HomePage({Key? key}) : super(key: key); + const HomePage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/apps/example_terms_and_conditions_app.dart b/example/lib/apps/example_terms_and_conditions_app.dart index c597117..13af8e1 100644 --- a/example/lib/apps/example_terms_and_conditions_app.dart +++ b/example/lib/apps/example_terms_and_conditions_app.dart @@ -17,7 +17,7 @@ void main() { } class HomePage extends StatelessWidget { - const HomePage({Key? key}) : super(key: key); + const HomePage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/apps/example_three_ds_soft_accept_app.dart b/example/lib/apps/example_three_ds_soft_accept_app.dart index b3a79f8..ebc571a 100644 --- a/example/lib/apps/example_three_ds_soft_accept_app.dart +++ b/example/lib/apps/example_three_ds_soft_accept_app.dart @@ -17,7 +17,7 @@ void main() { } class HomePage extends StatelessWidget { - const HomePage({Key? key}) : super(key: key); + const HomePage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/demo_add_card_widget/demo_add_card_widget_page.dart b/example/lib/features/demo_add_card_widget/demo_add_card_widget_page.dart index c8eb800..b79e5c7 100644 --- a/example/lib/features/demo_add_card_widget/demo_add_card_widget_page.dart +++ b/example/lib/features/demo_add_card_widget/demo_add_card_widget_page.dart @@ -6,7 +6,7 @@ import 'package:payu/payu.dart'; import 'package:example/features/demo_add_card_widget/demo_add_card_widget_controller.dart'; class DemoAddCardWidgetPage extends GetView { - const DemoAddCardWidgetPage({Key? key}) : super(key: key); + const DemoAddCardWidgetPage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/demo_features/demo_features_page.dart b/example/lib/features/demo_features/demo_features_page.dart index 312a89a..a1ba406 100644 --- a/example/lib/features/demo_features/demo_features_page.dart +++ b/example/lib/features/demo_features/demo_features_page.dart @@ -5,7 +5,7 @@ import 'package:get/get.dart'; import 'package:payu/payu.dart'; class DemoFeaturesPage extends GetView { - const DemoFeaturesPage({Key? key}) : super(key: key); + const DemoFeaturesPage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/demo_payment_widget/demo_payment_widget_page.dart b/example/lib/features/demo_payment_widget/demo_payment_widget_page.dart index 9154bb0..3a6048a 100644 --- a/example/lib/features/demo_payment_widget/demo_payment_widget_page.dart +++ b/example/lib/features/demo_payment_widget/demo_payment_widget_page.dart @@ -5,7 +5,7 @@ import 'package:get/get.dart'; import 'package:payu/payu.dart'; class DemoPaymentWidgetPage extends GetView implements PaymentMethodsListener { - const DemoPaymentWidgetPage({Key? key}) : super(key: key); + const DemoPaymentWidgetPage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/demo_terms_and_conditions/demo_terms_and_conditions_page.dart b/example/lib/features/demo_terms_and_conditions/demo_terms_and_conditions_page.dart index 4d5629b..609de3b 100644 --- a/example/lib/features/demo_terms_and_conditions/demo_terms_and_conditions_page.dart +++ b/example/lib/features/demo_terms_and_conditions/demo_terms_and_conditions_page.dart @@ -6,7 +6,7 @@ import 'package:payu/payu.dart'; import 'package:example/features/demo_terms_and_conditions/demo_terms_and_conditions_controller.dart'; class DemoTermsAndConditionsPage extends GetView { - const DemoTermsAndConditionsPage({Key? key}) : super(key: key); + const DemoTermsAndConditionsPage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/demo_theme/demo_theme_page.dart b/example/lib/features/demo_theme/demo_theme_page.dart index 802bf71..e9411f3 100644 --- a/example/lib/features/demo_theme/demo_theme_page.dart +++ b/example/lib/features/demo_theme/demo_theme_page.dart @@ -8,7 +8,7 @@ import 'package:example/features/demo_theme/demo_theme_controller.dart'; class DemoThemePage extends GetView { static const _awesomeColor = Colors.amber; - const DemoThemePage({Key? key}) : super(key: key); + const DemoThemePage({super.key}); @override Widget build(BuildContext context) { @@ -24,7 +24,7 @@ class DemoThemePage extends GetView { colorScheme: theme.colorScheme.copyWith(primary: _awesomeColor), ), child: Scaffold( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.surface, appBar: AppBar( title: PayuImage.logo(), leading: IconButton( diff --git a/example/lib/features/demo_web_payments_secure/demo_web_payments_secure_page.dart b/example/lib/features/demo_web_payments_secure/demo_web_payments_secure_page.dart index 02b64eb..95ed067 100644 --- a/example/lib/features/demo_web_payments_secure/demo_web_payments_secure_page.dart +++ b/example/lib/features/demo_web_payments_secure/demo_web_payments_secure_page.dart @@ -6,7 +6,7 @@ import 'package:payu/payu.dart'; import 'package:example/features/demo_web_payments_secure/demo_web_payments_secure_controller.dart'; class DemoWebPaymentsSecurePage extends GetView { - const DemoWebPaymentsSecurePage({Key? key}) : super(key: key); + const DemoWebPaymentsSecurePage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/environments_create/environments_create_page.dart b/example/lib/features/environments_create/environments_create_page.dart index b2b0090..1625d33 100644 --- a/example/lib/features/environments_create/environments_create_page.dart +++ b/example/lib/features/environments_create/environments_create_page.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; class EnvironmentsCreatePage extends GetView { - const EnvironmentsCreatePage({Key? key}) : super(key: key); + const EnvironmentsCreatePage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/example/backend/api/api.g.dart b/example/lib/features/example/backend/api/api.g.dart index 4011761..397f3ec 100644 --- a/example/lib/features/example/backend/api/api.g.dart +++ b/example/lib/features/example/backend/api/api.g.dart @@ -23,7 +23,7 @@ class _Api implements Api { String contentType, AuthorizationBody body, ) async { - const _extra = {}; + final _extra = {}; final queryParameters = {}; final _headers = {r'Content-Type': contentType}; _headers.removeWhere((k, v) => v == null); @@ -53,11 +53,11 @@ class _Api implements Api { @override Future getPaymentMethods(String contentType) async { - const _extra = {}; + final _extra = {}; final queryParameters = {}; final _headers = {r'Content-Type': contentType}; _headers.removeWhere((k, v) => v == null); - final Map? _data = null; + const Map? _data = null; final _result = await _dio.fetch>( _setStreamType(Options( method: 'GET', @@ -85,7 +85,7 @@ class _Api implements Api { String contentType, OrderCreateRequest request, ) async { - const _extra = {}; + final _extra = {}; final queryParameters = {}; final _headers = {r'Content-Type': contentType}; _headers.removeWhere((k, v) => v == null); @@ -116,10 +116,10 @@ class _Api implements Api { @override Future getCardInstallmentProposals( String proposalId) async { - const _extra = {}; + final _extra = {}; final queryParameters = {}; final _headers = {}; - final Map? _data = null; + const Map? _data = null; final _result = await _dio.fetch>( _setStreamType(Options( method: 'GET', @@ -146,7 +146,7 @@ class _Api implements Api { String proposalId, InstallmentResult decision, ) async { - const _extra = {}; + final _extra = {}; final queryParameters = {}; final _headers = {}; final _data = {}; @@ -171,10 +171,10 @@ class _Api implements Api { @override Future getTransactions(String orderId) async { - const _extra = {}; + final _extra = {}; final queryParameters = {}; final _headers = {}; - final Map? _data = null; + const Map? _data = null; final _result = await _dio.fetch>( _setStreamType(Options( method: 'GET', diff --git a/example/lib/features/example/backend/api/interceptors/error_interceptor.dart b/example/lib/features/example/backend/api/interceptors/error_interceptor.dart index e88e3fe..ca5cd8c 100644 --- a/example/lib/features/example/backend/api/interceptors/error_interceptor.dart +++ b/example/lib/features/example/backend/api/interceptors/error_interceptor.dart @@ -2,11 +2,11 @@ import 'package:dio/dio.dart'; import 'package:example/data/models/request_response.dart'; -class _ErrorInterceptorDioError extends DioError { +class _ErrorInterceptorDioError extends DioException { _ErrorInterceptorDioError({ - required RequestOptions requestOptions, - required dynamic error, - }) : super(requestOptions: requestOptions, error: error); + required super.requestOptions, + required dynamic super.error, + }); @override String toString() => error.toString(); @@ -14,7 +14,7 @@ class _ErrorInterceptorDioError extends DioError { class ErrorInterceptor extends InterceptorsWrapper { @override - void onError(DioError err, ErrorInterceptorHandler handler) { + void onError(DioException err, ErrorInterceptorHandler handler) { if (err.response != null) { if (err.response?.data is Map) { final json = err.response?.data as Map; diff --git a/example/lib/features/example/features/checkout/example_checkout_page.dart b/example/lib/features/example/features/checkout/example_checkout_page.dart index 16e3cfa..5e69778 100644 --- a/example/lib/features/example/features/checkout/example_checkout_page.dart +++ b/example/lib/features/example/features/checkout/example_checkout_page.dart @@ -5,7 +5,7 @@ import 'package:get/get.dart'; import 'package:example/features/example/features/checkout/example_checkout_controller.dart'; class ExampleCheckoutPage extends GetView { - const ExampleCheckoutPage({Key? key}) : super(key: key); + const ExampleCheckoutPage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/example/features/method/blik/example_blik_alert_dialog.dart b/example/lib/features/example/features/method/blik/example_blik_alert_dialog.dart index d35eaf6..2010b1a 100644 --- a/example/lib/features/example/features/method/blik/example_blik_alert_dialog.dart +++ b/example/lib/features/example/features/method/blik/example_blik_alert_dialog.dart @@ -7,7 +7,7 @@ import 'package:example/features/example/features/method/blik/example_blik_alert class ExampleBlikAlertDialog extends StatelessWidget { final _controller = ExampleBlikAlertDialogController(); - ExampleBlikAlertDialog({Key? key}) : super(key: key); + ExampleBlikAlertDialog({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/example/features/method/example_method_page.dart b/example/lib/features/example/features/method/example_method_page.dart index 4c4beb3..f0c3e8c 100644 --- a/example/lib/features/example/features/method/example_method_page.dart +++ b/example/lib/features/example/features/method/example_method_page.dart @@ -5,7 +5,7 @@ import 'package:get/get.dart'; import 'package:example/features/example/features/method/example_method_controller.dart'; class ExampleMethodPage extends GetView { - const ExampleMethodPage({Key? key}) : super(key: key); + const ExampleMethodPage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/example/features/order/example_order_page.dart b/example/lib/features/example/features/order/example_order_page.dart index d58503e..b366492 100644 --- a/example/lib/features/example/features/order/example_order_page.dart +++ b/example/lib/features/example/features/order/example_order_page.dart @@ -5,7 +5,7 @@ import 'package:get/get.dart'; import './example_order_controller.dart'; class ExampleOrderPage extends GetView { - const ExampleOrderPage({Key? key}) : super(key: key); + const ExampleOrderPage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/example/features/products/example_products_page.dart b/example/lib/features/example/features/products/example_products_page.dart index 5d966a9..510cbc8 100644 --- a/example/lib/features/example/features/products/example_products_page.dart +++ b/example/lib/features/example/features/products/example_products_page.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; class ExampleProductsPage extends GetView { - const ExampleProductsPage({Key? key}) : super(key: key); + const ExampleProductsPage({super.key}); @override Widget build(BuildContext context) { @@ -35,10 +35,9 @@ class _ProductListTile extends StatelessWidget { final ExampleProductsController controller; const _ProductListTile({ - Key? key, required this.product, required this.controller, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/example/lib/features/example/features/test_cards/example_test_cards_page.dart b/example/lib/features/example/features/test_cards/example_test_cards_page.dart index 8d74d97..2f6df30 100644 --- a/example/lib/features/example/features/test_cards/example_test_cards_page.dart +++ b/example/lib/features/example/features/test_cards/example_test_cards_page.dart @@ -6,7 +6,7 @@ import 'package:payu/payu.dart'; import 'package:example/features/example/features/test_cards/example_test_cards_controller.dart'; class ExampleTestCardsPage extends GetView { - const ExampleTestCardsPage({Key? key}) : super(key: key); + const ExampleTestCardsPage({super.key}); @override Widget build(BuildContext context) { diff --git a/example/lib/features/settings/settings_page.dart b/example/lib/features/settings/settings_page.dart index 66922b1..58df0d6 100644 --- a/example/lib/features/settings/settings_page.dart +++ b/example/lib/features/settings/settings_page.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; class SettingsPage extends GetView { - const SettingsPage({Key? key}) : super(key: key); + const SettingsPage({super.key}); @override Widget build(BuildContext context) { @@ -31,10 +31,9 @@ class _SettingsListTile extends StatelessWidget { final VoidCallback onPressed; const _SettingsListTile({ - Key? key, required this.model, required this.onPressed, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/example/pubspec.lock b/example/pubspec.lock index 9b8acb4..a72441d 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -77,10 +77,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21" + sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" url: "https://pub.dev" source: hosted - version: "2.4.8" + version: "2.4.9" build_runner_core: dependency: transitive description: @@ -234,10 +234,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "4.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -380,34 +380,34 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lints: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" logging: dependency: transitive description: @@ -436,10 +436,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mime: dependency: transitive description: @@ -526,49 +526,49 @@ packages: path: "../payu" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_add_card: dependency: transitive description: path: "../payu_add_card" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_api: dependency: transitive description: path: "../payu_api" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_core: dependency: transitive description: path: "../payu_core" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_interface: dependency: transitive description: path: "../payu_interface" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_mastercard_installments: dependency: transitive description: path: "../payu_mastercard_installments" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_mobile_payments: dependency: transitive description: path: "../payu_mobile_payments/payu_mobile_payments" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_mobile_payments_android: dependency: transitive description: @@ -596,49 +596,49 @@ packages: path: "../payu_payment_methods" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_state_management: dependency: transitive description: path: "../payu_state_management" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_terms_and_conditions: dependency: transitive description: path: "../payu_terms_and_conditions" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_three_ds: dependency: transitive description: path: "../payu_three_ds" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_translations: dependency: transitive description: path: "../payu_translations" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_ui: dependency: transitive description: path: "../payu_ui" relative: true source: path - version: "1.0.1" + version: "1.0.2" payu_web_payments: dependency: transitive description: path: "../payu_web_payments" relative: true source: path - version: "1.0.1" + version: "1.0.2" platform: dependency: transitive description: @@ -800,10 +800,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -904,10 +904,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" watcher: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index cde97f7..4811425 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -3,7 +3,7 @@ description: A new Flutter project. publish_to: 'none' version: 1.0.2 environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: collection: ^1.18.0 @@ -22,8 +22,8 @@ dependencies: path: payu retrofit: ^4.1.0 dev_dependencies: - build_runner: ^2.4.8 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter hive_generator: ^2.0.1 diff --git a/payu/pubspec.yaml b/payu/pubspec.yaml index 212c4dc..dd2d165 100644 --- a/payu/pubspec.yaml +++ b/payu/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -59,9 +59,9 @@ dependencies: url: https://github.com/PayU-EMEA/PayU-Flutter.git path: payu_ui dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter flutter: diff --git a/payu_add_card/lib/src/page/add_card_page.dart b/payu_add_card/lib/src/page/add_card_page.dart index cef4300..714c4f5 100644 --- a/payu_add_card/lib/src/page/add_card_page.dart +++ b/payu_add_card/lib/src/page/add_card_page.dart @@ -12,7 +12,7 @@ import 'add_card_page_assembler.dart'; import 'add_card_page_controller.dart'; class AddCardPage extends StatefulWidget { - const AddCardPage({Key? key}) : super(key: key); + const AddCardPage({super.key}); @override State createState() => _AddCardPageState(); @@ -24,7 +24,7 @@ class _AddCardPageState extends State with AddCardPageControllerDel return PayuWidget( assembler: () => AddCardPageAssembler(this), builder: (context, controller) => Scaffold( - backgroundColor: Theme.of(context).colorScheme.background, + backgroundColor: Theme.of(context).colorScheme.surface, appBar: AppBar( title: PayuImage.logo(), ), diff --git a/payu_add_card/lib/src/widget/add_card_widget.dart b/payu_add_card/lib/src/widget/add_card_widget.dart index 62547fa..955d870 100644 --- a/payu_add_card/lib/src/widget/add_card_widget.dart +++ b/payu_add_card/lib/src/widget/add_card_widget.dart @@ -17,10 +17,10 @@ class AddCardWidget extends StatelessWidget { final Function(AddCardService) onCreated; const AddCardWidget({ - Key? key, + super.key, required this.configuration, required this.onCreated, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -44,7 +44,7 @@ class AddCardWidget extends StatelessWidget { children: [ Text( 'new_card'.translated(), - style: Theme.of(context).textTheme.caption, + style: Theme.of(context).textTheme.bodySmall, ), Expanded( child: Padding( diff --git a/payu_add_card/lib/src/widget/widgets/add_card_text_field.dart b/payu_add_card/lib/src/widget/widgets/add_card_text_field.dart index 4c9543b..9798ff9 100644 --- a/payu_add_card/lib/src/widget/widgets/add_card_text_field.dart +++ b/payu_add_card/lib/src/widget/widgets/add_card_text_field.dart @@ -11,10 +11,10 @@ class AddCardTextField extends StatelessWidget { final AddCardWidgetTextInputDecoration decoration; const AddCardTextField({ - Key? key, + super.key, required this.controller, required this.decoration, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/payu_add_card/pubspec.yaml b/payu_add_card/pubspec.yaml index cde6ccb..ba6ac67 100644 --- a/payu_add_card/pubspec.yaml +++ b/payu_add_card/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -36,9 +36,9 @@ dependencies: url: https://github.com/PayU-EMEA/PayU-Flutter.git path: payu_ui dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter http: ^1.2.1 diff --git a/payu_api/pubspec.yaml b/payu_api/pubspec.yaml index a0dbcc7..788a61e 100644 --- a/payu_api/pubspec.yaml +++ b/payu_api/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -16,9 +16,9 @@ dependencies: url: https://github.com/PayU-EMEA/PayU-Flutter.git path: payu_core dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter flutter: diff --git a/payu_core/pubspec.yaml b/payu_core/pubspec.yaml index 67495c1..85138ba 100644 --- a/payu_core/pubspec.yaml +++ b/payu_core/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -16,9 +16,9 @@ dependencies: path: payu_interface url_launcher: ^6.1.6 dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter flutter: diff --git a/payu_interface/pubspec.yaml b/payu_interface/pubspec.yaml index 6b57093..cddd943 100644 --- a/payu_interface/pubspec.yaml +++ b/payu_interface/pubspec.yaml @@ -8,13 +8,13 @@ homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 flutter: diff --git a/payu_mastercard_installments/lib/src/core/widgets/installments_header_widget.dart b/payu_mastercard_installments/lib/src/core/widgets/installments_header_widget.dart index c69c533..f7c6cd2 100644 --- a/payu_mastercard_installments/lib/src/core/widgets/installments_header_widget.dart +++ b/payu_mastercard_installments/lib/src/core/widgets/installments_header_widget.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; class InstallmentsHeaderWidget extends StatelessWidget { - const InstallmentsHeaderWidget({Key? key}) : super(key: key); + const InstallmentsHeaderWidget({super.key}); @override Widget build(BuildContext context) { diff --git a/payu_mastercard_installments/lib/src/pages/offer/installments_offer_page.dart b/payu_mastercard_installments/lib/src/pages/offer/installments_offer_page.dart index 24b7b17..0dd543a 100644 --- a/payu_mastercard_installments/lib/src/pages/offer/installments_offer_page.dart +++ b/payu_mastercard_installments/lib/src/pages/offer/installments_offer_page.dart @@ -11,14 +11,14 @@ import 'installments_offer_controller.dart'; class InstallmentsOfferPage extends StatelessWidget { final InstallmentProposal proposal; - const InstallmentsOfferPage({Key? key, required this.proposal}) : super(key: key); + const InstallmentsOfferPage({super.key, required this.proposal}); @override Widget build(BuildContext context) { return PayuWidget( assembler: () => InstallmentsOfferAssembler(proposal), builder: (context, controller) => Scaffold( - backgroundColor: Theme.of(context).colorScheme.background, + backgroundColor: Theme.of(context).colorScheme.surface, appBar: AppBar( title: PayuImage.logo(), ), diff --git a/payu_mastercard_installments/lib/src/pages/options/installments_options_list_tile.dart b/payu_mastercard_installments/lib/src/pages/options/installments_options_list_tile.dart index f9b7eef..ab5b22b 100644 --- a/payu_mastercard_installments/lib/src/pages/options/installments_options_list_tile.dart +++ b/payu_mastercard_installments/lib/src/pages/options/installments_options_list_tile.dart @@ -8,7 +8,7 @@ class InstallmentsOptionsListTile extends StatelessWidget { final InstallmentsOptionsListTileData data; final Function(InstallmentOption) onTap; - const InstallmentsOptionsListTile({Key? key, required this.data, required this.onTap}) : super(key: key); + const InstallmentsOptionsListTile({super.key, required this.data, required this.onTap}); @override Widget build(BuildContext context) { @@ -29,7 +29,7 @@ class InstallmentsOptionsListTile extends StatelessWidget { ), title: Text( data.title, - style: Theme.of(context).textTheme.bodyText1?.copyWith(fontWeight: FontWeight.bold), + style: Theme.of(context).textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.bold), ), trailing: Wrap( direction: Axis.vertical, @@ -42,7 +42,7 @@ class InstallmentsOptionsListTile extends StatelessWidget { if (data.prefix != null) Text(data.prefix!), Text( data.subtitle, - style: Theme.of(context).textTheme.bodyText1?.copyWith(fontWeight: FontWeight.bold), + style: Theme.of(context).textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.bold), ), ], ), diff --git a/payu_mastercard_installments/lib/src/pages/options/installments_options_page.dart b/payu_mastercard_installments/lib/src/pages/options/installments_options_page.dart index ffa4355..687078e 100644 --- a/payu_mastercard_installments/lib/src/pages/options/installments_options_page.dart +++ b/payu_mastercard_installments/lib/src/pages/options/installments_options_page.dart @@ -13,14 +13,14 @@ import 'installments_options_list_tile.dart'; class InstallmentsOptionsPage extends StatelessWidget { final InstallmentProposal proposal; - const InstallmentsOptionsPage({Key? key, required this.proposal}) : super(key: key); + const InstallmentsOptionsPage({super.key, required this.proposal}); @override Widget build(BuildContext context) { return PayuWidget( assembler: () => InstallmentsOptionsAssembler(proposal), builder: (context, controller) => Scaffold( - backgroundColor: Theme.of(context).colorScheme.background, + backgroundColor: Theme.of(context).colorScheme.surface, appBar: AppBar( title: PayuImage.logo(), ), diff --git a/payu_mastercard_installments/pubspec.yaml b/payu_mastercard_installments/pubspec.yaml index a6ff6c2..ff9250c 100644 --- a/payu_mastercard_installments/pubspec.yaml +++ b/payu_mastercard_installments/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: collection: ^1.18.0 @@ -25,9 +25,9 @@ dependencies: url: https://github.com/PayU-EMEA/PayU-Flutter.git path: payu_ui dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter mockito: ^5.3.2 diff --git a/payu_mobile_payments/payu_mobile_payments/pubspec.yaml b/payu_mobile_payments/payu_mobile_payments/pubspec.yaml index 4dc4bb3..139c3b7 100644 --- a/payu_mobile_payments/payu_mobile_payments/pubspec.yaml +++ b/payu_mobile_payments/payu_mobile_payments/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -23,9 +23,9 @@ dependencies: url: https://github.com/PayU-EMEA/PayU-Flutter.git path: payu_mobile_payments/payu_mobile_payments_platform_interface dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter flutter: diff --git a/payu_mobile_payments/payu_mobile_payments_android/pubspec.yaml b/payu_mobile_payments/payu_mobile_payments_android/pubspec.yaml index 660b2a6..c3b1daf 100644 --- a/payu_mobile_payments/payu_mobile_payments_android/pubspec.yaml +++ b/payu_mobile_payments/payu_mobile_payments_android/pubspec.yaml @@ -8,7 +8,7 @@ homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: @@ -16,9 +16,9 @@ dependencies: sdk: flutter dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter: plugin: diff --git a/payu_mobile_payments/payu_mobile_payments_ios/pubspec.yaml b/payu_mobile_payments/payu_mobile_payments_ios/pubspec.yaml index 1987e18..374c6be 100644 --- a/payu_mobile_payments/payu_mobile_payments_ios/pubspec.yaml +++ b/payu_mobile_payments/payu_mobile_payments_ios/pubspec.yaml @@ -8,7 +8,7 @@ homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: @@ -16,9 +16,9 @@ dependencies: sdk: flutter dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter: plugin: diff --git a/payu_mobile_payments/payu_mobile_payments_platform_interface/pubspec.yaml b/payu_mobile_payments/payu_mobile_payments_platform_interface/pubspec.yaml index 2c7efe5..4c48f18 100644 --- a/payu_mobile_payments/payu_mobile_payments_platform_interface/pubspec.yaml +++ b/payu_mobile_payments/payu_mobile_payments_platform_interface/pubspec.yaml @@ -8,7 +8,7 @@ homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: @@ -16,9 +16,9 @@ dependencies: sdk: flutter dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter diff --git a/payu_payment_methods/lib/src/features/payment_methods/payment_methods_page.dart b/payu_payment_methods/lib/src/features/payment_methods/payment_methods_page.dart index 8eac821..4b19be8 100644 --- a/payu_payment_methods/lib/src/features/payment_methods/payment_methods_page.dart +++ b/payu_payment_methods/lib/src/features/payment_methods/payment_methods_page.dart @@ -18,11 +18,11 @@ class PaymentMethodsPage extends StatefulWidget { final PaymentMethodsStorage storage; const PaymentMethodsPage({ - Key? key, + super.key, required this.configuration, required this.listener, required this.storage, - }) : super(key: key); + }); @override State createState() => _PaymentMethodsPageState(); @@ -37,7 +37,7 @@ class _PaymentMethodsPageState extends State implements Paym return PayuWidget( assembler: () => assembler, builder: (context, controller) => Scaffold( - backgroundColor: Theme.of(context).colorScheme.background, + backgroundColor: Theme.of(context).colorScheme.surface, appBar: AppBar( title: PayuImage.logo(), ), @@ -98,11 +98,10 @@ class _DismissibleListTile extends StatelessWidget { final Function(DismissDirection) onDismissed; const _DismissibleListTile({ - Key? key, required this.value, required this.onTap, required this.onDismissed, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -134,7 +133,7 @@ class _ListTile extends StatelessWidget { final PaymentMethodsItem value; final VoidCallback onTap; - const _ListTile({Key? key, required this.value, required this.onTap}) : super(key: key); + const _ListTile({required this.value, required this.onTap}); @override Widget build(BuildContext context) { diff --git a/payu_payment_methods/lib/src/features/pbl_payment_methods/pbl_payment_methods_page.dart b/payu_payment_methods/lib/src/features/pbl_payment_methods/pbl_payment_methods_page.dart index 673320b..de09032 100644 --- a/payu_payment_methods/lib/src/features/pbl_payment_methods/pbl_payment_methods_page.dart +++ b/payu_payment_methods/lib/src/features/pbl_payment_methods/pbl_payment_methods_page.dart @@ -10,14 +10,14 @@ import 'pbl_payment_methods_controller.dart'; class PBLPaymentMethodsPage extends StatelessWidget { final PaymentMethodsConfiguration configuration; - const PBLPaymentMethodsPage({Key? key, required this.configuration}) : super(key: key); + const PBLPaymentMethodsPage({super.key, required this.configuration}); @override Widget build(BuildContext context) { return PayuWidget( assembler: () => PBLPaymentMethodsAssembler(configuration), builder: (context, controller) => Scaffold( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.surface, appBar: AppBar( title: PayuImage.logo(), ), diff --git a/payu_payment_methods/lib/src/features/widget/payment_widget.dart b/payu_payment_methods/lib/src/features/widget/payment_widget.dart index 7e719a7..9d4beca 100644 --- a/payu_payment_methods/lib/src/features/widget/payment_widget.dart +++ b/payu_payment_methods/lib/src/features/widget/payment_widget.dart @@ -22,20 +22,20 @@ class PaymentMethodsWidget extends StatelessWidget { final Function(PaymentMethod) onSelect; const PaymentMethodsWidget({ - Key? key, + super.key, required this.configuration, required this.service, required this.storage, required this.listener, required this.onSelect, - }) : super(key: key); + }); @override Widget build(BuildContext context) { return PayuWidget( assembler: () => PaymentWidgetAssembler(configuration, service, storage, listener), builder: (context, controller) => Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.surface, child: Padding( padding: const EdgeInsets.symmetric( horizontal: PayuPadding.padding4, @@ -87,7 +87,7 @@ class PaymentMethodsWidget extends StatelessWidget { } class _Logo extends StatelessWidget { - const _Logo({Key? key}) : super(key: key); + const _Logo(); @override Widget build(BuildContext context) { @@ -96,7 +96,7 @@ class _Logo extends StatelessWidget { } class _Divider extends StatelessWidget { - const _Divider({Key? key}) : super(key: key); + const _Divider(); @override Widget build(BuildContext context) { @@ -114,7 +114,7 @@ class _Divider extends StatelessWidget { class _Empty extends StatelessWidget { final PaymentWidgetController controller; - const _Empty({Key? key, required this.controller}) : super(key: key); + const _Empty({required this.controller}); @override Widget build(BuildContext context) { @@ -122,7 +122,7 @@ class _Empty extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 8.0), child: Text( 'select_payment_method'.translated(), - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, overflow: TextOverflow.ellipsis, maxLines: 1, ), @@ -133,7 +133,7 @@ class _Empty extends StatelessWidget { class _Icon extends StatelessWidget { final PaymentWidgetController controller; - const _Icon({Key? key, required this.controller}) : super(key: key); + const _Icon({required this.controller}); @override Widget build(BuildContext context) { @@ -150,7 +150,7 @@ class _Icon extends StatelessWidget { class _Info extends StatelessWidget { final PaymentWidgetController controller; - const _Info({Key? key, required this.controller}) : super(key: key); + const _Info({required this.controller}); @override Widget build(BuildContext context) { @@ -165,7 +165,7 @@ class _Info extends StatelessWidget { Flexible( child: Text( controller.name ?? '', - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, overflow: TextOverflow.ellipsis, maxLines: 2, ), @@ -173,7 +173,7 @@ class _Info extends StatelessWidget { if (controller.description != null) Text( controller.description!, - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, overflow: TextOverflow.ellipsis, maxLines: 1, ) @@ -187,7 +187,7 @@ class _Info extends StatelessWidget { class _Arrow extends StatelessWidget { final PaymentWidgetController controller; - const _Arrow({Key? key, required this.controller}) : super(key: key); + const _Arrow({required this.controller}); @override Widget build(BuildContext context) { @@ -204,7 +204,7 @@ class _Arrow extends StatelessWidget { class _BlikCode extends StatelessWidget { final PaymentWidgetController controller; - const _BlikCode({Key? key, required this.controller}) : super(key: key); + const _BlikCode({required this.controller}); @override Widget build(BuildContext context) { @@ -225,7 +225,7 @@ class _BlikCode extends StatelessWidget { class _BlikToken extends StatelessWidget { final PaymentWidgetController controller; - const _BlikToken({Key? key, required this.controller}) : super(key: key); + const _BlikToken({required this.controller}); @override Widget build(BuildContext context) { diff --git a/payu_payment_methods/pubspec.yaml b/payu_payment_methods/pubspec.yaml index b8597bc..db1ed23 100644 --- a/payu_payment_methods/pubspec.yaml +++ b/payu_payment_methods/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: collection: ^1.18.0 @@ -32,9 +32,9 @@ dependencies: url: https://github.com/PayU-EMEA/PayU-Flutter.git path: payu_ui dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter mockito: ^5.3.2 diff --git a/payu_state_management/lib/src/payu_widget.dart b/payu_state_management/lib/src/payu_widget.dart index 711a0a1..56e35d4 100644 --- a/payu_state_management/lib/src/payu_widget.dart +++ b/payu_state_management/lib/src/payu_widget.dart @@ -10,7 +10,7 @@ class PayuWidget extends Stat final E Function() assembler; final Widget Function(BuildContext context, T controller) builder; - const PayuWidget({Key? key, required this.assembler, required this.builder}) : super(key: key); + const PayuWidget({super.key, required this.assembler, required this.builder}); @override // ignore: library_private_types_in_public_api diff --git a/payu_state_management/pubspec.yaml b/payu_state_management/pubspec.yaml index 8faec00..5f7079e 100644 --- a/payu_state_management/pubspec.yaml +++ b/payu_state_management/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -21,8 +21,8 @@ dependencies: path: payu_ui provider: ^6.0.3 dev_dependencies: - build_runner: ^2.4.8 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter flutter: diff --git a/payu_terms_and_conditions/lib/src/terms_and_conditions_widget.dart b/payu_terms_and_conditions/lib/src/terms_and_conditions_widget.dart index fdf75cc..7e8aa37 100644 --- a/payu_terms_and_conditions/lib/src/terms_and_conditions_widget.dart +++ b/payu_terms_and_conditions/lib/src/terms_and_conditions_widget.dart @@ -8,7 +8,7 @@ import 'terms_and_conditions_assembler.dart'; import 'terms_and_conditions_controller.dart'; class TermsAndConditionsWidget extends StatelessWidget { - const TermsAndConditionsWidget({Key? key}) : super(key: key); + const TermsAndConditionsWidget({super.key}); @override Widget build(BuildContext context) { @@ -18,7 +18,7 @@ class TermsAndConditionsWidget extends StatelessWidget { width: MediaQuery.of(context).size.width, child: InkWell( child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.surface, child: Padding( padding: const EdgeInsets.all(PayuPadding.padding16), child: RichText( @@ -26,15 +26,15 @@ class TermsAndConditionsWidget extends StatelessWidget { children: [ TextSpan( text: 'i_accept'.translated(), - style: Theme.of(context).textTheme.caption, + style: Theme.of(context).textTheme.bodySmall, ), TextSpan( text: ' ', - style: Theme.of(context).textTheme.caption, + style: Theme.of(context).textTheme.bodySmall, ), TextSpan( text: 'pay_u_payment_terms'.translated(), - style: Theme.of(context).textTheme.caption?.copyWith(color: Theme.of(context).primaryColor), + style: Theme.of(context).textTheme.bodySmall?.copyWith(color: Theme.of(context).primaryColor), ), ], ), diff --git a/payu_terms_and_conditions/pubspec.yaml b/payu_terms_and_conditions/pubspec.yaml index 2fad8a8..21e0004 100644 --- a/payu_terms_and_conditions/pubspec.yaml +++ b/payu_terms_and_conditions/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -27,9 +27,9 @@ dependencies: url: https://github.com/PayU-EMEA/PayU-Flutter.git path: payu_ui dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter mockito: ^5.3.2 diff --git a/payu_three_ds/lib/src/soft_accept/soft_accept_alert_dialog.dart b/payu_three_ds/lib/src/soft_accept/soft_accept_alert_dialog.dart index 8b382f5..c13c92a 100644 --- a/payu_three_ds/lib/src/soft_accept/soft_accept_alert_dialog.dart +++ b/payu_three_ds/lib/src/soft_accept/soft_accept_alert_dialog.dart @@ -11,7 +11,7 @@ import 'soft_accept_controller.dart'; class SoftAcceptAlertDialog extends StatelessWidget { final SoftAcceptRequest request; - const SoftAcceptAlertDialog({Key? key, required this.request}) : super(key: key); + const SoftAcceptAlertDialog({super.key, required this.request}); @override Widget build(BuildContext context) { diff --git a/payu_three_ds/pubspec.yaml b/payu_three_ds/pubspec.yaml index d9e12cd..77b94ce 100644 --- a/payu_three_ds/pubspec.yaml +++ b/payu_three_ds/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -28,9 +28,10 @@ dependencies: path: payu_translations webview_flutter: ^3.0.4 dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter mockito: ^5.3.2 + webview_flutter_platform_interface: any diff --git a/payu_translations/pubspec.yaml b/payu_translations/pubspec.yaml index 45a3742..3596bbd 100644 --- a/payu_translations/pubspec.yaml +++ b/payu_translations/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: collection: ^1.18.0 @@ -16,9 +16,9 @@ dependencies: url: https://github.com/PayU-EMEA/PayU-Flutter.git path: payu_core dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter: assets: - assets/lang/ diff --git a/payu_ui/lib/src/theme/theme_data_factory.dart b/payu_ui/lib/src/theme/theme_data_factory.dart index 71999b9..8aeca93 100644 --- a/payu_ui/lib/src/theme/theme_data_factory.dart +++ b/payu_ui/lib/src/theme/theme_data_factory.dart @@ -22,14 +22,13 @@ class ThemeDataFactory { static ThemeData _data(ThemeColorsPallete pallete) { return ThemeData( appBarTheme: _appBarTheme(pallete), - backgroundColor: pallete.secondaryGray4, buttonTheme: _buttonTheme(pallete), cardTheme: _cardTheme(pallete), - colorScheme: _colorScheme(pallete), dialogBackgroundColor: pallete.secondaryGray4, inputDecorationTheme: _inputDecorationTheme(pallete), primaryColor: pallete.primary2, textTheme: _textTheme(pallete), + colorScheme: _colorScheme(pallete).copyWith(surface: pallete.secondaryGray4), ); } @@ -75,12 +74,10 @@ class ThemeDataFactory { primary: pallete.primary2, secondary: Colors.red, surface: ThemeColorsPallete.debugColor, - background: pallete.secondaryGray4, error: pallete.tertiary2, onPrimary: Colors.white, onSecondary: ThemeColorsPallete.debugColor, onSurface: pallete.secondaryGray2, - onBackground: ThemeColorsPallete.debugColor, onError: ThemeColorsPallete.debugColor, ); } @@ -120,14 +117,14 @@ class ThemeDataFactory { static TextTheme _textTheme(ThemeColorsPallete pallete) { return TextTheme( - headline6: ThemeTextStyles.headline6.copyWith(color: pallete.secondaryGray1), - subtitle1: ThemeTextStyles.subtitle1.copyWith(color: pallete.secondaryGray1), - subtitle2: ThemeTextStyles.subtitle2.copyWith(color: pallete.secondaryGray2), - bodyText1: ThemeTextStyles.bodyText1.copyWith(color: pallete.secondaryGray1), - bodyText2: ThemeTextStyles.bodyText2.copyWith(color: pallete.secondaryGray2), - caption: ThemeTextStyles.caption.copyWith(color: pallete.secondaryGray2), - button: ThemeTextStyles.button.copyWith(color: pallete.secondaryGray3), - overline: ThemeTextStyles.overline.copyWith(color: pallete.secondaryGray1), + titleLarge: ThemeTextStyles.headline6.copyWith(color: pallete.secondaryGray1), + titleMedium: ThemeTextStyles.subtitle1.copyWith(color: pallete.secondaryGray1), + titleSmall: ThemeTextStyles.subtitle2.copyWith(color: pallete.secondaryGray2), + bodyLarge: ThemeTextStyles.bodyText1.copyWith(color: pallete.secondaryGray1), + bodyMedium: ThemeTextStyles.bodyText2.copyWith(color: pallete.secondaryGray2), + bodySmall: ThemeTextStyles.caption.copyWith(color: pallete.secondaryGray2), + labelLarge: ThemeTextStyles.button.copyWith(color: pallete.secondaryGray3), + labelSmall: ThemeTextStyles.overline.copyWith(color: pallete.secondaryGray1), ); } } diff --git a/payu_ui/lib/src/widgets/payu_app_bar_icon.dart b/payu_ui/lib/src/widgets/payu_app_bar_icon.dart index 546065f..32ddef4 100644 --- a/payu_ui/lib/src/widgets/payu_app_bar_icon.dart +++ b/payu_ui/lib/src/widgets/payu_app_bar_icon.dart @@ -5,10 +5,9 @@ class PayuAppBarIcon extends StatelessWidget { final VoidCallback onPressed; const PayuAppBarIcon._({ - Key? key, required this.icon, required this.onPressed, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/payu_ui/lib/src/widgets/payu_fade_in_image.dart b/payu_ui/lib/src/widgets/payu_fade_in_image.dart index 7054fb6..a89384c 100644 --- a/payu_ui/lib/src/widgets/payu_fade_in_image.dart +++ b/payu_ui/lib/src/widgets/payu_fade_in_image.dart @@ -7,7 +7,7 @@ class PayuFadeInImage extends StatelessWidget { final IconData? icon; final double? size; - const PayuFadeInImage({Key? key, this.uri, this.icon, this.size}) : super(key: key); + const PayuFadeInImage({super.key, this.uri, this.icon, this.size}); @override Widget build(BuildContext context) { @@ -21,7 +21,7 @@ class _UriFadeInImage extends StatelessWidget { final String uri; final double? size; - const _UriFadeInImage({Key? key, required this.uri, this.size}) : super(key: key); + const _UriFadeInImage({required this.uri, this.size}); @override Widget build(BuildContext context) { @@ -41,7 +41,7 @@ class _IconFadeInImage extends StatelessWidget { final IconData icon; final double? size; - const _IconFadeInImage({Key? key, required this.icon, this.size}) : super(key: key); + const _IconFadeInImage({required this.icon, this.size}); @override Widget build(BuildContext context) { diff --git a/payu_ui/lib/src/widgets/payu_image.dart b/payu_ui/lib/src/widgets/payu_image.dart index f7b7a5e..9ca4190 100644 --- a/payu_ui/lib/src/widgets/payu_image.dart +++ b/payu_ui/lib/src/widgets/payu_image.dart @@ -15,7 +15,7 @@ class PayuImage extends StatelessWidget { final Size size; final String url; - const PayuImage._({Key? key, required this.size, required this.url}) : super(key: key); + const PayuImage._({required this.size, required this.url}); factory PayuImage.logo() => const PayuImage._(size: PayuImageSize.logo, url: PayuImageUrl.logo); diff --git a/payu_ui/lib/src/widgets/payu_provider_widget.dart b/payu_ui/lib/src/widgets/payu_provider_widget.dart index 5cb8982..f7707b0 100644 --- a/payu_ui/lib/src/widgets/payu_provider_widget.dart +++ b/payu_ui/lib/src/widgets/payu_provider_widget.dart @@ -8,7 +8,7 @@ class PayuProviderWidget extends StatelessWidget { final T Function(BuildContext context) create; final Widget Function(BuildContext context, T controller) builder; - const PayuProviderWidget({Key? key, required this.create, required this.builder}) : super(key: key); + const PayuProviderWidget({super.key, required this.create, required this.builder}); @override Widget build(BuildContext context) { diff --git a/payu_ui/pubspec.yaml b/payu_ui/pubspec.yaml index f139285..69c4994 100644 --- a/payu_ui/pubspec.yaml +++ b/payu_ui/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -16,7 +16,7 @@ dependencies: path: payu_interface provider: ^6.0.3 dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter: diff --git a/payu_web_payments/lib/src/cvv/cvv_authorization_alert_dialog.dart b/payu_web_payments/lib/src/cvv/cvv_authorization_alert_dialog.dart index 1ab5d1d..0233226 100644 --- a/payu_web_payments/lib/src/cvv/cvv_authorization_alert_dialog.dart +++ b/payu_web_payments/lib/src/cvv/cvv_authorization_alert_dialog.dart @@ -10,7 +10,7 @@ import 'cvv_authorization_controller.dart'; class CVVAuthorizationAlertDialog extends StatelessWidget { final String refReqId; - const CVVAuthorizationAlertDialog({Key? key, required this.refReqId}) : super(key: key); + const CVVAuthorizationAlertDialog({super.key, required this.refReqId}); @override Widget build(BuildContext context) { diff --git a/payu_web_payments/lib/src/web_payments_page.dart b/payu_web_payments/lib/src/web_payments_page.dart index c61e6b8..b2f2223 100644 --- a/payu_web_payments/lib/src/web_payments_page.dart +++ b/payu_web_payments/lib/src/web_payments_page.dart @@ -13,7 +13,7 @@ import 'web_payments_controller.dart'; class WebPaymentsPage extends StatefulWidget { final WebPaymentsRequest request; - const WebPaymentsPage({Key? key, required this.request}) : super(key: key); + const WebPaymentsPage({super.key, required this.request}); @override State createState() => _WebPaymentsPageState(); @@ -28,7 +28,7 @@ class _WebPaymentsPageState extends State with WebPaymentsContr return PayuWidget( assembler: () => assembler, builder: (context, controller) => Scaffold( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.surface, appBar: AppBar( title: PayuImage.logo(), bottom: PreferredSize( diff --git a/payu_web_payments/pubspec.yaml b/payu_web_payments/pubspec.yaml index 81762dc..c7cef59 100644 --- a/payu_web_payments/pubspec.yaml +++ b/payu_web_payments/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none homepage: https://github.com/PayU-EMEA/PayU-Flutter issue_tracker: https://github.com/PayU-EMEA/PayU-Flutter/issues environment: - sdk: '>=2.18.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.5.0" dependencies: flutter: @@ -32,9 +32,9 @@ dependencies: path: payu_ui webview_flutter: ^3.0.4 dev_dependencies: - build_runner: ^2.4.8 - dependency_validator: ^3.2.2 - flutter_lints: ^3.0.1 + build_runner: ^2.4.9 + dependency_validator: ^4.1.0 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter http: ^1.2.1