Merge branch 'master' into feature-landscape-support
This commit is contained in:
commit
e1143e252e
@ -24,7 +24,7 @@ class AppColors {
|
||||
TextTheme txtTheme = (isDark ? ThemeData.dark() : ThemeData.light()).textTheme;
|
||||
Color txtColor = white;
|
||||
ColorScheme colorScheme = ColorScheme(
|
||||
// Decide how you want to apply your own custom them, to the MaterialApp
|
||||
// Decide how you want to apply your own custom theme, to the MaterialApp
|
||||
brightness: isDark ? Brightness.dark : Brightness.light,
|
||||
primary: accent1,
|
||||
primaryContainer: accent1,
|
||||
|
@ -148,10 +148,7 @@ class _PhotoGalleryState extends State<PhotoGallery> {
|
||||
gridOffset += Offset(0, -context.mq.padding.top / 2);
|
||||
final offsetTweenDuration = _skipNextOffsetTween ? Duration.zero : swipeDuration;
|
||||
final cutoutTweenDuration = _skipNextOffsetTween ? Duration.zero : swipeDuration * .5;
|
||||
return Stack(
|
||||
children: [
|
||||
// A overlay with a transparent middle sits on top of everything, animating itself each time index changes
|
||||
_AnimatedCutoutOverlay(
|
||||
return _AnimatedCutoutOverlay(
|
||||
animationKey: ValueKey(_index),
|
||||
cutoutSize: imgSize,
|
||||
swipeDir: _lastSwipeDir,
|
||||
@ -186,8 +183,6 @@ class _PhotoGalleryState extends State<PhotoGallery> {
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
});
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user