From 3faac4c999314bad4e61860006136926e0bc982e Mon Sep 17 00:00:00 2001 From: Sulaiman Adewale Date: Thu, 30 May 2024 11:55:13 +0100 Subject: [PATCH] Upgrade --- example/lib/main.dart | 2 +- lib/src/widgets/birthday_widget.dart | 2 +- lib/src/widgets/checkout/checkout_widget.dart | 11 ++++++----- lib/src/widgets/custom_dialog.dart | 4 ++-- lib/src/widgets/otp_widget.dart | 4 ++-- lib/src/widgets/pin_widget.dart | 2 +- lib/src/widgets/sucessful_widget.dart | 4 ++-- pubspec.yaml | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 87a7123e..55075ef5 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -156,7 +156,7 @@ class _HomePageState extends State { primaryColorLight: Colors.white, primaryColorDark: navyBlue, textTheme: Theme.of(context).textTheme.copyWith( - bodyText2: TextStyle( + bodyMedium: TextStyle( color: lightBlue, ), ), diff --git a/lib/src/widgets/birthday_widget.dart b/lib/src/widgets/birthday_widget.dart index 20449a42..a7b1b726 100644 --- a/lib/src/widgets/birthday_widget.dart +++ b/lib/src/widgets/birthday_widget.dart @@ -45,7 +45,7 @@ class _BirthdayWidgetState extends BaseState { textAlign: TextAlign.center, style: TextStyle( fontWeight: FontWeight.w500, - color: context.textTheme().headline6?.color, + color: context.textTheme().titleLarge?.color, fontSize: 15.0, ), ), diff --git a/lib/src/widgets/checkout/checkout_widget.dart b/lib/src/widgets/checkout/checkout_widget.dart index 6e467620..69ca60df 100644 --- a/lib/src/widgets/checkout/checkout_widget.dart +++ b/lib/src/widgets/checkout/checkout_widget.dart @@ -188,7 +188,8 @@ class _CheckoutWidgetState extends BaseState Text( 'Pay', style: TextStyle( - fontSize: 14.0, color: context.textTheme().headline1?.color), + fontSize: 14.0, + color: context.textTheme().displayLarge?.color), ), SizedBox( width: 5.0, @@ -197,7 +198,7 @@ class _CheckoutWidgetState extends BaseState child: Text(Utils.formatAmount(_charge.amount), style: TextStyle( fontSize: 15.0, - color: context.textTheme().headline6?.color, + color: context.textTheme().titleLarge?.color, fontWeight: FontWeight.bold))) ], ) @@ -242,13 +243,13 @@ class _CheckoutWidgetState extends BaseState duration: const Duration(milliseconds: 300), curve: Curves.fastOutSlowIn, child: new Container( - color: context.colorScheme().background.withOpacity(0.5), + color: context.colorScheme().surface.withOpacity(0.5), height: _tabHeight, alignment: Alignment.center, child: new TabBar( controller: _tabController, isScrollable: true, - unselectedLabelColor: context.colorScheme().onBackground, + unselectedLabelColor: context.colorScheme().onSurface, labelColor: accentColor, labelStyle: new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500), @@ -421,7 +422,7 @@ class _CheckoutWidgetState extends BaseState if (_response!.card != null) { _response!.card!.nullifyNumber(); } - Navigator.of(context).pop(_response); + Navigator.of(context).pop(_response); }, ); diff --git a/lib/src/widgets/custom_dialog.dart b/lib/src/widgets/custom_dialog.dart index 4faa5333..5dd49c0b 100644 --- a/lib/src/widgets/custom_dialog.dart +++ b/lib/src/widgets/custom_dialog.dart @@ -33,7 +33,7 @@ class CustomAlertDialog extends StatelessWidget { children.add(new Padding( padding: titlePadding!, child: new DefaultTextStyle( - style: context.textTheme().headline6!, + style: context.textTheme().titleLarge!, child: new Semantics(child: title, namesRoute: true), ), )); @@ -43,7 +43,7 @@ class CustomAlertDialog extends StatelessWidget { child: new Padding( padding: contentPadding, child: new DefaultTextStyle( - style: context.textTheme().subtitle1!, + style: context.textTheme().bodyMedium!, child: content, ), ), diff --git a/lib/src/widgets/otp_widget.dart b/lib/src/widgets/otp_widget.dart index f0f74a70..8b399792 100644 --- a/lib/src/widgets/otp_widget.dart +++ b/lib/src/widgets/otp_widget.dart @@ -40,9 +40,9 @@ class _OtpWidgetState extends BaseState { new Text( widget.message!, textAlign: TextAlign.center, - style: TextStyle( + style: TextStyle( fontWeight: FontWeight.w500, - color: context.textTheme().headline6?.color, + color: context.textTheme().titleLarge?.color, fontSize: 15.0, ), ), diff --git a/lib/src/widgets/pin_widget.dart b/lib/src/widgets/pin_widget.dart index 124dabd8..eac1c463 100644 --- a/lib/src/widgets/pin_widget.dart +++ b/lib/src/widgets/pin_widget.dart @@ -38,7 +38,7 @@ class _PinWidgetState extends BaseState { textAlign: TextAlign.center, style: TextStyle( fontWeight: FontWeight.w500, - color: context.textTheme().headline6?.color, + color: context.textTheme().titleLarge?.color, fontSize: 15.0, ), ), diff --git a/lib/src/widgets/sucessful_widget.dart b/lib/src/widgets/sucessful_widget.dart index dc669431..79dd546d 100644 --- a/lib/src/widgets/sucessful_widget.dart +++ b/lib/src/widgets/sucessful_widget.dart @@ -86,7 +86,7 @@ class _SuccessfulWidgetState extends State Text( 'Payment Successful', style: TextStyle( - color: context.textTheme().headline6?.color, + color: context.textTheme().titleLarge?.color, fontWeight: FontWeight.w500, fontSize: 16.0, ), @@ -98,7 +98,7 @@ class _SuccessfulWidgetState extends State ? new Container() : new Text('You paid ${Utils.formatAmount(widget.amount)}', style: TextStyle( - color: context.textTheme().headline6?.color, + color: context.textTheme().titleLarge?.color, fontWeight: FontWeight.normal, fontSize: 14.0, )), diff --git a/pubspec.yaml b/pubspec.yaml index f76392a8..4faeea20 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_paystack description: A Flutter plugin for making payments via Paystack Payment Gateway. Completely supports Android and iOS. -version: 1.0.7 +version: 1.0.8 homepage: https://github.com/wilburt/flutter_paystack dependencies: