Merge branch 'main' into fix/state_loss_on_android

This commit is contained in:
Shawn 2023-02-16 00:33:33 -07:00
commit 1ff80a1859

View File

@ -13,22 +13,20 @@ class WondersAppScaffold extends StatelessWidget {
_style = AppStyle(screenSize: context.sizePx); _style = AppStyle(screenSize: context.sizePx);
Animate.defaultDuration = _style.times.fast; Animate.defaultDuration = _style.times.fast;
appLogic.handleAppSizeChanged(context.mq.size); appLogic.handleAppSizeChanged(context.mq.size);
return Stack( return KeyedSubtree(
key: ValueKey($styles.scale), key: ValueKey($styles.scale),
children: [ child: Theme(
Theme( data: $styles.colors.toThemeData(),
data: $styles.colors.toThemeData(), // Provide a default texts style to allow Hero's to render text properly
// Provide a default texts style to allow Hero's to render text properly child: DefaultTextStyle(
child: DefaultTextStyle( style: $styles.text.body,
style: $styles.text.body, // Use a custom scroll behavior across entire app
// Use a custom scroll behavior across entire app child: ScrollConfiguration(
child: ScrollConfiguration( behavior: AppScrollBehavior(),
behavior: AppScrollBehavior(), child: child,
child: child,
),
), ),
), ),
], ),
); );
} }
} }