Skip to content

Fix the theme text issues #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix the theme text issues #190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e44d445
Fix the theme text issues
I-driod May 21, 2024
eaa6a87
fix the intl version to 0.19.0
Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class _HomePageState extends State<HomePage> {
primaryColorLight: Colors.white,
primaryColorDark: navyBlue,
textTheme: Theme.of(context).textTheme.copyWith(
bodyText2: TextStyle(
bodyMedium: TextStyle(
color: lightBlue,
),
),
Expand Down
3 changes: 2 additions & 1 deletion lib/src/widgets/birthday_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ class _BirthdayWidgetState extends BaseState<BirthdayWidget> {
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.w500,
color: context.textTheme().headline6?.color,
// color: context.textTheme().headline6?.color,
color: Theme.of(context).textTheme.headlineSmall?.color,
fontSize: 15.0,
),
),
Expand Down
12 changes: 9 additions & 3 deletions lib/src/widgets/checkout/checkout_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,11 @@ class _CheckoutWidgetState extends BaseState<CheckoutWidget>
Text(
'Pay',
style: TextStyle(
fontSize: 14.0, color: context.textTheme().headline1?.color),
fontSize: 14.0,
// color: context.textTheme().headline1?.color,

color: Theme.of(context).textTheme.headlineLarge?.color,
),
),
SizedBox(
width: 5.0,
Expand All @@ -197,7 +201,9 @@ class _CheckoutWidgetState extends BaseState<CheckoutWidget>
child: Text(Utils.formatAmount(_charge.amount),
style: TextStyle(
fontSize: 15.0,
color: context.textTheme().headline6?.color,
// color: context.textTheme().headline6?.color,
color:
Theme.of(context).textTheme.headlineSmall?.color,
fontWeight: FontWeight.bold)))
],
)
Expand Down Expand Up @@ -421,7 +427,7 @@ class _CheckoutWidgetState extends BaseState<CheckoutWidget>
if (_response!.card != null) {
_response!.card!.nullifyNumber();
}
Navigator.of(context).pop(_response);
Navigator.of(context).pop(_response);
},
);

Expand Down
5 changes: 3 additions & 2 deletions lib/src/widgets/custom_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class CustomAlertDialog extends StatelessWidget {
children.add(new Padding(
padding: titlePadding!,
child: new DefaultTextStyle(
style: context.textTheme().headline6!,
// style: context.textTheme().headline6!,
style: context.textTheme().headlineSmall!,
child: new Semantics(child: title, namesRoute: true),
),
));
Expand All @@ -43,7 +44,7 @@ class CustomAlertDialog extends StatelessWidget {
child: new Padding(
padding: contentPadding,
child: new DefaultTextStyle(
style: context.textTheme().subtitle1!,
style: context.textTheme().titleSmall!,
child: content,
),
),
Expand Down
3 changes: 2 additions & 1 deletion lib/src/widgets/otp_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class _OtpWidgetState extends BaseState<OtpWidget> {
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.w500,
color: context.textTheme().headline6?.color,
// color: context.textTheme().headline6?.color,
color: Theme.of(context).textTheme.headlineSmall?.color,
fontSize: 15.0,
),
),
Expand Down
3 changes: 2 additions & 1 deletion lib/src/widgets/pin_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ class _PinWidgetState extends BaseState<PinWidget> {
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.w500,
color: context.textTheme().headline6?.color,
color: Theme.of(context).textTheme.headlineSmall?.color,
// color: context.textTheme().headline6?.color,
fontSize: 15.0,
),
),
Expand Down
6 changes: 4 additions & 2 deletions lib/src/widgets/sucessful_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ class _SuccessfulWidgetState extends State<SuccessfulWidget>
Text(
'Payment Successful',
style: TextStyle(
color: context.textTheme().headline6?.color,
// color: context.textTheme().headline6?.color,
color: Theme.of(context).textTheme.headlineSmall?.color,
fontWeight: FontWeight.w500,
fontSize: 16.0,
),
Expand All @@ -98,7 +99,8 @@ class _SuccessfulWidgetState extends State<SuccessfulWidget>
? new Container()
: new Text('You paid ${Utils.formatAmount(widget.amount)}',
style: TextStyle(
color: context.textTheme().headline6?.color,
// color: context.textTheme().headline6?.color,
color: Theme.of(context).textTheme.headlineSmall?.color,
fontWeight: FontWeight.normal,
fontSize: 14.0,
)),
Expand Down