Skip to content

Fix deprecated theme references #32

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 deprecated theme references #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61edb4e
Update tile.dart
DamienMrtl May 19, 2024
6e92c66
Fix headline6
DamienMrtl May 19, 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/features_modal/modal_header.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class _FeaturesModalHeaderState extends State<FeaturesModalHeader> {
type: S2ModalType.popupDialog,
headerStyle: S2ModalHeaderStyle(
backgroundColor: Theme.of(context).primaryColor,
textStyle: Theme.of(context).primaryTextTheme.headline6,
textStyle: Theme.of(context).primaryTextTheme.titleLarge,
centerTitle: true,
elevation: 0,
),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/widgets/card_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class CardTile extends StatelessWidget {
title,
style: Theme.of(context)
.textTheme
.headline6
.titleLarge
?.merge(TextStyle(color: Colors.black54)),
),
Container(height: 5),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/tile/tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class S2Tile<T> extends StatelessWidget {
return DefaultTextStyle.merge(
child: isLoading == true ? _loadingWidget : value,
style: isError == true
? TextStyle(color: Theme.of(context).errorColor)
? TextStyle(color: Theme.of(context).colorScheme.error)
: null,
overflow: TextOverflow.ellipsis,
maxLines: 1,
Expand Down
4 changes: 2 additions & 2 deletions lib/src/widget/s2_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ abstract class S2State<T> extends State<SmartSelect<T>> {
backgroundColor:
widget.modalConfig.isFullPage != true ? theme.cardColor : null,
textStyle: widget.modalConfig.isFullPage != true
? theme.textTheme.headline6
: theme.primaryTextTheme.headline6,
? theme.textTheme.titleLarge
: theme.primaryTextTheme.titleLarge,
iconTheme:
widget.modalConfig.isFullPage != true ? theme.iconTheme : null,
errorStyle: const TextStyle(
Expand Down