Skip to content
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

Jump to bottom

🐛 Fix Theme Application #149

Merged
merged 1 commit into from
Oct 4, 2023
Merged

🐛 Fix Theme Application #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
- Added dart 3 support [#146](https://github.com/SimformSolutionsPvtLtd/flutter_credit_card/pull/146).
- Fixed package structure and improved code overall [#150](https://github.com/SimformSolutionsPvtLtd/flutter_credit_card/pull/150).
- Fixed and improved card type detection logic [#151](https://github.com/SimformSolutionsPvtLtd/flutter_credit_card/pull/151).
- (Breaking Change) Fixed [#136](https://github.com/SimformSolutionsPvtLtd/flutter_credit_card/issues/136)
Application theme not applied to `CreditCardForm`.
Removed `themeColor`, `textColor`, `cursorColor` from `CreditCardForm`. You can check example app
to know how to apply those using `Theme`.

# [3.0.7](https://github.com/SimformSolutionsPvtLtd/flutter_credit_card/tree/3.0.7)

Expand Down
85 changes: 43 additions & 42 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,51 @@ class MySampleState extends State<MySample> {
debugShowCheckedModeBanner: false,
themeMode: isLightTheme ? ThemeMode.light : ThemeMode.dark,
theme: ThemeData(
brightness: Brightness.light,
primaryColor: Colors.white,
scaffoldBackgroundColor: Colors.black,
textTheme: const TextTheme(
// Text style for text fields' input.
titleMedium: TextStyle(color: Colors.black, fontSize: 18),
),
colorScheme: ColorScheme.fromSeed(
brightness: Brightness.light,
seedColor: Colors.white,
background: Colors.black,
// Defines colors like cursor color of the text fields.
primary: Colors.black,
),
// Decoration theme for the text fields.
inputDecorationTheme: InputDecorationTheme(
hintStyle: const TextStyle(color: Colors.black),
labelStyle: const TextStyle(color: Colors.black),
focusedBorder: border,
enabledBorder: border,
),
),
darkTheme: ThemeData(
brightness: Brightness.dark,
primaryColor: Colors.black,
scaffoldBackgroundColor: Colors.white,
textTheme: const TextTheme(
// Text style for text fields' input.
titleMedium: TextStyle(color: Colors.white, fontSize: 18),
),
colorScheme: ColorScheme.fromSeed(
brightness: Brightness.dark,
seedColor: Colors.black,
background: Colors.white,
// Defines colors like cursor color of the text fields.
primary: Colors.white,
),
// Decoration theme for the text fields.
inputDecorationTheme: InputDecorationTheme(
hintStyle: const TextStyle(color: Colors.white),
labelStyle: const TextStyle(color: Colors.white),
focusedBorder: border,
enabledBorder: border,
),
),
home: Scaffold(
resizeToAvoidBottomInset: false,
body: Builder(
builder: (BuildContext context) {
final Color bgColor = Theme.of(context).scaffoldBackgroundColor;
return Container(
decoration: BoxDecoration(
color: bgColor,
image: DecorationImage(
image: ExactAssetImage(
isLightTheme ? 'assets/bg-light.png' : 'assets/bg-dark.png',
Expand Down Expand Up @@ -128,37 +156,19 @@ class MySampleState extends State<MySample> {
isExpiryDateVisible: true,
cardHolderName: cardHolderName,
expiryDate: expiryDate,
themeColor: Theme.of(context).primaryColor,
textColor: bgColor,
cardNumberDecoration: InputDecoration(
cardNumberDecoration: const InputDecoration(
labelText: 'Number',
hintText: 'XXXX XXXX XXXX XXXX',
hintStyle: TextStyle(color: bgColor),
labelStyle: TextStyle(color: bgColor),
focusedBorder: border,
enabledBorder: border,
),
expiryDateDecoration: InputDecoration(
hintStyle: TextStyle(color: bgColor),
labelStyle: TextStyle(color: bgColor),
focusedBorder: border,
enabledBorder: border,
expiryDateDecoration: const InputDecoration(
labelText: 'Expired Date',
hintText: 'XX/XX',
),
cvvCodeDecoration: InputDecoration(
hintStyle: TextStyle(color: bgColor),
labelStyle: TextStyle(color: bgColor),
focusedBorder: border,
enabledBorder: border,
cvvCodeDecoration: const InputDecoration(
labelText: 'CVV',
hintText: 'XXX',
),
cardHolderDecoration: InputDecoration(
hintStyle: TextStyle(color: bgColor),
labelStyle: TextStyle(color: bgColor),
focusedBorder: border,
enabledBorder: border,
cardHolderDecoration: const InputDecoration(
labelText: 'Card Holder',
),
onCreditCardModelChange: onCreditCardModelChange,
Expand All @@ -170,10 +180,7 @@ class MySampleState extends State<MySample> {
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
const Text(
'Glassmorphism',
style: TextStyle(fontSize: 18),
),
const Text('Glassmorphism'),
const Spacer(),
Switch(
value: useGlassMorphism,
Expand All @@ -193,10 +200,7 @@ class MySampleState extends State<MySample> {
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
const Text(
'Card Image',
style: TextStyle(fontSize: 18),
),
const Text('Card Image'),
const Spacer(),
Switch(
value: useBackgroundImage,
Expand All @@ -216,10 +220,7 @@ class MySampleState extends State<MySample> {
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
const Text(
'Floating Card',
style: TextStyle(fontSize: 18),
),
const Text('Floating Card'),
const Spacer(),
Switch(
value: useFloatingAnimation,
Expand Down