From 61edb4e1f34b1abf58ff4b8221e4f8797940c99b Mon Sep 17 00:00:00 2001 From: Damien M Date: Sun, 19 May 2024 17:00:31 +0200 Subject: [PATCH 1/2] Update tile.dart Changed deprecated error color --- lib/src/tile/tile.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/tile/tile.dart b/lib/src/tile/tile.dart index bc40964..0a41367 100644 --- a/lib/src/tile/tile.dart +++ b/lib/src/tile/tile.dart @@ -213,7 +213,7 @@ class S2Tile 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, From 6e92c661fbb38f1d15870daefb69f68487d10945 Mon Sep 17 00:00:00 2001 From: Damien M Date: Sun, 19 May 2024 15:04:17 +0000 Subject: [PATCH 2/2] Fix headline6 --- example/lib/features_modal/modal_header.dart | 2 +- example/lib/widgets/card_tile.dart | 2 +- lib/src/widget/s2_state.dart | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/lib/features_modal/modal_header.dart b/example/lib/features_modal/modal_header.dart index 0e0acfd..090bd0a 100644 --- a/example/lib/features_modal/modal_header.dart +++ b/example/lib/features_modal/modal_header.dart @@ -56,7 +56,7 @@ class _FeaturesModalHeaderState extends State { 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, ), diff --git a/example/lib/widgets/card_tile.dart b/example/lib/widgets/card_tile.dart index 4723398..2a239ad 100644 --- a/example/lib/widgets/card_tile.dart +++ b/example/lib/widgets/card_tile.dart @@ -41,7 +41,7 @@ class CardTile extends StatelessWidget { title, style: Theme.of(context) .textTheme - .headline6 + .titleLarge ?.merge(TextStyle(color: Colors.black54)), ), Container(height: 5), diff --git a/lib/src/widget/s2_state.dart b/lib/src/widget/s2_state.dart index bcb63b1..55cf82d 100644 --- a/lib/src/widget/s2_state.dart +++ b/lib/src/widget/s2_state.dart @@ -138,8 +138,8 @@ abstract class S2State extends State> { 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(