From 141169c19fc3008838e3b4575de0d9ae02d64435 Mon Sep 17 00:00:00 2001 From: "artem.abramov" Date: Thu, 21 Aug 2025 11:03:52 +0400 Subject: [PATCH 1/2] Fix an issue with GfAppBar support on Flutter 3.35 --- lib/components/appbar/gf_appbar.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/components/appbar/gf_appbar.dart b/lib/components/appbar/gf_appbar.dart index a8fe9b7e..5543f915 100644 --- a/lib/components/appbar/gf_appbar.dart +++ b/lib/components/appbar/gf_appbar.dart @@ -304,7 +304,7 @@ class _GFAppBarState extends State { assert(!widget.primary || debugCheckHasMediaQuery(context)); assert(debugCheckHasMaterialLocalizations(context)); final ThemeData theme = Theme.of(context); - final AppBarTheme appBarTheme = AppBarTheme.of(context); + final appBarTheme = AppBarTheme.of(context); final ScaffoldState scaffold = Scaffold.of(context); final ModalRoute? parentRoute = ModalRoute.of(context); final bool hasDrawer = scaffold.hasDrawer; From 1ad24b95e912f8e4b95ef028d77dfc32b6e30754 Mon Sep 17 00:00:00 2001 From: "artem.abramov" Date: Thu, 21 Aug 2025 11:03:52 +0400 Subject: [PATCH 2/2] Fix an issue with GfAppBar & GfCard support on Flutter 3.35 --- lib/components/appbar/gf_appbar.dart | 2 +- lib/components/card/gf_card.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/components/appbar/gf_appbar.dart b/lib/components/appbar/gf_appbar.dart index a8fe9b7e..5543f915 100644 --- a/lib/components/appbar/gf_appbar.dart +++ b/lib/components/appbar/gf_appbar.dart @@ -304,7 +304,7 @@ class _GFAppBarState extends State { assert(!widget.primary || debugCheckHasMediaQuery(context)); assert(debugCheckHasMaterialLocalizations(context)); final ThemeData theme = Theme.of(context); - final AppBarTheme appBarTheme = AppBarTheme.of(context); + final appBarTheme = AppBarTheme.of(context); final ScaffoldState scaffold = Scaffold.of(context); final ModalRoute? parentRoute = ModalRoute.of(context); final bool hasDrawer = scaffold.hasDrawer; diff --git a/lib/components/card/gf_card.dart b/lib/components/card/gf_card.dart index 351946bf..9644924c 100644 --- a/lib/components/card/gf_card.dart +++ b/lib/components/card/gf_card.dart @@ -115,7 +115,7 @@ class GFCard extends StatelessWidget { @override Widget build(BuildContext context) { - final CardThemeData cardTheme = CardTheme.of(context); + final cardTheme = CardTheme.of(context); final Widget cardChild = Padding( padding: padding,